diff options
author | Yuhang Zhao <2546789017@qq.com> | 2022-07-15 13:48:58 +0800 |
---|---|---|
committer | Yuhang Zhao <2546789017@qq.com> | 2022-07-19 14:39:02 +0800 |
commit | 0923817ddadd35e43bc09449436e282f834d566f (patch) | |
tree | 0da6450e0e8decfdc6ad58946ec1723c629f61a7 /src/qml | |
parent | 99a35ac26a6523252bb041ea00af6ff0b8c237c2 (diff) |
Remove Qt key words from header files
So that users can use QT_NO_KEYWORDS when linking against QtDeclarative,
even if they are using private headers.
Docs, examples and tools are not touched because it's not necessary.
Pick-to: 6.4
Change-Id: Idc30797074aaa72576429ebdaaf915d7f5acf84e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/debugger/qqmlabstractprofileradapter_p.h | 6 | ||||
-rw-r--r-- | src/qml/debugger/qqmlconfigurabledebugservice_p.h | 4 | ||||
-rw-r--r-- | src/qml/debugger/qqmldebugservice_p.h | 6 | ||||
-rw-r--r-- | src/qml/debugger/qqmlprofiler_p.h | 2 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4profiling_p.h | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/qml/debugger/qqmlabstractprofileradapter_p.h b/src/qml/debugger/qqmlabstractprofileradapter_p.h index 0028937420..bd59c41aa7 100644 --- a/src/qml/debugger/qqmlabstractprofileradapter_p.h +++ b/src/qml/debugger/qqmlabstractprofileradapter_p.h @@ -43,7 +43,7 @@ public: void stopProfiling(); - void reportData() { emit dataRequested(); } + void reportData() { Q_EMIT dataRequested(); } void stopWaiting() { waiting = false; } void startWaiting() { waiting = true; } @@ -51,9 +51,9 @@ public: bool isRunning() const { return featuresEnabled != 0; } quint64 features() const { return featuresEnabled; } - void synchronize(const QElapsedTimer &t) { emit referenceTimeKnown(t); } + void synchronize(const QElapsedTimer &t) { Q_EMIT referenceTimeKnown(t); } -signals: +Q_SIGNALS: void profilingEnabled(quint64 features); void profilingEnabledWhileWaiting(quint64 features); diff --git a/src/qml/debugger/qqmlconfigurabledebugservice_p.h b/src/qml/debugger/qqmlconfigurabledebugservice_p.h index 288cdba2ef..8451f4e800 100644 --- a/src/qml/debugger/qqmlconfigurabledebugservice_p.h +++ b/src/qml/debugger/qqmlconfigurabledebugservice_p.h @@ -38,7 +38,7 @@ protected: QMutexLocker lock(&m_configMutex); m_waitingForConfiguration = false; for (QJSEngine *engine : qAsConst(m_waitingEngines)) - emit Base::attachedToEngine(engine); + Q_EMIT Base::attachedToEngine(engine); m_waitingEngines.clear(); } @@ -64,7 +64,7 @@ protected: if (m_waitingForConfiguration) m_waitingEngines.append(engine); else - emit Base::attachedToEngine(engine); + Q_EMIT Base::attachedToEngine(engine); } QRecursiveMutex m_configMutex; diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h index 73a7dc27b0..b92c61146c 100644 --- a/src/qml/debugger/qqmldebugservice_p.h +++ b/src/qml/debugger/qqmldebugservice_p.h @@ -46,8 +46,8 @@ public: virtual void stateChanged(State) {} virtual void messageReceived(const QByteArray &) {} - virtual void engineAboutToBeAdded(QJSEngine *engine) { emit attachedToEngine(engine); } - virtual void engineAboutToBeRemoved(QJSEngine *engine) { emit detachedFromEngine(engine); } + virtual void engineAboutToBeAdded(QJSEngine *engine) { Q_EMIT attachedToEngine(engine); } + virtual void engineAboutToBeRemoved(QJSEngine *engine) { Q_EMIT detachedFromEngine(engine); } virtual void engineAdded(QJSEngine *) {} virtual void engineRemoved(QJSEngine *) {} @@ -59,7 +59,7 @@ public: protected: explicit QQmlDebugService(const QString &, float version, QObject *parent = nullptr); -signals: +Q_SIGNALS: void attachedToEngine(QJSEngine *); void detachedFromEngine(QJSEngine *); diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h index 1362e5bf8f..e56c3e7948 100644 --- a/src/qml/debugger/qqmlprofiler_p.h +++ b/src/qml/debugger/qqmlprofiler_p.h @@ -353,7 +353,7 @@ public: void reportData(); void setTimer(const QElapsedTimer &timer) { m_timer = timer; } -signals: +Q_SIGNALS: void dataReady(const QVector<QQmlProfilerData> &, const QQmlProfiler::LocationHash &); protected: diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h index f974c2cb43..ee0213d89a 100644 --- a/src/qml/jsruntime/qv4profiling_p.h +++ b/src/qml/jsruntime/qv4profiling_p.h @@ -218,7 +218,7 @@ public: void reportData(); void setTimer(const QElapsedTimer &timer) { m_timer = timer; } -signals: +Q_SIGNALS: void dataReady(const QV4::Profiling::FunctionLocationHash &, const QVector<QV4::Profiling::FunctionCallProperties> &, const QVector<QV4::Profiling::MemoryAllocationProperties> &); diff --git a/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h b/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h index 2fa4d4f26e..47e59b4bba 100644 --- a/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h +++ b/src/qml/qml/qqmltypeloadernetworkreplyproxy_p.h @@ -37,7 +37,7 @@ class QQmlTypeLoaderNetworkReplyProxy : public QObject public: QQmlTypeLoaderNetworkReplyProxy(QQmlTypeLoader *l); -public slots: +public Q_SLOTS: void finished(); void downloadProgress(qint64, qint64); void manualFinished(QNetworkReply*); |