diff options
author | Harald Fernengel <harald@trolltech.com> | 2009-08-06 10:04:36 (GMT) |
---|---|---|
committer | Harald Fernengel <harald@trolltech.com> | 2009-08-06 10:04:36 (GMT) |
commit | e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7 (patch) | |
tree | c01e05d0ea5a42fa1ab5f2f5e686806bcd8e5280 /src/gui/styles | |
parent | 7588eaee83776b510eabdb9206e3cabcb3ee9dc2 (diff) | |
download | Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.zip Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.tar.gz Qt-e5800dd8fa0c61f3df1ddea4e6a55b4b30eb84a7.tar.bz2 |
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/gui/styles')
-rw-r--r-- | src/gui/styles/qcleanlooksstyle.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qcommonstyle.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qgtkstyle.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qmotifstyle.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qplastiquestyle.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qproxystyle.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qs60style.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qstyle.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qstylesheetstyle_p.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qwindowsmobilestyle.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qwindowsstyle.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qwindowsvistastyle.h | 2 | ||||
-rw-r--r-- | src/gui/styles/qwindowsxpstyle.h | 2 |
13 files changed, 13 insertions, 13 deletions
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; }; |