Port examples/widgets/dialogs to new connection syntax.

Change-Id: Ife8a24b43db400909099765b43f016b4be4bd6ef
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

10 files changed, 50 insertions, 68 deletions

diff --git a/examples/widgets/dialogs/classwizard/classwizard.cpp b/examples/widgets/dialogs/classwizard/classwizard.cpp
index 0f1a2a0869..c913d7b592 100644
--- a/examples/widgets/dialogs/classwizard/classwizard.cpp
+++ b/examples/widgets/dialogs/classwizard/classwizard.cpp
@@ -252,8 +252,8 @@ ClassInfoPage::ClassInfoPage(QWidget *parent)
 
     defaultCtorRadioButton->setChecked(true);
 
-    connect(defaultCtorRadioButton, SIGNAL(toggled(bool)),
-            copyCtorCheckBox, SLOT(setEnabled(bool)));
+    connect(defaultCtorRadioButton, &QAbstractButton::toggled,
+            copyCtorCheckBox, &QWidget::setEnabled);
 
 //! [11] //! [12]
     registerField("className*", classNameLineEdit);
@@ -311,14 +311,14 @@ CodeStylePage::CodeStylePage(QWidget *parent)
     baseIncludeLineEdit = new QLineEdit;
     baseIncludeLabel->setBuddy(baseIncludeLineEdit);
 
-    connect(protectCheckBox, SIGNAL(toggled(bool)),
-            macroNameLabel, SLOT(setEnabled(bool)));
-    connect(protectCheckBox, SIGNAL(toggled(bool)),
-            macroNameLineEdit, SLOT(setEnabled(bool)));
-    connect(includeBaseCheckBox, SIGNAL(toggled(bool)),
-            baseIncludeLabel, SLOT(setEnabled(bool)));
-    connect(includeBaseCheckBox, SIGNAL(toggled(bool)),
-            baseIncludeLineEdit, SLOT(setEnabled(bool)));
+    connect(protectCheckBox, &QAbstractButton::toggled,
+            macroNameLabel, &QWidget::setEnabled);
+    connect(protectCheckBox, &QAbstractButton::toggled,
+            macroNameLineEdit, &QWidget::setEnabled);
+    connect(includeBaseCheckBox, &QAbstractButton::toggled,
+            baseIncludeLabel, &QWidget::setEnabled);
+    connect(includeBaseCheckBox, &QAbstractButton::toggled,
+            baseIncludeLineEdit, &QWidget::setEnabled);
 
     registerField("comment", commentCheckBox);
     registerField("protect", protectCheckBox);
diff --git a/examples/widgets/dialogs/configdialog/configdialog.cpp b/examples/widgets/dialogs/configdialog/configdialog.cpp
index 8e68940227..c4565a6407 100644
--- a/examples/widgets/dialogs/configdialog/configdialog.cpp
+++ b/examples/widgets/dialogs/configdialog/configdialog.cpp
@@ -62,7 +62,7 @@ ConfigDialog::ConfigDialog()
     createIcons();
     contentsWidget->setCurrentRow(0);
 
-    connect(closeButton, SIGNAL(clicked()), this, SLOT(close()));
+    connect(closeButton, &QAbstractButton::clicked, this, &QWidget::close);
 
     QHBoxLayout *horizontalLayout = new QHBoxLayout;
     horizontalLayout->addWidget(contentsWidget);
@@ -102,9 +102,7 @@ void ConfigDialog::createIcons()
     queryButton->setTextAlignment(Qt::AlignHCenter);
     queryButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
 
-    connect(contentsWidget,
-            SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
-            this, SLOT(changePage(QListWidgetItem*,QListWidgetItem*)));
+    connect(contentsWidget, &QListWidget::currentItemChanged, this, &ConfigDialog::changePage);
 }
 
 void ConfigDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
diff --git a/examples/widgets/dialogs/extension/finddialog.cpp b/examples/widgets/dialogs/extension/finddialog.cpp
index 19eab195cb..895b0cf2ce 100644
--- a/examples/widgets/dialogs/extension/finddialog.cpp
+++ b/examples/widgets/dialogs/extension/finddialog.cpp
@@ -78,7 +78,7 @@ FindDialog::FindDialog(QWidget *parent)
     buttonBox->addButton(findButton, QDialogButtonBox::ActionRole);
     buttonBox->addButton(moreButton, QDialogButtonBox::ActionRole);
 
-    connect(moreButton, SIGNAL(toggled(bool)), extension, SLOT(setVisible(bool)));
+    connect(moreButton, &QAbstractButton::toggled, extension, &QWidget::setVisible);
 
     QVBoxLayout *extensionLayout = new QVBoxLayout;
     extensionLayout->setMargin(0);
