Author: craig
Date: Wed Feb 2 20:54:26 2022
New Revision: 24881
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24881
Log:
Qt6 build fix: fix QComboBox activated connections
Modified:
trunk/Scribus/scribus/ui/smcellstyle.cpp
trunk/Scribus/scribus/ui/smtablestyle.cpp
trunk/Scribus/scribus/ui/smtextstyles.cpp
Modified: trunk/Scribus/scribus/ui/smcellstyle.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24881&path=/trunk/Scribus/scribus/ui/smcellstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smcellstyle.cpp (original)
+++ trunk/Scribus/scribus/ui/smcellstyle.cpp Wed Feb 2 20:54:26 2022
@@ -420,18 +420,18 @@
{
if (!m_page)
return;
- connect(m_page->fillColor, SIGNAL(activated(const QString&)), this,
SLOT(slotFillColor()));
+ connect(m_page->fillColor, SIGNAL(currentTextChanged(const QString&)),
this, SLOT(slotFillColor()));
connect(m_page->fillShade, SIGNAL(clicked()), this,
SLOT(slotFillShade()));
- connect(m_page->parentCombo, SIGNAL(activated(const QString&)), this,
SLOT(slotParentChanged(const QString&)));
+ connect(m_page->parentCombo, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotParentChanged(const QString&)));
}
void SMCellStyle::removeConnections()
{
if (!m_page)
return;
- disconnect(m_page->fillColor, SIGNAL(activated(const QString&)), this,
SLOT(slotFillColor()));
+ disconnect(m_page->fillColor, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotFillColor()));
disconnect(m_page->fillShade, SIGNAL(clicked()), this,
SLOT(slotFillShade()));
- disconnect(m_page->parentCombo, SIGNAL(activated(const QString&)),
this, SLOT(slotParentChanged(const QString&)));
+ disconnect(m_page->parentCombo, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotParentChanged(const QString&)));
}
void SMCellStyle::slotFillColor()
Modified: trunk/Scribus/scribus/ui/smtablestyle.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24881&path=/trunk/Scribus/scribus/ui/smtablestyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtablestyle.cpp (original)
+++ trunk/Scribus/scribus/ui/smtablestyle.cpp Wed Feb 2 20:54:26 2022
@@ -422,18 +422,18 @@
{
if (!m_page)
return;
- connect(m_page->fillColor, SIGNAL(activated(const QString&)), this,
SLOT(slotFillColor()));
+ connect(m_page->fillColor, SIGNAL(currentTextChanged(const QString&)),
this, SLOT(slotFillColor()));
connect(m_page->fillShade, SIGNAL(clicked()), this,
SLOT(slotFillShade()));
- connect(m_page->parentCombo, SIGNAL(activated(const QString&)), this,
SLOT(slotParentChanged(const QString&)));
+ connect(m_page->parentCombo, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotParentChanged(const QString&)));
}
void SMTableStyle::removeConnections()
{
if (!m_page)
return;
- disconnect(m_page->fillColor, SIGNAL(activated(const QString&)), this,
SLOT(slotFillColor()));
+ disconnect(m_page->fillColor, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotFillColor()));
disconnect(m_page->fillShade, SIGNAL(clicked()), this,
SLOT(slotFillShade()));
- disconnect(m_page->parentCombo, SIGNAL(activated(const QString&)),
this, SLOT(slotParentChanged(const QString&)));
+ disconnect(m_page->parentCombo, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotParentChanged(const QString&)));
}
void SMTableStyle::slotFillColor()
Modified: trunk/Scribus/scribus/ui/smtextstyles.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24881&path=/trunk/Scribus/scribus/ui/smtextstyles.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smtextstyles.cpp (original)
+++ trunk/Scribus/scribus/ui/smtextstyles.cpp Wed Feb 2 20:54:26 2022
@@ -520,7 +520,7 @@
connect(m_pwidget->bulletBox, SIGNAL(toggled(bool)), this,
SLOT(slotBullet(bool)));
connect(m_pwidget->bulletStrEdit, SIGNAL(editTextChanged(QString)),
this, SLOT(slotBulletStr(QString)));
connect(m_pwidget->numBox, SIGNAL(toggled(bool)), this,
SLOT(slotNumeration(bool)));
- connect(m_pwidget->numComboBox, SIGNAL(activated(QString)), this,
SLOT(slotNumName(QString)));
+ connect(m_pwidget->numComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(slotNumName(QString)));
connect(m_pwidget->numLevelSpin, SIGNAL(valueChanged(int)), this,
SLOT(slotNumLevel(int)));
connect(m_pwidget->numFormatCombo, SIGNAL(activated(int)), this,
SLOT(slotNumFormat(int)));
connect(m_pwidget->numStartSpin, SIGNAL(valueChanged(int)), this,
SLOT(slotNumStart(int)));
@@ -543,8 +543,8 @@
connect(m_pwidget->tabList->rightIndentSpin,
SIGNAL(valueChanged(double)), this, SLOT(slotRightIndent()));
connect(m_pwidget->tabList->firstLineSpin,
SIGNAL(valueChanged(double)), this, SLOT(slotFirstLine()));
- connect(m_pwidget->parentCombo, SIGNAL(activated(const QString&)),
this, SLOT(slotParentChanged(const QString&)));
- connect(m_pwidget->backColor_, SIGNAL(activated(const QString&)), this,
SLOT(slotBackPColor()));
+ connect(m_pwidget->parentCombo, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotParentChanged(const QString&)));
+ connect(m_pwidget->backColor_, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotBackPColor()));
connect(m_pwidget->backShade_, SIGNAL(clicked()), this,
SLOT(slotBackPShade()));
// character attributes
@@ -557,9 +557,9 @@
connect(m_pwidget->cpage->effects_->UnderlineVal->LWidth,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
connect(m_pwidget->cpage->effects_->StrikeVal->LPos,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
connect(m_pwidget->cpage->effects_->StrikeVal->LWidth,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
- connect(m_pwidget->cpage->fillColor_, SIGNAL(activated(const
QString&)), this, SLOT(slotFillColor()));
+ connect(m_pwidget->cpage->fillColor_, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotFillColor()));
connect(m_pwidget->cpage->fillShade_, SIGNAL(clicked()), this,
SLOT(slotFillShade()));
- connect(m_pwidget->cpage->strokeColor_, SIGNAL(activated(const
QString&)), this, SLOT(slotStrokeColor()));
+ connect(m_pwidget->cpage->strokeColor_, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotStrokeColor()));
connect(m_pwidget->cpage->strokeShade_, SIGNAL(clicked()), this,
SLOT(slotStrokeShade()));
connect(m_pwidget->cpage->language_, SIGNAL(activated(int)), this,
SLOT(slotLanguage()));
connect(m_pwidget->cpage->fontSize_, SIGNAL(valueChanged(double)),
this, SLOT(slotFontSize()));
@@ -568,8 +568,8 @@
connect(m_pwidget->cpage->tracking_, SIGNAL(valueChanged(double)),
this, SLOT(slotTracking()));
connect(m_pwidget->cpage->widthSpaceSpin, SIGNAL(valueChanged(double)),
this, SLOT(slotWordTracking()));
connect(m_pwidget->cpage->baselineOffset_,
SIGNAL(valueChanged(double)), this, SLOT(slotBaselineOffset()));
- connect(m_pwidget->cpage->parentCombo, SIGNAL(activated(const
QString&)), this, SLOT(slotCharParentChanged(const QString&)));
- connect(m_pwidget->cpage->backColor_, SIGNAL(activated(const
QString&)), this, SLOT(slotBackColor()));
+ connect(m_pwidget->cpage->parentCombo, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotCharParentChanged(const QString&)));
+ connect(m_pwidget->cpage->backColor_, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotBackColor()));
connect(m_pwidget->cpage->backShade_, SIGNAL(clicked()), this,
SLOT(slotBackShade()));
connect(m_pwidget->cpage->fontfeaturesSetting,SIGNAL(changed()), this,
SLOT(slotFontFeatures()));
connect(m_pwidget->cpage->hyphenCharLineEdit,
SIGNAL(textChanged(QString)), this, SLOT(slotHyphenChar()));
@@ -619,7 +619,7 @@
disconnect(m_pwidget->bulletBox, SIGNAL(toggled(bool)), this,
SLOT(slotBullet(bool)));
disconnect(m_pwidget->bulletStrEdit, SIGNAL(editTextChanged(QString)),
this, SLOT(slotBulletStr(QString)));
disconnect(m_pwidget->numBox, SIGNAL(toggled(bool)), this,
SLOT(slotNumeration(bool)));
- disconnect(m_pwidget->numComboBox, SIGNAL(activated(QString)), this,
SLOT(slotNumName(QString)));
+ disconnect(m_pwidget->numComboBox, SIGNAL(currentTextChanged(QString)),
this, SLOT(slotNumName(QString)));
disconnect(m_pwidget->numFormatCombo, SIGNAL(activated(int)), this,
SLOT(slotNumFormat(int)));
disconnect(m_pwidget->numLevelSpin, SIGNAL(valueChanged(int)), this,
SLOT(slotNumLevel(int)));
disconnect(m_pwidget->numStartSpin, SIGNAL(valueChanged(int)), this,
SLOT(slotNumStart(int)));
@@ -631,7 +631,7 @@
disconnect(m_pwidget->numNewLineEdit, SIGNAL(editingFinished()), this,
SLOT(slotNumNew()));
disconnect(m_pwidget->numNewLineEdit, SIGNAL(textChanged(QString)),
this, SLOT(slotSelectionDirty()));
- disconnect(m_pwidget->parentCombo, SIGNAL(activated(const QString&)),
this, SLOT(slotParentChanged(const QString&)));
+ disconnect(m_pwidget->parentCombo, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotParentChanged(const QString&)));
disconnect(m_pwidget->keepLinesStart, SIGNAL(valueChanged(int)), this,
SLOT(handleKeepLinesStart()));
disconnect(m_pwidget->keepLinesEnd, SIGNAL(valueChanged(int)), this,
SLOT(handleKeepLinesEnd()));
@@ -642,7 +642,7 @@
disconnect(m_pwidget->tabList->leftIndentSpin,
SIGNAL(valueChanged(double)), this, SLOT(slotLeftIndent()));
disconnect(m_pwidget->tabList->rightIndentSpin,
SIGNAL(valueChanged(double)), this, SLOT(slotRightIndent()));
disconnect(m_pwidget->tabList->firstLineSpin,
SIGNAL(valueChanged(double)), this, SLOT(slotFirstLine()));
- disconnect(m_pwidget->backColor_, SIGNAL(activated(const QString&)),
this, SLOT(slotBackPColor()));
+ disconnect(m_pwidget->backColor_, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotBackPColor()));
disconnect(m_pwidget->backShade_, SIGNAL(clicked()), this,
SLOT(slotBackPShade()));
disconnect(m_pwidget->cpage->fontFace_, SIGNAL(fontSelected(QString)),
this, SLOT(slotFont(QString)));
@@ -654,9 +654,9 @@
disconnect(m_pwidget->cpage->effects_->UnderlineVal->LWidth,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
disconnect(m_pwidget->cpage->effects_->StrikeVal->LPos,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
disconnect(m_pwidget->cpage->effects_->StrikeVal->LWidth,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
- disconnect(m_pwidget->cpage->fillColor_, SIGNAL(activated(const
QString&)), this, SLOT(slotFillColor()));
+ disconnect(m_pwidget->cpage->fillColor_,
SIGNAL(currentTextChanged(const QString&)), this, SLOT(slotFillColor()));
disconnect(m_pwidget->cpage->fillShade_, SIGNAL(clicked()), this,
SLOT(slotFillShade()));
- disconnect(m_pwidget->cpage->strokeColor_, SIGNAL(activated(const
QString&)), this, SLOT(slotStrokeColor()));
+ disconnect(m_pwidget->cpage->strokeColor_,
SIGNAL(currentTextChanged(const QString&)), this, SLOT(slotStrokeColor()));
disconnect(m_pwidget->cpage->strokeShade_, SIGNAL(clicked()), this,
SLOT(slotStrokeShade()));
disconnect(m_pwidget->cpage->language_, SIGNAL(activated(int)), this,
SLOT(slotLanguage()));
disconnect(m_pwidget->cpage->fontSize_, SIGNAL(valueChanged(double)),
this, SLOT(slotFontSize()));
@@ -665,8 +665,8 @@
disconnect(m_pwidget->cpage->tracking_, SIGNAL(valueChanged(double)),
this, SLOT(slotTracking()));
disconnect(m_pwidget->cpage->widthSpaceSpin,
SIGNAL(valueChanged(double)), this, SLOT(slotWordTracking()));
disconnect(m_pwidget->cpage->baselineOffset_,
SIGNAL(valueChanged(double)), this, SLOT(slotBaselineOffset()));
- disconnect(m_pwidget->cpage->parentCombo, SIGNAL(activated(const
QString&)), this, SLOT(slotCharParentChanged(const QString&)));
- disconnect(m_pwidget->cpage->backColor_, SIGNAL(activated(const
QString&)), this, SLOT(slotBackColor()));
+ disconnect(m_pwidget->cpage->parentCombo,
SIGNAL(currentTextChanged(const QString&)), this,
SLOT(slotCharParentChanged(const QString&)));
+ disconnect(m_pwidget->cpage->backColor_,
SIGNAL(currentTextChanged(const QString&)), this, SLOT(slotBackColor()));
disconnect(m_pwidget->cpage->backShade_, SIGNAL(clicked()), this,
SLOT(slotBackShade()));
disconnect(m_pwidget->cpage->fontfeaturesSetting, SIGNAL(changed()),
this, SLOT(slotFontFeatures()));
disconnect(m_pwidget->cpage->hyphenCharLineEdit,
SIGNAL(textChanged(QString)), this, SLOT(slotHyphenChar()));
@@ -2280,9 +2280,9 @@
connect(m_page->effects_->UnderlineVal->LWidth,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
connect(m_page->effects_->StrikeVal->LPos,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
connect(m_page->effects_->StrikeVal->LWidth,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
- connect(m_page->fillColor_, SIGNAL(activated(const QString&)), this,
SLOT(slotFillColor()));
+ connect(m_page->fillColor_, SIGNAL(currentTextChanged(const QString&)),
this, SLOT(slotFillColor()));
connect(m_page->fillShade_, SIGNAL(clicked()), this,
SLOT(slotFillShade()));
- connect(m_page->strokeColor_, SIGNAL(activated(const QString&)), this,
SLOT(slotStrokeColor()));
+ connect(m_page->strokeColor_, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotStrokeColor()));
connect(m_page->strokeShade_, SIGNAL(clicked()), this,
SLOT(slotStrokeShade()));
connect(m_page->language_, SIGNAL(activated(int)), this,
SLOT(slotLanguage()));
connect(m_page->fontSize_, SIGNAL(valueChanged(double)), this,
SLOT(slotFontSize()));
@@ -2291,8 +2291,8 @@
connect(m_page->tracking_, SIGNAL(valueChanged(double)), this,
SLOT(slotTracking()));
connect(m_page->widthSpaceSpin, SIGNAL(valueChanged(double)), this,
SLOT(slotWordTracking()));
connect(m_page->baselineOffset_, SIGNAL(valueChanged(double)), this,
SLOT(slotBaselineOffset()));
- connect(m_page->parentCombo, SIGNAL(activated(const QString&)), this,
SLOT(slotParentChanged(const QString&)));
- connect(m_page->backColor_, SIGNAL(activated(const QString&)), this,
SLOT(slotBackColor()));
+ connect(m_page->parentCombo, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotParentChanged(const QString&)));
+ connect(m_page->backColor_, SIGNAL(currentTextChanged(const QString&)),
this, SLOT(slotBackColor()));
connect(m_page->backShade_, SIGNAL(clicked()), this,
SLOT(slotBackShade()));
connect(m_page->fontfeaturesSetting, SIGNAL(changed()), this,
SLOT(slotFontFeatures()));
connect(m_page->smallestWordSpinBox, SIGNAL(valueChanged(int)), this,
SLOT(slotSmallestWord()));
@@ -2313,9 +2313,9 @@
disconnect(m_page->effects_->UnderlineVal->LWidth,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
disconnect(m_page->effects_->StrikeVal->LPos,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
disconnect(m_page->effects_->StrikeVal->LWidth,
SIGNAL(valueChanged(double)), this, SLOT(slotEffectProperties()));
- disconnect(m_page->fillColor_, SIGNAL(activated(const QString&)), this,
SLOT(slotFillColor()));
+ disconnect(m_page->fillColor_, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotFillColor()));
disconnect(m_page->fillShade_, SIGNAL(clicked()), this,
SLOT(slotFillShade()));
- disconnect(m_page->strokeColor_, SIGNAL(activated(const QString&)),
this, SLOT(slotStrokeColor()));
+ disconnect(m_page->strokeColor_, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotStrokeColor()));
disconnect(m_page->strokeShade_, SIGNAL(clicked()), this,
SLOT(slotStrokeShade()));
disconnect(m_page->language_, SIGNAL(activated(int)), this,
SLOT(slotLanguage()));
disconnect(m_page->fontSize_, SIGNAL(valueChanged(double)), this,
SLOT(slotFontSize()));
@@ -2324,8 +2324,8 @@
disconnect(m_page->tracking_, SIGNAL(valueChanged(double)), this,
SLOT(slotTracking()));
disconnect(m_page->widthSpaceSpin, SIGNAL(valueChanged(double)), this,
SLOT(slotWordTracking()));
disconnect(m_page->baselineOffset_, SIGNAL(valueChanged(double)), this,
SLOT(slotBaselineOffset()));
- disconnect(m_page->parentCombo, SIGNAL(activated(const QString&)),
this, SLOT(slotParentChanged(const QString&)));
- disconnect(m_page->backColor_, SIGNAL(activated(const QString&)), this,
SLOT(slotBackColor()));
+ disconnect(m_page->parentCombo, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotParentChanged(const QString&)));
+ disconnect(m_page->backColor_, SIGNAL(currentTextChanged(const
QString&)), this, SLOT(slotBackColor()));
disconnect(m_page->backShade_, SIGNAL(clicked()), this,
SLOT(slotBackShade()));
disconnect(m_page->fontfeaturesSetting, SIGNAL(changed()), this,
SLOT(slotFontFeatures()));
disconnect(m_page->smallestWordSpinBox, SIGNAL(valueChanged(int)),
this, SLOT(slotSmallestWord()));
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
