Qt Designer: Fix clazy/Axivion warnings about QMetaObject::connectSlotsByName()

Migrate to Qt 5 connection syntax.

Also rename the slots for which explicit connections were already
added by qttools/f23befda718870f3dbb8f6e005e12a251fdfd059 for the
TableWidgetEditor/TreeWidgetEditor classes so that they are no longer
found.

Pick-to: 6.6 6.5
Change-Id: I9b6316c65f714e2a2117196e92d7517641648d95
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

16 files changed, 193 insertions, 138 deletions

diff --git a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
index 404540911..6ac1638bc 100644
--- a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
+++ b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
@@ -22,6 +22,8 @@ NewDynamicPropertyDialog::NewDynamicPropertyDialog(QDesignerDialogGuiInterface *
 {
     m_ui->setupUi(this);
     connect(m_ui->m_lineEdit, &QLineEdit::textChanged, this, &NewDynamicPropertyDialog::nameChanged);
+    connect(m_ui->m_buttonBox, &QDialogButtonBox::clicked,
+            this, &NewDynamicPropertyDialog::buttonBoxClicked);
 
     m_ui->m_comboBox->addItem(u"String"_s,
                               QVariant(QMetaType(QMetaType::QString)));
@@ -142,7 +144,7 @@ bool NewDynamicPropertyDialog::validatePropertyName(const QString& name)
     return true;
 }
 
-void NewDynamicPropertyDialog::on_m_buttonBox_clicked(QAbstractButton *btn)
+void NewDynamicPropertyDialog::buttonBoxClicked(QAbstractButton *btn)
 {
     const int role = m_ui->m_buttonBox->buttonRole(btn);
     switch (role) {
diff --git a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.h b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.h
index 5aae95689..0142e4482 100644
--- a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.h
+++ b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.h
@@ -46,7 +46,7 @@ public:
 
 private slots:
 
-    void on_m_buttonBox_clicked(QAbstractButton *btn);
+    void buttonBoxClicked(QAbstractButton *btn);
     void nameChanged(const QString &);
 
 private:
diff --git a/src/designer/src/components/propertyeditor/paletteeditor.cpp b/src/designer/src/components/propertyeditor/paletteeditor.cpp
index b073bc0ba..5a46bca01 100644
--- a/src/designer/src/components/propertyeditor/paletteeditor.cpp
+++ b/src/designer/src/components/propertyeditor/paletteeditor.cpp
@@ -53,6 +53,19 @@ PaletteEditor::PaletteEditor(QDesignerFormEditorInterface *core, QWidget *parent
     auto loadButton = ui.buttonBox->addButton(tr("Load..."), QDialogButtonBox::ActionRole);
     connect(loadButton, &QPushButton::clicked, this, &PaletteEditor::load);
 
+    connect(ui.buildButton, &QtColorButton::colorChanged,
+            this, &PaletteEditor::buildButtonColorChanged);
+    connect(ui.activeRadio, &QAbstractButton::clicked,
+            this, &PaletteEditor::activeRadioClicked);
+    connect(ui.inactiveRadio,  &QAbstractButton::clicked,
+            this, &PaletteEditor::inactiveRadioClicked);
+    connect(ui.disabledRadio, &QAbstractButton::clicked,
+            this, &PaletteEditor::disabledRadioClicked);
+    connect(ui.computeRadio, &QAbstractButton::clicked,
+            this, &PaletteEditor::computeRadioClicked);
+    connect(ui.detailsRadio, &QAbstractButton::clicked,
+            this, &PaletteEditor::detailsRadioClicked);
+
     ui.paletteView->setModel(m_paletteModel);
     updatePreviewPalette();
     updateStyledButton();
@@ -111,30 +124,30 @@ void PaletteEditor::setPalette(const QPalette &palette, const QPalette &parentPa
     setPalette(palette);
 }
 
-void PaletteEditor::on_buildButton_colorChanged(const QColor &)
+void PaletteEditor::buildButtonColorChanged()
 {
     buildPalette();
 }
 
-void PaletteEditor::on_activeRadio_clicked()
+void PaletteEditor::activeRadioClicked()
 {
     m_currentColorGroup = QPalette::Active;
     updatePreviewPalette();
 }
 
-void PaletteEditor::on_inactiveRadio_clicked()
+void PaletteEditor::inactiveRadioClicked()
 {
     m_currentColorGroup = QPalette::Inactive;
     updatePreviewPalette();
 }
 
-void PaletteEditor::on_disabledRadio_clicked()
+void PaletteEditor::disabledRadioClicked()
 {
     m_currentColorGroup = QPalette::Disabled;
     updatePreviewPalette();
 }
 
-void PaletteEditor::on_computeRadio_clicked()
+void PaletteEditor::computeRadioClicked()
 {
     if (m_compute)
         return;
@@ -144,7 +157,7 @@ void PaletteEditor::on_computeRadio_clicked()
     m_paletteModel->setCompute(true);
 }
 
-void PaletteEditor::on_detailsRadio_clicked()
+void PaletteEditor::detailsRadioClicked()
 {
     if (!m_compute)
         return;
diff --git a/src/designer/src/components/propertyeditor/paletteeditor.h b/src/designer/src/components/propertyeditor/paletteeditor.h
index 5fadf5f85..2f29bfd76 100644
--- a/src/designer/src/components/propertyeditor/paletteeditor.h
+++ b/src/designer/src/components/propertyeditor/paletteeditor.h
@@ -34,12 +34,12 @@ public:
 
 private slots:
 
-    void on_buildButton_colorChanged(const QColor &);
-    void on_activeRadio_clicked();
-    void on_inactiveRadio_clicked();
-    void on_disabledRadio_clicked();
-    void on_computeRadio_clicked();
-    void on_detailsRadio_clicked();
+    void buildButtonColorChanged();
+    void activeRadioClicked();
+    void inactiveRadioClicked();
+    void disabledRadioClicked();
+    void computeRadioClicked();
+    void detailsRadioClicked();
 
     void paletteChanged(const QPalette &palette);
     void viewContextMenuRequested(const QPoint &pos);
diff --git a/src/designer/src/components/propertyeditor/stringlisteditor.cpp b/src/designer/src/components/propertyeditor/stringlisteditor.cpp
index dc99e758c..82f9cc2cd 100644
--- a/src/designer/src/components/propertyeditor/stringlisteditor.cpp
+++ b/src/designer/src/components/propertyeditor/stringlisteditor.cpp
@@ -24,6 +24,12 @@ StringListEditor::StringListEditor(QWidget *parent)
             &QAbstractItemDelegate::closeEditor,
             this, &StringListEditor::currentValueChanged);
 
+    connect(upButton, &QAbstractButton::clicked, this, &StringListEditor::upButtonClicked);
+    connect(downButton, &QAbstractButton::clicked, this, &StringListEditor::downButtonClicked);
+    connect(newButton, &QAbstractButton::clicked, this, &StringListEditor::newButtonClicked);
+    connect(deleteButton, &QAbstractButton::clicked, this, &StringListEditor::deleteButtonClicked);
+    connect(valueEdit, &QLineEdit::textEdited, this, &StringListEditor::valueEdited);
+
     QIcon upIcon = createIconSet(u"up.png"_s);
     QIcon downIcon = createIconSet(u"down.png"_s);
     QIcon minusIcon = createIconSet(u"minus.png"_s);
@@ -72,7 +78,7 @@ void StringListEditor::currentValueChanged()
     updateUi();
 }
 
-void StringListEditor::on_upButton_clicked()
+void StringListEditor::upButtonClicked()
 {
     int from = currentIndex();
     int to = currentIndex() - 1;
@@ -83,7 +89,7 @@ void StringListEditor::on_upButton_clicked()
     updateUi();
 }
 
-void StringListEditor::on_downButton_clicked()
+void StringListEditor::downButtonClicked()
 {
     int from = currentIndex();
     int to = currentIndex() + 1;
@@ -94,7 +100,7 @@ void StringListEditor::on_downButton_clicked()
     updateUi();
 }
 
-void StringListEditor::on_newButton_clicked()
+void StringListEditor::newButtonClicked()
 {
     int to = currentIndex();
     if (to == -1)
@@ -106,14 +112,14 @@ void StringListEditor::on_newButton_clicked()
     editString(to);
 }
 
-void StringListEditor::on_deleteButton_clicked()
+void StringListEditor::deleteButtonClicked()
 {
     removeString(currentIndex());
     setCurrentIndex(currentIndex());
     updateUi();
 }
 
-void StringListEditor::on_valueEdit_textEdited(const QString &text)
+void StringListEditor::valueEdited(const QString &text)
 {
     setStringAt(currentIndex(), text);
 }
diff --git a/src/designer/src/components/propertyeditor/stringlisteditor.h b/src/designer/src/components/propertyeditor/stringlisteditor.h
index d18a6d2f6..a64250fcc 100644
--- a/src/designer/src/components/propertyeditor/stringlisteditor.h
+++ b/src/designer/src/components/propertyeditor/stringlisteditor.h
@@ -24,11 +24,11 @@ public:
         QWidget *parent, const QStringList &init = QStringList(), int *result = nullptr);
 
 private slots:
-    void on_upButton_clicked();
-    void on_downButton_clicked();
-    void on_newButton_clicked();
-    void on_deleteButton_clicked();
-    void on_valueEdit_textEdited(const QString &text);
+    void upButtonClicked();
+    void downButtonClicked();
+    void newButtonClicked();
+    void deleteButtonClicked();
+    void valueEdited(const QString &text);
     void currentIndexChanged(const QModelIndex &current, const QModelIndex &previous);
     void currentValueChanged();
 
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.cpp b/src/designer/src/components/taskmenu/itemlisteditor.cpp
index 20dd0b919..f24af1fc8 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.cpp
+++ b/src/designer/src/components/taskmenu/itemlisteditor.cpp
@@ -271,6 +271,20 @@ ItemListEditor::ItemListEditor(QDesignerFormWindowInterface *form, QWidget *pare
     injectPropertyBrowser(this, ui.widget);
     connect(ui.showPropertiesButton, &QAbstractButton::clicked,
             this, &ItemListEditor::togglePropertyBrowser);
+
+    connect(ui.newListItemButton, &QAbstractButton::clicked,
+            this, &ItemListEditor::newListItemButtonClicked);
+    connect(ui.deleteListItemButton, &QAbstractButton::clicked,
+            this, &ItemListEditor::deleteListItemButtonClicked);
+    connect(ui.moveListItemUpButton, &QAbstractButton::clicked,
+            this, &ItemListEditor::moveListItemUpButtonClicked);
+    connect(ui.moveListItemDownButton, &QAbstractButton::clicked,
+            this, &ItemListEditor::moveListItemDownButtonClicked);
+    connect(ui.listWidget, &QListWidget::currentRowChanged,
+            this, &ItemListEditor::listWidgetCurrentRowChanged);
+    connect(ui.listWidget, &QListWidget::itemChanged,
+            this, &ItemListEditor::listWidgetItemChanged);
+
     setPropertyBrowserVisible(false);
 
     QIcon upIcon = createIconSet(u"up.png"_s);
@@ -304,7 +318,7 @@ void ItemListEditor::setCurrentIndex(int idx)
     m_updating = false;
 }
 
-void ItemListEditor::on_newListItemButton_clicked()
+void ItemListEditor::newListItemButtonClicked()
 {
     int row = ui.listWidget->currentRow() + 1;
 
@@ -323,7 +337,7 @@ void ItemListEditor::on_newListItemButton_clicked()
     ui.listWidget->editItem(item);
 }
 
-void ItemListEditor::on_deleteListItemButton_clicked()
+void ItemListEditor::deleteListItemButtonClicked()
 {
     int row = ui.listWidget->currentRow();
 
@@ -340,7 +354,7 @@ void ItemListEditor::on_deleteListItemButton_clicked()
         ui.listWidget->setCurrentRow(row);
 }
 
-void ItemListEditor::on_moveListItemUpButton_clicked()
+void ItemListEditor::moveListItemUpButtonClicked()
 {
     int row = ui.listWidget->currentRow();
     if (row <= 0)
@@ -351,7 +365,7 @@ void ItemListEditor::on_moveListItemUpButton_clicked()
     emit itemMovedUp(row);
 }
 
-void ItemListEditor::on_moveListItemDownButton_clicked()
+void ItemListEditor::moveListItemDownButtonClicked()
 {
     int row = ui.listWidget->currentRow();
     if (row == -1 || row == ui.listWidget->count() - 1)
@@ -362,14 +376,14 @@ void ItemListEditor::on_moveListItemDownButton_clicked()
     emit itemMovedDown(row);
 }
 
-void ItemListEditor::on_listWidget_currentRowChanged()
+void ItemListEditor::listWidgetCurrentRowChanged()
 {
     updateEditor();
     if (!m_updating)
         emit indexChanged(ui.listWidget->currentRow());
 }
 
-void ItemListEditor::on_listWidget_itemChanged(QListWidgetItem *item)
+void ItemListEditor::listWidgetItemChanged(QListWidgetItem *item)
 {
     if (m_updatingBrowser)
         return;
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.h b/src/designer/src/components/taskmenu/itemlisteditor.h
index 0517cd729..084a32947 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.h
+++ b/src/designer/src/components/taskmenu/itemlisteditor.h
@@ -110,12 +110,12 @@ signals:
     void itemMovedDown(int idx);
 
 private slots:
-    void on_newListItemButton_clicked();
-    void on_deleteListItemButton_clicked();
-    void on_moveListItemUpButton_clicked();
-    void on_moveListItemDownButton_clicked();
-    void on_listWidget_currentRowChanged();
-    void on_listWidget_itemChanged(QListWidgetItem * item);
+    void newListItemButtonClicked();
+    void deleteListItemButtonClicked();
+    void moveListItemUpButtonClicked();
+    void moveListItemDownButtonClicked();
+    void listWidgetCurrentRowChanged();
+    void listWidgetItemChanged(QListWidgetItem * item);
     void togglePropertyBrowser();
     void cacheReloaded();
 
diff --git a/src/designer/src/components/taskmenu/tablewidgeteditor.cpp b/src/designer/src/components/taskmenu/tablewidgeteditor.cpp
index 7c5ca1f5b..725db1151 100644
--- a/src/designer/src/components/taskmenu/tablewidgeteditor.cpp
+++ b/src/designer/src/components/taskmenu/tablewidgeteditor.cpp
@@ -49,34 +49,34 @@ TableWidgetEditor::TableWidgetEditor(QDesignerFormWindowInterface *form, QDialog
     connect(iconCache(), &DesignerIconCache::reloaded, this, &TableWidgetEditor::cacheReloaded);
 
     connect(ui.tableWidget, &QTableWidget::currentCellChanged,
-            this, &TableWidgetEditor::on_tableWidget_currentCellChanged);
+            this, &TableWidgetEditor::tableWidgetCurrentCellChanged);
     connect(ui.tableWidget, &QTableWidget::itemChanged,
-            this, &TableWidgetEditor::on_tableWidget_itemChanged);
+            this, &TableWidgetEditor::tableWidgetItemChanged);
     connect(m_columnEditor, &ItemListEditor::indexChanged,
-            this, &TableWidgetEditor::on_columnEditor_indexChanged);
+            this, &TableWidgetEditor::columnEditorIndexChanged);
     connect(m_columnEditor, &ItemListEditor::itemChanged,
-            this, &TableWidgetEditor::on_columnEditor_itemChanged);
+            this, &TableWidgetEditor::columnEditorItemChanged);
     connect(m_columnEditor, &ItemListEditor::itemInserted,
-            this, &TableWidgetEditor::on_columnEditor_itemInserted);
+            this, &TableWidgetEditor::columnEditorItemInserted);
     connect(m_columnEditor, &ItemListEditor::itemDeleted,
-            this, &TableWidgetEditor::on_columnEditor_itemDeleted);
+            this, &TableWidgetEditor::columnEditorItemDeleted);
     connect(m_columnEditor, &ItemListEditor::itemMovedUp,
-            this, &TableWidgetEditor::on_columnEditor_itemMovedUp);
+            this, &TableWidgetEditor::columnEditorItemMovedUp);
     connect(m_columnEditor, &ItemListEditor::itemMovedDown,
-            this, &TableWidgetEditor::on_columnEditor_itemMovedDown);
+            this, &TableWidgetEditor::columnEditorItemMovedDown);
 
     connect(m_rowEditor, &ItemListEditor::indexChanged,
-            this, &TableWidgetEditor::on_rowEditor_indexChanged);
+            this, &TableWidgetEditor::rowEditorIndexChanged);
     connect(m_rowEditor, &ItemListEditor::itemChanged,
-            this, &TableWidgetEditor::on_rowEditor_itemChanged);
+            this, &TableWidgetEditor::rowEditorItemChanged);
     connect(m_rowEditor, &ItemListEditor::itemInserted,
-            this, &TableWidgetEditor::on_rowEditor_itemInserted);
+            this, &TableWidgetEditor::rowEditorItemInserted);
     connect(m_rowEditor, &ItemListEditor::itemDeleted,
-            this, &TableWidgetEditor::on_rowEditor_itemDeleted);
+            this, &TableWidgetEditor::rowEditorItemDeleted);
     connect(m_rowEditor, &ItemListEditor::itemMovedUp,
-            this, &TableWidgetEditor::on_rowEditor_itemMovedUp);
+            this, &TableWidgetEditor::rowEditorItemMovedUp);
     connect(m_rowEditor, &ItemListEditor::itemMovedDown,
-            this, &TableWidgetEditor::on_rowEditor_itemMovedDown);
+            this, &TableWidgetEditor::rowEditorItemMovedDown);
 }
 
 static AbstractItemEditor::PropertyDefinition tableHeaderPropList[] = {
@@ -175,14 +175,14 @@ int TableWidgetEditor::defaultItemFlags() const
     return flags;
 }
 
