Change to modern signal/slot connections

shaperilio · shaperilio · commit b1dd25ec20de · 2021-10-15T11:37:32.000-07:00
diff --git a/MainDialog.cpp b/MainDialog.cpp
@@ -40,34 +40,35 @@ MainDialog::MainDialog(QWidget *parent) :
     for (int i = 0; i < MAX_BUTTONS; i++)
     {
         imgWindows[i] = nullptr;
-        connect(imgButtons[i], &QPushButton::clicked, this, &MainDialog::slot_btnImage_clicked);
+        connect(imgButtons[i], &QPushButton::clicked, this, &MainDialog::imageButtonClicked);
         resetButton(i);
     }
+
+    connect(ui->btnExit, &QPushButton::clicked, this, &MainDialog::exitApp);
+    connect(ui->btnCloseAll, &QPushButton::clicked, this, &MainDialog::closeAllImageWindows);
+    connect(ui->chkSyncWindows, &QCheckBox::stateChanged, this, &MainDialog::toggleSyncWindows);
 }
 
 MainDialog::~MainDialog()
 {
-    this->on_btnCloseAll_clicked();
+    this->closeAllImageWindows();
 
     delete ui;
 }
 
-void MainDialog::on_btnExit_clicked()
+void MainDialog::exitApp()
 {
     this->close();
 }
 
-void MainDialog::on_btnCloseAll_clicked()
+void MainDialog::closeAllImageWindows()
 {
     for (int i = 0; i < MAX_BUTTONS; i++)
         if (imgWindows[i])
             imgWindows[i]->close();
 }
 
-// Don't start this with "on_" because we connect them manually in the constructor, and
-// Qt will try to connect this automatically just by looking at the name. See
-// https://linux.m2osw.com/qtwarning-qmetaobjectconnectslotsbyname-no-matching-signal-onsomethingevent
-void MainDialog::slot_btnImage_clicked()
+void MainDialog::imageButtonClicked()
 {
     QObject *obj = sender();
     QPushButton *button = static_cast<QPushButton *>(obj);
@@ -84,9 +85,9 @@ void MainDialog::slot_btnImage_clicked()
     }
 }
 
-void MainDialog::on_chkSyncWindows_stateChanged(int arg1)
+void MainDialog::toggleSyncWindows(int arg1)
 {
-    syncWindows = static_cast<bool>(arg1 == 2);
+    syncWindows = arg1 == Qt::CheckState::Checked;
     if (syncWindows)
     {
         for (int i = 0; i < MAX_BUTTONS; i++)
diff --git a/MainDialog.h b/MainDialog.h
@@ -22,11 +22,11 @@ class MainDialog : public QDialog
     void setButtonText(int ID, QString text);
 
 private slots:
-    void on_btnExit_clicked();
-    void on_btnCloseAll_clicked();
-    void slot_btnImage_clicked();
+    void exitApp();
+    void closeAllImageWindows();
+    void imageButtonClicked();
 
-    void on_chkSyncWindows_stateChanged(int arg1);
+    void toggleSyncWindows(int arg1);
 
     void wheelEventInImageWindow(QWheelEvent *event, int windowID);
     void mousePressEventInImageWindow(QMouseEvent *event, int windowID);

Original file line number	Diff line number	Diff line change
`@@ -40,34 +40,35 @@ MainDialog::MainDialog(QWidget *parent) :`
`40`	`40`	`for (int i = 0; i < MAX_BUTTONS; i++)`
`41`	`41`	`{`
`42`	`42`	`imgWindows[i] = nullptr;`
`43`		`- connect(imgButtons[i], &QPushButton::clicked, this, &MainDialog::slot_btnImage_clicked);`
	`43`	`+ connect(imgButtons[i], &QPushButton::clicked, this, &MainDialog::imageButtonClicked);`
`44`	`44`	`resetButton(i);`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ connect(ui->btnExit, &QPushButton::clicked, this, &MainDialog::exitApp);`
	`48`	`+ connect(ui->btnCloseAll, &QPushButton::clicked, this, &MainDialog::closeAllImageWindows);`
	`49`	`+ connect(ui->chkSyncWindows, &QCheckBox::stateChanged, this, &MainDialog::toggleSyncWindows);`
`46`	`50`	`}`
`47`	`51`
`48`	`52`	`MainDialog::~MainDialog()`
`49`	`53`	`{`
`50`		`- this->on_btnCloseAll_clicked();`
	`54`	`+ this->closeAllImageWindows();`
`51`	`55`
`52`	`56`	`delete ui;`
`53`	`57`	`}`
`54`	`58`
`55`		`-void MainDialog::on_btnExit_clicked()`
	`59`	`+void MainDialog::exitApp()`
`56`	`60`	`{`
`57`	`61`	`this->close();`
`58`	`62`	`}`
`59`	`63`
`60`		`-void MainDialog::on_btnCloseAll_clicked()`
	`64`	`+void MainDialog::closeAllImageWindows()`
`61`	`65`	`{`
`62`	`66`	`for (int i = 0; i < MAX_BUTTONS; i++)`
`63`	`67`	`if (imgWindows[i])`
`64`	`68`	`imgWindows[i]->close();`
`65`	`69`	`}`
`66`	`70`
`67`		`-// Don't start this with "on_" because we connect them manually in the constructor, and`
`68`		`-// Qt will try to connect this automatically just by looking at the name. See`
`69`		`-// https://linux.m2osw.com/qtwarning-qmetaobjectconnectslotsbyname-no-matching-signal-onsomethingevent`
`70`		`-void MainDialog::slot_btnImage_clicked()`
	`71`	`+void MainDialog::imageButtonClicked()`
`71`	`72`	`{`
`72`	`73`	`QObject *obj = sender();`
`73`	`74`	`QPushButton button = static_cast<QPushButton >(obj);`
`@@ -84,9 +85,9 @@ void MainDialog::slot_btnImage_clicked()`
`84`	`85`	`}`
`85`	`86`	`}`
`86`	`87`
`87`		`-void MainDialog::on_chkSyncWindows_stateChanged(int arg1)`
	`88`	`+void MainDialog::toggleSyncWindows(int arg1)`
`88`	`89`	`{`
`89`		`- syncWindows = static_cast<bool>(arg1 == 2);`
	`90`	`+ syncWindows = arg1 == Qt::CheckState::Checked;`
`90`	`91`	`if (syncWindows)`
`91`	`92`	`{`
`92`	`93`	`for (int i = 0; i < MAX_BUTTONS; i++)`