anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace obsoleted signal QComboBox::activated(QString)

Browse Source 
Since Qt 5.14 this signal is named textActivated.
This commit is contained in:
Enrico Forestieri 2021-04-01 21:17:41 +02:00
parent 570cd84ddc
commit 472953dbe1
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/frontends/qt/GuiPrefs.cpp
View File

@ -915,12 +915,21 @@ PrefScreenFonts::PrefScreenFonts(GuiPreferences * form)
{
setupUi(this);
#if QT_VERSION < 0x050e00
connect(screenRomanCO, SIGNAL(activated(QString)),
this, SLOT(selectRoman(QString)));
connect(screenSansCO, SIGNAL(activated(QString)),
this, SLOT(selectSans(QString)));
connect(screenTypewriterCO, SIGNAL(activated(QString)),
this, SLOT(selectTypewriter(QString)));
#else
connect(screenRomanCO, SIGNAL(textActivated(QString)),
this, SLOT(selectRoman(QString)));
connect(screenSansCO, SIGNAL(textActivated(QString)),
this, SLOT(selectSans(QString)));
connect(screenTypewriterCO, SIGNAL(textActivated(QString)),
this, SLOT(selectTypewriter(QString)));
#endif
QFontDatabase fontdb;
QStringList families(fontdb.families());
@ -929,12 +938,21 @@ PrefScreenFonts::PrefScreenFonts(GuiPreferences * form)
screenSansCO->addItem(family);
screenTypewriterCO->addItem(family);
}
#if QT_VERSION < 0x050e00
connect(screenRomanCO, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
connect(screenSansCO, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
connect(screenTypewriterCO, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
#else
connect(screenRomanCO, SIGNAL(textActivated(QString)),
this, SIGNAL(changed()));
connect(screenSansCO, SIGNAL(textActivated(QString)),
this, SIGNAL(changed()));
connect(screenTypewriterCO, SIGNAL(textActivated(QString)),
this, SIGNAL(changed()));
#endif
connect(screenZoomSB, SIGNAL(valueChanged(int)),
this, SIGNAL(changed()));
connect(screenTinyED, SIGNAL(textChanged(QString)),
@ -1641,10 +1659,17 @@ PrefConverters::PrefConverters(GuiPreferences * form)
this, SLOT(updateConverter()));
connect(convertersLW, SIGNAL(currentRowChanged(int)),
this, SLOT(switchConverter()));
#if QT_VERSION < 0x050e00
connect(converterFromCO, SIGNAL(activated(QString)),
this, SLOT(changeConverter()));
connect(converterToCO, SIGNAL(activated(QString)),
this, SLOT(changeConverter()));
#else
connect(converterFromCO, SIGNAL(textActivated(QString)),
this, SLOT(changeConverter()));
connect(converterToCO, SIGNAL(textActivated(QString)),
this, SLOT(changeConverter()));
#endif
connect(converterED, SIGNAL(textEdited(QString)),
this, SLOT(changeConverter()));
connect(converterFlagED, SIGNAL(textEdited(QString)),
@ -2004,12 +2029,21 @@ PrefFileformats::PrefFileformats(GuiPreferences * form)
this, SLOT(updatePrettyname()));
connect(formatsCB->lineEdit(), SIGNAL(textEdited(QString)),
this, SIGNAL(changed()));
#if QT_VERSION < 0x050e00
connect(defaultFormatCB, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
connect(defaultOTFFormatCB, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
connect(defaultPlatexFormatCB, SIGNAL(activated(QString)),
this, SIGNAL(changed()));
#else
connect(defaultFormatCB, SIGNAL(textActivated(QString)),
this, SIGNAL(changed()));
connect(defaultOTFFormatCB, SIGNAL(textActivated(QString)),
this, SIGNAL(changed()));
connect(defaultPlatexFormatCB, SIGNAL(textActivated(QString)),
this, SIGNAL(changed()));
#endif
connect(viewerCO, SIGNAL(activated(int)),
this, SIGNAL(changed()));
connect(editorCO, SIGNAL(activated(int)),