diff --git a/examples/widgets/dialogs/findfiles/window.cpp b/examples/widgets/dialogs/findfiles/window.cpp
index 86c34a6352..780c398ad5 100644
--- a/examples/widgets/dialogs/findfiles/window.cpp
+++ b/examples/widgets/dialogs/findfiles/window.cpp
@@ -46,8 +46,10 @@
 Window::Window(QWidget *parent)
     : QWidget(parent)
 {
-    browseButton = createButton(tr("&Browse..."), SLOT(browse()));
-    findButton = createButton(tr("&Find"), SLOT(find()));
+    browseButton = new QPushButton(tr("&Browse..."), this);
+    connect(browseButton, &QAbstractButton::clicked, this, &Window::browse);
+    findButton = new QPushButton(tr("&Find"), this);
+    connect(findButton, &QAbstractButton::clicked, this, &Window::find);
 
     fileComboBox = createComboBox(tr("*"));
     textComboBox = createComboBox();
@@ -195,15 +197,6 @@ void Window::showFiles(const QStringList &files)
 }
 //! [8]
 
-//! [9]
-QPushButton *Window::createButton(const QString &text, const char *member)
-{
-    QPushButton *button = new QPushButton(text);
-    connect(button, SIGNAL(clicked()), this, member);
-    return button;
-}
-//! [9]
-
 //! [10]
 QComboBox *Window::createComboBox(const QString &text)
 {
@@ -228,8 +221,8 @@ void Window::createFilesTable()
     filesTable->verticalHeader()->hide();
     filesTable->setShowGrid(false);
 
-    connect(filesTable, SIGNAL(cellActivated(int,int)),
-            this, SLOT(openFileOfItem(int,int)));
+    connect(filesTable, &QTableWidget::cellActivated,
+            this, &Window::openFileOfItem);
 }
 //! [11]
 
diff --git a/examples/widgets/dialogs/findfiles/window.h b/examples/widgets/dialogs/findfiles/window.h
index 281c932e2f..89dd87b83b 100644
--- a/examples/widgets/dialogs/findfiles/window.h
+++ b/examples/widgets/dialogs/findfiles/window.h
@@ -68,7 +68,6 @@ private slots:
 private:
     QStringList findFiles(const QStringList &files, const QString &text);
     void showFiles(const QStringList &files);
-    QPushButton *createButton(const QString &text, const char *member);
     QComboBox *createComboBox(const QString &text = QString());
     void createFilesTable();
 
diff --git a/examples/widgets/dialogs/licensewizard/licensewizard.cpp b/examples/widgets/dialogs/licensewizard/licensewizard.cpp
index ace2e1229a..0f11f3ab7b 100644
--- a/examples/widgets/dialogs/licensewizard/licensewizard.cpp
+++ b/examples/widgets/dialogs/licensewizard/licensewizard.cpp
@@ -70,7 +70,7 @@ LicenseWizard::LicenseWizard(QWidget *parent)
     setPixmap(QWizard::LogoPixmap, QPixmap(":/images/logo.png"));
 
 //! [7]
-    connect(this, SIGNAL(helpRequested()), this, SLOT(showHelp()));
+    connect(this, &QWizard::helpRequested, this, &LicenseWizard::showHelp);
 //! [7]
 
     setWindowTitle(tr("License Wizard"));
@@ -339,13 +339,13 @@ void ConclusionPage::setVisible(bool visible)
 //! [29]
         wizard()->setButtonText(QWizard::CustomButton1, tr("&Print"));
         wizard()->setOption(QWizard::HaveCustomButton1, true);
-        connect(wizard(), SIGNAL(customButtonClicked(int)),
-                this, SLOT(printButtonClicked()));
+        connect(wizard(), &QWizard::customButtonClicked,
+                this, &ConclusionPage::printButtonClicked);
 //! [29]
     } else {
         wizard()->setOption(QWizard::HaveCustomButton1, false);
-        disconnect(wizard(), SIGNAL(customButtonClicked(int)),
-                   this, SLOT(printButtonClicked()));
+        disconnect(wizard(), &QWizard::customButtonClicked,
+                   this, &ConclusionPage::printButtonClicked);
     }
 }
 //! [28]
diff --git a/examples/widgets/dialogs/sipdialog/dialog.cpp b/examples/widgets/dialogs/sipdialog/dialog.cpp
index f57cd094ae..48859ec5ff 100644
--- a/examples/widgets/dialogs/sipdialog/dialog.cpp
+++ b/examples/widgets/dialogs/sipdialog/dialog.cpp
@@ -89,10 +89,9 @@ Dialog::Dialog()
 //! [Dialog constructor part4]
 
 //! [Dialog constructor part5]
-    connect(button, SIGNAL(clicked()),
-        qApp, SLOT(closeAllWindows()));
-    connect(QApplication::desktop(), SIGNAL(workAreaResized(int)),
-        this, SLOT(desktopResized(int)));
+    connect(button, &QAbstractButton::clicked, qApp, &QApplication::closeAllWindows);
+    connect(QApplication::desktop(), &QDesktopWidget::workAreaResized,
+        this, &Dialog::desktopResized);
 }
 //! [Dialog constructor part5]
 
