diff options
| author | Harald Fernengel <harald@trolltech.com> | 2009-08-06 12:04:36 +0200 |
|---|---|---|
| committer | Harald Fernengel <harald@trolltech.com> | 2009-08-06 12:04:36 +0200 |
| commit | e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7 (patch) | |
| tree | c01e05d0ea5a42fa1ab5f2f5e686806bcd8e5280 /src/qt3support | |
| parent | 7588eaee83776b510eabdb9206e3cabcb3ee9dc2 (diff) | |
Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATE
Rationale: We're using template magic now to get the private
pointer in qglobal.h, so no need to have two macros. Also
keeps backward compatibility with outside (KDE) code.
Diffstat (limited to 'src/qt3support')
| -rw-r--r-- | src/qt3support/other/q3dragobject.h | 8 | ||||
| -rw-r--r-- | src/qt3support/painting/q3paintengine_svg_p.h | 2 | ||||
| -rw-r--r-- | src/qt3support/widgets/q3mainwindow.h | 2 | ||||
| -rw-r--r-- | src/qt3support/widgets/q3titlebar_p.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/qt3support/other/q3dragobject.h b/src/qt3support/other/q3dragobject.h index c25e54b881..356e1f7498 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 1faffff06d..26452ab364 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 2e056b4dc7..60dea5d4eb 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 6b3c22c671..c4be34e750 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) |