-void TableWidgetEditor::on_tableWidget_currentCellChanged(int currentRow, int currentCol, int, int /* XXX remove me */)
+void TableWidgetEditor::tableWidgetCurrentCellChanged(int currentRow, int currentCol)
 {
     m_rowEditor->setCurrentIndex(currentRow);
     m_columnEditor->setCurrentIndex(currentCol);
     updateBrowser();
 }
 
-void TableWidgetEditor::on_tableWidget_itemChanged(QTableWidgetItem *item)
+void TableWidgetEditor::tableWidgetItemChanged(QTableWidgetItem *item)
 {
     if (m_updatingBrowser)
         return;
@@ -195,22 +195,22 @@ void TableWidgetEditor::on_tableWidget_itemChanged(QTableWidgetItem *item)
     updateBrowser();
 }
 
-void TableWidgetEditor::on_columnEditor_indexChanged(int col)
+void TableWidgetEditor::columnEditorIndexChanged(int col)
 {
     ui.tableWidget->setCurrentCell(ui.tableWidget->currentRow(), col);
 }
 
-void TableWidgetEditor::on_columnEditor_itemChanged(int idx, int role, const QVariant &v)
+void TableWidgetEditor::columnEditorItemChanged(int idx, int role, const QVariant &v)
 {
     ui.tableWidget->horizontalHeaderItem(idx)->setData(role, v);
 }
 
