diff options
396 files changed, 487 insertions, 487 deletions
diff --git a/examples/script/qsdbg/scriptdebugger.h b/examples/script/qsdbg/scriptdebugger.h index 4752511..2d4ba07 100644 --- a/examples/script/qsdbg/scriptdebugger.h +++ b/examples/script/qsdbg/scriptdebugger.h @@ -78,7 +78,7 @@ protected: ScriptDebuggerPrivate *d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(ScriptDebugger) + Q_DECLARE_PRIVATE(ScriptDebugger) Q_DISABLE_COPY(ScriptDebugger) }; diff --git a/src/3rdparty/phonon/phonon/abstractmediastream.h b/src/3rdparty/phonon/phonon/abstractmediastream.h index be45861..c4cde85 100644 --- a/src/3rdparty/phonon/phonon/abstractmediastream.h +++ b/src/3rdparty/phonon/phonon/abstractmediastream.h @@ -103,7 +103,7 @@ class AbstractMediaStreamPrivate; class PHONON_EXPORT AbstractMediaStream : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(AbstractMediaStream) + Q_DECLARE_PRIVATE(AbstractMediaStream) friend class MediaObject; friend class MediaObjectPrivate; friend class StreamInterface; diff --git a/src/3rdparty/phonon/phonon/iodevicestream_p.h b/src/3rdparty/phonon/phonon/iodevicestream_p.h index 527ff17..5eb90bc 100644 --- a/src/3rdparty/phonon/phonon/iodevicestream_p.h +++ b/src/3rdparty/phonon/phonon/iodevicestream_p.h @@ -39,7 +39,7 @@ class IODeviceStreamPrivate; class IODeviceStream : public AbstractMediaStream { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(IODeviceStream) + Q_DECLARE_PRIVATE(IODeviceStream) public: explicit IODeviceStream(QIODevice *ioDevice, QObject *parent = 0); ~IODeviceStream(); diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index 8da0935..e4b1fcc 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -125,7 +125,7 @@ protected: private: Q_DISABLE_COPY(QAbstractAnimation) - Q_DECLARE_SCOPED_PRIVATE(QAbstractAnimation) + Q_DECLARE_PRIVATE(QAbstractAnimation) }; #endif //QT_NO_ANIMATION diff --git a/src/corelib/animation/qanimationgroup.h b/src/corelib/animation/qanimationgroup.h index 5b07524..93c6fb1 100644 --- a/src/corelib/animation/qanimationgroup.h +++ b/src/corelib/animation/qanimationgroup.h @@ -76,7 +76,7 @@ protected: private: Q_DISABLE_COPY(QAnimationGroup) - Q_DECLARE_SCOPED_PRIVATE(QAnimationGroup) + Q_DECLARE_PRIVATE(QAnimationGroup) }; #endif //QT_NO_ANIMATION diff --git a/src/corelib/animation/qparallelanimationgroup.h b/src/corelib/animation/qparallelanimationgroup.h index 8422102..07808f1 100644 --- a/src/corelib/animation/qparallelanimationgroup.h +++ b/src/corelib/animation/qparallelanimationgroup.h @@ -73,7 +73,7 @@ protected: private: Q_DISABLE_COPY(QParallelAnimationGroup) - Q_DECLARE_SCOPED_PRIVATE(QParallelAnimationGroup) + Q_DECLARE_PRIVATE(QParallelAnimationGroup) Q_PRIVATE_SLOT(d_func(), void _q_uncontrolledAnimationFinished()) }; diff --git a/src/corelib/animation/qpauseanimation.h b/src/corelib/animation/qpauseanimation.h index b84e940..6907d0a 100644 --- a/src/corelib/animation/qpauseanimation.h +++ b/src/corelib/animation/qpauseanimation.h @@ -72,7 +72,7 @@ protected: private: Q_DISABLE_COPY(QPauseAnimation) - Q_DECLARE_SCOPED_PRIVATE(QPauseAnimation) + Q_DECLARE_PRIVATE(QPauseAnimation) }; #endif //QT_NO_ANIMATION diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h index 6631f67..e07444c 100644 --- a/src/corelib/animation/qpropertyanimation.h +++ b/src/corelib/animation/qpropertyanimation.h @@ -78,7 +78,7 @@ protected: private: Q_PRIVATE_SLOT(d_func(), void _q_targetDestroyed()) Q_DISABLE_COPY(QPropertyAnimation) - Q_DECLARE_SCOPED_PRIVATE(QPropertyAnimation) + Q_DECLARE_PRIVATE(QPropertyAnimation) }; #endif //QT_NO_ANIMATION diff --git a/src/corelib/animation/qsequentialanimationgroup.h b/src/corelib/animation/qsequentialanimationgroup.h index 81a7ff5..5d43356 100644 --- a/src/corelib/animation/qsequentialanimationgroup.h +++ b/src/corelib/animation/qsequentialanimationgroup.h @@ -83,7 +83,7 @@ protected: private: Q_DISABLE_COPY(QSequentialAnimationGroup) - Q_DECLARE_SCOPED_PRIVATE(QSequentialAnimationGroup) + Q_DECLARE_PRIVATE(QSequentialAnimationGroup) Q_PRIVATE_SLOT(d_func(), void _q_uncontrolledAnimationFinished()) }; diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h index 8c75fc1..3e397ca 100644 --- a/src/corelib/animation/qvariantanimation.h +++ b/src/corelib/animation/qvariantanimation.h @@ -113,7 +113,7 @@ private: static void registerInterpolator(Interpolator func, int interpolationType); Q_DISABLE_COPY(QVariantAnimation) - Q_DECLARE_SCOPED_PRIVATE(QVariantAnimation) + Q_DECLARE_PRIVATE(QVariantAnimation) }; template <typename T> diff --git a/src/corelib/concurrent/qfuturewatcher.h b/src/corelib/concurrent/qfuturewatcher.h index 948ecca..04d5680 100644 --- a/src/corelib/concurrent/qfuturewatcher.h +++ b/src/corelib/concurrent/qfuturewatcher.h @@ -59,7 +59,7 @@ class QFutureWatcherBasePrivate; class Q_CORE_EXPORT QFutureWatcherBase : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QFutureWatcherBase) + Q_DECLARE_PRIVATE(QFutureWatcherBase) public: QFutureWatcherBase(QObject *parent = 0); diff --git a/src/corelib/concurrent/qthreadpool.h b/src/corelib/concurrent/qthreadpool.h index dddf962..0ddefd1 100644 --- a/src/corelib/concurrent/qthreadpool.h +++ b/src/corelib/concurrent/qthreadpool.h @@ -58,7 +58,7 @@ class QThreadPoolPrivate; class Q_CORE_EXPORT QThreadPool : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QThreadPool) + Q_DECLARE_PRIVATE(QThreadPool) Q_PROPERTY(int expiryTimeout READ expiryTimeout WRITE setExpiryTimeout) Q_PROPERTY(int maxThreadCount READ maxThreadCount WRITE setMaxThreadCount) Q_PROPERTY(int activeThreadCount READ activeThreadCount) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 86f0757..9b93306 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2290,14 +2290,12 @@ inline const QForeachContainer<T> *qForeachContainer(const QForeachContainerBase #endif #endif -#define Q_DECLARE_PRIVATE(Class) \ - inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(d_ptr); } \ - inline const Class##Private* d_func() const { return reinterpret_cast<const Class##Private *>(d_ptr); } \ - friend class Class##Private; +template <typename T> static inline T *qGetPtrHelper(T *ptr) { return ptr; } +template <typename Wrapper> static inline typename Wrapper::pointer qGetPtrHelper(const Wrapper &p) { return p.data(); } -#define Q_DECLARE_SCOPED_PRIVATE(Class) \ - inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(d_ptr.data()); } \ - inline const Class##Private* d_func() const { return reinterpret_cast<const Class##Private *>(d_ptr.data()); } \ +#define Q_DECLARE_PRIVATE(Class) \ + inline Class##Private* d_func() { return reinterpret_cast<Class##Private *>(qGetPtrHelper(d_ptr)); } \ + inline const Class##Private* d_func() const { return reinterpret_cast<const Class##Private *>(qGetPtrHelper(d_ptr)); } \ friend class Class##Private; #define Q_DECLARE_PRIVATE_D(Dptr, Class) \ diff --git a/src/corelib/io/qabstractfileengine.h b/src/corelib/io/qabstractfileengine.h index 07c92d2..54eb6de 100644 --- a/src/corelib/io/qabstractfileengine.h +++ b/src/corelib/io/qabstractfileengine.h @@ -196,7 +196,7 @@ protected: QScopedPointer<QAbstractFileEnginePrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QAbstractFileEngine) + Q_DECLARE_PRIVATE(QAbstractFileEngine) Q_DISABLE_COPY(QAbstractFileEngine) }; diff --git a/src/corelib/io/qbuffer.h b/src/corelib/io/qbuffer.h index ce5f605..e078d05 100644 --- a/src/corelib/io/qbuffer.h +++ b/src/corelib/io/qbuffer.h @@ -96,7 +96,7 @@ protected: qint64 writeData(const char *data, qint64 len); private: - Q_DECLARE_SCOPED_PRIVATE(QBuffer) + Q_DECLARE_PRIVATE(QBuffer) Q_DISABLE_COPY(QBuffer) Q_PRIVATE_SLOT(d_func(), void _q_emitSignals()) diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index 5ef4356..f54fbdc 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -60,7 +60,7 @@ class Q_CORE_EXPORT QDir protected: QScopedPointer<QDirPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QDir) + Q_DECLARE_PRIVATE(QDir) public: enum Filter { Dirs = 0x001, Files = 0x002, diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index 24ce617..f448609 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -64,7 +64,7 @@ class Q_CORE_EXPORT QFile : public QIODevice #ifndef QT_NO_QOBJECT Q_OBJECT #endif - Q_DECLARE_SCOPED_PRIVATE(QFile) + Q_DECLARE_PRIVATE(QFile) public: diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index c73823a..5295b16 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -168,7 +168,7 @@ public: protected: QScopedPointer<QFileInfoPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QFileInfo) + Q_DECLARE_PRIVATE(QFileInfo) }; Q_DECLARE_TYPEINFO(QFileInfo, Q_MOVABLE_TYPE); diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h index 76a6c60..60458e5 100644 --- a/src/corelib/io/qfilesystemwatcher.h +++ b/src/corelib/io/qfilesystemwatcher.h @@ -57,7 +57,7 @@ class QFileSystemWatcherPrivate; class Q_CORE_EXPORT QFileSystemWatcher : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QFileSystemWatcher) + Q_DECLARE_PRIVATE(QFileSystemWatcher) public: QFileSystemWatcher(QObject *parent = 0); diff --git a/src/corelib/io/qfsfileengine.h b/src/corelib/io/qfsfileengine.h index 0fd87a4..feca09b 100644 --- a/src/corelib/io/qfsfileengine.h +++ b/src/corelib/io/qfsfileengine.h @@ -56,7 +56,7 @@ class QFSFileEnginePrivate; class Q_CORE_EXPORT QFSFileEngine : public QAbstractFileEngine { - Q_DECLARE_SCOPED_PRIVATE(QFSFileEngine) + Q_DECLARE_PRIVATE(QFSFileEngine) public: QFSFileEngine(); explicit QFSFileEngine(const QString &file); diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h index d8237a7..866fa72 100644 --- a/src/corelib/io/qiodevice.h +++ b/src/corelib/io/qiodevice.h @@ -165,7 +165,7 @@ protected: #endif private: - Q_DECLARE_SCOPED_PRIVATE(QIODevice) + Q_DECLARE_PRIVATE(QIODevice) Q_DISABLE_COPY(QIODevice) #ifdef QT3_SUPPORT diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index a4025a1..bff5f7e 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -191,7 +191,7 @@ protected: qint64 writeData(const char *data, qint64 len); private: - Q_DECLARE_SCOPED_PRIVATE(QProcess) + Q_DECLARE_PRIVATE(QProcess) Q_DISABLE_COPY(QProcess) Q_PRIVATE_SLOT(d_func(), bool _q_canReadStandardOutput()) diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h index 49dacea..0bf9660 100644 --- a/src/corelib/io/qresource.h +++ b/src/corelib/io/qresource.h @@ -94,7 +94,7 @@ protected: QScopedPointer<QResourcePrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QResource) + Q_DECLARE_PRIVATE(QResource) }; QT_END_NAMESPACE diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index 452d8e1..f58f9a2 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -61,7 +61,7 @@ class QResourceFileEnginePrivate; class QResourceFileEngine : public QAbstractFileEngine { private: - Q_DECLARE_SCOPED_PRIVATE(QResourceFileEngine) + Q_DECLARE_PRIVATE(QResourceFileEngine) public: explicit QResourceFileEngine(const QString &path); ~QResourceFileEngine(); diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index a082d6a..0d382b66 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -80,7 +80,7 @@ class Q_CORE_EXPORT QSettings #else QScopedPointer<QSettingsPrivate> d_ptr; #endif - Q_DECLARE_SCOPED_PRIVATE(QSettings) + Q_DECLARE_PRIVATE(QSettings) public: enum Status { diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index 235b4f5..ccc753a 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -289,7 +289,7 @@ static int qt_mkstemps(char *path, int slen) //************* QTemporaryFileEngine class QTemporaryFileEngine : public QFSFileEngine { - Q_DECLARE_SCOPED_PRIVATE(QFSFileEngine) + Q_DECLARE_PRIVATE(QFSFileEngine) public: QTemporaryFileEngine(const QString &file, bool fileIsTemplate = true) : QFSFileEngine(file), filePathIsTemplate(fileIsTemplate) diff --git a/src/corelib/io/qtemporaryfile.h b/src/corelib/io/qtemporaryfile.h index c0b41bb..a597a93 100644 --- a/src/corelib/io/qtemporaryfile.h +++ b/src/corelib/io/qtemporaryfile.h @@ -64,7 +64,7 @@ class Q_CORE_EXPORT QTemporaryFile : public QFile #ifndef QT_NO_QOBJECT Q_OBJECT #endif - Q_DECLARE_SCOPED_PRIVATE(QTemporaryFile) + Q_DECLARE_PRIVATE(QTemporaryFile) public: QTemporaryFile(); diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h index 9d4b3d0..fc4794e 100644 --- a/src/corelib/io/qtextstream.h +++ b/src/corelib/io/qtextstream.h @@ -72,7 +72,7 @@ class QTextDecoder; class QTextStreamPrivate; class Q_CORE_EXPORT QTextStream // text stream class { - Q_DECLARE_SCOPED_PRIVATE(QTextStream) + Q_DECLARE_PRIVATE(QTextStream) public: enum RealNumberNotation { diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index 93815f6..0550dde 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -58,7 +58,7 @@ template <typename T1, typename T2> struct QPair; class Q_CORE_EXPORT QAbstractEventDispatcher : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QAbstractEventDispatcher) + Q_DECLARE_PRIVATE(QAbstractEventDispatcher) public: typedef QPair<int, int> TimerInfo; diff --git a/src/corelib/kernel/qabstractitemmodel.h b/src/corelib/kernel/qabstractitemmodel.h index 2503393..a6bbff4 100644 --- a/src/corelib/kernel/qabstractitemmodel.h +++ b/src/corelib/kernel/qabstractitemmodel.h @@ -287,7 +287,7 @@ protected: void setRoleNames(const QHash<int,QByteArray> &roleNames); private: - Q_DECLARE_SCOPED_PRIVATE(QAbstractItemModel) + Q_DECLARE_PRIVATE(QAbstractItemModel) Q_DISABLE_COPY(QAbstractItemModel) }; diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 60b0882..48e65a7 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -76,7 +76,7 @@ class Q_CORE_EXPORT QCoreApplication : public QObject Q_PROPERTY(QString organizationName READ organizationName WRITE setOrganizationName) Q_PROPERTY(QString organizationDomain READ organizationDomain WRITE setOrganizationDomain) - Q_DECLARE_SCOPED_PRIVATE(QCoreApplication) + Q_DECLARE_PRIVATE(QCoreApplication) public: QCoreApplication(int &argc, char **argv); ~QCoreApplication(); diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h index bcb655b..80ec9fa 100644 --- a/src/corelib/kernel/qeventdispatcher_glib_p.h +++ b/src/corelib/kernel/qeventdispatcher_glib_p.h @@ -67,7 +67,7 @@ class QEventDispatcherGlibPrivate; class Q_CORE_EXPORT QEventDispatcherGlib : public QAbstractEventDispatcher { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherGlib) + Q_DECLARE_PRIVATE(QEventDispatcherGlib) public: explicit QEventDispatcherGlib(QObject *parent = 0); diff --git a/src/corelib/kernel/qeventdispatcher_symbian_p.h b/src/corelib/kernel/qeventdispatcher_symbian_p.h index 310d74d..ffc2c04 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian_p.h +++ b/src/corelib/kernel/qeventdispatcher_symbian_p.h @@ -184,7 +184,7 @@ private: class QSelectThread : public QThread { - Q_DECLARE_SCOPED_PRIVATE(QThread) + Q_DECLARE_PRIVATE(QThread) public: QSelectThread(); @@ -218,7 +218,7 @@ public: // from CActiveScheduler class Q_CORE_EXPORT QEventDispatcherSymbian : public QAbstractEventDispatcher { - Q_DECLARE_SCOPED_PRIVATE(QAbstractEventDispatcher) + Q_DECLARE_PRIVATE(QAbstractEventDispatcher) public: QEventDispatcherSymbian(QObject *parent = 0); diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index 70c287f..a52af00 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -142,7 +142,7 @@ class QEventDispatcherUNIXPrivate; class Q_CORE_EXPORT QEventDispatcherUNIX : public QAbstractEventDispatcher { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherUNIX) + Q_DECLARE_PRIVATE(QEventDispatcherUNIX) public: explicit QEventDispatcherUNIX(QObject *parent = 0); diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h index 37578a0..ca5dbf8 100644 --- a/src/corelib/kernel/qeventdispatcher_win_p.h +++ b/src/corelib/kernel/qeventdispatcher_win_p.h @@ -67,7 +67,7 @@ LRESULT CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) class Q_CORE_EXPORT QEventDispatcherWin32 : public QAbstractEventDispatcher { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherWin32) + Q_DECLARE_PRIVATE(QEventDispatcherWin32) void createInternalHwnd(); friend class QGuiEventDispatcherWin32; diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h index e14e352..60d00df 100644 --- a/src/corelib/kernel/qeventloop.h +++ b/src/corelib/kernel/qeventloop.h @@ -55,7 +55,7 @@ class QEventLoopPrivate; class Q_CORE_EXPORT QEventLoop : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QEventLoop) + Q_DECLARE_PRIVATE(QEventLoop) public: explicit QEventLoop(QObject *parent = 0); diff --git a/src/corelib/kernel/qmimedata.h b/src/corelib/kernel/qmimedata.h index 9366c5d..609528a 100644 --- a/src/corelib/kernel/qmimedata.h +++ b/src/corelib/kernel/qmimedata.h @@ -94,7 +94,7 @@ protected: QVariant::Type preferredType) const; private: Q_DISABLE_COPY(QMimeData) - Q_DECLARE_SCOPED_PRIVATE(QMimeData) + Q_DECLARE_PRIVATE(QMimeData) }; QT_END_NAMESPACE diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 200c97d..a9f005b 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -118,7 +118,7 @@ class Q_CORE_EXPORT QObject { Q_OBJECT Q_PROPERTY(QString objectName READ objectName WRITE setObjectName) - Q_DECLARE_SCOPED_PRIVATE(QObject) + Q_DECLARE_PRIVATE(QObject) public: Q_INVOKABLE explicit QObject(QObject *parent=0); diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h index 0e15ebe..4957c3e 100644 --- a/src/corelib/kernel/qsharedmemory.h +++ b/src/corelib/kernel/qsharedmemory.h @@ -57,7 +57,7 @@ class QSharedMemoryPrivate; class Q_CORE_EXPORT QSharedMemory : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QSharedMemory) + Q_DECLARE_PRIVATE(QSharedMemory) public: enum AccessMode diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h index 8c1f663..7bc5035 100644 --- a/src/corelib/kernel/qsignalmapper.h +++ b/src/corelib/kernel/qsignalmapper.h @@ -56,7 +56,7 @@ class QSignalMapperPrivate; class Q_CORE_EXPORT QSignalMapper : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QSignalMapper) + Q_DECLARE_PRIVATE(QSignalMapper) public: explicit QSignalMapper(QObject *parent = 0); ~QSignalMapper(); diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h index bc5d97d..96dda35 100644 --- a/src/corelib/kernel/qsocketnotifier.h +++ b/src/corelib/kernel/qsocketnotifier.h @@ -53,7 +53,7 @@ QT_MODULE(Core) class Q_CORE_EXPORT QSocketNotifier : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QObject) + Q_DECLARE_PRIVATE(QObject) public: enum Type { Read, Write, Exception }; diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h index 1f94210..b4cea18 100644 --- a/src/corelib/kernel/qtranslator.h +++ b/src/corelib/kernel/qtranslator.h @@ -86,7 +86,7 @@ public: private: Q_DISABLE_COPY(QTranslator) - Q_DECLARE_SCOPED_PRIVATE(QTranslator) + Q_DECLARE_PRIVATE(QTranslator) }; #endif // QT_NO_TRANSLATION diff --git a/src/corelib/kernel/qwineventnotifier_p.h b/src/corelib/kernel/qwineventnotifier_p.h index 2c8934f..07aa0ae 100644 --- a/src/corelib/kernel/qwineventnotifier_p.h +++ b/src/corelib/kernel/qwineventnotifier_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE class Q_CORE_EXPORT QWinEventNotifier : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QObject) + Q_DECLARE_PRIVATE(QObject) public: explicit QWinEventNotifier(QObject *parent = 0); diff --git a/src/corelib/plugin/qfactoryloader_p.h b/src/corelib/plugin/qfactoryloader_p.h index b646b4d..1717ac0 100644 --- a/src/corelib/plugin/qfactoryloader_p.h +++ b/src/corelib/plugin/qfactoryloader_p.h @@ -66,7 +66,7 @@ class QFactoryLoaderPrivate; class Q_CORE_EXPORT QFactoryLoader : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QFactoryLoader) + Q_DECLARE_PRIVATE(QFactoryLoader) public: QFactoryLoader(const char *iid, diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h index 3229ab7..5355ac2 100644 --- a/src/corelib/statemachine/qabstractstate.h +++ b/src/corelib/statemachine/qabstractstate.h @@ -85,7 +85,7 @@ protected: private: Q_DISABLE_COPY(QAbstractState) - Q_DECLARE_SCOPED_PRIVATE(QAbstractState) + Q_DECLARE_PRIVATE(QAbstractState) }; #endif //QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h index bfd2849..8ff3a6e 100644 --- a/src/corelib/statemachine/qabstracttransition.h +++ b/src/corelib/statemachine/qabstracttransition.h @@ -106,7 +106,7 @@ protected: private: Q_DISABLE_COPY(QAbstractTransition) - Q_DECLARE_SCOPED_PRIVATE(QAbstractTransition) + Q_DECLARE_PRIVATE(QAbstractTransition) }; #endif //QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h index 08887f0..0ebca19 100644 --- a/src/corelib/statemachine/qeventtransition.h +++ b/src/corelib/statemachine/qeventtransition.h @@ -83,7 +83,7 @@ protected: private: Q_DISABLE_COPY(QEventTransition) - Q_DECLARE_SCOPED_PRIVATE(QEventTransition) + Q_DECLARE_PRIVATE(QEventTransition) }; #endif //QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h index 7b77b2b..e37ef36 100644 --- a/src/corelib/statemachine/qfinalstate.h +++ b/src/corelib/statemachine/qfinalstate.h @@ -68,7 +68,7 @@ protected: private: Q_DISABLE_COPY(QFinalState) - Q_DECLARE_SCOPED_PRIVATE(QFinalState) + Q_DECLARE_PRIVATE(QFinalState) }; #endif //QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h index 889308d..395bb98 100644 --- a/src/corelib/statemachine/qhistorystate.h +++ b/src/corelib/statemachine/qhistorystate.h @@ -83,7 +83,7 @@ protected: private: Q_DISABLE_COPY(QHistoryState) - Q_DECLARE_SCOPED_PRIVATE(QHistoryState) + Q_DECLARE_PRIVATE(QHistoryState) }; #endif //QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h index c823c2b..415751e 100644 --- a/src/corelib/statemachine/qsignaltransition.h +++ b/src/corelib/statemachine/qsignaltransition.h @@ -78,7 +78,7 @@ protected: private: Q_DISABLE_COPY(QSignalTransition) - Q_DECLARE_SCOPED_PRIVATE(QSignalTransition) + Q_DECLARE_PRIVATE(QSignalTransition) }; #endif //QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h index 05d394b..ce88b25 100644 --- a/src/corelib/statemachine/qstate.h +++ b/src/corelib/statemachine/qstate.h @@ -107,7 +107,7 @@ protected: private: Q_DISABLE_COPY(QState) - Q_DECLARE_SCOPED_PRIVATE(QState) + Q_DECLARE_PRIVATE(QState) }; #endif //QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 1b1caa1..230d852 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -141,7 +141,7 @@ protected: private: Q_DISABLE_COPY(QStateMachine) - Q_DECLARE_SCOPED_PRIVATE(QStateMachine) + Q_DECLARE_PRIVATE(QStateMachine) Q_PRIVATE_SLOT(d_func(), void _q_start()) Q_PRIVATE_SLOT(d_func(), void _q_process()) #ifndef QT_NO_ANIMATION diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index 0d8aa8b..c784352 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -127,7 +127,7 @@ protected: private: Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QThread) + Q_DECLARE_PRIVATE(QThread) static void initialize(); static void cleanup(); @@ -154,7 +154,7 @@ private: friend class QCoreApplication; friend class QThreadData; friend class QAdoptedThread; - Q_DECLARE_SCOPED_PRIVATE(QThread) + Q_DECLARE_PRIVATE(QThread) }; #endif // QT_NO_THREAD diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index 752796b..a67ae33 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -214,7 +214,7 @@ public: // thread wrapper for the main() thread class QAdoptedThread : public QThread { - Q_DECLARE_SCOPED_PRIVATE(QThread) + Q_DECLARE_PRIVATE(QThread) public: QAdoptedThread(QThreadData *data = 0); diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index 62daacb..cbd9309 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -161,6 +161,8 @@ public: return oldD; } + typedef T *pointer; + protected: T *d; diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h index 2a1c2c2..2d1ad42 100644 --- a/src/corelib/tools/qtimeline.h +++ b/src/corelib/tools/qtimeline.h @@ -136,7 +136,7 @@ protected: private: Q_DISABLE_COPY(QTimeLine) - Q_DECLARE_SCOPED_PRIVATE(QTimeLine) + Q_DECLARE_PRIVATE(QTimeLine) }; QT_END_NAMESPACE diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h index 3215624..7be7138 100644 --- a/src/corelib/xml/qxmlstream.h +++ b/src/corelib/xml/qxmlstream.h @@ -392,7 +392,7 @@ public: private: Q_DISABLE_COPY(QXmlStreamReader) - Q_DECLARE_SCOPED_PRIVATE(QXmlStreamReader) + Q_DECLARE_PRIVATE(QXmlStreamReader) QScopedPointer<QXmlStreamReaderPrivate> d_ptr; }; @@ -465,7 +465,7 @@ public: private: Q_DISABLE_COPY(QXmlStreamWriter) - Q_DECLARE_SCOPED_PRIVATE(QXmlStreamWriter) + Q_DECLARE_PRIVATE(QXmlStreamWriter) QScopedPointer<QXmlStreamWriterPrivate> d_ptr; }; #endif // QT_NO_XMLSTREAMWRITER diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h index 2af1d14..06ba004 100644 --- a/src/dbus/qdbusabstractadaptor.h +++ b/src/dbus/qdbusabstractadaptor.h @@ -66,7 +66,7 @@ protected: bool autoRelaySignals() const; private: - Q_DECLARE_SCOPED_PRIVATE(QDBusAbstractAdaptor) + Q_DECLARE_PRIVATE(QDBusAbstractAdaptor) }; QT_END_NAMESPACE diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index 0d016a3..e525f77 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -151,7 +151,7 @@ protected: const QList<QVariant> &args = QList<QVariant>()) const; private: - Q_DECLARE_SCOPED_PRIVATE(QDBusAbstractInterface) + Q_DECLARE_PRIVATE(QDBusAbstractInterface) Q_PRIVATE_SLOT(d_func(), void _q_serviceOwnerChanged(QString,QString,QString)) }; diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index 9d0779b..9cf36f8 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -69,7 +69,7 @@ public: virtual int qt_metacall(QMetaObject::Call, int, void **); private: - Q_DECLARE_SCOPED_PRIVATE(QDBusInterface) + Q_DECLARE_PRIVATE(QDBusInterface) }; QT_END_NAMESPACE diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index 182cff3..8dbbb3c 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -111,7 +111,7 @@ Q_SIGNALS: void finished(QDBusPendingCallWatcher *self); private: - Q_DECLARE_SCOPED_PRIVATE(QDBusPendingCallWatcher) + Q_DECLARE_PRIVATE(QDBusPendingCallWatcher) Q_PRIVATE_SLOT(d_func(), void _q_finished()) }; diff --git a/src/gui/accessible/qaccessiblewidget.cpp b/src/gui/accessible/qaccessiblewidget.cpp index 2d09c9c..447edc1 100644 --- a/src/gui/accessible/qaccessiblewidget.cpp +++ b/src/gui/accessible/qaccessiblewidget.cpp @@ -269,7 +269,7 @@ QT_END_INCLUDE_NAMESPACE class QACConnectionObject : public QObject { - Q_DECLARE_SCOPED_PRIVATE(QObject) + Q_DECLARE_PRIVATE(QObject) public: inline bool isSender(const QObject *receiver, const char *signal) const { return d_func()->isSender(receiver, signal); } diff --git a/src/gui/dialogs/qabstractpagesetupdialog.h b/src/gui/dialogs/qabstractpagesetupdialog.h index ba6b452..7a3bb48 100644 --- a/src/gui/dialogs/qabstractpagesetupdialog.h +++ b/src/gui/dialogs/qabstractpagesetupdialog.h @@ -58,7 +58,7 @@ class QPrinter; // ### Qt 5: Remove this class class Q_GUI_EXPORT QAbstractPageSetupDialog : public QDialog { - Q_DECLARE_SCOPED_PRIVATE(QAbstractPageSetupDialog) + Q_DECLARE_PRIVATE(QAbstractPageSetupDialog) Q_OBJECT public: diff --git a/src/gui/dialogs/qabstractprintdialog.h b/src/gui/dialogs/qabstractprintdialog.h index 0a94034..272d1b1 100644 --- a/src/gui/dialogs/qabstractprintdialog.h +++ b/src/gui/dialogs/qabstractprintdialog.h @@ -58,7 +58,7 @@ class QPrinter; // ### Qt 5: remove this class class Q_GUI_EXPORT QAbstractPrintDialog : public QDialog { - Q_DECLARE_SCOPED_PRIVATE(QAbstractPrintDialog) + Q_DECLARE_PRIVATE(QAbstractPrintDialog) Q_OBJECT public: diff --git a/src/gui/dialogs/qcolordialog.h b/src/gui/dialogs/qcolordialog.h index d0aeec7..2c107bd 100644 --- a/src/gui/dialogs/qcolordialog.h +++ b/src/gui/dialogs/qcolordialog.h @@ -57,7 +57,7 @@ class QColorDialogPrivate; class Q_GUI_EXPORT QColorDialog : public QDialog { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QColorDialog) + Q_DECLARE_PRIVATE(QColorDialog) Q_ENUMS(ColorDialogOption) Q_PROPERTY(QColor currentColor READ currentColor WRITE setCurrentColor NOTIFY currentColorChanged) diff --git a/src/gui/dialogs/qdialog.h b/src/gui/dialogs/qdialog.h index 0b5b326..8479994 100644 --- a/src/gui/dialogs/qdialog.h +++ b/src/gui/dialogs/qdialog.h @@ -121,7 +121,7 @@ protected: void adjustPosition(QWidget*); private: - Q_DECLARE_SCOPED_PRIVATE(QDialog) + Q_DECLARE_PRIVATE(QDialog) Q_DISABLE_COPY(QDialog) #ifdef Q_WS_WINCE_WM diff --git a/src/gui/dialogs/qerrormessage.h b/src/gui/dialogs/qerrormessage.h index 1d79f78..9721f46 100644 --- a/src/gui/dialogs/qerrormessage.h +++ b/src/gui/dialogs/qerrormessage.h @@ -57,7 +57,7 @@ class QErrorMessagePrivate; class Q_GUI_EXPORT QErrorMessage: public QDialog { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QErrorMessage) + Q_DECLARE_PRIVATE(QErrorMessage) public: explicit QErrorMessage(QWidget* parent = 0); ~QErrorMessage(); diff --git a/src/gui/dialogs/qfiledialog.h b/src/gui/dialogs/qfiledialog.h index 987e436..70ee720 100644 --- a/src/gui/dialogs/qfiledialog.h +++ b/src/gui/dialogs/qfiledialog.h @@ -283,7 +283,7 @@ protected: void changeEvent(QEvent *e); private: - Q_DECLARE_SCOPED_PRIVATE(QFileDialog) + Q_DECLARE_PRIVATE(QFileDialog) Q_DISABLE_COPY(QFileDialog) Q_PRIVATE_SLOT(d_func(), void _q_pathChanged(const QString &)) diff --git a/src/gui/dialogs/qfilesystemmodel.h b/src/gui/dialogs/qfilesystemmodel.h index 5ab49ff..769463c 100644 --- a/src/gui/dialogs/qfilesystemmodel.h +++ b/src/gui/dialogs/qfilesystemmodel.h @@ -151,7 +151,7 @@ protected: bool event(QEvent *event); private: - Q_DECLARE_SCOPED_PRIVATE(QFileSystemModel) + Q_DECLARE_PRIVATE(QFileSystemModel) Q_DISABLE_COPY(QFileSystemModel) Q_PRIVATE_SLOT(d_func(), void _q_directoryChanged(const QString &directory, const QStringList &list)) diff --git a/src/gui/dialogs/qfontdialog.h b/src/gui/dialogs/qfontdialog.h index 4c80194..6e0f1a0 100644 --- a/src/gui/dialogs/qfontdialog.h +++ b/src/gui/dialogs/qfontdialog.h @@ -59,7 +59,7 @@ class QFontDialogPrivate; class Q_GUI_EXPORT QFontDialog : public QDialog { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QFontDialog) + Q_DECLARE_PRIVATE(QFontDialog) Q_ENUMS(FontDialogOption) Q_PROPERTY(QFont currentFont READ currentFont WRITE setCurrentFont NOTIFY currentFontChanged) Q_PROPERTY(FontDialogOptions options READ options WRITE setOptions) diff --git a/src/gui/dialogs/qinputdialog.h b/src/gui/dialogs/qinputdialog.h index edeaadd..401b328 100644 --- a/src/gui/dialogs/qinputdialog.h +++ b/src/gui/dialogs/qinputdialog.h @@ -59,7 +59,7 @@ class QInputDialogPrivate; class Q_GUI_EXPORT QInputDialog : public QDialog { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QInputDialog) + Q_DECLARE_PRIVATE(QInputDialog) // Q_ENUMS(InputMode InputDialogOption) QDOC_PROPERTY(InputMode inputMode READ inputMode WRITE setInputMode) QDOC_PROPERTY(QString labelText READ labelText WRITE setLabelText) diff --git a/src/gui/dialogs/qmessagebox.h b/src/gui/dialogs/qmessagebox.h index d24d466..048455e 100644 --- a/src/gui/dialogs/qmessagebox.h +++ b/src/gui/dialogs/qmessagebox.h @@ -336,7 +336,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_buttonClicked(QAbstractButton *)) Q_DISABLE_COPY(QMessageBox) - Q_DECLARE_SCOPED_PRIVATE(QMessageBox) + Q_DECLARE_PRIVATE(QMessageBox) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QMessageBox::StandardButtons) diff --git a/src/gui/dialogs/qpagesetupdialog.h b/src/gui/dialogs/qpagesetupdialog.h index 1757c32..43e316d 100644 --- a/src/gui/dialogs/qpagesetupdialog.h +++ b/src/gui/dialogs/qpagesetupdialog.h @@ -57,7 +57,7 @@ class QPageSetupDialogPrivate; class Q_GUI_EXPORT QPageSetupDialog : public QAbstractPageSetupDialog { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPageSetupDialog) + Q_DECLARE_PRIVATE(QPageSetupDialog) Q_ENUMS(PageSetupDialogOption) Q_PROPERTY(PageSetupDialogOptions options READ options WRITE setOptions) diff --git a/src/gui/dialogs/qprintdialog.h b/src/gui/dialogs/qprintdialog.h index 5af70b3..e5a90cc 100644 --- a/src/gui/dialogs/qprintdialog.h +++ b/src/gui/dialogs/qprintdialog.h @@ -81,7 +81,7 @@ private: class Q_GUI_EXPORT QPrintDialog : public QAbstractPrintDialog { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPrintDialog) + Q_DECLARE_PRIVATE(QPrintDialog) Q_ENUMS(PrintDialogOption) Q_PROPERTY(PrintDialogOptions options READ options WRITE setOptions) diff --git a/src/gui/dialogs/qprintpreviewdialog.h b/src/gui/dialogs/qprintpreviewdialog.h index 5836e5a..85ed517 100644 --- a/src/gui/dialogs/qprintpreviewdialog.h +++ b/src/gui/dialogs/qprintpreviewdialog.h @@ -58,7 +58,7 @@ class QPrintPreviewDialogPrivate; class Q_GUI_EXPORT QPrintPreviewDialog : public QDialog { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPrintPreviewDialog) + Q_DECLARE_PRIVATE(QPrintPreviewDialog) public: explicit QPrintPreviewDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0); diff --git a/src/gui/dialogs/qprogressdialog.h b/src/gui/dialogs/qprogressdialog.h index 41a825a..1118c45 100644 --- a/src/gui/dialogs/qprogressdialog.h +++ b/src/gui/dialogs/qprogressdialog.h @@ -61,7 +61,7 @@ class QProgressDialogPrivate; class Q_GUI_EXPORT QProgressDialog : public QDialog { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QProgressDialog) + Q_DECLARE_PRIVATE(QProgressDialog) Q_PROPERTY(bool wasCanceled READ wasCanceled) Q_PROPERTY(int minimum READ minimum WRITE setMinimum) Q_PROPERTY(int maximum READ maximum WRITE setMaximum) diff --git a/src/gui/dialogs/qwizard.h b/src/gui/dialogs/qwizard.h index a8976c4..d1f9cf7 100644 --- a/src/gui/dialogs/qwizard.h +++ b/src/gui/dialogs/qwizard.h @@ -194,7 +194,7 @@ protected: private: Q_DISABLE_COPY(QWizard) - Q_DECLARE_SCOPED_PRIVATE(QWizard) + Q_DECLARE_PRIVATE(QWizard) Q_PRIVATE_SLOT(d_func(), void _q_emitCustomButtonClicked()) Q_PRIVATE_SLOT(d_func(), void _q_updateButtonStates()) Q_PRIVATE_SLOT(d_func(), void _q_handleFieldObjectDestroyed(QObject *)) @@ -246,7 +246,7 @@ protected: private: Q_DISABLE_COPY(QWizardPage) - Q_DECLARE_SCOPED_PRIVATE(QWizardPage) + Q_DECLARE_PRIVATE(QWizardPage) Q_PRIVATE_SLOT(d_func(), void _q_maybeEmitCompleteChanged()) Q_PRIVATE_SLOT(d_func(), void _q_updateCachedCompleteState()) diff --git a/src/gui/dialogs/qwizard_win.cpp b/src/gui/dialogs/qwizard_win.cpp index 41b581f..1def47f 100644 --- a/src/gui/dialogs/qwizard_win.cpp +++ b/src/gui/dialogs/qwizard_win.cpp @@ -429,7 +429,7 @@ void QVistaHelper::setWindowPosHack() class QHackWidget : public QWidget { public: - Q_DECLARE_SCOPED_PRIVATE(QWidget) + Q_DECLARE_PRIVATE(QWidget) QTLWExtra* topData() { return d_func()->topData(); } }; diff --git a/src/gui/embedded/qdirectpainter_qws.h b/src/gui/embedded/qdirectpainter_qws.h index a7f82f1..eddde10 100644 --- a/src/gui/embedded/qdirectpainter_qws.h +++ b/src/gui/embedded/qdirectpainter_qws.h @@ -57,7 +57,7 @@ class QWSEmbedEvent; class Q_GUI_EXPORT QDirectPainter : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QDirectPainter) + Q_DECLARE_PRIVATE(QDirectPainter) public: enum SurfaceFlag { NonReserved = 0, diff --git a/src/gui/embedded/qtransportauth_qws.h b/src/gui/embedded/qtransportauth_qws.h index e633a90..d8753fe 100644 --- a/src/gui/embedded/qtransportauth_qws.h +++ b/src/gui/embedded/qtransportauth_qws.h @@ -169,7 +169,7 @@ private: ~QTransportAuth(); friend class QAuthDevice; - Q_DECLARE_SCOPED_PRIVATE(QTransportAuth) + Q_DECLARE_PRIVATE(QTransportAuth) }; class Q_GUI_EXPORT RequestAnalyzer diff --git a/src/gui/embedded/qwindowsystem_qws.h b/src/gui/embedded/qwindowsystem_qws.h index 04cd756..3cda9f6 100644 --- a/src/gui/embedded/qwindowsystem_qws.h +++ b/src/gui/embedded/qwindowsystem_qws.h @@ -214,7 +214,7 @@ class Q_GUI_EXPORT QWSServer : public QObject friend class QWSDisplay; friend class QWSInputMethod; Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QWSServer) + Q_DECLARE_PRIVATE(QWSServer) public: explicit QWSServer(int flags = 0, QObject *parent=0); #ifdef QT3_SUPPORT @@ -443,7 +443,7 @@ class QWSConvertSelectionCommand; class Q_GUI_EXPORT QWSClient : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QWSClient) + Q_DECLARE_PRIVATE(QWSClient) public: QWSClient(QObject* parent, QWS_SOCK_BASE *, int id); ~QWSClient(); diff --git a/src/gui/embedded/qwsembedwidget.h b/src/gui/embedded/qwsembedwidget.h index d880454..8313c38 100644 --- a/src/gui/embedded/qwsembedwidget.h +++ b/src/gui/embedded/qwsembedwidget.h @@ -71,7 +71,7 @@ protected: void showEvent(QShowEvent *event); private: - Q_DECLARE_SCOPED_PRIVATE(QWSEmbedWidget) + Q_DECLARE_PRIVATE(QWSEmbedWidget) }; QT_END_NAMESPACE diff --git a/src/gui/embedded/qwsmanager_qws.h b/src/gui/embedded/qwsmanager_qws.h index 86aadc9..5a4312c 100644 --- a/src/gui/embedded/qwsmanager_qws.h +++ b/src/gui/embedded/qwsmanager_qws.h @@ -66,7 +66,7 @@ class QWSManagerPrivate; class Q_GUI_EXPORT QWSManager : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QWSManager) + Q_DECLARE_PRIVATE(QWSManager) public: explicit QWSManager(QWidget *); ~QWSManager(); diff --git a/src/gui/graphicsview/qgraphicsgridlayout.h b/src/gui/graphicsview/qgraphicsgridlayout.h index faa91b3..b9db03e 100644 --- a/src/gui/graphicsview/qgraphicsgridlayout.h +++ b/src/gui/graphicsview/qgraphicsgridlayout.h @@ -127,7 +127,7 @@ public: private: Q_DISABLE_COPY(QGraphicsGridLayout) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsGridLayout) + Q_DECLARE_PRIVATE(QGraphicsGridLayout) }; inline void QGraphicsGridLayout::addItem(QGraphicsLayoutItem *aitem, int arow, int acolumn, Qt::Alignment aalignment) diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index 6f9222e..465525f 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -431,7 +431,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsItem) + Q_DECLARE_PRIVATE(QGraphicsItem) friend class QGraphicsItemGroup; friend class QGraphicsScene; friend class QGraphicsScenePrivate; @@ -571,7 +571,7 @@ protected: private: Q_DISABLE_COPY(QAbstractGraphicsShapeItem) - Q_DECLARE_SCOPED_PRIVATE(QAbstractGraphicsShapeItem) + Q_DECLARE_PRIVATE(QAbstractGraphicsShapeItem) }; class QGraphicsPathItemPrivate; @@ -614,7 +614,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsPathItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsPathItem) + Q_DECLARE_PRIVATE(QGraphicsPathItem) }; class QGraphicsRectItemPrivate; @@ -664,7 +664,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsRectItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsRectItem) + Q_DECLARE_PRIVATE(QGraphicsRectItem) }; inline void QGraphicsRectItem::setRect(qreal ax, qreal ay, qreal w, qreal h) @@ -723,7 +723,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsEllipseItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsEllipseItem) + Q_DECLARE_PRIVATE(QGraphicsEllipseItem) }; inline void QGraphicsEllipseItem::setRect(qreal ax, qreal ay, qreal w, qreal h) @@ -773,7 +773,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsPolygonItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsPolygonItem) + Q_DECLARE_PRIVATE(QGraphicsPolygonItem) }; class QGraphicsLineItemPrivate; @@ -827,7 +827,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsLineItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsLineItem) + Q_DECLARE_PRIVATE(QGraphicsLineItem) }; class QGraphicsPixmapItemPrivate; @@ -886,7 +886,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsPixmapItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsPixmapItem) + Q_DECLARE_PRIVATE(QGraphicsPixmapItem) }; inline void QGraphicsPixmapItem::setOffset(qreal ax, qreal ay) @@ -1042,7 +1042,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsSimpleTextItem) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSimpleTextItem) + Q_DECLARE_PRIVATE(QGraphicsSimpleTextItem) }; class QGraphicsItemGroupPrivate; @@ -1071,7 +1071,7 @@ public: private: Q_DISABLE_COPY(QGraphicsItemGroup) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsItemGroup) + Q_DECLARE_PRIVATE(QGraphicsItemGroup) }; template <class T> inline T qgraphicsitem_cast(QGraphicsItem *item) diff --git a/src/gui/graphicsview/qgraphicslayout.h b/src/gui/graphicsview/qgraphicslayout.h index d2c45ab..7c758bc 100644 --- a/src/gui/graphicsview/qgraphicslayout.h +++ b/src/gui/graphicsview/qgraphicslayout.h @@ -81,7 +81,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsLayout) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsLayout) + Q_DECLARE_PRIVATE(QGraphicsLayout) friend class QGraphicsWidget; }; diff --git a/src/gui/graphicsview/qgraphicslayoutitem.h b/src/gui/graphicsview/qgraphicslayoutitem.h index 156c843..60f894f 100644 --- a/src/gui/graphicsview/qgraphicslayoutitem.h +++ b/src/gui/graphicsview/qgraphicslayoutitem.h @@ -117,7 +117,7 @@ protected: private: QSizeF *effectiveSizeHints(const QSizeF &constraint) const; - Q_DECLARE_SCOPED_PRIVATE(QGraphicsLayoutItem) + Q_DECLARE_PRIVATE(QGraphicsLayoutItem) friend class QGraphicsLayout; }; diff --git a/src/gui/graphicsview/qgraphicslinearlayout.h b/src/gui/graphicsview/qgraphicslinearlayout.h index 91335db..f469680 100644 --- a/src/gui/graphicsview/qgraphicslinearlayout.h +++ b/src/gui/graphicsview/qgraphicslinearlayout.h @@ -108,7 +108,7 @@ protected: private: Q_DISABLE_COPY(QGraphicsLinearLayout) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsLinearLayout) + Q_DECLARE_PRIVATE(QGraphicsLinearLayout) }; #endif diff --git a/src/gui/graphicsview/qgraphicsscene.h b/src/gui/graphicsview/qgraphicsscene.h index c2f7a22..c0c6e75 100644 --- a/src/gui/graphicsview/qgraphicsscene.h +++ b/src/gui/graphicsview/qgraphicsscene.h @@ -291,7 +291,7 @@ Q_SIGNALS: void selectionChanged(); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsScene) + Q_DECLARE_PRIVATE(QGraphicsScene) Q_DISABLE_COPY(QGraphicsScene) Q_PRIVATE_SLOT(d_func(), void _q_emitUpdated()) Q_PRIVATE_SLOT(d_func(), void _q_polishItems()) diff --git a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h index 01a8957..2293a8e 100644 --- a/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h +++ b/src/gui/graphicsview/qgraphicsscenebsptreeindex_p.h @@ -100,7 +100,7 @@ protected: void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const QVariant &value); private : - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneBspTreeIndex) + Q_DECLARE_PRIVATE(QGraphicsSceneBspTreeIndex) Q_DISABLE_COPY(QGraphicsSceneBspTreeIndex) Q_PRIVATE_SLOT(d_func(), void _q_updateSortCache()) Q_PRIVATE_SLOT(d_func(), void _q_updateIndex()) diff --git a/src/gui/graphicsview/qgraphicssceneevent.h b/src/gui/graphicsview/qgraphicssceneevent.h index 0445810..ea17f9d 100644 --- a/src/gui/graphicsview/qgraphicssceneevent.h +++ b/src/gui/graphicsview/qgraphicssceneevent.h @@ -76,7 +76,7 @@ public: protected: QGraphicsSceneEvent(QGraphicsSceneEventPrivate &dd, Type type = None); QScopedPointer<QGraphicsSceneEventPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneEvent) }; class QGraphicsSceneMouseEventPrivate; @@ -123,7 +123,7 @@ public: void setModifiers(Qt::KeyboardModifiers modifiers); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneMouseEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneMouseEvent) }; class QGraphicsSceneWheelEventPrivate; @@ -155,7 +155,7 @@ public: void setOrientation(Qt::Orientation orientation); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneWheelEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneWheelEvent) }; class QGraphicsSceneContextMenuEventPrivate; @@ -183,7 +183,7 @@ public: void setReason(Reason reason); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneContextMenuEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneContextMenuEvent) }; class QGraphicsSceneHoverEventPrivate; @@ -215,7 +215,7 @@ public: void setModifiers(Qt::KeyboardModifiers modifiers); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneHoverEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneHoverEvent) }; class QGraphicsSceneHelpEventPrivate; @@ -232,7 +232,7 @@ public: void setScreenPos(const QPoint &pos); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneHelpEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneHelpEvent) }; class QGraphicsSceneDragDropEventPrivate; @@ -274,13 +274,13 @@ public: void setMimeData(const QMimeData *data); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneDragDropEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneDragDropEvent) }; class QGraphicsSceneResizeEventPrivate; class Q_GUI_EXPORT QGraphicsSceneResizeEvent : public QGraphicsSceneEvent { - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneResizeEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneResizeEvent) public: QGraphicsSceneResizeEvent(); ~QGraphicsSceneResizeEvent(); @@ -295,7 +295,7 @@ public: class QGraphicsSceneMoveEventPrivate; class Q_GUI_EXPORT QGraphicsSceneMoveEvent : public QGraphicsSceneEvent { - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneMoveEvent) + Q_DECLARE_PRIVATE(QGraphicsSceneMoveEvent) public: QGraphicsSceneMoveEvent(); ~QGraphicsSceneMoveEvent(); diff --git a/src/gui/graphicsview/qgraphicssceneindex_p.h b/src/gui/graphicsview/qgraphicssceneindex_p.h index d3dfcc8..37dffb8 100644 --- a/src/gui/graphicsview/qgraphicssceneindex_p.h +++ b/src/gui/graphicsview/qgraphicssceneindex_p.h @@ -122,7 +122,7 @@ protected: friend class QGraphicsSceneBspTreeIndex; private: Q_DISABLE_COPY(QGraphicsSceneIndex) - Q_DECLARE_SCOPED_PRIVATE(QGraphicsSceneIndex) + Q_DECLARE_PRIVATE(QGraphicsSceneIndex) }; class QGraphicsSceneIndexPrivate : public QObjectPrivate diff --git a/src/gui/graphicsview/qgraphicstransform.h b/src/gui/graphicsview/qgraphicstransform.h index fb3a392..d7c07d0 100644 --- a/src/gui/graphicsview/qgraphicstransform.h +++ b/src/gui/graphicsview/qgraphicstransform.h @@ -74,7 +74,7 @@ protected: private: friend class QGraphicsItem; friend class QGraphicsItemPrivate; - Q_DECLARE_SCOPED_PRIVATE(QGraphicsTransform) + Q_DECLARE_PRIVATE(QGraphicsTransform) }; class QGraphicsScalePrivate; @@ -106,7 +106,7 @@ Q_SIGNALS: void scaleChanged(); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsScale) + Q_DECLARE_PRIVATE(QGraphicsScale) }; class QGraphicsRotationPrivate; @@ -136,7 +136,7 @@ Q_SIGNALS: protected: QGraphicsRotation(QGraphicsRotationPrivate &p, QObject *parent); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsRotation) + Q_DECLARE_PRIVATE(QGraphicsRotation) }; class QGraphicsRotation3DPrivate; @@ -159,7 +159,7 @@ Q_SIGNALS: void axisChanged(); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsRotation3D) + Q_DECLARE_PRIVATE(QGraphicsRotation3D) }; QT_END_NAMESPACE diff --git a/src/gui/graphicsview/qgraphicsview.h b/src/gui/graphicsview/qgraphicsview.h index 425f174..1285e45 100644 --- a/src/gui/graphicsview/qgraphicsview.h +++ b/src/gui/graphicsview/qgraphicsview.h @@ -269,7 +269,7 @@ protected: const QStyleOptionGraphicsItem options[]); private: - Q_DECLARE_SCOPED_PRIVATE(QGraphicsView) + Q_DECLARE_PRIVATE(QGraphicsView) Q_DISABLE_COPY(QGraphicsView) #ifndef QT_NO_CURSOR Q_PRIVATE_SLOT(d_func(), void _q_setViewportCursor(const QCursor &)) diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h index 97b2ba2..50508c0 100644 --- a/src/gui/image/qimageiohandler.h +++ b/src/gui/image/qimageiohandler.h @@ -60,7 +60,7 @@ class QVariant; class QImageIOHandlerPrivate; class Q_GUI_EXPORT QImageIOHandler { - Q_DECLARE_SCOPED_PRIVATE(QImageIOHandler) + Q_DECLARE_PRIVATE(QImageIOHandler) public: QImageIOHandler(); virtual ~QImageIOHandler(); diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h index eda5aa1..afee789 100644 --- a/src/gui/image/qmovie.h +++ b/src/gui/image/qmovie.h @@ -74,7 +74,7 @@ class QMoviePrivate; class Q_GUI_EXPORT QMovie : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QMovie) + Q_DECLARE_PRIVATE(QMovie) Q_ENUMS(MovieState CacheMode) Q_PROPERTY(int speed READ speed WRITE setSpeed) Q_PROPERTY(CacheMode cacheMode READ cacheMode WRITE setCacheMode) diff --git a/src/gui/image/qpaintengine_pic_p.h b/src/gui/image/qpaintengine_pic_p.h index 2aaa5f0..1e6413e 100644 --- a/src/gui/image/qpaintengine_pic_p.h +++ b/src/gui/image/qpaintengine_pic_p.h @@ -65,7 +65,7 @@ class QBuffer; class QPicturePaintEngine : public QPaintEngine { - Q_DECLARE_SCOPED_PRIVATE(QPicturePaintEngine) + Q_DECLARE_PRIVATE(QPicturePaintEngine) public: QPicturePaintEngine(); ~QPicturePaintEngine(); diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h index 4d9af37..c323f0e 100644 --- a/src/gui/image/qpicture.h +++ b/src/gui/image/qpicture.h @@ -56,7 +56,7 @@ QT_MODULE(Gui) class QPicturePrivate; class Q_GUI_EXPORT QPicture : public QPaintDevice { - Q_DECLARE_SCOPED_PRIVATE(QPicture) + Q_DECLARE_PRIVATE(QPicture) public: explicit QPicture(int formatVersion = -1); QPicture(const QPicture &); diff --git a/src/gui/image/qpixmapfilter_p.h b/src/gui/image/qpixmapfilter_p.h index 83fc1b9..51292b3 100644 --- a/src/gui/image/qpixmapfilter_p.h +++ b/src/gui/image/qpixmapfilter_p.h @@ -70,7 +70,7 @@ class QPixmapFilterPrivate; class Q_GUI_EXPORT QPixmapFilter : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPixmapFilter) + Q_DECLARE_PRIVATE(QPixmapFilter) public: virtual ~QPixmapFilter() = 0; @@ -98,7 +98,7 @@ class QPixmapConvolutionFilterPrivate; class Q_GUI_EXPORT QPixmapConvolutionFilter : public QPixmapFilter { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPixmapConvolutionFilter) + Q_DECLARE_PRIVATE(QPixmapConvolutionFilter) public: QPixmapConvolutionFilter(QObject *parent = 0); @@ -122,7 +122,7 @@ class QPixmapColorizeFilterPrivate; class Q_GUI_EXPORT QPixmapColorizeFilter : public QPixmapFilter { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPixmapColorizeFilter) + Q_DECLARE_PRIVATE(QPixmapColorizeFilter) public: QPixmapColorizeFilter(QObject *parent = 0); @@ -138,7 +138,7 @@ class QPixmapDropShadowFilterPrivate; class Q_GUI_EXPORT QPixmapDropShadowFilter : public QPixmapFilter { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPixmapDropShadowFilter) + Q_DECLARE_PRIVATE(QPixmapDropShadowFilter) public: QPixmapDropShadowFilter(QObject *parent = 0); diff --git a/src/gui/inputmethod/qinputcontext.h b/src/gui/inputmethod/qinputcontext.h index 87112b5..e4e5f9d 100644 --- a/src/gui/inputmethod/qinputcontext.h +++ b/src/gui/inputmethod/qinputcontext.h @@ -83,7 +83,7 @@ class QInputContextPrivate; class Q_GUI_EXPORT QInputContext : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QInputContext) + Q_DECLARE_PRIVATE(QInputContext) public: explicit QInputContext(QObject* parent = 0); virtual ~QInputContext(); diff --git a/src/gui/inputmethod/qmacinputcontext_p.h b/src/gui/inputmethod/qmacinputcontext_p.h index 69ac3e8..4fcba9a 100644 --- a/src/gui/inputmethod/qmacinputcontext_p.h +++ b/src/gui/inputmethod/qmacinputcontext_p.h @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE class Q_GUI_EXPORT QMacInputContext : public QInputContext { Q_OBJECT - //Q_DECLARE_SCOPED_PRIVATE(QMacInputContext) + //Q_DECLARE_PRIVATE(QMacInputContext) void createTextDocument(); public: explicit QMacInputContext(QObject* parent = 0); diff --git a/src/gui/itemviews/qabstractitemview.h b/src/gui/itemviews/qabstractitemview.h index 4f2aa1d..da6f0ea 100644 --- a/src/gui/itemviews/qabstractitemview.h +++ b/src/gui/itemviews/qabstractitemview.h @@ -345,7 +345,7 @@ protected: #endif private: - Q_DECLARE_SCOPED_PRIVATE(QAbstractItemView) + Q_DECLARE_PRIVATE(QAbstractItemView) Q_DISABLE_COPY(QAbstractItemView) Q_PRIVATE_SLOT(d_func(), void _q_columnsAboutToBeRemoved(const QModelIndex&, int, int)) Q_PRIVATE_SLOT(d_func(), void _q_columnsRemoved(const QModelIndex&, int, int)) diff --git a/src/gui/itemviews/qabstractproxymodel.h b/src/gui/itemviews/qabstractproxymodel.h index 356d923..8a703da 100644 --- a/src/gui/itemviews/qabstractproxymodel.h +++ b/src/gui/itemviews/qabstractproxymodel.h @@ -87,7 +87,7 @@ protected: QAbstractProxyModel(QAbstractProxyModelPrivate &, QObject *parent); private: - Q_DECLARE_SCOPED_PRIVATE(QAbstractProxyModel) + Q_DECLARE_PRIVATE(QAbstractProxyModel) Q_DISABLE_COPY(QAbstractProxyModel) Q_PRIVATE_SLOT(d_func(), void _q_sourceModelDestroyed()) }; diff --git a/src/gui/itemviews/qcolumnview.h b/src/gui/itemviews/qcolumnview.h index df5b84e..f8697e9 100644 --- a/src/gui/itemviews/qcolumnview.h +++ b/src/gui/itemviews/qcolumnview.h @@ -106,7 +106,7 @@ protected: void initializeColumn(QAbstractItemView *column) const; private: - Q_DECLARE_SCOPED_PRIVATE(QColumnView) + Q_DECLARE_PRIVATE(QColumnView) Q_DISABLE_COPY(QColumnView) Q_PRIVATE_SLOT(d_func(), void _q_gripMoved(int)) Q_PRIVATE_SLOT(d_func(), void _q_changeCurrentColumn()) diff --git a/src/gui/itemviews/qcolumnviewgrip_p.h b/src/gui/itemviews/qcolumnviewgrip_p.h index 8e670e9..4dc35ec 100644 --- a/src/gui/itemviews/qcolumnviewgrip_p.h +++ b/src/gui/itemviews/qcolumnviewgrip_p.h @@ -82,7 +82,7 @@ protected: void mousePressEvent(QMouseEvent *event); private: - Q_DECLARE_SCOPED_PRIVATE(QColumnViewGrip) + Q_DECLARE_PRIVATE(QColumnViewGrip) Q_DISABLE_COPY(QColumnViewGrip) }; diff --git a/src/gui/itemviews/qdatawidgetmapper.h b/src/gui/itemviews/qdatawidgetmapper.h index 2773b59..2df7b69 100644 --- a/src/gui/itemviews/qdatawidgetmapper.h +++ b/src/gui/itemviews/qdatawidgetmapper.h @@ -111,7 +111,7 @@ Q_SIGNALS: void currentIndexChanged(int index); private: - Q_DECLARE_SCOPED_PRIVATE(QDataWidgetMapper) + Q_DECLARE_PRIVATE(QDataWidgetMapper) Q_DISABLE_COPY(QDataWidgetMapper) Q_PRIVATE_SLOT(d_func(), void _q_dataChanged(const QModelIndex &, const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void _q_commitData(QWidget *)) diff --git a/src/gui/itemviews/qdirmodel.h b/src/gui/itemviews/qdirmodel.h index 1f28cc9..719d551 100644 --- a/src/gui/itemviews/qdirmodel.h +++ b/src/gui/itemviews/qdirmodel.h @@ -146,7 +146,7 @@ protected: friend class QFileDialogPrivate; private: - Q_DECLARE_SCOPED_PRIVATE(QDirModel) + Q_DECLARE_PRIVATE(QDirModel) Q_DISABLE_COPY(QDirModel) Q_PRIVATE_SLOT(d_func(), void _q_refresh()) }; diff --git a/src/gui/itemviews/qfileiconprovider.h b/src/gui/itemviews/qfileiconprovider.h index dd1bedd..165e30f 100644 --- a/src/gui/itemviews/qfileiconprovider.h +++ b/src/gui/itemviews/qfileiconprovider.h @@ -67,7 +67,7 @@ public: virtual QString type(const QFileInfo &info) const; private: - Q_DECLARE_SCOPED_PRIVATE(QFileIconProvider) + Q_DECLARE_PRIVATE(QFileIconProvider) QScopedPointer<QFileIconProviderPrivate> d_ptr; Q_DISABLE_COPY(QFileIconProvider) }; diff --git a/src/gui/itemviews/qheaderview.h b/src/gui/itemviews/qheaderview.h index 0690fa0..3a66c9a 100644 --- a/src/gui/itemviews/qheaderview.h +++ b/src/gui/itemviews/qheaderview.h @@ -228,7 +228,7 @@ protected: private: Q_PRIVATE_SLOT(d_func(), void _q_sectionsRemoved(const QModelIndex &parent, int logicalFirst, int logicalLast)) Q_PRIVATE_SLOT(d_func(), void _q_layoutAboutToBeChanged()) - Q_DECLARE_SCOPED_PRIVATE(QHeaderView) + Q_DECLARE_PRIVATE(QHeaderView) Q_DISABLE_COPY(QHeaderView) }; diff --git a/src/gui/itemviews/qitemdelegate.h b/src/gui/itemviews/qitemdelegate.h index a6f0ba1..d46481c 100644 --- a/src/gui/itemviews/qitemdelegate.h +++ b/src/gui/itemviews/qitemdelegate.h @@ -126,7 +126,7 @@ protected: const QFont &font, const QString &text) const; private: - Q_DECLARE_SCOPED_PRIVATE(QItemDelegate) + Q_DECLARE_PRIVATE(QItemDelegate) Q_DISABLE_COPY(QItemDelegate) Q_PRIVATE_SLOT(d_func(), void _q_commitDataAndCloseEditor(QWidget*)) diff --git a/src/gui/itemviews/qitemselectionmodel.h b/src/gui/itemviews/qitemselectionmodel.h index bc9f61c..e6a99a6 100644 --- a/src/gui/itemviews/qitemselectionmodel.h +++ b/src/gui/itemviews/qitemselectionmodel.h @@ -125,7 +125,7 @@ class QItemSelectionModelPrivate; class Q_GUI_EXPORT QItemSelectionModel : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QItemSelectionModel) + Q_DECLARE_PRIVATE(QItemSelectionModel) Q_FLAGS(SelectionFlags) public: diff --git a/src/gui/itemviews/qlistview.h b/src/gui/itemviews/qlistview.h index a098427..75dff40 100644 --- a/src/gui/itemviews/qlistview.h +++ b/src/gui/itemviews/qlistview.h @@ -190,7 +190,7 @@ private: friend class QAccessibleItemView; int visualIndex(const QModelIndex &index) const; - Q_DECLARE_SCOPED_PRIVATE(QListView) + Q_DECLARE_PRIVATE(QListView) Q_DISABLE_COPY(QListView) }; diff --git a/src/gui/itemviews/qlistwidget.h b/src/gui/itemviews/qlistwidget.h index d2f2f06..afcc331 100644 --- a/src/gui/itemviews/qlistwidget.h +++ b/src/gui/itemviews/qlistwidget.h @@ -291,7 +291,7 @@ private: void setModel(QAbstractItemModel *model); Qt::SortOrder sortOrder() const; - Q_DECLARE_SCOPED_PRIVATE(QListWidget) + Q_DECLARE_PRIVATE(QListWidget) Q_DISABLE_COPY(QListWidget) Q_PRIVATE_SLOT(d_func(), void _q_emitItemPressed(const QModelIndex &index)) diff --git a/src/gui/itemviews/qproxymodel.h b/src/gui/itemviews/qproxymodel.h index 420753c..62cf33e 100644 --- a/src/gui/itemviews/qproxymodel.h +++ b/src/gui/itemviews/qproxymodel.h @@ -119,7 +119,7 @@ protected: void disconnectFromModel(const QAbstractItemModel *model) const; private: - Q_DECLARE_SCOPED_PRIVATE(QProxyModel) + Q_DECLARE_PRIVATE(QProxyModel) Q_DISABLE_COPY(QProxyModel) Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(const QModelIndex&,const QModelIndex&)) diff --git a/src/gui/itemviews/qsortfilterproxymodel.h b/src/gui/itemviews/qsortfilterproxymodel.h index b179559..0bd084e 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.h +++ b/src/gui/itemviews/qsortfilterproxymodel.h @@ -172,7 +172,7 @@ public: QStringList mimeTypes() const; Qt::DropActions supportedDropActions() const; private: - Q_DECLARE_SCOPED_PRIVATE(QSortFilterProxyModel) + Q_DECLARE_PRIVATE(QSortFilterProxyModel) Q_DISABLE_COPY(QSortFilterProxyModel) Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(const QModelIndex &source_top_left, const QModelIndex &source_bottom_right)) diff --git a/src/gui/itemviews/qstandarditemmodel.h b/src/gui/itemviews/qstandarditemmodel.h index 7e76a4a..c470b80 100644 --- a/src/gui/itemviews/qstandarditemmodel.h +++ b/src/gui/itemviews/qstandarditemmodel.h @@ -245,7 +245,7 @@ protected: void emitDataChanged(); private: - Q_DECLARE_SCOPED_PRIVATE(QStandardItem) + Q_DECLARE_PRIVATE(QStandardItem) friend class QStandardItemModelPrivate; friend class QStandardItemModel; }; @@ -422,7 +422,7 @@ private: friend class QStandardItemPrivate; friend class QStandardItem; Q_DISABLE_COPY(QStandardItemModel) - Q_DECLARE_SCOPED_PRIVATE(QStandardItemModel) + Q_DECLARE_PRIVATE(QStandardItemModel) Q_PRIVATE_SLOT(d_func(), void _q_emitItemChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)) diff --git a/src/gui/itemviews/qstyleditemdelegate.h b/src/gui/itemviews/qstyleditemdelegate.h index 2f31387..ccb1024 100644 --- a/src/gui/itemviews/qstyleditemdelegate.h +++ b/src/gui/itemviews/qstyleditemdelegate.h @@ -101,7 +101,7 @@ protected: const QStyleOptionViewItem &option, const QModelIndex &index); private: - Q_DECLARE_SCOPED_PRIVATE(QStyledItemDelegate) + Q_DECLARE_PRIVATE(QStyledItemDelegate) Q_DISABLE_COPY(QStyledItemDelegate) Q_PRIVATE_SLOT(d_func(), void _q_commitDataAndCloseEditor(QWidget*)) diff --git a/src/gui/itemviews/qtableview.h b/src/gui/itemviews/qtableview.h index 7e4ba54..c09186c 100644 --- a/src/gui/itemviews/qtableview.h +++ b/src/gui/itemviews/qtableview.h @@ -178,7 +178,7 @@ private: friend class QAccessibleItemView; int visualIndex(const QModelIndex &index) const; - Q_DECLARE_SCOPED_PRIVATE(QTableView) + Q_DECLARE_PRIVATE(QTableView) Q_DISABLE_COPY(QTableView) Q_PRIVATE_SLOT(d_func(), void _q_selectRow(int)) Q_PRIVATE_SLOT(d_func(), void _q_selectColumn(int)) diff --git a/src/gui/itemviews/qtablewidget.h b/src/gui/itemviews/qtablewidget.h index 1963df8..6c25ba0 100644 --- a/src/gui/itemviews/qtablewidget.h +++ b/src/gui/itemviews/qtablewidget.h @@ -336,7 +336,7 @@ protected: private: void setModel(QAbstractItemModel *model); - Q_DECLARE_SCOPED_PRIVATE(QTableWidget) + Q_DECLARE_PRIVATE(QTableWidget) Q_DISABLE_COPY(QTableWidget) Q_PRIVATE_SLOT(d_func(), void _q_emitItemPressed(const QModelIndex &index)) diff --git a/src/gui/itemviews/qtreeview.h b/src/gui/itemviews/qtreeview.h index 876bc12..4411781 100644 --- a/src/gui/itemviews/qtreeview.h +++ b/src/gui/itemviews/qtreeview.h @@ -221,7 +221,7 @@ private: friend class QAccessibleItemView; int visualIndex(const QModelIndex &index) const; - Q_DECLARE_SCOPED_PRIVATE(QTreeView) + Q_DECLARE_PRIVATE(QTreeView) Q_DISABLE_COPY(QTreeView) #ifndef QT_NO_ANIMATION Q_PRIVATE_SLOT(d_func(), void _q_endAnimatedOperation()) diff --git a/src/gui/itemviews/qtreewidget.h b/src/gui/itemviews/qtreewidget.h index b640a7a..3266725 100644 --- a/src/gui/itemviews/qtreewidget.h +++ b/src/gui/itemviews/qtreewidget.h @@ -367,7 +367,7 @@ protected: private: void setModel(QAbstractItemModel *model); - Q_DECLARE_SCOPED_PRIVATE(QTreeWidget) + Q_DECLARE_PRIVATE(QTreeWidget) Q_DISABLE_COPY(QTreeWidget) Q_PRIVATE_SLOT(d_func(), void _q_emitItemPressed(const QModelIndex &index)) diff --git a/src/gui/itemviews/qtreewidget_p.h b/src/gui/itemviews/qtreewidget_p.h index 6d62062..145916a 100644 --- a/src/gui/itemviews/qtreewidget_p.h +++ b/src/gui/itemviews/qtreewidget_p.h @@ -162,7 +162,7 @@ private: bool isChanging() const; private: - Q_DECLARE_SCOPED_PRIVATE(QTreeModel) + Q_DECLARE_PRIVATE(QTreeModel) public: struct SkipSorting { diff --git a/src/gui/itemviews/qtreewidgetitemiterator.h b/src/gui/itemviews/qtreewidgetitemiterator.h index ce0b610..eff9fdb 100644 --- a/src/gui/itemviews/qtreewidgetitemiterator.h +++ b/src/gui/itemviews/qtreewidgetitemiterator.h @@ -109,7 +109,7 @@ private: QScopedPointer<QTreeWidgetItemIteratorPrivate> d_ptr; QTreeWidgetItem *current; IteratorFlags flags; - Q_DECLARE_SCOPED_PRIVATE(QTreeWidgetItemIterator) + Q_DECLARE_PRIVATE(QTreeWidgetItemIterator) }; inline const QTreeWidgetItemIterator QTreeWidgetItemIterator::operator++(int) diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h index ef32a33..68f88c5 100644 --- a/src/gui/kernel/qaction.h +++ b/src/gui/kernel/qaction.h @@ -64,7 +64,7 @@ class QGraphicsWidget; class Q_GUI_EXPORT QAction : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QAction) + Q_DECLARE_PRIVATE(QAction) Q_ENUMS(MenuRole) Q_ENUMS(SoftKeyRole) diff --git a/src/gui/kernel/qactiongroup.h b/src/gui/kernel/qactiongroup.h index 07bdbda..e42c2e5 100644 --- a/src/gui/kernel/qactiongroup.h +++ b/src/gui/kernel/qactiongroup.h @@ -57,7 +57,7 @@ class QActionGroupPrivate; class Q_GUI_EXPORT QActionGroup : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QActionGroup) + Q_DECLARE_PRIVATE(QActionGroup) Q_PROPERTY(bool exclusive READ isExclusive WRITE setExclusive) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled) diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h index 88a01fe..fcb3a7c 100644 --- a/src/gui/kernel/qapplication.h +++ b/src/gui/kernel/qapplication.h @@ -363,7 +363,7 @@ public: private: Q_DISABLE_COPY(QApplication) - Q_DECLARE_SCOPED_PRIVATE(QApplication) + Q_DECLARE_PRIVATE(QApplication) friend class QGraphicsWidget; friend class QGraphicsScene; diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 0a38870..2bded5c 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -1098,7 +1098,7 @@ static void qWinProcessConfigRequests() // perform requests in qu class QGuiEventDispatcherWin32 : public QEventDispatcherWin32 { - Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherWin32) + Q_DECLARE_PRIVATE(QEventDispatcherWin32) public: QGuiEventDispatcherWin32(QObject *parent = 0); bool processEvents(QEventLoop::ProcessEventsFlags flags); diff --git a/src/gui/kernel/qboxlayout.h b/src/gui/kernel/qboxlayout.h index c399b8d..f463c31 100644 --- a/src/gui/kernel/qboxlayout.h +++ b/src/gui/kernel/qboxlayout.h @@ -60,7 +60,7 @@ class QBoxLayoutPrivate; class Q_GUI_EXPORT QBoxLayout : public QLayout { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QBoxLayout) + Q_DECLARE_PRIVATE(QBoxLayout) public: enum Direction { LeftToRight, RightToLeft, TopToBottom, BottomToTop, Down = TopToBottom, Up = BottomToTop }; diff --git a/src/gui/kernel/qclipboard.h b/src/gui/kernel/qclipboard.h index 68fbf33..8241812 100644 --- a/src/gui/kernel/qclipboard.h +++ b/src/gui/kernel/qclipboard.h @@ -62,7 +62,7 @@ class QClipboardPrivate; class Q_GUI_EXPORT QClipboard : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QClipboard) + Q_DECLARE_PRIVATE(QClipboard) private: QClipboard(QObject *parent); ~QClipboard(); diff --git a/src/gui/kernel/qdesktopwidget.h b/src/gui/kernel/qdesktopwidget.h index 785f6c4..a21ae9d 100644 --- a/src/gui/kernel/qdesktopwidget.h +++ b/src/gui/kernel/qdesktopwidget.h @@ -96,7 +96,7 @@ protected: private: Q_DISABLE_COPY(QDesktopWidget) - Q_DECLARE_SCOPED_PRIVATE(QDesktopWidget) + Q_DECLARE_PRIVATE(QDesktopWidget) friend class QApplication; friend class QApplicationPrivate; diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp index 410d1a9..7b445ea 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp @@ -316,7 +316,7 @@ static XdndData xdnd_data = { 0, 0 }; class QExtraWidget : public QWidget { - Q_DECLARE_SCOPED_PRIVATE(QWidget) + Q_DECLARE_PRIVATE(QWidget) public: inline QWExtra* extraData(); inline QTLWExtra* topData(); diff --git a/src/gui/kernel/qdrag.h b/src/gui/kernel/qdrag.h index 7e54b51..b49d82a 100644 --- a/src/gui/kernel/qdrag.h +++ b/src/gui/kernel/qdrag.h @@ -61,7 +61,7 @@ class QDragManager; class Q_GUI_EXPORT QDrag : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QDrag) + Q_DECLARE_PRIVATE(QDrag) public: explicit QDrag(QWidget *dragSource); ~QDrag(); diff --git a/src/gui/kernel/qeventdispatcher_glib_qws_p.h b/src/gui/kernel/qeventdispatcher_glib_qws_p.h index f0751be..826661e 100644 --- a/src/gui/kernel/qeventdispatcher_glib_qws_p.h +++ b/src/gui/kernel/qeventdispatcher_glib_qws_p.h @@ -62,7 +62,7 @@ class QWSEventDispatcherGlibPrivate; class QWSEventDispatcherGlib : public QEventDispatcherGlib { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QWSEventDispatcherGlib) + Q_DECLARE_PRIVATE(QWSEventDispatcherGlib) public: explicit QWSEventDispatcherGlib(QObject *parent = 0); diff --git a/src/gui/kernel/qeventdispatcher_mac_p.h b/src/gui/kernel/qeventdispatcher_mac_p.h index 1986c4c..88663c6 100644 --- a/src/gui/kernel/qeventdispatcher_mac_p.h +++ b/src/gui/kernel/qeventdispatcher_mac_p.h @@ -108,7 +108,7 @@ class QEventDispatcherMacPrivate; class QEventDispatcherMac : public QAbstractEventDispatcher { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherMac) + Q_DECLARE_PRIVATE(QEventDispatcherMac) public: explicit QEventDispatcherMac(QObject *parent = 0); diff --git a/src/gui/kernel/qeventdispatcher_qws_p.h b/src/gui/kernel/qeventdispatcher_qws_p.h index 982ed58..b83fa10 100644 --- a/src/gui/kernel/qeventdispatcher_qws_p.h +++ b/src/gui/kernel/qeventdispatcher_qws_p.h @@ -62,7 +62,7 @@ class QEventDispatcherQWSPrivate; class QEventDispatcherQWS : public QEventDispatcherUNIX { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherQWS) + Q_DECLARE_PRIVATE(QEventDispatcherQWS) public: explicit QEventDispatcherQWS(QObject *parent = 0); diff --git a/src/gui/kernel/qeventdispatcher_x11_p.h b/src/gui/kernel/qeventdispatcher_x11_p.h index b4c553d..9a54c36 100644 --- a/src/gui/kernel/qeventdispatcher_x11_p.h +++ b/src/gui/kernel/qeventdispatcher_x11_p.h @@ -62,7 +62,7 @@ class QEventDispatcherX11Private; class QEventDispatcherX11 : public QEventDispatcherUNIX { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QEventDispatcherX11) + Q_DECLARE_PRIVATE(QEventDispatcherX11) public: explicit QEventDispatcherX11(QObject *parent = 0); diff --git a/src/gui/kernel/qformlayout.h b/src/gui/kernel/qformlayout.h index 0143711..b560e85 100644 --- a/src/gui/kernel/qformlayout.h +++ b/src/gui/kernel/qformlayout.h @@ -56,7 +56,7 @@ class Q_GUI_EXPORT QFormLayout : public QLayout { Q_OBJECT Q_ENUMS(FormStyle FieldGrowthPolicy RowWrapPolicy ItemRole) - Q_DECLARE_SCOPED_PRIVATE(QFormLayout) + Q_DECLARE_PRIVATE(QFormLayout) Q_PROPERTY(FieldGrowthPolicy fieldGrowthPolicy READ fieldGrowthPolicy WRITE setFieldGrowthPolicy RESET resetFieldGrowthPolicy) Q_PROPERTY(RowWrapPolicy rowWrapPolicy READ rowWrapPolicy WRITE setRowWrapPolicy RESET resetRowWrapPolicy) Q_PROPERTY(Qt::Alignment labelAlignment READ labelAlignment WRITE setLabelAlignment RESET resetLabelAlignment) diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h index a4bd2c2..0735160 100644 --- a/src/gui/kernel/qgesture.h +++ b/src/gui/kernel/qgesture.h @@ -60,7 +60,7 @@ class QGesturePrivate; class Q_GUI_EXPORT QGesture : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QGesture) + Q_DECLARE_PRIVATE(QGesture) Q_PROPERTY(Qt::GestureState state READ state) diff --git a/src/gui/kernel/qgridlayout.h b/src/gui/kernel/qgridlayout.h index 2b5299e..89a04a4 100644 --- a/src/gui/kernel/qgridlayout.h +++ b/src/gui/kernel/qgridlayout.h @@ -60,7 +60,7 @@ class QGridLayoutPrivate; class Q_GUI_EXPORT QGridLayout : public QLayout { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QGridLayout) + Q_DECLARE_PRIVATE(QGridLayout) QDOC_PROPERTY(int horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing) QDOC_PROPERTY(int verticalSpacing READ verticalSpacing WRITE setVerticalSpacing) diff --git a/src/gui/kernel/qguieventdispatcher_glib_p.h b/src/gui/kernel/qguieventdispatcher_glib_p.h index 8543836..65d233e 100644 --- a/src/gui/kernel/qguieventdispatcher_glib_p.h +++ b/src/gui/kernel/qguieventdispatcher_glib_p.h @@ -62,7 +62,7 @@ class QGuiEventDispatcherGlibPrivate; class QGuiEventDispatcherGlib : public QEventDispatcherGlib { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QGuiEventDispatcherGlib) + Q_DECLARE_PRIVATE(QGuiEventDispatcherGlib) public: explicit QGuiEventDispatcherGlib(QObject *parent = 0); diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h index 6c12b0f..5f3d22f 100644 --- a/src/gui/kernel/qkeymapper_p.h +++ b/src/gui/kernel/qkeymapper_p.h @@ -85,7 +85,7 @@ public: private: friend QKeyMapperPrivate *qt_keymapper_private(); - Q_DECLARE_SCOPED_PRIVATE(QKeyMapper) + Q_DECLARE_PRIVATE(QKeyMapper) Q_DISABLE_COPY(QKeyMapper) }; diff --git a/src/gui/kernel/qlayout.h b/src/gui/kernel/qlayout.h index ec95ca8..4f46c1d 100644 --- a/src/gui/kernel/qlayout.h +++ b/src/gui/kernel/qlayout.h @@ -89,7 +89,7 @@ class QLayoutPrivate; class Q_GUI_EXPORT QLayout : public QObject, public QLayoutItem { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QLayout) + Q_DECLARE_PRIVATE(QLayout) Q_ENUMS(SizeConstraint) Q_PROPERTY(int margin READ margin WRITE setMargin) diff --git a/src/gui/kernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h index 0a55d0c..f27dbaa 100644 --- a/src/gui/kernel/qsessionmanager.h +++ b/src/gui/kernel/qsessionmanager.h @@ -60,7 +60,7 @@ class QSessionManagerPrivate; class Q_GUI_EXPORT QSessionManager : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QSessionManager) + Q_DECLARE_PRIVATE(QSessionManager) QSessionManager(QApplication *app, QString &id, QString &key); ~QSessionManager(); public: diff --git a/src/gui/kernel/qshortcut.h b/src/gui/kernel/qshortcut.h index 7b79faa..c81ce7c 100644 --- a/src/gui/kernel/qshortcut.h +++ b/src/gui/kernel/qshortcut.h @@ -57,7 +57,7 @@ class QShortcutPrivate; class Q_GUI_EXPORT QShortcut : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QShortcut) + Q_DECLARE_PRIVATE(QShortcut) Q_PROPERTY(QKeySequence key READ key WRITE setKey) Q_PROPERTY(QString whatsThis READ whatsThis WRITE setWhatsThis) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled) diff --git a/src/gui/kernel/qshortcutmap_p.h b/src/gui/kernel/qshortcutmap_p.h index 53a39ec..8962ac7 100644 --- a/src/gui/kernel/qshortcutmap_p.h +++ b/src/gui/kernel/qshortcutmap_p.h @@ -74,7 +74,7 @@ class QObject; class QShortcutMap { - Q_DECLARE_SCOPED_PRIVATE(QShortcutMap) + Q_DECLARE_PRIVATE(QShortcutMap) public: QShortcutMap(); ~QShortcutMap(); diff --git a/src/gui/kernel/qsound.h b/src/gui/kernel/qsound.h index eeef047..22cfdde 100644 --- a/src/gui/kernel/qsound.h +++ b/src/gui/kernel/qsound.h @@ -82,7 +82,7 @@ public: static inline QT3_SUPPORT bool available() { return isAvailable(); } #endif private: - Q_DECLARE_SCOPED_PRIVATE(QSound) + Q_DECLARE_PRIVATE(QSound) friend class QAuServer; }; diff --git a/src/gui/kernel/qstackedlayout.h b/src/gui/kernel/qstackedlayout.h index ab215fa..d14b2ab 100644 --- a/src/gui/kernel/qstackedlayout.h +++ b/src/gui/kernel/qstackedlayout.h @@ -55,7 +55,7 @@ class QStackedLayoutPrivate; class Q_GUI_EXPORT QStackedLayout : public QLayout { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QStackedLayout) + Q_DECLARE_PRIVATE(QStackedLayout) Q_ENUMS(StackingMode) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentChanged) Q_PROPERTY(StackingMode stackingMode READ stackingMode WRITE setStackingMode) diff --git a/src/gui/kernel/qstandardgestures.h b/src/gui/kernel/qstandardgestures.h index fc7cb00..c734fba 100644 --- a/src/gui/kernel/qstandardgestures.h +++ b/src/gui/kernel/qstandardgestures.h @@ -57,7 +57,7 @@ class QPanGesturePrivate; class Q_GUI_EXPORT QPanGesture : public QGesture { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPanGesture) + Q_DECLARE_PRIVATE(QPanGesture) Q_PROPERTY(QSize totalOffset READ totalOffset) Q_PROPERTY(QSize lastOffset READ lastOffset) diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h index c5c10b6..c73f633 100644 --- a/src/gui/kernel/qwidget.h +++ b/src/gui/kernel/qwidget.h @@ -142,7 +142,7 @@ class QWidgetPrivate; class Q_GUI_EXPORT QWidget : public QObject, public QPaintDevice { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QWidget) + Q_DECLARE_PRIVATE(QWidget) Q_PROPERTY(bool modal READ isModal) Q_PROPERTY(Qt::WindowModality windowModality READ windowModality WRITE setWindowModality) diff --git a/src/gui/kernel/qwidgetaction.h b/src/gui/kernel/qwidgetaction.h index a39b281..4ec489e 100644 --- a/src/gui/kernel/qwidgetaction.h +++ b/src/gui/kernel/qwidgetaction.h @@ -57,7 +57,7 @@ class QWidgetActionPrivate; class Q_GUI_EXPORT QWidgetAction : public QAction { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QWidgetAction) + Q_DECLARE_PRIVATE(QWidgetAction) public: explicit QWidgetAction(QObject *parent); diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp index cce28c4..359434e 100644 --- a/src/gui/kernel/qx11embed_x11.cpp +++ b/src/gui/kernel/qx11embed_x11.cpp @@ -270,7 +270,7 @@ const int XButtonRelease = ButtonRelease; // need to to inspect window()'s embedded state. class QHackWidget : public QWidget { - Q_DECLARE_SCOPED_PRIVATE(QWidget) + Q_DECLARE_PRIVATE(QWidget) public: QTLWExtra* topData() { return d_func()->topData(); } }; diff --git a/src/gui/kernel/qx11embed_x11.h b/src/gui/kernel/qx11embed_x11.h index 0d67c23..8659ed6 100644 --- a/src/gui/kernel/qx11embed_x11.h +++ b/src/gui/kernel/qx11embed_x11.h @@ -80,7 +80,7 @@ protected: void resizeEvent(QResizeEvent *); private: - Q_DECLARE_SCOPED_PRIVATE(QX11EmbedWidget) + Q_DECLARE_PRIVATE(QX11EmbedWidget) Q_DISABLE_COPY(QX11EmbedWidget) }; @@ -121,7 +121,7 @@ protected: bool event(QEvent *); private: - Q_DECLARE_SCOPED_PRIVATE(QX11EmbedContainer) + Q_DECLARE_PRIVATE(QX11EmbedContainer) Q_DISABLE_COPY(QX11EmbedContainer) }; diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h index 6460afa..92aa506 100644 --- a/src/gui/painting/qpaintengine.h +++ b/src/gui/painting/qpaintengine.h @@ -89,7 +89,7 @@ Q_DECLARE_TYPEINFO(QTextItem, Q_PRIMITIVE_TYPE); class Q_GUI_EXPORT QPaintEngine { - Q_DECLARE_SCOPED_PRIVATE(QPaintEngine) + Q_DECLARE_PRIVATE(QPaintEngine) public: enum PaintEngineFeature { PrimitiveTransform = 0x00000001, // Can transform primitives brushes diff --git a/src/gui/painting/qpaintengine_alpha_p.h b/src/gui/painting/qpaintengine_alpha_p.h index 1a0b1ac..7f45ad6 100644 --- a/src/gui/painting/qpaintengine_alpha_p.h +++ b/src/gui/painting/qpaintengine_alpha_p.h @@ -62,7 +62,7 @@ class QAlphaPaintEnginePrivate; class QAlphaPaintEngine : public QPaintEngine { - Q_DECLARE_SCOPED_PRIVATE(QAlphaPaintEngine) + Q_DECLARE_PRIVATE(QAlphaPaintEngine) public: ~QAlphaPaintEngine(); diff --git a/src/gui/painting/qpaintengine_mac_p.h b/src/gui/painting/qpaintengine_mac_p.h index 42a55c4..20a4a08 100644 --- a/src/gui/painting/qpaintengine_mac_p.h +++ b/src/gui/painting/qpaintengine_mac_p.h @@ -69,7 +69,7 @@ extern int qt_defaultDpiY(); class QCoreGraphicsPaintEnginePrivate; class QCoreGraphicsPaintEngine : public QPaintEngine { - Q_DECLARE_SCOPED_PRIVATE(QCoreGraphicsPaintEngine) + Q_DECLARE_PRIVATE(QCoreGraphicsPaintEngine) public: QCoreGraphicsPaintEngine(); diff --git a/src/gui/painting/qpaintengine_preview_p.h b/src/gui/painting/qpaintengine_preview_p.h index d8e2b08..9f96d40 100644 --- a/src/gui/painting/qpaintengine_preview_p.h +++ b/src/gui/painting/qpaintengine_preview_p.h @@ -65,7 +65,7 @@ class QPreviewPaintEnginePrivate; class QPreviewPaintEngine : public QPaintEngine, public QPrintEngine { - Q_DECLARE_SCOPED_PRIVATE(QPreviewPaintEngine) + Q_DECLARE_PRIVATE(QPreviewPaintEngine) public: QPreviewPaintEngine(); ~QPreviewPaintEngine(); diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 43f7675..53f09cc 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -134,7 +134,7 @@ Q_GUI_EXPORT #endif QRasterPaintEngine : public QPaintEngineEx { - Q_DECLARE_SCOPED_PRIVATE(QRasterPaintEngine) + Q_DECLARE_PRIVATE(QRasterPaintEngine) public: QRasterPaintEngine(QPaintDevice *device); diff --git a/src/gui/painting/qpaintengine_x11_p.h b/src/gui/painting/qpaintengine_x11_p.h index 2a7894d..738a155 100644 --- a/src/gui/painting/qpaintengine_x11_p.h +++ b/src/gui/painting/qpaintengine_x11_p.h @@ -76,7 +76,7 @@ struct qt_float_point class QX11PaintEngine : public QPaintEngine { - Q_DECLARE_SCOPED_PRIVATE(QX11PaintEngine) + Q_DECLARE_PRIVATE(QX11PaintEngine) public: QX11PaintEngine(); ~QX11PaintEngine(); diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h index aea79e8..22354bc 100644 --- a/src/gui/painting/qpaintengineex_p.h +++ b/src/gui/painting/qpaintengineex_p.h @@ -143,7 +143,7 @@ class QPixmapFilter; class Q_GUI_EXPORT QPaintEngineEx : public QPaintEngine { - Q_DECLARE_SCOPED_PRIVATE(QPaintEngineEx) + Q_DECLARE_PRIVATE(QPaintEngineEx) public: QPaintEngineEx(); diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h index 227c6f5..00ebd76 100644 --- a/src/gui/painting/qpainter.h +++ b/src/gui/painting/qpainter.h @@ -83,7 +83,7 @@ class QPainterPrivateDeleter; class Q_GUI_EXPORT QPainter { - Q_DECLARE_SCOPED_PRIVATE(QPainter) + Q_DECLARE_PRIVATE(QPainter) Q_GADGET Q_FLAGS(RenderHint RenderHints) diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index ef92397..74a854e 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.h @@ -256,7 +256,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPainterPath &); class Q_GUI_EXPORT QPainterPathStroker { - Q_DECLARE_SCOPED_PRIVATE(QPainterPathStroker) + Q_DECLARE_PRIVATE(QPainterPathStroker) public: QPainterPathStroker(); ~QPainterPathStroker(); diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h index 26f5bd7..0e023d6 100644 --- a/src/gui/painting/qpdf_p.h +++ b/src/gui/painting/qpdf_p.h @@ -183,7 +183,7 @@ class QPdfBaseEnginePrivate; class QPdfBaseEngine : public QAlphaPaintEngine, public QPrintEngine { - Q_DECLARE_SCOPED_PRIVATE(QPdfBaseEngine) + Q_DECLARE_PRIVATE(QPdfBaseEngine) public: QPdfBaseEngine(QPdfBaseEnginePrivate &d, PaintEngineFeatures f); ~QPdfBaseEngine() {} diff --git a/src/gui/painting/qprintengine_mac_p.h b/src/gui/painting/qprintengine_mac_p.h index 1fdb172..23e99cd 100644 --- a/src/gui/painting/qprintengine_mac_p.h +++ b/src/gui/painting/qprintengine_mac_p.h @@ -72,7 +72,7 @@ class QPrinterPrivate; class QMacPrintEnginePrivate; class QMacPrintEngine : public QPaintEngine, public QPrintEngine { - Q_DECLARE_SCOPED_PRIVATE(QMacPrintEngine) + Q_DECLARE_PRIVATE(QMacPrintEngine) public: QMacPrintEngine(QPrinter::PrinterMode mode); diff --git a/src/gui/painting/qprintengine_pdf_p.h b/src/gui/painting/qprintengine_pdf_p.h index e130ada..6f884a9 100644 --- a/src/gui/painting/qprintengine_pdf_p.h +++ b/src/gui/painting/qprintengine_pdf_p.h @@ -84,7 +84,7 @@ class QPdfEnginePrivate; class QPdfEngine : public QPdfBaseEngine { - Q_DECLARE_SCOPED_PRIVATE(QPdfEngine) + Q_DECLARE_PRIVATE(QPdfEngine) public: QPdfEngine(QPrinter::PrinterMode m); virtual ~QPdfEngine(); diff --git a/src/gui/painting/qprintengine_ps_p.h b/src/gui/painting/qprintengine_ps_p.h index 4b8034e..986be38a 100644 --- a/src/gui/painting/qprintengine_ps_p.h +++ b/src/gui/painting/qprintengine_ps_p.h @@ -70,7 +70,7 @@ class QPSPrintEnginePrivate; class QPSPrintEngine : public QPdfBaseEngine { - Q_DECLARE_SCOPED_PRIVATE(QPSPrintEngine) + Q_DECLARE_PRIVATE(QPSPrintEngine) public: // QPrinter uses these explicit QPSPrintEngine(QPrinter::PrinterMode m); diff --git a/src/gui/painting/qprintengine_qws_p.h b/src/gui/painting/qprintengine_qws_p.h index 5e552fe..41cf935 100644 --- a/src/gui/painting/qprintengine_qws_p.h +++ b/src/gui/painting/qprintengine_qws_p.h @@ -70,7 +70,7 @@ class QImage; class QtopiaPrintEngine : public QPaintEngine, public QPrintEngine { - Q_DECLARE_SCOPED_PRIVATE(QtopiaPrintEngine) + Q_DECLARE_PRIVATE(QtopiaPrintEngine) public: QtopiaPrintEngine(QPrinter::PrinterMode mode); diff --git a/src/gui/painting/qprintengine_win_p.h b/src/gui/painting/qprintengine_win_p.h index 34fa538..36a32e8 100644 --- a/src/gui/painting/qprintengine_win_p.h +++ b/src/gui/painting/qprintengine_win_p.h @@ -69,7 +69,7 @@ class QPainterState; class QWin32PrintEngine : public QAlphaPaintEngine, public QPrintEngine { - Q_DECLARE_SCOPED_PRIVATE(QWin32PrintEngine) + Q_DECLARE_PRIVATE(QWin32PrintEngine) public: QWin32PrintEngine(QPrinter::PrinterMode mode); diff --git a/src/gui/painting/qprinter.h b/src/gui/painting/qprinter.h index 842845b..25c2f0c 100644 --- a/src/gui/painting/qprinter.h +++ b/src/gui/painting/qprinter.h @@ -65,7 +65,7 @@ class QPrinterInfo; class Q_GUI_EXPORT QPrinter : public QPaintDevice { - Q_DECLARE_SCOPED_PRIVATE(QPrinter) + Q_DECLARE_PRIVATE(QPrinter) public: enum PrinterMode { ScreenResolution, PrinterResolution, HighResolution }; diff --git a/src/gui/painting/qprinterinfo.h b/src/gui/painting/qprinterinfo.h index 5c0a25f..526b3b2 100644 --- a/src/gui/painting/qprinterinfo.h +++ b/src/gui/painting/qprinterinfo.h @@ -56,7 +56,7 @@ class QPrinterInfoPrivate; class QPrinterInfoPrivateDeleter; class Q_GUI_EXPORT QPrinterInfo { -Q_DECLARE_SCOPED_PRIVATE(QPrinterInfo) +Q_DECLARE_PRIVATE(QPrinterInfo) public: QPrinterInfo(); diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h index 4ee2047..b3256b3 100644 --- a/src/gui/painting/qwindowsurface_raster_p.h +++ b/src/gui/painting/qwindowsurface_raster_p.h @@ -108,7 +108,7 @@ public: private: void prepareBuffer(QImage::Format format, QWidget *widget); - Q_DECLARE_SCOPED_PRIVATE(QRasterWindowSurface) + Q_DECLARE_PRIVATE(QRasterWindowSurface) QScopedPointer<QRasterWindowSurfacePrivate> d_ptr; }; diff --git a/src/gui/statemachine/qbasickeyeventtransition_p.h b/src/gui/statemachine/qbasickeyeventtransition_p.h index 038c7d1..1d507b3 100644 --- a/src/gui/statemachine/qbasickeyeventtransition_p.h +++ b/src/gui/statemachine/qbasickeyeventtransition_p.h @@ -88,7 +88,7 @@ protected: private: Q_DISABLE_COPY(QBasicKeyEventTransition) - Q_DECLARE_SCOPED_PRIVATE(QBasicKeyEventTransition) + Q_DECLARE_PRIVATE(QBasicKeyEventTransition) }; QT_END_NAMESPACE diff --git a/src/gui/statemachine/qbasicmouseeventtransition_p.h b/src/gui/statemachine/qbasicmouseeventtransition_p.h index eb0dc0f..8ca6118 100644 --- a/src/gui/statemachine/qbasicmouseeventtransition_p.h +++ b/src/gui/statemachine/qbasicmouseeventtransition_p.h @@ -91,7 +91,7 @@ protected: private: Q_DISABLE_COPY(QBasicMouseEventTransition) - Q_DECLARE_SCOPED_PRIVATE(QBasicMouseEventTransition) + Q_DECLARE_PRIVATE(QBasicMouseEventTransition) }; QT_END_NAMESPACE diff --git a/src/gui/statemachine/qkeyeventtransition.h b/src/gui/statemachine/qkeyeventtransition.h index c3a440b..45ae684 100644 --- a/src/gui/statemachine/qkeyeventtransition.h +++ b/src/gui/statemachine/qkeyeventtransition.h @@ -76,7 +76,7 @@ protected: private: Q_DISABLE_COPY(QKeyEventTransition) - Q_DECLARE_SCOPED_PRIVATE(QKeyEventTransition) + Q_DECLARE_PRIVATE(QKeyEventTransition) }; #endif //QT_NO_STATEMACHINE diff --git a/src/gui/statemachine/qmouseeventtransition.h b/src/gui/statemachine/qmouseeventtransition.h index 35c7d1d..a56a554 100644 --- a/src/gui/statemachine/qmouseeventtransition.h +++ b/src/gui/statemachine/qmouseeventtransition.h @@ -80,7 +80,7 @@ protected: private: Q_DISABLE_COPY(QMouseEventTransition) - Q_DECLARE_SCOPED_PRIVATE(QMouseEventTransition) + Q_DECLARE_PRIVATE(QMouseEventTransition) }; #endif //QT_NO_STATEMACHINE diff --git a/src/gui/styles/qcleanlooksstyle.h b/src/gui/styles/qcleanlooksstyle.h index 834f238..ebfb707 100644 --- a/src/gui/styles/qcleanlooksstyle.h +++ b/src/gui/styles/qcleanlooksstyle.h @@ -56,7 +56,7 @@ class QCleanlooksStylePrivate; class Q_GUI_EXPORT QCleanlooksStyle : public QWindowsStyle { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QCleanlooksStyle) + Q_DECLARE_PRIVATE(QCleanlooksStyle) public: QCleanlooksStyle(); diff --git a/src/gui/styles/qcommonstyle.h b/src/gui/styles/qcommonstyle.h index 1f64fb3..ce54a96 100644 --- a/src/gui/styles/qcommonstyle.h +++ b/src/gui/styles/qcommonstyle.h @@ -98,7 +98,7 @@ protected: QCommonStyle(QCommonStylePrivate &dd); private: - Q_DECLARE_SCOPED_PRIVATE(QCommonStyle) + Q_DECLARE_PRIVATE(QCommonStyle) Q_DISABLE_COPY(QCommonStyle) }; diff --git a/src/gui/styles/qgtkstyle.h b/src/gui/styles/qgtkstyle.h index 3feeafa..e12f175 100644 --- a/src/gui/styles/qgtkstyle.h +++ b/src/gui/styles/qgtkstyle.h @@ -60,7 +60,7 @@ class QGtkStylePrivate; class Q_GUI_EXPORT QGtkStyle : public QCleanlooksStyle { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QGtkStyle) + Q_DECLARE_PRIVATE(QGtkStyle) public: QGtkStyle(); diff --git a/src/gui/styles/qmotifstyle.h b/src/gui/styles/qmotifstyle.h index 356f420..e848eb4 100644 --- a/src/gui/styles/qmotifstyle.h +++ b/src/gui/styles/qmotifstyle.h @@ -113,7 +113,7 @@ protected: bool eventFilter(QObject *o, QEvent *e); private: - Q_DECLARE_SCOPED_PRIVATE(QMotifStyle) + Q_DECLARE_PRIVATE(QMotifStyle) Q_DISABLE_COPY(QMotifStyle) bool highlightCols; diff --git a/src/gui/styles/qplastiquestyle.h b/src/gui/styles/qplastiquestyle.h index 74560fc..ac3da41 100644 --- a/src/gui/styles/qplastiquestyle.h +++ b/src/gui/styles/qplastiquestyle.h @@ -56,7 +56,7 @@ class QPlastiqueStylePrivate; class Q_GUI_EXPORT QPlastiqueStyle : public QWindowsStyle { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPlastiqueStyle) + Q_DECLARE_PRIVATE(QPlastiqueStyle) public: QPlastiqueStyle(); ~QPlastiqueStyle(); diff --git a/src/gui/styles/qproxystyle.h b/src/gui/styles/qproxystyle.h index 33f252a..c9edaff 100644 --- a/src/gui/styles/qproxystyle.h +++ b/src/gui/styles/qproxystyle.h @@ -102,7 +102,7 @@ protected Q_SLOTS: Qt::Orientation orientation, const QStyleOption *option = 0, const QWidget *widget = 0) const; private: Q_DISABLE_COPY(QProxyStyle) - Q_DECLARE_SCOPED_PRIVATE(QProxyStyle) + Q_DECLARE_PRIVATE(QProxyStyle) }; #endif // QT_NO_STYLE_PROXY diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h index 38d8e48..d8e9a40 100644 --- a/src/gui/styles/qs60style.h +++ b/src/gui/styles/qs60style.h @@ -57,7 +57,7 @@ class QS60StylePrivate; class Q_GUI_EXPORT QS60Style : public QCommonStyle { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QS60Style) + Q_DECLARE_PRIVATE(QS60Style) public: QS60Style(); diff --git a/src/gui/styles/qstyle.h b/src/gui/styles/qstyle.h index 68d4734..f22bf55 100644 --- a/src/gui/styles/qstyle.h +++ b/src/gui/styles/qstyle.h @@ -68,7 +68,7 @@ class QStylePrivate; class Q_GUI_EXPORT QStyle : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QStyle) + Q_DECLARE_PRIVATE(QStyle) protected: QStyle(QStylePrivate &dd); diff --git a/src/gui/styles/qstylesheetstyle_p.h b/src/gui/styles/qstylesheetstyle_p.h index 399e449..9b7b79d 100644 --- a/src/gui/styles/qstylesheetstyle_p.h +++ b/src/gui/styles/qstylesheetstyle_p.h @@ -182,7 +182,7 @@ public: private: Q_DISABLE_COPY(QStyleSheetStyle) - Q_DECLARE_SCOPED_PRIVATE(QStyleSheetStyle) + Q_DECLARE_PRIVATE(QStyleSheetStyle) }; diff --git a/src/gui/styles/qwindowsmobilestyle.h b/src/gui/styles/qwindowsmobilestyle.h index 9892dec..ab32e8e 100644 --- a/src/gui/styles/qwindowsmobilestyle.h +++ b/src/gui/styles/qwindowsmobilestyle.h @@ -104,7 +104,7 @@ protected: QWindowsMobileStyle(QWindowsMobileStylePrivate &dd); private: - Q_DECLARE_SCOPED_PRIVATE(QWindowsMobileStyle) + Q_DECLARE_PRIVATE(QWindowsMobileStyle) }; #endif // QT_NO_STYLE_WINDOWSMOBILE diff --git a/src/gui/styles/qwindowsstyle.h b/src/gui/styles/qwindowsstyle.h index 45260e8..c169a84 100644 --- a/src/gui/styles/qwindowsstyle.h +++ b/src/gui/styles/qwindowsstyle.h @@ -98,7 +98,7 @@ protected: private: Q_DISABLE_COPY(QWindowsStyle) - Q_DECLARE_SCOPED_PRIVATE(QWindowsStyle) + Q_DECLARE_PRIVATE(QWindowsStyle) void *reserved; }; diff --git a/src/gui/styles/qwindowsvistastyle.h b/src/gui/styles/qwindowsvistastyle.h index 60cd7a5..97b1e74 100644 --- a/src/gui/styles/qwindowsvistastyle.h +++ b/src/gui/styles/qwindowsvistastyle.h @@ -96,7 +96,7 @@ protected Q_SLOTS: private: Q_DISABLE_COPY(QWindowsVistaStyle) - Q_DECLARE_SCOPED_PRIVATE(QWindowsVistaStyle) + Q_DECLARE_PRIVATE(QWindowsVistaStyle) friend class QStyleFactory; }; #endif //QT_NO_STYLE_WINDOWSVISTA diff --git a/src/gui/styles/qwindowsxpstyle.h b/src/gui/styles/qwindowsxpstyle.h index 21e24ff..ab26f56 100644 --- a/src/gui/styles/qwindowsxpstyle.h +++ b/src/gui/styles/qwindowsxpstyle.h @@ -93,7 +93,7 @@ protected Q_SLOTS: private: Q_DISABLE_COPY(QWindowsXPStyle) - Q_DECLARE_SCOPED_PRIVATE(QWindowsXPStyle) + Q_DECLARE_PRIVATE(QWindowsXPStyle) friend class QStyleFactory; void *reserved; }; diff --git a/src/gui/text/qabstractfontengine_qws.h b/src/gui/text/qabstractfontengine_qws.h index 8403f87..e6be611 100644 --- a/src/gui/text/qabstractfontengine_qws.h +++ b/src/gui/text/qabstractfontengine_qws.h @@ -118,7 +118,7 @@ public: virtual QList<QFontEngineInfo> availableFontEngines() const = 0; private: - Q_DECLARE_SCOPED_PRIVATE(QFontEnginePlugin) + Q_DECLARE_PRIVATE(QFontEnginePlugin) Q_DISABLE_COPY(QFontEnginePlugin) }; @@ -207,7 +207,7 @@ public: */ private: - Q_DECLARE_SCOPED_PRIVATE(QAbstractFontEngine) + Q_DECLARE_PRIVATE(QAbstractFontEngine) Q_DISABLE_COPY(QAbstractFontEngine) }; diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h index 3681eec..070c301 100644 --- a/src/gui/text/qabstracttextdocumentlayout.h +++ b/src/gui/text/qabstracttextdocumentlayout.h @@ -62,7 +62,7 @@ class QTextFrame; class Q_GUI_EXPORT QAbstractTextDocumentLayout : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QAbstractTextDocumentLayout) + Q_DECLARE_PRIVATE(QAbstractTextDocumentLayout) public: explicit QAbstractTextDocumentLayout(QTextDocument *doc); diff --git a/src/gui/text/qsyntaxhighlighter.h b/src/gui/text/qsyntaxhighlighter.h index bfbb533..ee249b8 100644 --- a/src/gui/text/qsyntaxhighlighter.h +++ b/src/gui/text/qsyntaxhighlighter.h @@ -66,7 +66,7 @@ class QTextEdit; class Q_GUI_EXPORT QSyntaxHighlighter : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QSyntaxHighlighter) + Q_DECLARE_PRIVATE(QSyntaxHighlighter) public: QSyntaxHighlighter(QObject *parent); QSyntaxHighlighter(QTextDocument *parent); diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/text/qtextcontrol_p.h index 59693ac..eb0d749 100644 --- a/src/gui/text/qtextcontrol_p.h +++ b/src/gui/text/qtextcontrol_p.h @@ -86,7 +86,7 @@ class QTimerEvent; class Q_GUI_EXPORT QTextControl : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QTextControl) + Q_DECLARE_PRIVATE(QTextControl) #ifndef QT_NO_TEXTHTMLPARSER Q_PROPERTY(QString html READ toHtml WRITE setHtml NOTIFY textChanged USER true) #endif diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h index cfbb558..40b6621 100644 --- a/src/gui/text/qtextdocument.h +++ b/src/gui/text/qtextdocument.h @@ -286,7 +286,7 @@ public: QTextDocumentPrivate *docHandle() const; private: Q_DISABLE_COPY(QTextDocument) - Q_DECLARE_SCOPED_PRIVATE(QTextDocument) + Q_DECLARE_PRIVATE(QTextDocument) friend class QTextObjectPrivate; }; diff --git a/src/gui/text/qtextdocumentlayout_p.h b/src/gui/text/qtextdocumentlayout_p.h index 4dc18d0..41507b0 100644 --- a/src/gui/text/qtextdocumentlayout_p.h +++ b/src/gui/text/qtextdocumentlayout_p.h @@ -65,7 +65,7 @@ class QTextDocumentLayoutPrivate; class Q_AUTOTEST_EXPORT QTextDocumentLayout : public QAbstractTextDocumentLayout { - Q_DECLARE_SCOPED_PRIVATE(QTextDocumentLayout) + Q_DECLARE_PRIVATE(QTextDocumentLayout) Q_OBJECT Q_PROPERTY(int cursorWidth READ cursorWidth WRITE setCursorWidth) Q_PROPERTY(qreal idealWidth READ idealWidth) diff --git a/src/gui/text/qtextlist.h b/src/gui/text/qtextlist.h index 3d07be8..04f1838 100644 --- a/src/gui/text/qtextlist.h +++ b/src/gui/text/qtextlist.h @@ -81,7 +81,7 @@ public: private: Q_DISABLE_COPY(QTextList) - Q_DECLARE_SCOPED_PRIVATE(QTextList) + Q_DECLARE_PRIVATE(QTextList) }; inline void QTextList::setFormat(const QTextListFormat &aformat) diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h index f22f77c..4f239b2 100644 --- a/src/gui/text/qtextobject.h +++ b/src/gui/text/qtextobject.h @@ -84,7 +84,7 @@ protected: QTextObject(QTextObjectPrivate &p, QTextDocument *doc); private: - Q_DECLARE_SCOPED_PRIVATE(QTextObject) + Q_DECLARE_PRIVATE(QTextObject) Q_DISABLE_COPY(QTextObject) friend class QTextDocumentPrivate; }; @@ -107,7 +107,7 @@ protected: protected: QTextBlockGroup(QTextBlockGroupPrivate &p, QTextDocument *doc); private: - Q_DECLARE_SCOPED_PRIVATE(QTextBlockGroup) + Q_DECLARE_PRIVATE(QTextBlockGroup) Q_DISABLE_COPY(QTextBlockGroup) friend class QTextDocumentPrivate; }; @@ -182,7 +182,7 @@ protected: QTextFrame(QTextFramePrivate &p, QTextDocument *doc); private: friend class QTextDocumentPrivate; - Q_DECLARE_SCOPED_PRIVATE(QTextFrame) + Q_DECLARE_PRIVATE(QTextFrame) Q_DISABLE_COPY(QTextFrame) }; Q_DECLARE_TYPEINFO(QTextFrame::iterator, Q_MOVABLE_TYPE); diff --git a/src/gui/text/qtexttable.h b/src/gui/text/qtexttable.h index 2deb3fa..612c71c 100644 --- a/src/gui/text/qtexttable.h +++ b/src/gui/text/qtexttable.h @@ -134,7 +134,7 @@ public: private: Q_DISABLE_COPY(QTextTable) - Q_DECLARE_SCOPED_PRIVATE(QTextTable) + Q_DECLARE_PRIVATE(QTextTable) friend class QTextTableCell; }; diff --git a/src/gui/util/qcompleter.h b/src/gui/util/qcompleter.h index ac8c0c6..a419154 100644 --- a/src/gui/util/qcompleter.h +++ b/src/gui/util/qcompleter.h @@ -154,7 +154,7 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QCompleter) - Q_DECLARE_SCOPED_PRIVATE(QCompleter) + Q_DECLARE_PRIVATE(QCompleter) Q_PRIVATE_SLOT(d_func(), void _q_complete(QModelIndex)) Q_PRIVATE_SLOT(d_func(), void _q_completionSelected(const QItemSelection&)) diff --git a/src/gui/util/qcompleter_p.h b/src/gui/util/qcompleter_p.h index 745afff..3911b0d 100644 --- a/src/gui/util/qcompleter_p.h +++ b/src/gui/util/qcompleter_p.h @@ -239,7 +239,7 @@ public: QScopedPointer<QCompletionEngine> engine; bool showAll; - Q_DECLARE_SCOPED_PRIVATE(QCompletionModel) + Q_DECLARE_PRIVATE(QCompletionModel) signals: void rowsAdded(); diff --git a/src/gui/util/qsystemtrayicon.h b/src/gui/util/qsystemtrayicon.h index ac90487..0f1e2d2 100644 --- a/src/gui/util/qsystemtrayicon.h +++ b/src/gui/util/qsystemtrayicon.h @@ -117,7 +117,7 @@ protected: private: Q_DISABLE_COPY(QSystemTrayIcon) - Q_DECLARE_SCOPED_PRIVATE(QSystemTrayIcon) + Q_DECLARE_PRIVATE(QSystemTrayIcon) friend class QSystemTrayIconSys; friend class QBalloonTip; diff --git a/src/gui/util/qundogroup.h b/src/gui/util/qundogroup.h index 24d4e12..ddab6e0 100644 --- a/src/gui/util/qundogroup.h +++ b/src/gui/util/qundogroup.h @@ -60,7 +60,7 @@ QT_MODULE(Gui) class Q_GUI_EXPORT QUndoGroup : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QUndoGroup) + Q_DECLARE_PRIVATE(QUndoGroup) public: explicit QUndoGroup(QObject *parent = 0); diff --git a/src/gui/util/qundostack.h b/src/gui/util/qundostack.h index 8ad4b198..8efad0e 100644 --- a/src/gui/util/qundostack.h +++ b/src/gui/util/qundostack.h @@ -90,7 +90,7 @@ private: class Q_GUI_EXPORT QUndoStack : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QUndoStack) + Q_DECLARE_PRIVATE(QUndoStack) Q_PROPERTY(bool active READ isActive WRITE setActive) Q_PROPERTY(int undoLimit READ undoLimit WRITE setUndoLimit) diff --git a/src/gui/util/qundoview.h b/src/gui/util/qundoview.h index 293c0c2..fa0c163 100644 --- a/src/gui/util/qundoview.h +++ b/src/gui/util/qundoview.h @@ -61,7 +61,7 @@ QT_MODULE(Gui) class Q_GUI_EXPORT QUndoView : public QListView { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QUndoView) + Q_DECLARE_PRIVATE(QUndoView) Q_PROPERTY(QString emptyLabel READ emptyLabel WRITE setEmptyLabel) Q_PROPERTY(QIcon cleanIcon READ cleanIcon WRITE setCleanIcon) diff --git a/src/gui/widgets/qabstractbutton.h b/src/gui/widgets/qabstractbutton.h index 9e33479..29e9bf9 100644 --- a/src/gui/widgets/qabstractbutton.h +++ b/src/gui/widgets/qabstractbutton.h @@ -168,7 +168,7 @@ protected: QAbstractButton(QAbstractButtonPrivate &dd, QWidget* parent = 0); private: - Q_DECLARE_SCOPED_PRIVATE(QAbstractButton) + Q_DECLARE_PRIVATE(QAbstractButton) Q_DISABLE_COPY(QAbstractButton) friend class QButtonGroup; }; diff --git a/src/gui/widgets/qabstractscrollarea.h b/src/gui/widgets/qabstractscrollarea.h index 9a7e844..3ec41d1 100644 --- a/src/gui/widgets/qabstractscrollarea.h +++ b/src/gui/widgets/qabstractscrollarea.h @@ -123,7 +123,7 @@ protected: virtual void scrollContentsBy(int dx, int dy); private: - Q_DECLARE_SCOPED_PRIVATE(QAbstractScrollArea) + Q_DECLARE_PRIVATE(QAbstractScrollArea) Q_DISABLE_COPY(QAbstractScrollArea) Q_PRIVATE_SLOT(d_func(), void _q_hslide(int)) Q_PRIVATE_SLOT(d_func(), void _q_vslide(int)) diff --git a/src/gui/widgets/qabstractslider.h b/src/gui/widgets/qabstractslider.h index 6517944..7e03b6e 100644 --- a/src/gui/widgets/qabstractslider.h +++ b/src/gui/widgets/qabstractslider.h @@ -174,7 +174,7 @@ protected: private: Q_DISABLE_COPY(QAbstractSlider) - Q_DECLARE_SCOPED_PRIVATE(QAbstractSlider) + Q_DECLARE_PRIVATE(QAbstractSlider) }; QT_END_NAMESPACE diff --git a/src/gui/widgets/qabstractspinbox.h b/src/gui/widgets/qabstractspinbox.h index 2e8f7f9..e65f27b 100644 --- a/src/gui/widgets/qabstractspinbox.h +++ b/src/gui/widgets/qabstractspinbox.h @@ -165,7 +165,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_editorTextChanged(const QString &)) Q_PRIVATE_SLOT(d_func(), void _q_editorCursorPositionChanged(int, int)) - Q_DECLARE_SCOPED_PRIVATE(QAbstractSpinBox) + Q_DECLARE_PRIVATE(QAbstractSpinBox) Q_DISABLE_COPY(QAbstractSpinBox) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractSpinBox::StepEnabled) diff --git a/src/gui/widgets/qbuttongroup.h b/src/gui/widgets/qbuttongroup.h index fca1524..708c91c 100644 --- a/src/gui/widgets/qbuttongroup.h +++ b/src/gui/widgets/qbuttongroup.h @@ -98,7 +98,7 @@ public: private: Q_DISABLE_COPY(QButtonGroup) - Q_DECLARE_SCOPED_PRIVATE(QButtonGroup) + Q_DECLARE_PRIVATE(QButtonGroup) friend class QAbstractButton; friend class QAbstractButtonPrivate; }; diff --git a/src/gui/widgets/qcalendarwidget.h b/src/gui/widgets/qcalendarwidget.h index edd1511..f567180 100644 --- a/src/gui/widgets/qcalendarwidget.h +++ b/src/gui/widgets/qcalendarwidget.h @@ -179,7 +179,7 @@ Q_SIGNALS: void currentPageChanged(int year, int month); private: - Q_DECLARE_SCOPED_PRIVATE(QCalendarWidget) + Q_DECLARE_PRIVATE(QCalendarWidget) Q_DISABLE_COPY(QCalendarWidget) Q_PRIVATE_SLOT(d_func(), void _q_slotShowDate(const QDate &date)) diff --git a/src/gui/widgets/qcheckbox.h b/src/gui/widgets/qcheckbox.h index cd41626..1d61783 100644 --- a/src/gui/widgets/qcheckbox.h +++ b/src/gui/widgets/qcheckbox.h @@ -102,7 +102,7 @@ public: #endif private: - Q_DECLARE_SCOPED_PRIVATE(QCheckBox) + Q_DECLARE_PRIVATE(QCheckBox) Q_DISABLE_COPY(QCheckBox) }; diff --git a/src/gui/widgets/qcombobox.h b/src/gui/widgets/qcombobox.h index 2807a4f..22f6928 100644 --- a/src/gui/widgets/qcombobox.h +++ b/src/gui/widgets/qcombobox.h @@ -300,7 +300,7 @@ protected: QComboBox(QComboBoxPrivate &, QWidget *); private: - Q_DECLARE_SCOPED_PRIVATE(QComboBox) + Q_DECLARE_PRIVATE(QComboBox) Q_DISABLE_COPY(QComboBox) Q_PRIVATE_SLOT(d_func(), void _q_itemSelected(const QModelIndex &item)) Q_PRIVATE_SLOT(d_func(), void _q_emitHighlighted(const QModelIndex &)) diff --git a/src/gui/widgets/qcommandlinkbutton.h b/src/gui/widgets/qcommandlinkbutton.h index 5191252..bf30242 100644 --- a/src/gui/widgets/qcommandlinkbutton.h +++ b/src/gui/widgets/qcommandlinkbutton.h @@ -75,7 +75,7 @@ protected: private: Q_DISABLE_COPY(QCommandLinkButton) - Q_DECLARE_SCOPED_PRIVATE(QCommandLinkButton) + Q_DECLARE_PRIVATE(QCommandLinkButton) }; QT_END_NAMESPACE diff --git a/src/gui/widgets/qdatetimeedit.h b/src/gui/widgets/qdatetimeedit.h index 1e4c621..e43a3fa 100644 --- a/src/gui/widgets/qdatetimeedit.h +++ b/src/gui/widgets/qdatetimeedit.h @@ -197,7 +197,7 @@ protected: QDateTimeEdit(const QVariant &val, QVariant::Type parserType, QWidget *parent = 0); private: - Q_DECLARE_SCOPED_PRIVATE(QDateTimeEdit) + Q_DECLARE_PRIVATE(QDateTimeEdit) Q_DISABLE_COPY(QDateTimeEdit) Q_PRIVATE_SLOT(d_func(), void _q_resetButton()) diff --git a/src/gui/widgets/qdial.h b/src/gui/widgets/qdial.h index f07999b..91b8c5e 100644 --- a/src/gui/widgets/qdial.h +++ b/src/gui/widgets/qdial.h @@ -109,7 +109,7 @@ Q_SIGNALS: #endif private: - Q_DECLARE_SCOPED_PRIVATE(QDial) + Q_DECLARE_PRIVATE(QDial) Q_DISABLE_COPY(QDial) }; diff --git a/src/gui/widgets/qdialogbuttonbox.h b/src/gui/widgets/qdialogbuttonbox.h index 97a6a59..df40a66 100644 --- a/src/gui/widgets/qdialogbuttonbox.h +++ b/src/gui/widgets/qdialogbuttonbox.h @@ -154,7 +154,7 @@ protected: private: Q_DISABLE_COPY(QDialogButtonBox) - Q_DECLARE_SCOPED_PRIVATE(QDialogButtonBox) + Q_DECLARE_PRIVATE(QDialogButtonBox) Q_PRIVATE_SLOT(d_func(), void _q_handleButtonClicked()) Q_PRIVATE_SLOT(d_func(), void _q_handleButtonDestroyed()) }; diff --git a/src/gui/widgets/qdockwidget.h b/src/gui/widgets/qdockwidget.h index b1abbdd..f0c0b46 100644 --- a/src/gui/widgets/qdockwidget.h +++ b/src/gui/widgets/qdockwidget.h @@ -124,7 +124,7 @@ protected: void initStyleOption(QStyleOptionDockWidget *option) const; private: - Q_DECLARE_SCOPED_PRIVATE(QDockWidget) + Q_DECLARE_PRIVATE(QDockWidget) Q_DISABLE_COPY(QDockWidget) Q_PRIVATE_SLOT(d_func(), void _q_toggleView(bool)) Q_PRIVATE_SLOT(d_func(), void _q_toggleTopLevel()) diff --git a/src/gui/widgets/qfocusframe.h b/src/gui/widgets/qfocusframe.h index e496343..139374c 100644 --- a/src/gui/widgets/qfocusframe.h +++ b/src/gui/widgets/qfocusframe.h @@ -71,7 +71,7 @@ protected: void initStyleOption(QStyleOption *option) const; private: - Q_DECLARE_SCOPED_PRIVATE(QFocusFrame) + Q_DECLARE_PRIVATE(QFocusFrame) Q_DISABLE_COPY(QFocusFrame) }; diff --git a/src/gui/widgets/qfontcombobox.h b/src/gui/widgets/qfontcombobox.h index 41f9d72..6034881 100644 --- a/src/gui/widgets/qfontcombobox.h +++ b/src/gui/widgets/qfontcombobox.h @@ -97,7 +97,7 @@ protected: private: Q_DISABLE_COPY(QFontComboBox) - Q_DECLARE_SCOPED_PRIVATE(QFontComboBox) + Q_DECLARE_PRIVATE(QFontComboBox) Q_PRIVATE_SLOT(d_func(), void _q_currentChanged(const QString &)) Q_PRIVATE_SLOT(d_func(), void _q_updateModel()) }; diff --git a/src/gui/widgets/qframe.h b/src/gui/widgets/qframe.h index f8776c6..7b6073b 100644 --- a/src/gui/widgets/qframe.h +++ b/src/gui/widgets/qframe.h @@ -138,7 +138,7 @@ protected: private: Q_DISABLE_COPY(QFrame) - Q_DECLARE_SCOPED_PRIVATE(QFrame) + Q_DECLARE_PRIVATE(QFrame) }; QT_END_NAMESPACE diff --git a/src/gui/widgets/qgroupbox.h b/src/gui/widgets/qgroupbox.h index c4bef6e..d3f76e1 100644 --- a/src/gui/widgets/qgroupbox.h +++ b/src/gui/widgets/qgroupbox.h @@ -109,7 +109,7 @@ public: private: Q_DISABLE_COPY(QGroupBox) - Q_DECLARE_SCOPED_PRIVATE(QGroupBox) + Q_DECLARE_PRIVATE(QGroupBox) Q_PRIVATE_SLOT(d_func(), void _q_setChildrenEnabled(bool b)) }; diff --git a/src/gui/widgets/qlabel.h b/src/gui/widgets/qlabel.h index 520d661..b7a7c11 100644 --- a/src/gui/widgets/qlabel.h +++ b/src/gui/widgets/qlabel.h @@ -156,7 +156,7 @@ public: private: Q_DISABLE_COPY(QLabel) - Q_DECLARE_SCOPED_PRIVATE(QLabel) + Q_DECLARE_PRIVATE(QLabel) #ifndef QT_NO_MOVIE Q_PRIVATE_SLOT(d_func(), void _q_movieUpdated(const QRect&)) Q_PRIVATE_SLOT(d_func(), void _q_movieResized(const QSize&)) diff --git a/src/gui/widgets/qlcdnumber.h b/src/gui/widgets/qlcdnumber.h index 3d7cf43..1437427 100644 --- a/src/gui/widgets/qlcdnumber.h +++ b/src/gui/widgets/qlcdnumber.h @@ -128,7 +128,7 @@ public: private: Q_DISABLE_COPY(QLCDNumber) - Q_DECLARE_SCOPED_PRIVATE(QLCDNumber) + Q_DECLARE_PRIVATE(QLCDNumber) }; #endif // QT_NO_LCDNUMBER diff --git a/src/gui/widgets/qlineedit.h b/src/gui/widgets/qlineedit.h index 9eed110..daac6a7 100644 --- a/src/gui/widgets/qlineedit.h +++ b/src/gui/widgets/qlineedit.h @@ -265,7 +265,7 @@ private: friend class QDateTimeEdit; #endif Q_DISABLE_COPY(QLineEdit) - Q_DECLARE_SCOPED_PRIVATE(QLineEdit) + Q_DECLARE_PRIVATE(QLineEdit) Q_PRIVATE_SLOT(d_func(), void _q_handleWindowActivate()) Q_PRIVATE_SLOT(d_func(), void _q_deleteSelected()) Q_PRIVATE_SLOT(d_func(), void _q_textEdited(const QString &)) diff --git a/src/gui/widgets/qmaccocoaviewcontainer_mac.h b/src/gui/widgets/qmaccocoaviewcontainer_mac.h index 0fdaac5..8ca1073 100644 --- a/src/gui/widgets/qmaccocoaviewcontainer_mac.h +++ b/src/gui/widgets/qmaccocoaviewcontainer_mac.h @@ -63,7 +63,7 @@ public: void *cocoaView() const; private: - Q_DECLARE_SCOPED_PRIVATE(QMacCocoaViewContainer) + Q_DECLARE_PRIVATE(QMacCocoaViewContainer) }; QT_END_NAMESPACE diff --git a/src/gui/widgets/qmacnativewidget_mac.h b/src/gui/widgets/qmacnativewidget_mac.h index 904108e..5c654b5 100644 --- a/src/gui/widgets/qmacnativewidget_mac.h +++ b/src/gui/widgets/qmacnativewidget_mac.h @@ -64,7 +64,7 @@ protected: bool event(QEvent *ev); private: - Q_DECLARE_SCOPED_PRIVATE(QMacNativeWidget) + Q_DECLARE_PRIVATE(QMacNativeWidget) }; QT_END_NAMESPACE diff --git a/src/gui/widgets/qmainwindow.h b/src/gui/widgets/qmainwindow.h index a221131..9c2fb88 100644 --- a/src/gui/widgets/qmainwindow.h +++ b/src/gui/widgets/qmainwindow.h @@ -202,7 +202,7 @@ protected: bool event(QEvent *event); private: - Q_DECLARE_SCOPED_PRIVATE(QMainWindow) + Q_DECLARE_PRIVATE(QMainWindow) Q_DISABLE_COPY(QMainWindow) }; diff --git a/src/gui/widgets/qmdiarea.h b/src/gui/widgets/qmdiarea.h index f64397b..9f1014e 100644 --- a/src/gui/widgets/qmdiarea.h +++ b/src/gui/widgets/qmdiarea.h @@ -153,7 +153,7 @@ protected: private: Q_DISABLE_COPY(QMdiArea) - Q_DECLARE_SCOPED_PRIVATE(QMdiArea) + Q_DECLARE_PRIVATE(QMdiArea) Q_PRIVATE_SLOT(d_func(), void _q_deactivateAllWindows()) Q_PRIVATE_SLOT(d_func(), void _q_processWindowStateChanged(Qt::WindowStates, Qt::WindowStates)) Q_PRIVATE_SLOT(d_func(), void _q_currentTabChanged(int index)) diff --git a/src/gui/widgets/qmdisubwindow.h b/src/gui/widgets/qmdisubwindow.h index bfb523d..924cc9a 100644 --- a/src/gui/widgets/qmdisubwindow.h +++ b/src/gui/widgets/qmdisubwindow.h @@ -137,7 +137,7 @@ protected: private: Q_DISABLE_COPY(QMdiSubWindow) - Q_DECLARE_SCOPED_PRIVATE(QMdiSubWindow) + Q_DECLARE_PRIVATE(QMdiSubWindow) Q_PRIVATE_SLOT(d_func(), void _q_updateStaysOnTopHint()) Q_PRIVATE_SLOT(d_func(), void _q_enterInteractiveMode()) Q_PRIVATE_SLOT(d_func(), void _q_processFocusChanged(QWidget *, QWidget *)) diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 4b48fce..6465975 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -144,7 +144,7 @@ public slots: void onTrigger(QAction *action) { d_func()->activateAction(action, QAction::Trigger, false); } void onHovered(QAction *action) { d_func()->activateAction(action, QAction::Hover, false); } private: - Q_DECLARE_SCOPED_PRIVATE(QTornOffMenu) + Q_DECLARE_PRIVATE(QTornOffMenu) friend class QMenuPrivate; }; diff --git a/src/gui/widgets/qmenu.h b/src/gui/widgets/qmenu.h index 9f9cdf5..41890c4 100644 --- a/src/gui/widgets/qmenu.h +++ b/src/gui/widgets/qmenu.h @@ -77,7 +77,7 @@ class Q_GUI_EXPORT QMenu : public QWidget { private: Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QMenu) + Q_DECLARE_PRIVATE(QMenu) Q_PROPERTY(bool tearOffEnabled READ isTearOffEnabled WRITE setTearOffEnabled) Q_PROPERTY(QString title READ title WRITE setTitle) diff --git a/src/gui/widgets/qmenubar.h b/src/gui/widgets/qmenubar.h index ddd2d67..1fda1c1 100644 --- a/src/gui/widgets/qmenubar.h +++ b/src/gui/widgets/qmenubar.h @@ -336,7 +336,7 @@ private: #endif private: - Q_DECLARE_SCOPED_PRIVATE(QMenuBar) + Q_DECLARE_PRIVATE(QMenuBar) Q_DISABLE_COPY(QMenuBar) Q_PRIVATE_SLOT(d_func(), void _q_actionTriggered()) Q_PRIVATE_SLOT(d_func(), void _q_actionHovered()) diff --git a/src/gui/widgets/qplaintextedit.h b/src/gui/widgets/qplaintextedit.h index 767bb69..35bbc37 100644 --- a/src/gui/widgets/qplaintextedit.h +++ b/src/gui/widgets/qplaintextedit.h @@ -69,7 +69,7 @@ class QMimeData; class Q_GUI_EXPORT QPlainTextEdit : public QAbstractScrollArea { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPlainTextEdit) + Q_DECLARE_PRIVATE(QPlainTextEdit) Q_ENUMS(LineWrapMode) Q_PROPERTY(bool tabChangesFocus READ tabChangesFocus WRITE setTabChangesFocus) Q_PROPERTY(QString documentTitle READ documentTitle WRITE setDocumentTitle) @@ -278,7 +278,7 @@ class QPlainTextDocumentLayoutPrivate; class Q_GUI_EXPORT QPlainTextDocumentLayout : public QAbstractTextDocumentLayout { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPlainTextDocumentLayout) + Q_DECLARE_PRIVATE(QPlainTextDocumentLayout) Q_PROPERTY(int cursorWidth READ cursorWidth WRITE setCursorWidth) public: diff --git a/src/gui/widgets/qprintpreviewwidget.h b/src/gui/widgets/qprintpreviewwidget.h index 240306f..d74bf93 100644 --- a/src/gui/widgets/qprintpreviewwidget.h +++ b/src/gui/widgets/qprintpreviewwidget.h @@ -58,7 +58,7 @@ class QPrintPreviewWidgetPrivate; class Q_GUI_EXPORT QPrintPreviewWidget : public QWidget { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QPrintPreviewWidget) + Q_DECLARE_PRIVATE(QPrintPreviewWidget) public: enum ViewMode { diff --git a/src/gui/widgets/qprogressbar.h b/src/gui/widgets/qprogressbar.h index de995b6..5ac6b85 100644 --- a/src/gui/widgets/qprogressbar.h +++ b/src/gui/widgets/qprogressbar.h @@ -117,7 +117,7 @@ protected: void initStyleOption(QStyleOptionProgressBar *option) const; private: - Q_DECLARE_SCOPED_PRIVATE(QProgressBar) + Q_DECLARE_PRIVATE(QProgressBar) Q_DISABLE_COPY(QProgressBar) }; diff --git a/src/gui/widgets/qpushbutton.h b/src/gui/widgets/qpushbutton.h index 1b4cb95..2264cc3 100644 --- a/src/gui/widgets/qpushbutton.h +++ b/src/gui/widgets/qpushbutton.h @@ -111,7 +111,7 @@ public: private: Q_DISABLE_COPY(QPushButton) - Q_DECLARE_SCOPED_PRIVATE(QPushButton) + Q_DECLARE_PRIVATE(QPushButton) #ifndef QT_NO_MENU Q_PRIVATE_SLOT(d_func(), void _q_popupPressed()) #endif diff --git a/src/gui/widgets/qradiobutton.h b/src/gui/widgets/qradiobutton.h index d2eaa4d..e631bab 100644 --- a/src/gui/widgets/qradiobutton.h +++ b/src/gui/widgets/qradiobutton.h @@ -77,7 +77,7 @@ public: #endif private: - Q_DECLARE_SCOPED_PRIVATE(QRadioButton) + Q_DECLARE_PRIVATE(QRadioButton) Q_DISABLE_COPY(QRadioButton) }; diff --git a/src/gui/widgets/qrubberband.h b/src/gui/widgets/qrubberband.h index 629bc29..1e638fd 100644 --- a/src/gui/widgets/qrubberband.h +++ b/src/gui/widgets/qrubberband.h @@ -87,7 +87,7 @@ protected: void initStyleOption(QStyleOptionRubberBand *option) const; private: - Q_DECLARE_SCOPED_PRIVATE(QRubberBand) + Q_DECLARE_PRIVATE(QRubberBand) }; inline void QRubberBand::setGeometry(int ax, int ay, int aw, int ah) diff --git a/src/gui/widgets/qscrollarea.h b/src/gui/widgets/qscrollarea.h index d2179b8..d713e15 100644 --- a/src/gui/widgets/qscrollarea.h +++ b/src/gui/widgets/qscrollarea.h @@ -88,7 +88,7 @@ protected: void scrollContentsBy(int dx, int dy); private: - Q_DECLARE_SCOPED_PRIVATE(QScrollArea) + Q_DECLARE_PRIVATE(QScrollArea) Q_DISABLE_COPY(QScrollArea) }; diff --git a/src/gui/widgets/qscrollbar.h b/src/gui/widgets/qscrollbar.h index b9302b3..9d25359 100644 --- a/src/gui/widgets/qscrollbar.h +++ b/src/gui/widgets/qscrollbar.h @@ -92,7 +92,7 @@ private: friend Q_GUI_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollBar); Q_DISABLE_COPY(QScrollBar) - Q_DECLARE_SCOPED_PRIVATE(QScrollBar) + Q_DECLARE_PRIVATE(QScrollBar) }; #endif // QT_NO_SCROLLBAR diff --git a/src/gui/widgets/qsizegrip.h b/src/gui/widgets/qsizegrip.h index 7e9e6ac..5a0fb3b 100644 --- a/src/gui/widgets/qsizegrip.h +++ b/src/gui/widgets/qsizegrip.h @@ -82,7 +82,7 @@ public: #endif private: - Q_DECLARE_SCOPED_PRIVATE(QSizeGrip) + Q_DECLARE_PRIVATE(QSizeGrip) Q_DISABLE_COPY(QSizeGrip) Q_PRIVATE_SLOT(d_func(), void _q_showIfNotHidden()) }; diff --git a/src/gui/widgets/qslider.h b/src/gui/widgets/qslider.h index 3ff3889..18c2603 100644 --- a/src/gui/widgets/qslider.h +++ b/src/gui/widgets/qslider.h @@ -122,7 +122,7 @@ private: friend Q_GUI_EXPORT QStyleOptionSlider qt_qsliderStyleOption(QSlider *slider); Q_DISABLE_COPY(QSlider) - Q_DECLARE_SCOPED_PRIVATE(QSlider) + Q_DECLARE_PRIVATE(QSlider) }; #endif // QT_NO_SLIDER diff --git a/src/gui/widgets/qspinbox.h b/src/gui/widgets/qspinbox.h index 96d7b96..a168528 100644 --- a/src/gui/widgets/qspinbox.h +++ b/src/gui/widgets/qspinbox.h @@ -119,7 +119,7 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QSpinBox) - Q_DECLARE_SCOPED_PRIVATE(QSpinBox) + Q_DECLARE_PRIVATE(QSpinBox) }; class QDoubleSpinBoxPrivate; @@ -176,7 +176,7 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QDoubleSpinBox) - Q_DECLARE_SCOPED_PRIVATE(QDoubleSpinBox) + Q_DECLARE_PRIVATE(QDoubleSpinBox) }; #endif // QT_NO_SPINBOX diff --git a/src/gui/widgets/qsplashscreen.h b/src/gui/widgets/qsplashscreen.h index 23d4d34..d7c521c 100644 --- a/src/gui/widgets/qsplashscreen.h +++ b/src/gui/widgets/qsplashscreen.h @@ -87,7 +87,7 @@ protected: private: Q_DISABLE_COPY(QSplashScreen) - Q_DECLARE_SCOPED_PRIVATE(QSplashScreen) + Q_DECLARE_PRIVATE(QSplashScreen) }; #endif // QT_NO_SPLASHSCREEN diff --git a/src/gui/widgets/qsplitter.h b/src/gui/widgets/qsplitter.h index 5f16db2..ad5620e 100644 --- a/src/gui/widgets/qsplitter.h +++ b/src/gui/widgets/qsplitter.h @@ -142,7 +142,7 @@ public: private: Q_DISABLE_COPY(QSplitter) - Q_DECLARE_SCOPED_PRIVATE(QSplitter) + Q_DECLARE_PRIVATE(QSplitter) private: friend class QSplitterHandle; }; @@ -179,7 +179,7 @@ protected: private: Q_DISABLE_COPY(QSplitterHandle) - Q_DECLARE_SCOPED_PRIVATE(QSplitterHandle) + Q_DECLARE_PRIVATE(QSplitterHandle) }; #endif // QT_NO_SPLITTER diff --git a/src/gui/widgets/qstackedwidget.h b/src/gui/widgets/qstackedwidget.h index 6dd21bb..95d6d9f 100644 --- a/src/gui/widgets/qstackedwidget.h +++ b/src/gui/widgets/qstackedwidget.h @@ -88,7 +88,7 @@ protected: private: Q_DISABLE_COPY(QStackedWidget) - Q_DECLARE_SCOPED_PRIVATE(QStackedWidget) + Q_DECLARE_PRIVATE(QStackedWidget) }; #endif // QT_NO_STACKEDWIDGET diff --git a/src/gui/widgets/qstatusbar.h b/src/gui/widgets/qstatusbar.h index 28cb2a9..86d1cda 100644 --- a/src/gui/widgets/qstatusbar.h +++ b/src/gui/widgets/qstatusbar.h @@ -104,7 +104,7 @@ protected: private: Q_DISABLE_COPY(QStatusBar) - Q_DECLARE_SCOPED_PRIVATE(QStatusBar) + Q_DECLARE_PRIVATE(QStatusBar) }; #endif // QT_NO_STATUSBAR diff --git a/src/gui/widgets/qtabbar.h b/src/gui/widgets/qtabbar.h index 2e6eaac..402f54b 100644 --- a/src/gui/widgets/qtabbar.h +++ b/src/gui/widgets/qtabbar.h @@ -212,7 +212,7 @@ Q_SIGNALS: friend class QAccessibleTabBar; private: Q_DISABLE_COPY(QTabBar) - Q_DECLARE_SCOPED_PRIVATE(QTabBar) + Q_DECLARE_PRIVATE(QTabBar) Q_PRIVATE_SLOT(d_func(), void _q_scrollTabs()) Q_PRIVATE_SLOT(d_func(), void _q_closeTab()) }; diff --git a/src/gui/widgets/qtabwidget.h b/src/gui/widgets/qtabwidget.h index 138a612..10150af 100644 --- a/src/gui/widgets/qtabwidget.h +++ b/src/gui/widgets/qtabwidget.h @@ -234,7 +234,7 @@ Q_SIGNALS: #endif // QT3_SUPPORT private: - Q_DECLARE_SCOPED_PRIVATE(QTabWidget) + Q_DECLARE_PRIVATE(QTabWidget) Q_DISABLE_COPY(QTabWidget) Q_PRIVATE_SLOT(d_func(), void _q_showTab(int)) Q_PRIVATE_SLOT(d_func(), void _q_removeTab(int)) diff --git a/src/gui/widgets/qtextbrowser.h b/src/gui/widgets/qtextbrowser.h index b9a501f..d5bd956 100644 --- a/src/gui/widgets/qtextbrowser.h +++ b/src/gui/widgets/qtextbrowser.h @@ -125,7 +125,7 @@ public: private: Q_DISABLE_COPY(QTextBrowser) - Q_DECLARE_SCOPED_PRIVATE(QTextBrowser) + Q_DECLARE_PRIVATE(QTextBrowser) Q_PRIVATE_SLOT(d_func(), void _q_documentModified()) Q_PRIVATE_SLOT(d_func(), void _q_activateAnchor(const QString &)) Q_PRIVATE_SLOT(d_func(), void _q_highlightLink(const QString &)) diff --git a/src/gui/widgets/qtextedit.h b/src/gui/widgets/qtextedit.h index ab807e8..9e10e07 100644 --- a/src/gui/widgets/qtextedit.h +++ b/src/gui/widgets/qtextedit.h @@ -70,7 +70,7 @@ class QMimeData; class Q_GUI_EXPORT QTextEdit : public QAbstractScrollArea { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QTextEdit) + Q_DECLARE_PRIVATE(QTextEdit) Q_FLAGS(AutoFormatting) Q_ENUMS(LineWrapMode) Q_PROPERTY(AutoFormatting autoFormatting READ autoFormatting WRITE setAutoFormatting) diff --git a/src/gui/widgets/qtoolbar.h b/src/gui/widgets/qtoolbar.h index 6e58555..07502b3 100644 --- a/src/gui/widgets/qtoolbar.h +++ b/src/gui/widgets/qtoolbar.h @@ -162,7 +162,7 @@ public: #endif private: - Q_DECLARE_SCOPED_PRIVATE(QToolBar) + Q_DECLARE_PRIVATE(QToolBar) Q_DISABLE_COPY(QToolBar) Q_PRIVATE_SLOT(d_func(), void _q_toggleView(bool)) Q_PRIVATE_SLOT(d_func(), void _q_updateIconSize(const QSize &)) diff --git a/src/gui/widgets/qtoolbox.h b/src/gui/widgets/qtoolbox.h index 242efa6..2c38967 100644 --- a/src/gui/widgets/qtoolbox.h +++ b/src/gui/widgets/qtoolbox.h @@ -124,7 +124,7 @@ public: #endif private: - Q_DECLARE_SCOPED_PRIVATE(QToolBox) + Q_DECLARE_PRIVATE(QToolBox) Q_DISABLE_COPY(QToolBox) Q_PRIVATE_SLOT(d_func(), void _q_buttonClicked()) Q_PRIVATE_SLOT(d_func(), void _q_widgetDestroyed(QObject*)) diff --git a/src/gui/widgets/qtoolbutton.h b/src/gui/widgets/qtoolbutton.h index 7286096..1e7d678 100644 --- a/src/gui/widgets/qtoolbutton.h +++ b/src/gui/widgets/qtoolbutton.h @@ -127,7 +127,7 @@ protected: private: Q_DISABLE_COPY(QToolButton) - Q_DECLARE_SCOPED_PRIVATE(QToolButton) + Q_DECLARE_PRIVATE(QToolButton) #ifndef QT_NO_MENU Q_PRIVATE_SLOT(d_func(), void _q_buttonPressed()) Q_PRIVATE_SLOT(d_func(), void _q_updateButtonDown()) diff --git a/src/gui/widgets/qvalidator.h b/src/gui/widgets/qvalidator.h index 5c15116..5c27d1d 100644 --- a/src/gui/widgets/qvalidator.h +++ b/src/gui/widgets/qvalidator.h @@ -90,7 +90,7 @@ protected: private: Q_DISABLE_COPY(QValidator) - Q_DECLARE_SCOPED_PRIVATE(QValidator) + Q_DECLARE_PRIVATE(QValidator) }; class Q_GUI_EXPORT QIntValidator : public QValidator @@ -168,7 +168,7 @@ public: QObject * parent, const char *name); #endif private: - Q_DECLARE_SCOPED_PRIVATE(QDoubleValidator) + Q_DECLARE_PRIVATE(QDoubleValidator) Q_DISABLE_COPY(QDoubleValidator) double b; diff --git a/src/gui/widgets/qworkspace.cpp b/src/gui/widgets/qworkspace.cpp index da06e9d..3184140 100644 --- a/src/gui/widgets/qworkspace.cpp +++ b/src/gui/widgets/qworkspace.cpp @@ -228,7 +228,7 @@ void QMDIControl::paintEvent(QPaintEvent *) class QWorkspaceTitleBar : public QWidget { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QWorkspaceTitleBar) + Q_DECLARE_PRIVATE(QWorkspaceTitleBar) Q_PROPERTY(bool autoRaise READ autoRaise WRITE setAutoRaise) Q_PROPERTY(bool movable READ isMovable WRITE setMovable) diff --git a/src/gui/widgets/qworkspace.h b/src/gui/widgets/qworkspace.h index 1a20d6c..8a64315 100644 --- a/src/gui/widgets/qworkspace.h +++ b/src/gui/widgets/qworkspace.h @@ -115,7 +115,7 @@ protected: #endif private: - Q_DECLARE_SCOPED_PRIVATE(QWorkspace) + Q_DECLARE_PRIVATE(QWorkspace) Q_DISABLE_COPY(QWorkspace) Q_PRIVATE_SLOT(d_func(), void _q_normalizeActiveWindow()) Q_PRIVATE_SLOT(d_func(), void _q_minimizeActiveWindow()) diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h index 38ebb69..40f2313 100644 --- a/src/network/access/qabstractnetworkcache.h +++ b/src/network/access/qabstractnetworkcache.h @@ -130,7 +130,7 @@ protected: QAbstractNetworkCache(QAbstractNetworkCachePrivate &dd, QObject *parent); private: - Q_DECLARE_SCOPED_PRIVATE(QAbstractNetworkCache) + Q_DECLARE_PRIVATE(QAbstractNetworkCache) Q_DISABLE_COPY(QAbstractNetworkCache) }; diff --git a/src/network/access/qftp.h b/src/network/access/qftp.h index 8e4af9f..c6aaea4 100644 --- a/src/network/access/qftp.h +++ b/src/network/access/qftp.h @@ -162,7 +162,7 @@ public: private: Q_DISABLE_COPY(QFtp) - Q_DECLARE_SCOPED_PRIVATE(QFtp) + Q_DECLARE_PRIVATE(QFtp) Q_PRIVATE_SLOT(d_func(), void _q_startNextCommand()) Q_PRIVATE_SLOT(d_func(), void _q_piFinished(const QString&)) diff --git a/src/network/access/qhttp.h b/src/network/access/qhttp.h index c1fda0e..e524350 100644 --- a/src/network/access/qhttp.h +++ b/src/network/access/qhttp.h @@ -112,7 +112,7 @@ protected: QScopedPointer<QHttpHeaderPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QHttpHeader) + Q_DECLARE_PRIVATE(QHttpHeader) }; class QHttpResponseHeaderPrivate; @@ -139,7 +139,7 @@ protected: bool parseLine(const QString &line, int number); private: - Q_DECLARE_SCOPED_PRIVATE(QHttpResponseHeader) + Q_DECLARE_PRIVATE(QHttpResponseHeader) friend class QHttpPrivate; }; @@ -167,7 +167,7 @@ protected: bool parseLine(const QString &line, int number); private: - Q_DECLARE_SCOPED_PRIVATE(QHttpRequestHeader) + Q_DECLARE_PRIVATE(QHttpRequestHeader) }; class Q_NETWORK_EXPORT QHttp : public QObject @@ -282,7 +282,7 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QHttp) - Q_DECLARE_SCOPED_PRIVATE(QHttp) + Q_DECLARE_PRIVATE(QHttp) Q_PRIVATE_SLOT(d_func(), void _q_startNextRequest()) Q_PRIVATE_SLOT(d_func(), void _q_slotReadyRead()) diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h index d8e21cd..d6b0325 100644 --- a/src/network/access/qhttpnetworkconnection_p.h +++ b/src/network/access/qhttpnetworkconnection_p.h @@ -135,7 +135,7 @@ Q_SIGNALS: void error(QNetworkReply::NetworkError errorCode, const QString &detail = QString()); private: - Q_DECLARE_SCOPED_PRIVATE(QHttpNetworkConnection) + Q_DECLARE_PRIVATE(QHttpNetworkConnection) Q_DISABLE_COPY(QHttpNetworkConnection) friend class QHttpNetworkReply; friend class QHttpNetworkConnectionChannel; diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index 27c5860..fe49799 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -146,7 +146,7 @@ Q_SIGNALS: void dataSendProgress(qint64 done, qint64 total); private: - Q_DECLARE_SCOPED_PRIVATE(QHttpNetworkReply) + Q_DECLARE_PRIVATE(QHttpNetworkReply) friend class QHttpNetworkConnection; friend class QHttpNetworkConnectionPrivate; friend class QHttpNetworkConnectionChannel; diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index 01f09cf..f7967f6 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -119,7 +119,7 @@ protected: private: friend class QNetworkReplyImplPrivate; - Q_DECLARE_SCOPED_PRIVATE(QNetworkAccessManager) + Q_DECLARE_PRIVATE(QNetworkAccessManager) Q_PRIVATE_SLOT(d_func(), void _q_replyFinished()) Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList<QSslError>)) }; diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h index 269ead9..fae0857 100644 --- a/src/network/access/qnetworkcookiejar.h +++ b/src/network/access/qnetworkcookiejar.h @@ -70,7 +70,7 @@ protected: void setAllCookies(const QList<QNetworkCookie> &cookieList); private: - Q_DECLARE_SCOPED_PRIVATE(QNetworkCookieJar) + Q_DECLARE_PRIVATE(QNetworkCookieJar) Q_DISABLE_COPY(QNetworkCookieJar) }; diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h index 8827bfb..2d04564 100644 --- a/src/network/access/qnetworkdiskcache.h +++ b/src/network/access/qnetworkdiskcache.h @@ -84,7 +84,7 @@ protected: virtual qint64 expire(); private: - Q_DECLARE_SCOPED_PRIVATE(QNetworkDiskCache) + Q_DECLARE_PRIVATE(QNetworkDiskCache) Q_DISABLE_COPY(QNetworkDiskCache) }; diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index 854111f..679ab71 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -165,7 +165,7 @@ protected: void setAttribute(QNetworkRequest::Attribute code, const QVariant &value); private: - Q_DECLARE_SCOPED_PRIVATE(QNetworkReply) + Q_DECLARE_PRIVATE(QNetworkReply) }; QT_END_NAMESPACE diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index eb63e62..fba8d34 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -92,7 +92,7 @@ public: Q_INVOKABLE virtual void ignoreSslErrorsImplementation(const QList<QSslError> &errors); #endif - Q_DECLARE_SCOPED_PRIVATE(QNetworkReplyImpl) + Q_DECLARE_PRIVATE(QNetworkReplyImpl) Q_PRIVATE_SLOT(d_func(), void _q_startOperation()) Q_PRIVATE_SLOT(d_func(), void _q_copyReadyRead()) Q_PRIVATE_SLOT(d_func(), void _q_copyReadChannelFinished()) diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index 42e3ffd..50a38bb 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -209,7 +209,7 @@ protected: QAbstractSocket(SocketType socketType, QAbstractSocketPrivate &dd, QObject *parent = 0); private: - Q_DECLARE_SCOPED_PRIVATE(QAbstractSocket) + Q_DECLARE_PRIVATE(QAbstractSocket) Q_DISABLE_COPY(QAbstractSocket) Q_PRIVATE_SLOT(d_func(), void _q_connectToNextAddress()) diff --git a/src/network/socket/qabstractsocketengine_p.h b/src/network/socket/qabstractsocketengine_p.h index 3a6aa62..39c00cc 100644 --- a/src/network/socket/qabstractsocketengine_p.h +++ b/src/network/socket/qabstractsocketengine_p.h @@ -177,7 +177,7 @@ protected: void setPeerPort(quint16 port); private: - Q_DECLARE_SCOPED_PRIVATE(QAbstractSocketEngine) + Q_DECLARE_PRIVATE(QAbstractSocketEngine) Q_DISABLE_COPY(QAbstractSocketEngine) }; diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h index f4d29cf..bc7e47a 100644 --- a/src/network/socket/qhttpsocketengine_p.h +++ b/src/network/socket/qhttpsocketengine_p.h @@ -144,7 +144,7 @@ private: void emitWriteNotification(); void emitConnectionNotification(); - Q_DECLARE_SCOPED_PRIVATE(QHttpSocketEngine) + Q_DECLARE_PRIVATE(QHttpSocketEngine) Q_DISABLE_COPY(QHttpSocketEngine) }; diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h index 10dd62f..24b69a8 100644 --- a/src/network/socket/qlocalserver.h +++ b/src/network/socket/qlocalserver.h @@ -58,7 +58,7 @@ class QLocalServerPrivate; class Q_NETWORK_EXPORT QLocalServer : public QObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QLocalServer) + Q_DECLARE_PRIVATE(QLocalServer) Q_SIGNALS: void newConnection(); diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index 6a07d74..4bff62e 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -58,7 +58,7 @@ class QLocalSocketPrivate; class Q_NETWORK_EXPORT QLocalSocket : public QIODevice { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QLocalSocket) + Q_DECLARE_PRIVATE(QLocalSocket) public: enum LocalSocketError diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h index e26e9cb..f522aff 100644 --- a/src/network/socket/qnativesocketengine_p.h +++ b/src/network/socket/qnativesocketengine_p.h @@ -288,7 +288,7 @@ public Q_SLOTS: void connectionNotification(); private: - Q_DECLARE_SCOPED_PRIVATE(QNativeSocketEngine) + Q_DECLARE_PRIVATE(QNativeSocketEngine) Q_DISABLE_COPY(QNativeSocketEngine) }; diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h index 04c6280..19560f0 100644 --- a/src/network/socket/qsocks5socketengine_p.h +++ b/src/network/socket/qsocks5socketengine_p.h @@ -117,7 +117,7 @@ public: void setExceptionNotificationEnabled(bool enable); private: - Q_DECLARE_SCOPED_PRIVATE(QSocks5SocketEngine) + Q_DECLARE_PRIVATE(QSocks5SocketEngine) Q_DISABLE_COPY(QSocks5SocketEngine) Q_PRIVATE_SLOT(d_func(), void _q_controlSocketConnected()) Q_PRIVATE_SLOT(d_func(), void _q_controlSocketReadNotification()) diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h index 697f998..19f2a45 100644 --- a/src/network/socket/qtcpserver.h +++ b/src/network/socket/qtcpserver.h @@ -99,7 +99,7 @@ Q_SIGNALS: private: Q_DISABLE_COPY(QTcpServer) - Q_DECLARE_SCOPED_PRIVATE(QTcpServer) + Q_DECLARE_PRIVATE(QTcpServer) }; QT_END_NAMESPACE diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h index b0bb80f..4e1003a 100644 --- a/src/network/socket/qtcpsocket.h +++ b/src/network/socket/qtcpsocket.h @@ -65,7 +65,7 @@ protected: private: Q_DISABLE_COPY(QTcpSocket) - Q_DECLARE_SCOPED_PRIVATE(QTcpSocket) + Q_DECLARE_PRIVATE(QTcpSocket) }; QT_END_NAMESPACE diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h index ea0c42c..078b8ad 100644 --- a/src/network/socket/qudpsocket.h +++ b/src/network/socket/qudpsocket.h @@ -85,7 +85,7 @@ public: private: Q_DISABLE_COPY(QUdpSocket) - Q_DECLARE_SCOPED_PRIVATE(QUdpSocket) + Q_DECLARE_PRIVATE(QUdpSocket) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QUdpSocket::BindMode) diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index f3600bf..cab0667 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -193,7 +193,7 @@ protected: qint64 writeData(const char *data, qint64 len); private: - Q_DECLARE_SCOPED_PRIVATE(QSslSocket) + Q_DECLARE_PRIVATE(QSslSocket) Q_DISABLE_COPY(QSslSocket) Q_PRIVATE_SLOT(d_func(), void _q_connectedSlot()) Q_PRIVATE_SLOT(d_func(), void _q_hostFoundSlot()) diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index ccfd3b4..906817b 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h @@ -93,7 +93,7 @@ public: class QGL2PaintEngineEx : public QPaintEngineEx { - Q_DECLARE_SCOPED_PRIVATE(QGL2PaintEngineEx) + Q_DECLARE_PRIVATE(QGL2PaintEngineEx) public: QGL2PaintEngineEx(); ~QGL2PaintEngineEx(); diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index fee19a5..9ee200b 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -266,7 +266,7 @@ Q_OPENGL_EXPORT bool operator!=(const QGLFormat&, const QGLFormat&); class Q_OPENGL_EXPORT QGLContext { - Q_DECLARE_SCOPED_PRIVATE(QGLContext) + Q_DECLARE_PRIVATE(QGLContext) public: QGLContext(const QGLFormat& format, QPaintDevice* device); QGLContext(const QGLFormat& format); @@ -388,7 +388,7 @@ private: class Q_OPENGL_EXPORT QGLWidget : public QWidget { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QGLWidget) + Q_DECLARE_PRIVATE(QGLWidget) public: explicit QGLWidget(QWidget* parent=0, const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0); diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h index 7130dec..108bbb4 100644 --- a/src/opengl/qglframebufferobject.h +++ b/src/opengl/qglframebufferobject.h @@ -56,7 +56,7 @@ class QGLFramebufferObjectFormat; class Q_OPENGL_EXPORT QGLFramebufferObject : public QPaintDevice { - Q_DECLARE_SCOPED_PRIVATE(QGLFramebufferObject) + Q_DECLARE_PRIVATE(QGLFramebufferObject) public: enum Attachment { NoAttachment, diff --git a/src/opengl/qglpaintdevice_qws_p.h b/src/opengl/qglpaintdevice_qws_p.h index 08ad304..ec7d6c8 100644 --- a/src/opengl/qglpaintdevice_qws_p.h +++ b/src/opengl/qglpaintdevice_qws_p.h @@ -64,7 +64,7 @@ class QWSGLPaintDevicePrivate; class Q_OPENGL_EXPORT QWSGLPaintDevice : public QPaintDevice { - Q_DECLARE_SCOPED_PRIVATE(QWSGLPaintDevice) + Q_DECLARE_PRIVATE(QWSGLPaintDevice) public: QWSGLPaintDevice(QWidget *widget); ~QWSGLPaintDevice(); diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h index f8b5707..06894c0 100644 --- a/src/opengl/qglpixelbuffer.h +++ b/src/opengl/qglpixelbuffer.h @@ -55,7 +55,7 @@ class QGLPixelBufferPrivate; class Q_OPENGL_EXPORT QGLPixelBuffer : public QPaintDevice { - Q_DECLARE_SCOPED_PRIVATE(QGLPixelBuffer) + Q_DECLARE_PRIVATE(QGLPixelBuffer) public: QGLPixelBuffer(const QSize &size, const QGLFormat &format = QGLFormat::defaultFormat(), QGLWidget *shareWidget = 0); diff --git a/src/opengl/qglscreen_qws.h b/src/opengl/qglscreen_qws.h index 4caa134..8f2ccb7 100644 --- a/src/opengl/qglscreen_qws.h +++ b/src/opengl/qglscreen_qws.h @@ -88,7 +88,7 @@ public: class Q_OPENGL_EXPORT QGLScreen : public QScreen { - Q_DECLARE_SCOPED_PRIVATE(QGLScreen) + Q_DECLARE_PRIVATE(QGLScreen) public: QGLScreen(int displayId); virtual ~QGLScreen(); diff --git a/src/opengl/qglwindowsurface_qws_p.h b/src/opengl/qglwindowsurface_qws_p.h index f6d6713..1def568 100644 --- a/src/opengl/qglwindowsurface_qws_p.h +++ b/src/opengl/qglwindowsurface_qws_p.h @@ -70,7 +70,7 @@ class QWSGLWindowSurfacePrivate; class Q_OPENGL_EXPORT QWSGLWindowSurface : public QWSWindowSurface { - Q_DECLARE_SCOPED_PRIVATE(QWSGLWindowSurface) + Q_DECLARE_PRIVATE(QWSGLWindowSurface) public: QWSGLWindowSurface(QWidget *widget); diff --git a/src/opengl/qpaintengine_opengl_p.h b/src/opengl/qpaintengine_opengl_p.h index e1cd897..439782b 100644 --- a/src/opengl/qpaintengine_opengl_p.h +++ b/src/opengl/qpaintengine_opengl_p.h @@ -74,7 +74,7 @@ public: class QOpenGLPaintEngine : public QPaintEngineEx { - Q_DECLARE_SCOPED_PRIVATE(QOpenGLPaintEngine) + Q_DECLARE_PRIVATE(QOpenGLPaintEngine) public: QOpenGLPaintEngine(); ~QOpenGLPaintEngine(); diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h index 7585b4a..6148b14 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h @@ -53,7 +53,7 @@ class QDirectFBPaintEnginePrivate; class QDirectFBPaintEngine : public QRasterPaintEngine { - Q_DECLARE_SCOPED_PRIVATE(QDirectFBPaintEngine) + Q_DECLARE_PRIVATE(QDirectFBPaintEngine) public: QDirectFBPaintEngine(QPaintDevice *device); virtual ~QDirectFBPaintEngine(); diff --git a/src/plugins/imageformats/mng/qmnghandler.h b/src/plugins/imageformats/mng/qmnghandler.h index aa6efd3..b9e37bf 100644 --- a/src/plugins/imageformats/mng/qmnghandler.h +++ b/src/plugins/imageformats/mng/qmnghandler.h @@ -74,7 +74,7 @@ class QMngHandler : public QImageIOHandler virtual bool supportsOption(ImageOption option) const; private: - Q_DECLARE_SCOPED_PRIVATE(QMngHandler) + Q_DECLARE_PRIVATE(QMngHandler) QScopedPointer<QMngHandlerPrivate> d_ptr; }; diff --git a/src/qt3support/other/q3dragobject.h b/src/qt3support/other/q3dragobject.h index c25e54b..356e1f7 100644 --- a/src/qt3support/other/q3dragobject.h +++ b/src/qt3support/other/q3dragobject.h @@ -68,7 +68,7 @@ class QPixmap; class Q_COMPAT_EXPORT Q3DragObject : public QObject, public QMimeSource { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(Q3DragObject) + Q_DECLARE_PRIVATE(Q3DragObject) public: Q3DragObject(QWidget * dragSource = 0, const char *name = 0); virtual ~Q3DragObject(); @@ -99,7 +99,7 @@ private: class Q_COMPAT_EXPORT Q3StoredDrag: public Q3DragObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(Q3StoredDrag) + Q_DECLARE_PRIVATE(Q3StoredDrag) public: Q3StoredDrag(const char *mimeType, QWidget *dragSource = 0, const char *name = 0); ~Q3StoredDrag(); @@ -118,7 +118,7 @@ private: class Q_COMPAT_EXPORT Q3TextDrag: public Q3DragObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(Q3TextDrag) + Q_DECLARE_PRIVATE(Q3TextDrag) public: Q3TextDrag(const QString &, QWidget *dragSource = 0, const char *name = 0); Q3TextDrag(QWidget * dragSource = 0, const char * name = 0); @@ -143,7 +143,7 @@ private: class Q_COMPAT_EXPORT Q3ImageDrag: public Q3DragObject { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(Q3ImageDrag) + Q_DECLARE_PRIVATE(Q3ImageDrag) public: Q3ImageDrag(QImage image, QWidget * dragSource = 0, const char * name = 0); Q3ImageDrag(QWidget * dragSource = 0, const char * name = 0); diff --git a/src/qt3support/painting/q3paintengine_svg_p.h b/src/qt3support/painting/q3paintengine_svg_p.h index 1faffff..26452ab 100644 --- a/src/qt3support/painting/q3paintengine_svg_p.h +++ b/src/qt3support/painting/q3paintengine_svg_p.h @@ -63,7 +63,7 @@ class Q3SVGPaintEnginePrivate; class Q3SVGPaintEngine : public QPaintEngine { - Q_DECLARE_SCOPED_PRIVATE(Q3SVGPaintEngine) + Q_DECLARE_PRIVATE(Q3SVGPaintEngine) public: Q3SVGPaintEngine(); diff --git a/src/qt3support/widgets/q3mainwindow.h b/src/qt3support/widgets/q3mainwindow.h index 2e056b4..60dea5d 100644 --- a/src/qt3support/widgets/q3mainwindow.h +++ b/src/qt3support/widgets/q3mainwindow.h @@ -66,7 +66,7 @@ template<class T> class QList; class Q_COMPAT_EXPORT Q3MainWindow: public QWidget { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(Q3MainWindow) + Q_DECLARE_PRIVATE(Q3MainWindow) Q_PROPERTY(bool rightJustification READ rightJustification WRITE setRightJustification DESIGNABLE false) Q_PROPERTY(bool usesBigPixmaps READ usesBigPixmaps WRITE setUsesBigPixmaps) diff --git a/src/qt3support/widgets/q3titlebar_p.h b/src/qt3support/widgets/q3titlebar_p.h index 6b3c22c..c4be34e 100644 --- a/src/qt3support/widgets/q3titlebar_p.h +++ b/src/qt3support/widgets/q3titlebar_p.h @@ -67,7 +67,7 @@ class QPixmap; class Q_COMPAT_EXPORT Q3TitleBar : public QWidget { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(Q3TitleBar) + Q_DECLARE_PRIVATE(Q3TitleBar) Q_PROPERTY(bool autoRaise READ autoRaise WRITE setAutoRaise) Q_PROPERTY(bool movable READ isMovable WRITE setMovable) diff --git a/src/script/qscriptable.h b/src/script/qscriptable.h index 11ecb6b..76a0496 100644 --- a/src/script/qscriptable.h +++ b/src/script/qscriptable.h @@ -78,7 +78,7 @@ private: QScopedPointer<QScriptablePrivate> d_ptr; Q_DISABLE_COPY(QScriptable) - Q_DECLARE_SCOPED_PRIVATE(QScriptable) + Q_DECLARE_PRIVATE(QScriptable) }; #endif // QT_NO_QOBJECT diff --git a/src/script/qscriptclass.h b/src/script/qscriptclass.h index e821cf7..7070470 100644 --- a/src/script/qscriptclass.h +++ b/src/script/qscriptclass.h @@ -107,7 +107,7 @@ protected: QScopedPointer<QScriptClassPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptClass) + Q_DECLARE_PRIVATE(QScriptClass) Q_DISABLE_COPY(QScriptClass) }; diff --git a/src/script/qscriptclasspropertyiterator.h b/src/script/qscriptclasspropertyiterator.h index ce6d3d4..1570410 100644 --- a/src/script/qscriptclasspropertyiterator.h +++ b/src/script/qscriptclasspropertyiterator.h @@ -84,7 +84,7 @@ protected: QScopedPointer<QScriptClassPropertyIteratorPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptClassPropertyIterator) + Q_DECLARE_PRIVATE(QScriptClassPropertyIterator) Q_DISABLE_COPY(QScriptClassPropertyIterator) }; diff --git a/src/script/qscriptcontext.h b/src/script/qscriptcontext.h index 84d4192..5a86cba 100644 --- a/src/script/qscriptcontext.h +++ b/src/script/qscriptcontext.h @@ -114,7 +114,7 @@ private: QScopedPointer<QScriptContextPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptContext) + Q_DECLARE_PRIVATE(QScriptContext) Q_DISABLE_COPY(QScriptContext) }; diff --git a/src/script/qscriptcontextinfo.h b/src/script/qscriptcontextinfo.h index 95e88e2..3540060 100644 --- a/src/script/qscriptcontextinfo.h +++ b/src/script/qscriptcontextinfo.h @@ -107,7 +107,7 @@ public: private: QScopedSharedPointer<QScriptContextInfoPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptContextInfo) + Q_DECLARE_PRIVATE(QScriptContextInfo) }; typedef QList<QScriptContextInfo> QScriptContextInfoList; diff --git a/src/script/qscriptengine.h b/src/script/qscriptengine.h index 4f39c57..794c965 100644 --- a/src/script/qscriptengine.h +++ b/src/script/qscriptengine.h @@ -117,7 +117,7 @@ private: QScriptSyntaxCheckResult(QScriptSyntaxCheckResultPrivate *d); QScopedSharedPointer<QScriptSyntaxCheckResultPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptSyntaxCheckResult) + Q_DECLARE_PRIVATE(QScriptSyntaxCheckResult) friend class QScriptEnginePrivate; }; @@ -291,7 +291,7 @@ protected: #endif private: - Q_DECLARE_SCOPED_PRIVATE(QScriptEngine) + Q_DECLARE_PRIVATE(QScriptEngine) Q_DISABLE_COPY(QScriptEngine) #ifndef QT_NO_QOBJECT Q_PRIVATE_SLOT(d_func(), void _q_objectDestroyed(QObject *)) diff --git a/src/script/qscriptengineagent.h b/src/script/qscriptengineagent.h index 10209df..e71560c 100644 --- a/src/script/qscriptengineagent.h +++ b/src/script/qscriptengineagent.h @@ -100,7 +100,7 @@ protected: QScopedPointer<QScriptEngineAgentPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptEngineAgent) + Q_DECLARE_PRIVATE(QScriptEngineAgent) Q_DISABLE_COPY(QScriptEngineAgent) }; diff --git a/src/script/qscriptstring.h b/src/script/qscriptstring.h index 17cb687..16c834d 100644 --- a/src/script/qscriptstring.h +++ b/src/script/qscriptstring.h @@ -78,7 +78,7 @@ public: private: QCustomScopedPointer<QScriptStringPrivate, QScriptStringPrivatePointerDeleter> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptString) + Q_DECLARE_PRIVATE(QScriptString) }; QT_END_NAMESPACE diff --git a/src/script/qscriptvalue.h b/src/script/qscriptvalue.h index 5b10f9e..d504ad8 100644 --- a/src/script/qscriptvalue.h +++ b/src/script/qscriptvalue.h @@ -225,7 +225,7 @@ private: private: QCustomScopedPointer<QScriptValuePrivate, QScriptValuePrivatePointerDeleter> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptValue) + Q_DECLARE_PRIVATE(QScriptValue) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptValue::ResolveFlags) diff --git a/src/script/qscriptvalueiterator.h b/src/script/qscriptvalueiterator.h index a25d12c..c8684ea 100644 --- a/src/script/qscriptvalueiterator.h +++ b/src/script/qscriptvalueiterator.h @@ -88,7 +88,7 @@ public: private: QScopedPointer<QScriptValueIteratorPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptValueIterator) + Q_DECLARE_PRIVATE(QScriptValueIterator) Q_DISABLE_COPY(QScriptValueIterator) }; diff --git a/src/scripttools/debugging/qscriptbreakpointdata_p.h b/src/scripttools/debugging/qscriptbreakpointdata_p.h index 4f6d7b9..6fcb3f3 100644 --- a/src/scripttools/debugging/qscriptbreakpointdata_p.h +++ b/src/scripttools/debugging/qscriptbreakpointdata_p.h @@ -116,7 +116,7 @@ public: private: QScopedPointer<QScriptBreakpointDataPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptBreakpointData) + Q_DECLARE_PRIVATE(QScriptBreakpointData) }; typedef QMap<int, QScriptBreakpointData> QScriptBreakpointMap; diff --git a/src/scripttools/debugging/qscriptbreakpointsmodel_p.h b/src/scripttools/debugging/qscriptbreakpointsmodel_p.h index 7c0ba01..b6e11e5 100644 --- a/src/scripttools/debugging/qscriptbreakpointsmodel_p.h +++ b/src/scripttools/debugging/qscriptbreakpointsmodel_p.h @@ -98,7 +98,7 @@ public: Qt::ItemFlags flags(const QModelIndex &index) const; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptBreakpointsModel) + Q_DECLARE_PRIVATE(QScriptBreakpointsModel) Q_DISABLE_COPY(QScriptBreakpointsModel) }; diff --git a/src/scripttools/debugging/qscriptbreakpointswidget_p.h b/src/scripttools/debugging/qscriptbreakpointswidget_p.h index e0bb25c..0717351 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidget_p.h +++ b/src/scripttools/debugging/qscriptbreakpointswidget_p.h @@ -81,7 +81,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_onCurrentChanged(const QModelIndex &)) Q_PRIVATE_SLOT(d_func(), void _q_onNewBreakpointRequest(const QString &, int)) - Q_DECLARE_SCOPED_PRIVATE(QScriptBreakpointsWidget) + Q_DECLARE_PRIVATE(QScriptBreakpointsWidget) Q_DISABLE_COPY(QScriptBreakpointsWidget) }; diff --git a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h index 74e775b..c2b6418 100644 --- a/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptbreakpointswidgetinterface_p.h @@ -83,7 +83,7 @@ protected: QWidget *parent, Qt::WindowFlags flags); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptBreakpointsWidgetInterface) + Q_DECLARE_PRIVATE(QScriptBreakpointsWidgetInterface) Q_DISABLE_COPY(QScriptBreakpointsWidgetInterface) }; diff --git a/src/scripttools/debugging/qscriptcompletiontask_p.h b/src/scripttools/debugging/qscriptcompletiontask_p.h index 95afa88..1dd80c0 100644 --- a/src/scripttools/debugging/qscriptcompletiontask_p.h +++ b/src/scripttools/debugging/qscriptcompletiontask_p.h @@ -81,7 +81,7 @@ public: void start(); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptCompletionTask) + Q_DECLARE_PRIVATE(QScriptCompletionTask) Q_DISABLE_COPY(QScriptCompletionTask) }; diff --git a/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h b/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h index abe908c..6a47bed 100644 --- a/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h +++ b/src/scripttools/debugging/qscriptcompletiontaskinterface_p.h @@ -97,7 +97,7 @@ protected: QScriptCompletionTaskInterfacePrivate &dd, QObject *parent); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptCompletionTaskInterface) + Q_DECLARE_PRIVATE(QScriptCompletionTaskInterface) Q_DISABLE_COPY(QScriptCompletionTaskInterface) }; diff --git a/src/scripttools/debugging/qscriptdebugger_p.h b/src/scripttools/debugging/qscriptdebugger_p.h index f9cbf74..ba27200 100644 --- a/src/scripttools/debugging/qscriptdebugger_p.h +++ b/src/scripttools/debugging/qscriptdebugger_p.h @@ -185,7 +185,7 @@ protected: QScriptDebugger(QScriptDebuggerPrivate &dd, QObject *parent); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebugger) + Q_DECLARE_PRIVATE(QScriptDebugger) Q_DISABLE_COPY(QScriptDebugger) Q_PRIVATE_SLOT(d_func(), void _q_onLineEntered(const QString &)) diff --git a/src/scripttools/debugging/qscriptdebuggeragent_p.h b/src/scripttools/debugging/qscriptdebuggeragent_p.h index 769ed53..ca4ab2e 100644 --- a/src/scripttools/debugging/qscriptdebuggeragent_p.h +++ b/src/scripttools/debugging/qscriptdebuggeragent_p.h @@ -125,7 +125,7 @@ public: const QVariant &argument = QVariant()); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerAgent) + Q_DECLARE_PRIVATE(QScriptDebuggerAgent) Q_DISABLE_COPY(QScriptDebuggerAgent) }; diff --git a/src/scripttools/debugging/qscriptdebuggerbackend_p.h b/src/scripttools/debugging/qscriptdebuggerbackend_p.h index 64c6ef3..759a304 100644 --- a/src/scripttools/debugging/qscriptdebuggerbackend_p.h +++ b/src/scripttools/debugging/qscriptdebuggerbackend_p.h @@ -147,7 +147,7 @@ protected: QScopedPointer<QScriptDebuggerBackendPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerBackend) + Q_DECLARE_PRIVATE(QScriptDebuggerBackend) Q_DISABLE_COPY(QScriptDebuggerBackend) }; diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h index b7d9392..f6d000d 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget_p.h @@ -78,7 +78,7 @@ protected: void keyPressEvent(QKeyEvent *e); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeFinderWidget) + Q_DECLARE_PRIVATE(QScriptDebuggerCodeFinderWidget) Q_DISABLE_COPY(QScriptDebuggerCodeFinderWidget) Q_PRIVATE_SLOT(d_func(), void _q_updateButtons()) diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h index e73be00..5848e34 100644 --- a/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidgetinterface_p.h @@ -84,7 +84,7 @@ protected: QWidget *parent, Qt::WindowFlags flags); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeFinderWidgetInterface) + Q_DECLARE_PRIVATE(QScriptDebuggerCodeFinderWidgetInterface) Q_DISABLE_COPY(QScriptDebuggerCodeFinderWidgetInterface) }; diff --git a/src/scripttools/debugging/qscriptdebuggercodeview_p.h b/src/scripttools/debugging/qscriptdebuggercodeview_p.h index 5945382..1748102 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeview_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodeview_p.h @@ -87,7 +87,7 @@ public: bool event(QEvent *e); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeView) + Q_DECLARE_PRIVATE(QScriptDebuggerCodeView) Q_DISABLE_COPY(QScriptDebuggerCodeView) }; diff --git a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h index 9bb4017..ea9eb62 100644 --- a/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodeviewinterface_p.h @@ -97,7 +97,7 @@ protected: QWidget *parent, Qt::WindowFlags flags); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeViewInterface) + Q_DECLARE_PRIVATE(QScriptDebuggerCodeViewInterface) Q_DISABLE_COPY(QScriptDebuggerCodeViewInterface) }; diff --git a/src/scripttools/debugging/qscriptdebuggercodewidget_p.h b/src/scripttools/debugging/qscriptdebuggercodewidget_p.h index f9a1b82..e072a3d 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodewidget_p.h @@ -82,7 +82,7 @@ public: QScriptDebuggerCodeViewInterface *currentView() const; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeWidget) + Q_DECLARE_PRIVATE(QScriptDebuggerCodeWidget) Q_DISABLE_COPY(QScriptDebuggerCodeWidget) Q_PRIVATE_SLOT(d_func(), void _q_onBreakpointToggleRequest(int,bool)) diff --git a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h index d27af3d..03b813a 100644 --- a/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggercodewidgetinterface_p.h @@ -92,7 +92,7 @@ protected: QWidget *parent, Qt::WindowFlags flags); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCodeWidgetInterface) + Q_DECLARE_PRIVATE(QScriptDebuggerCodeWidgetInterface) Q_DISABLE_COPY(QScriptDebuggerCodeWidgetInterface) }; diff --git a/src/scripttools/debugging/qscriptdebuggercommand_p.h b/src/scripttools/debugging/qscriptdebuggercommand_p.h index ffdb107..8e44fcf 100644 --- a/src/scripttools/debugging/qscriptdebuggercommand_p.h +++ b/src/scripttools/debugging/qscriptdebuggercommand_p.h @@ -257,7 +257,7 @@ public: private: QScopedPointer<QScriptDebuggerCommandPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCommand) + Q_DECLARE_PRIVATE(QScriptDebuggerCommand) }; Q_AUTOTEST_EXPORT QDataStream &operator<<(QDataStream &, const QScriptDebuggerCommand &); diff --git a/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h b/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h index d303d66..0da0d87 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h +++ b/src/scripttools/debugging/qscriptdebuggercommandexecutor_p.h @@ -78,7 +78,7 @@ protected: QScopedPointer<QScriptDebuggerCommandExecutorPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCommandExecutor) + Q_DECLARE_PRIVATE(QScriptDebuggerCommandExecutor) Q_DISABLE_COPY(QScriptDebuggerCommandExecutor) }; diff --git a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h index 3c80173..db9c503 100644 --- a/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h +++ b/src/scripttools/debugging/qscriptdebuggercommandschedulerjob_p.h @@ -78,7 +78,7 @@ protected: QScriptDebuggerCommandSchedulerInterface *commandScheduler); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerCommandSchedulerJob) + Q_DECLARE_PRIVATE(QScriptDebuggerCommandSchedulerJob) Q_DISABLE_COPY(QScriptDebuggerCommandSchedulerJob) }; diff --git a/src/scripttools/debugging/qscriptdebuggerconsole_p.h b/src/scripttools/debugging/qscriptdebuggerconsole_p.h index 5b88291..2e4a726 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsole_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsole_p.h @@ -112,7 +112,7 @@ public: private: QScopedPointer<QScriptDebuggerConsolePrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsole) + Q_DECLARE_PRIVATE(QScriptDebuggerConsole) Q_DISABLE_COPY(QScriptDebuggerConsole) }; diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h index a335e56..c380150 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommand_p.h @@ -94,7 +94,7 @@ protected: QScopedPointer<QScriptDebuggerConsoleCommandPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleCommand) + Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommand) Q_DISABLE_COPY(QScriptDebuggerConsoleCommand) }; diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h index b1dfecb..5e23628 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandgroupdata_p.h @@ -85,7 +85,7 @@ private: QScopedSharedPointer<QScriptDebuggerConsoleCommandGroupDataPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleCommandGroupData) + Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommandGroupData) }; typedef QMap<QString, QScriptDebuggerConsoleCommandGroupData> QScriptDebuggerConsoleCommandGroupMap; diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h index 65b2a4c..ce35157 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandjob_p.h @@ -77,7 +77,7 @@ protected: QScriptDebuggerCommandSchedulerInterface *scheduler); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleCommandJob) + Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommandJob) Q_DISABLE_COPY(QScriptDebuggerConsoleCommandJob) }; diff --git a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h index 0ffd61e..c6de5b1 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolecommandmanager_p.h @@ -88,7 +88,7 @@ public: private: QScopedPointer<QScriptDebuggerConsoleCommandManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleCommandManager) + Q_DECLARE_PRIVATE(QScriptDebuggerConsoleCommandManager) }; QT_END_NAMESPACE diff --git a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h index 1145162..0200a32 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject_p.h @@ -163,7 +163,7 @@ public Q_SLOTS: void setEvaluateAction(int action); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleGlobalObject) + Q_DECLARE_PRIVATE(QScriptDebuggerConsoleGlobalObject) Q_DISABLE_COPY(QScriptDebuggerConsoleGlobalObject) }; diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h index 02e9e94..462d445 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidget_p.h @@ -85,7 +85,7 @@ protected: QWidget *parent); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleWidget) + Q_DECLARE_PRIVATE(QScriptDebuggerConsoleWidget) Q_DISABLE_COPY(QScriptDebuggerConsoleWidget) Q_PRIVATE_SLOT(d_func(), void _q_onLineEntered(const QString &)) diff --git a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h index a3b5b5f..486a19a 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerconsolewidgetinterface_p.h @@ -94,7 +94,7 @@ protected: QWidget *parent, Qt::WindowFlags flags); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerConsoleWidgetInterface) + Q_DECLARE_PRIVATE(QScriptDebuggerConsoleWidgetInterface) Q_DISABLE_COPY(QScriptDebuggerConsoleWidgetInterface) }; diff --git a/src/scripttools/debugging/qscriptdebuggerevent_p.h b/src/scripttools/debugging/qscriptdebuggerevent_p.h index c6067d5..8c4e460 100644 --- a/src/scripttools/debugging/qscriptdebuggerevent_p.h +++ b/src/scripttools/debugging/qscriptdebuggerevent_p.h @@ -140,7 +140,7 @@ public: private: QScopedPointer<QScriptDebuggerEventPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerEvent) + Q_DECLARE_PRIVATE(QScriptDebuggerEvent) }; Q_AUTOTEST_EXPORT QDataStream &operator<<(QDataStream &, const QScriptDebuggerEvent &); diff --git a/src/scripttools/debugging/qscriptdebuggerfrontend_p.h b/src/scripttools/debugging/qscriptdebuggerfrontend_p.h index 04ebb5c..1f7b2ef 100644 --- a/src/scripttools/debugging/qscriptdebuggerfrontend_p.h +++ b/src/scripttools/debugging/qscriptdebuggerfrontend_p.h @@ -93,7 +93,7 @@ protected: QScopedPointer<QScriptDebuggerFrontendPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerFrontend) + Q_DECLARE_PRIVATE(QScriptDebuggerFrontend) Q_DISABLE_COPY(QScriptDebuggerFrontend) }; diff --git a/src/scripttools/debugging/qscriptdebuggerjob_p.h b/src/scripttools/debugging/qscriptdebuggerjob_p.h index 0b723c7..099ad16 100644 --- a/src/scripttools/debugging/qscriptdebuggerjob_p.h +++ b/src/scripttools/debugging/qscriptdebuggerjob_p.h @@ -80,7 +80,7 @@ protected: QScopedPointer<QScriptDebuggerJobPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerJob) + Q_DECLARE_PRIVATE(QScriptDebuggerJob) Q_DISABLE_COPY(QScriptDebuggerJob) }; diff --git a/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h b/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h index b93e490..172fb7e 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h +++ b/src/scripttools/debugging/qscriptdebuggerlocalsmodel_p.h @@ -93,7 +93,7 @@ Q_SIGNALS: void scopeObjectAvailable(const QModelIndex &index); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerLocalsModel) + Q_DECLARE_PRIVATE(QScriptDebuggerLocalsModel) Q_DISABLE_COPY(QScriptDebuggerLocalsModel) }; diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h index 6ef9b37..e68ce53 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidget_p.h @@ -72,7 +72,7 @@ public: void expand(const QModelIndex &index); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerLocalsWidget) + Q_DECLARE_PRIVATE(QScriptDebuggerLocalsWidget) Q_DISABLE_COPY(QScriptDebuggerLocalsWidget) Q_PRIVATE_SLOT(d_func(), void _q_onCompletionTaskFinished()) diff --git a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h index fd6ebae..45936de 100644 --- a/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerlocalswidgetinterface_p.h @@ -83,7 +83,7 @@ protected: QWidget *parent, Qt::WindowFlags flags); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerLocalsWidgetInterface) + Q_DECLARE_PRIVATE(QScriptDebuggerLocalsWidgetInterface) Q_DISABLE_COPY(QScriptDebuggerLocalsWidgetInterface) }; diff --git a/src/scripttools/debugging/qscriptdebuggerresponse_p.h b/src/scripttools/debugging/qscriptdebuggerresponse_p.h index f372994..645cab0 100644 --- a/src/scripttools/debugging/qscriptdebuggerresponse_p.h +++ b/src/scripttools/debugging/qscriptdebuggerresponse_p.h @@ -129,7 +129,7 @@ public: private: QScopedPointer<QScriptDebuggerResponsePrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerResponse) + Q_DECLARE_PRIVATE(QScriptDebuggerResponse) }; Q_AUTOTEST_EXPORT QDataStream &operator<<(QDataStream &, const QScriptDebuggerResponse &); diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp index 76f3a38..92fa36c 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp +++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp @@ -359,7 +359,7 @@ public: int commandId); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerScriptedConsoleCommandJob) + Q_DECLARE_PRIVATE(QScriptDebuggerScriptedConsoleCommandJob) Q_DISABLE_COPY(QScriptDebuggerScriptedConsoleCommandJob) }; diff --git a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h index cea8ec9..0fefea6 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h +++ b/src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand_p.h @@ -97,7 +97,7 @@ public: QScriptDebuggerCommandSchedulerInterface *commandScheduler); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerScriptedConsoleCommand) + Q_DECLARE_PRIVATE(QScriptDebuggerScriptedConsoleCommand) Q_DISABLE_COPY(QScriptDebuggerScriptedConsoleCommand) }; diff --git a/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h b/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h index 0e05d7e..1988ace 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h +++ b/src/scripttools/debugging/qscriptdebuggerscriptsmodel_p.h @@ -92,7 +92,7 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerScriptsModel) + Q_DECLARE_PRIVATE(QScriptDebuggerScriptsModel) Q_DISABLE_COPY(QScriptDebuggerScriptsModel) }; diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h index 4c17eda..4359ec1 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidget_p.h @@ -73,7 +73,7 @@ public: void setCurrentScript(qint64 id); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerScriptsWidget) + Q_DECLARE_PRIVATE(QScriptDebuggerScriptsWidget) Q_DISABLE_COPY(QScriptDebuggerScriptsWidget) Q_PRIVATE_SLOT(d_func(), void _q_onCurrentChanged(const QModelIndex &)) diff --git a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h index 8aa3203..eff08dc 100644 --- a/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerscriptswidgetinterface_p.h @@ -83,7 +83,7 @@ protected: QWidget *parent, Qt::WindowFlags flags); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerScriptsWidgetInterface) + Q_DECLARE_PRIVATE(QScriptDebuggerScriptsWidgetInterface) Q_DISABLE_COPY(QScriptDebuggerScriptsWidgetInterface) }; diff --git a/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h b/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h index 3075594..ff493f2 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h +++ b/src/scripttools/debugging/qscriptdebuggerstackmodel_p.h @@ -78,7 +78,7 @@ public: QVariant headerData(int section, Qt::Orientation, int role) const; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerStackModel) + Q_DECLARE_PRIVATE(QScriptDebuggerStackModel) Q_DISABLE_COPY(QScriptDebuggerStackModel) }; diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h index 4d8e6bc..eaa04f3 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h +++ b/src/scripttools/debugging/qscriptdebuggerstackwidget_p.h @@ -73,7 +73,7 @@ public: void setCurrentFrameIndex(int frameIndex); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerStackWidget) + Q_DECLARE_PRIVATE(QScriptDebuggerStackWidget) Q_DISABLE_COPY(QScriptDebuggerStackWidget) Q_PRIVATE_SLOT(d_func(), void _q_onCurrentChanged(const QModelIndex &)) diff --git a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h index bf1b698..d3c466c 100644 --- a/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebuggerstackwidgetinterface_p.h @@ -82,7 +82,7 @@ protected: QWidget *parent, Qt::WindowFlags flags); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerStackWidgetInterface) + Q_DECLARE_PRIVATE(QScriptDebuggerStackWidgetInterface) Q_DISABLE_COPY(QScriptDebuggerStackWidgetInterface) }; diff --git a/src/scripttools/debugging/qscriptdebuggervalue_p.h b/src/scripttools/debugging/qscriptdebuggervalue_p.h index 522f601..e701313 100644 --- a/src/scripttools/debugging/qscriptdebuggervalue_p.h +++ b/src/scripttools/debugging/qscriptdebuggervalue_p.h @@ -105,7 +105,7 @@ public: private: QScopedSharedPointer<QScriptDebuggerValuePrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerValue) + Q_DECLARE_PRIVATE(QScriptDebuggerValue) }; typedef QList<QScriptDebuggerValue> QScriptDebuggerValueList; diff --git a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h index af8b2d6..5e8f72a 100644 --- a/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h +++ b/src/scripttools/debugging/qscriptdebuggervalueproperty_p.h @@ -88,7 +88,7 @@ public: private: QScopedSharedPointer<QScriptDebuggerValuePropertyPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptDebuggerValueProperty) + Q_DECLARE_PRIVATE(QScriptDebuggerValueProperty) }; typedef QList<QScriptDebuggerValueProperty> QScriptDebuggerValuePropertyList; diff --git a/src/scripttools/debugging/qscriptdebugoutputwidget_p.h b/src/scripttools/debugging/qscriptdebugoutputwidget_p.h index e9fe112..21c7eb2 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidget_p.h +++ b/src/scripttools/debugging/qscriptdebugoutputwidget_p.h @@ -74,7 +74,7 @@ public: void clear(); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebugOutputWidget) + Q_DECLARE_PRIVATE(QScriptDebugOutputWidget) Q_DISABLE_COPY(QScriptDebugOutputWidget) }; diff --git a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h index 22f9443..6a124e4 100644 --- a/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h +++ b/src/scripttools/debugging/qscriptdebugoutputwidgetinterface_p.h @@ -75,7 +75,7 @@ protected: QWidget *parent, Qt::WindowFlags flags); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptDebugOutputWidgetInterface) + Q_DECLARE_PRIVATE(QScriptDebugOutputWidgetInterface) Q_DISABLE_COPY(QScriptDebugOutputWidgetInterface) }; diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h index f5fa5fc..b9061a2 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.h +++ b/src/scripttools/debugging/qscriptenginedebugger.h @@ -120,7 +120,7 @@ Q_SIGNALS: void evaluationResumed(); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptEngineDebugger) + Q_DECLARE_PRIVATE(QScriptEngineDebugger) Q_DISABLE_COPY(QScriptEngineDebugger) Q_PRIVATE_SLOT(d_func(), void _q_showStandardWindow()) diff --git a/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp b/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp index 6faad96..5b58c52 100644 --- a/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp +++ b/src/scripttools/debugging/qscriptenginedebuggerfrontend.cpp @@ -111,7 +111,7 @@ protected: void event(const QScriptDebuggerEvent &event); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptEngineDebuggerBackend) + Q_DECLARE_PRIVATE(QScriptEngineDebuggerBackend) Q_DISABLE_COPY(QScriptEngineDebuggerBackend) }; diff --git a/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h b/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h index 9320461..226fecc 100644 --- a/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h +++ b/src/scripttools/debugging/qscriptenginedebuggerfrontend_p.h @@ -80,7 +80,7 @@ protected: void processCommand(int id, const QScriptDebuggerCommand &command); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptEngineDebuggerFrontend) + Q_DECLARE_PRIVATE(QScriptEngineDebuggerFrontend) Q_DISABLE_COPY(QScriptEngineDebuggerFrontend) }; diff --git a/src/scripttools/debugging/qscripterrorlogwidget_p.h b/src/scripttools/debugging/qscripterrorlogwidget_p.h index f05b5fb..75d3e57 100644 --- a/src/scripttools/debugging/qscripterrorlogwidget_p.h +++ b/src/scripttools/debugging/qscripterrorlogwidget_p.h @@ -74,7 +74,7 @@ public: void clear(); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptErrorLogWidget) + Q_DECLARE_PRIVATE(QScriptErrorLogWidget) Q_DISABLE_COPY(QScriptErrorLogWidget) }; diff --git a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h index 903bc21..0ce86ff 100644 --- a/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h +++ b/src/scripttools/debugging/qscripterrorlogwidgetinterface_p.h @@ -75,7 +75,7 @@ protected: QWidget *parent, Qt::WindowFlags flags); private: - Q_DECLARE_SCOPED_PRIVATE(QScriptErrorLogWidgetInterface) + Q_DECLARE_PRIVATE(QScriptErrorLogWidgetInterface) Q_DISABLE_COPY(QScriptErrorLogWidgetInterface) }; diff --git a/src/scripttools/debugging/qscriptscriptdata_p.h b/src/scripttools/debugging/qscriptscriptdata_p.h index 750bd2a..d5ef52d 100644 --- a/src/scripttools/debugging/qscriptscriptdata_p.h +++ b/src/scripttools/debugging/qscriptscriptdata_p.h @@ -93,7 +93,7 @@ public: private: QScopedSharedPointer<QScriptScriptDataPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptScriptData) + Q_DECLARE_PRIVATE(QScriptScriptData) }; typedef QMap<qint64, QScriptScriptData> QScriptScriptMap; diff --git a/src/scripttools/debugging/qscriptstdmessagehandler_p.h b/src/scripttools/debugging/qscriptstdmessagehandler_p.h index 10accc2..6242c94 100644 --- a/src/scripttools/debugging/qscriptstdmessagehandler_p.h +++ b/src/scripttools/debugging/qscriptstdmessagehandler_p.h @@ -76,7 +76,7 @@ private: QScopedPointer<QScriptStdMessageHandlerPrivate> d_ptr; private: - Q_DECLARE_SCOPED_PRIVATE(QScriptStdMessageHandler) + Q_DECLARE_PRIVATE(QScriptStdMessageHandler) Q_DISABLE_COPY(QScriptStdMessageHandler) }; diff --git a/src/scripttools/debugging/qscriptvalueproperty_p.h b/src/scripttools/debugging/qscriptvalueproperty_p.h index 545047d..b752272 100644 --- a/src/scripttools/debugging/qscriptvalueproperty_p.h +++ b/src/scripttools/debugging/qscriptvalueproperty_p.h @@ -84,7 +84,7 @@ public: private: QScopedSharedPointer<QScriptValuePropertyPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QScriptValueProperty) + Q_DECLARE_PRIVATE(QScriptValueProperty) }; typedef QList<QScriptValueProperty> QScriptValuePropertyList; diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h index b411d65..3052be6 100644 --- a/src/sql/kernel/qsqldriver.h +++ b/src/sql/kernel/qsqldriver.h @@ -69,7 +69,7 @@ class Q_SQL_EXPORT QSqlDriver : public QObject { friend class QSqlDatabase; Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QSqlDriver) + Q_DECLARE_PRIVATE(QSqlDriver) public: enum DriverFeature { Transactions, QuerySize, BLOB, Unicode, PreparedQueries, diff --git a/src/sql/models/qsqlquerymodel.h b/src/sql/models/qsqlquerymodel.h index bf99634..c81fa2c 100644 --- a/src/sql/models/qsqlquerymodel.h +++ b/src/sql/models/qsqlquerymodel.h @@ -59,7 +59,7 @@ class QSqlQuery; class Q_SQL_EXPORT QSqlQueryModel: public QAbstractTableModel { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QSqlQueryModel) + Q_DECLARE_PRIVATE(QSqlQueryModel) public: explicit QSqlQueryModel(QObject *parent = 0); diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h index fa060b8..f476a48 100644 --- a/src/sql/models/qsqlrelationaltablemodel.h +++ b/src/sql/models/qsqlrelationaltablemodel.h @@ -102,7 +102,7 @@ protected: QString orderByClause() const; private: - Q_DECLARE_SCOPED_PRIVATE(QSqlRelationalTableModel) + Q_DECLARE_PRIVATE(QSqlRelationalTableModel) }; QT_END_NAMESPACE diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h index 3e539be..a6f4469 100644 --- a/src/sql/models/qsqltablemodel.h +++ b/src/sql/models/qsqltablemodel.h @@ -59,7 +59,7 @@ class QSqlIndex; class Q_SQL_EXPORT QSqlTableModel: public QSqlQueryModel { Q_OBJECT - Q_DECLARE_SCOPED_PRIVATE(QSqlTableModel) + Q_DECLARE_PRIVATE(QSqlTableModel) public: enum EditStrategy {OnFieldChange, OnRowChange, OnManualSubmit}; diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h index 9a41e9b..e7ef4b3 100644 --- a/src/svg/qgraphicssvgitem.h +++ b/src/svg/qgraphicssvgitem.h @@ -87,7 +87,7 @@ public: private: Q_DISABLE_COPY(QGraphicsSvgItem) - // Q_DECLARE_SCOPED_PRIVATE_WITH_BASE(QGraphicsSvgItem, QObject) + // Q_DECLARE_PRIVATE_WITH_BASE(QGraphicsSvgItem, QObject) inline QGraphicsSvgItemPrivate *d_func() { return reinterpret_cast<QGraphicsSvgItemPrivate *>(QObject::d_ptr.data()); } inline const QGraphicsSvgItemPrivate *d_func() const diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp index b5c56cd..9486479 100644 --- a/src/svg/qsvggenerator.cpp +++ b/src/svg/qsvggenerator.cpp @@ -155,7 +155,7 @@ static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures() class QSvgPaintEngine : public QPaintEngine { - Q_DECLARE_SCOPED_PRIVATE(QSvgPaintEngine) + Q_DECLARE_PRIVATE(QSvgPaintEngine) public: QSvgPaintEngine() diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h index 951cee1..5b60a05 100644 --- a/src/svg/qsvggenerator.h +++ b/src/svg/qsvggenerator.h @@ -61,7 +61,7 @@ class QSvgGeneratorPrivate; class Q_SVG_EXPORT QSvgGenerator : public QPaintDevice { - Q_DECLARE_SCOPED_PRIVATE(QSvgGenerator) + Q_DECLARE_PRIVATE(QSvgGenerator) Q_PROPERTY(QSize size READ size WRITE setSize) Q_PROPERTY(QRectF viewBox READ viewBoxF WRITE setViewBox) diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h index 2b9a4f7..78e8a7e 100644 --- a/src/svg/qsvgrenderer.h +++ b/src/svg/qsvgrenderer.h @@ -109,7 +109,7 @@ Q_SIGNALS: void repaintNeeded(); private: - Q_DECLARE_SCOPED_PRIVATE(QSvgRenderer) + Q_DECLARE_PRIVATE(QSvgRenderer) }; QT_END_NAMESPACE diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h index 1a2cdd1..ccf66bb 100644 --- a/src/svg/qsvgwidget.h +++ b/src/svg/qsvgwidget.h @@ -74,7 +74,7 @@ protected: void paintEvent(QPaintEvent *event); private: Q_DISABLE_COPY(QSvgWidget) - Q_DECLARE_SCOPED_PRIVATE(QSvgWidget) + Q_DECLARE_PRIVATE(QSvgWidget) }; QT_END_NAMESPACE diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index 788f2e8..18dc332 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -272,7 +272,7 @@ public: private: Q_DISABLE_COPY(QXmlSimpleReader) - Q_DECLARE_SCOPED_PRIVATE(QXmlSimpleReader) + Q_DECLARE_PRIVATE(QXmlSimpleReader) QScopedPointer<QXmlSimpleReaderPrivate> d_ptr; friend class QXmlSimpleReaderLocator; diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h index 2c26143..21c6fe5 100644 --- a/src/xmlpatterns/api/qabstractmessagehandler.h +++ b/src/xmlpatterns/api/qabstractmessagehandler.h @@ -70,7 +70,7 @@ protected: const QUrl &identifier, const QSourceLocation &sourceLocation) = 0; private: - Q_DECLARE_SCOPED_PRIVATE(QAbstractMessageHandler) + Q_DECLARE_PRIVATE(QAbstractMessageHandler) Q_DISABLE_COPY(QAbstractMessageHandler) }; diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h index db545ea..c341ac2c 100644 --- a/src/xmlpatterns/api/qabstracturiresolver.h +++ b/src/xmlpatterns/api/qabstracturiresolver.h @@ -64,7 +64,7 @@ public: private: Q_DISABLE_COPY(QAbstractUriResolver) - Q_DECLARE_SCOPED_PRIVATE(QAbstractUriResolver) + Q_DECLARE_PRIVATE(QAbstractUriResolver) }; QT_END_NAMESPACE diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.h b/src/xmlpatterns/api/qsimplexmlnodemodel.h index 3098604..1c70159 100644 --- a/src/xmlpatterns/api/qsimplexmlnodemodel.h +++ b/src/xmlpatterns/api/qsimplexmlnodemodel.h @@ -67,7 +67,7 @@ public: virtual QVector<QXmlNodeModelIndex> nodesByIdref(const QXmlName &idref) const; private: - Q_DECLARE_SCOPED_PRIVATE(QSimpleXmlNodeModel) + Q_DECLARE_PRIVATE(QSimpleXmlNodeModel) }; QT_END_NAMESPACE diff --git a/src/xmlpatterns/api/qxmlformatter.h b/src/xmlpatterns/api/qxmlformatter.h index ca65331..9bec06d 100644 --- a/src/xmlpatterns/api/qxmlformatter.h +++ b/src/xmlpatterns/api/qxmlformatter.h @@ -84,7 +84,7 @@ public: virtual void item(const QPatternist::Item &item); private: inline void startFormattingContent(); - Q_DECLARE_SCOPED_PRIVATE(QXmlFormatter) + Q_DECLARE_PRIVATE(QXmlFormatter) }; QT_END_NAMESPACE diff --git a/src/xmlpatterns/api/qxmlresultitems.h b/src/xmlpatterns/api/qxmlresultitems.h index ad222ed..6fc8d52 100644 --- a/src/xmlpatterns/api/qxmlresultitems.h +++ b/src/xmlpatterns/api/qxmlresultitems.h @@ -66,7 +66,7 @@ public: private: friend class QXmlQuery; - Q_DECLARE_SCOPED_PRIVATE(QXmlResultItems) + Q_DECLARE_PRIVATE(QXmlResultItems) QScopedPointer<QXmlResultItemsPrivate> d_ptr; Q_DISABLE_COPY(QXmlResultItems) }; diff --git a/src/xmlpatterns/api/qxmlserializer.h b/src/xmlpatterns/api/qxmlserializer.h index 2fcc454..d46a566 100644 --- a/src/xmlpatterns/api/qxmlserializer.h +++ b/src/xmlpatterns/api/qxmlserializer.h @@ -148,7 +148,7 @@ private: */ inline void write(const QString &content); - Q_DECLARE_SCOPED_PRIVATE(QXmlSerializer) + Q_DECLARE_PRIVATE(QXmlSerializer) }; QT_END_NAMESPACE diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index e4f1ddd..86bf237 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -1358,7 +1358,7 @@ void tst_QFiledialog::heapCorruption() struct FriendlyQFileDialog : public QFileDialog { friend class tst_QFileDialog; - Q_DECLARE_SCOPED_PRIVATE(QFileDialog) + Q_DECLARE_PRIVATE(QFileDialog) }; diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp index 5337de6..72841bb 100644 --- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp +++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp @@ -772,7 +772,7 @@ void tst_QFileSystemModel::setData() class MyFriendFileSystemModel : public QFileSystemModel { friend class tst_QFileSystemModel; - Q_DECLARE_SCOPED_PRIVATE(QFileSystemModel) + Q_DECLARE_PRIVATE(QFileSystemModel) }; void tst_QFileSystemModel::sort_data() diff --git a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp index f08b89a..794c5e6 100644 --- a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp +++ b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp @@ -1468,7 +1468,7 @@ static QModelIndex indexFromText(QStandardItemModel *model, const QString &text) struct FriendlyTreeView : public QTreeView { friend class tst_QStandardItemModel; - Q_DECLARE_SCOPED_PRIVATE(QTreeView) + Q_DECLARE_PRIVATE(QTreeView) }; #endif diff --git a/tools/designer/src/components/formeditor/brushmanagerproxy.h b/tools/designer/src/components/formeditor/brushmanagerproxy.h index 9314120..bfd95e5 100644 --- a/tools/designer/src/components/formeditor/brushmanagerproxy.h +++ b/tools/designer/src/components/formeditor/brushmanagerproxy.h @@ -64,7 +64,7 @@ public: private: QScopedPointer<BrushManagerProxyPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(BrushManagerProxy) + Q_DECLARE_PRIVATE(BrushManagerProxy) Q_DISABLE_COPY(BrushManagerProxy) Q_PRIVATE_SLOT(d_func(), void brushAdded(const QString &, const QBrush &)) Q_PRIVATE_SLOT(d_func(), void brushRemoved(const QString &name)) diff --git a/tools/designer/src/components/formeditor/qtbrushmanager.h b/tools/designer/src/components/formeditor/qtbrushmanager.h index e6ced60..4884c577 100644 --- a/tools/designer/src/components/formeditor/qtbrushmanager.h +++ b/tools/designer/src/components/formeditor/qtbrushmanager.h @@ -78,7 +78,7 @@ signals: private: QScopedPointer<QtBrushManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtBrushManager) + Q_DECLARE_PRIVATE(QtBrushManager) Q_DISABLE_COPY(QtBrushManager) }; diff --git a/tools/designer/src/lib/shared/iconselector_p.h b/tools/designer/src/lib/shared/iconselector_p.h index e91a21e..9190d54 100644 --- a/tools/designer/src/lib/shared/iconselector_p.h +++ b/tools/designer/src/lib/shared/iconselector_p.h @@ -88,7 +88,7 @@ public: private: QScopedPointer<class LanguageResourceDialogPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(LanguageResourceDialog) + Q_DECLARE_PRIVATE(LanguageResourceDialog) Q_DISABLE_COPY(LanguageResourceDialog) Q_PRIVATE_SLOT(d_func(), void slotAccepted()) Q_PRIVATE_SLOT(d_func(), void slotPathChanged(QString)) @@ -121,7 +121,7 @@ signals: void iconChanged(const PropertySheetIconValue &icon); private: QScopedPointer<class IconSelectorPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(IconSelector) + Q_DECLARE_PRIVATE(IconSelector) Q_DISABLE_COPY(IconSelector) Q_PRIVATE_SLOT(d_func(), void slotStateActivated()) diff --git a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h index 59c5ca6..6eac2b8 100644 --- a/tools/designer/src/lib/shared/qtresourceeditordialog_p.h +++ b/tools/designer/src/lib/shared/qtresourceeditordialog_p.h @@ -85,7 +85,7 @@ private: ~QtResourceEditorDialog(); QScopedPointer<class QtResourceEditorDialogPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtResourceEditorDialog) + Q_DECLARE_PRIVATE(QtResourceEditorDialog) Q_DISABLE_COPY(QtResourceEditorDialog) Q_PRIVATE_SLOT(d_func(), void slotQrcFileInserted(QtQrcFile *)) diff --git a/tools/designer/src/lib/shared/qtresourcemodel_p.h b/tools/designer/src/lib/shared/qtresourcemodel_p.h index 22e98bb..e9f1c93 100644 --- a/tools/designer/src/lib/shared/qtresourcemodel_p.h +++ b/tools/designer/src/lib/shared/qtresourcemodel_p.h @@ -89,7 +89,7 @@ private: friend class QtResourceModel; QScopedPointer<class QtResourceSetPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtResourceSet) + Q_DECLARE_PRIVATE(QtResourceSet) Q_DISABLE_COPY(QtResourceSet) }; @@ -134,7 +134,7 @@ private: friend class QtResourceSet; QScopedPointer<class QtResourceModelPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtResourceModel) + Q_DECLARE_PRIVATE(QtResourceModel) Q_DISABLE_COPY(QtResourceModel) Q_PRIVATE_SLOT(d_func(), void slotFileChanged(const QString &)) diff --git a/tools/designer/src/lib/shared/qtresourceview_p.h b/tools/designer/src/lib/shared/qtresourceview_p.h index 82bb8d8..0484686 100644 --- a/tools/designer/src/lib/shared/qtresourceview_p.h +++ b/tools/designer/src/lib/shared/qtresourceview_p.h @@ -103,7 +103,7 @@ protected: private: QScopedPointer<class QtResourceViewPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtResourceView) + Q_DECLARE_PRIVATE(QtResourceView) Q_DISABLE_COPY(QtResourceView) Q_PRIVATE_SLOT(d_func(), void slotResourceSetActivated(QtResourceSet *)) Q_PRIVATE_SLOT(d_func(), void slotCurrentPathChanged(QTreeWidgetItem *)) @@ -131,7 +131,7 @@ public: private: QScopedPointer<class QtResourceViewDialogPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtResourceViewDialog) + Q_DECLARE_PRIVATE(QtResourceViewDialog) Q_DISABLE_COPY(QtResourceViewDialog) Q_PRIVATE_SLOT(d_func(), void slotResourceSelected(const QString &)) }; diff --git a/tools/designer/src/uitools/quiloader.h b/tools/designer/src/uitools/quiloader.h index 7f718a6..40b5010 100644 --- a/tools/designer/src/uitools/quiloader.h +++ b/tools/designer/src/uitools/quiloader.h @@ -92,7 +92,7 @@ public: private: QScopedPointer<QUiLoaderPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QUiLoader) + Q_DECLARE_PRIVATE(QUiLoader) Q_DISABLE_COPY(QUiLoader) }; diff --git a/tools/shared/qtgradienteditor/qtcolorbutton.h b/tools/shared/qtgradienteditor/qtcolorbutton.h index 5f34815..0348998 100644 --- a/tools/shared/qtgradienteditor/qtcolorbutton.h +++ b/tools/shared/qtgradienteditor/qtcolorbutton.h @@ -76,7 +76,7 @@ protected: #endif private: QScopedPointer<class QtColorButtonPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtColorButton) + Q_DECLARE_PRIVATE(QtColorButton) Q_DISABLE_COPY(QtColorButton) Q_PRIVATE_SLOT(d_func(), void slotEditColor()) }; diff --git a/tools/shared/qtgradienteditor/qtcolorline.h b/tools/shared/qtgradienteditor/qtcolorline.h index f54ec70..ffd3eea 100644 --- a/tools/shared/qtgradienteditor/qtcolorline.h +++ b/tools/shared/qtgradienteditor/qtcolorline.h @@ -115,7 +115,7 @@ protected: private: QScopedPointer<class QtColorLinePrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtColorLine) + Q_DECLARE_PRIVATE(QtColorLine) Q_DISABLE_COPY(QtColorLine) }; diff --git a/tools/shared/qtgradienteditor/qtgradientdialog.h b/tools/shared/qtgradienteditor/qtgradientdialog.h index 6f40794..f293a28 100644 --- a/tools/shared/qtgradienteditor/qtgradientdialog.h +++ b/tools/shared/qtgradienteditor/qtgradientdialog.h @@ -77,7 +77,7 @@ public: private: QScopedPointer<class QtGradientDialogPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientDialog) + Q_DECLARE_PRIVATE(QtGradientDialog) Q_DISABLE_COPY(QtGradientDialog) Q_PRIVATE_SLOT(d_func(), void slotAboutToShowDetails(bool details, int extensionWidthHint)) }; diff --git a/tools/shared/qtgradienteditor/qtgradienteditor.h b/tools/shared/qtgradienteditor/qtgradienteditor.h index b7dcfd3..2d96515 100644 --- a/tools/shared/qtgradienteditor/qtgradienteditor.h +++ b/tools/shared/qtgradienteditor/qtgradienteditor.h @@ -79,7 +79,7 @@ signals: private: QScopedPointer<class QtGradientEditorPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientEditor) + Q_DECLARE_PRIVATE(QtGradientEditor) Q_DISABLE_COPY(QtGradientEditor) Q_PRIVATE_SLOT(d_func(), void slotGradientStopsChanged(const QGradientStops &stops)) Q_PRIVATE_SLOT(d_func(), void slotTypeChanged(int type)) diff --git a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h index 94a5619..7c6a660 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopscontroller.h +++ b/tools/shared/qtgradienteditor/qtgradientstopscontroller.h @@ -71,7 +71,7 @@ signals: private: QScopedPointer<class QtGradientStopsControllerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsController) + Q_DECLARE_PRIVATE(QtGradientStopsController) Q_DISABLE_COPY(QtGradientStopsController) Q_PRIVATE_SLOT(d_func(), void slotHsvClicked()) Q_PRIVATE_SLOT(d_func(), void slotRgbClicked()) diff --git a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h index 8190829..a02ebc5 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopsmodel.h +++ b/tools/shared/qtgradienteditor/qtgradientstopsmodel.h @@ -112,7 +112,7 @@ signals: private: QScopedPointer<class QtGradientStopsModelPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsModel) + Q_DECLARE_PRIVATE(QtGradientStopsModel) Q_DISABLE_COPY(QtGradientStopsModel) }; diff --git a/tools/shared/qtgradienteditor/qtgradientstopswidget.h b/tools/shared/qtgradienteditor/qtgradientstopswidget.h index 7c7c5fc..753d695 100644 --- a/tools/shared/qtgradienteditor/qtgradientstopswidget.h +++ b/tools/shared/qtgradienteditor/qtgradientstopswidget.h @@ -92,7 +92,7 @@ protected: private: QScopedPointer<QtGradientStopsWidgetPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientStopsWidget) + Q_DECLARE_PRIVATE(QtGradientStopsWidget) Q_DISABLE_COPY(QtGradientStopsWidget) Q_PRIVATE_SLOT(d_func(), void slotStopAdded(QtGradientStop *stop)) Q_PRIVATE_SLOT(d_func(), void slotStopRemoved(QtGradientStop *stop)) diff --git a/tools/shared/qtgradienteditor/qtgradientwidget.h b/tools/shared/qtgradienteditor/qtgradientwidget.h index 52fdcbb..3e23bf9 100644 --- a/tools/shared/qtgradienteditor/qtgradientwidget.h +++ b/tools/shared/qtgradienteditor/qtgradientwidget.h @@ -111,7 +111,7 @@ protected: private: QScopedPointer<class QtGradientWidgetPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGradientWidget) + Q_DECLARE_PRIVATE(QtGradientWidget) Q_DISABLE_COPY(QtGradientWidget) }; diff --git a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h index 13d37e2..a558657 100644 --- a/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h @@ -72,7 +72,7 @@ protected: private: QScopedPointer<QtButtonPropertyBrowserPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtButtonPropertyBrowser) + Q_DECLARE_PRIVATE(QtButtonPropertyBrowser) Q_DISABLE_COPY(QtButtonPropertyBrowser) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) diff --git a/tools/shared/qtpropertybrowser/qteditorfactory.h b/tools/shared/qtpropertybrowser/qteditorfactory.h index ec30f9d..bad2080 100644 --- a/tools/shared/qtpropertybrowser/qteditorfactory.h +++ b/tools/shared/qtpropertybrowser/qteditorfactory.h @@ -61,7 +61,7 @@ protected: void disconnectPropertyManager(QtIntPropertyManager *manager); private: QScopedPointer<QtSpinBoxFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtSpinBoxFactory) + Q_DECLARE_PRIVATE(QtSpinBoxFactory) Q_DISABLE_COPY(QtSpinBoxFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) @@ -85,7 +85,7 @@ protected: void disconnectPropertyManager(QtIntPropertyManager *manager); private: QScopedPointer<QtSliderFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtSliderFactory) + Q_DECLARE_PRIVATE(QtSliderFactory) Q_DISABLE_COPY(QtSliderFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) @@ -109,7 +109,7 @@ protected: void disconnectPropertyManager(QtIntPropertyManager *manager); private: QScopedPointer<QtScrollBarFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtScrollBarFactory) + Q_DECLARE_PRIVATE(QtScrollBarFactory) Q_DISABLE_COPY(QtScrollBarFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, int, int)) @@ -133,7 +133,7 @@ protected: void disconnectPropertyManager(QtBoolPropertyManager *manager); private: QScopedPointer<QtCheckBoxFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtCheckBoxFactory) + Q_DECLARE_PRIVATE(QtCheckBoxFactory) Q_DISABLE_COPY(QtCheckBoxFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, bool)) Q_PRIVATE_SLOT(d_func(), void slotSetValue(bool)) @@ -155,7 +155,7 @@ protected: void disconnectPropertyManager(QtDoublePropertyManager *manager); private: QScopedPointer<QtDoubleSpinBoxFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDoubleSpinBoxFactory) + Q_DECLARE_PRIVATE(QtDoubleSpinBoxFactory) Q_DISABLE_COPY(QtDoubleSpinBoxFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, double)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, double, double)) @@ -180,7 +180,7 @@ protected: void disconnectPropertyManager(QtStringPropertyManager *manager); private: QScopedPointer<QtLineEditFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtLineEditFactory) + Q_DECLARE_PRIVATE(QtLineEditFactory) Q_DISABLE_COPY(QtLineEditFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QString &)) Q_PRIVATE_SLOT(d_func(), void slotRegExpChanged(QtProperty *, const QRegExp &)) @@ -203,7 +203,7 @@ protected: void disconnectPropertyManager(QtDatePropertyManager *manager); private: QScopedPointer<QtDateEditFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDateEditFactory) + Q_DECLARE_PRIVATE(QtDateEditFactory) Q_DISABLE_COPY(QtDateEditFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDate &)) Q_PRIVATE_SLOT(d_func(), void slotRangeChanged(QtProperty *, @@ -227,7 +227,7 @@ protected: void disconnectPropertyManager(QtTimePropertyManager *manager); private: QScopedPointer<QtTimeEditFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtTimeEditFactory) + Q_DECLARE_PRIVATE(QtTimeEditFactory) Q_DISABLE_COPY(QtTimeEditFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QTime &)) Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QTime &)) @@ -249,7 +249,7 @@ protected: void disconnectPropertyManager(QtDateTimePropertyManager *manager); private: QScopedPointer<QtDateTimeEditFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDateTimeEditFactory) + Q_DECLARE_PRIVATE(QtDateTimeEditFactory) Q_DISABLE_COPY(QtDateTimeEditFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QDateTime &)) Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QDateTime &)) @@ -271,7 +271,7 @@ protected: void disconnectPropertyManager(QtKeySequencePropertyManager *manager); private: QScopedPointer<QtKeySequenceEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtKeySequenceEditorFactory) + Q_DECLARE_PRIVATE(QtKeySequenceEditorFactory) Q_DISABLE_COPY(QtKeySequenceEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QKeySequence &)) Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QKeySequence &)) @@ -293,7 +293,7 @@ protected: void disconnectPropertyManager(QtCharPropertyManager *manager); private: QScopedPointer<QtCharEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtCharEditorFactory) + Q_DECLARE_PRIVATE(QtCharEditorFactory) Q_DISABLE_COPY(QtCharEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QChar &)) Q_PRIVATE_SLOT(d_func(), void slotSetValue(const QChar &)) @@ -315,7 +315,7 @@ protected: void disconnectPropertyManager(QtEnumPropertyManager *manager); private: QScopedPointer<QtEnumEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtEnumEditorFactory) + Q_DECLARE_PRIVATE(QtEnumEditorFactory) Q_DISABLE_COPY(QtEnumEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotEnumNamesChanged(QtProperty *, @@ -341,7 +341,7 @@ protected: void disconnectPropertyManager(QtCursorPropertyManager *manager); private: QScopedPointer<QtCursorEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtCursorEditorFactory) + Q_DECLARE_PRIVATE(QtCursorEditorFactory) Q_DISABLE_COPY(QtCursorEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QCursor &)) Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) @@ -363,7 +363,7 @@ protected: void disconnectPropertyManager(QtColorPropertyManager *manager); private: QScopedPointer<QtColorEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtColorEditorFactory) + Q_DECLARE_PRIVATE(QtColorEditorFactory) Q_DISABLE_COPY(QtColorEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QColor &)) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) @@ -385,7 +385,7 @@ protected: void disconnectPropertyManager(QtFontPropertyManager *manager); private: QScopedPointer<QtFontEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtFontEditorFactory) + Q_DECLARE_PRIVATE(QtFontEditorFactory) Q_DISABLE_COPY(QtFontEditorFactory) Q_PRIVATE_SLOT(d_func(), void slotPropertyChanged(QtProperty *, const QFont &)) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed(QObject *)) diff --git a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h index 5124fd5..1cfda63 100644 --- a/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h @@ -64,7 +64,7 @@ protected: private: QScopedPointer<QtGroupBoxPropertyBrowserPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtGroupBoxPropertyBrowser) + Q_DECLARE_PRIVATE(QtGroupBoxPropertyBrowser) Q_DISABLE_COPY(QtGroupBoxPropertyBrowser) Q_PRIVATE_SLOT(d_func(), void slotUpdate()) Q_PRIVATE_SLOT(d_func(), void slotEditorDestroyed()) diff --git a/tools/shared/qtpropertybrowser/qtpropertybrowser.h b/tools/shared/qtpropertybrowser/qtpropertybrowser.h index dfcb65a..19996c0 100644 --- a/tools/shared/qtpropertybrowser/qtpropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qtpropertybrowser.h @@ -119,7 +119,7 @@ protected: private: friend class QtProperty; QScopedPointer<QtAbstractPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtAbstractPropertyManager) + Q_DECLARE_PRIVATE(QtAbstractPropertyManager) Q_DISABLE_COPY(QtAbstractPropertyManager) }; @@ -293,7 +293,7 @@ private: QtAbstractEditorFactoryBase *abstractFactory); QScopedPointer<QtAbstractPropertyBrowserPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtAbstractPropertyBrowser) + Q_DECLARE_PRIVATE(QtAbstractPropertyBrowser) Q_DISABLE_COPY(QtAbstractPropertyBrowser) Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) diff --git a/tools/shared/qtpropertybrowser/qtpropertymanager.h b/tools/shared/qtpropertybrowser/qtpropertymanager.h index 14b71fb..31c308e 100644 --- a/tools/shared/qtpropertybrowser/qtpropertymanager.h +++ b/tools/shared/qtpropertybrowser/qtpropertymanager.h @@ -95,7 +95,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtIntPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtIntPropertyManager) + Q_DECLARE_PRIVATE(QtIntPropertyManager) Q_DISABLE_COPY(QtIntPropertyManager) }; @@ -121,7 +121,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtBoolPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtBoolPropertyManager) + Q_DECLARE_PRIVATE(QtBoolPropertyManager) Q_DISABLE_COPY(QtBoolPropertyManager) }; @@ -158,7 +158,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtDoublePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDoublePropertyManager) + Q_DECLARE_PRIVATE(QtDoublePropertyManager) Q_DISABLE_COPY(QtDoublePropertyManager) }; @@ -186,7 +186,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtStringPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtStringPropertyManager) + Q_DECLARE_PRIVATE(QtStringPropertyManager) Q_DISABLE_COPY(QtStringPropertyManager) }; @@ -217,7 +217,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtDatePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDatePropertyManager) + Q_DECLARE_PRIVATE(QtDatePropertyManager) Q_DISABLE_COPY(QtDatePropertyManager) }; @@ -242,7 +242,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtTimePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtTimePropertyManager) + Q_DECLARE_PRIVATE(QtTimePropertyManager) Q_DISABLE_COPY(QtTimePropertyManager) }; @@ -267,7 +267,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtDateTimePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtDateTimePropertyManager) + Q_DECLARE_PRIVATE(QtDateTimePropertyManager) Q_DISABLE_COPY(QtDateTimePropertyManager) }; @@ -292,7 +292,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtKeySequencePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtKeySequencePropertyManager) + Q_DECLARE_PRIVATE(QtKeySequencePropertyManager) Q_DISABLE_COPY(QtKeySequencePropertyManager) }; @@ -317,7 +317,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtCharPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtCharPropertyManager) + Q_DECLARE_PRIVATE(QtCharPropertyManager) Q_DISABLE_COPY(QtCharPropertyManager) }; @@ -345,7 +345,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtLocalePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtLocalePropertyManager) + Q_DECLARE_PRIVATE(QtLocalePropertyManager) Q_DISABLE_COPY(QtLocalePropertyManager) Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -374,7 +374,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtPointPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtPointPropertyManager) + Q_DECLARE_PRIVATE(QtPointPropertyManager) Q_DISABLE_COPY(QtPointPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -406,7 +406,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtPointFPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtPointFPropertyManager) + Q_DECLARE_PRIVATE(QtPointFPropertyManager) Q_DISABLE_COPY(QtPointFPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -441,7 +441,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtSizePropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtSizePropertyManager) + Q_DECLARE_PRIVATE(QtSizePropertyManager) Q_DISABLE_COPY(QtSizePropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -479,7 +479,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtSizeFPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtSizeFPropertyManager) + Q_DECLARE_PRIVATE(QtSizeFPropertyManager) Q_DISABLE_COPY(QtSizeFPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -511,7 +511,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtRectPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtRectPropertyManager) + Q_DECLARE_PRIVATE(QtRectPropertyManager) Q_DISABLE_COPY(QtRectPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -546,7 +546,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtRectFPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtRectFPropertyManager) + Q_DECLARE_PRIVATE(QtRectFPropertyManager) Q_DISABLE_COPY(QtRectFPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotDoubleChanged(QtProperty *, double)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -580,7 +580,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtEnumPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtEnumPropertyManager) + Q_DECLARE_PRIVATE(QtEnumPropertyManager) Q_DISABLE_COPY(QtEnumPropertyManager) }; @@ -610,7 +610,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtFlagPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtFlagPropertyManager) + Q_DECLARE_PRIVATE(QtFlagPropertyManager) Q_DISABLE_COPY(QtFlagPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotBoolChanged(QtProperty *, bool)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -640,7 +640,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtSizePolicyPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtSizePolicyPropertyManager) + Q_DECLARE_PRIVATE(QtSizePolicyPropertyManager) Q_DISABLE_COPY(QtSizePolicyPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) @@ -673,7 +673,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtFontPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtFontPropertyManager) + Q_DECLARE_PRIVATE(QtFontPropertyManager) Q_DISABLE_COPY(QtFontPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotEnumChanged(QtProperty *, int)) @@ -707,7 +707,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtColorPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtColorPropertyManager) + Q_DECLARE_PRIVATE(QtColorPropertyManager) Q_DISABLE_COPY(QtColorPropertyManager) Q_PRIVATE_SLOT(d_func(), void slotIntChanged(QtProperty *, int)) Q_PRIVATE_SLOT(d_func(), void slotPropertyDestroyed(QtProperty *)) @@ -737,7 +737,7 @@ protected: virtual void uninitializeProperty(QtProperty *property); private: QScopedPointer<QtCursorPropertyManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtCursorPropertyManager) + Q_DECLARE_PRIVATE(QtCursorPropertyManager) Q_DISABLE_COPY(QtCursorPropertyManager) }; diff --git a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h index 4994bfc..ebcf185 100644 --- a/tools/shared/qtpropertybrowser/qttreepropertybrowser.h +++ b/tools/shared/qtpropertybrowser/qttreepropertybrowser.h @@ -119,7 +119,7 @@ protected: private: QScopedPointer<QtTreePropertyBrowserPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtTreePropertyBrowser) + Q_DECLARE_PRIVATE(QtTreePropertyBrowser) Q_DISABLE_COPY(QtTreePropertyBrowser) Q_PRIVATE_SLOT(d_func(), void slotCollapsed(const QModelIndex &)) diff --git a/tools/shared/qtpropertybrowser/qtvariantproperty.h b/tools/shared/qtpropertybrowser/qtvariantproperty.h index f4f45da..4f32c57 100644 --- a/tools/shared/qtpropertybrowser/qtvariantproperty.h +++ b/tools/shared/qtpropertybrowser/qtvariantproperty.h @@ -149,7 +149,7 @@ private: Q_PRIVATE_SLOT(d_func(), void slotPropertyInserted(QtProperty *, QtProperty *, QtProperty *)) Q_PRIVATE_SLOT(d_func(), void slotPropertyRemoved(QtProperty *, QtProperty *)) - Q_DECLARE_SCOPED_PRIVATE(QtVariantPropertyManager) + Q_DECLARE_PRIVATE(QtVariantPropertyManager) Q_DISABLE_COPY(QtVariantPropertyManager) }; @@ -166,7 +166,7 @@ protected: void disconnectPropertyManager(QtVariantPropertyManager *manager); private: QScopedPointer<class QtVariantEditorFactoryPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtVariantEditorFactory) + Q_DECLARE_PRIVATE(QtVariantEditorFactory) Q_DISABLE_COPY(QtVariantEditorFactory) }; diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.cpp b/tools/shared/qttoolbardialog/qttoolbardialog.cpp index 0c4622f..8ceb582 100644 --- a/tools/shared/qttoolbardialog/qttoolbardialog.cpp +++ b/tools/shared/qttoolbardialog/qttoolbardialog.cpp @@ -120,7 +120,7 @@ signals: private: QScopedPointer<QtFullToolBarManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtFullToolBarManager) + Q_DECLARE_PRIVATE(QtFullToolBarManager) Q_DISABLE_COPY(QtFullToolBarManager) }; diff --git a/tools/shared/qttoolbardialog/qttoolbardialog.h b/tools/shared/qttoolbardialog/qttoolbardialog.h index d3f7396..9227b56 100644 --- a/tools/shared/qttoolbardialog/qttoolbardialog.h +++ b/tools/shared/qttoolbardialog/qttoolbardialog.h @@ -89,7 +89,7 @@ private: friend class QtToolBarDialog; QScopedPointer<QtToolBarManagerPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtToolBarManager) + Q_DECLARE_PRIVATE(QtToolBarManager) Q_DISABLE_COPY(QtToolBarManager) }; @@ -113,7 +113,7 @@ protected: private: QScopedPointer<QtToolBarDialogPrivate> d_ptr; - Q_DECLARE_SCOPED_PRIVATE(QtToolBarDialog) + Q_DECLARE_PRIVATE(QtToolBarDialog) Q_DISABLE_COPY(QtToolBarDialog) Q_PRIVATE_SLOT(d_func(), void newClicked()) |