diff options
author | Yuhang Zhao <2546789017@qq.com> | 2022-12-07 14:27:01 +0800 |
---|---|---|
committer | Yuhang Zhao <2546789017@qq.com> | 2022-12-09 11:55:10 +0800 |
commit | 781714aefb8bb8df0794cff7fc79c971c0fcf17a (patch) | |
tree | 3602ddf016a8582af1f475edaa95dfc7327aea46 | |
parent | f756c201c56454f4162de05a3c6bc264e8b7a758 (diff) |
Remove Qt keywords from all headers
It's good practice to do so.
Change-Id: I72435ff99aaee942c1d3b488ec5dedd7e82d1047
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r-- | src/quick/items/qquicktableview_p.h | 2 | ||||
-rw-r--r-- | tools/qml/conf.h | 6 | ||||
-rw-r--r-- | tools/qmleasing/mainwindow.h | 4 | ||||
-rw-r--r-- | tools/qmleasing/segmentproperties.h | 6 | ||||
-rw-r--r-- | tools/qmleasing/splineeditor.h | 4 | ||||
-rw-r--r-- | tools/qmlls/qlanguageserver.h | 4 | ||||
-rw-r--r-- | tools/qmlls/qmlcompletionsupport.h | 2 | ||||
-rw-r--r-- | tools/qmlls/qmllintsuggestions.h | 2 | ||||
-rw-r--r-- | tools/qmlls/qqmlcodemodel.h | 2 | ||||
-rw-r--r-- | tools/qmlls/qqmllanguageserver.h | 2 | ||||
-rw-r--r-- | tools/qmlls/textsynchronization.h | 2 | ||||
-rw-r--r-- | tools/qmlls/workspace.h | 2 | ||||
-rw-r--r-- | tools/qmlpreview/qmlpreviewfilesystemwatcher.h | 2 | ||||
-rw-r--r-- | tools/qmlprofiler/commandlistener.h | 2 | ||||
-rw-r--r-- | tools/qmlprofiler/qmlprofilerapplication.h | 2 | ||||
-rw-r--r-- | tools/qmlprofiler/qmlprofilerclient.h | 2 | ||||
-rw-r--r-- | tools/qmlprofiler/qmlprofilerdata.h | 2 |
17 files changed, 21 insertions, 27 deletions
diff --git a/src/quick/items/qquicktableview_p.h b/src/quick/items/qquicktableview_p.h index bce6b55b54..2dc06e92fd 100644 --- a/src/quick/items/qquicktableview_p.h +++ b/src/quick/items/qquicktableview_p.h @@ -288,7 +288,7 @@ public: if (m_editDelegate == newEditDelegate) return; m_editDelegate = newEditDelegate; - emit editDelegateChanged(); + Q_EMIT editDelegateChanged(); } Q_SIGNALS: diff --git a/tools/qml/conf.h b/tools/qml/conf.h index d3f311af03..d105359037 100644 --- a/tools/qml/conf.h +++ b/tools/qml/conf.h @@ -27,16 +27,16 @@ public: if (a==m_container) return; m_container = a; - emit containerChanged(); + Q_EMIT containerChanged(); } void setItemType(const QString &a) { if (a==m_itemType) return; m_itemType = a; - emit itemTypeChanged(); + Q_EMIT itemTypeChanged(); } -signals: +Q_SIGNALS: void containerChanged(); void itemTypeChanged(); diff --git a/tools/qmleasing/mainwindow.h b/tools/qmleasing/mainwindow.h index a6a36983ae..34e3d6365e 100644 --- a/tools/qmleasing/mainwindow.h +++ b/tools/qmleasing/mainwindow.h @@ -19,9 +19,7 @@ public: void showQuickView(); -signals: - -public slots: +public Q_SLOTS: void textEditTextChanged(); void importData(int result); diff --git a/tools/qmleasing/segmentproperties.h b/tools/qmleasing/segmentproperties.h index 02617c54ef..cfdea24e77 100644 --- a/tools/qmleasing/segmentproperties.h +++ b/tools/qmleasing/segmentproperties.h @@ -28,11 +28,7 @@ public: invalidate(); } -signals: - -public slots: - -private slots: +private Q_SLOTS: void c1Updated(); void c2Updated(); void pUpdated(); diff --git a/tools/qmleasing/splineeditor.h b/tools/qmleasing/splineeditor.h index 1e87e6a28a..3a1a7da3e9 100644 --- a/tools/qmleasing/splineeditor.h +++ b/tools/qmleasing/splineeditor.h @@ -39,12 +39,12 @@ public: //update(); } -signals: +Q_SIGNALS: void easingCurveChanged(); void easingCurveCodeChanged(const QString &code); -public slots: +public Q_SLOTS: void setEasingCurve(const QEasingCurve &easingCurve); void setPreset(const QString &name); void setEasingCurve(const QString &code); diff --git a/tools/qmlls/qlanguageserver.h b/tools/qmlls/qlanguageserver.h index 322e083d06..d4172b192c 100644 --- a/tools/qmlls/qlanguageserver.h +++ b/tools/qmlls/qlanguageserver.h @@ -71,9 +71,9 @@ public: const QLspSpecification::InitializeParams &clientInfo() const; const QLspSpecification::InitializeResult &serverInfo() const; -public slots: +public Q_SLOTS: void receiveData(const QByteArray &d); -signals: +Q_SIGNALS: void runStatusChanged(RunStatus); void clientInitialized(QLanguageServer *server); void shutdown(); diff --git a/tools/qmlls/qmlcompletionsupport.h b/tools/qmlls/qmlcompletionsupport.h index 12744aca3c..ce149667bd 100644 --- a/tools/qmlls/qmlcompletionsupport.h +++ b/tools/qmlls/qmlcompletionsupport.h @@ -35,7 +35,7 @@ public: void registerHandlers(QLanguageServer *server, QLanguageServerProtocol *protocol) override; void setupCapabilities(const QLspSpecification::InitializeParams &clientInfo, QLspSpecification::InitializeResult &) override; -public slots: +public Q_SLOTS: void updatedSnapshot(const QByteArray &uri); private: diff --git a/tools/qmlls/qmllintsuggestions.h b/tools/qmlls/qmllintsuggestions.h index bf91a8f9e9..9d738a269f 100644 --- a/tools/qmlls/qmllintsuggestions.h +++ b/tools/qmlls/qmllintsuggestions.h @@ -23,7 +23,7 @@ public: QmlLintSuggestions(QLanguageServer *server, QmlLsp::QQmlCodeModel *codeModel); QString name() const override { return QLatin1StringView("QmlLint Suggestions"); } -public slots: +public Q_SLOTS: void diagnose(const QByteArray &uri); void registerHandlers(QLanguageServer *server, QLanguageServerProtocol *protocol) override; void setupCapabilities(const QLspSpecification::InitializeParams &clientInfo, diff --git a/tools/qmlls/qqmlcodemodel.h b/tools/qmlls/qqmlcodemodel.h index 38a0f7d7f2..549f7dd1a1 100644 --- a/tools/qmlls/qqmlcodemodel.h +++ b/tools/qmlls/qqmlcodemodel.h @@ -88,7 +88,7 @@ public: void setBuildPathsForRootUrl(QByteArray url, const QStringList &paths); void removeRootUrls(const QList<QByteArray> &urls); QQmlToolingSettings *settings(); -signals: +Q_SIGNALS: void updatedSnapshot(const QByteArray &url); private: void indexDirectory(const QString &path, int depthLeft); diff --git a/tools/qmlls/qqmllanguageserver.h b/tools/qmlls/qqmllanguageserver.h index 6decc264bd..7efe93990a 100644 --- a/tools/qmlls/qqmllanguageserver.h +++ b/tools/qmlls/qqmllanguageserver.h @@ -47,7 +47,7 @@ public: QmlLintSuggestions *lint(); WorkspaceHandlers *worspace(); -public slots: +public Q_SLOTS: void exit(); void errorExit(); diff --git a/tools/qmlls/textsynchronization.h b/tools/qmlls/textsynchronization.h index ded0b8b66f..69076aa81b 100644 --- a/tools/qmlls/textsynchronization.h +++ b/tools/qmlls/textsynchronization.h @@ -19,7 +19,7 @@ public: void setupCapabilities(const QLspSpecification::InitializeParams &clientInfo, QLspSpecification::InitializeResult &) override; -public slots: +public Q_SLOTS: void didOpenTextDocument(const QLspSpecification::DidOpenTextDocumentParams ¶ms); void didDidChangeTextDocument(const QLspSpecification::DidChangeTextDocumentParams ¶ms); void didCloseTextDocument(const QLspSpecification::DidCloseTextDocumentParams ¶ms); diff --git a/tools/qmlls/workspace.h b/tools/qmlls/workspace.h index d7da092261..03dcf291d1 100644 --- a/tools/qmlls/workspace.h +++ b/tools/qmlls/workspace.h @@ -19,7 +19,7 @@ public: void registerHandlers(QLanguageServer *server, QLanguageServerProtocol *protocol) override; void setupCapabilities(const QLspSpecification::InitializeParams &clientInfo, QLspSpecification::InitializeResult &) override; -public slots: +public Q_SLOTS: void clientInitialized(QLanguageServer *); private: diff --git a/tools/qmlpreview/qmlpreviewfilesystemwatcher.h b/tools/qmlpreview/qmlpreviewfilesystemwatcher.h index 63dd8e22b2..6304405b9d 100644 --- a/tools/qmlpreview/qmlpreviewfilesystemwatcher.h +++ b/tools/qmlpreview/qmlpreviewfilesystemwatcher.h @@ -23,7 +23,7 @@ public: void removeDirectory(const QString &file); bool watchesDirectory(const QString &file) const; -signals: +Q_SIGNALS: void fileChanged(const QString &path); void directoryChanged(const QString &path); diff --git a/tools/qmlprofiler/commandlistener.h b/tools/qmlprofiler/commandlistener.h index 92153ea405..65ba3682bd 100644 --- a/tools/qmlprofiler/commandlistener.h +++ b/tools/qmlprofiler/commandlistener.h @@ -11,7 +11,7 @@ class CommandListener : public QObject { public: void readCommand(); -signals: +Q_SIGNALS: void command(const QString &command); }; diff --git a/tools/qmlprofiler/qmlprofilerapplication.h b/tools/qmlprofiler/qmlprofilerapplication.h index 98a078442d..b02faa7c9d 100644 --- a/tools/qmlprofiler/qmlprofilerapplication.h +++ b/tools/qmlprofiler/qmlprofilerapplication.h @@ -37,7 +37,7 @@ public: void notifyTraceStarted(); void outputData(); -signals: +Q_SIGNALS: void readyForCommand(); private: diff --git a/tools/qmlprofiler/qmlprofilerclient.h b/tools/qmlprofiler/qmlprofilerclient.h index ab2def4e95..b6558869bc 100644 --- a/tools/qmlprofiler/qmlprofilerclient.h +++ b/tools/qmlprofiler/qmlprofilerclient.h @@ -18,7 +18,7 @@ class QmlProfilerClient : public QQmlProfilerClient public: QmlProfilerClient(QQmlDebugConnection *connection, QmlProfilerData *data); -signals: +Q_SIGNALS: void enabledChanged(bool enabled); void error(const QString &error); diff --git a/tools/qmlprofiler/qmlprofilerdata.h b/tools/qmlprofiler/qmlprofilerdata.h index c629d38a4d..95b8869fac 100644 --- a/tools/qmlprofiler/qmlprofilerdata.h +++ b/tools/qmlprofiler/qmlprofilerdata.h @@ -45,7 +45,7 @@ public: void complete(); bool save(const QString &filename); -signals: +Q_SIGNALS: void error(QString); void stateChanged(); void dataReady(); |