-void TableWidgetEditor::on_rowEditor_indexChanged(int col)
+void TableWidgetEditor::rowEditorIndexChanged(int col)
 {
     ui.tableWidget->setCurrentCell(col, ui.tableWidget->currentColumn());
 }
 
-void TableWidgetEditor::on_rowEditor_itemChanged(int idx, int role, const QVariant &v)
+void TableWidgetEditor::rowEditorItemChanged(int idx, int role, const QVariant &v)
 {
     ui.tableWidget->verticalHeaderItem(idx)->setData(role, v);
 }
@@ -318,7 +318,7 @@ void TableWidgetEditor::moveRowsUp(int fromRow, int toRow)
     }
 }
 
-void TableWidgetEditor::on_columnEditor_itemInserted(int idx)
+void TableWidgetEditor::columnEditorItemInserted(int idx)
 {
     const int columnCount = ui.tableWidget->columnCount();
     ui.tableWidget->setColumnCount(columnCount + 1);
@@ -336,7 +336,7 @@ void TableWidgetEditor::on_columnEditor_itemInserted(int idx)
     updateEditor();
 }
 
-void TableWidgetEditor::on_columnEditor_itemDeleted(int idx)
+void TableWidgetEditor::columnEditorItemDeleted(int idx)
 {
     const int columnCount = ui.tableWidget->columnCount();
 
@@ -346,21 +346,21 @@ void TableWidgetEditor::on_columnEditor_itemDeleted(int idx)
     updateEditor();
 }
 
