From a7ed81b557d593a8ddb43b71bf4bbf3b44ead070 Mon Sep 17 00:00:00 2001 From: Marcel Krems Date: Thu, 5 Apr 2012 22:12:15 +0200 Subject: Removed QApplication overloads used solely for documentation. Also removed a define which was used only for this purpose. This change brings the constructors in line with Q{Core,Gui}Application. Change-Id: I1134ca5611453e8445c1a4f3226846621fa8872c Reviewed-by: Olivier Goffart --- src/widgets/kernel/qapplication.cpp | 12 ------------ src/widgets/kernel/qapplication.h | 9 --------- 2 files changed, 21 deletions(-) (limited to 'src/widgets/kernel') diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 2615ac891d..22589a4170 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -558,10 +558,6 @@ void QApplicationPrivate::process_cmdline() \sa arguments() */ -QApplication::QApplication(int &argc, char **argv) - : QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000)) -{ Q_D(QApplication); d->construct(); } - QApplication::QApplication(int &argc, char **argv, int _internal) : QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, _internal)) { Q_D(QApplication); d->construct(); } @@ -584,10 +580,6 @@ QApplication::QApplication(int &argc, char **argv, int _internal) \snippet doc/src/snippets/code/src_gui_kernel_qapplication.cpp 0 */ -QApplication::QApplication(int &argc, char **argv, bool GUIenabled ) - : QGuiApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, 0x040000)) -{ Q_D(QApplication); d->construct(); } - QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _internal) : QGuiApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, _internal)) { Q_D(QApplication); d->construct();} @@ -603,10 +595,6 @@ QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _intern be greater than zero and \a argv must contain at least one valid character string. */ -QApplication::QApplication(int &argc, char **argv, Type type) - : QGuiApplication(*new QApplicationPrivate(argc, argv, type, 0x040000)) -{ Q_D(QApplication); d->construct(); } - QApplication::QApplication(int &argc, char **argv, Type type , int _internal) : QGuiApplication(*new QApplicationPrivate(argc, argv, type, _internal)) { Q_D(QApplication); d->construct(); } diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 6c1ced1623..7a57a913bd 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -96,11 +96,9 @@ class Q_WIDGETS_EXPORT QApplication : public QGuiApplication public: -#ifndef qdoc QApplication(int &argc, char **argv, int = ApplicationFlags); QT_DEPRECATED QApplication(int &argc, char **argv, bool GUIenabled, int = ApplicationFlags); QApplication(int &argc, char **argv, Type, int = ApplicationFlags); -#endif virtual ~QApplication(); static Type type(); @@ -225,13 +223,6 @@ protected: bool event(QEvent *); bool compressEvent(QEvent *, QObject *receiver, QPostEventList *); - -#if defined(Q_INTERNAL_QAPP_SRC) || defined(qdoc) - QApplication(int &argc, char **argv); - QT_DEPRECATED QApplication(int &argc, char **argv, bool GUIenabled); - QApplication(int &argc, char **argv, Type); -#endif - private: Q_DISABLE_COPY(QApplication) Q_DECLARE_PRIVATE(QApplication) -- cgit v1.2.3