From 39795b1411a5ed17c47ef638c693d4b788442d0c Mon Sep 17 00:00:00 2001
From: Debao Zhang <hello@debao.me>
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 <qthjk@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---
 src/corelib/thread/qatomic.h        | 4 ++--
 src/corelib/thread/qexception.cpp   | 4 ++--
 src/corelib/thread/qfuturewatcher.h | 2 +-
 src/corelib/thread/qmutex.h         | 6 +++---
 src/corelib/thread/qresultstore.h   | 4 ++--
 src/corelib/thread/qthread.h        | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/corelib/thread')

diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h
index 10001802ba..6b502440f3 100644
--- a/src/corelib/thread/qatomic.h
+++ b/src/corelib/thread/qatomic.h
@@ -81,7 +81,7 @@ public:
         return *this;
     }
 
-#ifdef qdoc
+#ifdef Q_QDOC
     int load() const;
     int loadAcquire() const;
     void store(int newValue);
@@ -143,7 +143,7 @@ public:
         return *this;
     }
 
-#ifdef qdoc
+#ifdef Q_QDOC
     T *load() const;
     T *loadAcquire() const;
     void store(T *newValue);
diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp
index 50689c0abe..de6bc5085b 100644
--- a/src/corelib/thread/qexception.cpp
+++ b/src/corelib/thread/qexception.cpp
@@ -137,7 +137,7 @@ QUnhandledException *QUnhandledException::clone() const
     return new QUnhandledException(*this);
 }
 
-#ifndef qdoc
+#ifndef Q_QDOC
 
 namespace QtPrivate {
 
@@ -200,7 +200,7 @@ bool ExceptionStore::hasThrown() const { return exceptionHolder.base->hasThrown;
 
 } // namespace QtPrivate
 
-#endif //qdoc
+#endif //Q_QDOC
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/thread/qfuturewatcher.h b/src/corelib/thread/qfuturewatcher.h
index 005a0b10e5..13a278d59a 100644
--- a/src/corelib/thread/qfuturewatcher.h
+++ b/src/corelib/thread/qfuturewatcher.h
@@ -131,7 +131,7 @@ public:
     T result() const { return m_future.result(); }
     T resultAt(int index) const { return m_future.resultAt(index); }
 
-#ifdef qdoc
+#ifdef Q_QDOC
     int progressValue() const;
     int progressMinimum() const;
     int progressMaximum() const;
diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h
index 86b3db2c89..a553a83c92 100644
--- a/src/corelib/thread/qmutex.h
+++ b/src/corelib/thread/qmutex.h
@@ -51,7 +51,7 @@ QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
 
-#if !defined(QT_NO_THREAD) && !defined(qdoc)
+#if !defined(QT_NO_THREAD) && !defined(Q_QDOC)
 
 #ifdef Q_OS_LINUX
 # define QT_MUTEX_LOCK_NOEXCEPT Q_DECL_NOTHROW
@@ -173,7 +173,7 @@ private:
     quintptr val;
 };
 
-#else // QT_NO_THREAD or qdoc
+#else // QT_NO_THREAD or Q_QDOC
 
 class Q_CORE_EXPORT QMutex
 {
@@ -207,7 +207,7 @@ private:
 
 typedef QMutex QBasicMutex;
 
-#endif // QT_NO_THREAD or qdoc
+#endif // QT_NO_THREAD or Q_QDOC
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h
index d084e24c0c..1b1504fa10 100644
--- a/src/corelib/thread/qresultstore.h
+++ b/src/corelib/thread/qresultstore.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
     either individually or in batches.
 */
 
-#ifndef qdoc
+#ifndef Q_QDOC
 
 namespace QtPrivate {
 
@@ -231,7 +231,7 @@ public:
 
 } // namespace QtPrivate
 
-#endif //qdoc
+#endif //Q_QDOC
 
 QT_END_NAMESPACE
 QT_END_HEADER
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
index f7ae95f009..51f9b8f2d9 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -113,12 +113,12 @@ public:
 
 Q_SIGNALS:
     void started(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
       QPrivateSignal
 #endif
     );
     void finished(
-#if !defined(qdoc)
+#if !defined(Q_QDOC)
       QPrivateSignal
 #endif
     );
-- 
cgit v1.2.3