-void TableWidgetEditor::on_columnEditor_itemMovedUp(int idx)
+void TableWidgetEditor::columnEditorItemMovedUp(int idx)
 {
     moveColumnsRight(idx - 1, idx);
 
     ui.tableWidget->setCurrentCell(ui.tableWidget->currentRow(), idx - 1);
 }
 
-void TableWidgetEditor::on_columnEditor_itemMovedDown(int idx)
+void TableWidgetEditor::columnEditorItemMovedDown(int idx)
 {
     moveColumnsLeft(idx, idx + 1);
 
     ui.tableWidget->setCurrentCell(ui.tableWidget->currentRow(), idx + 1);
 }
 
-void TableWidgetEditor::on_rowEditor_itemInserted(int idx)
+void TableWidgetEditor::rowEditorItemInserted(int idx)
 {
     const int rowCount = ui.tableWidget->rowCount();
     ui.tableWidget->setRowCount(rowCount + 1);
@@ -378,7 +378,7 @@ void TableWidgetEditor::on_rowEditor_itemInserted(int idx)
     updateEditor();
 }
 
-void TableWidgetEditor::on_rowEditor_itemDeleted(int idx)
+void TableWidgetEditor::rowEditorItemDeleted(int idx)
 {
     const int rowCount = ui.tableWidget->rowCount();
 
@@ -388,14 +388,14 @@ void TableWidgetEditor::on_rowEditor_itemDeleted(int idx)
     updateEditor();
 }
 
