diff --git a/src/plugins/git/gerrit/authenticationdialog.h b/src/plugins/git/gerrit/authenticationdialog.h index 99d94a39d8d..e666851e383 100644 --- a/src/plugins/git/gerrit/authenticationdialog.h +++ b/src/plugins/git/gerrit/authenticationdialog.h @@ -19,8 +19,6 @@ class GerritServer; class AuthenticationDialog : public QDialog { - Q_DECLARE_TR_FUNCTIONS(Gerrit::Internal::AuthenticationDialog) - public: AuthenticationDialog(GerritServer *server); ~AuthenticationDialog() override; diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp index bc83a7fd57b..779d175b80f 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -689,7 +690,7 @@ static BuildInfo createBuildInfo(const Kit *k, const FilePath &projectPath, if (type == BuildConfiguration::Release) { //: The name of the release build configuration created by default for a qmake project. - info.displayName = BuildConfigurationTr::tr("Release"); + info.displayName = ::ProjectExplorer::Tr::tr("Release"); //: Non-ASCII characters in directory suffix may cause build issues. suffix = Tr::tr("Release", "Shadow build directory suffix"); if (settings.qtQuickCompiler.value() == TriState::Default) { @@ -699,12 +700,12 @@ static BuildInfo createBuildInfo(const Kit *k, const FilePath &projectPath, } else { if (type == BuildConfiguration::Debug) { //: The name of the debug build configuration created by default for a qmake project. - info.displayName = BuildConfigurationTr::tr("Debug"); + info.displayName = ::ProjectExplorer::Tr::tr("Debug"); //: Non-ASCII characters in directory suffix may cause build issues. suffix = Tr::tr("Debug", "Shadow build directory suffix"); } else if (type == BuildConfiguration::Profile) { //: The name of the profile build configuration created by default for a qmake project. - info.displayName = BuildConfigurationTr::tr("Profile"); + info.displayName = ::ProjectExplorer::Tr::tr("Profile"); //: Non-ASCII characters in directory suffix may cause build issues. suffix = Tr::tr("Profile", "Shadow build directory suffix"); if (settings.separateDebugInfo.value() == TriState::Default) diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h index 3f1361e3b09..1eb7ca38fcf 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h @@ -12,9 +12,4 @@ struct Tr Q_DECLARE_TR_FUNCTIONS(::QmakeProjectManager) }; -struct BuildConfigurationTr -{ - Q_DECLARE_TR_FUNCTIONS(::BuildConfiguration) -}; - } // namespace QmakeProjectManager diff --git a/src/plugins/qmljseditor/qmljshoverhandler.h b/src/plugins/qmljseditor/qmljshoverhandler.h index 93804936417..9ebd457b57a 100644 --- a/src/plugins/qmljseditor/qmljshoverhandler.h +++ b/src/plugins/qmljseditor/qmljshoverhandler.h @@ -24,8 +24,6 @@ class QmlJSEditorWidget; class QMLJSEDITOR_EXPORT QmlJSHoverHandler : public TextEditor::BaseHoverHandler { - Q_DECLARE_TR_FUNCTIONS(QmlJSHoverHandler) - public: QmlJSHoverHandler(); diff --git a/src/plugins/qmljseditor/qmljsquickfixes.cpp b/src/plugins/qmljseditor/qmljsquickfixes.cpp index 2226dc395df..f6baa01509d 100644 --- a/src/plugins/qmljseditor/qmljsquickfixes.cpp +++ b/src/plugins/qmljseditor/qmljsquickfixes.cpp @@ -105,8 +105,6 @@ class AnalysizeMessageSuppressionOperation: public QmlJSQuickFixOperation { StaticAnalysis::Message _message; - Q_DECLARE_TR_FUNCTIONS(AddAnalysisMessageSuppressionComment) - public: AnalysizeMessageSuppressionOperation(const Internal::QmlJSQuickFixAssistInterface *interface, const StaticAnalysis::Message &message) diff --git a/src/plugins/qmljseditor/qmljswrapinloader.cpp b/src/plugins/qmljseditor/qmljswrapinloader.cpp index 2b0d05928ec..91a762191aa 100644 --- a/src/plugins/qmljseditor/qmljswrapinloader.cpp +++ b/src/plugins/qmljseditor/qmljswrapinloader.cpp @@ -62,8 +62,6 @@ protected: template class Operation: public QmlJSQuickFixOperation { - Q_DECLARE_TR_FUNCTIONS(QmlJSEditor::Internal::Operation) - T *m_objDef; public: diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index a3cb3f49de4..af3134a69da 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -54,7 +54,6 @@ private: class QmlProfilerEventStorage : public Timeline::TraceEventStorage { - Q_DECLARE_TR_FUNCTIONS(QmlProfilerEventStorage) public: using ErrorHandler = std::function;