diff --git a/examples/widgets/dialogs/standarddialogs/dialog.cpp b/examples/widgets/dialogs/standarddialogs/dialog.cpp
index 0a1532616c..560ca77f31 100644
--- a/examples/widgets/dialogs/standarddialogs/dialog.cpp
+++ b/examples/widgets/dialogs/standarddialogs/dialog.cpp
@@ -180,27 +180,27 @@ Dialog::Dialog(QWidget *parent)
     QPushButton *errorButton =
             new QPushButton(tr("QErrorMessage::showM&essage()"));
 
-    connect(integerButton, SIGNAL(clicked()), this, SLOT(setInteger()));
-    connect(doubleButton, SIGNAL(clicked()), this, SLOT(setDouble()));
-    connect(itemButton, SIGNAL(clicked()), this, SLOT(setItem()));
-    connect(textButton, SIGNAL(clicked()), this, SLOT(setText()));
-    connect(multiLineTextButton, SIGNAL(clicked()), this, SLOT(setMultiLineText()));
-    connect(colorButton, SIGNAL(clicked()), this, SLOT(setColor()));
-    connect(fontButton, SIGNAL(clicked()), this, SLOT(setFont()));
-    connect(directoryButton, SIGNAL(clicked()),
-            this, SLOT(setExistingDirectory()));
-    connect(openFileNameButton, SIGNAL(clicked()),
-            this, SLOT(setOpenFileName()));
-    connect(openFileNamesButton, SIGNAL(clicked()),
-            this, SLOT(setOpenFileNames()));
-    connect(saveFileNameButton, SIGNAL(clicked()),
-            this, SLOT(setSaveFileName()));
-    connect(criticalButton, SIGNAL(clicked()), this, SLOT(criticalMessage()));
-    connect(informationButton, SIGNAL(clicked()),
-            this, SLOT(informationMessage()));
-    connect(questionButton, SIGNAL(clicked()), this, SLOT(questionMessage()));
-    connect(warningButton, SIGNAL(clicked()), this, SLOT(warningMessage()));
-    connect(errorButton, SIGNAL(clicked()), this, SLOT(errorMessage()));
+    connect(integerButton, &QAbstractButton::clicked, this, &Dialog::setInteger);
+    connect(doubleButton, &QAbstractButton::clicked, this, &Dialog::setDouble);
+    connect(itemButton, &QAbstractButton::clicked, this, &Dialog::setItem);
+    connect(textButton, &QAbstractButton::clicked, this, &Dialog::setText);
+    connect(multiLineTextButton, &QAbstractButton::clicked, this, &Dialog::setMultiLineText);
+    connect(colorButton, &QAbstractButton::clicked, this, &Dialog::setColor);
+    connect(fontButton, &QAbstractButton::clicked, this, &Dialog::setFont);
+    connect(directoryButton, &QAbstractButton::clicked,
+            this, &Dialog::setExistingDirectory);
+    connect(openFileNameButton, &QAbstractButton::clicked,
+            this, &Dialog::setOpenFileName);
+    connect(openFileNamesButton, &QAbstractButton::clicked,
+            this, &Dialog::setOpenFileNames);
+    connect(saveFileNameButton, &QAbstractButton::clicked,
+            this, &Dialog::setSaveFileName);
+    connect(criticalButton, &QAbstractButton::clicked, this, &Dialog::criticalMessage);
+    connect(informationButton, &QAbstractButton::clicked,
+            this, &Dialog::informationMessage);
+    connect(questionButton, &QAbstractButton::clicked, this, &Dialog::questionMessage);
+    connect(warningButton, &QAbstractButton::clicked, this, &Dialog::warningMessage);
+    connect(errorButton, &QAbstractButton::clicked, this, &Dialog::errorMessage);
 
     QWidget *page = new QWidget;
     QGridLayout *layout = new QGridLayout(page);
diff --git a/examples/widgets/dialogs/tabdialog/tabdialog.cpp b/examples/widgets/dialogs/tabdialog/tabdialog.cpp
index ec1a6efbc8..75a7b85e3b 100644
--- a/examples/widgets/dialogs/tabdialog/tabdialog.cpp
+++ b/examples/widgets/dialogs/tabdialog/tabdialog.cpp
@@ -59,8 +59,8 @@ TabDialog::TabDialog(const QString &fileName, QWidget *parent)
 //! [1] //! [3]
                                      | QDialogButtonBox::Cancel);
 
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 //! [2] //! [3]
 
 //! [4]
diff --git a/examples/widgets/doc/src/findfiles.qdoc b/examples/widgets/doc/src/findfiles.qdoc
index 0a4fb8268d..dd06ed8bb4 100644
--- a/examples/widgets/doc/src/findfiles.qdoc
+++ b/examples/widgets/doc/src/findfiles.qdoc
@@ -200,13 +200,6 @@
 
     We also update the total number of files found.
 
-    \snippet dialogs/findfiles/window.cpp 9
-
-    The private \c createButton() function is called from the
-    constructor. We create a QPushButton with the provided text,
-    connect it to the provided slot, and return a pointer to the
-    button.
-
     \snippet dialogs/findfiles/window.cpp 10
 
     The private \c createComboBox() function is also called from the