-void TableWidgetEditor::on_rowEditor_itemMovedUp(int idx)
+void TableWidgetEditor::rowEditorItemMovedUp(int idx)
 {
     moveRowsUp(idx - 1, idx);
 
     ui.tableWidget->setCurrentCell(idx - 1, ui.tableWidget->currentColumn());
 }
 
-void TableWidgetEditor::on_rowEditor_itemMovedDown(int idx)
+void TableWidgetEditor::rowEditorItemMovedDown(int idx)
 {
     moveRowsDown(idx, idx + 1);
 
diff --git a/src/designer/src/components/taskmenu/tablewidgeteditor.h b/src/designer/src/components/taskmenu/tablewidgeteditor.h
index 5749999ac..defc05f3c 100644
--- a/src/designer/src/components/taskmenu/tablewidgeteditor.h
+++ b/src/designer/src/components/taskmenu/tablewidgeteditor.h
@@ -31,24 +31,24 @@ public:
 
 private slots:
 
-    void on_tableWidget_currentCellChanged(int currentRow, int currentCol, int, int);
-    void on_tableWidget_itemChanged(QTableWidgetItem *item);
+    void tableWidgetCurrentCellChanged(int currentRow, int currentCol);
+    void tableWidgetItemChanged(QTableWidgetItem *item);
 
-    void on_columnEditor_indexChanged(int idx);
-    void on_columnEditor_itemChanged(int idx, int role, const QVariant &v);
+    void columnEditorIndexChanged(int idx);
+    void columnEditorItemChanged(int idx, int role, const QVariant &v);
 
-    void on_columnEditor_itemInserted(int idx);
-    void on_columnEditor_itemDeleted(int idx);
-    void on_columnEditor_itemMovedUp(int idx);
-    void on_columnEditor_itemMovedDown(int idx);
+    void columnEditorItemInserted(int idx);
+    void columnEditorItemDeleted(int idx);
+    void columnEditorItemMovedUp(int idx);
+    void columnEditorItemMovedDown(int idx);
 
-    void on_rowEditor_indexChanged(int idx);
-    void on_rowEditor_itemChanged(int idx, int role, const QVariant &v);
+    void rowEditorIndexChanged(int idx);
+    void rowEditorItemChanged(int idx, int role, const QVariant &v);
 
-    void on_rowEditor_itemInserted(int idx);
-    void on_rowEditor_itemDeleted(int idx);
-    void on_rowEditor_itemMovedUp(int idx);
-    void on_rowEditor_itemMovedDown(int idx);
+    void rowEditorItemInserted(int idx);
+    void rowEditorItemDeleted(int idx);
+    void rowEditorItemMovedUp(int idx);
+    void rowEditorItemMovedDown(int idx);
 
     void togglePropertyBrowser();
 
diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.cpp b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
index 844a1da20..ca88362dd 100644
--- a/src/designer/src/components/taskmenu/treewidgeteditor.cpp
+++ b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
@@ -50,30 +50,37 @@ TreeWidgetEditor::TreeWidgetEditor(QDesignerFormWindowInterface *form, QDialog *
 
     ui.treeWidget->header()->setSectionsMovable(false);
 
-    connect(ui.newItemButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_newItemButton_clicked);
-    connect(ui.newSubItemButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_newSubItemButton_clicked);
-    connect(ui.moveItemUpButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_moveItemUpButton_clicked);
-    connect(ui.moveItemDownButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_moveItemDownButton_clicked);
-    connect(ui.moveItemRightButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_moveItemRightButton_clicked);
-    connect(ui.moveItemLeftButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_moveItemLeftButton_clicked);
-    connect(ui.deleteItemButton, &QAbstractButton::clicked, this, &TreeWidgetEditor::on_deleteItemButton_clicked);
+    connect(ui.newItemButton, &QAbstractButton::clicked,
+            this, &TreeWidgetEditor::newItemButtonClicked);
+    connect(ui.newSubItemButton, &QAbstractButton::clicked,
+            this, &TreeWidgetEditor::newSubItemButtonClicked);
+    connect(ui.moveItemUpButton, &QAbstractButton::clicked,
+            this, &TreeWidgetEditor::moveItemUpButtonClicked);
+    connect(ui.moveItemDownButton, &QAbstractButton::clicked,
+            this, &TreeWidgetEditor::moveItemDownButtonClicked);
+    connect(ui.moveItemRightButton, &QAbstractButton::clicked,
+            this, &TreeWidgetEditor::moveItemRightButtonClicked);
+    connect(ui.moveItemLeftButton, &QAbstractButton::clicked,
+            this, &TreeWidgetEditor::moveItemLeftButtonClicked);
+    connect(ui.deleteItemButton, &QAbstractButton::clicked,
+            this, &TreeWidgetEditor::deleteItemButtonClicked);
     connect(ui.treeWidget, &QTreeWidget::currentItemChanged,
-            this, &TreeWidgetEditor::on_treeWidget_currentItemChanged);
+            this, &TreeWidgetEditor::treeWidgetCurrentItemChanged);
     connect(ui.treeWidget, &QTreeWidget::itemChanged,
-            this, &TreeWidgetEditor::on_treeWidget_itemChanged);
+            this, &TreeWidgetEditor::treeWidgetItemChanged);
 
     connect(m_columnEditor, &ItemListEditor::indexChanged,
-            this, &TreeWidgetEditor::on_columnEditor_indexChanged);
+            this, &TreeWidgetEditor::columnEditorIndexChanged);
     connect(m_columnEditor, &ItemListEditor::itemChanged,
-            this, &TreeWidgetEditor::on_columnEditor_itemChanged);
+            this, &TreeWidgetEditor::columnEditorItemChanged);
     connect(m_columnEditor, &ItemListEditor::itemInserted,
-            this, &TreeWidgetEditor::on_columnEditor_itemInserted);
+            this, &TreeWidgetEditor::columnEditorItemInserted);
     connect(m_columnEditor, &ItemListEditor::itemDeleted,
-            this, &TreeWidgetEditor::on_columnEditor_itemDeleted);
+            this, &TreeWidgetEditor::columnEditorItemDeleted);
     connect(m_columnEditor, &ItemListEditor::itemMovedUp,
-            this, &TreeWidgetEditor::on_columnEditor_itemMovedUp);
+            this, &TreeWidgetEditor::columnEditorItemMovedUp);
     connect(m_columnEditor, &ItemListEditor::itemMovedDown,
-            this, &TreeWidgetEditor::on_columnEditor_itemMovedDown);
+            this, &TreeWidgetEditor::columnEditorItemMovedDown);
 
     connect(iconCache(), &DesignerIconCache::reloaded, this, &TreeWidgetEditor::cacheReloaded);
 }
