1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace macro qdoc with Q_QDOC

Browse Source 
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>
This commit is contained in:
Debao Zhang 2012-12-28 14:18:53 +08:00 committed by The Qt Project
parent 742f0c6e0b
commit 39795b1411
47 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/concurrent/qtconcurrentfilter.h
View File

@ -53,7 +53,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef qdoc #ifdef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
@ -258,7 +258,7 @@ OutputSequence blockingFiltered(Iterator begin, Iterator end, KeepFunctor keep)
} // namespace QtConcurrent } // namespace QtConcurrent
#endif // qdoc #endif // Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

4
src/concurrent/qtconcurrentfilterkernel.h
View File

@ -54,7 +54,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef qdoc #ifndef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
@ -340,7 +340,7 @@ inline ThreadEngineStarter<ResultType> startFilteredReduced(Iterator begin, Iter
} // namespace QtConcurrent } // namespace QtConcurrent
#endif // qdoc #endif // Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

4
src/concurrent/qtconcurrentfunctionwrappers.h
View File

@ -51,7 +51,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef qdoc #ifndef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
@ -294,7 +294,7 @@ struct MapResultType<QStringList, U(C::*)() const>
} // namespace QtPrivate. } // namespace QtPrivate.
#endif //qdoc #endif //Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

4
src/concurrent/qtconcurrentiteratekernel.h
View File

@ -56,7 +56,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef qdoc #ifndef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
@ -300,7 +300,7 @@ public:
} // namespace QtConcurrent } // namespace QtConcurrent
#endif //qdoc #endif //Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

4
src/concurrent/qtconcurrentmap.h
View File

@ -55,7 +55,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef qdoc #ifdef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
@ -309,7 +309,7 @@ typename QtPrivate::MapResultType<Iterator, MapFunctor>::ResultType blockingMapp
} // namespace QtConcurrent } // namespace QtConcurrent
#endif // qdoc #endif // Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

4
src/concurrent/qtconcurrentmapkernel.h
View File

@ -53,7 +53,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef qdoc #ifndef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
// map kernel, works with both parallel-for and parallel-while // map kernel, works with both parallel-for and parallel-while
@ -262,7 +262,7 @@ inline ThreadEngineStarter<ResultType> startMappedReduced(Iterator begin, Iterat
} // namespace QtConcurrent } // namespace QtConcurrent
#endif //qdoc #endif //Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

4
src/concurrent/qtconcurrentmedian.h
View File

@ -53,7 +53,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef qdoc #ifndef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
@ -119,7 +119,7 @@ private:
} // namespace QtConcurrent } // namespace QtConcurrent
#endif //qdoc #endif //Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

8
src/concurrent/qtconcurrentreducekernel.h
View File

