From da3cb1deb6c752f8e4c05434e3451432e5d787ba Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Sun, 19 Apr 2020 11:23:55 +0200 Subject: [PATCH] uic: Generate Qt 5 connection syntax Add a enum and formatting for member function pointer based connections. Now preferably use member function pointer for Qt classes or parameterless connections. This should not require qOverload() within Qt classes after the Signal/Slot disambiguation. Add command line option to force either syntax for all connections. Task-number: QTBUG-76375 Change-Id: Icdb4051e1173172a71cd536bdbc7d1ab1edf267d Reviewed-by: Volker Hilsheimer --- src/tools/uic/cpp/cppwriteincludes.cpp | 3 ++ src/tools/uic/cpp/cppwriteinitialization.cpp | 33 ++++++++++-- src/tools/uic/cpp/cppwriteinitialization.h | 6 +++ src/tools/uic/main.cpp | 12 +++++ src/tools/uic/option.h | 4 ++ src/tools/uic/shared/language.cpp | 51 +++++++++++++++++-- src/tools/uic/shared/language.h | 8 ++- .../baseline/Dialog_with_Buttons_Bottom.ui.h | 5 +- .../baseline/Dialog_with_Buttons_Right.ui.h | 5 +- .../tools/uic/baseline/addlinkdialog.ui.h | 5 +- .../tools/uic/baseline/addtorrentform.ui.h | 4 +- .../uic/baseline/authenticationdialog.ui.h | 5 +- tests/auto/tools/uic/baseline/backside.ui.h | 4 +- .../tools/uic/baseline/bookmarkdialog.ui.h | 5 +- .../uic/baseline/bug18156QTreeWidget.ui.h | 5 +- .../tools/uic/baseline/certificateinfo.ui.h | 3 +- .../tools/uic/baseline/chatmainwindow.ui.h | 4 +- .../tools/uic/baseline/chatsetnickname.ui.h | 4 +- tests/auto/tools/uic/baseline/config.ui.h | 4 +- .../tools/uic/baseline/connectdialog.ui.h | 5 +- tests/auto/tools/uic/baseline/cookies.ui.h | 3 +- .../tools/uic/baseline/cookiesexceptions.ui.h | 3 +- tests/auto/tools/uic/baseline/default.ui.h | 1 + .../tools/uic/baseline/filternamedialog.ui.h | 1 + tests/auto/tools/uic/baseline/finddialog.ui.h | 2 +- .../uic/baseline/formwindowsettings.ui.h | 5 +- tests/auto/tools/uic/baseline/history.ui.h | 3 +- .../tools/uic/baseline/identifierpage.ui.h | 2 +- .../auto/tools/uic/baseline/imagedialog.ui.h | 2 +- .../tools/uic/baseline/installdialog.ui.h | 2 +- .../tools/uic/baseline/languagesdialog.ui.h | 2 +- .../tools/uic/baseline/listwidgeteditor.ui.h | 5 +- tests/auto/tools/uic/baseline/mainwindow.ui.h | 18 +++---- .../tools/uic/baseline/newactiondialog.ui.h | 5 +- .../baseline/newdynamicpropertydialog.ui.h | 1 + tests/auto/tools/uic/baseline/newform.ui.h | 1 + .../auto/tools/uic/baseline/orderdialog.ui.h | 5 +- tests/auto/tools/uic/baseline/pagefold.ui.h | 1 + .../tools/uic/baseline/paletteeditor.ui.h | 5 +- .../tools/uic/baseline/passworddialog.ui.h | 5 +- .../auto/tools/uic/baseline/plugindialog.ui.h | 3 +- .../tools/uic/baseline/preferencesdialog.ui.h | 5 +- .../tools/uic/baseline/previewdialogbase.ui.h | 5 +- tests/auto/tools/uic/baseline/proxy.ui.h | 5 +- .../auto/tools/uic/baseline/qfiledialog.ui.h | 1 + .../uic/baseline/qprintsettingsoutput.ui.h | 4 +- .../tools/uic/baseline/qtgradientdialog.ui.h | 5 +- .../uic/baseline/qtgradientviewdialog.ui.h | 5 +- .../uic/baseline/qtresourceeditordialog.ui.h | 5 +- .../tools/uic/baseline/qttoolbardialog.ui.h | 1 + .../uic/baseline/saveformastemplate.ui.h | 5 +- tests/auto/tools/uic/baseline/settings.ui.h | 5 +- .../tools/uic/baseline/signalslotdialog.ui.h | 1 + tests/auto/tools/uic/baseline/sslclient.ui.h | 4 +- tests/auto/tools/uic/baseline/sslerrors.ui.h | 4 +- .../tools/uic/baseline/stringlisteditor.ui.h | 5 +- .../tools/uic/baseline/tablewidgeteditor.ui.h | 5 +- tests/auto/tools/uic/baseline/textfinder.ui.h | 2 +- .../tools/uic/baseline/translatedialog.ui.h | 2 +- .../uic/baseline/translationsettings.ui.h | 5 +- .../tools/uic/baseline/treewidgeteditor.ui.h | 5 +- tests/auto/tools/uic/baseline/validators.ui.h | 2 +- .../uic/baseline/wateringconfigdialog.ui.h | 9 ++-- 63 files changed, 241 insertions(+), 99 deletions(-) diff --git a/src/tools/uic/cpp/cppwriteincludes.cpp b/src/tools/uic/cpp/cppwriteincludes.cpp index f2e69553c6..b9190b8295 100644 --- a/src/tools/uic/cpp/cppwriteincludes.cpp +++ b/src/tools/uic/cpp/cppwriteincludes.cpp @@ -229,6 +229,9 @@ void WriteIncludes::add(const QString &className, bool determineHeader, const QS return; } + if (cwi->extends(className, QLatin1String("QDialogButtonBox"))) + add(QLatin1String("QAbstractButton")); // for signal "clicked(QAbstractButton*)" + if (determineHeader) insertIncludeForClass(className, header, global); } diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 2a9efaac95..585313f5de 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -2568,6 +2568,31 @@ WriteInitialization::Declaration WriteInitialization::findDeclaration(const QStr return {}; } +bool WriteInitialization::isCustomWidget(const QString &className) const +{ + return m_uic->customWidgetsInfo()->customWidget(className) != nullptr; +} + +ConnectionSyntax WriteInitialization::connectionSyntax(const QString &senderSignature, + const QString &senderClassName, + const QString &receiverClassName) const +{ + if (m_option.forceMemberFnPtrConnectionSyntax) + return ConnectionSyntax::MemberFunctionPtr; + if (m_option.forceStringConnectionSyntax) + return ConnectionSyntax::StringBased; + // Auto mode: Use Qt 5 connection syntax for Qt classes and parameterless + // connections. QAxWidget is special though since it has a fake Meta object. + static const QStringList requiresStringSyntax{QStringLiteral("QAxWidget")}; + if (requiresStringSyntax.contains(senderClassName) + || requiresStringSyntax.contains(receiverClassName)) { + return ConnectionSyntax::StringBased; + } + return senderSignature.endsWith(QLatin1String("()")) + || (!isCustomWidget(senderClassName) && !isCustomWidget(receiverClassName)) + ? ConnectionSyntax::MemberFunctionPtr : ConnectionSyntax::StringBased; +} + void WriteInitialization::acceptConnection(DomConnection *connection) { const QString senderName = connection->elementSender(); @@ -2584,14 +2609,16 @@ void WriteInitialization::acceptConnection(DomConnection *connection) fprintf(stderr, "%s\n", qPrintable(message)); return; } - - language::SignalSlot theSignal{senderDecl.name, connection->elementSignal(), + const QString senderSignature = connection->elementSignal(); + language::SignalSlot theSignal{senderDecl.name, senderSignature, senderDecl.className}; language::SignalSlot theSlot{receiverDecl.name, connection->elementSlot(), receiverDecl.className}; m_output << m_indent; - language::formatConnection(m_output, theSignal, theSlot); + language::formatConnection(m_output, theSignal, theSlot, + connectionSyntax(senderSignature, senderDecl.className, + receiverDecl.className)); m_output << language::eol; } diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index 0a6ddbb3c8..df06358077 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -37,6 +37,8 @@ #include #include +enum class ConnectionSyntax; + QT_BEGIN_NAMESPACE class Driver; @@ -238,6 +240,10 @@ private: QString writeBrushInitialization(const DomBrush *brush); void addButtonGroup(const DomWidget *node, const QString &varName); void addWizardPage(const QString &pageVarName, const DomWidget *page, const QString &parentWidget); + bool isCustomWidget(const QString &className) const; + ConnectionSyntax connectionSyntax(const QString &senderSignature, + const QString &senderClassName, + const QString &receiverClassName) const; const Uic *m_uic; Driver *m_driver; diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp index 6f342fb398..81492bbf45 100644 --- a/src/tools/uic/main.cpp +++ b/src/tools/uic/main.cpp @@ -100,6 +100,11 @@ int runUic(int argc, char *argv[]) generatorOption.setValueName(QStringLiteral("python|cpp")); parser.addOption(generatorOption); + QCommandLineOption connectionsOption(QStringList{QStringLiteral("c"), QStringLiteral("connections")}); + connectionsOption.setDescription(QStringLiteral("Connection syntax.")); + connectionsOption.setValueName(QStringLiteral("pmf|string")); + parser.addOption(connectionsOption); + QCommandLineOption idBasedOption(QStringLiteral("idbased")); idBasedOption.setDescription(QStringLiteral("Use id based function for i18n")); parser.addOption(idBasedOption); @@ -122,6 +127,13 @@ int runUic(int argc, char *argv[]) driver.option().postfix = parser.value(postfixOption); driver.option().translateFunction = parser.value(translateOption); driver.option().includeFile = parser.value(includeOption); + if (parser.isSet(connectionsOption)) { + const auto value = parser.value(connectionsOption); + if (value == QLatin1String("pmf")) + driver.option().forceMemberFnPtrConnectionSyntax = 1; + else if (value == QLatin1String("string")) + driver.option().forceStringConnectionSyntax = 1; + } Language language = Language::Cpp; if (parser.isSet(generatorOption)) { diff --git a/src/tools/uic/option.h b/src/tools/uic/option.h index 8e882079c9..c869fec9a6 100644 --- a/src/tools/uic/option.h +++ b/src/tools/uic/option.h @@ -46,6 +46,8 @@ struct Option unsigned int implicitIncludes: 1; unsigned int idBased: 1; unsigned int fromImports: 1; + unsigned int forceMemberFnPtrConnectionSyntax: 1; + unsigned int forceStringConnectionSyntax: 1; QString inputFile; QString outputFile; @@ -67,6 +69,8 @@ struct Option implicitIncludes(1), idBased(0), fromImports(0), + forceMemberFnPtrConnectionSyntax(0), + forceStringConnectionSyntax(0), prefix(QLatin1String("Ui_")) { indent.fill(QLatin1Char(' '), 4); } diff --git a/src/tools/uic/shared/language.cpp b/src/tools/uic/shared/language.cpp index 987d51e30c..a42e7b8461 100644 --- a/src/tools/uic/shared/language.cpp +++ b/src/tools/uic/shared/language.cpp @@ -387,12 +387,57 @@ void _formatStackVariable(QTextStream &str, const char *className, QStringView v } } -void formatConnection(QTextStream &str, const SignalSlot &sender, const SignalSlot &receiver) +// Format a member function for a signal slot connection +static void formatMemberFnPtr(QTextStream &str, const SignalSlot &s, + bool useQOverload = false) +{ + const int parenPos = s.signature.indexOf(QLatin1Char('(')); + Q_ASSERT(parenPos >= 0); + if (useQOverload) { + const auto parameters = s.signature.midRef(parenPos + 1, + s.signature.size() - parenPos - 2); + str << "qOverload<" << parameters << ">("; + } + + const auto functionName = s.signature.leftRef(parenPos); + str << '&' << s.className << "::" << functionName; + + if (useQOverload) + str << ')'; +} + +static void formatMemberFnPtrConnection(QTextStream &str, + const SignalSlot &sender, + const SignalSlot &receiver) +{ + str << "QObject::connect(" << sender.name << ", "; + formatMemberFnPtr(str, sender); + str << ", " << receiver.name << ", "; + formatMemberFnPtr(str, receiver); + str << ')'; +} + +static void formatStringBasedConnection(QTextStream &str, + const SignalSlot &sender, + const SignalSlot &receiver) +{ + str << "QObject::connect(" << sender.name << ", SIGNAL("<< sender.signature + << "), " << receiver.name << ", SLOT(" << receiver.signature << "))"; +} + +void formatConnection(QTextStream &str, const SignalSlot &sender, const SignalSlot &receiver, + ConnectionSyntax connectionSyntax) { switch (language()) { case Language::Cpp: - str << "QObject::connect(" << sender.name << ", SIGNAL("<< sender.signature - << "), " << receiver.name << ", SLOT("<< receiver.signature << "))"; + switch (connectionSyntax) { + case ConnectionSyntax::MemberFunctionPtr: + formatMemberFnPtrConnection(str, sender, receiver); + break; + case ConnectionSyntax::StringBased: + formatStringBasedConnection(str, sender, receiver); + break; + } break; case Language::Python: str << sender.name << '.' diff --git a/src/tools/uic/shared/language.h b/src/tools/uic/shared/language.h index 7b019ec8fc..fcc2d5d258 100644 --- a/src/tools/uic/shared/language.h +++ b/src/tools/uic/shared/language.h @@ -37,11 +37,16 @@ QT_FORWARD_DECLARE_CLASS(QTextStream) enum class Language { Cpp, Python }; +enum class ConnectionSyntax { StringBased, MemberFunctionPtr }; + namespace language { Language language(); void setLanguage(Language); +ConnectionSyntax connectionSyntax(); +void setConnectionSyntax(ConnectionSyntax cs); + extern QString derefPointer; extern QString nullPtr; extern QString operatorNew; @@ -198,7 +203,8 @@ struct SignalSlot QString className; }; -void formatConnection(QTextStream &str, const SignalSlot &sender, const SignalSlot &receiver); +void formatConnection(QTextStream &str, const SignalSlot &sender, const SignalSlot &receiver, + ConnectionSyntax connectionSyntax); QString boolValue(bool v); diff --git a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h index 0806ca6c33..e08d32894d 100644 --- a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h +++ b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Bottom.ui.h @@ -10,6 +10,7 @@ #define DIALOG_WITH_BUTTONS_BOTTOM_H #include +#include #include #include #include @@ -33,8 +34,8 @@ public: buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); retranslateUi(Dialog); - QObject::connect(buttonBox, SIGNAL(accepted()), Dialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), Dialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, Dialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, Dialog, &QDialog::reject); QMetaObject::connectSlotsByName(Dialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h index 9dd79f2587..6eb45d890d 100644 --- a/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h +++ b/tests/auto/tools/uic/baseline/Dialog_with_Buttons_Right.ui.h @@ -10,6 +10,7 @@ #define DIALOG_WITH_BUTTONS_RIGHT_H #include +#include #include #include #include @@ -33,8 +34,8 @@ public: buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); retranslateUi(Dialog); - QObject::connect(buttonBox, SIGNAL(accepted()), Dialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), Dialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, Dialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, Dialog, &QDialog::reject); QMetaObject::connectSlotsByName(Dialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/addlinkdialog.ui.h b/tests/auto/tools/uic/baseline/addlinkdialog.ui.h index b090359c31..830c00cf59 100644 --- a/tests/auto/tools/uic/baseline/addlinkdialog.ui.h +++ b/tests/auto/tools/uic/baseline/addlinkdialog.ui.h @@ -10,6 +10,7 @@ #define ADDLINKDIALOG_H #include +#include #include #include #include @@ -89,8 +90,8 @@ public: retranslateUi(AddLinkDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), AddLinkDialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), AddLinkDialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, AddLinkDialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, AddLinkDialog, &QDialog::reject); QMetaObject::connectSlotsByName(AddLinkDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/addtorrentform.ui.h b/tests/auto/tools/uic/baseline/addtorrentform.ui.h index 3de95df1fc..e5369d8c4a 100644 --- a/tests/auto/tools/uic/baseline/addtorrentform.ui.h +++ b/tests/auto/tools/uic/baseline/addtorrentform.ui.h @@ -198,8 +198,8 @@ public: QWidget::setTabOrder(okButton, cancelButton); retranslateUi(AddTorrentFile); - QObject::connect(okButton, SIGNAL(clicked()), AddTorrentFile, SLOT(accept())); - QObject::connect(cancelButton, SIGNAL(clicked()), AddTorrentFile, SLOT(reject())); + QObject::connect(okButton, &QPushButton::clicked, AddTorrentFile, &QDialog::accept); + QObject::connect(cancelButton, &QPushButton::clicked, AddTorrentFile, &QDialog::reject); browseTorrents->setDefault(true); diff --git a/tests/auto/tools/uic/baseline/authenticationdialog.ui.h b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h index ba4ce13db1..1d475005bf 100644 --- a/tests/auto/tools/uic/baseline/authenticationdialog.ui.h +++ b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h @@ -10,6 +10,7 @@ #define AUTHENTICATIONDIALOG_H #include +#include #include #include #include @@ -95,8 +96,8 @@ public: retranslateUi(Dialog); - QObject::connect(buttonBox, SIGNAL(accepted()), Dialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), Dialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, Dialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, Dialog, &QDialog::reject); QMetaObject::connectSlotsByName(Dialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/backside.ui.h b/tests/auto/tools/uic/baseline/backside.ui.h index 709f494922..1e21e21fe9 100644 --- a/tests/auto/tools/uic/baseline/backside.ui.h +++ b/tests/auto/tools/uic/baseline/backside.ui.h @@ -136,8 +136,8 @@ public: QWidget::setTabOrder(groupBox_2, treeWidget); retranslateUi(BackSide); - QObject::connect(horizontalSlider, SIGNAL(valueChanged(int)), spinBox, SLOT(setValue(int))); - QObject::connect(spinBox, SIGNAL(valueChanged(int)), horizontalSlider, SLOT(setValue(int))); + QObject::connect(horizontalSlider, &QSlider::valueChanged, spinBox, &QSpinBox::setValue); + QObject::connect(spinBox, &QSpinBox::valueChanged, horizontalSlider, &QSlider::setValue); QMetaObject::connectSlotsByName(BackSide); } // setupUi diff --git a/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h b/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h index 27911f2741..a1557bf4fd 100644 --- a/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h +++ b/tests/auto/tools/uic/baseline/bookmarkdialog.ui.h @@ -10,6 +10,7 @@ #define BOOKMARKDIALOG_H #include +#include #include #include #include @@ -140,8 +141,8 @@ public: retranslateUi(BookmarkDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), BookmarkDialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), BookmarkDialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, BookmarkDialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, BookmarkDialog, &QDialog::reject); QMetaObject::connectSlotsByName(BookmarkDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h b/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h index 68e54d1f98..d2b504394e 100644 --- a/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h +++ b/tests/auto/tools/uic/baseline/bug18156QTreeWidget.ui.h @@ -10,6 +10,7 @@ #define BUG18156QTREEWIDGET_H #include +#include #include #include #include @@ -49,8 +50,8 @@ public: retranslateUi(Dialog); - QObject::connect(buttonBox, SIGNAL(accepted()), Dialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), Dialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, Dialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, Dialog, &QDialog::reject); QMetaObject::connectSlotsByName(Dialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/certificateinfo.ui.h b/tests/auto/tools/uic/baseline/certificateinfo.ui.h index 029e5b5582..8734ab257a 100644 --- a/tests/auto/tools/uic/baseline/certificateinfo.ui.h +++ b/tests/auto/tools/uic/baseline/certificateinfo.ui.h @@ -10,6 +10,7 @@ #define CERTIFICATEINFO_H #include +#include #include #include #include @@ -83,7 +84,7 @@ public: retranslateUi(CertificateInfo); - QObject::connect(buttonBox, SIGNAL(clicked(QAbstractButton*)), CertificateInfo, SLOT(accept())); + QObject::connect(buttonBox, &QDialogButtonBox::clicked, CertificateInfo, &QDialog::accept); QMetaObject::connectSlotsByName(CertificateInfo); } // setupUi diff --git a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h index 0d676f7953..99b279fc25 100644 --- a/tests/auto/tools/uic/baseline/chatmainwindow.ui.h +++ b/tests/auto/tools/uic/baseline/chatmainwindow.ui.h @@ -139,8 +139,8 @@ public: menuFile->addAction(actionQuit); retranslateUi(ChatMainWindow); - QObject::connect(messageLineEdit, SIGNAL(returnPressed()), sendButton, SLOT(animateClick())); - QObject::connect(actionQuit, SIGNAL(triggered(bool)), ChatMainWindow, SLOT(close())); + QObject::connect(messageLineEdit, &QLineEdit::returnPressed, sendButton, &QPushButton::animateClick); + QObject::connect(actionQuit, &QAction::triggered, ChatMainWindow, &QMainWindow::close); QMetaObject::connectSlotsByName(ChatMainWindow); } // setupUi diff --git a/tests/auto/tools/uic/baseline/chatsetnickname.ui.h b/tests/auto/tools/uic/baseline/chatsetnickname.ui.h index 8c8415f4ea..8c94d7b49e 100644 --- a/tests/auto/tools/uic/baseline/chatsetnickname.ui.h +++ b/tests/auto/tools/uic/baseline/chatsetnickname.ui.h @@ -104,8 +104,8 @@ public: retranslateUi(NicknameDialog); - QObject::connect(okButton, SIGNAL(clicked()), NicknameDialog, SLOT(accept())); - QObject::connect(cancelButton, SIGNAL(clicked()), NicknameDialog, SLOT(reject())); + QObject::connect(okButton, &QPushButton::clicked, NicknameDialog, &QDialog::accept); + QObject::connect(cancelButton, &QPushButton::clicked, NicknameDialog, &QDialog::reject); QMetaObject::connectSlotsByName(NicknameDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/config.ui.h b/tests/auto/tools/uic/baseline/config.ui.h index dcaad3c528..8f29926fbb 100644 --- a/tests/auto/tools/uic/baseline/config.ui.h +++ b/tests/auto/tools/uic/baseline/config.ui.h @@ -695,8 +695,8 @@ public: retranslateUi(Config); - QObject::connect(size_width, SIGNAL(valueChanged(int)), size_custom, SLOT(click())); - QObject::connect(size_height, SIGNAL(valueChanged(int)), size_custom, SLOT(click())); + QObject::connect(size_width, &QSpinBox::valueChanged, size_custom, &QRadioButton::click); + QObject::connect(size_height, &QSpinBox::valueChanged, size_custom, &QRadioButton::click); buttonOk->setDefault(true); diff --git a/tests/auto/tools/uic/baseline/connectdialog.ui.h b/tests/auto/tools/uic/baseline/connectdialog.ui.h index 7a3a941429..a20a406b42 100644 --- a/tests/auto/tools/uic/baseline/connectdialog.ui.h +++ b/tests/auto/tools/uic/baseline/connectdialog.ui.h @@ -10,6 +10,7 @@ #define CONNECTDIALOG_H #include +#include #include #include #include @@ -118,8 +119,8 @@ public: retranslateUi(ConnectDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), ConnectDialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), ConnectDialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, ConnectDialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, ConnectDialog, &QDialog::reject); QMetaObject::connectSlotsByName(ConnectDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/cookies.ui.h b/tests/auto/tools/uic/baseline/cookies.ui.h index 78cc4cb641..56ec0bbb0d 100644 --- a/tests/auto/tools/uic/baseline/cookies.ui.h +++ b/tests/auto/tools/uic/baseline/cookies.ui.h @@ -10,6 +10,7 @@ #define COOKIES_H #include +#include #include #include #include @@ -84,7 +85,7 @@ public: retranslateUi(CookiesDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), CookiesDialog, SLOT(accept())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, CookiesDialog, &QDialog::accept); QMetaObject::connectSlotsByName(CookiesDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h b/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h index 5b8beb4ea4..95a43b6caf 100644 --- a/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h +++ b/tests/auto/tools/uic/baseline/cookiesexceptions.ui.h @@ -10,6 +10,7 @@ #define COOKIESEXCEPTIONS_H #include +#include #include #include #include @@ -151,7 +152,7 @@ public: retranslateUi(CookiesExceptionsDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), CookiesExceptionsDialog, SLOT(accept())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, CookiesExceptionsDialog, &QDialog::accept); QMetaObject::connectSlotsByName(CookiesExceptionsDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/default.ui.h b/tests/auto/tools/uic/baseline/default.ui.h index 2dda17cbc6..12374eed55 100644 --- a/tests/auto/tools/uic/baseline/default.ui.h +++ b/tests/auto/tools/uic/baseline/default.ui.h @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/tests/auto/tools/uic/baseline/filternamedialog.ui.h b/tests/auto/tools/uic/baseline/filternamedialog.ui.h index ad157f238c..7a6cec820f 100644 --- a/tests/auto/tools/uic/baseline/filternamedialog.ui.h +++ b/tests/auto/tools/uic/baseline/filternamedialog.ui.h @@ -10,6 +10,7 @@ #define FILTERNAMEDIALOG_H #include +#include #include #include #include diff --git a/tests/auto/tools/uic/baseline/finddialog.ui.h b/tests/auto/tools/uic/baseline/finddialog.ui.h index 2ab88ab2f9..d58666427a 100644 --- a/tests/auto/tools/uic/baseline/finddialog.ui.h +++ b/tests/auto/tools/uic/baseline/finddialog.ui.h @@ -183,7 +183,7 @@ public: QWidget::setTabOrder(translations, matchCase); retranslateUi(FindDialog); - QObject::connect(cancel, SIGNAL(clicked()), FindDialog, SLOT(reject())); + QObject::connect(cancel, &QPushButton::clicked, FindDialog, &QDialog::reject); findNxt->setDefault(true); diff --git a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h index 613a31280f..1242668af7 100644 --- a/tests/auto/tools/uic/baseline/formwindowsettings.ui.h +++ b/tests/auto/tools/uic/baseline/formwindowsettings.ui.h @@ -40,6 +40,7 @@ #define FORMWINDOWSETTINGS_H #include +#include #include #include #include @@ -263,8 +264,8 @@ public: QWidget::setTabOrder(spacingFunctionLineEdit, pixmapFunctionLineEdit); retranslateUi(FormWindowSettings); - QObject::connect(buttonBox, SIGNAL(accepted()), FormWindowSettings, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), FormWindowSettings, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, FormWindowSettings, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, FormWindowSettings, &QDialog::reject); QMetaObject::connectSlotsByName(FormWindowSettings); } // setupUi diff --git a/tests/auto/tools/uic/baseline/history.ui.h b/tests/auto/tools/uic/baseline/history.ui.h index 6591bbd566..7110068e90 100644 --- a/tests/auto/tools/uic/baseline/history.ui.h +++ b/tests/auto/tools/uic/baseline/history.ui.h @@ -10,6 +10,7 @@ #define HISTORY_H #include +#include #include #include #include @@ -84,7 +85,7 @@ public: retranslateUi(HistoryDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), HistoryDialog, SLOT(accept())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, HistoryDialog, &QDialog::accept); QMetaObject::connectSlotsByName(HistoryDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/identifierpage.ui.h b/tests/auto/tools/uic/baseline/identifierpage.ui.h index facf6b1c35..af40184e71 100644 --- a/tests/auto/tools/uic/baseline/identifierpage.ui.h +++ b/tests/auto/tools/uic/baseline/identifierpage.ui.h @@ -82,7 +82,7 @@ public: retranslateUi(IdentifierPage); - QObject::connect(globalButton, SIGNAL(toggled(bool)), prefixLineEdit, SLOT(setEnabled(bool))); + QObject::connect(globalButton, &QRadioButton::toggled, prefixLineEdit, &QLineEdit::setEnabled); QMetaObject::connectSlotsByName(IdentifierPage); } // setupUi diff --git a/tests/auto/tools/uic/baseline/imagedialog.ui.h b/tests/auto/tools/uic/baseline/imagedialog.ui.h index a6afb15af4..6e372f27d9 100644 --- a/tests/auto/tools/uic/baseline/imagedialog.ui.h +++ b/tests/auto/tools/uic/baseline/imagedialog.ui.h @@ -189,7 +189,7 @@ public: QWidget::setTabOrder(okButton, cancelButton); retranslateUi(dialog); - QObject::connect(nameLineEdit, SIGNAL(returnPressed()), okButton, SLOT(animateClick())); + QObject::connect(nameLineEdit, &QLineEdit::returnPressed, okButton, &QPushButton::animateClick); QMetaObject::connectSlotsByName(dialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/installdialog.ui.h b/tests/auto/tools/uic/baseline/installdialog.ui.h index 64b375aec6..5031266737 100644 --- a/tests/auto/tools/uic/baseline/installdialog.ui.h +++ b/tests/auto/tools/uic/baseline/installdialog.ui.h @@ -113,7 +113,7 @@ public: retranslateUi(InstallDialog); - QObject::connect(closeButton, SIGNAL(clicked()), InstallDialog, SLOT(accept())); + QObject::connect(closeButton, &QPushButton::clicked, InstallDialog, &QDialog::accept); QMetaObject::connectSlotsByName(InstallDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/languagesdialog.ui.h b/tests/auto/tools/uic/baseline/languagesdialog.ui.h index 23858dad84..0125827d63 100644 --- a/tests/auto/tools/uic/baseline/languagesdialog.ui.h +++ b/tests/auto/tools/uic/baseline/languagesdialog.ui.h @@ -101,7 +101,7 @@ public: retranslateUi(LanguagesDialog); - QObject::connect(okButton, SIGNAL(clicked()), LanguagesDialog, SLOT(accept())); + QObject::connect(okButton, &QPushButton::clicked, LanguagesDialog, &QDialog::accept); QMetaObject::connectSlotsByName(LanguagesDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h b/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h index 8ce9975f7c..c5ee055bf6 100644 --- a/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/listwidgeteditor.ui.h @@ -40,6 +40,7 @@ #define LISTWIDGETEDITOR_H #include +#include #include #include #include @@ -164,8 +165,8 @@ public: QWidget::setTabOrder(moveItemUpButton, moveItemDownButton); retranslateUi(qdesigner_internal__ListWidgetEditor); - QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__ListWidgetEditor, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__ListWidgetEditor, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, qdesigner_internal__ListWidgetEditor, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, qdesigner_internal__ListWidgetEditor, &QDialog::reject); QMetaObject::connectSlotsByName(qdesigner_internal__ListWidgetEditor); } // setupUi diff --git a/tests/auto/tools/uic/baseline/mainwindow.ui.h b/tests/auto/tools/uic/baseline/mainwindow.ui.h index f0ad126c47..dba9a5eb37 100644 --- a/tests/auto/tools/uic/baseline/mainwindow.ui.h +++ b/tests/auto/tools/uic/baseline/mainwindow.ui.h @@ -346,15 +346,15 @@ public: menuFile->addAction(action_Exit); retranslateUi(MainWindow); - QObject::connect(action_Exit, SIGNAL(triggered()), MainWindow, SLOT(close())); - QObject::connect(chooseFromCodePoints, SIGNAL(toggled(bool)), characterRangeView, SLOT(setEnabled(bool))); - QObject::connect(chooseFromCodePoints, SIGNAL(toggled(bool)), selectAll, SLOT(setEnabled(bool))); - QObject::connect(chooseFromCodePoints, SIGNAL(toggled(bool)), deselectAll, SLOT(setEnabled(bool))); - QObject::connect(chooseFromCodePoints, SIGNAL(toggled(bool)), invertSelection, SLOT(setEnabled(bool))); - QObject::connect(chooseFromSampleFile, SIGNAL(toggled(bool)), sampleFile, SLOT(setEnabled(bool))); - QObject::connect(chooseFromSampleFile, SIGNAL(toggled(bool)), browseSampleFile, SLOT(setEnabled(bool))); - QObject::connect(chooseFromSampleFile, SIGNAL(toggled(bool)), charCount, SLOT(setEnabled(bool))); - QObject::connect(chooseFromSampleFile, SIGNAL(toggled(bool)), label_5, SLOT(setEnabled(bool))); + QObject::connect(action_Exit, &QAction::triggered, MainWindow, &QMainWindow::close); + QObject::connect(chooseFromCodePoints, &QRadioButton::toggled, characterRangeView, &QListWidget::setEnabled); + QObject::connect(chooseFromCodePoints, &QRadioButton::toggled, selectAll, &QPushButton::setEnabled); + QObject::connect(chooseFromCodePoints, &QRadioButton::toggled, deselectAll, &QPushButton::setEnabled); + QObject::connect(chooseFromCodePoints, &QRadioButton::toggled, invertSelection, &QPushButton::setEnabled); + QObject::connect(chooseFromSampleFile, &QRadioButton::toggled, sampleFile, &QLineEdit::setEnabled); + QObject::connect(chooseFromSampleFile, &QRadioButton::toggled, browseSampleFile, &QPushButton::setEnabled); + QObject::connect(chooseFromSampleFile, &QRadioButton::toggled, charCount, &QLabel::setEnabled); + QObject::connect(chooseFromSampleFile, &QRadioButton::toggled, label_5, &QLabel::setEnabled); QMetaObject::connectSlotsByName(MainWindow); } // setupUi diff --git a/tests/auto/tools/uic/baseline/newactiondialog.ui.h b/tests/auto/tools/uic/baseline/newactiondialog.ui.h index 8059affff1..dcea5b066b 100644 --- a/tests/auto/tools/uic/baseline/newactiondialog.ui.h +++ b/tests/auto/tools/uic/baseline/newactiondialog.ui.h @@ -40,6 +40,7 @@ #define NEWACTIONDIALOG_H #include +#include #include #include #include @@ -151,8 +152,8 @@ public: QWidget::setTabOrder(editActionText, editObjectName); retranslateUi(qdesigner_internal__NewActionDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__NewActionDialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__NewActionDialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, qdesigner_internal__NewActionDialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, qdesigner_internal__NewActionDialog, &QDialog::reject); QMetaObject::connectSlotsByName(qdesigner_internal__NewActionDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h index eb93a98eb8..c377320702 100644 --- a/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h +++ b/tests/auto/tools/uic/baseline/newdynamicpropertydialog.ui.h @@ -10,6 +10,7 @@ #define NEWDYNAMICPROPERTYDIALOG_H #include +#include #include #include #include diff --git a/tests/auto/tools/uic/baseline/newform.ui.h b/tests/auto/tools/uic/baseline/newform.ui.h index 488dbd2506..261b96a017 100644 --- a/tests/auto/tools/uic/baseline/newform.ui.h +++ b/tests/auto/tools/uic/baseline/newform.ui.h @@ -40,6 +40,7 @@ #define NEWFORM_H #include +#include #include #include #include diff --git a/tests/auto/tools/uic/baseline/orderdialog.ui.h b/tests/auto/tools/uic/baseline/orderdialog.ui.h index 1671bcc911..c4b0ee87c2 100644 --- a/tests/auto/tools/uic/baseline/orderdialog.ui.h +++ b/tests/auto/tools/uic/baseline/orderdialog.ui.h @@ -40,6 +40,7 @@ #define ORDERDIALOG_H #include +#include #include #include #include @@ -122,8 +123,8 @@ public: retranslateUi(qdesigner_internal__OrderDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__OrderDialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__OrderDialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, qdesigner_internal__OrderDialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, qdesigner_internal__OrderDialog, &QDialog::reject); QMetaObject::connectSlotsByName(qdesigner_internal__OrderDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/pagefold.ui.h b/tests/auto/tools/uic/baseline/pagefold.ui.h index 6e54f92cda..1f4dedf6f3 100644 --- a/tests/auto/tools/uic/baseline/pagefold.ui.h +++ b/tests/auto/tools/uic/baseline/pagefold.ui.h @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff --git a/tests/auto/tools/uic/baseline/paletteeditor.ui.h b/tests/auto/tools/uic/baseline/paletteeditor.ui.h index 1367a1513f..4f5a00dead 100644 --- a/tests/auto/tools/uic/baseline/paletteeditor.ui.h +++ b/tests/auto/tools/uic/baseline/paletteeditor.ui.h @@ -40,6 +40,7 @@ #define PALETTEEDITOR_H #include +#include #include #include #include @@ -189,8 +190,8 @@ public: retranslateUi(qdesigner_internal__PaletteEditor); - QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__PaletteEditor, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__PaletteEditor, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, qdesigner_internal__PaletteEditor, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, qdesigner_internal__PaletteEditor, &QDialog::reject); QMetaObject::connectSlotsByName(qdesigner_internal__PaletteEditor); } // setupUi diff --git a/tests/auto/tools/uic/baseline/passworddialog.ui.h b/tests/auto/tools/uic/baseline/passworddialog.ui.h index f44374e6f2..aab88314c6 100644 --- a/tests/auto/tools/uic/baseline/passworddialog.ui.h +++ b/tests/auto/tools/uic/baseline/passworddialog.ui.h @@ -10,6 +10,7 @@ #define PASSWORDDIALOG_H #include +#include #include #include #include @@ -90,8 +91,8 @@ public: retranslateUi(PasswordDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), PasswordDialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), PasswordDialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, PasswordDialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, PasswordDialog, &QDialog::reject); QMetaObject::connectSlotsByName(PasswordDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/plugindialog.ui.h b/tests/auto/tools/uic/baseline/plugindialog.ui.h index 75c4705be6..5461e2235e 100644 --- a/tests/auto/tools/uic/baseline/plugindialog.ui.h +++ b/tests/auto/tools/uic/baseline/plugindialog.ui.h @@ -40,6 +40,7 @@ #define PLUGINDIALOG_H #include +#include #include #include #include @@ -104,7 +105,7 @@ public: retranslateUi(PluginDialog); - QObject::connect(buttonBox, SIGNAL(rejected()), PluginDialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, PluginDialog, &QDialog::reject); QMetaObject::connectSlotsByName(PluginDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/preferencesdialog.ui.h b/tests/auto/tools/uic/baseline/preferencesdialog.ui.h index e22704be0c..4d31980872 100644 --- a/tests/auto/tools/uic/baseline/preferencesdialog.ui.h +++ b/tests/auto/tools/uic/baseline/preferencesdialog.ui.h @@ -10,6 +10,7 @@ #define PREFERENCESDIALOG_H #include +#include #include #include #include @@ -142,8 +143,8 @@ public: retranslateUi(PreferencesDialog); - QObject::connect(m_dialogButtonBox, SIGNAL(accepted()), PreferencesDialog, SLOT(accept())); - QObject::connect(m_dialogButtonBox, SIGNAL(rejected()), PreferencesDialog, SLOT(reject())); + QObject::connect(m_dialogButtonBox, &QDialogButtonBox::accepted, PreferencesDialog, &QDialog::accept); + QObject::connect(m_dialogButtonBox, &QDialogButtonBox::rejected, PreferencesDialog, &QDialog::reject); QMetaObject::connectSlotsByName(PreferencesDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/previewdialogbase.ui.h b/tests/auto/tools/uic/baseline/previewdialogbase.ui.h index 335b1874ac..778fe27ccf 100644 --- a/tests/auto/tools/uic/baseline/previewdialogbase.ui.h +++ b/tests/auto/tools/uic/baseline/previewdialogbase.ui.h @@ -10,6 +10,7 @@ #define PREVIEWDIALOGBASE_H #include +#include #include #include #include @@ -162,8 +163,8 @@ public: #endif // QT_CONFIG(shortcut) retranslateUi(PreviewDialogBase); - QObject::connect(buttonBox, SIGNAL(accepted()), PreviewDialogBase, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), PreviewDialogBase, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, PreviewDialogBase, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, PreviewDialogBase, &QDialog::reject); QMetaObject::connectSlotsByName(PreviewDialogBase); } // setupUi diff --git a/tests/auto/tools/uic/baseline/proxy.ui.h b/tests/auto/tools/uic/baseline/proxy.ui.h index 63f0d4574f..fb9b7431f4 100644 --- a/tests/auto/tools/uic/baseline/proxy.ui.h +++ b/tests/auto/tools/uic/baseline/proxy.ui.h @@ -10,6 +10,7 @@ #define PROXY_H #include +#include #include #include #include @@ -79,8 +80,8 @@ public: retranslateUi(ProxyDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), ProxyDialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), ProxyDialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, ProxyDialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, ProxyDialog, &QDialog::reject); QMetaObject::connectSlotsByName(ProxyDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/qfiledialog.ui.h b/tests/auto/tools/uic/baseline/qfiledialog.ui.h index 22cc37b8c9..abe7dbc147 100644 --- a/tests/auto/tools/uic/baseline/qfiledialog.ui.h +++ b/tests/auto/tools/uic/baseline/qfiledialog.ui.h @@ -40,6 +40,7 @@ #define QFILEDIALOG_H #include +#include #include #include #include diff --git a/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h b/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h index 86da3a7849..375ca53177 100644 --- a/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h +++ b/tests/auto/tools/uic/baseline/qprintsettingsoutput.ui.h @@ -265,8 +265,8 @@ public: #endif // QT_CONFIG(shortcut) retranslateUi(QPrintSettingsOutput); - QObject::connect(printRange, SIGNAL(toggled(bool)), from, SLOT(setEnabled(bool))); - QObject::connect(printRange, SIGNAL(toggled(bool)), to, SLOT(setEnabled(bool))); + QObject::connect(printRange, &QRadioButton::toggled, from, &QSpinBox::setEnabled); + QObject::connect(printRange, &QRadioButton::toggled, to, &QSpinBox::setEnabled); tabs->setCurrentIndex(0); diff --git a/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h b/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h index f6ddf100f8..f238e3af3c 100644 --- a/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h +++ b/tests/auto/tools/uic/baseline/qtgradientdialog.ui.h @@ -40,6 +40,7 @@ #define QTGRADIENTDIALOG_H #include +#include #include #include #include @@ -81,8 +82,8 @@ public: retranslateUi(QtGradientDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), QtGradientDialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), QtGradientDialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, QtGradientDialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, QtGradientDialog, &QDialog::reject); QMetaObject::connectSlotsByName(QtGradientDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h index 4dd7a11182..d29f635045 100644 --- a/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h +++ b/tests/auto/tools/uic/baseline/qtgradientviewdialog.ui.h @@ -40,6 +40,7 @@ #define QTGRADIENTVIEWDIALOG_H #include +#include #include #include #include @@ -81,8 +82,8 @@ public: retranslateUi(QtGradientViewDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), QtGradientViewDialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), QtGradientViewDialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, QtGradientViewDialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, QtGradientViewDialog, &QDialog::reject); QMetaObject::connectSlotsByName(QtGradientViewDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h index 5fd78ddfaf..d44db3e113 100644 --- a/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h +++ b/tests/auto/tools/uic/baseline/qtresourceeditordialog.ui.h @@ -10,6 +10,7 @@ #define QTRESOURCEEDITORDIALOG_H #include +#include #include #include #include @@ -133,8 +134,8 @@ public: retranslateUi(QtResourceEditorDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), QtResourceEditorDialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), QtResourceEditorDialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, QtResourceEditorDialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, QtResourceEditorDialog, &QDialog::reject); QMetaObject::connectSlotsByName(QtResourceEditorDialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h b/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h index fe4c2ace2e..c9e0c9e778 100644 --- a/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h +++ b/tests/auto/tools/uic/baseline/qttoolbardialog.ui.h @@ -10,6 +10,7 @@ #define QTTOOLBARDIALOG_H #include +#include #include #include #include diff --git a/tests/auto/tools/uic/baseline/saveformastemplate.ui.h b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h index 22229fd9b6..2b0f2cbae9 100644 --- a/tests/auto/tools/uic/baseline/saveformastemplate.ui.h +++ b/tests/auto/tools/uic/baseline/saveformastemplate.ui.h @@ -40,6 +40,7 @@ #define SAVEFORMASTEMPLATE_H #include +#include #include #include #include @@ -123,8 +124,8 @@ public: #endif // QT_CONFIG(shortcut) retranslateUi(SaveFormAsTemplate); - QObject::connect(buttonBox, SIGNAL(accepted()), SaveFormAsTemplate, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), SaveFormAsTemplate, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, SaveFormAsTemplate, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, SaveFormAsTemplate, &QDialog::reject); QMetaObject::connectSlotsByName(SaveFormAsTemplate); } // setupUi diff --git a/tests/auto/tools/uic/baseline/settings.ui.h b/tests/auto/tools/uic/baseline/settings.ui.h index c509240f0d..312d9291e3 100644 --- a/tests/auto/tools/uic/baseline/settings.ui.h +++ b/tests/auto/tools/uic/baseline/settings.ui.h @@ -10,6 +10,7 @@ #define SETTINGS_H #include +#include #include #include #include @@ -174,8 +175,8 @@ public: retranslateUi(Dialog); - QObject::connect(buttonBox, SIGNAL(accepted()), Dialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), Dialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, Dialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, Dialog, &QDialog::reject); QMetaObject::connectSlotsByName(Dialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/signalslotdialog.ui.h b/tests/auto/tools/uic/baseline/signalslotdialog.ui.h index 3116e67dc8..eea8141815 100644 --- a/tests/auto/tools/uic/baseline/signalslotdialog.ui.h +++ b/tests/auto/tools/uic/baseline/signalslotdialog.ui.h @@ -10,6 +10,7 @@ #define SIGNALSLOTDIALOG_H #include +#include #include #include #include diff --git a/tests/auto/tools/uic/baseline/sslclient.ui.h b/tests/auto/tools/uic/baseline/sslclient.ui.h index c794aeeefa..8b24da4d1a 100644 --- a/tests/auto/tools/uic/baseline/sslclient.ui.h +++ b/tests/auto/tools/uic/baseline/sslclient.ui.h @@ -143,8 +143,8 @@ public: retranslateUi(Form); - QObject::connect(hostNameEdit, SIGNAL(returnPressed()), connectButton, SLOT(animateClick())); - QObject::connect(sessionInput, SIGNAL(returnPressed()), sendButton, SLOT(animateClick())); + QObject::connect(hostNameEdit, &QLineEdit::returnPressed, connectButton, &QPushButton::animateClick); + QObject::connect(sessionInput, &QLineEdit::returnPressed, sendButton, &QPushButton::animateClick); connectButton->setDefault(true); sendButton->setDefault(true); diff --git a/tests/auto/tools/uic/baseline/sslerrors.ui.h b/tests/auto/tools/uic/baseline/sslerrors.ui.h index b8758815e5..60f4432669 100644 --- a/tests/auto/tools/uic/baseline/sslerrors.ui.h +++ b/tests/auto/tools/uic/baseline/sslerrors.ui.h @@ -78,8 +78,8 @@ public: retranslateUi(SslErrors); - QObject::connect(pushButton, SIGNAL(clicked()), SslErrors, SLOT(accept())); - QObject::connect(pushButton_2, SIGNAL(clicked()), SslErrors, SLOT(reject())); + QObject::connect(pushButton, &QPushButton::clicked, SslErrors, &QDialog::accept); + QObject::connect(pushButton_2, &QPushButton::clicked, SslErrors, &QDialog::reject); QMetaObject::connectSlotsByName(SslErrors); } // setupUi diff --git a/tests/auto/tools/uic/baseline/stringlisteditor.ui.h b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h index 03350482da..5e3d86be06 100644 --- a/tests/auto/tools/uic/baseline/stringlisteditor.ui.h +++ b/tests/auto/tools/uic/baseline/stringlisteditor.ui.h @@ -40,6 +40,7 @@ #define STRINGLISTEDITOR_H #include +#include #include #include #include @@ -206,8 +207,8 @@ public: #endif // QT_CONFIG(shortcut) retranslateUi(qdesigner_internal__Dialog); - QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__Dialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__Dialog, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, qdesigner_internal__Dialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, qdesigner_internal__Dialog, &QDialog::reject); QMetaObject::connectSlotsByName(qdesigner_internal__Dialog); } // setupUi diff --git a/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h index f279b31060..839bf573b1 100644 --- a/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/tablewidgeteditor.ui.h @@ -40,6 +40,7 @@ #define TABLEWIDGETEDITOR_H #include +#include #include #include #include @@ -303,8 +304,8 @@ public: QWidget::setTabOrder(moveRowUpButton, moveRowDownButton); retranslateUi(qdesigner_internal__TableWidgetEditor); - QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__TableWidgetEditor, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__TableWidgetEditor, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, qdesigner_internal__TableWidgetEditor, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, qdesigner_internal__TableWidgetEditor, &QDialog::reject); QMetaObject::connectSlotsByName(qdesigner_internal__TableWidgetEditor); } // setupUi diff --git a/tests/auto/tools/uic/baseline/textfinder.ui.h b/tests/auto/tools/uic/baseline/textfinder.ui.h index 25d1c3aace..e583390f80 100644 --- a/tests/auto/tools/uic/baseline/textfinder.ui.h +++ b/tests/auto/tools/uic/baseline/textfinder.ui.h @@ -86,7 +86,7 @@ public: #endif // QT_CONFIG(shortcut) retranslateUi(Form); - QObject::connect(lineEdit, SIGNAL(returnPressed()), findButton, SLOT(animateClick())); + QObject::connect(lineEdit, &QLineEdit::returnPressed, findButton, &QPushButton::animateClick); QMetaObject::connectSlotsByName(Form); } // setupUi diff --git a/tests/auto/tools/uic/baseline/translatedialog.ui.h b/tests/auto/tools/uic/baseline/translatedialog.ui.h index fc0bad8b9e..29c6083366 100644 --- a/tests/auto/tools/uic/baseline/translatedialog.ui.h +++ b/tests/auto/tools/uic/baseline/translatedialog.ui.h @@ -195,7 +195,7 @@ public: QWidget::setTabOrder(ckMatchCase, ckMarkFinished); retranslateUi(TranslateDialog); - QObject::connect(cancel, SIGNAL(clicked()), TranslateDialog, SLOT(reject())); + QObject::connect(cancel, &QPushButton::clicked, TranslateDialog, &QDialog::reject); findNxt->setDefault(true); diff --git a/tests/auto/tools/uic/baseline/translationsettings.ui.h b/tests/auto/tools/uic/baseline/translationsettings.ui.h index 10d10353e5..73f22218d7 100644 --- a/tests/auto/tools/uic/baseline/translationsettings.ui.h +++ b/tests/auto/tools/uic/baseline/translationsettings.ui.h @@ -10,6 +10,7 @@ #define TRANSLATIONSETTINGS_H #include +#include #include #include #include @@ -91,8 +92,8 @@ public: #endif // QT_CONFIG(shortcut) retranslateUi(TranslationSettings); - QObject::connect(buttonBox, SIGNAL(accepted()), TranslationSettings, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), TranslationSettings, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, TranslationSettings, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, TranslationSettings, &QDialog::reject); QMetaObject::connectSlotsByName(TranslationSettings); } // setupUi diff --git a/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h index c7840ce6df..335279860a 100644 --- a/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h +++ b/tests/auto/tools/uic/baseline/treewidgeteditor.ui.h @@ -40,6 +40,7 @@ #define TREEWIDGETEDITOR_H #include +#include #include #include #include @@ -268,8 +269,8 @@ public: QWidget::setTabOrder(moveColumnUpButton, moveColumnDownButton); retranslateUi(qdesigner_internal__TreeWidgetEditor); - QObject::connect(buttonBox, SIGNAL(accepted()), qdesigner_internal__TreeWidgetEditor, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), qdesigner_internal__TreeWidgetEditor, SLOT(reject())); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, qdesigner_internal__TreeWidgetEditor, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, qdesigner_internal__TreeWidgetEditor, &QDialog::reject); QMetaObject::connectSlotsByName(qdesigner_internal__TreeWidgetEditor); } // setupUi diff --git a/tests/auto/tools/uic/baseline/validators.ui.h b/tests/auto/tools/uic/baseline/validators.ui.h index 6de9ae1483..1283573e5c 100644 --- a/tests/auto/tools/uic/baseline/validators.ui.h +++ b/tests/auto/tools/uic/baseline/validators.ui.h @@ -368,7 +368,7 @@ public: retranslateUi(ValidatorsForm); - QObject::connect(pushButton, SIGNAL(clicked()), ValidatorsForm, SLOT(close())); + QObject::connect(pushButton, &QPushButton::clicked, ValidatorsForm, &QWidget::close); QMetaObject::connectSlotsByName(ValidatorsForm); } // setupUi diff --git a/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h index 504fe37afd..cf67805330 100644 --- a/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h +++ b/tests/auto/tools/uic/baseline/wateringconfigdialog.ui.h @@ -10,6 +10,7 @@ #define WATERINGCONFIGDIALOG_H #include +#include #include #include #include @@ -240,10 +241,10 @@ public: retranslateUi(WateringConfigDialog); - QObject::connect(buttonBox, SIGNAL(accepted()), WateringConfigDialog, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), WateringConfigDialog, SLOT(reject())); - QObject::connect(temperatureCheckBox, SIGNAL(toggled(bool)), temperatureSpinBox, SLOT(setEnabled(bool))); - QObject::connect(rainCheckBox, SIGNAL(toggled(bool)), rainSpinBox, SLOT(setEnabled(bool))); + QObject::connect(buttonBox, &QDialogButtonBox::accepted, WateringConfigDialog, &QDialog::accept); + QObject::connect(buttonBox, &QDialogButtonBox::rejected, WateringConfigDialog, &QDialog::reject); + QObject::connect(temperatureCheckBox, &QCheckBox::toggled, temperatureSpinBox, &QSpinBox::setEnabled); + QObject::connect(rainCheckBox, &QCheckBox::toggled, rainSpinBox, &QSpinBox::setEnabled); QMetaObject::connectSlotsByName(WateringConfigDialog); } // setupUi