From 39795b1411a5ed17c47ef638c693d4b788442d0c Mon Sep 17 00:00:00 2001 From: Debao Zhang Date: Fri, 28 Dec 2012 14:18:53 +0800 Subject: 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 Reviewed-by: Paul Olav Tvete --- src/corelib/kernel/qobject.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/kernel/qobject.h') diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index e9316c98f0..7a4d513c1f 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -125,7 +125,7 @@ public: virtual bool event(QEvent *); virtual bool eventFilter(QObject *, QEvent *); -#ifdef qdoc +#ifdef Q_QDOC static QString tr(const char *sourceText, const char *comment = 0, int n = -1); static QString trUtf8(const char *sourceText, const char *comment = 0, int n = -1); virtual const QMetaObject *metaObject() const; @@ -367,7 +367,7 @@ public: Q_SIGNALS: void destroyed(QObject * = 0); void objectNameChanged(const QString &objectName -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); @@ -438,7 +438,7 @@ public: }; #endif -#ifdef qdoc +#ifdef Q_QDOC T qFindChild(const QObject *o, const QString &name = QString()); QList qFindChildren(const QObject *oobj, const QString &name = QString()); QList qFindChildren(const QObject *o, const QRegExp &re); -- cgit v1.2.3