diff options
Diffstat (limited to 'src')
133 files changed, 214 insertions, 206 deletions
diff --git a/src/plugins/android/androidtr.h b/src/plugins/android/androidtr.h index 67ebf299a42..1293ced7c60 100644 --- a/src/plugins/android/androidtr.h +++ b/src/plugins/android/androidtr.h @@ -9,7 +9,7 @@ namespace Android { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Android) + Q_DECLARE_TR_FUNCTIONS(::Android) }; } // namespace Android diff --git a/src/plugins/autotest/autotesttr.h b/src/plugins/autotest/autotesttr.h index 9e266dd746d..117dc6bcddc 100644 --- a/src/plugins/autotest/autotesttr.h +++ b/src/plugins/autotest/autotesttr.h @@ -9,7 +9,7 @@ namespace Autotest { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Autotest) + Q_DECLARE_TR_FUNCTIONS(::Autotest) }; } // namespace Autotest diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanagertr.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanagertr.h index 039a595e355..9d7672c8046 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanagertr.h +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanagertr.h @@ -9,7 +9,7 @@ namespace AutotoolsProjectManager { struct Tr { - Q_DECLARE_TR_FUNCTIONS(AutotoolsProjectManager) + Q_DECLARE_TR_FUNCTIONS(::AutotoolsProjectManager) }; } // namespace AutotoolsProjectManager diff --git a/src/plugins/baremetal/baremetaltr.h b/src/plugins/baremetal/baremetaltr.h index 0708d059fd3..ec035c1c4d3 100644 --- a/src/plugins/baremetal/baremetaltr.h +++ b/src/plugins/baremetal/baremetaltr.h @@ -9,7 +9,7 @@ namespace BareMetal { struct Tr { - Q_DECLARE_TR_FUNCTIONS(BareMetal) + Q_DECLARE_TR_FUNCTIONS(::BareMetal) }; } // namespace BareMetal diff --git a/src/plugins/bazaar/bazaartr.h b/src/plugins/bazaar/bazaartr.h index 19e4666cb94..27abb9eaeb6 100644 --- a/src/plugins/bazaar/bazaartr.h +++ b/src/plugins/bazaar/bazaartr.h @@ -9,7 +9,7 @@ namespace Bazaar { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Bazaar) + Q_DECLARE_TR_FUNCTIONS(::Bazaar) }; } // namespace Bazaar diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index 73ed7beea20..b685fa1fc99 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -4,6 +4,7 @@ #include "beautifierplugin.h" #include "beautifierconstants.h" +#include "beautifiertr.h" #include "generaloptionspage.h" #include "generalsettings.h" @@ -99,7 +100,7 @@ bool BeautifierPlugin::initialize(const QStringList &arguments, QString *errorSt Q_UNUSED(errorString) Core::ActionContainer *menu = Core::ActionManager::createMenu(Constants::MENU_ID); - menu->menu()->setTitle(QCoreApplication::translate("Beautifier", "Bea&utifier")); + menu->menu()->setTitle(Tr::tr("Bea&utifier")); menu->setOnAllDisabledBehavior(Core::ActionContainer::Show); Core::ActionManager::actionContainer(Core::Constants::M_TOOLS)->addMenu(menu); return true; diff --git a/src/plugins/beautifier/beautifiertr.h b/src/plugins/beautifier/beautifiertr.h index cbb2266c1ea..68a82ad3587 100644 --- a/src/plugins/beautifier/beautifiertr.h +++ b/src/plugins/beautifier/beautifiertr.h @@ -9,7 +9,7 @@ namespace Beautifier { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Beautifier) + Q_DECLARE_TR_FUNCTIONS(::Beautifier) }; } // namespace Beautifier diff --git a/src/plugins/beautifier/generaloptionspage.cpp b/src/plugins/beautifier/generaloptionspage.cpp index 4c65d2e180a..2ffbbf7e9b9 100644 --- a/src/plugins/beautifier/generaloptionspage.cpp +++ b/src/plugins/beautifier/generaloptionspage.cpp @@ -4,6 +4,7 @@ #include "generaloptionspage.h" #include "beautifierconstants.h" +#include "beautifiertr.h" #include "generalsettings.h" #include <utils/layoutbuilder.h> @@ -98,7 +99,7 @@ GeneralOptionsPage::GeneralOptionsPage(const QStringList &toolIds) setId(Constants::OPTION_GENERAL_ID); setDisplayName(GeneralOptionsPageWidget::tr("General")); setCategory(Constants::OPTION_CATEGORY); - setDisplayCategory(QCoreApplication::translate("Beautifier", "Beautifier")); + setDisplayCategory(Tr::tr("Beautifier")); setWidgetCreator([toolIds] { return new GeneralOptionsPageWidget(toolIds); }); setCategoryIconPath(":/beautifier/images/settingscategory_beautifier.png"); } diff --git a/src/plugins/bineditor/bineditortr.h b/src/plugins/bineditor/bineditortr.h index d0932cd3d7d..34d3de9bb8f 100644 --- a/src/plugins/bineditor/bineditortr.h +++ b/src/plugins/bineditor/bineditortr.h @@ -9,7 +9,7 @@ namespace BinEditor { struct Tr { - Q_DECLARE_TR_FUNCTIONS(BinEditor) + Q_DECLARE_TR_FUNCTIONS(::BinEditor) }; } // BinEditor diff --git a/src/plugins/bookmarks/bookmarkstr.h b/src/plugins/bookmarks/bookmarkstr.h index 813096766ea..ab0999c4f4c 100644 --- a/src/plugins/bookmarks/bookmarkstr.h +++ b/src/plugins/bookmarks/bookmarkstr.h @@ -9,7 +9,7 @@ namespace Bookmarks { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Bookmarks) + Q_DECLARE_TR_FUNCTIONS(::Bookmarks) }; } // namespace Bookmarks diff --git a/src/plugins/boot2qt/boot2qttr.h b/src/plugins/boot2qt/boot2qttr.h index 1edecbe1969..cff48d4e8e5 100644 --- a/src/plugins/boot2qt/boot2qttr.h +++ b/src/plugins/boot2qt/boot2qttr.h @@ -9,7 +9,7 @@ namespace Boot2Qt { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Boot2Qt) + Q_DECLARE_TR_FUNCTIONS(::Boot2Qt) }; } // namespace Boot2Qt diff --git a/src/plugins/boot2qt/qdbutils.cpp b/src/plugins/boot2qt/qdbutils.cpp index 47ce38b5564..e430dc69fbd 100644 --- a/src/plugins/boot2qt/qdbutils.cpp +++ b/src/plugins/boot2qt/qdbutils.cpp @@ -65,7 +65,7 @@ QString overridingEnvironmentVariable(QdbTool tool) void showMessage(const QString &message, bool important) { - const QString fullMessage = QCoreApplication::translate("Boot2Qt", "Boot2Qt: %1").arg(message); + const QString fullMessage = QCoreApplication::translate("::Boot2Qt", "Boot2Qt: %1").arg(message); if (important) Core::MessageManager::writeFlashing(fullMessage); else diff --git a/src/plugins/clangcodemodel/clangcodemodeltr.h b/src/plugins/clangcodemodel/clangcodemodeltr.h index 9691de386d3..1eb14dce9c5 100644 --- a/src/plugins/clangcodemodel/clangcodemodeltr.h +++ b/src/plugins/clangcodemodel/clangcodemodeltr.h @@ -9,7 +9,7 @@ namespace ClangCodeModel { struct Tr { - Q_DECLARE_TR_FUNCTIONS(ClangCodeModel) + Q_DECLARE_TR_FUNCTIONS(::ClangCodeModel) }; } // namespace ClangCodeModel diff --git a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp index 071969b907c..ccebcee7275 100644 --- a/src/plugins/clangcodemodel/clangdlocatorfilters.cpp +++ b/src/plugins/clangcodemodel/clangdlocatorfilters.cpp @@ -121,7 +121,8 @@ ClangGlobalSymbolFilter::ClangGlobalSymbolFilter(ILocatorFilter *cppFilter, : m_cppFilter(cppFilter), m_lspFilter(lspFilter) { setId(CppEditor::Constants::LOCATOR_FILTER_ID); - setDisplayName(CppEditor::Constants::LOCATOR_FILTER_DISPLAY_NAME); + setDisplayName(QCoreApplication::translate("::CppEditor", + CppEditor::Constants::LOCATOR_FILTER_DISPLAY_NAME)); setDefaultShortcutString(":"); setDefaultIncludedByDefault(false); } @@ -188,7 +189,8 @@ ClangClassesFilter::ClangClassesFilter() : ClangGlobalSymbolFilter(new CppClassesFilter, new LspClassesFilter) { setId(CppEditor::Constants::CLASSES_FILTER_ID); - setDisplayName(CppEditor::Constants::CLASSES_FILTER_DISPLAY_NAME); + setDisplayName(QCoreApplication::translate("::CppEditor", + CppEditor::Constants::CLASSES_FILTER_DISPLAY_NAME)); setDefaultShortcutString("c"); setDefaultIncludedByDefault(false); } @@ -197,7 +199,8 @@ ClangFunctionsFilter::ClangFunctionsFilter() : ClangGlobalSymbolFilter(new CppFunctionsFilter, new LspFunctionsFilter) { setId(CppEditor::Constants::FUNCTIONS_FILTER_ID); - setDisplayName(CppEditor::Constants::FUNCTIONS_FILTER_DISPLAY_NAME); + setDisplayName(QCoreApplication::translate(":CppEditor", + CppEditor::Constants::FUNCTIONS_FILTER_DISPLAY_NAME)); setDefaultShortcutString("m"); setDefaultIncludedByDefault(false); } @@ -253,7 +256,9 @@ public: ClangdCurrentDocumentFilter::ClangdCurrentDocumentFilter() : d(new Private) { setId(CppEditor::Constants::CURRENT_DOCUMENT_FILTER_ID); - setDisplayName(CppEditor::Constants::CURRENT_DOCUMENT_FILTER_DISPLAY_NAME); + setDisplayName( + QCoreApplication::translate("::CppEditor", + CppEditor::Constants::CURRENT_DOCUMENT_FILTER_DISPLAY_NAME)); setDefaultShortcutString("."); setPriority(High); setDefaultIncludedByDefault(false); diff --git a/src/plugins/clangcodemodel/clangdmemoryusagewidget.h b/src/plugins/clangcodemodel/clangdmemoryusagewidget.h index 23bfd105137..a9a6bb9922b 100644 --- a/src/plugins/clangcodemodel/clangdmemoryusagewidget.h +++ b/src/plugins/clangcodemodel/clangdmemoryusagewidget.h @@ -11,7 +11,7 @@ class ClangdClient; class ClangdMemoryUsageWidget : public QWidget { - Q_DECLARE_TR_FUNCTIONS(ClangCodeModel) + Q_DECLARE_TR_FUNCTIONS(::ClangCodeModel) public: explicit ClangdMemoryUsageWidget(ClangdClient *client); ~ClangdMemoryUsageWidget(); diff --git a/src/plugins/clangformat/clangformattr.h b/src/plugins/clangformat/clangformattr.h index b17e7ff9e9b..e99806b0153 100644 --- a/src/plugins/clangformat/clangformattr.h +++ b/src/plugins/clangformat/clangformattr.h @@ -9,7 +9,7 @@ namespace ClangFormat { struct Tr { - Q_DECLARE_TR_FUNCTIONS(ClangFormat) + Q_DECLARE_TR_FUNCTIONS(::ClangFormat) }; } // namespace ClangFormat diff --git a/src/plugins/clangtools/clangtoolstr.h b/src/plugins/clangtools/clangtoolstr.h index c446c5bd1ac..933b0342195 100644 --- a/src/plugins/clangtools/clangtoolstr.h +++ b/src/plugins/clangtools/clangtoolstr.h @@ -9,7 +9,7 @@ namespace ClangTools { struct Tr { - Q_DECLARE_TR_FUNCTIONS(ClangTools) + Q_DECLARE_TR_FUNCTIONS(::ClangTools) }; } // namespace ClangTools diff --git a/src/plugins/classview/classviewtr.h b/src/plugins/classview/classviewtr.h index bbf2922c2bc..ca218d0402f 100644 --- a/src/plugins/classview/classviewtr.h +++ b/src/plugins/classview/classviewtr.h @@ -9,7 +9,7 @@ namespace ClassView { struct Tr { - Q_DECLARE_TR_FUNCTIONS(ClassView) + Q_DECLARE_TR_FUNCTIONS(::ClassView) }; } // namespace ClassView diff --git a/src/plugins/clearcase/clearcasetr.h b/src/plugins/clearcase/clearcasetr.h index c318ab0b5be..fbf44395a31 100644 --- a/src/plugins/clearcase/clearcasetr.h +++ b/src/plugins/clearcase/clearcasetr.h @@ -9,7 +9,7 @@ namespace ClearCase { struct Tr { - Q_DECLARE_TR_FUNCTIONS(ClearCase) + Q_DECLARE_TR_FUNCTIONS(::ClearCase) }; } // namespace ClearCase diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanagertr.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanagertr.h index 627bf6f8345..5e201908ccf 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanagertr.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanagertr.h @@ -9,7 +9,7 @@ namespace CMakeProjectManager { struct Tr { - Q_DECLARE_TR_FUNCTIONS(CMakeProjectManager) + Q_DECLARE_TR_FUNCTIONS(::CMakeProjectManager) }; } // namespace CMakeProjectManager diff --git a/src/plugins/coco/cocotr.h b/src/plugins/coco/cocotr.h index b646ebf3f37..a69b436506d 100644 --- a/src/plugins/coco/cocotr.h +++ b/src/plugins/coco/cocotr.h @@ -9,7 +9,7 @@ namespace Coco { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Coco) + Q_DECLARE_TR_FUNCTIONS(::Coco) }; } // namespace Coco diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagertr.h b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagertr.h index 6a83f878c6e..7e7d3dc708c 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagertr.h +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagertr.h @@ -9,7 +9,7 @@ namespace CompilationDatabaseProjectManager { struct Tr { - Q_DECLARE_TR_FUNCTIONS(CompilationDatabaseProjectManager) + Q_DECLARE_TR_FUNCTIONS(::CompilationDatabaseProjectManager) }; } // namespace CompilationDatabaseProjectManager diff --git a/src/plugins/conan/conantr.h b/src/plugins/conan/conantr.h index 2b57e84b111..b8ff19c9a0b 100644 --- a/src/plugins/conan/conantr.h +++ b/src/plugins/conan/conantr.h @@ -9,7 +9,7 @@ namespace Conan { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Conan) + Q_DECLARE_TR_FUNCTIONS(::Conan) }; } // Conan diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 9ea914b57e1..6846177b683 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -86,11 +86,11 @@ const char CYCLE_MODE_SELECTOR_STYLE[] = const char TOGGLE_FULLSCREEN[] = "QtCreator.ToggleFullScreen"; const char THEMEOPTIONS[] = "QtCreator.ThemeOptions"; -const char TR_SHOW_LEFT_SIDEBAR[] = QT_TRANSLATE_NOOP("Core", "Show Left Sidebar"); -const char TR_HIDE_LEFT_SIDEBAR[] = QT_TRANSLATE_NOOP("Core", "Hide Left Sidebar"); +const char TR_SHOW_LEFT_SIDEBAR[] = QT_TRANSLATE_NOOP("::Core", "Show Left Sidebar"); +const char TR_HIDE_LEFT_SIDEBAR[] = QT_TRANSLATE_NOOP("::Core", "Hide Left Sidebar"); -const char TR_SHOW_RIGHT_SIDEBAR[] = QT_TRANSLATE_NOOP("Core", "Show Right Sidebar"); -const char TR_HIDE_RIGHT_SIDEBAR[] = QT_TRANSLATE_NOOP("Core", "Hide Right Sidebar"); +const char TR_SHOW_RIGHT_SIDEBAR[] = QT_TRANSLATE_NOOP("::Core", "Show Right Sidebar"); +const char TR_HIDE_RIGHT_SIDEBAR[] = QT_TRANSLATE_NOOP("::Core", "Hide Right Sidebar"); const char MINIMIZE_WINDOW[] = "QtCreator.MinimizeWindow"; const char ZOOM_WINDOW[] = "QtCreator.ZoomWindow"; @@ -190,7 +190,7 @@ const char G_TOUCHBAR_NAVIGATION[] = "QtCreator.Group.TouchBar.Navigation"; const char G_TOUCHBAR_OTHER[] = "QtCreator.Group.TouchBar.Other"; const char WIZARD_CATEGORY_QT[] = "R.Qt"; -const char WIZARD_TR_CATEGORY_QT[] = QT_TRANSLATE_NOOP("Core", "Qt"); +const char WIZARD_TR_CATEGORY_QT[] = QT_TRANSLATE_NOOP("::Core", "Qt"); const char WIZARD_KIND_UNKNOWN[] = "unknown"; const char WIZARD_KIND_PROJECT[] = "project"; const char WIZARD_KIND_FILE[] = "file"; diff --git a/src/plugins/coreplugin/coreplugintr.h b/src/plugins/coreplugin/coreplugintr.h index 1bee6aaa0ff..f9281fd7289 100644 --- a/src/plugins/coreplugin/coreplugintr.h +++ b/src/plugins/coreplugin/coreplugintr.h @@ -9,7 +9,7 @@ namespace Core { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Core) + Q_DECLARE_TR_FUNCTIONS(::Core) }; } // namespace Core diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index 5cb133a6107..403bd1a0f72 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -755,9 +755,9 @@ QString DocumentManager::fileDialogFilter(QString *selectedFilter) } #ifdef Q_OS_WIN -static struct {const char *source; const char *comment; } ALL_FILES_FILTER = QT_TRANSLATE_NOOP3("Core", "All Files (*.*)", "On Windows"); +static struct {const char *source; const char *comment; } ALL_FILES_FILTER = QT_TRANSLATE_NOOP3("::Core", "All Files (*.*)", "On Windows"); #else -static struct {const char *source; const char *comment; } ALL_FILES_FILTER = QT_TRANSLATE_NOOP3("Core", "All Files (*)", "On Linux/macOS"); +static struct {const char *source; const char *comment; } ALL_FILES_FILTER = QT_TRANSLATE_NOOP3("::Core", "All Files (*)", "On Linux/macOS"); #endif QString DocumentManager::allFilesFilterString() diff --git a/src/plugins/cpaster/cpastertr.h b/src/plugins/cpaster/cpastertr.h index d2bed0aa7d7..46d2c2ca360 100644 --- a/src/plugins/cpaster/cpastertr.h +++ b/src/plugins/cpaster/cpastertr.h @@ -9,7 +9,7 @@ namespace CodePaster { struct Tr { - Q_DECLARE_TR_FUNCTIONS(CodePaster) + Q_DECLARE_TR_FUNCTIONS(::CodePaster) }; } // namespace CodePaster diff --git a/src/plugins/cppcheck/cppchecktr.h b/src/plugins/cppcheck/cppchecktr.h index 5bb526ef78e..6e016de5598 100644 --- a/src/plugins/cppcheck/cppchecktr.h +++ b/src/plugins/cppcheck/cppchecktr.h @@ -9,7 +9,7 @@ namespace Cppcheck { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Cppcheck) + Q_DECLARE_TR_FUNCTIONS(::Cppcheck) }; } // namespace Cppcheck diff --git a/src/plugins/cppeditor/cppcodestylepreferencesfactory.cpp b/src/plugins/cppeditor/cppcodestylepreferencesfactory.cpp index 5f33439f912..26255bb74e9 100644 --- a/src/plugins/cppeditor/cppcodestylepreferencesfactory.cpp +++ b/src/plugins/cppeditor/cppcodestylepreferencesfactory.cpp @@ -3,9 +3,10 @@ #include "cppcodestylepreferencesfactory.h" -#include "cppcodestylesettingspage.h" #include "cppcodestylepreferences.h" +#include "cppcodestylesettingspage.h" #include "cppeditorconstants.h" +#include "cppeditortr.h" #include "cppqtstyleindenter.h" #include <QLayout> @@ -67,7 +68,7 @@ Utils::Id CppCodeStylePreferencesFactory::languageId() QString CppCodeStylePreferencesFactory::displayName() { - return QString::fromUtf8(Constants::CPP_SETTINGS_NAME); + return Tr::tr(Constants::CPP_SETTINGS_NAME); } TextEditor::ICodeStylePreferences *CppCodeStylePreferencesFactory::createCodeStyle() const diff --git a/src/plugins/cppeditor/cppcurrentdocumentfilter.cpp b/src/plugins/cppeditor/cppcurrentdocumentfilter.cpp index 320fc02e76f..6c7c4448069 100644 --- a/src/plugins/cppeditor/cppcurrentdocumentfilter.cpp +++ b/src/plugins/cppeditor/cppcurrentdocumentfilter.cpp @@ -20,7 +20,8 @@ CppCurrentDocumentFilter::CppCurrentDocumentFilter(CppModelManager *manager) : m_modelManager(manager) { setId(Constants::CURRENT_DOCUMENT_FILTER_ID); - setDisplayName(Constants::CURRENT_DOCUMENT_FILTER_DISPLAY_NAME); + setDisplayName(QCoreApplication::translate("::CppEditor", + Constants::CURRENT_DOCUMENT_FILTER_DISPLAY_NAME)); setDefaultShortcutString("."); setPriority(High); setDefaultIncludedByDefault(false); diff --git a/src/plugins/cppeditor/cppeditorconstants.h b/src/plugins/cppeditor/cppeditorconstants.h index 638070f4c77..f0b4ee861b2 100644 --- a/src/plugins/cppeditor/cppeditorconstants.h +++ b/src/plugins/cppeditor/cppeditorconstants.h @@ -34,7 +34,7 @@ const char PREFERRED_PARSE_CONTEXT[] = "CppEditor.PreferredParseContext-"; const char QUICK_FIX_PROJECT_PANEL_ID[] = "CppEditor.QuickFix"; const char QUICK_FIX_SETTINGS_ID[] = "CppEditor.QuickFix"; -const char QUICK_FIX_SETTINGS_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppEditor", "Quick Fixes"); +const char QUICK_FIX_SETTINGS_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::CppEditor", "Quick Fixes"); const char QUICK_FIX_SETTING_GETTER_OUTSIDE_CLASS_FROM[] = "GettersOutsideClassFrom"; const char QUICK_FIX_SETTING_GETTER_IN_CPP_FILE_FROM[] = "GettersInCppFileFrom"; const char QUICK_FIX_SETTING_SETTER_OUTSIDE_CLASS_FROM[] = "SettersOutsideClassFrom"; @@ -105,25 +105,28 @@ const char CPP_CLANG_FIXIT_AVAILABLE_MARKER_ID[] = "ClangFixItAvailableMarker"; const char CPP_FUNCTION_DECL_DEF_LINK_MARKER_ID[] = "FunctionDeclDefLinkMarker"; const char CPP_SETTINGS_ID[] = "Cpp"; -const char CPP_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("CppEditor", "C++"); +const char CPP_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("::CppEditor", "C++"); const char CURRENT_DOCUMENT_FILTER_ID[] = "Methods in current Document"; -const char CURRENT_DOCUMENT_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppEditor", "C++ Symbols in Current Document"); +const char CURRENT_DOCUMENT_FILTER_DISPLAY_NAME[] + = QT_TRANSLATE_NOOP("::CppEditor", "C++ Symbols in Current Document"); const char CLASSES_FILTER_ID[] = "Classes"; -const char CLASSES_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppEditor", "C++ Classes"); +const char CLASSES_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::CppEditor", "C++ Classes"); const char FUNCTIONS_FILTER_ID[] = "Methods"; -const char FUNCTIONS_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppEditor", "C++ Functions"); +const char FUNCTIONS_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::CppEditor", "C++ Functions"); const char INCLUDES_FILTER_ID[] = "All Included C/C++ Files"; -const char INCLUDES_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppEditor", "All Included C/C++ Files"); +const char INCLUDES_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::CppEditor", + "All Included C/C++ Files"); const char LOCATOR_FILTER_ID[] = "Classes and Methods"; -const char LOCATOR_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppEditor", "C++ Classes, Enums, Functions and Type Aliases"); +const char LOCATOR_FILTER_DISPLAY_NAME[] + = QT_TRANSLATE_NOOP("::CppEditor", "C++ Classes, Enums, Functions and Type Aliases"); const char SYMBOLS_FIND_FILTER_ID[] = "Symbols"; -const char SYMBOLS_FIND_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("CppEditor", "C++ Symbols"); +const char SYMBOLS_FIND_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::CppEditor", "C++ Symbols"); constexpr const char CLANG_STATIC_ANALYZER_DOCUMENTATION_URL[] = "https://clang-analyzer.llvm.org/available_checks.html"; diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index a732ab0aef9..3b82803a00e 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/src/plugins/cppeditor/cppeditorplugin.cpp @@ -277,8 +277,7 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err const auto quickFixSettingsPanelFactory = new ProjectPanelFactory; quickFixSettingsPanelFactory->setPriority(100); quickFixSettingsPanelFactory->setId(Constants::QUICK_FIX_PROJECT_PANEL_ID); - quickFixSettingsPanelFactory->setDisplayName( - Tr::tr("CppEditor", Constants::QUICK_FIX_SETTINGS_DISPLAY_NAME)); + quickFixSettingsPanelFactory->setDisplayName(Tr::tr(Constants::QUICK_FIX_SETTINGS_DISPLAY_NAME)); quickFixSettingsPanelFactory->setCreateWidgetFunction([](Project *project) { return new CppQuickFixProjectSettingsWidget(project); }); diff --git a/src/plugins/cppeditor/cppeditortr.h b/src/plugins/cppeditor/cppeditortr.h index ae75a0b5fdf..e764d5ad335 100644 --- a/src/plugins/cppeditor/cppeditortr.h +++ b/src/plugins/cppeditor/cppeditortr.h @@ -9,7 +9,7 @@ namespace CppEditor { struct Tr { - Q_DECLARE_TR_FUNCTIONS(CppEditor) + Q_DECLARE_TR_FUNCTIONS(::CppEditor) }; } // namespace CppEditor diff --git a/src/plugins/cppeditor/cppincludesfilter.cpp b/src/plugins/cppeditor/cppincludesfilter.cpp index a59a7c90f16..9f637f6582b 100644 --- a/src/plugins/cppeditor/cppincludesfilter.cpp +++ b/src/plugins/cppeditor/cppincludesfilter.cpp @@ -97,7 +97,7 @@ void CppIncludesIterator::fetchMore() CppIncludesFilter::CppIncludesFilter() { setId(Constants::INCLUDES_FILTER_ID); - setDisplayName(Constants::INCLUDES_FILTER_DISPLAY_NAME); + setDisplayName(Tr::tr(Constants::INCLUDES_FILTER_DISPLAY_NAME)); setDescription( Tr::tr("Matches all files that are included by all C++ files in all projects. Append " "\"+<number>\" or \":<number>\" to jump to the given line number. Append another " diff --git a/src/plugins/cppeditor/cpplocatorfilter.cpp b/src/plugins/cppeditor/cpplocatorfilter.cpp index 6c2874ac1a3..083c5df1b2f 100644 --- a/src/plugins/cppeditor/cpplocatorfilter.cpp +++ b/src/plugins/cppeditor/cpplocatorfilter.cpp @@ -4,7 +4,7 @@ #include "cpplocatorfilter.h" #include "cppeditorconstants.h" -#include "cppmodelmanager.h" +#include "cppeditortr.h" #include <coreplugin/editormanager/editormanager.h> #include <utils/algorithm.h> @@ -20,7 +20,7 @@ CppLocatorFilter::CppLocatorFilter(CppLocatorData *locatorData) : m_data(locatorData) { setId(Constants::LOCATOR_FILTER_ID); - setDisplayName(Constants::LOCATOR_FILTER_DISPLAY_NAME); + setDisplayName(Tr::tr(Constants::LOCATOR_FILTER_DISPLAY_NAME)); setDefaultShortcutString(":"); setDefaultIncludedByDefault(false); } @@ -129,7 +129,7 @@ CppClassesFilter::CppClassesFilter(CppLocatorData *locatorData) : CppLocatorFilter(locatorData) { setId(Constants::CLASSES_FILTER_ID); - setDisplayName(Constants::CLASSES_FILTER_DISPLAY_NAME); + setDisplayName(Tr::tr(Constants::CLASSES_FILTER_DISPLAY_NAME)); setDefaultShortcutString("c"); setDefaultIncludedByDefault(false); } @@ -151,7 +151,7 @@ CppFunctionsFilter::CppFunctionsFilter(CppLocatorData *locatorData) : CppLocatorFilter(locatorData) { setId(Constants::FUNCTIONS_FILTER_ID); - setDisplayName(Constants::FUNCTIONS_FILTER_DISPLAY_NAME); + setDisplayName(Tr::tr(Constants::FUNCTIONS_FILTER_DISPLAY_NAME)); setDefaultShortcutString("m"); setDefaultIncludedByDefault(false); } diff --git a/src/plugins/cppeditor/cppquickfixsettingspage.cpp b/src/plugins/cppeditor/cppquickfixsettingspage.cpp index 85d02130721..05aa4c586a8 100644 --- a/src/plugins/cppeditor/cppquickfixsettingspage.cpp +++ b/src/plugins/cppeditor/cppquickfixsettingspage.cpp @@ -16,7 +16,7 @@ namespace CppEditor::Internal { CppQuickFixSettingsPage::CppQuickFixSettingsPage() { setId(Constants::QUICK_FIX_SETTINGS_ID); - setDisplayName(Tr::tr("CppEditor", Constants::QUICK_FIX_SETTINGS_DISPLAY_NAME)); + setDisplayName(Tr::tr(Constants::QUICK_FIX_SETTINGS_DISPLAY_NAME)); setCategory(Constants::CPP_SETTINGS_CATEGORY); } diff --git a/src/plugins/cppeditor/symbolsfindfilter.cpp b/src/plugins/cppeditor/symbolsfindfilter.cpp index ed8dd833620..3b901715b2c 100644 --- a/src/plugins/cppeditor/symbolsfindfilter.cpp +++ b/src/plugins/cppeditor/symbolsfindfilter.cpp @@ -54,7 +54,7 @@ QString SymbolsFindFilter::id() const QString SymbolsFindFilter::displayName() const { - return QString(Constants::SYMBOLS_FIND_FILTER_DISPLAY_NAME); + return Tr::tr(Constants::SYMBOLS_FIND_FILTER_DISPLAY_NAME); } bool SymbolsFindFilter::isEnabled() const diff --git a/src/plugins/ctfvisualizer/ctfvisualizertr.h b/src/plugins/ctfvisualizer/ctfvisualizertr.h index 7d418c49cdc..339fcca46a5 100644 --- a/src/plugins/ctfvisualizer/ctfvisualizertr.h +++ b/src/plugins/ctfvisualizer/ctfvisualizertr.h @@ -9,7 +9,7 @@ namespace CtfVisualizer { struct Tr { - Q_DECLARE_TR_FUNCTIONS(CtfVisualizer) + Q_DECLARE_TR_FUNCTIONS(::CtfVisualizer) }; } // namespace CtfVisualizer diff --git a/src/plugins/cvs/cvstr.h b/src/plugins/cvs/cvstr.h index 14791645a83..47f51fc17ab 100644 --- a/src/plugins/cvs/cvstr.h +++ b/src/plugins/cvs/cvstr.h @@ -9,7 +9,7 @@ namespace Cvs { struct Tr { - Q_DECLARE_TR_FUNCTIONS(CVS) + Q_DECLARE_TR_FUNCTIONS(::CVS) }; } // Cvs diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp index d502ff37282..72fecca154f 100644 --- a/src/plugins/debugger/console/console.cpp +++ b/src/plugins/debugger/console/console.cpp @@ -257,7 +257,7 @@ void Console::evaluate(const QString &expression) } else { auto item = new ConsoleItem( ConsoleItem::ErrorType, - QCoreApplication::translate("Debugger", "Can only evaluate during a debug session.")); + QCoreApplication::translate("::Debugger", "Can only evaluate during a debug session.")); m_consoleItemModel->shiftEditableRow(); printItem(item); } diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 7b51da8c084..ca04683856c 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -1071,19 +1071,19 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(const QStringList &arguments) debugMenu->addSeparator(); act = new QAction(this); - act->setText(QCoreApplication::translate("Debugger", "Move to Calling Frame")); + act->setText(QCoreApplication::translate("::Debugger", "Move to Calling Frame")); act->setEnabled(false); act->setVisible(false); ActionManager::registerAction(act, Constants::FRAME_UP); act = new QAction(this); - act->setText(QCoreApplication::translate("Debugger", "Move to Called Frame")); + act->setText(QCoreApplication::translate("::Debugger", "Move to Called Frame")); act->setEnabled(false); act->setVisible(false); ActionManager::registerAction(act, Constants::FRAME_DOWN); act = new QAction(this); - act->setText(QCoreApplication::translate("Debugger", "Operate by Instruction")); + act->setText(QCoreApplication::translate("::Debugger", "Operate by Instruction")); act->setEnabled(false); act->setVisible(false); act->setCheckable(true); diff --git a/src/plugins/debugger/debuggertr.h b/src/plugins/debugger/debuggertr.h index 9da1fe8f977..1333648e422 100644 --- a/src/plugins/debugger/debuggertr.h +++ b/src/plugins/debugger/debuggertr.h @@ -9,7 +9,7 @@ namespace Debugger { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Debugger) + Q_DECLARE_TR_FUNCTIONS(::Debugger) }; } // namespace Debugger diff --git a/src/plugins/designer/designertr.h b/src/plugins/designer/designertr.h index 5ba25c79442..7c20e593f60 100644 --- a/src/plugins/designer/designertr.h +++ b/src/plugins/designer/designertr.h @@ -9,7 +9,7 @@ namespace Designer { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Designer) + Q_DECLARE_TR_FUNCTIONS(::Designer) }; } // namespace Designer diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index 7359832c288..132d56663bf 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -67,7 +67,8 @@ bool FormEditorPlugin::initialize(const QStringList &arguments, QString *error) IWizardFactory::registerFactoryCreator([]() -> IWizardFactory * { IWizardFactory *wizard = new FormClassWizard; wizard->setCategory(Core::Constants::WIZARD_CATEGORY_QT); - wizard->setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::WIZARD_TR_CATEGORY_QT)); + wizard->setDisplayCategory( + QCoreApplication::translate("::Core", Core::Constants::WIZARD_TR_CATEGORY_QT)); wizard->setDisplayName(Tr::tr("Qt Designer Form Class")); wizard->setIcon({}, "ui/h"); wizard->setId("C.FormClass"); diff --git a/src/plugins/diffeditor/diffeditorconstants.h b/src/plugins/diffeditor/diffeditorconstants.h index b750413d47d..b7aebfb5bc2 100644 --- a/src/plugins/diffeditor/diffeditorconstants.h +++ b/src/plugins/diffeditor/diffeditorconstants.h @@ -11,7 +11,6 @@ namespace Constants { const char DIFF_EDITOR_PLUGIN[] = "DiffEditorPlugin"; const char DIFF_EDITOR_ID[] = "Diff Editor"; -const char DIFF_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("DiffEditor", "Diff Editor"); const char DIFF_EDITOR_MIMETYPE[] = "text/x-patch"; const char C_DIFF_EDITOR_DESCRIPTION[] = "DiffEditor.Description"; const char SIDE_BY_SIDE_VIEW_ID[] = "DiffEditor.SideBySide"; diff --git a/src/plugins/diffeditor/diffeditorfactory.cpp b/src/plugins/diffeditor/diffeditorfactory.cpp index 5982a91548c..a771fda53a1 100644 --- a/src/plugins/diffeditor/diffeditorfactory.cpp +++ b/src/plugins/diffeditor/diffeditorfactory.cpp @@ -1,10 +1,11 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +#include "diffeditorfactory.h" #include "diffeditor.h" #include "diffeditorconstants.h" #include "diffeditordocument.h" -#include "diffeditorfactory.h" +#include "diffeditortr.h" #include "texteditor/texteditoractionhandler.h" @@ -44,7 +45,7 @@ DiffEditorFactory::DiffEditorFactory() : } { setId(Constants::DIFF_EDITOR_ID); - setDisplayName(QCoreApplication::translate("DiffEditorFactory", Constants::DIFF_EDITOR_DISPLAY_NAME)); + setDisplayName(Tr::tr("Diff Editor")); addMimeType(Constants::DIFF_EDITOR_MIMETYPE); setEditorCreator([] { return new DiffEditor(new DiffEditorDocument); }); } diff --git a/src/plugins/diffeditor/diffeditortr.h b/src/plugins/diffeditor/diffeditortr.h index 0df8c83bc42..ca5dc7f26d4 100644 --- a/src/plugins/diffeditor/diffeditortr.h +++ b/src/plugins/diffeditor/diffeditortr.h @@ -9,7 +9,7 @@ namespace DiffEditor { struct Tr { - Q_DECLARE_TR_FUNCTIONS(DiffEditor) + Q_DECLARE_TR_FUNCTIONS(::DiffEditor) }; } // namespace DiffEditor diff --git a/src/plugins/docker/dockerdevice.cpp b/src/plugins/docker/dockerdevice.cpp index 712c960ef0e..c6371484779 100644 --- a/src/plugins/docker/dockerdevice.cpp +++ b/src/plugins/docker/dockerdevice.cpp @@ -974,7 +974,7 @@ public: m_log->setVisible(dockerDeviceLog().isDebugEnabled()); const QString fail = QString{"Docker: "} - + QCoreApplication::translate("Debugger", "Process failed to start."); + + QCoreApplication::translate("::Debugger", "Process failed to start."); auto errorLabel = new Utils::InfoLabel(fail, Utils::InfoLabel::Error, this); errorLabel->setVisible(false); diff --git a/src/plugins/docker/dockertr.h b/src/plugins/docker/dockertr.h index 922111f0a9b..26f8d17a738 100644 --- a/src/plugins/docker/dockertr.h +++ b/src/plugins/docker/dockertr.h @@ -9,7 +9,7 @@ namespace Docker { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Docker) + Q_DECLARE_TR_FUNCTIONS(::Docker) }; } // namespace Docker diff --git a/src/plugins/emacskeys/emacskeystr.h b/src/plugins/emacskeys/emacskeystr.h index caa4537358a..f255fd31940 100644 --- a/src/plugins/emacskeys/emacskeystr.h +++ b/src/plugins/emacskeys/emacskeystr.h @@ -9,7 +9,7 @@ namespace EmacsKeys { struct Tr { - Q_DECLARE_TR_FUNCTIONS(EmacsKeys) + Q_DECLARE_TR_FUNCTIONS(::EmacsKeys) }; } // namespace EmacsKeys diff --git a/src/plugins/fakevim/fakevimtr.h b/src/plugins/fakevim/fakevimtr.h index 120205f1a5d..1595c932874 100644 --- a/src/plugins/fakevim/fakevimtr.h +++ b/src/plugins/fakevim/fakevimtr.h @@ -9,7 +9,7 @@ namespace FakeVim { struct Tr { - Q_DECLARE_TR_FUNCTIONS(FakeVim) + Q_DECLARE_TR_FUNCTIONS(::FakeVim) }; } // namespace FakeVim diff --git a/src/plugins/genericprojectmanager/genericprojectmanagertr.h b/src/plugins/genericprojectmanager/genericprojectmanagertr.h index b7faa832523..1b7f007714a 100644 --- a/src/plugins/genericprojectmanager/genericprojectmanagertr.h +++ b/src/plugins/genericprojectmanager/genericprojectmanagertr.h @@ -9,7 +9,7 @@ namespace GenericProjectManager { struct Tr { - Q_DECLARE_TR_FUNCTIONS(GenericProjectManager) + Q_DECLARE_TR_FUNCTIONS(::GenericProjectManager) }; } // namespace GenericProjectManager diff --git a/src/plugins/git/gittr.h b/src/plugins/git/gittr.h index 9f36b1764c7..852a7e9750d 100644 --- a/src/plugins/git/gittr.h +++ b/src/plugins/git/gittr.h @@ -9,7 +9,7 @@ namespace Git { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Git) + Q_DECLARE_TR_FUNCTIONS(::Git) }; } // namespace Git diff --git a/src/plugins/gitlab/gitlabtr.h b/src/plugins/gitlab/gitlabtr.h index 08dd1ac10ee..de69ab84e25 100644 --- a/src/plugins/gitlab/gitlabtr.h +++ b/src/plugins/gitlab/gitlabtr.h @@ -9,7 +9,7 @@ namespace GitLab { struct Tr { - Q_DECLARE_TR_FUNCTIONS(GitLab) + Q_DECLARE_TR_FUNCTIONS(::GitLab) }; } // namespace GitLab diff --git a/src/plugins/glsleditor/glsleditorconstants.h b/src/plugins/glsleditor/glsleditorconstants.h index f73f47f692b..687678b92d3 100644 --- a/src/plugins/glsleditor/glsleditorconstants.h +++ b/src/plugins/glsleditor/glsleditorconstants.h @@ -22,8 +22,5 @@ const char GLSL_MIMETYPE_FRAG[] = "text/x-glsl-frag"; const char GLSL_MIMETYPE_VERT_ES[] = "text/x-glsl-es-vert"; const char GLSL_MIMETYPE_FRAG_ES[] = "text/x-glsl-es-frag"; -const char WIZARD_CATEGORY_GLSL[] = "U.GLSL"; -const char WIZARD_TR_CATEGORY_GLSL[] = QT_TRANSLATE_NOOP("GLSLEditor", "GLSL"); - } // namespace Constants } // namespace GlslEditor diff --git a/src/plugins/glsleditor/glsleditortr.h b/src/plugins/glsleditor/glsleditortr.h index f259f4e15c4..8c16d30d486 100644 --- a/src/plugins/glsleditor/glsleditortr.h +++ b/src/plugins/glsleditor/glsleditortr.h @@ -9,7 +9,7 @@ namespace GLSLEditor { struct Tr { - Q_DECLARE_TR_FUNCTIONS(GLSLEditor) + Q_DECLARE_TR_FUNCTIONS(::GLSLEditor) }; } // namespace GLSLEditor diff --git a/src/plugins/helloworld/helloworldtr.h b/src/plugins/helloworld/helloworldtr.h index ffa60d88ff1..8d36b6f069e 100644 --- a/src/plugins/helloworld/helloworldtr.h +++ b/src/plugins/helloworld/helloworldtr.h @@ -9,7 +9,7 @@ namespace HelloWorld { struct Tr { - Q_DECLARE_TR_FUNCTIONS(HelloWorld) + Q_DECLARE_TR_FUNCTIONS(::HelloWorld) }; } // namespace HelloWorld diff --git a/src/plugins/help/helptr.h b/src/plugins/help/helptr.h index 8185a1352d5..ef046f7319d 100644 --- a/src/plugins/help/helptr.h +++ b/src/plugins/help/helptr.h @@ -9,7 +9,7 @@ namespace Help { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Help) + Q_DECLARE_TR_FUNCTIONS(::Help) }; } // namespace Help diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp index 87edfbb821d..d0b822ecfe0 100644 --- a/src/plugins/help/helpwidget.cpp +++ b/src/plugins/help/helpwidget.cpp @@ -221,20 +221,21 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget setAttribute(Qt::WA_QuitOnClose, false); // don't prevent Qt Creator from closing } if (style != SideBarWidget) { - m_toggleSideBarAction = new QAction(Utils::Icons::TOGGLE_LEFT_SIDEBAR_TOOLBAR.icon(), - QCoreApplication::translate("Core", Core::Constants::TR_SHOW_LEFT_SIDEBAR), - toolBar); + m_toggleSideBarAction + = new QAction(Utils::Icons::TOGGLE_LEFT_SIDEBAR_TOOLBAR.icon(), + QCoreApplication::translate("::Core", + Core::Constants::TR_SHOW_LEFT_SIDEBAR), + toolBar); m_toggleSideBarAction->setCheckable(true); m_toggleSideBarAction->setChecked(false); cmd = Core::ActionManager::registerAction(m_toggleSideBarAction, Core::Constants::TOGGLE_LEFT_SIDEBAR, context); - connect(m_toggleSideBarAction, &QAction::toggled, m_toggleSideBarAction, - [this](bool checked) { - m_toggleSideBarAction->setText( - QCoreApplication::translate("Core", - checked ? Core::Constants::TR_HIDE_LEFT_SIDEBAR - : Core::Constants::TR_SHOW_LEFT_SIDEBAR)); - }); + connect(m_toggleSideBarAction, &QAction::toggled, m_toggleSideBarAction, [this](bool checked) { + m_toggleSideBarAction->setText( + QCoreApplication::translate("::Core", + checked ? Core::Constants::TR_HIDE_LEFT_SIDEBAR + : Core::Constants::TR_SHOW_LEFT_SIDEBAR)); + }); addSideBar(); m_toggleSideBarAction->setChecked(m_sideBar->isVisibleTo(this)); connect(m_toggleSideBarAction, &QAction::triggered, m_sideBar, &Core::SideBar::setVisible); diff --git a/src/plugins/imageviewer/imageviewertr.h b/src/plugins/imageviewer/imageviewertr.h index d93ce660993..040a2744548 100644 --- a/src/plugins/imageviewer/imageviewertr.h +++ b/src/plugins/imageviewer/imageviewertr.h @@ -9,7 +9,7 @@ namespace ImageViewer { struct Tr { - Q_DECLARE_TR_FUNCTIONS(ImageViewer) + Q_DECLARE_TR_FUNCTIONS(::ImageViewer) }; } // namespace ImageViewer diff --git a/src/plugins/incredibuild/incredibuildtr.h b/src/plugins/incredibuild/incredibuildtr.h index 39dbc1e0e84..b1ce097c6c1 100644 --- a/src/plugins/incredibuild/incredibuildtr.h +++ b/src/plugins/incredibuild/incredibuildtr.h @@ -9,7 +9,7 @@ namespace IncrediBuild { struct Tr { - Q_DECLARE_TR_FUNCTIONS(IncrediBuild) + Q_DECLARE_TR_FUNCTIONS(::IncrediBuild) }; } // namespace IncrediBuild diff --git a/src/plugins/ios/iostr.h b/src/plugins/ios/iostr.h index 2f100a353f6..9af6c3dad52 100644 --- a/src/plugins/ios/iostr.h +++ b/src/plugins/ios/iostr.h @@ -9,7 +9,7 @@ namespace Ios { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Ios) + Q_DECLARE_TR_FUNCTIONS(::Ios) }; } // namespace Ios diff --git a/src/plugins/languageclient/languageclient_global.h b/src/plugins/languageclient/languageclient_global.h index 4279d2f7e8e..4e57d0057d6 100644 --- a/src/plugins/languageclient/languageclient_global.h +++ b/src/plugins/languageclient/languageclient_global.h @@ -19,15 +19,15 @@ namespace Constants { const char LANGUAGECLIENT_SETTINGS_CATEGORY[] = "ZY.LanguageClient"; const char LANGUAGECLIENT_SETTINGS_PAGE[] = "LanguageClient.General"; const char LANGUAGECLIENT_STDIO_SETTINGS_ID[] = "LanguageClient::StdIOSettingsID"; -const char LANGUAGECLIENT_SETTINGS_TR[] = QT_TRANSLATE_NOOP("LanguageClient", "Language Client"); +const char LANGUAGECLIENT_SETTINGS_TR[] = QT_TRANSLATE_NOOP("::LanguageClient", "Language Client"); const char LANGUAGECLIENT_DOCUMENT_FILTER_ID[] = "Current Document Symbols"; -const char LANGUAGECLIENT_DOCUMENT_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("LanguageClient", "Symbols in Current Document"); +const char LANGUAGECLIENT_DOCUMENT_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Symbols in Current Document"); const char LANGUAGECLIENT_WORKSPACE_FILTER_ID[] = "Workspace Symbols"; -const char LANGUAGECLIENT_WORKSPACE_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("LanguageClient", "Symbols in Workspace"); +const char LANGUAGECLIENT_WORKSPACE_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Symbols in Workspace"); const char LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_ID[] = "Workspace Classes and Structs"; -const char LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("LanguageClient", "Classes and Structs in Workspace"); +const char LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Classes and Structs in Workspace"); const char LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_ID[] = "Workspace Functions and Methods"; -const char LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("LanguageClient", "Functions and Methods in Workspace"); +const char LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::LanguageClient", "Functions and Methods in Workspace"); } // namespace Constants } // namespace LanguageClient diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index ac98ffe834f..55390e1aef0 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -270,8 +270,7 @@ LanguageClientSettingsPage::LanguageClientSettingsPage() setId(Constants::LANGUAGECLIENT_SETTINGS_PAGE); setDisplayName(tr("General")); setCategory(Constants::LANGUAGECLIENT_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("LanguageClient", - Constants::LANGUAGECLIENT_SETTINGS_TR)); + setDisplayCategory(Tr::tr(Constants::LANGUAGECLIENT_SETTINGS_TR)); setCategoryIconPath(":/languageclient/images/settingscategory_languageclient.png"); connect(&m_model, &LanguageClientSettingsModel::dataChanged, [this](const QModelIndex &index) { if (BaseSettings *setting = m_model.settingForIndex(index)) diff --git a/src/plugins/languageclient/languageclienttr.h b/src/plugins/languageclient/languageclienttr.h index 0b813d9dc2b..261d8745c27 100644 --- a/src/plugins/languageclient/languageclienttr.h +++ b/src/plugins/languageclient/languageclienttr.h @@ -9,7 +9,7 @@ namespace LanguageClient { struct Tr { - Q_DECLARE_TR_FUNCTIONS(LanguageClient) + Q_DECLARE_TR_FUNCTIONS(::LanguageClient) }; } // namespace LanguageClient diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp index d34cd0d1811..ae1dd9bbe72 100644 --- a/src/plugins/languageclient/locatorfilter.cpp +++ b/src/plugins/languageclient/locatorfilter.cpp @@ -6,6 +6,7 @@ #include "documentsymbolcache.h" #include "languageclient_global.h" #include "languageclientmanager.h" +#include "languageclienttr.h" #include "languageclientutils.h" #include <coreplugin/editormanager/editormanager.h> @@ -29,7 +30,7 @@ namespace LanguageClient { DocumentLocatorFilter::DocumentLocatorFilter() { setId(Constants::LANGUAGECLIENT_DOCUMENT_FILTER_ID); - setDisplayName(Constants::LANGUAGECLIENT_DOCUMENT_FILTER_DISPLAY_NAME); + setDisplayName(Tr::tr(Constants::LANGUAGECLIENT_DOCUMENT_FILTER_DISPLAY_NAME)); setDescription( tr("Matches all symbols from the current document, based on a language server.")); setDefaultShortcutString("."); @@ -232,7 +233,7 @@ WorkspaceLocatorFilter::WorkspaceLocatorFilter(const QVector<SymbolKind> &filter : m_filterKinds(filter) { setId(Constants::LANGUAGECLIENT_WORKSPACE_FILTER_ID); - setDisplayName(Constants::LANGUAGECLIENT_WORKSPACE_FILTER_DISPLAY_NAME); + setDisplayName(Tr::tr(Constants::LANGUAGECLIENT_WORKSPACE_FILTER_DISPLAY_NAME)); setDefaultShortcutString(":"); setDefaultIncludedByDefault(false); setPriority(ILocatorFilter::Low); @@ -344,7 +345,7 @@ WorkspaceClassLocatorFilter::WorkspaceClassLocatorFilter() : WorkspaceLocatorFilter({SymbolKind::Class, SymbolKind::Struct}) { setId(Constants::LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_ID); - setDisplayName(Constants::LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_DISPLAY_NAME); + setDisplayName(Tr::tr(Constants::LANGUAGECLIENT_WORKSPACE_CLASS_FILTER_DISPLAY_NAME)); setDefaultShortcutString("c"); } @@ -352,7 +353,7 @@ WorkspaceMethodLocatorFilter::WorkspaceMethodLocatorFilter() : WorkspaceLocatorFilter({SymbolKind::Method, SymbolKind::Function, SymbolKind::Constructor}) { setId(Constants::LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_ID); - setDisplayName(Constants::LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DISPLAY_NAME); + setDisplayName(Tr::tr(Constants::LANGUAGECLIENT_WORKSPACE_METHOD_FILTER_DISPLAY_NAME)); setDefaultShortcutString("m"); } diff --git a/src/plugins/macros/macrosconstants.h b/src/plugins/macros/macrosconstants.h index 47d1ec18aaf..9a69d519b8d 100644 --- a/src/plugins/macros/macrosconstants.h +++ b/src/plugins/macros/macrosconstants.h @@ -17,7 +17,6 @@ const char SAVE_LAST_MACRO[] = "Macros.SaveLastMacro"; const char PREFIX_MACRO[] = "Macros."; const char M_OPTIONS_PAGE[] = "Macros"; -const char M_OPTIONS_TR_PAGE[] = QT_TRANSLATE_NOOP("Macros", "Macros"); const char M_STATUS_BUFFER[] = "Macros.Status"; diff --git a/src/plugins/macros/macrostr.h b/src/plugins/macros/macrostr.h index a1134b86f28..854a9db8935 100644 --- a/src/plugins/macros/macrostr.h +++ b/src/plugins/macros/macrostr.h @@ -9,7 +9,7 @@ namespace Macros { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Macros) + Q_DECLARE_TR_FUNCTIONS(::Macros) }; } // namespace Macros diff --git a/src/plugins/marketplace/marketplacetr.h b/src/plugins/marketplace/marketplacetr.h index dc656057369..95404ec64a3 100644 --- a/src/plugins/marketplace/marketplacetr.h +++ b/src/plugins/marketplace/marketplacetr.h @@ -9,7 +9,7 @@ namespace Marketplace { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Marketplace) + Q_DECLARE_TR_FUNCTIONS(::Marketplace) }; } // namespace Marketplace diff --git a/src/plugins/mcusupport/mcusupporttr.h b/src/plugins/mcusupport/mcusupporttr.h index 125396725f2..c63ca55bdb7 100644 --- a/src/plugins/mcusupport/mcusupporttr.h +++ b/src/plugins/mcusupport/mcusupporttr.h @@ -9,7 +9,7 @@ namespace McuSupport { struct Tr { - Q_DECLARE_TR_FUNCTIONS(McuSupport) + Q_DECLARE_TR_FUNCTIONS(::McuSupport) }; } // namespace McuSupport diff --git a/src/plugins/mercurial/mercurialtr.h b/src/plugins/mercurial/mercurialtr.h index d40d4ac935b..f220cc8d8aa 100644 --- a/src/plugins/mercurial/mercurialtr.h +++ b/src/plugins/mercurial/mercurialtr.h @@ -9,7 +9,7 @@ namespace Mercurial { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Mercurial) + Q_DECLARE_TR_FUNCTIONS(::Mercurial) }; } // namespace Mercurial diff --git a/src/plugins/mesonprojectmanager/mesonprojectmanagertr.h b/src/plugins/mesonprojectmanager/mesonprojectmanagertr.h index 1bb02a75da0..f9f20dbf469 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectmanagertr.h +++ b/src/plugins/mesonprojectmanager/mesonprojectmanagertr.h @@ -9,7 +9,7 @@ namespace MesonProjectManager { struct Tr { - Q_DECLARE_TR_FUNCTIONS(MesonProjectManager) + Q_DECLARE_TR_FUNCTIONS(::MesonProjectManager) }; } // namespace MesonProjectManager diff --git a/src/plugins/modeleditor/modeleditor.cpp b/src/plugins/modeleditor/modeleditor.cpp index 25486fb07e5..8443839d581 100644 --- a/src/plugins/modeleditor/modeleditor.cpp +++ b/src/plugins/modeleditor/modeleditor.cpp @@ -13,8 +13,8 @@ #include "modeldocument.h" #include "modeleditor_constants.h" #include "modeleditor_plugin.h" +#include "modeleditortr.h" #include "modelsmanager.h" -#include "openelementvisitor.h" #include "uicontroller.h" #include "qmt/controller/undocontroller.h" @@ -861,8 +861,7 @@ void ModelEditor::showZoomIndicator() { int scale = int(d->diagramView->transform().map(QPointF(100, 100)).x() + 0.5); Utils::FadingIndicator::showText(d->diagramStack, - QCoreApplication::translate("ModelEditor", - "Zoom: %1%").arg(scale), + Tr::tr("Zoom: %1%").arg(scale), Utils::FadingIndicator::SmallText); } diff --git a/src/plugins/modeleditor/modeleditortr.h b/src/plugins/modeleditor/modeleditortr.h index badefd7cbc4..5f353432046 100644 --- a/src/plugins/modeleditor/modeleditortr.h +++ b/src/plugins/modeleditor/modeleditortr.h @@ -9,7 +9,7 @@ namespace ModelEditor { struct Tr { - Q_DECLARE_TR_FUNCTIONS(ModelEditor) + Q_DECLARE_TR_FUNCTIONS(::ModelEditor) }; } // namespace ModelEditor diff --git a/src/plugins/nim/nimtr.h b/src/plugins/nim/nimtr.h index 990ab35521a..a15d194bc13 100644 --- a/src/plugins/nim/nimtr.h +++ b/src/plugins/nim/nimtr.h @@ -9,7 +9,7 @@ namespace Nim { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Nim) + Q_DECLARE_TR_FUNCTIONS(::Nim) }; } // namespace Nim diff --git a/src/plugins/perforce/perforcetr.h b/src/plugins/perforce/perforcetr.h index 33ba812bbd2..d2477a1d665 100644 --- a/src/plugins/perforce/perforcetr.h +++ b/src/plugins/perforce/perforcetr.h @@ -9,7 +9,7 @@ namespace Perforce { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Perforce) + Q_DECLARE_TR_FUNCTIONS(::Perforce) }; } // namespace Perforce diff --git a/src/plugins/perfprofiler/perfprofilertr.h b/src/plugins/perfprofiler/perfprofilertr.h index 65687708e48..50a411b99b3 100644 --- a/src/plugins/perfprofiler/perfprofilertr.h +++ b/src/plugins/perfprofiler/perfprofilertr.h @@ -9,7 +9,7 @@ namespace PerfProfiler { struct Tr { - Q_DECLARE_TR_FUNCTIONS(PerfProfiler) + Q_DECLARE_TR_FUNCTIONS(::PerfProfiler) }; } // namespace PerfProfiler diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index cd9d8886aa5..0bd03680f60 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -596,25 +596,25 @@ FilePath BuildConfiguration::buildDirectoryFromTemplate(const FilePath &projectD qCDebug(bcLog) << Q_FUNC_INFO << projectDir << mainFilePath << projectName << bcName; exp.registerFileVariables("Project", - QCoreApplication::translate("ProjectExplorer", "Main file of the project"), + QCoreApplication::translate("::ProjectExplorer", "Main file of the project"), [mainFilePath] { return mainFilePath; }); exp.registerVariable("Project:Name", - QCoreApplication::translate("ProjectExplorer", "Name of the project"), + QCoreApplication::translate("::ProjectExplorer", "Name of the project"), [projectName] { return projectName; }); exp.registerVariable("BuildConfig:Name", QCoreApplication::translate( - "ProjectExplorer", "Name of the project's active build configuration"), + "::ProjectExplorer", "Name of the project's active build configuration"), [bcName] { return bcName; }); exp.registerVariable("BuildSystem:Name", QCoreApplication::translate( - "ProjectExplorer", "Name of the project's active build system"), + "::ProjectExplorer", "Name of the project's active build system"), [buildSystem] { return buildSystem; }); exp.registerVariable("CurrentBuild:Type", - QCoreApplication::translate("ProjectExplorer", "Type of current build"), + QCoreApplication::translate("::ProjectExplorer", "Type of current build"), [buildType] { return buildTypeName(buildType); }, false); exp.registerVariable("BuildConfig:Type", QCoreApplication::translate( - "ProjectExplorer", "Type of the project's active build configuration"), + "::ProjectExplorer", "Type of the project's active build configuration"), [buildType] { return buildTypeName(buildType); }); exp.registerSubProvider([kit] { return kit->macroExpander(); }); diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp index 474b08d319d..5c3c30d6701 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp @@ -17,7 +17,7 @@ DeviceSettingsPage::DeviceSettingsPage() setId(Constants::DEVICE_SETTINGS_PAGE_ID); setDisplayName(DeviceSettingsWidget::tr("Devices")); setCategory(Constants::DEVICE_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Devices")); + setDisplayCategory(QCoreApplication::translate("::ProjectExplorer", "Devices")); setCategoryIconPath(":/projectexplorer/images/settingscategory_devices.png"); setWidgetCreator([] { return new DeviceSettingsWidget; }); } diff --git a/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp b/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp index 1ffe995dab7..985354eec72 100644 --- a/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp @@ -57,7 +57,7 @@ SshSettingsPage::SshSettingsPage() setId(Constants::SSH_SETTINGS_PAGE_ID); setDisplayName(SshSettingsWidget::tr("SSH")); setCategory(Constants::DEVICE_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "SSH")); + setDisplayCategory(QCoreApplication::translate("::ProjectExplorer", "SSH")); setCategoryIconPath(":/projectexplorer/images/settingscategory_devices.png"); setWidgetCreator([] { return new SshSettingsWidget; }); } diff --git a/src/plugins/projectexplorer/kitoptionspage.cpp b/src/plugins/projectexplorer/kitoptionspage.cpp index 1b6ae2cbea4..caf95211be2 100644 --- a/src/plugins/projectexplorer/kitoptionspage.cpp +++ b/src/plugins/projectexplorer/kitoptionspage.cpp @@ -249,7 +249,7 @@ KitOptionsPage::KitOptionsPage() setId(Constants::KITS_SETTINGS_PAGE_ID); setDisplayName(Internal::KitOptionsPageWidget::tr("Kits")); setCategory(Constants::KITS_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Kits")); + setDisplayCategory(QCoreApplication::translate("::ProjectExplorer", "Kits")); setCategoryIconPath(":/projectexplorer/images/settingscategory_kits.png"); } diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 3871d895770..7e2f6698062 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -3361,7 +3361,7 @@ void ProjectExplorerPluginPrivate::updateRecentProjectMenu() if (hasRecentProjects) { menu->addSeparator(); QAction *action = menu->addAction(QCoreApplication::translate( - "Core", Core::Constants::TR_CLEAR_MENU)); + "::Core", Core::Constants::TR_CLEAR_MENU)); connect(action, &QAction::triggered, this, &ProjectExplorerPluginPrivate::clearRecentProjects); } diff --git a/src/plugins/projectexplorer/projectexplorerconstants.cpp b/src/plugins/projectexplorer/projectexplorerconstants.cpp index 39f4a2cfc80..804a175ff6a 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.cpp +++ b/src/plugins/projectexplorer/projectexplorerconstants.cpp @@ -13,19 +13,19 @@ namespace Constants { QString msgAutoDetected() { - return QCoreApplication::translate("ProjectExplorer", "Auto-detected"); + return QCoreApplication::translate("::ProjectExplorer", "Auto-detected"); } QString msgAutoDetectedToolTip() { - return QCoreApplication::translate("ProjectExplorer", + return QCoreApplication::translate("::ProjectExplorer", "Automatically managed by %1 or the installer.") .arg(Core::ICore::ideDisplayName()); } QString msgManual() { - return QCoreApplication::translate("ProjectExplorer", "Manual"); + return QCoreApplication::translate("::ProjectExplorer", "Manual"); } } // namespace Constants diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index 371630edad6..59d361d9775 100644 --- a/src/plugins/projectexplorer/projectexplorerconstants.h +++ b/src/plugins/projectexplorer/projectexplorerconstants.h @@ -115,16 +115,16 @@ const char TASK_CATEGORY_TASKLIST_ID[] = "Task.Category.TaskListId"; // Wizard categories const char QT_PROJECT_WIZARD_CATEGORY[] = "H.Project"; -const char QT_PROJECT_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Other Project"); +const char QT_PROJECT_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("::ProjectExplorer", "Other Project"); const char QT_APPLICATION_WIZARD_CATEGORY[] = "F.Application"; -const char QT_APPLICATION_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Application"); +const char QT_APPLICATION_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("::ProjectExplorer", "Application"); const char LIBRARIES_WIZARD_CATEGORY[] = "G.Library"; -const char LIBRARIES_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Library"); +const char LIBRARIES_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("::ProjectExplorer", "Library"); const char IMPORT_WIZARD_CATEGORY[] = "T.Import"; -const char IMPORT_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Import Project"); +const char IMPORT_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("::ProjectExplorer", "Import Project"); // Wizard extra values const char PREFERRED_PROJECT_NODE[] = "ProjectExplorer.PreferredProjectNode"; diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index ae8453c871e..88cf592e29f 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -240,7 +240,7 @@ ProjectExplorerSettingsPage::ProjectExplorerSettingsPage() setId(Constants::BUILD_AND_RUN_SETTINGS_PAGE_ID); setDisplayName(ProjectExplorerSettingsWidget::tr("General")); setCategory(Constants::BUILD_AND_RUN_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", "Build & Run")); + setDisplayCategory(QCoreApplication::translate("::ProjectExplorer", "Build & Run")); setCategoryIconPath(":/projectexplorer/images/settingscategory_buildrun.png"); } diff --git a/src/plugins/projectexplorer/projectexplorertr.h b/src/plugins/projectexplorer/projectexplorertr.h index ce018520d95..aea17355148 100644 --- a/src/plugins/projectexplorer/projectexplorertr.h +++ b/src/plugins/projectexplorer/projectexplorertr.h @@ -9,7 +9,7 @@ namespace ProjectExplorer { struct Tr { - Q_DECLARE_TR_FUNCTIONS(ProjectExplorer) + Q_DECLARE_TR_FUNCTIONS(::ProjectExplorer) }; } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index 31c4349b087..d7bd5d77132 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -619,9 +619,10 @@ public: m_toggleRightSidebarAction.setCheckable(true); m_toggleRightSidebarAction.setChecked(true); const auto toolTipText = [](bool checked) { - return checked - ? QCoreApplication::translate("Core", Core::Constants::TR_HIDE_RIGHT_SIDEBAR) - : QCoreApplication::translate("Core", Core::Constants::TR_SHOW_RIGHT_SIDEBAR); + return checked ? QCoreApplication::translate("::Core", + Core::Constants::TR_HIDE_RIGHT_SIDEBAR) + : QCoreApplication::translate("::Core", + Core::Constants::TR_SHOW_RIGHT_SIDEBAR); }; m_toggleRightSidebarAction.setText(toolTipText(false)); // always "Show Right Sidebar" m_toggleRightSidebarAction.setToolTip(toolTipText(m_toggleRightSidebarAction.isChecked())); diff --git a/src/plugins/projectexplorer/simpleprojectwizard.cpp b/src/plugins/projectexplorer/simpleprojectwizard.cpp index 9587f1f4b35..242214108e9 100644 --- a/src/plugins/projectexplorer/simpleprojectwizard.cpp +++ b/src/plugins/projectexplorer/simpleprojectwizard.cpp @@ -4,6 +4,7 @@ #include "simpleprojectwizard.h" #include "projectexplorerconstants.h" +#include "projectexplorertr.h" #include <app/app_version.h> @@ -156,7 +157,7 @@ SimpleProjectWizard::SimpleProjectWizard() "If you want to build the project, you might need to edit the generated project file.") .arg(Core::Constants::IDE_DISPLAY_NAME)); setCategory(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY); - setDisplayCategory(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY_DISPLAY); + setDisplayCategory(Tr::tr(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY_DISPLAY)); setFlags(IWizardFactory::PlatformIndependent); } diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp index 4631a2f1769..5c315a02c6e 100644 --- a/src/plugins/projectexplorer/target.cpp +++ b/src/plugins/projectexplorer/target.cpp @@ -146,7 +146,7 @@ Target::Target(Project *project, Kit *k, _constructor_tag) : }); d->m_macroExpander.registerVariable("Project:Name", - QCoreApplication::translate("ProjectExplorer", "Name of current project"), + QCoreApplication::translate("::ProjectExplorer", "Name of current project"), [project] { return project->displayName(); }); } diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp index 21fe714beee..7997833f5ca 100644 --- a/src/plugins/projectexplorer/targetsetuppage.cpp +++ b/src/plugins/projectexplorer/targetsetuppage.cpp @@ -151,7 +151,7 @@ static TasksGenerator defaultTasksGenerator(const TasksGenerator &childGenerator if (!k->isValid()) return { CompileTask(Task::Error, - QCoreApplication::translate("ProjectExplorer", "Kit is not valid."))}; + QCoreApplication::translate("::ProjectExplorer", "Kit is not valid."))}; if (childGenerator) return childGenerator(k); return {}; diff --git a/src/plugins/python/pythontr.h b/src/plugins/python/pythontr.h index 14839345e05..f2cb90e754c 100644 --- a/src/plugins/python/pythontr.h +++ b/src/plugins/python/pythontr.h @@ -9,7 +9,7 @@ namespace Python { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Python) + Q_DECLARE_TR_FUNCTIONS(::Python) }; } // namespace Python diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagertr.h b/src/plugins/qbsprojectmanager/qbsprojectmanagertr.h index b982b6013ca..2dacbdd215c 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagertr.h +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagertr.h @@ -9,7 +9,7 @@ namespace QbsProjectManager { struct Tr { - Q_DECLARE_TR_FUNCTIONS(QbsProjectManager) + Q_DECLARE_TR_FUNCTIONS(::QbsProjectManager) }; } // namespace QbsProjectManager diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp index 1f7a9bc1367..570d85d22e2 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp @@ -23,7 +23,7 @@ CustomWidgetWizard::CustomWidgetWizard() { setId("P.Qt4CustomWidget"); setCategory(QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY)); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", + setDisplayCategory(QCoreApplication::translate("::ProjectExplorer", ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY_DISPLAY)); setDisplayName(Tr::tr("Qt Custom Designer Widget")); setDescription(Tr::tr("Creates a Qt Custom Designer Widget or a Custom Widget Collection.")); diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h index 1daff4182e0..3f1361e3b09 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h @@ -9,12 +9,12 @@ namespace QmakeProjectManager { struct Tr { - Q_DECLARE_TR_FUNCTIONS(QmakeProjectManager) + Q_DECLARE_TR_FUNCTIONS(::QmakeProjectManager) }; struct BuildConfigurationTr { - Q_DECLARE_TR_FUNCTIONS(BuildConfiguration) + Q_DECLARE_TR_FUNCTIONS(::BuildConfiguration) }; } // namespace QmakeProjectManager diff --git a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp index 7f2c3de126a..d67d3f28ba4 100644 --- a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp @@ -24,7 +24,7 @@ SubdirsProjectWizard::SubdirsProjectWizard() { setId("U.Qt4Subdirs"); setCategory(QLatin1String(ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY)); - setDisplayCategory(QCoreApplication::translate("ProjectExplorer", + setDisplayCategory(QCoreApplication::translate("::ProjectExplorer", ProjectExplorer::Constants::QT_PROJECT_WIZARD_CATEGORY_DISPLAY)); setDisplayName(Tr::tr("Subdirs Project")); setDescription(Tr::tr("Creates a qmake-based subdirs project. This allows you to group " diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index ba73f6370b1..71930d5ea17 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -254,7 +254,7 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e .toBool()); Exception::setShowExceptionCallback([&](QStringView title, QStringView description) { - QString composedTitle = title.isEmpty() ? QCoreApplication::translate("QmlDesigner", "Error") + QString composedTitle = title.isEmpty() ? QCoreApplication::translate("::QmlDesigner", "Error") : title.toString(); Core::AsynchronousMessageBox::warning(composedTitle, description.toString()); }); diff --git a/src/plugins/qmldesigner/qmldesignertr.h b/src/plugins/qmldesigner/qmldesignertr.h index af42c7ecbc8..71ecd7dc252 100644 --- a/src/plugins/qmldesigner/qmldesignertr.h +++ b/src/plugins/qmldesigner/qmldesignertr.h @@ -9,7 +9,7 @@ namespace QmlDesigner { struct Tr { - Q_DECLARE_TR_FUNCTIONS(QmlDesigner) + Q_DECLARE_TR_FUNCTIONS(::QmlDesigner) }; } // namespace QmlDesigner diff --git a/src/plugins/qmljseditor/qmljseditortr.h b/src/plugins/qmljseditor/qmljseditortr.h index dfe9e020d44..1061481fd15 100644 --- a/src/plugins/qmljseditor/qmljseditortr.h +++ b/src/plugins/qmljseditor/qmljseditortr.h @@ -9,7 +9,7 @@ namespace QmlJSEditor { struct Tr { - Q_DECLARE_TR_FUNCTIONS(QmlJSEditor) + Q_DECLARE_TR_FUNCTIONS(::QmlJSEditor) }; } // namespace QmlJSEditor diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp index a9a0ccaadae..1b5bd092583 100644 --- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp +++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp @@ -7,6 +7,7 @@ #include "qmljscodestylesettingspage.h" #include "qmljsindenter.h" #include "qmljstoolsconstants.h" +#include "qmljstoolstr.h" #include <qmljseditor/qmljseditorconstants.h> @@ -39,7 +40,7 @@ Utils::Id QmlJSCodeStylePreferencesFactory::languageId() QString QmlJSCodeStylePreferencesFactory::displayName() { - return QLatin1String(Constants::QML_JS_SETTINGS_NAME); + return Tr::tr("Qt Quick"); } TextEditor::ICodeStylePreferences *QmlJSCodeStylePreferencesFactory::createCodeStyle() const diff --git a/src/plugins/qmljstools/qmljstoolsconstants.h b/src/plugins/qmljstools/qmljstoolsconstants.h index f50c1b27fb3..e5dc274640d 100644 --- a/src/plugins/qmljstools/qmljstoolsconstants.h +++ b/src/plugins/qmljstools/qmljstoolsconstants.h @@ -20,7 +20,6 @@ const char QML_JS_CODE_STYLE_SETTINGS_ID[] = "A.Code Style"; const char QML_JS_CODE_STYLE_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("QmlJSTools", "Code Style"); const char QML_JS_SETTINGS_ID[] = "QmlJS"; -const char QML_JS_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("QmlJSTools", "Qt Quick"); const char M_TOOLS_QMLJS[] = "QmlJSTools.Tools.Menu"; const char RESET_CODEMODEL[] = "QmlJSTools.ResetCodeModel"; diff --git a/src/plugins/qmljstools/qmljstoolstr.h b/src/plugins/qmljstools/qmljstoolstr.h index e4bc6fe13b5..3da70ba463d 100644 --- a/src/plugins/qmljstools/qmljstoolstr.h +++ b/src/plugins/qmljstools/qmljstoolstr.h @@ -9,7 +9,7 @@ namespace QmlJSTools { struct Tr { - Q_DECLARE_TR_FUNCTIONS(QmlJSTools) + Q_DECLARE_TR_FUNCTIONS(::QmlJSTools) }; } // namespace QmlJSTools diff --git a/src/plugins/qmlpreview/qmlpreviewtr.h b/src/plugins/qmlpreview/qmlpreviewtr.h index ff276bb318b..84904bb1847 100644 --- a/src/plugins/qmlpreview/qmlpreviewtr.h +++ b/src/plugins/qmlpreview/qmlpreviewtr.h @@ -9,7 +9,7 @@ namespace QmlPreview { struct Tr { - Q_DECLARE_TR_FUNCTIONS(QmlPreview) + Q_DECLARE_TR_FUNCTIONS(::QmlPreview) }; } // namespace QmlPreview diff --git a/src/plugins/qmlprofiler/qmlprofilertr.h b/src/plugins/qmlprofiler/qmlprofilertr.h index bb542efc7f5..e8326c0b641 100644 --- a/src/plugins/qmlprofiler/qmlprofilertr.h +++ b/src/plugins/qmlprofiler/qmlprofilertr.h @@ -9,7 +9,7 @@ namespace QmlProfiler { struct Tr { - Q_DECLARE_TR_FUNCTIONS(QmlProfiler) + Q_DECLARE_TR_FUNCTIONS(::QmlProfiler) }; } // namespace QmlProfiler diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanagertr.h b/src/plugins/qmlprojectmanager/qmlprojectmanagertr.h index b19dc309e61..0921f0549ee 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanagertr.h +++ b/src/plugins/qmlprojectmanager/qmlprojectmanagertr.h @@ -9,7 +9,7 @@ namespace QmlProjectManager { struct Tr { - Q_DECLARE_TR_FUNCTIONS(QmlProjectManager) + Q_DECLARE_TR_FUNCTIONS(::QmlProjectManager) }; } // namespace QmlProjectManager diff --git a/src/plugins/qnx/qnxtr.h b/src/plugins/qnx/qnxtr.h index d155ea93ff1..e0666aafd6a 100644 --- a/src/plugins/qnx/qnxtr.h +++ b/src/plugins/qnx/qnxtr.h @@ -9,7 +9,7 @@ namespace Qnx { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Qnx) + Q_DECLARE_TR_FUNCTIONS(::Qnx) }; } // namespace Qnx diff --git a/src/plugins/qtsupport/codegensettingspage.cpp b/src/plugins/qtsupport/codegensettingspage.cpp index 40cfc1f480c..7291487c491 100644 --- a/src/plugins/qtsupport/codegensettingspage.cpp +++ b/src/plugins/qtsupport/codegensettingspage.cpp @@ -118,7 +118,7 @@ CodeGenSettingsPage::CodeGenSettingsPage() setDisplayName(Tr::tr("Qt Class Generation")); setCategory(CppEditor::Constants::CPP_SETTINGS_CATEGORY); setDisplayCategory( - QCoreApplication::translate("CppEditor", CppEditor::Constants::CPP_SETTINGS_NAME)); + QCoreApplication::translate("::CppEditor", CppEditor::Constants::CPP_SETTINGS_NAME)); setCategoryIconPath(":/projectexplorer/images/settingscategory_cpp.png"); setWidgetCreator([] { return new CodeGenSettingsPageWidget; }); } diff --git a/src/plugins/qtsupport/qtsupporttr.h b/src/plugins/qtsupport/qtsupporttr.h index 3b2eaaec94a..6bd9ac0865c 100644 --- a/src/plugins/qtsupport/qtsupporttr.h +++ b/src/plugins/qtsupport/qtsupporttr.h @@ -9,7 +9,7 @@ namespace QtSupport { struct Tr { - Q_DECLARE_TR_FUNCTIONS(QtSupport) + Q_DECLARE_TR_FUNCTIONS(::QtSupport) }; } // namespace QtSupport diff --git a/src/plugins/remotelinux/remotelinuxtr.h b/src/plugins/remotelinux/remotelinuxtr.h index 869c55ee198..99e2f79ae89 100644 --- a/src/plugins/remotelinux/remotelinuxtr.h +++ b/src/plugins/remotelinux/remotelinuxtr.h @@ -9,7 +9,7 @@ namespace RemoteLinux { struct Tr { - Q_DECLARE_TR_FUNCTIONS(RemoteLinux) + Q_DECLARE_TR_FUNCTIONS(::RemoteLinux) }; } // namespace RemoteLinux diff --git a/src/plugins/resourceeditor/resourceeditortr.h b/src/plugins/resourceeditor/resourceeditortr.h index 6140f179995..2fac00c620b 100644 --- a/src/plugins/resourceeditor/resourceeditortr.h +++ b/src/plugins/resourceeditor/resourceeditortr.h @@ -9,7 +9,7 @@ namespace ResourceEditor { struct Tr { - Q_DECLARE_TR_FUNCTIONS(ResourceEditor) + Q_DECLARE_TR_FUNCTIONS(::ResourceEditor) }; } // namespace ResourceEditor diff --git a/src/plugins/scxmleditor/scxmleditorfactory.cpp b/src/plugins/scxmleditor/scxmleditorfactory.cpp index ae226f4e3fb..c89871dc358 100644 --- a/src/plugins/scxmleditor/scxmleditorfactory.cpp +++ b/src/plugins/scxmleditor/scxmleditorfactory.cpp @@ -19,7 +19,7 @@ using namespace ScxmlEditor::Internal; ScxmlEditorFactory::ScxmlEditorFactory() { setId(K_SCXML_EDITOR_ID); - setDisplayName(QCoreApplication::translate("ScxmlEditor", C_SCXMLEDITOR_DISPLAY_NAME)); + setDisplayName(QCoreApplication::translate("OpenWith::Editors", C_SCXMLEDITOR_DISPLAY_NAME)); addMimeType(ProjectExplorer::Constants::SCXML_MIMETYPE); Utils::FileIconProvider::registerIconOverlayForSuffix(":/projectexplorer/images/fileoverlay_scxml.png", "scxml"); diff --git a/src/plugins/scxmleditor/scxmleditortr.h b/src/plugins/scxmleditor/scxmleditortr.h index 41f546fcfbf..c25dbc764a6 100644 --- a/src/plugins/scxmleditor/scxmleditortr.h +++ b/src/plugins/scxmleditor/scxmleditortr.h @@ -9,7 +9,7 @@ namespace ScxmlEditor { struct Tr { - Q_DECLARE_TR_FUNCTIONS(ScxmlEditor) + Q_DECLARE_TR_FUNCTIONS(::ScxmlEditor) }; } // namespace ScxmlEditor diff --git a/src/plugins/silversearcher/silversearchertr.h b/src/plugins/silversearcher/silversearchertr.h index 6b6d92a0a2b..13bc074be89 100644 --- a/src/plugins/silversearcher/silversearchertr.h +++ b/src/plugins/silversearcher/silversearchertr.h @@ -9,7 +9,7 @@ namespace SilverSearcher { struct Tr { - Q_DECLARE_TR_FUNCTIONS(SilverSearcher) + Q_DECLARE_TR_FUNCTIONS(::SilverSearcher) }; } // namespace SilverSearcher diff --git a/src/plugins/squish/squishtr.h b/src/plugins/squish/squishtr.h index 0ee9fc4bf0e..5488c591365 100644 --- a/src/plugins/squish/squishtr.h +++ b/src/plugins/squish/squishtr.h @@ -9,7 +9,7 @@ namespace Squish { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Squish) + Q_DECLARE_TR_FUNCTIONS(::Squish) }; } // namespace Squish diff --git a/src/plugins/studiowelcome/studiowelcometr.h b/src/plugins/studiowelcome/studiowelcometr.h index 2a27df5374c..12d8be459a5 100644 --- a/src/plugins/studiowelcome/studiowelcometr.h +++ b/src/plugins/studiowelcome/studiowelcometr.h @@ -9,7 +9,7 @@ namespace StudioWelcome { struct Tr { - Q_DECLARE_TR_FUNCTIONS(StudioWelcome) + Q_DECLARE_TR_FUNCTIONS(::StudioWelcome) }; } // namespace StudioWelcome diff --git a/src/plugins/subversion/subversiontr.h b/src/plugins/subversion/subversiontr.h index 3a2483468e7..628ba80f1b2 100644 --- a/src/plugins/subversion/subversiontr.h +++ b/src/plugins/subversion/subversiontr.h @@ -9,7 +9,7 @@ namespace Subversion { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Subversion) + Q_DECLARE_TR_FUNCTIONS(::Subversion) }; } // namespace Subversion diff --git a/src/plugins/texteditor/behaviorsettingspage.cpp b/src/plugins/texteditor/behaviorsettingspage.cpp index ef3f74d0fee..ee565995483 100644 --- a/src/plugins/texteditor/behaviorsettingspage.cpp +++ b/src/plugins/texteditor/behaviorsettingspage.cpp @@ -78,7 +78,7 @@ BehaviorSettingsPage::BehaviorSettingsPage() setDisplayName(tr("Behavior")); setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("TextEditor", "Text Editor")); + setDisplayCategory(QCoreApplication::translate("::TextEditor", "Text Editor")); setCategoryIconPath(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON_PATH); } diff --git a/src/plugins/texteditor/completionsettingspage.cpp b/src/plugins/texteditor/completionsettingspage.cpp index 1603fbdeacb..f3a09c57355 100644 --- a/src/plugins/texteditor/completionsettingspage.cpp +++ b/src/plugins/texteditor/completionsettingspage.cpp @@ -358,7 +358,7 @@ CompletionSettingsPage::CompletionSettingsPage() setId("P.Completion"); setDisplayName(CompletionSettingsPageWidget::tr("Completion")); setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("TextEditor", "Text Editor")); + setDisplayCategory(QCoreApplication::translate("::TextEditor", "Text Editor")); setCategoryIconPath(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON_PATH); setWidgetCreator([this] { return new CompletionSettingsPageWidget(this); }); diff --git a/src/plugins/texteditor/displaysettingspage.cpp b/src/plugins/texteditor/displaysettingspage.cpp index 09c5457ef17..fc48e226846 100644 --- a/src/plugins/texteditor/displaysettingspage.cpp +++ b/src/plugins/texteditor/displaysettingspage.cpp @@ -347,7 +347,7 @@ DisplaySettingsPage::DisplaySettingsPage() setId(Constants::TEXT_EDITOR_DISPLAY_SETTINGS); setDisplayName(DisplaySettingsWidget::tr("Display")); setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("TextEditor", "Text Editor")); + setDisplayCategory(QCoreApplication::translate("::TextEditor", "Text Editor")); setCategoryIconPath(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON_PATH); setWidgetCreator([this] { return new DisplaySettingsWidget(d); }); } diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index 1c543394866..cad2aa6f0f3 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -777,7 +777,7 @@ FontSettingsPage::FontSettingsPage(FontSettings *fontSettings, const FormatDescr setId(Constants::TEXT_EDITOR_FONT_SETTINGS); setDisplayName(FontSettingsPageWidget::tr("Font && Colors")); setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("TextEditor", "Text Editor")); + setDisplayCategory(QCoreApplication::translate("::TextEditor", "Text Editor")); setCategoryIconPath(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON_PATH); setWidgetCreator([this, fontSettings, fd] { return new FontSettingsPageWidget(this, fd, fontSettings); }); } diff --git a/src/plugins/texteditor/formattexteditor.cpp b/src/plugins/texteditor/formattexteditor.cpp index d2b38552b22..5265cc02886 100644 --- a/src/plugins/texteditor/formattexteditor.cpp +++ b/src/plugins/texteditor/formattexteditor.cpp @@ -6,6 +6,7 @@ #include "textdocument.h" #include "textdocumentlayout.h" #include "texteditor.h" +#include "texteditortr.h" #include <coreplugin/messagemanager.h> @@ -55,8 +56,7 @@ static FormatTask format(FormatTask task) sourceFile.setAutoRemove(true); sourceFile.write(task.sourceData.toUtf8()); if (!sourceFile.finalize()) { - task.error = QString(QT_TRANSLATE_NOOP("TextEditor", - "Cannot create temporary file \"%1\": %2.")) + task.error = Tr::tr("Cannot create temporary file \"%1\": %2.") .arg(sourceFile.filePath().toUserOutput(), sourceFile.errorString()); return task; } @@ -69,7 +69,7 @@ static FormatTask format(FormatTask task) process.setCommand({FilePath::fromString(executable), options}); process.runBlocking(); if (process.result() != ProcessResult::FinishedWithSuccess) { - task.error = QString(QT_TRANSLATE_NOOP("TextEditor", "Failed to format: %1.")) + task.error = Tr::tr("TextEditor", "Failed to format: %1.") .arg(process.exitMessage()); return task; } @@ -80,7 +80,7 @@ static FormatTask format(FormatTask task) // Read text back Utils::FileReader reader; if (!reader.fetch(sourceFile.filePath(), QIODevice::Text)) { - task.error = QString(QT_TRANSLATE_NOOP("TextEditor", "Cannot read file \"%1\": %2.")) + task.error = Tr::tr("Cannot read file \"%1\": %2.") .arg(sourceFile.filePath().toUserOutput(), reader.errorString()); return task; } @@ -97,9 +97,8 @@ static FormatTask format(FormatTask task) process.setWriteData(task.sourceData.toUtf8()); process.start(); if (!process.waitForFinished(5000)) { - task.error = QString(QT_TRANSLATE_NOOP("TextEditor", - "Cannot call %1 or some other error occurred. Timeout " - "reached while formatting file %2.")) + task.error = Tr::tr("Cannot call %1 or some other error occurred. Timeout " + "reached while formatting file %2.") .arg(executable, task.filePath.displayName()); return task; } @@ -250,8 +249,7 @@ void updateEditorText(QPlainTextEdit *editor, const QString &text) static void showError(const QString &error) { - Core::MessageManager::writeFlashing( - QString(QT_TRANSLATE_NOOP("TextEditor", "Error in text formatting: %1")) + Core::MessageManager::writeFlashing(Tr::tr("TextEditor", "Error in text formatting: %1") .arg(error.trimmed())); } @@ -267,14 +265,14 @@ static void checkAndApplyTask(const FormatTask &task) } if (task.formattedData.isEmpty()) { - showError(QString(QT_TRANSLATE_NOOP("TextEditor", "Could not format file %1.")).arg( + showError(Tr::tr("Could not format file %1.").arg( task.filePath.displayName())); return; } QPlainTextEdit *textEditor = task.editor; if (!textEditor) { - showError(QString(QT_TRANSLATE_NOOP("TextEditor", "File %1 was closed.")).arg( + showError(Tr::tr("File %1 was closed.").arg( task.filePath.displayName())); return; } @@ -321,7 +319,7 @@ void formatEditorAsync(TextEditorWidget *editor, const Command &command, int sta QObject::connect(doc, &TextDocument::contentsChanged, watcher, &QFutureWatcher<FormatTask>::cancel); QObject::connect(watcher, &QFutureWatcherBase::finished, [watcher] { if (watcher->isCanceled()) - showError(QString(QT_TRANSLATE_NOOP("TextEditor", "File was modified."))); + showError(Tr::tr("File was modified.")); else checkAndApplyTask(watcher->result()); watcher->deleteLater(); diff --git a/src/plugins/texteditor/highlightersettingspage.cpp b/src/plugins/texteditor/highlightersettingspage.cpp index cd16d007e08..58a7cba73a1 100644 --- a/src/plugins/texteditor/highlightersettingspage.cpp +++ b/src/plugins/texteditor/highlightersettingspage.cpp @@ -158,7 +158,7 @@ HighlighterSettingsPage::HighlighterSettingsPage() setId(Constants::TEXT_EDITOR_HIGHLIGHTER_SETTINGS); setDisplayName(HighlighterSettingsPagePrivate::tr("Generic Highlighter")); setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("TextEditor", "Text Editor")); + setDisplayCategory(QCoreApplication::translate("::TextEditor", "Text Editor")); setCategoryIconPath(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON_PATH); } diff --git a/src/plugins/texteditor/snippets/snippetssettingspage.cpp b/src/plugins/texteditor/snippets/snippetssettingspage.cpp index fdfadad16e3..18aac728b98 100644 --- a/src/plugins/texteditor/snippets/snippetssettingspage.cpp +++ b/src/plugins/texteditor/snippets/snippetssettingspage.cpp @@ -552,7 +552,7 @@ SnippetsSettingsPage::SnippetsSettingsPage() setId(Constants::TEXT_EDITOR_SNIPPETS_SETTINGS); setDisplayName(SnippetsSettingsPagePrivate::tr("Snippets")); setCategory(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("TextEditor", "Text Editor")); + setDisplayCategory(QCoreApplication::translate("::TextEditor", "Text Editor")); setCategoryIconPath(TextEditor::Constants::TEXT_EDITOR_SETTINGS_CATEGORY_ICON_PATH); } diff --git a/src/plugins/texteditor/texteditortr.h b/src/plugins/texteditor/texteditortr.h index a456a57be57..d705758e0c7 100644 --- a/src/plugins/texteditor/texteditortr.h +++ b/src/plugins/texteditor/texteditortr.h @@ -9,7 +9,7 @@ namespace TextEditor { struct Tr { - Q_DECLARE_TR_FUNCTIONS(TextEditor) + Q_DECLARE_TR_FUNCTIONS(::TextEditor) }; } // namespace TextEditor diff --git a/src/plugins/todo/todotr.h b/src/plugins/todo/todotr.h index b54bae4092f..27b367c5278 100644 --- a/src/plugins/todo/todotr.h +++ b/src/plugins/todo/todotr.h @@ -9,7 +9,7 @@ namespace Todo { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Todo) + Q_DECLARE_TR_FUNCTIONS(::Todo) }; } // namespace Todo diff --git a/src/plugins/updateinfo/updateinfotr.h b/src/plugins/updateinfo/updateinfotr.h index 957820805d0..2cd606187fa 100644 --- a/src/plugins/updateinfo/updateinfotr.h +++ b/src/plugins/updateinfo/updateinfotr.h @@ -9,7 +9,7 @@ namespace UpdateInfo { struct Tr { - Q_DECLARE_TR_FUNCTIONS(UpdateInfo) + Q_DECLARE_TR_FUNCTIONS(::UpdateInfo) }; } // namespace UpdateInfo diff --git a/src/plugins/valgrind/callgrind/callgrindfunction.cpp b/src/plugins/valgrind/callgrind/callgrindfunction.cpp index b7e11b3e2b3..98c3a0241ce 100644 --- a/src/plugins/valgrind/callgrind/callgrindfunction.cpp +++ b/src/plugins/valgrind/callgrind/callgrindfunction.cpp @@ -4,9 +4,10 @@ #include "callgrindfunction.h" #include "callgrindfunction_p.h" -#include "callgrindfunctioncall.h" #include "callgrindcostitem.h" +#include "callgrindfunctioncall.h" #include "callgrindparsedata.h" +#include "valgrindtr.h" #include <utils/qtcassert.h> @@ -181,9 +182,9 @@ QString Function::location() const if (f.isEmpty() || f == "???") return o; if (pos.isEmpty()) - return QCoreApplication::translate("Valgrind", "%1 in %2").arg(f, o); + return Tr::tr("%1 in %2").arg(f, o); - return QCoreApplication::translate("Valgrind", "%1:%2 in %3").arg(f, pos, o); + return Tr::tr("%1:%2 in %3").arg(f, pos, o); } int Function::lineNumber() const diff --git a/src/plugins/valgrind/valgrindtr.h b/src/plugins/valgrind/valgrindtr.h index 2727f82e548..c6a13e1178d 100644 --- a/src/plugins/valgrind/valgrindtr.h +++ b/src/plugins/valgrind/valgrindtr.h @@ -9,7 +9,7 @@ namespace Valgrind { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Valgrind) + Q_DECLARE_TR_FUNCTIONS(::Valgrind) }; } // namespace Valgrind diff --git a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp index 7f74223f8fe..a44aa73a35a 100644 --- a/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp +++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp @@ -104,7 +104,7 @@ static QString makeFrameName(const Frame &frame, bool withLocation) if (!fn.isEmpty()) { const QString location = withLocation || path == frame.object() ? QString::fromLatin1(" in %2").arg(path) : QString(); - return QCoreApplication::translate("Valgrind", "%1%2").arg(fn, location); + return Tr::tr("%1%2").arg(fn, location); } if (!path.isEmpty()) return path; @@ -113,8 +113,7 @@ static QString makeFrameName(const Frame &frame, bool withLocation) QString ErrorListModel::errorLocation(const Error &error) const { - return QCoreApplication::translate("Valgrind", "in %1") - .arg(makeFrameName(findRelevantFrame(error), true)); + return Tr::tr("in %1").arg(makeFrameName(findRelevantFrame(error), true)); } void ErrorListModel::addError(const Error &error) diff --git a/src/plugins/vcsbase/commonvcssettings.cpp b/src/plugins/vcsbase/commonvcssettings.cpp index 5e8765b08df..a5d56a99459 100644 --- a/src/plugins/vcsbase/commonvcssettings.cpp +++ b/src/plugins/vcsbase/commonvcssettings.cpp @@ -4,6 +4,7 @@ #include "commonvcssettings.h" #include "vcsbaseconstants.h" +#include "vcsbasetr.h" #include <coreplugin/icore.h> #include <coreplugin/iversioncontrol.h> @@ -156,10 +157,10 @@ CommonOptionsPage::CommonOptionsPage() m_settings.readSettings(Core::ICore::settings()); setId(Constants::VCS_COMMON_SETTINGS_ID); - setDisplayName(QCoreApplication::translate("VcsBase", Constants::VCS_COMMON_SETTINGS_NAME)); + setDisplayName(Tr::tr("General")); setCategory(Constants::VCS_SETTINGS_CATEGORY); // The following act as blueprint for other pages in the same category: - setDisplayCategory(QCoreApplication::translate("VcsBase", "Version Control")); + setDisplayCategory(Tr::tr("Version Control")); setCategoryIconPath(":/vcsbase/images/settingscategory_vcs.png"); setWidgetCreator([this] { return new CommonSettingsWidget(this); }); } diff --git a/src/plugins/vcsbase/vcsbaseconstants.h b/src/plugins/vcsbase/vcsbaseconstants.h index c4d18752338..b3c8b4b27e1 100644 --- a/src/plugins/vcsbase/vcsbaseconstants.h +++ b/src/plugins/vcsbase/vcsbaseconstants.h @@ -10,7 +10,6 @@ namespace Constants { const char VCS_SETTINGS_CATEGORY[] = "V.Version Control"; const char VCS_COMMON_SETTINGS_ID[] = "A.VCS.General"; -const char VCS_COMMON_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("VcsBase", "General"); // Ids for sort order (wizards and preferences) const char VCS_ID_BAZAAR[] = "B.Bazaar"; diff --git a/src/plugins/vcsbase/vcsbasetr.h b/src/plugins/vcsbase/vcsbasetr.h index d41cf6b6a5b..3bede77b173 100644 --- a/src/plugins/vcsbase/vcsbasetr.h +++ b/src/plugins/vcsbase/vcsbasetr.h @@ -9,7 +9,7 @@ namespace VcsBase { struct Tr { - Q_DECLARE_TR_FUNCTIONS(VcsBase) + Q_DECLARE_TR_FUNCTIONS(::VcsBase) }; } // namespace VcsBase diff --git a/src/plugins/webassembly/webassemblytr.h b/src/plugins/webassembly/webassemblytr.h index f473276e6bb..fc05192eea7 100644 --- a/src/plugins/webassembly/webassemblytr.h +++ b/src/plugins/webassembly/webassemblytr.h @@ -9,7 +9,7 @@ namespace WebAssembly { struct Tr { - Q_DECLARE_TR_FUNCTIONS(WebAssembly) + Q_DECLARE_TR_FUNCTIONS(::WebAssembly) }; } // namespace WebAssembly diff --git a/src/plugins/welcome/welcometr.h b/src/plugins/welcome/welcometr.h index ec67f94c259..28798fbdb08 100644 --- a/src/plugins/welcome/welcometr.h +++ b/src/plugins/welcome/welcometr.h @@ -9,7 +9,7 @@ namespace Welcome { struct Tr { - Q_DECLARE_TR_FUNCTIONS(Welcome) + Q_DECLARE_TR_FUNCTIONS(::Welcome) }; } // namespace Welcome |