@@ -178,7 +185,7 @@ int TreeWidgetEditor::defaultItemFlags() const
     return flags;
 }
 
-void TreeWidgetEditor::on_newItemButton_clicked()
+void TreeWidgetEditor::newItemButtonClicked()
 {
     QTreeWidgetItem *curItem = ui.treeWidget->currentItem();
     QTreeWidgetItem *newItem = nullptr;
@@ -201,7 +208,7 @@ void TreeWidgetEditor::on_newItemButton_clicked()
     ui.treeWidget->editItem(newItem, ui.treeWidget->currentColumn());
 }
 
-void TreeWidgetEditor::on_newSubItemButton_clicked()
+void TreeWidgetEditor::newSubItemButtonClicked()
 {
     QTreeWidgetItem *curItem = ui.treeWidget->currentItem();
     if (!curItem)
@@ -220,7 +227,7 @@ void TreeWidgetEditor::on_newSubItemButton_clicked()
     ui.treeWidget->editItem(newItem, ui.treeWidget->currentColumn());
 }
 
-void TreeWidgetEditor::on_deleteItemButton_clicked()
+void TreeWidgetEditor::deleteItemButtonClicked()
 {
     QTreeWidgetItem *curItem = ui.treeWidget->currentItem();
     if (!curItem)
@@ -256,7 +263,7 @@ void TreeWidgetEditor::on_deleteItemButton_clicked()
     updateEditor();
 }
 
-void TreeWidgetEditor::on_moveItemUpButton_clicked()
+void TreeWidgetEditor::moveItemUpButtonClicked()
 {
     QTreeWidgetItem *curItem = ui.treeWidget->currentItem();
     if (!curItem)
@@ -286,7 +293,7 @@ void TreeWidgetEditor::on_moveItemUpButton_clicked()
     updateEditor();
 }
 
-void TreeWidgetEditor::on_moveItemDownButton_clicked()
+void TreeWidgetEditor::moveItemDownButtonClicked()
 {
     QTreeWidgetItem *curItem = ui.treeWidget->currentItem();
     if (!curItem)
@@ -319,7 +326,7 @@ void TreeWidgetEditor::on_moveItemDownButton_clicked()
     updateEditor();
 }
 
-void TreeWidgetEditor::on_moveItemLeftButton_clicked()
+void TreeWidgetEditor::moveItemLeftButtonClicked()
 {
     QTreeWidgetItem *curItem = ui.treeWidget->currentItem();
     if (!curItem)
@@ -344,7 +351,7 @@ void TreeWidgetEditor::on_moveItemLeftButton_clicked()
     updateEditor();
 }
 
-void TreeWidgetEditor::on_moveItemRightButton_clicked()
+void TreeWidgetEditor::moveItemRightButtonClicked()
 {
     QTreeWidgetItem *curItem = ui.treeWidget->currentItem();
     if (!curItem)
@@ -389,13 +396,13 @@ void TreeWidgetEditor::setPropertyBrowserVisible(bool v)
     m_propertyBrowser->setVisible(v);
 }
 
-void TreeWidgetEditor::on_treeWidget_currentItemChanged()
+void TreeWidgetEditor::treeWidgetCurrentItemChanged()
 {
     m_columnEditor->setCurrentIndex(ui.treeWidget->currentColumn());
     updateEditor();
 }
 