@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
namespace QtConcurrent { namespace QtConcurrent {
#ifndef qdoc #ifndef Q_QDOC
/* /*
The ReduceQueueStartLimit and ReduceQueueThrottleLimit constants The ReduceQueueStartLimit and ReduceQueueThrottleLimit constants
@ -85,7 +85,7 @@ public:
QVector<T> vector; QVector<T> vector;
}; };
#endif // qdoc #endif // Q_QDOC
enum ReduceOption { enum ReduceOption {
UnorderedReduce = 0x1, UnorderedReduce = 0x1,
@ -96,7 +96,7 @@ enum ReduceOption {
Q_DECLARE_FLAGS(ReduceOptions, ReduceOption) Q_DECLARE_FLAGS(ReduceOptions, ReduceOption)
Q_DECLARE_OPERATORS_FOR_FLAGS(ReduceOptions) Q_DECLARE_OPERATORS_FOR_FLAGS(ReduceOptions)
#ifndef qdoc #ifndef Q_QDOC
// supports both ordered and out-of-order reduction // supports both ordered and out-of-order reduction
template <typename ReduceFunctor, typename ReduceResultType, typename T> template <typename ReduceFunctor, typename ReduceResultType, typename T>
@ -242,7 +242,7 @@ struct SequenceHolder2 : public Base
} }
}; };
#endif //qdoc #endif //Q_QDOC
} // namespace QtConcurrent } // namespace QtConcurrent

4
src/concurrent/qtconcurrentrun.h
View File

@ -54,7 +54,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef qdoc #ifdef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
@ -337,7 +337,7 @@ QFuture<T> run(const Class *object, T (Class::*fn)(Param1, Param2, Param3, Param
} //namespace QtConcurrent } //namespace QtConcurrent
#endif // qdoc #endif // Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

4
src/concurrent/qtconcurrentrunbase.h
View File

@ -54,7 +54,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef qdoc #ifndef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
@ -144,7 +144,7 @@ public:
} //namespace QtConcurrent } //namespace QtConcurrent
#endif //qdoc #endif //Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

4
src/concurrent/qtconcurrentstoredfunctioncall.h
View File

@ -52,7 +52,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef qdoc #ifndef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
template <typename T, typename FunctionPointer> template <typename T, typename FunctionPointer>
@ -1302,7 +1302,7 @@ private:
} //namespace QtConcurrent } //namespace QtConcurrent
#endif // qdoc #endif // Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

4
src/concurrent/qtconcurrentthreadengine.h
View File

@ -58,7 +58,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef qdoc #ifndef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
@ -270,7 +270,7 @@ inline ThreadEngineStarter<typename ThreadEngine::ResultType> startThreadEngine(
} // namespace QtConcurrent } // namespace QtConcurrent
#endif //qdoc #endif //Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

4
src/corelib/global/qflags.h
View File

@ -85,7 +85,7 @@ class QFlags
struct Private; struct Private;
typedef int (Private::*Zero); typedef int (Private::*Zero);
public: public:
#ifndef qdoc #ifndef Q_QDOC
typedef typename QtPrivate::if_< typedef typename QtPrivate::if_<
QtPrivate::is_unsigned<Enum>::value, QtPrivate::is_unsigned<Enum>::value,
unsigned int, unsigned int,
@ -94,7 +94,7 @@ public:
#endif #endif
typedef Enum enum_type; typedef Enum enum_type;
// compiler-generated copy/move ctor/assignment operators are fine! // 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 typedef int Int; // the real typedef above is too complex for qdoc
inline QFlags(const QFlags &other); inline QFlags(const QFlags &other);
inline QFlags &operator=(const QFlags &other); inline QFlags &operator=(const QFlags &other);

2
src/corelib/global/qsysinfo.h
View File

@ -70,7 +70,7 @@ public:
BigEndian, BigEndian,
LittleEndian LittleEndian
# ifdef qdoc # ifdef Q_QDOC
, ByteOrder = <platform-dependent> , ByteOrder = <platform-dependent>
# elif Q_BYTE_ORDER == Q_BIG_ENDIAN # elif Q_BYTE_ORDER == Q_BIG_ENDIAN
, ByteOrder = BigEndian , ByteOrder = BigEndian

2
src/corelib/io/qdatastream.h
View File

@ -369,7 +369,7 @@ Q_OUTOFLINE_TEMPLATE QDataStream &operator<<(QDataStream &out, const QHash<Key,
} }
return out; return out;
} }
#ifdef qdoc #ifdef Q_QDOC
template <class Key, class T> template <class Key, class T>
Q_OUTOFLINE_TEMPLATE QDataStream &operator>>(QDataStream &in, QMap<Key, T> &map) Q_OUTOFLINE_TEMPLATE QDataStream &operator>>(QDataStream &in, QMap<Key, T> &map)
#else #else

4
src/corelib/io/qfilesystemwatcher.h
View File

@ -73,12 +73,12 @@ public:
Q_SIGNALS: Q_SIGNALS:
void fileChanged(const QString &path void fileChanged(const QString &path
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void directoryChanged(const QString &path void directoryChanged(const QString &path
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );

10
src/corelib/io/qprocess.h
View File

@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
#ifndef QT_NO_PROCESS #ifndef QT_NO_PROCESS
#if !defined(Q_OS_WIN) || defined(qdoc) #if !defined(Q_OS_WIN) || defined(Q_QDOC)
typedef qint64 Q_PID; typedef qint64 Q_PID;
#else #else
QT_END_NAMESPACE QT_END_NAMESPACE
@ -211,7 +211,7 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
void started( void started(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );
@ -219,18 +219,18 @@ Q_SIGNALS:
void finished(int exitCode, QProcess::ExitStatus exitStatus); void finished(int exitCode, QProcess::ExitStatus exitStatus);
void error(QProcess::ProcessError error); void error(QProcess::ProcessError error);
void stateChanged(QProcess::ProcessState state void stateChanged(QProcess::ProcessState state
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void readyReadStandardOutput( void readyReadStandardOutput(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );
void readyReadStandardError( void readyReadStandardError(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );

2
src/corelib/io/qurl.h
View File

@ -154,7 +154,7 @@ public:
FullyDecoded = FullyEncoded | DecodeReserved | 0x4000000 FullyDecoded = FullyEncoded | DecodeReserved | 0x4000000
}; };
Q_DECLARE_FLAGS(ComponentFormattingOptions, ComponentFormattingOption) Q_DECLARE_FLAGS(ComponentFormattingOptions, ComponentFormattingOption)
#ifdef qdoc #ifdef Q_QDOC
Q_DECLARE_FLAGS(FormattingOptions, UrlFormattingOption) Q_DECLARE_FLAGS(FormattingOptions, UrlFormattingOption)
#else #else
typedef QUrlTwoFlags<UrlFormattingOption, ComponentFormattingOption> FormattingOptions; typedef QUrlTwoFlags<UrlFormattingOption, ComponentFormattingOption> FormattingOptions;

28
src/corelib/itemmodels/qabstractitemmodel.h
View File

@ -252,78 +252,78 @@ Q_SIGNALS:
void layoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint); void layoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint);
void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void rowsInserted(const QModelIndex &parent, int first, int last void rowsInserted(const QModelIndex &parent, int first, int last
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void rowsRemoved(const QModelIndex &parent, int first, int last void rowsRemoved(const QModelIndex &parent, int first, int last
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void columnsAboutToBeInserted(const QModelIndex &parent, int first, int last void columnsAboutToBeInserted(const QModelIndex &parent, int first, int last
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void columnsInserted(const QModelIndex &parent, int first, int last void columnsInserted(const QModelIndex &parent, int first, int last
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void columnsRemoved(const QModelIndex &parent, int first, int last void columnsRemoved(const QModelIndex &parent, int first, int last
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void modelAboutToBeReset( void modelAboutToBeReset(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );
void modelReset( void modelReset(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );
void rowsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow void rowsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void columnsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn void columnsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );

2
src/corelib/kernel/qcoreapplication.h
View File

@ -161,7 +161,7 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
void aboutToQuit( void aboutToQuit(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );

10
src/corelib/kernel/qmetatype.h
View File

@ -574,7 +574,7 @@ namespace QtPrivate {
template <typename T> template <typename T>
int qRegisterNormalizedMetaType(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName int qRegisterNormalizedMetaType(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName
#ifndef qdoc #ifndef Q_QDOC
, T * dummy = 0 , 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 , typename QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::DefinedType defined = QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::Defined
#endif #endif
@ -604,7 +604,7 @@ int qRegisterNormalizedMetaType(const QT_PREPEND_NAMESPACE(QByteArray) &normaliz
template <typename T> template <typename T>
int qRegisterMetaType(const char *typeName int qRegisterMetaType(const char *typeName
#ifndef qdoc #ifndef Q_QDOC
, T * dummy = 0 , 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 , typename QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::DefinedType defined = QtPrivate::MetaTypeDefinedHelper<T, QMetaTypeId2<T>::Defined && !QMetaTypeId2<T>::IsBuiltIn>::Defined
#endif #endif
@ -621,7 +621,7 @@ int qRegisterMetaType(const char *typeName
#ifndef QT_NO_DATASTREAM #ifndef QT_NO_DATASTREAM
template <typename T> template <typename T>
void qRegisterMetaTypeStreamOperators(const char *typeName void qRegisterMetaTypeStreamOperators(const char *typeName
#ifndef qdoc #ifndef Q_QDOC
, T * /* dummy */ = 0 , T * /* dummy */ = 0
#endif #endif
) )
@ -634,7 +634,7 @@ void qRegisterMetaTypeStreamOperators(const char *typeName
template <typename T> template <typename T>
inline Q_DECL_CONSTEXPR int qMetaTypeId( inline Q_DECL_CONSTEXPR int qMetaTypeId(
#ifndef qdoc #ifndef Q_QDOC
T * /* dummy */ = 0 T * /* dummy */ = 0
#endif #endif
) )
@ -645,7 +645,7 @@ inline Q_DECL_CONSTEXPR int qMetaTypeId(
template <typename T> template <typename T>
inline Q_DECL_CONSTEXPR int qRegisterMetaType( inline Q_DECL_CONSTEXPR int qRegisterMetaType(
#if !defined(qdoc) && !defined(Q_CC_SUN) #if !defined(Q_QDOC) && !defined(Q_CC_SUN)
T * dummy = 0 T * dummy = 0
#endif #endif
) )

6
src/corelib/kernel/qobject.h
View File

@ -125,7 +125,7 @@ public:
virtual bool event(QEvent *); virtual bool event(QEvent *);
virtual bool eventFilter(QObject *, 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 tr(const char *sourceText, const char *comment = 0, int n = -1);
static QString trUtf8(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; virtual const QMetaObject *metaObject() const;
@ -367,7 +367,7 @@ public:
Q_SIGNALS: Q_SIGNALS:
void destroyed(QObject * = 0); void destroyed(QObject * = 0);
void objectNameChanged(const QString &objectName void objectNameChanged(const QString &objectName
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
@ -438,7 +438,7 @@ public:
}; };
#endif #endif
#ifdef qdoc #ifdef Q_QDOC
T qFindChild(const QObject *o, const QString &name = QString()); T qFindChild(const QObject *o, const QString &name = QString());
QList<T> qFindChildren(const QObject *oobj, const QString &name = QString()); QList<T> qFindChildren(const QObject *oobj, const QString &name = QString());
QList<T> qFindChildren(const QObject *o, const QRegExp &re); QList<T> qFindChildren(const QObject *o, const QRegExp &re);

2
src/corelib/kernel/qpointer.h
View File

@ -95,7 +95,7 @@ public:
{ return *data(); } { return *data(); }
inline operator T*() const inline operator T*() const
{ return data(); } { return data(); }
#ifdef qdoc #ifdef Q_QDOC
inline bool isNull() const; inline bool isNull() const;
inline void clear(); inline void clear();
#else #else

2
src/corelib/kernel/qsocketnotifier.h
View File

@ -70,7 +70,7 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
void activated(int socket void activated(int socket
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );

2
src/corelib/kernel/qtimer.h
View File

@ -89,7 +89,7 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
void timeout( void timeout(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );

4
src/corelib/kernel/qvariant.h
View File

@ -355,7 +355,7 @@ class Q_CORE_EXPORT QVariant
{ return canConvert(qMetaTypeId<T>()); } { return canConvert(qMetaTypeId<T>()); }
public: public:
#ifndef qdoc #ifndef Q_QDOC
struct PrivateShared struct PrivateShared
{ {
inline PrivateShared(void *v) : ptr(v), ref(1) { } 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; } { 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);
inline bool operator!=(const QVariant &v1, const QVariant &v2); inline bool operator!=(const QVariant &v1, const QVariant &v2);
#else #else

2
src/corelib/kernel/qwineventnotifier.h
View File

@ -72,7 +72,7 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
void activated(HANDLE hEvent void activated(HANDLE hEvent
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );

4
src/corelib/statemachine/qabstractstate.h
View File

@ -66,12 +66,12 @@ public:
Q_SIGNALS: Q_SIGNALS:
void entered( void entered(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );
void exited( void exited(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );

2
src/corelib/statemachine/qabstracttransition.h
View File

@ -89,7 +89,7 @@ public:
Q_SIGNALS: Q_SIGNALS:
void triggered( void triggered(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );

4
src/corelib/statemachine/qstate.h
View File

@ -101,12 +101,12 @@ public:
Q_SIGNALS: Q_SIGNALS:
void finished( void finished(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );
void propertiesAssigned( void propertiesAssigned(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );

4
src/corelib/statemachine/qstatemachine.h
View File

@ -154,12 +154,12 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
void started( void started(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );
void stopped( void stopped(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );

4
src/corelib/thread/qatomic.h
View File

@ -81,7 +81,7 @@ public:
return *this; return *this;
} }
#ifdef qdoc #ifdef Q_QDOC
int load() const; int load() const;
int loadAcquire() const; int loadAcquire() const;
void store(int newValue); void store(int newValue);
@ -143,7 +143,7 @@ public:
return *this; return *this;
} }
#ifdef qdoc #ifdef Q_QDOC
T *load() const; T *load() const;
T *loadAcquire() const; T *loadAcquire() const;
void store(T *newValue); void store(T *newValue);

4
src/corelib/thread/qexception.cpp
View File

@ -137,7 +137,7 @@ QUnhandledException *QUnhandledException::clone() const
return new QUnhandledException(*this); return new QUnhandledException(*this);
} }
#ifndef qdoc #ifndef Q_QDOC
namespace QtPrivate { namespace QtPrivate {
@ -200,7 +200,7 @@ bool ExceptionStore::hasThrown() const { return exceptionHolder.base->hasThrown;
} // namespace QtPrivate } // namespace QtPrivate
#endif //qdoc #endif //Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/corelib/thread/qfuturewatcher.h
View File

@ -131,7 +131,7 @@ public:
T result() const { return m_future.result(); } T result() const { return m_future.result(); }
T resultAt(int index) const { return m_future.resultAt(index); } T resultAt(int index) const { return m_future.resultAt(index); }
#ifdef qdoc #ifdef Q_QDOC
int progressValue() const; int progressValue() const;
int progressMinimum() const; int progressMinimum() const;
int progressMaximum() const; int progressMaximum() const;

6
src/corelib/thread/qmutex.h
View File

@ -51,7 +51,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#if !defined(QT_NO_THREAD) && !defined(qdoc) #if !defined(QT_NO_THREAD) && !defined(Q_QDOC)
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
# define QT_MUTEX_LOCK_NOEXCEPT Q_DECL_NOTHROW # define QT_MUTEX_LOCK_NOEXCEPT Q_DECL_NOTHROW
@ -173,7 +173,7 @@ private:
quintptr val; quintptr val;
}; };
#else // QT_NO_THREAD or qdoc #else // QT_NO_THREAD or Q_QDOC
class Q_CORE_EXPORT QMutex class Q_CORE_EXPORT QMutex
{ {
@ -207,7 +207,7 @@ private:
typedef QMutex QBasicMutex; typedef QMutex QBasicMutex;
#endif // QT_NO_THREAD or qdoc #endif // QT_NO_THREAD or Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE

4
src/corelib/thread/qresultstore.h
View File

@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
either individually or in batches. either individually or in batches.
*/ */
#ifndef qdoc #ifndef Q_QDOC
namespace QtPrivate { namespace QtPrivate {
@ -231,7 +231,7 @@ public:
} // namespace QtPrivate } // namespace QtPrivate
#endif //qdoc #endif //Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER

4
src/corelib/thread/qthread.h
View File

@ -113,12 +113,12 @@ public:
Q_SIGNALS: Q_SIGNALS:
void started( void started(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );
void finished( void finished(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );

2
src/corelib/tools/qalgorithms.h
View File

@ -140,7 +140,7 @@ inline void qCount(const Container &container, const T &value, Size &n)
qCount(container.constBegin(), container.constEnd(), value, n); qCount(container.constBegin(), container.constEnd(), value, n);
} }
#ifdef qdoc #ifdef Q_QDOC
template <typename T> template <typename T>
LessThan qLess() LessThan qLess()
{ {

8
src/corelib/tools/qtimeline.h
View File

@ -126,22 +126,22 @@ public Q_SLOTS:
Q_SIGNALS: Q_SIGNALS:
void valueChanged(qreal x void valueChanged(qreal x
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void frameChanged(int void frameChanged(int
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void stateChanged(QTimeLine::State newState void stateChanged(QTimeLine::State newState
#if !defined(qdoc) #if !defined(Q_QDOC)
, QPrivateSignal , QPrivateSignal
#endif #endif
); );
void finished( void finished(
#if !defined(qdoc) #if !defined(Q_QDOC)
QPrivateSignal QPrivateSignal
#endif #endif
); );

2
src/dbus/qdbusmetatype.h
View File

@ -76,7 +76,7 @@ void qDBusDemarshallHelper(const QDBusArgument &arg, T *t)
template<typename T> template<typename T>
int qDBusRegisterMetaType( int qDBusRegisterMetaType(
#ifndef qdoc #ifndef Q_QDOC
T * /* dummy */ = 0 T * /* dummy */ = 0
#endif #endif
) )

4
src/gui/accessible/qaccessible.h
View File

@ -64,7 +64,7 @@ class QWindow;
// We need to inherit QObject to expose the enums to QML. // We need to inherit QObject to expose the enums to QML.
class Q_GUI_EXPORT QAccessible class Q_GUI_EXPORT QAccessible
#ifndef qdoc #ifndef Q_QDOC
:public QObject :public QObject
#endif #endif
{ {
@ -269,7 +269,7 @@ public:
StaticText = 0x00000029, StaticText = 0x00000029,
EditableText = 0x0000002A, // Editable, selectable, etc. EditableText = 0x0000002A, // Editable, selectable, etc.
Button = 0x0000002B, Button = 0x0000002B,
#ifndef qdoc #ifndef Q_QDOC
PushButton = Button, // deprecated PushButton = Button, // deprecated
#endif #endif
CheckBox = 0x0000002C, CheckBox = 0x0000002C,

2
src/gui/image/qimage.h
View File

@ -122,7 +122,7 @@ public:
Format_Grayscale2, Format_Grayscale2,
Format_Grayscale2LSB Format_Grayscale2LSB
#endif #endif
#ifndef qdoc #ifndef Q_QDOC
NImageFormats NImageFormats
#endif #endif
}; };

2
src/gui/kernel/qkeysequence.h
View File

@ -61,7 +61,7 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QKeySequence &ks);
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &out, QKeySequence &ks); Q_GUI_EXPORT QDataStream &operator>>(QDataStream &out, QKeySequence &ks);
#endif #endif
#ifdef qdoc #ifdef Q_QDOC
void qt_set_sequence_auto_mnemonic(bool b); void qt_set_sequence_auto_mnemonic(bool b);
#endif #endif

2
src/printsupport/dialogs/qprintdialog.h
View File

@ -91,7 +91,7 @@ public:
#endif #endif
void open(QObject *receiver, const char *member); void open(QObject *receiver, const char *member);
#ifdef qdoc #ifdef Q_QDOC
QPrinter *printer(); QPrinter *printer();
#endif #endif

2
src/printsupport/kernel/qprinter.h
View File

@ -221,7 +221,7 @@ public:
QRectF paperRect(Unit) const; QRectF paperRect(Unit) const;
QRectF pageRect(Unit) const; QRectF pageRect(Unit) const;
#if !defined(Q_OS_WIN) || defined(qdoc) #if !defined(Q_OS_WIN) || defined(Q_QDOC)
QString printerSelectionOption() const; QString printerSelectionOption() const;
void setPrinterSelectionOption(const QString &); void setPrinterSelectionOption(const QString &);
#endif #endif

2
src/testlib/qtestcase.h
View File

@ -249,7 +249,7 @@ namespace QTest
Q_TESTLIB_EXPORT bool compare_string_helper(const char *t1, const char *t2, const char *actual, Q_TESTLIB_EXPORT bool compare_string_helper(const char *t1, const char *t2, const char *actual,
const char *expected, const char *file, int line); const char *expected, const char *file, int line);
#ifndef qdoc #ifndef Q_QDOC
QTEST_COMPARE_DECL(short) QTEST_COMPARE_DECL(short)
QTEST_COMPARE_DECL(ushort) QTEST_COMPARE_DECL(ushort)
QTEST_COMPARE_DECL(int) QTEST_COMPARE_DECL(int)

2
src/widgets/dialogs/qmessagebox.h
View File

@ -288,7 +288,7 @@ public:
Q_SIGNALS: Q_SIGNALS:
void buttonClicked(QAbstractButton *button); void buttonClicked(QAbstractButton *button);
#ifdef qdoc #ifdef Q_QDOC
public Q_SLOTS: public Q_SLOTS:
int exec(); int exec();
#endif #endif