diff options
author | Debao Zhang <hello@debao.me> | 2012-12-28 14:18:53 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-08 10:48:33 +0100 |
commit | 39795b1411a5ed17c47ef638c693d4b788442d0c (patch) | |
tree | 9862b40a06e239d4486966f9b972a475f7170da3 /src/gui | |
parent | 742f0c6e0b8e3ec6fddc146205e78a93f600c1cf (diff) |
Replace macro qdoc with Q_QDOC
Both qdoc and Q_QDOC are used in source code, which looks not good.
Change-Id: I4f3a71670278b0758d92bfa5db086a07e1b1acfd
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/accessible/qaccessible.h | 4 | ||||
-rw-r--r-- | src/gui/image/qimage.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qkeysequence.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 5f61634ba2..a3014cb858 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -64,7 +64,7 @@ class QWindow; // We need to inherit QObject to expose the enums to QML. class Q_GUI_EXPORT QAccessible -#ifndef qdoc +#ifndef Q_QDOC :public QObject #endif { @@ -269,7 +269,7 @@ public: StaticText = 0x00000029, EditableText = 0x0000002A, // Editable, selectable, etc. Button = 0x0000002B, -#ifndef qdoc +#ifndef Q_QDOC PushButton = Button, // deprecated #endif CheckBox = 0x0000002C, diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 304d54a378..454acddd5a 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -122,7 +122,7 @@ public: Format_Grayscale2, Format_Grayscale2LSB #endif -#ifndef qdoc +#ifndef Q_QDOC NImageFormats #endif }; diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 2bb0c73119..2b23f34dcb 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -61,7 +61,7 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QKeySequence &ks); Q_GUI_EXPORT QDataStream &operator>>(QDataStream &out, QKeySequence &ks); #endif -#ifdef qdoc +#ifdef Q_QDOC void qt_set_sequence_auto_mnemonic(bool b); #endif |