diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-04 11:17:47 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-04 11:17:47 (GMT) |
| commit | be212bf108e71ba3b5b75802b1f4de6613ba315c (patch) | |
| tree | c541ad12e8698f04e8fe386c2e1b94e8baca6c1b /src/qt3support/other/q3dragobject.h | |
| parent | 67ae1b0dac175f48875507f3187ed49276a29ddf (diff) | |
| parent | e6bb00250b321b149dd80259dc4f479088d5949b (diff) | |
| download | Qt-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/other/q3dragobject.h')
| -rw-r--r-- | src/qt3support/other/q3dragobject.h | 8 |
1 files changed, 4 insertions, 4 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); |