summaryrefslogtreecommitdiffstats
path: root/src/qt3support
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-08-04 11:17:47 (GMT)
committerJason Barron <jbarron@trolltech.com>2009-08-04 11:17:47 (GMT)
commitbe212bf108e71ba3b5b75802b1f4de6613ba315c (patch)
treec541ad12e8698f04e8fe386c2e1b94e8baca6c1b /src/qt3support
parent67ae1b0dac175f48875507f3187ed49276a29ddf (diff)
parente6bb00250b321b149dd80259dc4f479088d5949b (diff)
downloadQt-be212bf108e71ba3b5b75802b1f4de6613ba315c.zip
Qt-be212bf108e71ba3b5b75802b1f4de6613ba315c.tar.gz
Qt-be212bf108e71ba3b5b75802b1f4de6613ba315c.tar.bz2
Merge commit 'origin/master'
Conflicts: src/corelib/global/qglobal.h src/corelib/kernel/qmetatype.cpp src/corelib/kernel/qobject.cpp src/corelib/thread/qthread_unix.cpp src/gui/graphicsview/qgraphicssceneevent.h src/gui/itemviews/qheaderview.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qgesture.h src/gui/kernel/qgesturerecognizer.h src/gui/painting/qpaintengine_raster.cpp src/network/access/qhttpnetworkreply.cpp src/network/access/qnetworkcookie.h src/network/socket/qnativesocketengine_unix.cpp
Diffstat (limited to 'src/qt3support')
-rw-r--r--src/qt3support/other/q3dragobject.h8
-rw-r--r--src/qt3support/painting/q3paintengine_svg_p.h2
-rw-r--r--src/qt3support/widgets/q3mainwindow.h2
-rw-r--r--src/qt3support/widgets/q3titlebar_p.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/qt3support/other/q3dragobject.h b/src/qt3support/other/q3dragobject.h
index 356e1f7..c25e54b 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_PRIVATE(Q3DragObject)
+ Q_DECLARE_SCOPED_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_PRIVATE(Q3StoredDrag)
+ Q_DECLARE_SCOPED_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_PRIVATE(Q3TextDrag)
+ Q_DECLARE_SCOPED_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_PRIVATE(Q3ImageDrag)
+ Q_DECLARE_SCOPED_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 26452ab..1faffff 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_PRIVATE(Q3SVGPaintEngine)
+ Q_DECLARE_SCOPED_PRIVATE(Q3SVGPaintEngine)
public:
Q3SVGPaintEngine();
diff --git a/src/qt3support/widgets/q3mainwindow.h b/src/qt3support/widgets/q3mainwindow.h
index 60dea5d..2e056b4 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_PRIVATE(Q3MainWindow)
+ Q_DECLARE_SCOPED_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 c4be34e..6b3c22c 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_PRIVATE(Q3TitleBar)
+ Q_DECLARE_SCOPED_PRIVATE(Q3TitleBar)
Q_PROPERTY(bool autoRaise READ autoRaise WRITE setAutoRaise)
Q_PROPERTY(bool movable READ isMovable WRITE setMovable)