diff options
Diffstat (limited to 'src/corelib')
27 files changed, 65 insertions, 65 deletions
diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index cbd7185a92..1d79b70600 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -85,7 +85,7 @@ class QFlags struct Private; typedef int (Private::*Zero); public: -#ifndef qdoc +#ifndef Q_QDOC typedef typename QtPrivate::if_< QtPrivate::is_unsigned<Enum>::value, unsigned int, @@ -94,7 +94,7 @@ public: #endif typedef Enum enum_type; // compiler-generated copy/move ctor/assignment operators are fine! -#ifdef qdoc +#ifdef Q_QDOC typedef int Int; // the real typedef above is too complex for qdoc inline QFlags(const QFlags &other); inline QFlags &operator=(const QFlags &other); diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index 867acd4d60..a6ff3d289d 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -70,7 +70,7 @@ public: BigEndian, LittleEndian -# ifdef qdoc +# ifdef Q_QDOC , ByteOrder = <platform-dependent> # elif Q_BYTE_ORDER == Q_BIG_ENDIAN , ByteOrder = BigEndian diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 7fe2598cd5..89538a5fcf 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -369,7 +369,7 @@ Q_OUTOFLINE_TEMPLATE QDataStream &operator<<(QDataStream &out, const QHash<Key, } return out; } -#ifdef qdoc +#ifdef Q_QDOC template <class Key, class T> Q_OUTOFLINE_TEMPLATE QDataStream &operator>>(QDataStream &in, QMap<Key, T> &map) #else diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h index 6fbbdae157..b5c79303ef 100644 --- a/src/corelib/io/qfilesystemwatcher.h +++ b/src/corelib/io/qfilesystemwatcher.h @@ -73,12 +73,12 @@ public: Q_SIGNALS: void fileChanged(const QString &path -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void directoryChanged(const QString &path -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index bf4f2fb55b..604b60d333 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_PROCESS -#if !defined(Q_OS_WIN) || defined(qdoc) +#if !defined(Q_OS_WIN) || defined(Q_QDOC) typedef qint64 Q_PID; #else QT_END_NAMESPACE @@ -211,7 +211,7 @@ public Q_SLOTS: Q_SIGNALS: void started( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); @@ -219,18 +219,18 @@ Q_SIGNALS: void finished(int exitCode, QProcess::ExitStatus exitStatus); void error(QProcess::ProcessError error); void stateChanged(QProcess::ProcessState state -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void readyReadStandardOutput( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void readyReadStandardError( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index fcea4fd6ad..c45708cc1a 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -154,7 +154,7 @@ public: FullyDecoded = FullyEncoded | DecodeReserved | 0x4000000 }; Q_DECLARE_FLAGS(ComponentFormattingOptions, ComponentFormattingOption) -#ifdef qdoc +#ifdef Q_QDOC Q_DECLARE_FLAGS(FormattingOptions, UrlFormattingOption) #else typedef QUrlTwoFlags<UrlFormattingOption, ComponentFormattingOption> FormattingOptions; diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index 9513a245d7..f7e7ce95f6 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -252,78 +252,78 @@ Q_SIGNALS: void layoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint); void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void rowsInserted(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void rowsRemoved(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsAboutToBeInserted(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsInserted(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsRemoved(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void modelAboutToBeReset( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void modelReset( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void rowsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 83f444c5b2..185aea53d1 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -161,7 +161,7 @@ public Q_SLOTS: Q_SIGNALS: void aboutToQuit( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 09c641e4a3..cf45f7b864 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -574,7 +574,7 @@ namespace QtPrivate { template <typename T> int qRegisterNormalizedMetaType(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName -#ifndef qdoc +#ifndef Q_QDOC , T * dummy = 0 , typename QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::DefinedType defined = QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::Defined #endif @@ -604,7 +604,7 @@ int qRegisterNormalizedMetaType(const QT_PREPEND_NAMESPACE(QByteArray) &normaliz template <typename T> int qRegisterMetaType(const char *typeName -#ifndef qdoc +#ifndef Q_QDOC , T * dummy = 0 , typename QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::DefinedType defined = QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::Defined #endif @@ -621,7 +621,7 @@ int qRegisterMetaType(const char *typeName #ifndef QT_NO_DATASTREAM template <typename T> void qRegisterMetaTypeStreamOperators(const char *typeName -#ifndef qdoc +#ifndef Q_QDOC , T * /* dummy */ = 0 #endif ) @@ -634,7 +634,7 @@ void qRegisterMetaTypeStreamOperators(const char *typeName template <typename T> inline Q_DECL_CONSTEXPR int qMetaTypeId( -#ifndef qdoc +#ifndef Q_QDOC T * /* dummy */ = 0 #endif ) @@ -645,7 +645,7 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId( template <typename T> inline Q_DECL_CONSTEXPR int qRegisterMetaType( -#if !defined(qdoc) && !defined(Q_CC_SUN) +#if !defined(Q_QDOC) && !defined(Q_CC_SUN) T * dummy = 0 #endif ) 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<T> qFindChildren(const QObject *oobj, const QString &name = QString()); QList<T> qFindChildren(const QObject *o, const QRegExp &re); diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index dee1543262..0c8e8bc17e 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -95,7 +95,7 @@ public: { return *data(); } inline operator T*() const { return data(); } -#ifdef qdoc +#ifdef Q_QDOC inline bool isNull() const; inline void clear(); #else diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h index 35e73b790b..63876be3a0 100644 --- a/src/corelib/kernel/qsocketnotifier.h +++ b/src/corelib/kernel/qsocketnotifier.h @@ -70,7 +70,7 @@ public Q_SLOTS: Q_SIGNALS: void activated(int socket -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index a3cc1c7813..f46ef07aaf 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -89,7 +89,7 @@ public Q_SLOTS: Q_SIGNALS: void timeout( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 86b43cf69a..ec09cc40c5 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -355,7 +355,7 @@ class Q_CORE_EXPORT QVariant { return canConvert(qMetaTypeId<T>()); } public: -#ifndef qdoc +#ifndef Q_QDOC struct PrivateShared { inline PrivateShared(void *v) : ptr(v), ref(1) { } @@ -533,7 +533,7 @@ inline bool QVariant::isDetached() const { return !d.is_shared || d.data.shared->ref.load() == 1; } -#ifdef qdoc +#ifdef Q_QDOC inline bool operator==(const QVariant &v1, const QVariant &v2); inline bool operator!=(const QVariant &v1, const QVariant &v2); #else diff --git a/src/corelib/kernel/qwineventnotifier.h b/src/corelib/kernel/qwineventnotifier.h index 291d953e58..b9da6b3d96 100644 --- a/src/corelib/kernel/qwineventnotifier.h +++ b/src/corelib/kernel/qwineventnotifier.h @@ -72,7 +72,7 @@ public Q_SLOTS: Q_SIGNALS: void activated(HANDLE hEvent -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h index 370414ede6..df1cbaa866 100644 --- a/src/corelib/statemachine/qabstractstate.h +++ b/src/corelib/statemachine/qabstractstate.h @@ -66,12 +66,12 @@ public: Q_SIGNALS: void entered( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void exited( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h index f9790bc861..e98eb2d064 100644 --- a/src/corelib/statemachine/qabstracttransition.h +++ b/src/corelib/statemachine/qabstracttransition.h @@ -89,7 +89,7 @@ public: Q_SIGNALS: void triggered( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h index cad2691733..f5371e56a8 100644 --- a/src/corelib/statemachine/qstate.h +++ b/src/corelib/statemachine/qstate.h @@ -101,12 +101,12 @@ public: Q_SIGNALS: void finished( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void propertiesAssigned( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 256471e517..32384d1f7e 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -154,12 +154,12 @@ public Q_SLOTS: Q_SIGNALS: void started( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void stopped( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); 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 ); diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h index 356f524ebb..4fcc032941 100644 --- a/src/corelib/tools/qalgorithms.h +++ b/src/corelib/tools/qalgorithms.h @@ -140,7 +140,7 @@ inline void qCount(const Container &container, const T &value, Size &n) qCount(container.constBegin(), container.constEnd(), value, n); } -#ifdef qdoc +#ifdef Q_QDOC template <typename T> LessThan qLess() { diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h index 04ad5490c6..990b0a41f2 100644 --- a/src/corelib/tools/qtimeline.h +++ b/src/corelib/tools/qtimeline.h @@ -126,22 +126,22 @@ public Q_SLOTS: Q_SIGNALS: void valueChanged(qreal x -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void frameChanged(int -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void stateChanged(QTimeLine::State newState -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void finished( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); |