diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index eb5945b5ae7..4d69ca9a17d 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -393,7 +393,7 @@ static inline bool contains(int argc, char **argv, const char *needle) } #endif // Q_OS_WIN -QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv, uint) +QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv) : #ifndef QT_NO_QOBJECT QObjectPrivate(), @@ -707,13 +707,13 @@ QCoreApplication::QCoreApplication(QCoreApplicationPrivate &p) */ QCoreApplication::QCoreApplication(int &argc, char **argv #ifndef Q_QDOC - , int _internal + , int #endif ) #ifdef QT_NO_QOBJECT - : d_ptr(new QCoreApplicationPrivate(argc, argv, _internal)) + : d_ptr(new QCoreApplicationPrivate(argc, argv)) #else - : QObject(*new QCoreApplicationPrivate(argc, argv, _internal)) + : QObject(*new QCoreApplicationPrivate(argc, argv)) #endif { d_func()->q_ptr = this; diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index b5621f1de6f..94c4b0f1e98 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -56,7 +56,7 @@ public: Gui }; - QCoreApplicationPrivate(int &aargc, char **aargv, uint); + QCoreApplicationPrivate(int &aargc, char **aargv); // If not inheriting from QObjectPrivate: force this class to be polymorphic #ifdef QT_NO_QOBJECT diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index a8ec2c0540d..274342792f7 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -621,9 +621,9 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME #ifdef Q_QDOC QGuiApplication::QGuiApplication(int &argc, char **argv) #else -QGuiApplication::QGuiApplication(int &argc, char **argv, int flags) +QGuiApplication::QGuiApplication(int &argc, char **argv, int) #endif - : QCoreApplication(*new QGuiApplicationPrivate(argc, argv, flags)) + : QCoreApplication(*new QGuiApplicationPrivate(argc, argv)) { d_func()->init(); @@ -686,8 +686,8 @@ QGuiApplication::~QGuiApplication() QGuiApplicationPrivate::tabletDevicePoints.clear(); } -QGuiApplicationPrivate::QGuiApplicationPrivate(int &argc, char **argv, int flags) - : QCoreApplicationPrivate(argc, argv, flags), +QGuiApplicationPrivate::QGuiApplicationPrivate(int &argc, char **argv) + : QCoreApplicationPrivate(argc, argv), inputMethod(nullptr), lastTouchType(QEvent::TouchEnd), ownGlobalShareContext(false) diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index cc8b6a206c3..72a3fc78d0a 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -57,7 +57,7 @@ class Q_GUI_EXPORT QGuiApplicationPrivate : public QCoreApplicationPrivate { Q_DECLARE_PUBLIC(QGuiApplication) public: - QGuiApplicationPrivate(int &argc, char **argv, int flags); + QGuiApplicationPrivate(int &argc, char **argv); ~QGuiApplicationPrivate(); void init(); diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 5743f0e451e..c0920af760b 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -111,8 +111,8 @@ QApplicationPrivate *QApplicationPrivate::self = nullptr; bool QApplicationPrivate::autoSipEnabled = true; -QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, int flags) - : QApplicationPrivateBase(argc, argv, flags) +QApplicationPrivate::QApplicationPrivate(int &argc, char **argv) + : QApplicationPrivateBase(argc, argv) { application_type = QApplicationPrivate::Gui; @@ -442,9 +442,9 @@ void QApplicationPrivate::process_cmdline() #ifdef Q_QDOC QApplication::QApplication(int &argc, char **argv) #else -QApplication::QApplication(int &argc, char **argv, int _internal) +QApplication::QApplication(int &argc, char **argv, int) #endif - : QGuiApplication(*new QApplicationPrivate(argc, argv, _internal)) + : QGuiApplication(*new QApplicationPrivate(argc, argv)) { Q_D(QApplication); d->init(); diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index d7397a3d8ba..ee36f447423 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -64,7 +64,7 @@ class Q_WIDGETS_EXPORT QApplicationPrivate : public QApplicationPrivateBase { Q_DECLARE_PUBLIC(QApplication) public: - QApplicationPrivate(int &argc, char **argv, int flags); + QApplicationPrivate(int &argc, char **argv); ~QApplicationPrivate(); virtual void notifyLayoutDirectionChange() override;