diff options
| author | Luca Di Sera <luca.disera@qt.io> | 2022-10-11 10:26:28 +0200 |
|---|---|---|
| committer | Luca Di Sera <luca.disera@qt.io> | 2022-10-21 09:48:36 +0200 |
| commit | e2fef733be92e95ff28225196e14ffeb98d61a1f (patch) | |
| tree | 42bc5a06849c48c89a74fc65a494a126e46b1797 /src/corelib/kernel/qobject.h | |
| parent | 2b35b89803bc90a3595be5386da905d79d841b73 (diff) | |
Replace usages of Q_CLANG_QDOC with Q_QDOC
To allow the user to customize the C++ code that QDoc sees, so as to be
able to work-around some limitations on QDoc itself, QDoc defines two
symbols: Q_QDOC and Q_CLANG_QDOC, both of which are "true" during an
entire execution of QDoc.
At a certain point in time, QDoc allowed the user the choice between a
custom C++ parser and a Clang based one.
The Q_QDOC symbol would always be defined while the Q_CLANG_QDOC symbol
would be defined only when the Clang based parser was chosen.
In more recent times, QDoc always uses a Clang based parser, such that
both Q_CLANG_QDOC and Q_QDOC are always defined, making them equivalent.
To avoid using different symbols, and the possible confusion and
fragmentation that derives from it, all usages of Q_CLANG_QDOC are now
replaced by the equivalent usages of Q_QDOC.
Change-Id: I5810abb9ad1016a4c5bbea99acd03381b8514b3f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/corelib/kernel/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 358f151495..075529571f 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -101,7 +101,7 @@ public: virtual bool event(QEvent *event); virtual bool eventFilter(QObject *watched, QEvent *event); -#if defined(QT_NO_TRANSLATION) || defined(Q_CLANG_QDOC) +#if defined(QT_NO_TRANSLATION) || defined(Q_QDOC) static QString tr(const char *sourceText, const char * = nullptr, int = -1) { return QString::fromUtf8(sourceText); } #endif // QT_NO_TRANSLATION @@ -188,7 +188,7 @@ public: inline QMetaObject::Connection connect(const QObject *sender, const char *signal, const char *member, Qt::ConnectionType type = Qt::AutoConnection) const; -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename PointerToMemberFunction> static QMetaObject::Connection connect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method, Qt::ConnectionType type = Qt::AutoConnection); template<typename PointerToMemberFunction, typename Functor> @@ -311,7 +311,7 @@ public: typename SignalType::ReturnType>(std::move(slot)), type, types, &SignalType::Object::staticMetaObject); } -#endif //Q_CLANG_QDOC +#endif //Q_QDOC static bool disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *member); @@ -324,7 +324,7 @@ public: { return disconnect(this, nullptr, receiver, member); } static bool disconnect(const QMetaObject::Connection &); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename PointerToMemberFunction> static bool disconnect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method); #else @@ -357,7 +357,7 @@ public: return disconnectImpl(sender, reinterpret_cast<void **>(&signal), receiver, zero, &SignalType::Object::staticMetaObject); } -#endif //Q_CLANG_QDOC +#endif //Q_QDOC void dumpObjectTree() const; void dumpObjectInfo() const; @@ -466,7 +466,7 @@ qobject_iid_cast(const QObject *object) return qobject_iid_cast<std::remove_cv_t<T>>(o); } -#if defined(Q_CLANG_QDOC) +#if defined(Q_QDOC) # define Q_DECLARE_INTERFACE(IFace, IId) #elif !defined(Q_MOC_RUN) # define Q_DECLARE_INTERFACE(IFace, IId) \ |