1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QApplication: Baseclass fixup

Browse Source 
(cherry picked from commit 5bbdf65632feed1a2e3f30e97bcdd47950f2b8d4)
This commit is contained in:
Jørgen Lind 2011-04-27 17:36:02 +02:00 committed by Samuel Rødal
parent 9f14dc661e
commit 290573425c
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/kernel/qapplication.cpp
View File

@ -172,7 +172,7 @@ bool QApplicationPrivate::autoSipEnabled = true;
#endif #endif
QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, QApplication::Type type, int flags) QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, QApplication::Type type, int flags)
: QGuiApplicationPrivate(argc, argv, flags) : QApplicationPrivateBase(argc, argv, flags)
{ {
application_type = type; application_type = type;
qt_appType = type; qt_appType = type;
@ -728,11 +728,11 @@ void QApplicationPrivate::process_cmdline()
*/ */
QApplication::QApplication(int &argc, char **argv) QApplication::QApplication(int &argc, char **argv)
: QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000)) : QApplicationBase(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000))
{ Q_D(QApplication); d->construct(); } { Q_D(QApplication); d->construct(); }
QApplication::QApplication(int &argc, char **argv, int _internal) QApplication::QApplication(int &argc, char **argv, int _internal)
: QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, _internal)) : QApplicationBase(*new QApplicationPrivate(argc, argv, GuiClient, _internal))
{ Q_D(QApplication); d->construct(); } { Q_D(QApplication); d->construct(); }
@ -762,11 +762,11 @@ QApplication::QApplication(int &argc, char **argv, int _internal)
*/ */
QApplication::QApplication(int &argc, char **argv, bool GUIenabled ) QApplication::QApplication(int &argc, char **argv, bool GUIenabled )
: QGuiApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, 0x040000)) : QApplicationBase(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, 0x040000))
{ Q_D(QApplication); d->construct(); } { Q_D(QApplication); d->construct(); }
QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _internal) QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _internal)
: QGuiApplication(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, _internal)) : QApplicationBase(*new QApplicationPrivate(argc, argv, GUIenabled ? GuiClient : Tty, _internal))
{ Q_D(QApplication); d->construct();} { Q_D(QApplication); d->construct();}
@ -785,11 +785,11 @@ QApplication::QApplication(int &argc, char **argv, bool GUIenabled , int _intern
\c -qws option). \c -qws option).
*/ */
QApplication::QApplication(int &argc, char **argv, Type type) QApplication::QApplication(int &argc, char **argv, Type type)
: QGuiApplication(*new QApplicationPrivate(argc, argv, type, 0x040000)) : QApplicationBase(*new QApplicationPrivate(argc, argv, type, 0x040000))
{ Q_D(QApplication); d->construct(); } { Q_D(QApplication); d->construct(); }
QApplication::QApplication(int &argc, char **argv, Type type , int _internal) QApplication::QApplication(int &argc, char **argv, Type type , int _internal)
: QGuiApplication(*new QApplicationPrivate(argc, argv, type, _internal)) : QApplicationBase(*new QApplicationPrivate(argc, argv, type, _internal))
{ Q_D(QApplication); d->construct(); } { Q_D(QApplication); d->construct(); }
#if defined(Q_WS_X11) && !defined(QT_NO_EGL) #if defined(Q_WS_X11) && !defined(QT_NO_EGL)
@ -896,7 +896,7 @@ static char *aargv[] = { (char*)"unknown", 0 };
This function is only available on X11. This function is only available on X11.
*/ */
QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap) QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap)
: QGuiApplication(*new QApplicationPrivate(aargc, aargv, GuiClient, 0x040000)) : QApplicationBase(*new QApplicationPrivate(aargc, aargv, GuiClient, 0x040000))
{ {
if (! dpy) if (! dpy)
qWarning("QApplication: Invalid Display* argument"); qWarning("QApplication: Invalid Display* argument");
@ -905,7 +905,7 @@ QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap)
} }
QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap, int _internal) QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap, int _internal)
: QGuiApplication(*new QApplicationPrivate(aargc, aargv, GuiClient, _internal)) : QApplicationBase(*new QApplicationPrivate(aargc, aargv, GuiClient, _internal))
{ {
if (! dpy) if (! dpy)
qWarning("QApplication: Invalid Display* argument"); qWarning("QApplication: Invalid Display* argument");
@ -930,7 +930,7 @@ QApplication::QApplication(Display* dpy, Qt::HANDLE visual, Qt::HANDLE colormap,
*/ */
QApplication::QApplication(Display *dpy, int &argc, char **argv, QApplication::QApplication(Display *dpy, int &argc, char **argv,
Qt::HANDLE visual, Qt::HANDLE colormap) Qt::HANDLE visual, Qt::HANDLE colormap)
: QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000)) : QApplicationBase(*new QApplicationPrivate(argc, argv, GuiClient, 0x040000))
{ {
if (! dpy) if (! dpy)
qWarning("QApplication: Invalid Display* argument"); qWarning("QApplication: Invalid Display* argument");
@ -940,7 +940,7 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv,
QApplication::QApplication(Display *dpy, int &argc, char **argv, QApplication::QApplication(Display *dpy, int &argc, char **argv,
Qt::HANDLE visual, Qt::HANDLE colormap, int _internal) Qt::HANDLE visual, Qt::HANDLE colormap, int _internal)
: QGuiApplication(*new QApplicationPrivate(argc, argv, GuiClient, _internal)) : QApplicationBase(*new QApplicationPrivate(argc, argv, GuiClient, _internal))
{ {
if (! dpy) if (! dpy)
qWarning("QApplication: Invalid Display* argument"); qWarning("QApplication: Invalid Display* argument");

6
src/gui/kernel/qapplication_p.h
View File

@ -296,10 +296,12 @@ typedef QHash<QByteArray, QPalette> PaletteHash;
PaletteHash *qt_app_palettes_hash(); PaletteHash *qt_app_palettes_hash();
#ifdef Q_WS_QPA #ifdef Q_WS_QPA
class Q_GUI_EXPORT QApplicationPrivate : public QGuiApplicationPrivate #define QApplicationPrivateBase QGuiApplicationPrivate
#else #else
class Q_GUI_EXPORT QApplicationPrivate : public QCoreApplicationPrivate #define QApplicationPrivateBase QCoreApplicationPrivate
#endif #endif
class Q_GUI_EXPORT QApplicationPrivate : public QApplicationPrivateBase
{ {
Q_DECLARE_PUBLIC(QApplication) Q_DECLARE_PUBLIC(QApplication)
public: public: