From 2b41db93260b7fd65c4d7e05d9bf7162d1fc60f5 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 23 Aug 2016 01:06:17 +0000 Subject: [PATCH] various cleanups Signed-off-by: Ivailo Monev --- src/core/global/qconfig.h.cmake | 40 ++++++------ src/core/global/qfeatures.h | 88 +------------------------- src/core/global/qglobal.h.cmake | 62 ++----------------- src/core/tools/qscopedpointer.h | 9 --- src/core/tools/qsharedpointer_impl.h | 12 ---- src/dbus/qdbusargument.h | 12 +--- src/dbus/qdbuspendingcall.h | 2 - src/dbus/qdbuspendingreply.h | 2 +- src/gui/dialogs/qfilesystemmodel.cpp | 2 - src/gui/graphicsview/qgraphicsitem.cpp | 110 +++++++-------------------------- src/opengl/qglframebufferobject.h | 2 +- src/test/qtest_global.h | 2 +- 12 files changed, 52 insertions(+), 291 deletions(-) diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake index dca6ec491..0537a4e37 100644 --- a/src/core/global/qconfig.h.cmake +++ b/src/core/global/qconfig.h.cmake @@ -47,13 +47,32 @@ #define QT_NO_STYLE_S60 #define QT_NO_PHONON #define QT_NO_WIN_ACTIVEQT -#define QT_NO_QWS_QPF2 #define QT_NO_STYLE_WINDOWSMOBILE #define QT_NO_DIRECTPAINTER #define QT_NO_COP #define QT_NO_BLITTABLE #define QT_NO_PICTUREIO #define QT_NO_SOFTKEYMANAGER +#define QT_NO_SXE +#define QT_NO_QWS_QPF2 +#define QT_NO_QWS_INPUTMETHODS +#define QT_NO_QWSEMBEDWIDGET +#define QT_NO_QWS_CURSOR +#define QT_NO_QWS_DECORATION_DEFAULT +#define QT_NO_QWS_DECORATION_STYLED +#define QT_NO_QWS_DECORATION_WINDOWS +#define QT_NO_QWS_MANAGER +#define QT_NO_QWS_KEYBOARD +#define QT_NO_QWS_MOUSE +#define QT_NO_QWS_MOUSE_AUTO +#define QT_NO_QWS_MOUSE_MANUAL +#define QT_NO_QWS_MULTIPROCESS +#define QT_NO_QWS_SOUNDSERVER +#define QT_NO_QWS_PROPERTIES +#define QT_NO_QWS_PROXYSCREEN +#define QT_NO_QWS_DYNAMICSCREENTRANSFORMATION +#define QT_NO_QWS_TRANSFORMED +#define QT_NO_QWS_VNC /* Qt build specs */ #ifndef QT_EDITION @@ -117,7 +136,6 @@ /* Internationalization */ #cmakedefine QT_NO_BIG_CODECS -#cmakedefine QT_NO_QWS_INPUTMETHODS #cmakedefine QT_NO_TEXTCODEC #cmakedefine QT_NO_CODECS #cmakedefine QT_NO_TEXTCODECPLUGIN @@ -176,24 +194,6 @@ #cmakedefine QT_NO_PRINTER #cmakedefine QT_NO_CUPS -/* Qt for Embedded Linux */ -#cmakedefine QT_NO_QWSEMBEDWIDGET -#cmakedefine QT_NO_QWS_CURSOR -#cmakedefine QT_NO_QWS_DECORATION_DEFAULT -#cmakedefine QT_NO_QWS_DECORATION_STYLED -#cmakedefine QT_NO_QWS_DECORATION_WINDOWS -#cmakedefine QT_NO_QWS_MANAGER -#cmakedefine QT_NO_QWS_KEYBOARD -#cmakedefine QT_NO_QWS_MOUSE -#cmakedefine QT_NO_QWS_MOUSE_AUTO -#cmakedefine QT_NO_QWS_MOUSE_MANUAL -#cmakedefine QT_NO_QWS_MULTIPROCESS -#cmakedefine QT_NO_QWS_SOUNDSERVER -#cmakedefine QT_NO_SXE -#cmakedefine QT_NO_QWS_PROPERTIES -#cmakedefine QT_NO_QWS_PROXYSCREEN -#cmakedefine QT_NO_QWS_DYNAMICSCREENTRANSFORMATION - /* SVG */ #cmakedefine QT_NO_SVG #cmakedefine QT_NO_GRAPHICSSVGITEM diff --git a/src/core/global/qfeatures.h b/src/core/global/qfeatures.h index b08c76ce8..46cf5c019 100644 --- a/src/core/global/qfeatures.h +++ b/src/core/global/qfeatures.h @@ -172,33 +172,6 @@ // Universally Unique Identifier Convertion //#define QT_NO_QUUID_STRING -// QWSEmbedWidget -//#define QT_NO_QWSEMBEDWIDGET - -// Decoration -//#define QT_NO_QWS_DECORATION_DEFAULT - -// Keyboard -//#define QT_NO_QWS_KEYBOARD - -// Mouse -//#define QT_NO_QWS_MOUSE - -// Mouse (Auto) -//#define QT_NO_QWS_MOUSE_AUTO - -// Mouse (Non-Auto) -//#define QT_NO_QWS_MOUSE_MANUAL - -// Multi-Process -//#define QT_NO_QWS_MULTIPROCESS - -// Properties -//#define QT_NO_QWS_PROPERTIES - -// QProxyScreen -//#define QT_NO_QWS_PROXYSCREEN - // Raster Paint Engine callback functions //#define QT_NO_RASTERCALLBACKS @@ -317,11 +290,6 @@ #define QT_NO_BUTTONGROUP #endif -// QClipboard -#if !defined(QT_NO_CLIPBOARD) && (defined(QT_NO_QWS_PROPERTIES)) -#define QT_NO_CLIPBOARD -#endif - // Codecs #if !defined(QT_NO_CODECS) && (defined(QT_NO_TEXTCODEC)) #define QT_NO_CODECS @@ -392,41 +360,6 @@ #define QT_NO_PROGRESSDIALOG #endif -// Cursor -#if !defined(QT_NO_QWS_CURSOR) && (defined(QT_NO_CURSOR)) -#define QT_NO_QWS_CURSOR -#endif - -// Decoration (Styled) -#if !defined(QT_NO_QWS_DECORATION_STYLED) && (defined(QT_NO_QWS_DECORATION_DEFAULT)) -#define QT_NO_QWS_DECORATION_STYLED -#endif - -// Decoration (Windows Style) -#if !defined(QT_NO_QWS_DECORATION_WINDOWS) && (defined(QT_NO_QWS_DECORATION_DEFAULT)) -#define QT_NO_QWS_DECORATION_WINDOWS -#endif - -// Dynamic screen transformation. -#if !defined(QT_NO_QWS_DYNAMICSCREENTRANSFORMATION) && (defined(QT_NO_QWS_PROXYSCREEN)) -#define QT_NO_QWS_DYNAMICSCREENTRANSFORMATION -#endif - -// Manager -#if !defined(QT_NO_QWS_MANAGER) && (defined(QT_NO_QWS_DECORATION_DEFAULT)) -#define QT_NO_QWS_MANAGER -#endif - -// QVncTransformed -#if !defined(QT_NO_QWS_TRANSFORMED) && (defined(QT_NO_QWS_PROXYSCREEN)) -#define QT_NO_QWS_TRANSFORMED -#endif - -// QVncScreen -#if !defined(QT_NO_QWS_VNC) && (defined(QT_NO_QWS_PROXYSCREEN)) -#define QT_NO_QWS_VNC -#endif - // QScrollBar #if !defined(QT_NO_SCROLLBAR) && (defined(QT_NO_SLIDER)) #define QT_NO_SCROLLBAR @@ -457,11 +390,6 @@ #define QT_NO_STYLE_WINDOWSXP #endif -// SXE -#if !defined(QT_NO_SXE) && (defined(QT_NO_QWS_MULTIPROCESS)) -#define QT_NO_SXE -#endif - // QToolButton #if !defined(QT_NO_TOOLBUTTON) && (defined(QT_NO_ACTION)) #define QT_NO_TOOLBUTTON @@ -553,7 +481,7 @@ #endif // Drag and drop -#if !defined(QT_NO_DRAGANDDROP) && (defined(QT_NO_QWS_PROPERTIES) || defined(QT_NO_IMAGEFORMAT_XPM)) +#if !defined(QT_NO_DRAGANDDROP) && defined(QT_NO_IMAGEFORMAT_XPM) #define QT_NO_DRAGANDDROP #endif @@ -582,11 +510,6 @@ #define QT_NO_PRINTER #endif -// QWSInputMethod -#if !defined(QT_NO_QWS_INPUTMETHODS) && (defined(QT_NO_IM)) -#define QT_NO_QWS_INPUTMETHODS -#endif - // QSpinBox #if !defined(QT_NO_SPINBOX) && (defined(QT_NO_SPINWIDGET) || defined(QT_NO_LINEEDIT) || defined(QT_NO_VALIDATOR)) #define QT_NO_SPINBOX @@ -647,11 +570,6 @@ #define QT_NO_MENUBAR #endif -// Sound Server -#if !defined(QT_NO_QWS_SOUNDSERVER) && (defined(QT_NO_SOUND) || defined(QT_NO_HOSTINFO) || defined(QT_NO_QWS_MULTIPROCESS)) -#define QT_NO_QWS_SOUNDSERVER -#endif - // QSvgGenerator #if !defined(QT_NO_SVGGENERATOR) && (defined(QT_NO_SVG)) #define QT_NO_SVGGENERATOR @@ -877,8 +795,4 @@ #define QT_NO_XIM #endif -#if !defined(QT_NO_QWS_INPUTMETHODS) && defined(QT_NO_IM) -#define QT_NO_QWS_INPUTMETHODS -#endif - #endif diff --git a/src/core/global/qglobal.h.cmake b/src/core/global/qglobal.h.cmake index 0d598f976..ab4af5414 100644 --- a/src/core/global/qglobal.h.cmake +++ b/src/core/global/qglobal.h.cmake @@ -84,7 +84,6 @@ !WINDOWS - ... !WINDOWSCE - ... X86_64 - ... - !SYMBIAN - ... SH - ... !SH4A - ... NACL - ... @@ -229,7 +228,6 @@ namespace QT_NAMESPACE {} The operating system, must be one of: (Q_OS_x) DARWIN - Darwin OS (synonym for Q_OS_MAC) - SYMBIAN - Symbian MSDOS - MS-DOS and Windows OS2 - OS/2 OS2EMX - XFree86 on OS/2 (not PM) @@ -267,10 +265,6 @@ namespace QT_NAMESPACE {} # else # define Q_OS_DARWIN32 # endif -#elif defined(__SYMBIAN32__) || defined(SYMBIAN) -# define Q_OS_SYMBIAN -# define Q_NO_POSIX_SIGNALS -# define QT_NO_GETIFADDRS #elif defined(__CYGWIN__) # define Q_OS_CYGWIN #elif defined(MSDOS) || defined(_MSDOS) @@ -478,9 +472,7 @@ namespace QT_NAMESPACE {} HIGHC - MetaWare High C/C++ PGI - Portland Group C++ GHS - Green Hills Optimizing C++ Compilers - GCCE - GCCE (Symbian GCCE builds) RVCT - ARM Realview Compiler Suite - NOKIAX86 - Nokia x86 (Symbian WINSCW builds) CLANG - C++ front-end for the LLVM compiler @@ -515,9 +507,6 @@ namespace QT_NAMESPACE {} #elif defined(__MWERKS__) # define Q_CC_MWERKS -# if defined(__EMU_SYMBIAN_OS__) -# define Q_CC_NOKIAX86 -# endif /* "explicit" recognized since 4.0d1 */ #elif defined(_MSC_VER) @@ -551,14 +540,6 @@ namespace QT_NAMESPACE {} #elif defined(__WATCOMC__) # define Q_CC_WAT -/* Symbian GCCE */ -#elif defined(__GCCE__) -# define Q_CC_GCCE -# define QT_VISIBILITY_AVAILABLE -# if defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) -# define QT_HAVE_ARMV6 -# endif - /* ARM Realview Compiler Suite RVCT compiler also defines __EDG__ and __GNUC__ (if --gnu flag is given), so check for it before that */ @@ -865,9 +846,6 @@ namespace QT_NAMESPACE {} # endif # define Q_NO_USING_KEYWORD /* ### check "using" status */ -#elif defined(__WINSCW__) && !defined(Q_CC_NOKIAX86) -# define Q_CC_NOKIAX86 - #else # error "Qt has not been tested with this compiler - talk to qt-bugs@trolltech.com" #endif @@ -1074,10 +1052,8 @@ namespace QT_NAMESPACE {} MACX - Mac OS X MAC9 - Mac OS 9 - QWS - Qt for Embedded Linux WIN32 - Windows X11 - X Window System - S60 - Symbian S60 PM - unsupported WIN16 - unsupported */ @@ -1149,14 +1125,6 @@ typedef unsigned long long quint64; /* 64 bit unsigned */ typedef qint64 qlonglong; typedef quint64 qulonglong; -#ifndef QT_POINTER_SIZE -# if defined(Q_OS_WIN64) -# define QT_POINTER_SIZE 8 -# elif defined(Q_OS_WIN32) || defined(Q_OS_WINCE) -# define QT_POINTER_SIZE 4 -# endif -#endif - #define Q_INIT_RESOURCE_EXTERN(name) \ extern int QT_MANGLE_NAMESPACE(qInitResources_ ## name) (); @@ -1373,10 +1341,6 @@ Q_DECL_CONSTEXPR inline const T &qBound(const T &min, const T &val, const T &max class QDataStream; -#ifndef QT_BUILD_KEY -#define QT_BUILD_KEY "unspecified" -#endif - #if defined(Q_WS_MAC) # ifndef QMAC_QMENUBAR_NO_EVENT # define QMAC_QMENUBAR_NO_EVENT @@ -1389,7 +1353,6 @@ class QDataStream; # define QT_NO_LPR # define QT_NO_SHAREDMEMORY // only POSIX, no SysV and in the end... # define QT_NO_SYSTEMSEMAPHORE // not needed at all in a flat address space -# define QT_NO_QWS_MULTIPROCESS // no processes #endif # include @@ -1403,7 +1366,7 @@ class QDataStream; #endif #ifndef Q_DECL_EXPORT -# if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT) +# if defined(Q_OS_WIN) || defined(Q_CC_RVCT) # define Q_DECL_EXPORT __declspec(dllexport) # elif defined(QT_VISIBILITY_AVAILABLE) # define Q_DECL_EXPORT __attribute__((visibility("default"))) @@ -1414,7 +1377,7 @@ class QDataStream; # endif #endif #ifndef Q_DECL_IMPORT -# if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT) +# if defined(Q_OS_WIN) || defined(Q_CC_RVCT) # define Q_DECL_IMPORT __declspec(dllimport) # else # define Q_DECL_IMPORT @@ -1787,12 +1750,6 @@ inline void qUnused(T &x) { (void)x; } Debugging and error handling */ -/* - On Symbian we do not know beforehand whether we are compiling in - release or debug mode, so check the Symbian build define here, - and set the QT_NO_DEBUG define appropriately. -*/ - #if !defined(QT_NO_DEBUG) && !defined(QT_DEBUG) # define QT_DEBUG #endif @@ -1920,7 +1877,7 @@ inline T *q_check_ptr(T *p) { Q_CHECK_PTR(p); return p; } # endif /* The MIPSpro and RVCT compilers postpones macro expansion, and therefore macros must be in scope when being used. */ -# if !defined(Q_CC_MIPS) && !defined(Q_CC_RVCT) && !defined(Q_CC_NOKIAX86) +# if !defined(Q_CC_MIPS) && !defined(Q_CC_RVCT) # undef QT_STRINGIFY2 # undef QT_STRINGIFY # endif @@ -2486,18 +2443,7 @@ inline const QForeachContainer *qForeachContainer(const QForeachContainerBase # endif #endif -#define Q_UNREACHABLE() \ - do {\ - Q_ASSERT_X(false, "Q_UNREACHABLE()", "Q_UNREACHABLE was reached");\ - } while (0) - -#if 0 -/* tell gcc to use its built-in methods for some common functions */ -#if defined(QT_NO_DEBUG) && defined(Q_CC_GNU) -# define qMemCopy __builtin_memcpy -# define qMemSet __builtin_memset -#endif -#endif +#define Q_UNREACHABLE() Q_ASSERT_X(false, "Q_UNREACHABLE()", "Q_UNREACHABLE was reached"); template static inline T *qGetPtrHelper(T *ptr) { return ptr; } template static inline typename Wrapper::pointer qGetPtrHelper(const Wrapper &p) { return p.data(); } diff --git a/src/core/tools/qscopedpointer.h b/src/core/tools/qscopedpointer.h index 11338abfa..60275c179 100644 --- a/src/core/tools/qscopedpointer.h +++ b/src/core/tools/qscopedpointer.h @@ -87,9 +87,7 @@ struct QScopedPointerPodDeleter template > class QScopedPointer { -#ifndef Q_CC_NOKIAX86 typedef T *QScopedPointer:: *RestrictedBool; -#endif public: explicit inline QScopedPointer(T *p = 0) : d(p) { @@ -119,17 +117,10 @@ public: return !d; } -#if defined(Q_CC_NOKIAX86) || defined(Q_QDOC) - inline operator bool() const - { - return isNull() ? 0 : &QScopedPointer::d; - } -#else inline operator RestrictedBool() const { return isNull() ? 0 : &QScopedPointer::d; } -#endif inline T *data() const { diff --git a/src/core/tools/qsharedpointer_impl.h b/src/core/tools/qsharedpointer_impl.h index f5f8b93f4..dbdd34540 100644 --- a/src/core/tools/qsharedpointer_impl.h +++ b/src/core/tools/qsharedpointer_impl.h @@ -111,9 +111,7 @@ namespace QtSharedPointer { template class Basic { -#ifndef Q_CC_NOKIAX86 typedef T *Basic:: *RestrictedBool; -#endif public: typedef T Type; typedef T element_type; @@ -126,11 +124,7 @@ namespace QtSharedPointer { inline T *data() const { return value; } inline bool isNull() const { return !data(); } -#ifndef Q_CC_NOKIAX86 inline operator RestrictedBool() const { return isNull() ? 0 : &Basic::value; } -#else - inline operator bool() const { return isNull() ? 0 : &Basic::value; } -#endif inline bool operator !() const { return isNull(); } inline T &operator*() const { return *data(); } inline T *operator->() const { return data(); } @@ -521,9 +515,7 @@ public: template class QWeakPointer { -#ifndef Q_CC_NOKIAX86 typedef T *QWeakPointer:: *RestrictedBool; -#endif typedef QtSharedPointer::ExternalRefCountData Data; public: @@ -536,11 +528,7 @@ public: typedef qptrdiff difference_type; inline bool isNull() const { return d == 0 || d->strongref == 0 || value == 0; } -#ifndef Q_CC_NOKIAX86 inline operator RestrictedBool() const { return isNull() ? 0 : &QWeakPointer::value; } -#else - inline operator bool() const { return isNull() ? 0 : &QWeakPointer::value; } -#endif inline bool operator !() const { return isNull(); } inline T *data() const { return d == 0 || d->strongref == 0 ? 0 : value; } diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 85cfc79cb..7fb96a5a0 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -146,22 +146,14 @@ protected: mutable QDBusArgumentPrivate *d; }; -template inline T qdbus_cast(const QDBusArgument &arg -#ifndef Q_QDOC -, T * = 0 -#endif - ) +template inline T qdbus_cast(const QDBusArgument &arg, T * = 0) { T item; arg >> item; return item; } -template inline T qdbus_cast(const QVariant &v -#ifndef Q_QDOC -, T * = 0 -#endif - ) +template inline T qdbus_cast(const QVariant &v, T * = 0) { int id = v.userType(); if (id == qMetaTypeId()) diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index d9b9116b7..0b6b3f274 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -68,7 +68,6 @@ public: ~QDBusPendingCall(); QDBusPendingCall &operator=(const QDBusPendingCall &other); -#ifndef Q_QDOC // pretend that they aren't here bool isFinished() const; void waitForFinished(); @@ -77,7 +76,6 @@ public: bool isValid() const; QDBusError error() const; QDBusMessage reply() const; -#endif static QDBusPendingCall fromError(const QDBusError &error); static QDBusPendingCall fromCompletedCall(const QDBusMessage &message); diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index fa5f00d4c..26e86f57c 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -141,7 +141,7 @@ public: inline int count() const { return Count; } -#if defined(Q_QDOC) || defined(Q_NO_USING_KEYWORD) +#if defined(Q_NO_USING_KEYWORD) inline QVariant argumentAt(int index) const { return QDBusPendingReplyData::argumentAt(index); } #else diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp index d6477c6e9..5f0a9f87e 100644 --- a/src/gui/dialogs/qfilesystemmodel.cpp +++ b/src/gui/dialogs/qfilesystemmodel.cpp @@ -401,8 +401,6 @@ QFileSystemModelPrivate::QFileSystemNode *QFileSystemModelPrivate::node(const QS #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) { if (!pathElements.at(0).contains(QLatin1String(":"))) { - // The reason we express it like this instead of with anonymous, temporary - // variables, is to workaround a compiler crash with Q_CC_NOKIAX86. QString rootPath = QDir(longPath).rootPath(); pathElements.prepend(rootPath); } diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 89f811931..23df28276 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1385,11 +1385,8 @@ void QGraphicsItemCache::purge() \sa QGraphicsScene::addItem(), setParentItem() */ QGraphicsItem::QGraphicsItem(QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : d_ptr(new QGraphicsItemPrivate) { d_ptr->q_ptr = this; @@ -8016,11 +8013,8 @@ public: QGraphicsItem's constructor. */ QAbstractGraphicsShapeItem::QAbstractGraphicsShapeItem(QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QGraphicsItem(*new QAbstractGraphicsShapeItemPrivate, parent, scene) { } @@ -8150,11 +8144,8 @@ public: */ QGraphicsPathItem::QGraphicsPathItem(const QPainterPath &path, QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsPathItemPrivate, parent, scene) { if (!path.isEmpty()) @@ -8168,11 +8159,8 @@ QGraphicsPathItem::QGraphicsPathItem(const QPainterPath &path, \sa QGraphicsScene::addItem() */ QGraphicsPathItem::QGraphicsPathItem(QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsPathItemPrivate, parent, scene) { } @@ -8342,11 +8330,8 @@ public: \sa QGraphicsScene::addItem() */ QGraphicsRectItem::QGraphicsRectItem(const QRectF &rect, QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsRectItemPrivate, parent, scene) { setRect(rect); @@ -8365,11 +8350,8 @@ QGraphicsRectItem::QGraphicsRectItem(const QRectF &rect, QGraphicsItem *parent */ QGraphicsRectItem::QGraphicsRectItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsRectItemPrivate, parent, scene) { setRect(QRectF(x, y, w, h)); @@ -8382,11 +8364,8 @@ QGraphicsRectItem::QGraphicsRectItem(qreal x, qreal y, qreal w, qreal h, \sa QGraphicsScene::addItem() */ QGraphicsRectItem::QGraphicsRectItem(QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsRectItemPrivate, parent, scene) { } @@ -8576,11 +8555,8 @@ public: \sa QGraphicsScene::addItem() */ QGraphicsEllipseItem::QGraphicsEllipseItem(const QRectF &rect, QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsEllipseItemPrivate, parent, scene) { setRect(rect); @@ -8598,11 +8574,8 @@ QGraphicsEllipseItem::QGraphicsEllipseItem(const QRectF &rect, QGraphicsItem *pa */ QGraphicsEllipseItem::QGraphicsEllipseItem(qreal x, qreal y, qreal w, qreal h, QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsEllipseItemPrivate, parent, scene) { setRect(x,y,w,h); @@ -8617,11 +8590,8 @@ QGraphicsEllipseItem::QGraphicsEllipseItem(qreal x, qreal y, qreal w, qreal h, \sa QGraphicsScene::addItem() */ QGraphicsEllipseItem::QGraphicsEllipseItem(QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsEllipseItemPrivate, parent, scene) { } @@ -8869,11 +8839,8 @@ public: */ QGraphicsPolygonItem::QGraphicsPolygonItem(const QPolygonF &polygon, QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsPolygonItemPrivate, parent, scene) { setPolygon(polygon); @@ -8886,11 +8853,8 @@ QGraphicsPolygonItem::QGraphicsPolygonItem(const QPolygonF &polygon, \sa QGraphicsScene::addItem() */ QGraphicsPolygonItem::QGraphicsPolygonItem(QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsPolygonItemPrivate, parent, scene) { } @@ -9080,11 +9044,8 @@ public: \sa QGraphicsScene::addItem() */ QGraphicsLineItem::QGraphicsLineItem(const QLineF &line, QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QGraphicsItem(*new QGraphicsLineItemPrivate, parent, scene) { setLine(line); @@ -9098,11 +9059,8 @@ QGraphicsLineItem::QGraphicsLineItem(const QLineF &line, QGraphicsItem *parent \sa QGraphicsScene::addItem() */ QGraphicsLineItem::QGraphicsLineItem(qreal x1, qreal y1, qreal x2, qreal y2, QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QGraphicsItem(*new QGraphicsLineItemPrivate, parent, scene) { setLine(x1, y1, x2, y2); @@ -9117,11 +9075,8 @@ QGraphicsLineItem::QGraphicsLineItem(qreal x1, qreal y1, qreal x2, qreal y2, QGr \sa QGraphicsScene::addItem() */ QGraphicsLineItem::QGraphicsLineItem(QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QGraphicsItem(*new QGraphicsLineItemPrivate, parent, scene) { } @@ -9385,11 +9340,8 @@ public: */ QGraphicsPixmapItem::QGraphicsPixmapItem(const QPixmap &pixmap, QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QGraphicsItem(*new QGraphicsPixmapItemPrivate, parent, scene) { setPixmap(pixmap); @@ -9402,11 +9354,8 @@ QGraphicsPixmapItem::QGraphicsPixmapItem(const QPixmap &pixmap, \sa QGraphicsScene::addItem() */ QGraphicsPixmapItem::QGraphicsPixmapItem(QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QGraphicsItem(*new QGraphicsPixmapItemPrivate, parent, scene) { } @@ -9675,11 +9624,8 @@ public: \sa QGraphicsScene::addItem() */ QGraphicsTextItem::QGraphicsTextItem(const QString &text, QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QGraphicsObject(*new QGraphicsItemPrivate, parent, scene), dd(new QGraphicsTextItemPrivate) { dd->qq = this; @@ -9697,11 +9643,8 @@ QGraphicsTextItem::QGraphicsTextItem(const QString &text, QGraphicsItem *parent \sa QGraphicsScene::addItem() */ QGraphicsTextItem::QGraphicsTextItem(QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QGraphicsObject(*new QGraphicsItemPrivate, parent, scene), dd(new QGraphicsTextItemPrivate) { dd->qq = this; @@ -10547,11 +10490,8 @@ void QGraphicsSimpleTextItemPrivate::updateBoundingRect() \sa QGraphicsScene::addItem() */ QGraphicsSimpleTextItem::QGraphicsSimpleTextItem(QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsSimpleTextItemPrivate, parent, scene) { } @@ -10564,11 +10504,8 @@ QGraphicsSimpleTextItem::QGraphicsSimpleTextItem(QGraphicsItem *parent \sa QGraphicsScene::addItem() */ QGraphicsSimpleTextItem::QGraphicsSimpleTextItem(const QString &text, QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QAbstractGraphicsShapeItem(*new QGraphicsSimpleTextItemPrivate, parent, scene) { setText(text); @@ -10797,11 +10734,8 @@ public: \sa QGraphicsScene::addItem() */ QGraphicsItemGroup::QGraphicsItemGroup(QGraphicsItem *parent -#ifndef Q_QDOC // obsolete argument - , QGraphicsScene *scene -#endif - ) + , QGraphicsScene *scene) : QGraphicsItem(*new QGraphicsItemGroupPrivate, parent, scene) { setHandlesChildEvents(true); diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h index 16416ab87..481b8a3cd 100644 --- a/src/opengl/qglframebufferobject.h +++ b/src/opengl/qglframebufferobject.h @@ -65,7 +65,7 @@ public: QGLFramebufferObject(const QSize &size, GLenum target = GL_TEXTURE_2D); QGLFramebufferObject(int width, int height, GLenum target = GL_TEXTURE_2D); -#if !defined(QT_OPENGL_ES) || defined(Q_QDOC) +#if !defined(QT_OPENGL_ES) QGLFramebufferObject(const QSize &size, Attachment attachment, GLenum target = GL_TEXTURE_2D, GLenum internal_format = GL_RGBA8); QGLFramebufferObject(int width, int height, Attachment attachment, diff --git a/src/test/qtest_global.h b/src/test/qtest_global.h index b02bab925..3c7010545 100644 --- a/src/test/qtest_global.h +++ b/src/test/qtest_global.h @@ -48,7 +48,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#if defined (Q_CC_SUN) || defined (Q_CC_XLC) || (defined (Q_CC_GNU) && (__GNUC__ - 0 < 3)) || defined (Q_CC_NOKIAX86) +#if defined (Q_CC_SUN) || defined (Q_CC_XLC) || (defined (Q_CC_GNU) && (__GNUC__ - 0 < 3)) # define QTEST_NO_SPECIALIZATIONS #endif -- 2.11.0