suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt4/Qt5 neutral changes

Browse Source 
fix interface of slot functions in DlgSettingsEditorImp to avoid warnings with Qt5
This commit is contained in:
wmayer 2017-02-08 12:45:16 +01:00
parent 0a6b382d71
commit 2ab9ef93cd
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Gui/DlgEditorImp.cpp
View File

@ -221,7 +221,7 @@ void DlgSettingsEditorImp::loadSettings()
int index = familyNames.indexOf(QString::fromLatin1(hGrp->GetASCII("Font", "Courier").c_str()));
if (index < 0) index = 0;
fontFamily->setCurrentIndex(index);
on_fontFamily_activated();
on_fontFamily_activated(this->fontFamily->currentText());
displayItems->setCurrentItem(displayItems->topLevelItem(0));
}
@ -241,17 +241,16 @@ void DlgSettingsEditorImp::changeEvent(QEvent *e)
}
}
void DlgSettingsEditorImp::on_fontFamily_activated()
void DlgSettingsEditorImp::on_fontFamily_activated(const QString& fontFamily)
{
const QString& fontFamily = this->fontFamily->currentText();
int fontSize = this->fontSize->value();
QFont ft(fontFamily, fontSize);
textEdit1->setFont(ft);
}
void DlgSettingsEditorImp::on_fontSize_valueChanged()
void DlgSettingsEditorImp::on_fontSize_valueChanged(const QString&)
{
on_fontFamily_activated();
on_fontFamily_activated(this->fontFamily->currentText());
}
#include "moc_DlgEditorImp.cpp"

4
src/Gui/DlgEditorImp.h
View File

@ -52,8 +52,8 @@ public:
protected Q_SLOTS:
void on_displayItems_currentItemChanged(QTreeWidgetItem *i);
void on_colorButton_changed();
void on_fontFamily_activated();
void on_fontSize_valueChanged();
void on_fontFamily_activated(const QString&);
void on_fontSize_valueChanged(const QString&);
protected:
void changeEvent(QEvent *e);