Fix slots not matching signals with Qt 6

qt.core.qmetaobject.connectslotsbyname: QMetaObject::connectSlotsByName: No matching signal for on_errorLogComboBox_currentIndexChanged(QString) qt.core.qmetaobject.connectslotsbyname: QMetaObject::connectSlotsByName: No matching signal for on_fontChooser_activated(QString) qt.core.qmetaobject.connectslotsbyname: QMetaObject::connectSlotsByName: No matching signal for on_fontSize_currentIndexChanged(QString) qt.core.qmetaobject.connectslotsbyname: QMetaObject::connectSlotsByName: No matching signal for on_syntaxHighlight_activated(QString) qt.core.qmetaobject.connectslotsbyname: QMetaObject::connectSlotsByName: No matching signal for on_consoleFontChooser_activated(QString) qt.core.qmetaobject.connectslotsbyname: QMetaObject::connectSlotsByName: No matching signal for on_consoleFontSize_currentIndexChanged(QString)
openscad · Dec 27, 2023 · 224e81f · 224e81f
1 parent 8b09f9a
commit 224e81f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/gui/ErrorLog.cc b/src/gui/ErrorLog.cc
@@ -113,7 +113,7 @@ int ErrorLog::getLine(int row, int col)
   return logTable->model()->index(row, col).data().toInt();
 }
 
-void ErrorLog::on_errorLogComboBox_currentIndexChanged(const QString& group)
+void ErrorLog::on_errorLogComboBox_currentTextChanged(const QString& group)
 {
   errorLogModel->clear();
   initGUI();

diff --git a/src/gui/ErrorLog.h b/src/gui/ErrorLog.h
@@ -44,7 +44,7 @@ class ErrorLog : public QWidget, public Ui::errorLogWidget
 
 private slots:
   void on_logTable_doubleClicked(const QModelIndex& index);
-  void on_errorLogComboBox_currentIndexChanged(const QString& arg1);
+  void on_errorLogComboBox_currentTextChanged(const QString& arg1);
   void on_actionRowSelected_triggered(bool);
   void onSectionResized(int, int, int);
 };
diff --git a/src/gui/Preferences.cc b/src/gui/Preferences.cc
@@ -356,22 +356,22 @@ void Preferences::on_colorSchemeChooser_itemSelectionChanged()
   emit colorSchemeChanged(scheme);
 }
 
-void Preferences::on_fontChooser_activated(const QString& family)
+void Preferences::on_fontChooser_currentFontChanged(const QFont& font)
 {
   QSettingsCached settings;
-  settings.setValue("editor/fontfamily", family);
-  emit fontChanged(family, getValue("editor/fontsize").toUInt());
+  settings.setValue("editor/fontfamily", font.family());
+  emit fontChanged(font.family(), getValue("editor/fontsize").toUInt());
 }
 
-void Preferences::on_fontSize_currentIndexChanged(const QString& size)
+void Preferences::on_fontSize_currentIndexChanged(int index)
 {
-  uint intsize = size.toUInt();
+  uint intsize = this->fontSize->itemText(index).toUInt();
   QSettingsCached settings;
   settings.setValue("editor/fontsize", intsize);
   emit fontChanged(getValue("editor/fontfamily").toString(), intsize);
 }
 
-void Preferences::on_syntaxHighlight_activated(const QString& s)
+void Preferences::on_syntaxHighlight_currentTextChanged(const QString& s)
 {
   QSettingsCached settings;
   settings.setValue("editor/syntaxhighlight", s);
@@ -639,16 +639,16 @@ void Preferences::on_consoleMaxLinesEdit_textChanged(const QString& text)
   settings.setValue("advanced/consoleMaxLines", text);
 }
 
-void Preferences::on_consoleFontChooser_activated(const QString& family)
+void Preferences::on_consoleFontChooser_currentFontChanged(const QFont& font)
 {
   QSettingsCached settings;
-  settings.setValue("advanced/consoleFontFamily", family);
-  emit consoleFontChanged(family, getValue("advanced/consoleFontSize").toUInt());
+  settings.setValue("advanced/consoleFontFamily", font.family());
+  emit consoleFontChanged(font.family(), getValue("advanced/consoleFontSize").toUInt());
 }
 
-void Preferences::on_consoleFontSize_currentIndexChanged(const QString& size)
-{
-  uint intsize = size.toUInt();
+void Preferences::on_consoleFontSize_currentIndexChanged(int index)
+{ 
+  uint intsize = this->consoleFontSize->itemText(index).toUInt();
   QSettingsCached settings;
   settings.setValue("advanced/consoleFontSize", intsize);
   emit consoleFontChanged(getValue("advanced/consoleFontFamily").toString(), intsize);

diff --git a/src/gui/Preferences.h b/src/gui/Preferences.h
@@ -29,9 +29,9 @@ public slots:
   void featuresCheckBoxToggled(bool);
   void on_stackedWidget_currentChanged(int);
   void on_colorSchemeChooser_itemSelectionChanged();
-  void on_fontChooser_activated(const QString&);
-  void on_fontSize_currentIndexChanged(const QString&);
-  void on_syntaxHighlight_activated(const QString&);
+  void on_fontChooser_currentFontChanged(const QFont&);
+  void on_fontSize_currentIndexChanged(int);
+  void on_syntaxHighlight_currentTextChanged(const QString&);
   void on_openCSGWarningBox_toggled(bool);
   void on_cgalCacheSizeMBEdit_textChanged(const QString&);
   void on_polysetCacheSizeMBEdit_textChanged(const QString&);
@@ -65,8 +65,8 @@ public slots:
   void on_timeThresholdOnRenderCompleteSoundEdit_textChanged(const QString&);
   void on_enableClearConsoleCheckBox_toggled(bool);
   void on_consoleMaxLinesEdit_textChanged(const QString&);
-  void on_consoleFontChooser_activated(const QString&);
-  void on_consoleFontSize_currentIndexChanged(const QString&);
+  void on_consoleFontChooser_currentFontChanged(const QFont&);
+  void on_consoleFontSize_currentIndexChanged(int);
   void on_checkBoxEnableAutocomplete_toggled(bool);
   void on_lineEditCharacterThreshold_textChanged(const QString&);
   //