-void TreeWidgetEditor::on_treeWidget_itemChanged(QTreeWidgetItem *item, int column)
+void TreeWidgetEditor::treeWidgetItemChanged(QTreeWidgetItem *item, int column)
 {
     if (m_updatingBrowser)
         return;
@@ -408,13 +415,13 @@ void TreeWidgetEditor::on_treeWidget_itemChanged(QTreeWidgetItem *item, int colu
     updateBrowser();
 }
 
-void TreeWidgetEditor::on_columnEditor_indexChanged(int idx)
+void TreeWidgetEditor::columnEditorIndexChanged(int idx)
 {
     if (QTreeWidgetItem *item = ui.treeWidget->currentItem())
         ui.treeWidget->setCurrentItem(item, idx);
 }
 
-void TreeWidgetEditor::on_columnEditor_itemChanged(int idx, int role, const QVariant &v)
+void TreeWidgetEditor::columnEditorItemChanged(int idx, int role, const QVariant &v)
 {
     if (role == Qt::DisplayPropertyRole)
         ui.treeWidget->headerItem()->setData(idx, Qt::EditRole, qvariant_cast<PropertySheetStringValue>(v).value());
@@ -537,7 +544,7 @@ void TreeWidgetEditor::moveColumnsRight(int fromColumn, int toColumn)
     moveColumns(toColumn, fromColumn, 1);
 }
 
-void TreeWidgetEditor::on_columnEditor_itemInserted(int idx)
+void TreeWidgetEditor::columnEditorItemInserted(int idx)
 {
     int columnCount = ui.treeWidget->columnCount();
     ui.treeWidget->setColumnCount(columnCount + 1);
@@ -547,7 +554,7 @@ void TreeWidgetEditor::on_columnEditor_itemInserted(int idx)
     updateEditor();
 }
 
-void TreeWidgetEditor::on_columnEditor_itemDeleted(int idx)
+void TreeWidgetEditor::columnEditorItemDeleted(int idx)
 {
     closeEditors();
 
@@ -561,7 +568,7 @@ void TreeWidgetEditor::on_columnEditor_itemDeleted(int idx)
     updateEditor();
 }
 
-void TreeWidgetEditor::on_columnEditor_itemMovedUp(int idx)
+void TreeWidgetEditor::columnEditorItemMovedUp(int idx)
 {
     moveColumnsRight(idx - 1, idx);
 
@@ -569,7 +576,7 @@ void TreeWidgetEditor::on_columnEditor_itemMovedUp(int idx)
     updateEditor();
 }
 
-void TreeWidgetEditor::on_columnEditor_itemMovedDown(int idx)
+void TreeWidgetEditor::columnEditorItemMovedDown(int idx)
 {
     moveColumnsLeft(idx, idx + 1);
 
diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.h b/src/designer/src/components/taskmenu/treewidgeteditor.h
index 6e64b529a..b2d306f0a 100644
--- a/src/designer/src/components/taskmenu/treewidgeteditor.h
+++ b/src/designer/src/components/taskmenu/treewidgeteditor.h
@@ -30,24 +30,24 @@ public:
     TreeWidgetContents contents() const;
 
 private slots:
-    void on_newItemButton_clicked();
-    void on_newSubItemButton_clicked();
-    void on_deleteItemButton_clicked();
-    void on_moveItemUpButton_clicked();
-    void on_moveItemDownButton_clicked();
-    void on_moveItemRightButton_clicked();
-    void on_moveItemLeftButton_clicked();
-
-    void on_treeWidget_currentItemChanged();
-    void on_treeWidget_itemChanged(QTreeWidgetItem *item, int column);
-
-    void on_columnEditor_indexChanged(int idx);
-    void on_columnEditor_itemChanged(int idx, int role, const QVariant &v);
-
-    void on_columnEditor_itemInserted(int idx);
-    void on_columnEditor_itemDeleted(int idx);
-    void on_columnEditor_itemMovedUp(int idx);
-    void on_columnEditor_itemMovedDown(int idx);
+    void newItemButtonClicked();
+    void newSubItemButtonClicked();
+    void deleteItemButtonClicked();
+    void moveItemUpButtonClicked();
+    void moveItemDownButtonClicked();
+    void moveItemRightButtonClicked();
+    void moveItemLeftButtonClicked();
+
+    void treeWidgetCurrentItemChanged();
+    void treeWidgetItemChanged(QTreeWidgetItem *item, int column);
+
+    void columnEditorIndexChanged(int idx);
+    void columnEditorItemChanged(int idx, int role, const QVariant &v);
+
+    void columnEditorItemInserted(int idx);
+    void columnEditorItemDeleted(int idx);
+    void columnEditorItemMovedUp(int idx);
+    void columnEditorItemMovedDown(int idx);
 
     void togglePropertyBrowser();
     void cacheReloaded();
diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp
index d5aff2c46..cbfafdf0a 100644
--- a/src/designer/src/lib/shared/newformwidget.cpp
+++ b/src/designer/src/lib/shared/newformwidget.cpp
@@ -116,6 +116,14 @@ NewFormWidget::NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent
     m_ui->treeWidget->header()->hide();
     m_ui->treeWidget->header()->setStretchLastSection(true);
     m_ui->lblPreview->setBackgroundRole(QPalette::Base);
+
+    connect(m_ui->treeWidget, &QTreeWidget::itemActivated,
+            this, &NewFormWidget::treeWidgetItemActivated);
+    connect(m_ui->treeWidget, &QTreeWidget::currentItemChanged,
+            this, &NewFormWidget::treeWidgetCurrentItemChanged);
+    connect(m_ui->treeWidget, &QTreeWidget::itemPressed,
+            this, &NewFormWidget::treeWidgetItemPressed);
+
     QDesignerSharedSettings settings(m_core);
 
     QString uiExtension = u"ui"_s;
@@ -191,7 +199,7 @@ NewFormWidget::~NewFormWidget()
     delete m_ui;
 }
 
-void NewFormWidget::on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *)
+void NewFormWidget::treeWidgetCurrentItemChanged(QTreeWidgetItem *current)
 {
     if (debugNewFormWidget)
         qDebug() << Q_FUNC_INFO << current;
@@ -222,7 +230,7 @@ bool NewFormWidget::showCurrentItemPixmap()
     return rc;
 }
 
