Author: jghali
Date: Sat Feb 5 21:07:35 2022
New Revision: 24915
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24915
Log:
Qt6: fix some signal/slot connections
Modified:
trunk/Scribus/scribus/ui/insertaframe.cpp
trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp
trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp
trunk/Scribus/scribus/ui/prefs_userinterface.cpp
trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp
Modified: trunk/Scribus/scribus/ui/insertaframe.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24915&path=/trunk/Scribus/scribus/ui/insertaframe.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/insertaframe.cpp (original)
+++ trunk/Scribus/scribus/ui/insertaframe.cpp Sat Feb 5 21:07:35 2022
@@ -109,11 +109,11 @@
if (comboBoxLinkToExistingFrameName->count() == 0)
checkBoxLinkToExistingFrame->setEnabled(false);
- connect(typeButtonGroup, SIGNAL(buttonClicked(int)), this,
SLOT(slotSelectType(int)));
- connect(pagePlacementButtonGroup, SIGNAL(buttonClicked(int)), this,
SLOT(slotSelectPagePlacement(int)));
+ connect(typeButtonGroup, SIGNAL(idClicked(int)), this,
SLOT(slotSelectType(int)));
+ connect(pagePlacementButtonGroup, SIGNAL(idClicked(int)), this,
SLOT(slotSelectPagePlacement(int)));
connect(placementPagesRangeButton, SIGNAL(clicked()), this,
SLOT(slotCreatePageNumberRange()));
- connect(framePositionButtonGroup, SIGNAL(buttonClicked(int)), this,
SLOT(slotSelectPosition(int)));
- connect(sizeButtonGroup, SIGNAL(buttonClicked(int)), this,
SLOT(slotSelectSize(int)));
+ connect(framePositionButtonGroup, SIGNAL(idClicked(int)), this,
SLOT(slotSelectPosition(int)));
+ connect(sizeButtonGroup, SIGNAL(idClicked(int)), this,
SLOT(slotSelectSize(int)));
connect(selectImageFileButton, SIGNAL(clicked()), this,
SLOT(locateImageFile()));
connect(selectDocFileButton, SIGNAL(clicked()), this,
SLOT(locateDocFile()));
connect(checkBoxLinkToExistingFrame, SIGNAL(stateChanged(int)), this,
SLOT(slotLinkToExistingFrame(int)));
Modified: trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24915&path=/trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsetup.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_documentsetup.cpp Sat Feb 5 21:07:35 2022
@@ -68,11 +68,11 @@
pageHeightSpinBox->setMaximum(16777215);
languageChange();
- connect(pageSizeComboBox, SIGNAL(activated(const QString &)), this,
SLOT(setPageSize()));
+ connect(pageSizeComboBox, SIGNAL(activated(int)), this,
SLOT(setPageSize()));
connect(pageOrientationComboBox, SIGNAL(activated(int)), this,
SLOT(setPageOrientation(int)));
connect(pageWidthSpinBox, SIGNAL(valueChanged(double)), this,
SLOT(setPageWidth(double)));
connect(pageHeightSpinBox, SIGNAL(valueChanged(double)), this,
SLOT(setPageHeight(double)));
- connect(pageLayoutButtonGroup, SIGNAL(buttonClicked(int)), this,
SLOT(pageLayoutChanged(int)));
+ connect(pageLayoutButtonGroup, SIGNAL(idClicked(int)), this,
SLOT(pageLayoutChanged(int)));
connect(pageUnitsComboBox, SIGNAL(activated(int)), this,
SLOT(unitChange()));
connect(undoCheckBox, SIGNAL(toggled(bool)), this,
SLOT(slotUndo(bool)));
connect(changeAutoDir, SIGNAL(clicked()), this,
SLOT(changeAutoDocDir()));
Modified: trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24915&path=/trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_preflightverifier.cpp Sat Feb 5
21:07:35 2022
@@ -18,8 +18,8 @@
m_caption = tr("Preflight Verifier");
m_icon = "16/preflight-verifier.png";
- connect(currentProfileComboBox, SIGNAL(activated(const QString&)),
this, SLOT(setProfile(const QString&)));
- connect(currentProfileComboBox, SIGNAL(editTextChanged(const
QString&)), this, SLOT(setProfile(const QString&)));
+ connect(currentProfileComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(setProfile(QString)));
+ connect(currentProfileComboBox, SIGNAL(editTextChanged(QString)), this,
SLOT(setProfile(QString)));
connect(ignoreAllErrorsCheckBox, SIGNAL(clicked()), this,
SLOT(putProfile()));
connect(autoCheckBeforePrintExportCheckBox, SIGNAL(clicked()), this,
SLOT(putProfile()));
@@ -228,8 +228,8 @@
addProfilePushButton->setEnabled(false);
currentProfileComboBox->clear();
- disconnect(currentProfileComboBox, SIGNAL(activated(const QString&)),
this, SLOT(setProfile(const QString&)));
- disconnect(currentProfileComboBox, SIGNAL(editTextChanged(const
QString&)), this, SLOT(setProfile(const QString&)));
+ disconnect(currentProfileComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(setProfile(QString)));
+ disconnect(currentProfileComboBox, SIGNAL(editTextChanged(QString)),
this, SLOT(setProfile(QString)));
CheckerPrefsList::Iterator it;
int j,i=0;
for (it = checkerProfiles.begin(), j=0; it != checkerProfiles.end();
++it, ++j)
@@ -239,15 +239,15 @@
i=j;
}
currentProfileComboBox->setCurrentIndex(i);
- connect(currentProfileComboBox, SIGNAL(activated(const QString&)),
this, SLOT(setProfile(const QString&)));
- connect(currentProfileComboBox, SIGNAL(editTextChanged(const
QString&)), this, SLOT(setProfile(const QString&)));
+ connect(currentProfileComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(setProfile(QString)));
+ connect(currentProfileComboBox, SIGNAL(editTextChanged(QString)), this,
SLOT(setProfile(QString)));
tempNewProfileName="";
}
void Prefs_PreflightVerifier::delProf()
{
- disconnect(currentProfileComboBox, SIGNAL(activated(const QString&)),
this, SLOT(setProfile(const QString&)));
- disconnect(currentProfileComboBox, SIGNAL(editTextChanged(const
QString&)), this, SLOT(setProfile(const QString&)));
+ disconnect(currentProfileComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(setProfile(QString)));
+ disconnect(currentProfileComboBox, SIGNAL(editTextChanged(QString)),
this, SLOT(setProfile(QString)));
checkerProfiles.remove(currentProfile);
updateProfile(checkerProfiles.begin().key());
currentProfileComboBox->clear();
@@ -256,8 +256,8 @@
for (it = checkerProfiles.begin(); it != itend; ++it)
currentProfileComboBox->addItem(it.key());
setCurrentComboItem(currentProfileComboBox, currentProfile);
- connect(currentProfileComboBox, SIGNAL(activated(const QString&)),
this, SLOT(setProfile(const QString&)));
- connect(currentProfileComboBox, SIGNAL(editTextChanged(const
QString&)), this, SLOT(setProfile(const QString&)));
+ connect(currentProfileComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(setProfile(QString)));
+ connect(currentProfileComboBox, SIGNAL(editTextChanged(QString)), this,
SLOT(setProfile(QString)));
if (checkerProfiles.count() == 1)
removeProfilePushButton->setEnabled(false);
}
Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24915&path=/trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp Sat Feb 5 21:07:35 2022
@@ -34,11 +34,11 @@
//do not connect( tocListBox, SIGNAL( currentRowChanged(int) ), this,
SLOT( selectToC(int) ) );
connect( tocAddButton, SIGNAL( clicked() ), this, SLOT( addToC() ) );
connect( tocDeleteButton, SIGNAL( clicked() ), this, SLOT( deleteToC()
) );
- connect( itemAttrComboBox, SIGNAL( activated(const QString&) ), this,
SLOT( itemAttributeSelected(const QString&)));
- connect( itemDestFrameComboBox, SIGNAL( activated(const QString&) ),
this, SLOT( itemFrameSelected(const QString&)));
- connect( itemParagraphStyleComboBox, SIGNAL( activated(const QString&)
), this, SLOT( itemParagraphStyleSelected(const QString&)));
- connect( itemNumberPlacementComboBox, SIGNAL( activated(const QString&)
), this, SLOT( itemPageNumberPlacedSelected(const QString&)));
- connect( tocNameLineEdit, SIGNAL( textChanged(const QString&)), this,
SLOT( setToCName(const QString&)));
+ connect( itemAttrComboBox, SIGNAL(currentTextChanged(QString)), this,
SLOT(itemAttributeSelected(QString)));
+ connect( itemDestFrameComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(itemFrameSelected(QString)));
+ connect( itemParagraphStyleComboBox,
SIGNAL(currentTextChanged(QString)), this,
SLOT(itemParagraphStyleSelected(QString)));
+ connect( itemNumberPlacementComboBox,
SIGNAL(currentTextChanged(QString)), this,
SLOT(itemPageNumberPlacedSelected(QString)));
+ connect( tocNameLineEdit, SIGNAL(textChanged(QString)), this, SLOT(
setToCName(const QString&)));
connect( itemListNonPrintingCheckBox, SIGNAL( toggled(bool) ), this,
SLOT( nonPrintingFramesSelected(bool)));
itemAttrComboBox->setEnabled(false);
@@ -93,14 +93,14 @@
trStrPNNotShown = tr("Not Shown");
strPNNotShown = "Not Shown";
- disconnect(itemNumberPlacementComboBox, SIGNAL(activated(const
QString&)), this, SLOT(itemPageNumberPlacedSelected(const QString&)));
+ disconnect(itemNumberPlacementComboBox,
SIGNAL(currentTextChanged(QString)), this,
SLOT(itemPageNumberPlacedSelected(QString)));
int i = itemNumberPlacementComboBox->currentIndex();
itemNumberPlacementComboBox->clear();
itemNumberPlacementComboBox->addItem(trStrPNEnd);
itemNumberPlacementComboBox->addItem(trStrPNBeginning);
itemNumberPlacementComboBox->addItem(trStrPNNotShown);
itemNumberPlacementComboBox->setCurrentIndex(i);
- connect(itemNumberPlacementComboBox, SIGNAL(activated(const QString&)),
this, SLOT(itemPageNumberPlacedSelected(const QString&)));
+ connect(itemNumberPlacementComboBox,
SIGNAL(currentTextChanged(QString)), this,
SLOT(itemPageNumberPlacedSelected(QString)));
}
void Prefs_TableOfContents::destroy()
@@ -137,7 +137,7 @@
void Prefs_TableOfContents::setupItemAttrs(const QStringList& newNames)
{
- disconnect(itemAttrComboBox, SIGNAL(activated(const QString&)), this,
SLOT(itemAttributeSelected(const QString&)));
+ disconnect(itemAttrComboBox, SIGNAL(currentTextChanged(QString)), this,
SLOT(itemAttributeSelected(QString)));
itemAttrComboBox->clear();
itemAttrComboBox->addItem(CommonStrings::tr_None);
itemAttrComboBox->addItems(newNames);
@@ -148,7 +148,7 @@
else
setCurrentComboItem(itemAttrComboBox,
localToCSetupVector[numSelected].itemAttrName);
}
- connect(itemAttrComboBox, SIGNAL(activated(const QString&)), this,
SLOT(itemAttributeSelected(const QString&)));
+ connect(itemAttrComboBox, SIGNAL(currentTextChanged(QString)), this,
SLOT(itemAttributeSelected(QString)));
}
void Prefs_TableOfContents::selectToC(int numberSelected)
@@ -165,11 +165,11 @@
numSelected = 0;
disconnect( tocListBox, SIGNAL( currentRowChanged(int) ), this, SLOT(
selectToC(int) ) );
- disconnect( itemAttrComboBox, SIGNAL( activated(const QString&) ),
this, SLOT( itemAttributeSelected(const QString&) ) );
- disconnect( itemDestFrameComboBox, SIGNAL( activated(const QString&) ),
this, SLOT( itemFrameSelected(const QString&) ) );
- disconnect( itemParagraphStyleComboBox, SIGNAL( activated(const
QString&) ), this, SLOT( itemParagraphStyleSelected(const QString&) ) );
- disconnect( itemNumberPlacementComboBox, SIGNAL( activated(const
QString&) ), this, SLOT( itemPageNumberPlacedSelected(const QString&) ) );
- disconnect( tocNameLineEdit, SIGNAL( textChanged(const QString&) ),
this, SLOT( setToCName(const QString&) ) );
+ disconnect( itemAttrComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(itemAttributeSelected(QString)) );
+ disconnect( itemDestFrameComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(itemFrameSelected(QString)) );
+ disconnect( itemParagraphStyleComboBox,
SIGNAL(currentTextChanged(QString)), this,
SLOT(itemParagraphStyleSelected(QString)));
+ disconnect( itemNumberPlacementComboBox,
SIGNAL(currentTextChanged(QString)), this,
SLOT(itemPageNumberPlacedSelected(QString)));
+ disconnect( tocNameLineEdit, SIGNAL(textChanged(QString)), this,
SLOT(setToCName(QString)));
disconnect( itemListNonPrintingCheckBox, SIGNAL( toggled(bool) ), this,
SLOT( nonPrintingFramesSelected(bool) ) );
if (localToCSetupVector[numSelected].itemAttrName ==
CommonStrings::None)
@@ -205,11 +205,11 @@
tocNameLineEdit->setText(tocListBox->currentItem()->text());
connect( tocListBox, SIGNAL( currentRowChanged(int) ), this, SLOT(
selectToC(int) ) );
- connect( itemAttrComboBox, SIGNAL( activated(const QString&) ), this,
SLOT( itemAttributeSelected(const QString&) ) );
- connect( itemDestFrameComboBox, SIGNAL( activated(const QString&) ),
this, SLOT( itemFrameSelected(const QString&) ) );
- connect( itemParagraphStyleComboBox, SIGNAL( activated(const QString&)
), this, SLOT( itemParagraphStyleSelected(const QString&) ) );
- connect( itemNumberPlacementComboBox, SIGNAL( activated(const QString&)
), this, SLOT( itemPageNumberPlacedSelected(const QString&) ) );
- connect( tocNameLineEdit, SIGNAL( textChanged(const QString&) ), this,
SLOT( setToCName(const QString&) ) );
+ connect( itemAttrComboBox, SIGNAL(currentTextChanged(QString)), this,
SLOT(itemAttributeSelected(QString)) );
+ connect( itemDestFrameComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(itemFrameSelected(QString)) );
+ connect( itemParagraphStyleComboBox,
SIGNAL(currentTextChanged(QString)), this,
SLOT(itemParagraphStyleSelected(QString)));
+ connect( itemNumberPlacementComboBox,
SIGNAL(currentTextChanged(QString)), this,
SLOT(itemPageNumberPlacedSelected(QString)));
+ connect( tocNameLineEdit, SIGNAL(textChanged(QString)), this,
SLOT(setToCName(QString)));
connect( itemListNonPrintingCheckBox, SIGNAL( toggled(bool) ), this,
SLOT( nonPrintingFramesSelected(bool) ) );
}
Modified: trunk/Scribus/scribus/ui/prefs_userinterface.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24915&path=/trunk/Scribus/scribus/ui/prefs_userinterface.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_userinterface.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_userinterface.cpp Sat Feb 5 21:07:35 2022
@@ -51,7 +51,7 @@
numberFormatComboBox->addItem(tr("Use System Format"),"System");
numberFormatComboBox->addItem(tr("Use Interface Language
Format"),"Language");
- connect(languageComboBox, SIGNAL(activated(const QString &)), this,
SLOT(setSelectedGUILang(const QString &)));
+ connect(languageComboBox, SIGNAL(currentTextChanged(QString)), this,
SLOT(setSelectedGUILang(QString)));
connect(storyEditorFontPushButton, SIGNAL(clicked()), this,
SLOT(changeStoryEditorFont()));
}
Modified: trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24915&path=/trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_hyphenation.cpp Sat Feb 5
21:07:35 2022
@@ -126,7 +126,7 @@
QSignalBlocker hyphenCharLineEditBlocker(hyphenCharLineEdit);
smallestWordSpinBox->setValue(charStyle.hyphenWordMin());
- uint hyphenChar = charStyle.hyphenChar();
+ char32_t hyphenChar = charStyle.hyphenChar();
QString hyphenText;
if (hyphenChar)
hyphenText = QString::fromUcs4(&hyphenChar, 1);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