-void NewFormWidget::on_treeWidget_itemActivated(QTreeWidgetItem *item)
+void NewFormWidget::treeWidgetItemActivated(QTreeWidgetItem *item)
 {
     if (debugNewFormWidget)
         qDebug() << Q_FUNC_INFO << item;
@@ -435,7 +443,7 @@ void NewFormWidget::loadFrom(const QString &title, const QStringList &nameList,
     }
 }
 
-void NewFormWidget::on_treeWidget_itemPressed(QTreeWidgetItem *item)
+void NewFormWidget::treeWidgetItemPressed(QTreeWidgetItem *item)
 {
     if (item && !item->parent())
         item->setExpanded(!item->isExpanded());
diff --git a/src/designer/src/lib/shared/newformwidget_p.h b/src/designer/src/lib/shared/newformwidget_p.h
index c6d224f45..235bbc4ee 100644
--- a/src/designer/src/lib/shared/newformwidget_p.h
+++ b/src/designer/src/lib/shared/newformwidget_p.h
@@ -61,9 +61,9 @@ public:
                            const qdesigner_internal::DeviceProfile &dp);
 
 private slots:
-    void on_treeWidget_itemActivated(QTreeWidgetItem *item);
-    void on_treeWidget_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *);
-    void on_treeWidget_itemPressed(QTreeWidgetItem *item);
+    void treeWidgetItemActivated(QTreeWidgetItem *item);
+    void treeWidgetCurrentItemChanged(QTreeWidgetItem *current);
+    void treeWidgetItemPressed(QTreeWidgetItem *item);
     void slotDeviceProfileIndexChanged(int idx);
 
 private:
diff --git a/src/designer/src/lib/shared/orderdialog.cpp b/src/designer/src/lib/shared/orderdialog.cpp
index 12dcbc3cc..275a7d4fd 100644
--- a/src/designer/src/lib/shared/orderdialog.cpp
+++ b/src/designer/src/lib/shared/orderdialog.cpp
@@ -35,6 +35,11 @@ OrderDialog::OrderDialog(QWidget *parent) :
     connect(m_ui->pageList->model(), &QAbstractItemModel::rowsRemoved,
             this, &OrderDialog::slotEnableButtonsAfterDnD);
 
+    connect(m_ui->upButton, &QAbstractButton::clicked, this, &OrderDialog::upButtonClicked);
+    connect(m_ui->downButton, &QAbstractButton::clicked, this, &OrderDialog::downButtonClicked);
+    connect(m_ui->pageList, &QListWidget::currentRowChanged,
+            this, &OrderDialog::pageListCurrentRowChanged);
+
     m_ui->upButton->setEnabled(false);
     m_ui->downButton->setEnabled(false);
 }
@@ -99,7 +104,7 @@ QWidgetList OrderDialog::pageList() const
     return rc;
 }
 
-void OrderDialog::on_upButton_clicked()
+void OrderDialog::upButtonClicked()
 {
     const int row = m_ui->pageList->currentRow();
     if (row <= 0)
@@ -109,7 +114,7 @@ void OrderDialog::on_upButton_clicked()
     m_ui->pageList->setCurrentRow(row - 1);
 }
 
-void OrderDialog::on_downButton_clicked()
+void OrderDialog::downButtonClicked()
 {
     const int row = m_ui->pageList->currentRow();
     if (row == -1 || row == m_ui->pageList->count() - 1)
@@ -124,7 +129,7 @@ void OrderDialog::slotEnableButtonsAfterDnD()
     enableButtons(m_ui->pageList->currentRow());
 }
 
-void OrderDialog::on_pageList_currentRowChanged(int r)
+void OrderDialog::pageListCurrentRowChanged(int r)
 {
     enableButtons(r);
 }
diff --git a/src/designer/src/lib/shared/orderdialog_p.h b/src/designer/src/lib/shared/orderdialog_p.h
index 456fb9406..2fb506f07 100644
--- a/src/designer/src/lib/shared/orderdialog_p.h
+++ b/src/designer/src/lib/shared/orderdialog_p.h
@@ -53,9 +53,9 @@ public:
     Format format() const     { return m_format; }
 
 private slots:
-    void on_upButton_clicked();
-    void on_downButton_clicked();
-    void on_pageList_currentRowChanged(int row);
+    void upButtonClicked();
+    void downButtonClicked();
+    void pageListCurrentRowChanged(int row);
     void slotEnableButtonsAfterDnD();
     void slotReset();