diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2023-02-10 16:15:49 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2023-02-10 16:27:55 +0000 |
| commit | 9f2f2f3390fe88b120073be9a08da66cbdc95552 (patch) | |
| tree | ed77de309984d5f9b974326b9ee0145d41b789fa /src | |
| parent | 226799858c8a0da51f7f0b99b83308c60f30a288 (diff) | |
| download | qt-creator-9f2f2f3390fe88b120073be9a08da66cbdc95552.tar.gz | |
Translations: Change translation context prefix from "::" to "QtC::"
lupdate would be confused by translation contexts starting with ::
Change-Id: Ie95e73436fd3cafc80a8e89f908efadc747e644c
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src')
143 files changed, 296 insertions, 296 deletions
diff --git a/src/libs/advanceddockingsystem/advanceddockingsystemtr.h b/src/libs/advanceddockingsystem/advanceddockingsystemtr.h index 2d1eccce1e..9752e2f025 100644 --- a/src/libs/advanceddockingsystem/advanceddockingsystemtr.h +++ b/src/libs/advanceddockingsystem/advanceddockingsystemtr.h @@ -9,7 +9,7 @@ namespace AdvancedDockingSystem { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::AdvancedDockingSystem) + Q_DECLARE_TR_FUNCTIONS(QtC::AdvancedDockingSystem) }; } // AdvancedDockingSystem diff --git a/src/libs/extensionsystem/extensionsystemtr.h b/src/libs/extensionsystem/extensionsystemtr.h index d254a886fe..5c70117aac 100644 --- a/src/libs/extensionsystem/extensionsystemtr.h +++ b/src/libs/extensionsystem/extensionsystemtr.h @@ -9,7 +9,7 @@ namespace ExtensionSystem { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::ExtensionSystem) + Q_DECLARE_TR_FUNCTIONS(QtC::ExtensionSystem) }; } // ExtensionSystem diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.h b/src/libs/languageserverprotocol/jsonrpcmessages.h index 68e0e1fc19..0b018d7f54 100644 --- a/src/libs/languageserverprotocol/jsonrpcmessages.h +++ b/src/libs/languageserverprotocol/jsonrpcmessages.h @@ -162,7 +162,7 @@ public: if (auto parameter = params()) return parameter->isValid(); if (errorMessage) - *errorMessage = QCoreApplication::translate("::LanguageServerProtocol", + *errorMessage = QCoreApplication::translate("QtC::LanguageServerProtocol", "No parameters in \"%1\".").arg(method()); return false; } @@ -253,7 +253,7 @@ public: CASE_ERRORCODES(ServerNotInitialized); CASE_ERRORCODES(RequestCancelled); default: - return QCoreApplication::translate("::LanguageClient", "Error %1").arg(code); + return QCoreApplication::translate("QtC::LanguageClient", "Error %1").arg(code); } } #undef CASE_ERRORCODES @@ -375,7 +375,7 @@ public: if (id().isValid()) return true; if (errorMessage) - *errorMessage = QCoreApplication::translate("::LanguageServerProtocol", + *errorMessage = QCoreApplication::translate("QtC::LanguageServerProtocol", "No ID set in \"%1\".").arg(this->method()); return false; } diff --git a/src/libs/languageserverprotocol/languageserverprotocoltr.h b/src/libs/languageserverprotocol/languageserverprotocoltr.h index 3b0f3d1677..e514112790 100644 --- a/src/libs/languageserverprotocol/languageserverprotocoltr.h +++ b/src/libs/languageserverprotocol/languageserverprotocoltr.h @@ -9,7 +9,7 @@ namespace LanguageServerProtocol { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::LanguageServerProtocol) + Q_DECLARE_TR_FUNCTIONS(QtC::LanguageServerProtocol) }; } // LanguageServerProtocol diff --git a/src/libs/modelinglib/modelinglibtr.h b/src/libs/modelinglib/modelinglibtr.h index 16fd273bee..f4dadad4b8 100644 --- a/src/libs/modelinglib/modelinglibtr.h +++ b/src/libs/modelinglib/modelinglibtr.h @@ -9,7 +9,7 @@ namespace qmt { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::qmt) + Q_DECLARE_TR_FUNCTIONS(QtC::qmt) }; } // qmt diff --git a/src/libs/qmldebug/qmldebugtr.h b/src/libs/qmldebug/qmldebugtr.h index 43ca8e3aa9..b6ea2a1ab9 100644 --- a/src/libs/qmldebug/qmldebugtr.h +++ b/src/libs/qmldebug/qmldebugtr.h @@ -9,7 +9,7 @@ namespace QmlDebug { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::QmlDebug) + Q_DECLARE_TR_FUNCTIONS(QtC::QmlDebug) }; } // QmlDebug diff --git a/src/libs/qmleditorwidgets/qmleditorwidgetstr.h b/src/libs/qmleditorwidgets/qmleditorwidgetstr.h index 5e3c60d241..8a5ea91470 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgetstr.h +++ b/src/libs/qmleditorwidgets/qmleditorwidgetstr.h @@ -9,7 +9,7 @@ namespace QmlEditorWidgets { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::QmlEditorWidgets) + Q_DECLARE_TR_FUNCTIONS(QtC::QmlEditorWidgets) }; } // QmlEditorWidgets diff --git a/src/libs/qmljs/qmljstr.h b/src/libs/qmljs/qmljstr.h index aa8e46f11e..10c9a08f30 100644 --- a/src/libs/qmljs/qmljstr.h +++ b/src/libs/qmljs/qmljstr.h @@ -9,7 +9,7 @@ namespace QmlJS { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::QmlJS) + Q_DECLARE_TR_FUNCTIONS(QtC::QmlJS) }; } // QmlJS diff --git a/src/libs/tracing/qml/ButtonsBar.qml b/src/libs/tracing/qml/ButtonsBar.qml index fd6a2ae76d..f187539d5a 100644 --- a/src/libs/tracing/qml/ButtonsBar.qml +++ b/src/libs/tracing/qml/ButtonsBar.qml @@ -47,7 +47,7 @@ ToolBar { Layout.fillHeight: true imageSource: "image://icons/prev" - ToolTip.text: qsTranslate("::Tracing", "Jump to previous event.") + ToolTip.text: qsTranslate("QtC::Tracing", "Jump to previous event.") onClicked: buttons.jumpToPrev() } @@ -56,7 +56,7 @@ ToolBar { Layout.fillHeight: true imageSource: "image://icons/next" - ToolTip.text: qsTranslate("::Tracing", "Jump to next event.") + ToolTip.text: qsTranslate("QtC::Tracing", "Jump to next event.") onClicked: buttons.jumpToNext() } @@ -65,7 +65,7 @@ ToolBar { Layout.fillHeight: true imageSource: "image://icons/zoom" - ToolTip.text: qsTranslate("::Tracing", "Show zoom slider.") + ToolTip.text: qsTranslate("QtC::Tracing", "Show zoom slider.") checkable: true checked: false onCheckedChanged: buttons.zoomControlChanged() @@ -76,7 +76,7 @@ ToolBar { Layout.fillHeight: true imageSource: "image://icons/" + (checked ? "rangeselected" : "rangeselection"); - ToolTip.text: qsTranslate("::Tracing", "Select range.") + ToolTip.text: qsTranslate("QtC::Tracing", "Select range.") checkable: true checked: false onCheckedChanged: buttons.rangeSelectChanged() @@ -87,7 +87,7 @@ ToolBar { Layout.fillHeight: true imageSource: "image://icons/selectionmode" - ToolTip.text: qsTranslate("::Tracing", "View event information on mouseover.") + ToolTip.text: qsTranslate("QtC::Tracing", "View event information on mouseover.") checkable: true checked: false onCheckedChanged: buttons.lockChanged() diff --git a/src/libs/tracing/qml/CategoryLabel.qml b/src/libs/tracing/qml/CategoryLabel.qml index 50ac687037..4226195cbb 100644 --- a/src/libs/tracing/qml/CategoryLabel.qml +++ b/src/libs/tracing/qml/CategoryLabel.qml @@ -165,8 +165,8 @@ Item { implicitHeight: txt.height - 1 enabled: labelContainer.expanded || (labelContainer.model && !labelContainer.model.empty) imageSource: labelContainer.expanded ? "image://icons/close_split" : "image://icons/split" - ToolTip.text: labelContainer.expanded ? qsTranslate("::Tracing", "Collapse category") - : qsTranslate("::Tracing", "Expand category") + ToolTip.text: labelContainer.expanded ? qsTranslate("QtC::Tracing", "Collapse category") + : qsTranslate("QtC::Tracing", "Expand category") onClicked: labelContainer.model.expanded = !labelContainer.expanded } diff --git a/src/libs/tracing/qml/FlameGraphView.qml b/src/libs/tracing/qml/FlameGraphView.qml index 1f84e82ce7..065ce7d27b 100644 --- a/src/libs/tracing/qml/FlameGraphView.qml +++ b/src/libs/tracing/qml/FlameGraphView.qml @@ -41,7 +41,7 @@ ScrollView { property var details: function(flameGraph) { return []; } property var summary: function(attached) { if (!attached.dataValid) - return qsTranslate("::Tracing", "others"); + return qsTranslate("QtC::Tracing", "others"); return attached.data(summaryRole) + " (" + percent(sizeRole, attached) + "%)"; } @@ -231,7 +231,7 @@ ScrollView { // and because FlameGraph.data(...) cannot be notified anyway. function title() { return FlameGraph.data(root.detailsTitleRole) - || qsTranslate("::Tracing", "unknown"); + || qsTranslate("QtC::Tracing", "unknown"); } function note() { @@ -271,7 +271,7 @@ ScrollView { if (currentNode) return currentNode.title(); else if (root.model === null || root.model.rowCount() === 0) - return qsTranslate("::Tracing", "No data available"); + return qsTranslate("QtC::Tracing", "No data available"); else return ""; } diff --git a/src/libs/tracing/qml/RangeDetails.qml b/src/libs/tracing/qml/RangeDetails.qml index 144d50c3d1..8c0e64f25c 100644 --- a/src/libs/tracing/qml/RangeDetails.qml +++ b/src/libs/tracing/qml/RangeDetails.qml @@ -87,7 +87,7 @@ Item { implicitHeight: typeTitle.height visible: !rangeDetails.noteReadonly onClicked: noteEdit.focus = true - ToolTip.text: qsTranslate("::Tracing", "Edit note") + ToolTip.text: qsTranslate("QtC::Tracing", "Edit note") } ImageToolButton { @@ -97,7 +97,7 @@ Item { anchors.right: closeIcon.left implicitHeight: typeTitle.height onClicked: rangeDetails.locked = !rangeDetails.locked - ToolTip.text: qsTranslate("::Tracing", "View event information on mouseover.") + ToolTip.text: qsTranslate("QtC::Tracing", "View event information on mouseover.") } ImageToolButton { @@ -107,8 +107,8 @@ Item { implicitHeight: typeTitle.height imageSource: "image://icons/arrow" + (col.visible ? "up" : "down") onClicked: col.visible = !col.visible - ToolTip.text: col.visible ? qsTranslate("::Tracing", "Collapse") - : qsTranslate("::Tracing", "Expand") + ToolTip.text: col.visible ? qsTranslate("QtC::Tracing", "Collapse") + : qsTranslate("QtC::Tracing", "Expand") } } diff --git a/src/libs/tracing/qml/RowLabel.qml b/src/libs/tracing/qml/RowLabel.qml index 956fdc3b0f..8ec6f6d3a4 100644 --- a/src/libs/tracing/qml/RowLabel.qml +++ b/src/libs/tracing/qml/RowLabel.qml @@ -15,7 +15,7 @@ Button { signal setRowHeight(int newHeight) property string labelText: label.description ? label.description - : qsTranslate("::Tracing", "[unknown]") + : qsTranslate("QtC::Tracing", "[unknown]") onPressed: selectBySelectionId(); ToolTip.text: labelText + (label.displayName ? (" (" + label.displayName + ")") : "") diff --git a/src/libs/tracing/qml/SelectionRangeDetails.qml b/src/libs/tracing/qml/SelectionRangeDetails.qml index 71d8576ab9..4f03e06374 100644 --- a/src/libs/tracing/qml/SelectionRangeDetails.qml +++ b/src/libs/tracing/qml/SelectionRangeDetails.qml @@ -54,7 +54,7 @@ Item { //title TimelineText { id: typeTitle - text: " "+qsTranslate("::Tracing", "Selection") + text: " "+qsTranslate("QtC::Tracing", "Selection") font.bold: true height: 20 verticalAlignment: Text.AlignVCenter @@ -78,13 +78,13 @@ Item { Repeater { id: details property var contents: [ - qsTranslate("::Tracing", "Start") + ":", + qsTranslate("QtC::Tracing", "Start") + ":", TimeFormatter.format(selectionRangeDetails.startTime, selectionRangeDetails.referenceDuration), - (qsTranslate("::Tracing", "End") + ":"), + (qsTranslate("QtC::Tracing", "End") + ":"), TimeFormatter.format(selectionRangeDetails.endTime, selectionRangeDetails.referenceDuration), - (qsTranslate("::Tracing", "Duration") + ":"), + (qsTranslate("QtC::Tracing", "Duration") + ":"), TimeFormatter.format(selectionRangeDetails.duration, selectionRangeDetails.referenceDuration) ] @@ -115,6 +115,6 @@ Item { anchors.top: selectionRangeDetails.top implicitHeight: typeTitle.height onClicked: selectionRangeDetails.close() - ToolTip.text: qsTranslate("::Tracing", "Close") + ToolTip.text: qsTranslate("QtC::Tracing", "Close") } } diff --git a/src/libs/tracing/tracingtr.h b/src/libs/tracing/tracingtr.h index 0a05466373..240ed43aed 100644 --- a/src/libs/tracing/tracingtr.h +++ b/src/libs/tracing/tracingtr.h @@ -9,7 +9,7 @@ namespace Timeline { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::Tracing) + Q_DECLARE_TR_FUNCTIONS(QtC::Tracing) }; } // Tracing diff --git a/src/libs/utils/utilstr.h b/src/libs/utils/utilstr.h index b69363ef58..5cfd23d964 100644 --- a/src/libs/utils/utilstr.h +++ b/src/libs/utils/utilstr.h @@ -9,7 +9,7 @@ namespace Utils { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::Utils) + Q_DECLARE_TR_FUNCTIONS(QtC::Utils) }; } // Utils diff --git a/src/plugins/android/androidtr.h b/src/plugins/android/androidtr.h index 1293ced7c6..3536c22a9a 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(QtC::Android) }; } // namespace Android diff --git a/src/plugins/autotest/autotesttr.h b/src/plugins/autotest/autotesttr.h index 117dc6bcdd..5ba82a008d 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(QtC::Autotest) }; } // namespace Autotest diff --git a/src/plugins/autotest/boost/boosttestconstants.h b/src/plugins/autotest/boost/boosttestconstants.h index e2be27d51c..c56ca447a9 100644 --- a/src/plugins/autotest/boost/boosttestconstants.h +++ b/src/plugins/autotest/boost/boosttestconstants.h @@ -10,7 +10,7 @@ namespace BoostTest { namespace Constants { const char FRAMEWORK_NAME[] = "Boost"; -const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("::Autotest", "Boost Test"); +const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("QtC::Autotest", "Boost Test"); const unsigned FRAMEWORK_PRIORITY = 11; const char BOOST_MASTER_SUITE[] = "Master Test Suite"; diff --git a/src/plugins/autotest/gtest/gtestconstants.h b/src/plugins/autotest/gtest/gtestconstants.h index b90d9f2963..7d422e8df8 100644 --- a/src/plugins/autotest/gtest/gtestconstants.h +++ b/src/plugins/autotest/gtest/gtestconstants.h @@ -10,7 +10,7 @@ namespace GTest { namespace Constants { const char FRAMEWORK_NAME[] = "GTest"; -const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("::Autotest", "Google Test"); +const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("QtC::Autotest", "Google Test"); const unsigned FRAMEWORK_PRIORITY = 10; const char DEFAULT_FILTER[] = "*.*"; diff --git a/src/plugins/autotest/qtest/qttestconstants.h b/src/plugins/autotest/qtest/qttestconstants.h index 985591a946..10042a1c96 100644 --- a/src/plugins/autotest/qtest/qttestconstants.h +++ b/src/plugins/autotest/qtest/qttestconstants.h @@ -10,7 +10,7 @@ namespace QtTest { namespace Constants { const char FRAMEWORK_NAME[] = "QtTest"; -const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("::Autotest", "Qt Test"); +const char FRAMEWORK_SETTINGS_CATEGORY[] = QT_TRANSLATE_NOOP("QtC::Autotest", "Qt Test"); const unsigned FRAMEWORK_PRIORITY = 1; } // namespace Constants diff --git a/src/plugins/autotest/testrunconfiguration.h b/src/plugins/autotest/testrunconfiguration.h index 5fda1542af..1e89949ce1 100644 --- a/src/plugins/autotest/testrunconfiguration.h +++ b/src/plugins/autotest/testrunconfiguration.h @@ -25,7 +25,7 @@ public: TestRunConfiguration(ProjectExplorer::Target *parent, TestConfiguration *config) : ProjectExplorer::RunConfiguration(parent, "AutoTest.TestRunConfig") { - setDefaultDisplayName(QCoreApplication::translate("::Autotest", "AutoTest Debug")); + setDefaultDisplayName(QCoreApplication::translate("QtC::Autotest", "AutoTest Debug")); bool enableQuick = false; if (auto debuggable = dynamic_cast<DebuggableTestConfiguration *>(config)) diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanagertr.h b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanagertr.h index 9d7672c804..1010df0a94 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(QtC::AutotoolsProjectManager) }; } // namespace AutotoolsProjectManager diff --git a/src/plugins/baremetal/baremetaltr.h b/src/plugins/baremetal/baremetaltr.h index ec035c1c4d..6fb587ae05 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(QtC::BareMetal) }; } // namespace BareMetal diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 5775380b13..a0f980606d 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -64,7 +64,7 @@ namespace Bazaar::Internal { // Submit editor parameters const char COMMIT_ID[] = "Bazaar Commit Log Editor"; -const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Bazaar Commit Log Editor"); +const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Bazaar Commit Log Editor"); const char COMMITMIMETYPE[] = "text/vnd.qtcreator.bazaar.commit"; // Menu items diff --git a/src/plugins/bazaar/bazaartr.h b/src/plugins/bazaar/bazaartr.h index 27abb9eaeb..d182f6788d 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(QtC::Bazaar) }; } // namespace Bazaar diff --git a/src/plugins/bazaar/constants.h b/src/plugins/bazaar/constants.h index d51359a123..e2cdb549bb 100644 --- a/src/plugins/bazaar/constants.h +++ b/src/plugins/bazaar/constants.h @@ -23,15 +23,15 @@ const char ANNOTATE_CHANGESET_ID[] = "([.0-9]+)"; // Base editor parameters const char FILELOG_ID[] = "Bazaar File Log Editor"; -const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Bazaar File Log Editor"); +const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Bazaar File Log Editor"); const char LOGAPP[] = "text/vnd.qtcreator.bazaar.log"; const char ANNOTATELOG_ID[] = "Bazaar Annotation Editor"; -const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Bazaar Annotation Editor"); +const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Bazaar Annotation Editor"); const char ANNOTATEAPP[] = "text/vnd.qtcreator.bazaar.annotation"; const char DIFFLOG_ID[] = "Bazaar Diff Editor"; -const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Bazaar Diff Editor"); +const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Bazaar Diff Editor"); const char DIFFAPP[] = "text/x-patch"; // File status hint diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h b/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h index 74424e362c..92b95f70ba 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyleconstants.h @@ -7,6 +7,6 @@ namespace Beautifier::Constants { -const char ARTISTICSTYLE_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::Beautifier", "Artistic Style"); +const char ARTISTICSTYLE_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::Beautifier", "Artistic Style"); } // Beautifier::Constants diff --git a/src/plugins/beautifier/beautifiertr.h b/src/plugins/beautifier/beautifiertr.h index 68a82ad358..83cbf19478 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(QtC::Beautifier) }; } // namespace Beautifier diff --git a/src/plugins/beautifier/clangformat/clangformatconstants.h b/src/plugins/beautifier/clangformat/clangformatconstants.h index c6b62e1f53..177253f6c1 100644 --- a/src/plugins/beautifier/clangformat/clangformatconstants.h +++ b/src/plugins/beautifier/clangformat/clangformatconstants.h @@ -7,6 +7,6 @@ namespace Beautifier::Constants { -const char CLANGFORMAT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::Beautifier", "ClangFormat"); +const char CLANGFORMAT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::Beautifier", "ClangFormat"); } // Beautifier::Constants diff --git a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h index f6b4567098..e8c4331be7 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h +++ b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h @@ -7,6 +7,6 @@ namespace Beautifier::Constants { -const char UNCRUSTIFY_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::Beautifier", "Uncrustify"); +const char UNCRUSTIFY_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::Beautifier", "Uncrustify"); } // Beautifier::Constants diff --git a/src/plugins/bineditor/bineditortr.h b/src/plugins/bineditor/bineditortr.h index 34d3de9bb8..30e8ca0068 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(QtC::BinEditor) }; } // BinEditor diff --git a/src/plugins/bookmarks/bookmarkstr.h b/src/plugins/bookmarks/bookmarkstr.h index ab0999c4f4..c48879d347 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(QtC::Bookmarks) }; } // namespace Bookmarks diff --git a/src/plugins/boot2qt/qdbtr.h b/src/plugins/boot2qt/qdbtr.h index b0bc7232f9..41a8e0af15 100644 --- a/src/plugins/boot2qt/qdbtr.h +++ b/src/plugins/boot2qt/qdbtr.h @@ -9,7 +9,7 @@ namespace Qdb { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::Qdb) + Q_DECLARE_TR_FUNCTIONS(QtC::Qdb) }; } // namespace Qdb diff --git a/src/plugins/clangcodemodel/clangcodemodeltr.h b/src/plugins/clangcodemodel/clangcodemodeltr.h index 1eb14dce9c..f9f5d8bf5e 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(QtC::ClangCodeModel) }; } // namespace ClangCodeModel diff --git a/src/plugins/clangformat/clangformattr.h b/src/plugins/clangformat/clangformattr.h index e99806b015..c34ccfec43 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(QtC::ClangFormat) }; } // namespace ClangFormat diff --git a/src/plugins/clangtools/clangtoolslogfilereader.cpp b/src/plugins/clangtools/clangtoolslogfilereader.cpp index a8950d6603..d7ccb5579e 100644 --- a/src/plugins/clangtools/clangtoolslogfilereader.cpp +++ b/src/plugins/clangtools/clangtoolslogfilereader.cpp @@ -22,7 +22,7 @@ static bool checkFilePath(const Utils::FilePath &filePath, QString *errorMessage if (!fi.exists() || !fi.isReadable()) { if (errorMessage) { *errorMessage - = QString(QT_TRANSLATE_NOOP("::ClangTools", + = QString(QT_TRANSLATE_NOOP("QtC::ClangTools", "File \"%1\" does not exist or is not readable.")) .arg(filePath.toUserOutput()); } @@ -255,7 +255,7 @@ Diagnostics readExportedDiagnostics(const Utils::FilePath &logFilePath, } catch (std::exception &e) { if (errorMessage) { *errorMessage = QString( - QT_TRANSLATE_NOOP("::ClangTools", + QT_TRANSLATE_NOOP("QtC::ClangTools", "Error: Failed to parse YAML file \"%1\": %2.")) .arg(logFilePath.toUserOutput(), QString::fromUtf8(e.what())); } diff --git a/src/plugins/clangtools/clangtoolstr.h b/src/plugins/clangtools/clangtoolstr.h index 933b034219..6c2872ed90 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(QtC::ClangTools) }; } // namespace ClangTools diff --git a/src/plugins/classview/classviewtr.h b/src/plugins/classview/classviewtr.h index ca218d0402..4dc930f65e 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(QtC::ClassView) }; } // namespace ClassView diff --git a/src/plugins/clearcase/clearcaseconstants.h b/src/plugins/clearcase/clearcaseconstants.h index bcf93a149c..fe42967e55 100644 --- a/src/plugins/clearcase/clearcaseconstants.h +++ b/src/plugins/clearcase/clearcaseconstants.h @@ -11,7 +11,7 @@ namespace Constants { const char VCS_ID_CLEARCASE[] = "E.ClearCase"; const char CLEARCASE_SUBMIT_MIMETYPE[] = "text/vnd.qtcreator.clearcase.submit"; const char CLEARCASECHECKINEDITOR_ID[] = "ClearCase Check In Editor"; -const char CLEARCASECHECKINEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "ClearCase Check In Editor"); +const char CLEARCASECHECKINEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "ClearCase Check In Editor"); const char TASK_INDEX[] = "ClearCase.Task.Index"; const char KEEP_ACTIVITY[] = "__KEEP__"; enum { debug = 0 }; diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 2c6a390179..de884452be 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -105,21 +105,21 @@ const char CMD_ID_STATUS[] = "ClearCase.Status"; const VcsBaseEditorParameters logEditorParameters { LogOutput, "ClearCase File Log Editor", // id - QT_TRANSLATE_NOOP("::VcsBase", "ClearCase File Log Editor"), // display_name + QT_TRANSLATE_NOOP("QtC::VcsBase", "ClearCase File Log Editor"), // display_name "text/vnd.qtcreator.clearcase.log" }; const VcsBaseEditorParameters annotateEditorParameters { AnnotateOutput, "ClearCase Annotation Editor", // id - QT_TRANSLATE_NOOP("::VcsBase", "ClearCase Annotation Editor"), // display_name + QT_TRANSLATE_NOOP("QtC::VcsBase", "ClearCase Annotation Editor"), // display_name "text/vnd.qtcreator.clearcase.annotation" }; const VcsBaseEditorParameters diffEditorParameters { DiffOutput, "ClearCase Diff Editor", // id - QT_TRANSLATE_NOOP("::VcsBase", "ClearCase Diff Editor"), // display_name + QT_TRANSLATE_NOOP("QtC::VcsBase", "ClearCase Diff Editor"), // display_name "text/x-patch" }; diff --git a/src/plugins/clearcase/clearcasetr.h b/src/plugins/clearcase/clearcasetr.h index fbf44395a3..446260bede 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(QtC::ClearCase) }; } // namespace ClearCase diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanagertr.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanagertr.h index 5e201908cc..206f80d53b 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(QtC::CMakeProjectManager) }; } // namespace CMakeProjectManager diff --git a/src/plugins/coco/cocotr.h b/src/plugins/coco/cocotr.h index a69b436506..2b2a76365b 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(QtC::Coco) }; } // namespace Coco diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index 3085a011ff..e47dd262ea 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -512,7 +512,7 @@ CompilationDatabaseBuildConfigurationFactory::CompilationDatabaseBuildConfigurat setSupportedProjectMimeTypeName(Constants::COMPILATIONDATABASEMIMETYPE); setBuildGenerator([](const Kit *, const FilePath &projectPath, bool) { - const QString name = QCoreApplication::translate("::ProjectExplorer", "Release"); + const QString name = QCoreApplication::translate("QtC::ProjectExplorer", "Release"); ProjectExplorer::BuildInfo info; info.typeName = name; info.displayName = name; diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagertr.h b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseprojectmanagertr.h index 7e7d3dc708..c0fee358bf 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(QtC::CompilationDatabaseProjectManager) }; } // namespace CompilationDatabaseProjectManager diff --git a/src/plugins/conan/conantr.h b/src/plugins/conan/conantr.h index b8ff19c9a0..708bc479f3 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(QtC::Conan) }; } // Conan diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 51633a04e1..91e1e2d34b 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("QtC::Core", "Show Left Sidebar"); +const char TR_HIDE_LEFT_SIDEBAR[] = QT_TRANSLATE_NOOP("QtC::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("QtC::Core", "Show Right Sidebar"); +const char TR_HIDE_RIGHT_SIDEBAR[] = QT_TRANSLATE_NOOP("QtC::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("QtC::Core", "Qt"); const char WIZARD_KIND_UNKNOWN[] = "unknown"; const char WIZARD_KIND_PROJECT[] = "project"; const char WIZARD_KIND_FILE[] = "file"; @@ -209,7 +209,7 @@ const char SETTINGS_THEME[] = "Core/CreatorTheme"; const char DEFAULT_THEME[] = "flat"; const char DEFAULT_DARK_THEME[] = "flat-dark"; -const char TR_CLEAR_MENU[] = QT_TRANSLATE_NOOP("::Core", "Clear Menu"); +const char TR_CLEAR_MENU[] = QT_TRANSLATE_NOOP("QtC::Core", "Clear Menu"); const int MODEBAR_ICON_SIZE = 34; const int MODEBAR_ICONSONLY_BUTTON_SIZE = MODEBAR_ICON_SIZE + 4; diff --git a/src/plugins/coreplugin/coreplugintr.h b/src/plugins/coreplugin/coreplugintr.h index f9281fd728..28c7a072ce 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(QtC::Core) }; } // namespace Core diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp index d5bd558e80..226564fa0b 100644 --- a/src/plugins/coreplugin/documentmanager.cpp +++ b/src/plugins/coreplugin/documentmanager.cpp @@ -754,9 +754,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("QtC::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("QtC::Core", "All Files (*)", "On Linux/macOS"); #endif QString DocumentManager::allFilesFilterString() diff --git a/src/plugins/coreplugin/locator/locatorconstants.h b/src/plugins/coreplugin/locator/locatorconstants.h index cd44cff836..9433166503 100644 --- a/src/plugins/coreplugin/locator/locatorconstants.h +++ b/src/plugins/coreplugin/locator/locatorconstants.h @@ -9,7 +9,7 @@ namespace Core { namespace Constants { const char LOCATE[] = "QtCreator.Locate"; -const char FILTER_OPTIONS_PAGE[] = QT_TRANSLATE_NOOP("::Core", "Locator"); +const char FILTER_OPTIONS_PAGE[] = QT_TRANSLATE_NOOP("QtC::Core", "Locator"); const char CUSTOM_DIRECTORY_FILTER_BASEID[] = "Locator.CustomFilter"; const char CUSTOM_URL_FILTER_BASEID[] = "Locator.CustomUrlFilter"; const char TASK_INDEX[] = "Locator.Task.Index"; diff --git a/src/plugins/cpaster/cpastertr.h b/src/plugins/cpaster/cpastertr.h index 46d2c2ca36..c0fd571fbe 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(QtC::CodePaster) }; } // namespace CodePaster diff --git a/src/plugins/cppcheck/cppchecktr.h b/src/plugins/cppcheck/cppchecktr.h index 6e016de559..2246074c6e 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(QtC::Cppcheck) }; } // namespace Cppcheck diff --git a/src/plugins/cppeditor/cppeditorconstants.h b/src/plugins/cppeditor/cppeditorconstants.h index f0b4ee861b..3c87aa6d63 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("QtC::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,28 +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("QtC::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"); + = QT_TRANSLATE_NOOP("QtC::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("QtC::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("QtC::CppEditor", "C++ Functions"); const char INCLUDES_FILTER_ID[] = "All Included C/C++ Files"; -const char INCLUDES_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::CppEditor", +const char INCLUDES_FILTER_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::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"); + = QT_TRANSLATE_NOOP("QtC::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("QtC::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/cppeditortr.h b/src/plugins/cppeditor/cppeditortr.h index e764d5ad33..0a4bd36ad8 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(QtC::CppEditor) }; } // namespace CppEditor diff --git a/src/plugins/cppeditor/cppfilesettingspage.cpp b/src/plugins/cppeditor/cppfilesettingspage.cpp index 30bda87af6..447d608369 100644 --- a/src/plugins/cppeditor/cppfilesettingspage.cpp +++ b/src/plugins/cppeditor/cppfilesettingspage.cpp @@ -39,7 +39,7 @@ const char sourceSearchPathsKeyC[] = "SourceSearchPaths"; const char headerPragmaOnceC[] = "HeaderPragmaOnce"; const char licenseTemplatePathKeyC[] = "LicenseTemplate"; -const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("::CppEditor", +const char *licenseTemplateTemplate = QT_TRANSLATE_NOOP("QtC::CppEditor", "/**************************************************************************\n" "** %1 license header template\n" "** Special keywords: %USER% %DATE% %YEAR%\n" diff --git a/src/plugins/cppeditor/cppoutlinemodel.cpp b/src/plugins/cppeditor/cppoutlinemodel.cpp index 9c06f3c835..d1875b6bb3 100644 --- a/src/plugins/cppeditor/cppoutlinemodel.cpp +++ b/src/plugins/cppeditor/cppoutlinemodel.cpp @@ -31,8 +31,8 @@ public: switch (role) { case Qt::DisplayRole: if (parent()->childCount() > 1) - return QString(QT_TRANSLATE_NOOP("::CppEditor", "<Select Symbol>")); - return QString(QT_TRANSLATE_NOOP("::CppEditor", "<No Symbols>")); + return QString(QT_TRANSLATE_NOOP("QtC::CppEditor", "<Select Symbol>")); + return QString(QT_TRANSLATE_NOOP("QtC::CppEditor", "<No Symbols>")); default: return QVariant(); } diff --git a/src/plugins/ctfvisualizer/ctfvisualizertool.h b/src/plugins/ctfvisualizer/ctfvisualizertool.h index 24c1bf45ca..647ea3cb74 100644 --- a/src/plugins/ctfvisualizer/ctfvisualizertool.h +++ b/src/plugins/ctfvisualizer/ctfvisualizertool.h @@ -46,7 +46,7 @@ private: void toggleThreadRestriction(QAction *action); Utils::Perspective m_perspective{Constants::CtfVisualizerPerspectiveId, - QCoreApplication::translate("::CtfVisualizer", + QCoreApplication::translate("QtC::CtfVisualizer", "Chrome Trace Format Visualizer")}; bool m_isLoading; diff --git a/src/plugins/ctfvisualizer/ctfvisualizertr.h b/src/plugins/ctfvisualizer/ctfvisualizertr.h index 339fcca46a..207388aced 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(QtC::CtfVisualizer) }; } // namespace CtfVisualizer diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 1030b74cfa..85e98c1e4c 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -90,7 +90,7 @@ const char CMD_ID_REPOSITORYUPDATE[] = "CVS.RepositoryUpdate"; const char CVS_SUBMIT_MIMETYPE[] = "text/vnd.qtcreator.cvs.submit"; const char CVSCOMMITEDITOR_ID[] = "CVS Commit Editor"; -const char CVSCOMMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "CVS Commit Editor"); +const char CVSCOMMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "CVS Commit Editor"); const VcsBaseSubmitEditorParameters submitParameters { CVS_SUBMIT_MIMETYPE, @@ -102,28 +102,28 @@ const VcsBaseSubmitEditorParameters submitParameters { const VcsBaseEditorParameters commandLogEditorParameters { OtherContent, "CVS Command Log Editor", // id - QT_TRANSLATE_NOOP("::VcsBase", "CVS Command Log Editor"), // display name + QT_TRANSLATE_NOOP("QtC::VcsBase", "CVS Command Log Editor"), // display name "text/vnd.qtcreator.cvs.commandlog" }; const VcsBaseEditorParameters logEditorParameters { LogOutput, "CVS File Log Editor", // id - QT_TRANSLATE_NOOP("::VcsBase", "CVS File Log Editor"), // display name + QT_TRANSLATE_NOOP("QtC::VcsBase", "CVS File Log Editor"), // display name "text/vnd.qtcreator.cvs.log" }; const VcsBaseEditorParameters annotateEditorParameters { AnnotateOutput, "CVS Annotation Editor", // id - QT_TRANSLATE_NOOP("::VcsBase", "CVS Annotation Editor"), // display name + QT_TRANSLATE_NOOP("QtC::VcsBase", "CVS Annotation Editor"), // display name "text/vnd.qtcreator.cvs.annotation" }; const VcsBaseEditorParameters diffEditorParameters { DiffOutput, "CVS Diff Editor", // id - QT_TRANSLATE_NOOP("::VcsBase", "CVS Diff Editor"), // display name + QT_TRANSLATE_NOOP("QtC::VcsBase", "CVS Diff Editor"), // display name "text/x-patch" }; diff --git a/src/plugins/cvs/cvstr.h b/src/plugins/cvs/cvstr.h index 47f51fc17a..e75a3c2096 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(QtC::CVS) }; } // Cvs diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp index 4759c23988..8f21d67096 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.cpp +++ b/src/plugins/debugger/cdb/cdboptionspage.cpp @@ -33,12 +33,12 @@ struct EventsDescription { // Parameters of the "sxe" command const EventsDescription eventDescriptions[] = { - {"eh", false, QT_TRANSLATE_NOOP("::Debugger", "C++ exception")}, - {"ct", false, QT_TRANSLATE_NOOP("::Debugger", "Thread creation")}, - {"et", false, QT_TRANSLATE_NOOP("::Debugger", "Thread exit")}, - {"ld", true, QT_TRANSLATE_NOOP("::Debugger", "Load module:")}, - {"ud", true, QT_TRANSLATE_NOOP("::Debugger", "Unload module:")}, - {"out", true, QT_TRANSLATE_NOOP("::Debugger", "Output:")} + {"eh", false, QT_TRANSLATE_NOOP("QtC::Debugger", "C++ exception")}, + {"ct", false, QT_TRANSLATE_NOOP("QtC::Debugger", "Thread creation")}, + {"et", false, QT_TRANSLATE_NOOP("QtC::Debugger", "Thread exit")}, + {"ld", true, QT_TRANSLATE_NOOP("QtC::Debugger", "Load module:")}, + {"ud", true, QT_TRANSLATE_NOOP("QtC::Debugger", "Unload module:")}, + {"out", true, QT_TRANSLATE_NOOP("QtC::Debugger", "Output:")} }; static inline int indexOfEvent(const QString &abbrev) diff --git a/src/plugins/debugger/debuggertr.h b/src/plugins/debugger/debuggertr.h index 1333648e42..6f75450c59 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(QtC::Debugger) }; } // namespace Debugger diff --git a/src/plugins/designer/designerconstants.h b/src/plugins/designer/designerconstants.h index 8b2a34dffe..0f05b67124 100644 --- a/src/plugins/designer/designerconstants.h +++ b/src/plugins/designer/designerconstants.h @@ -11,10 +11,10 @@ namespace Constants { const char INFO_READ_ONLY[] = "DesignerXmlEditor.ReadOnly"; const char K_DESIGNER_XML_EDITOR_ID[] = "FormEditor.DesignerXmlEditor"; const char C_DESIGNER_XML_EDITOR[] = "Designer Xml Editor"; -const char C_DESIGNER_XML_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::Designer", "Form Editor"); +const char C_DESIGNER_XML_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::Designer", "Form Editor"); const char SETTINGS_CATEGORY[] = "P.Designer"; -const char SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("::Designer", "Designer"); +const char SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("QtC::Designer", "Designer"); // Context const char C_FORMEDITOR[] = "FormEditor.FormEditor"; diff --git a/src/plugins/designer/designertr.h b/src/plugins/designer/designertr.h index 7c20e593f6..5b26eb4c09 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(QtC::Designer) }; } // namespace Designer diff --git a/src/plugins/diffeditor/diffeditortr.h b/src/plugins/diffeditor/diffeditortr.h index ca5dc7f26d..8f754bb744 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(QtC::DiffEditor) }; } // namespace DiffEditor diff --git a/src/plugins/docker/dockertr.h b/src/plugins/docker/dockertr.h index 26f8d17a73..0abb3cddd0 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(QtC::Docker) }; } // namespace Docker diff --git a/src/plugins/emacskeys/emacskeystr.h b/src/plugins/emacskeys/emacskeystr.h index f255fd3194..0c776013ff 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(QtC::EmacsKeys) }; } // namespace EmacsKeys diff --git a/src/plugins/fakevim/fakevimtr.h b/src/plugins/fakevim/fakevimtr.h index 1595c93287..a32f8c9b90 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(QtC::FakeVim) }; } // namespace FakeVim diff --git a/src/plugins/fossil/constants.h b/src/plugins/fossil/constants.h index acaf3aa4d7..6dd6bd4d04 100644 --- a/src/plugins/fossil/constants.h +++ b/src/plugins/fossil/constants.h @@ -31,20 +31,20 @@ const char DIFFFILE_ID_EXACT[] = "[+]{3} (.*)\\s*"; // match and capture //BaseEditorParameters const char FILELOG_ID[] = "Fossil File Log Editor"; -const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Fossil File Log Editor"); +const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Fossil File Log Editor"); const char LOGAPP[] = "text/vnd.qtcreator.fossil.log"; const char ANNOTATELOG_ID[] = "Fossil Annotation Editor"; -const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Fossil Annotation Editor"); +const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Fossil Annotation Editor"); const char ANNOTATEAPP[] = "text/vnd.qtcreator.fossil.annotation"; const char DIFFLOG_ID[] = "Fossil Diff Editor"; -const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Fossil Diff Editor"); +const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Fossil Diff Editor"); const char DIFFAPP[] = "text/x-patch"; //SubmitEditorParameters const char COMMIT_ID[] = "Fossil Commit Log Editor"; -const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Fossil Commit Log Editor"); +const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Fossil Commit Log Editor"); const char COMMITMIMETYPE[] = "text/vnd.qtcreator.fossil.commit"; //menu items diff --git a/src/plugins/fossil/fossiltr.h b/src/plugins/fossil/fossiltr.h index 657db81f85..39de294e87 100644 --- a/src/plugins/fossil/fossiltr.h +++ b/src/plugins/fossil/fossiltr.h @@ -9,7 +9,7 @@ namespace Fossil { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::Fossil) + Q_DECLARE_TR_FUNCTIONS(QtC::Fossil) }; } // namespace Fossil diff --git a/src/plugins/genericprojectmanager/genericprojectmanagertr.h b/src/plugins/genericprojectmanager/genericprojectmanagertr.h index 1b7f007714..0fee1c557a 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(QtC::GenericProjectManager) }; } // namespace GenericProjectManager diff --git a/src/plugins/git/gitconstants.h b/src/plugins/git/gitconstants.h index 6263ea28ac..32d456ca16 100644 --- a/src/plugins/git/gitconstants.h +++ b/src/plugins/git/gitconstants.h @@ -11,22 +11,22 @@ namespace Constants { const char GIT_PLUGIN[] = "GitPlugin"; const char GIT_SVN_LOG_EDITOR_ID[] = "Git SVN Log Editor"; -const char GIT_SVN_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Git SVN Log Editor"); +const char GIT_SVN_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Git SVN Log Editor"); const char GIT_LOG_EDITOR_ID[] = "Git Log Editor"; -const char GIT_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Git Log Editor"); +const char GIT_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Git Log Editor"); const char GIT_REFLOG_EDITOR_ID[] = "Git Reflog Editor"; -const char GIT_REFLOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Git Reflog Editor"); +const char GIT_REFLOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Git Reflog Editor"); const char GIT_BLAME_EDITOR_ID[] = "Git Annotation Editor"; -const char GIT_BLAME_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Git Annotation Editor"); +const char GIT_BLAME_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Git Annotation Editor"); const char GIT_COMMIT_TEXT_EDITOR_ID[] = "Git Commit Editor"; -const char GIT_COMMIT_TEXT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Git Commit Editor"); +const char GIT_COMMIT_TEXT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Git Commit Editor"); const char GIT_REBASE_EDITOR_ID[] = "Git Rebase Editor"; -const char GIT_REBASE_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Git Rebase Editor"); +const char GIT_REBASE_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Git Rebase Editor"); const char GIT_BRANCH_VIEW_ID[] = "Git Branches"; const char GIT_CONTEXT[] = "Git Context"; const char GITSUBMITEDITOR_ID[] = "Git Submit Editor"; -const char GITSUBMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Git Submit Editor"); +const char GITSUBMITEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Git Submit Editor"); const char SUBMIT_MIMETYPE[] = "text/vnd.qtcreator.git.submit"; const char C_GITEDITORID[] = "Git Editor"; diff --git a/src/plugins/git/gittr.h b/src/plugins/git/gittr.h index 852a7e9750..98171fed20 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(QtC::Git) }; } // namespace Git diff --git a/src/plugins/gitlab/gitlabtr.h b/src/plugins/gitlab/gitlabtr.h index de69ab84e2..0a1ff1c4d0 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(QtC::GitLab) }; } // namespace GitLab diff --git a/src/plugins/glsleditor/glsleditortr.h b/src/plugins/glsleditor/glsleditortr.h index e5c4023c93..9f6455aa2c 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(QtC::GlslEditor) }; } // namespace GLSLEditor diff --git a/src/plugins/helloworld/helloworldtr.h b/src/plugins/helloworld/helloworldtr.h index 8d36b6f069..53f192a4d6 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(QtC::HelloWorld) }; } // namespace HelloWorld diff --git a/src/plugins/help/helpconstants.h b/src/plugins/help/helpconstants.h index 163f12a258..f47d325313 100644 --- a/src/plugins/help/helpconstants.h +++ b/src/plugins/help/helpconstants.h @@ -34,14 +34,14 @@ const char HELP_SEARCH[] = "Help.Search"; const char HELP_BOOKMARKS[] = "Help.Bookmarks"; const char HELP_OPENPAGES[] = "Help.OpenPages"; -static const char SB_INDEX[] = QT_TRANSLATE_NOOP("::Help", "Index"); -static const char SB_CONTENTS[] = QT_TRANSLATE_NOOP("::Help", "Contents"); -static const char SB_BOOKMARKS[] = QT_TRANSLATE_NOOP("::Help", "Bookmarks"); -static const char SB_OPENPAGES[] = QT_TRANSLATE_NOOP("::Help", "Open Pages"); -static const char SB_SEARCH[] = QT_TRANSLATE_NOOP("::Help", "Search"); - -static const char TR_OPEN_LINK_AS_NEW_PAGE[] = QT_TRANSLATE_NOOP("::Help", "Open Link as New Page"); -static const char TR_OPEN_LINK_IN_WINDOW[] = QT_TRANSLATE_NOOP("::Help", "Open Link in Window"); +static const char SB_INDEX[] = QT_TRANSLATE_NOOP("QtC::Help", "Index"); +static const char SB_CONTENTS[] = QT_TRANSLATE_NOOP("QtC::Help", "Contents"); +static const char SB_BOOKMARKS[] = QT_TRANSLATE_NOOP("QtC::Help", "Bookmarks"); +static const char SB_OPENPAGES[] = QT_TRANSLATE_NOOP("QtC::Help", "Open Pages"); +static const char SB_SEARCH[] = QT_TRANSLATE_NOOP("QtC::Help", "Search"); + +static const char TR_OPEN_LINK_AS_NEW_PAGE[] = QT_TRANSLATE_NOOP("QtC::Help", "Open Link as New Page"); +static const char TR_OPEN_LINK_IN_WINDOW[] = QT_TRANSLATE_NOOP("QtC::Help", "Open Link in Window"); } // Constants } // Help diff --git a/src/plugins/help/helptr.h b/src/plugins/help/helptr.h index ef046f7319..8542d4b502 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(QtC::Help) }; } // namespace Help diff --git a/src/plugins/imageviewer/imageviewertr.h b/src/plugins/imageviewer/imageviewertr.h index 040a274454..ba6a9d1be5 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(QtC::ImageViewer) }; } // namespace ImageViewer diff --git a/src/plugins/incredibuild/incredibuildtr.h b/src/plugins/incredibuild/incredibuildtr.h index 5a7b5d6cf5..14c2d2865f 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(QtC::IncrediBuild) }; } // IncrediBuild diff --git a/src/plugins/ios/iostr.h b/src/plugins/ios/iostr.h index 9af6c3dad5..10c3556e9f 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(QtC::Ios) }; } // namespace Ios diff --git a/src/plugins/languageclient/languageclient_global.h b/src/plugins/languageclient/languageclient_global.h index 4e57d0057d..0dca3e6bbf 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("QtC::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("QtC::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("QtC::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("QtC::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("QtC::LanguageClient", "Functions and Methods in Workspace"); } // namespace Constants } // namespace LanguageClient diff --git a/src/plugins/languageclient/languageclienttr.h b/src/plugins/languageclient/languageclienttr.h index 261d8745c2..e2c53af50f 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(QtC::LanguageClient) }; } // namespace LanguageClient diff --git a/src/plugins/macros/macrostr.h b/src/plugins/macros/macrostr.h index 854a9db893..9de9a67935 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(QtC::Macros) }; } // namespace Macros diff --git a/src/plugins/marketplace/marketplacetr.h b/src/plugins/marketplace/marketplacetr.h index 95404ec64a..3f20fbf574 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(QtC::Marketplace) }; } // namespace Marketplace diff --git a/src/plugins/mcusupport/mcusupporttr.h b/src/plugins/mcusupport/mcusupporttr.h index c63ca55bdb..dcfa61a94f 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(QtC::McuSupport) }; } // namespace McuSupport diff --git a/src/plugins/mercurial/constants.h b/src/plugins/mercurial/constants.h index 6ec215db4a..e38871e4aa 100644 --- a/src/plugins/mercurial/constants.h +++ b/src/plugins/mercurial/constants.h @@ -23,20 +23,20 @@ const char DIFFIDENTIFIER[] = "^(?:diff --git a/|[+-]{3} (?:/dev/null|[ab]/(.+$) // Base editor parameters const char FILELOG_ID[] = "Mercurial File Log Editor"; -const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Mercurial File Log Editor"); +const char FILELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Mercurial File Log Editor"); const char LOGAPP[] = "text/vnd.qtcreator.mercurial.log"; const char ANNOTATELOG_ID[] = "Mercurial Annotation Editor"; -const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Mercurial Annotation Editor"); +const char ANNOTATELOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Mercurial Annotation Editor"); const char ANNOTATEAPP[] = "text/vnd.qtcreator.mercurial.annotation"; const char DIFFLOG_ID[] = "Mercurial Diff Editor"; -const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Mercurial Diff Editor"); +const char DIFFLOG_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Mercurial Diff Editor"); const char DIFFAPP[] = "text/x-patch"; // Submit editor parameters const char COMMIT_ID[] = "Mercurial Commit Log Editor"; -const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Mercurial Commit Log Editor"); +const char COMMIT_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Mercurial Commit Log Editor"); const char COMMITMIMETYPE[] = "text/vnd.qtcreator.mercurial.commit"; // File menu actions diff --git a/src/plugins/mercurial/mercurialtr.h b/src/plugins/mercurial/mercurialtr.h index f220cc8d8a..cb16de6dd7 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(QtC::Mercurial) }; } // namespace Mercurial diff --git a/src/plugins/mesonprojectmanager/mesonactionsmanager.h b/src/plugins/mesonprojectmanager/mesonactionsmanager.h index 0bb81c753b..004be312a3 100644 --- a/src/plugins/mesonprojectmanager/mesonactionsmanager.h +++ b/src/plugins/mesonprojectmanager/mesonactionsmanager.h @@ -14,8 +14,8 @@ class MesonActionsManager : public QObject { Q_OBJECT Utils::ParameterAction buildTargetContextAction{ - QCoreApplication::translate("::MesonProjectManager", "Build"), - QCoreApplication::translate("::MesonProjectManager", "Build \"%1\""), + QCoreApplication::translate("QtC::MesonProjectManager", "Build"), + QCoreApplication::translate("QtC::MesonProjectManager", "Build \"%1\""), Utils::ParameterAction::AlwaysEnabled /*handled manually*/ }; QAction configureActionMenu; diff --git a/src/plugins/mesonprojectmanager/mesonprojectmanagertr.h b/src/plugins/mesonprojectmanager/mesonprojectmanagertr.h index f9f20dbf46..575a8af890 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(QtC::MesonProjectManager) }; } // namespace MesonProjectManager diff --git a/src/plugins/modeleditor/modeleditortr.h b/src/plugins/modeleditor/modeleditortr.h index 5f35343204..c2c3ea7048 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(QtC::ModelEditor) }; } // namespace ModelEditor diff --git a/src/plugins/nim/nimconstants.h b/src/plugins/nim/nimconstants.h index 21e00d5e75..5c66be9f29 100644 --- a/src/plugins/nim/nimconstants.h +++ b/src/plugins/nim/nimconstants.h @@ -52,7 +52,7 @@ const char C_NIMCODESTYLESETTINGSPAGE_CATEGORY[] = "Z.Nim"; const char C_NIMTOOLSSETTINGSPAGE_ID[] = "Nim.NimToolsSettings"; const char C_NIMTOOLSSETTINGSPAGE_CATEGORY[] = "Z.Nim"; -const char C_NIMLANGUAGE_NAME[] = QT_TRANSLATE_NOOP("::Nim", "Nim"); +const char C_NIMLANGUAGE_NAME[] = QT_TRANSLATE_NOOP("QtC::Nim", "Nim"); const char C_NIMGLOBALCODESTYLE_ID[] = "NimGlobal"; const QString C_NIMSNIPPETSGROUP_ID = QStringLiteral("Nim.NimSnippetsGroup"); diff --git a/src/plugins/nim/nimtr.h b/src/plugins/nim/nimtr.h index a15d194bc1..b86f7fe964 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(QtC::Nim) }; } // namespace Nim diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index 636fed7560..31fcb97a20 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -64,16 +64,16 @@ const char SUBMIT_MIMETYPE[] = "text/vnd.qtcreator.p4.submit"; const char PERFORCE_CONTEXT[] = "Perforce Context"; const char PERFORCE_SUBMIT_EDITOR_ID[] = "Perforce.SubmitEditor"; -const char PERFORCE_SUBMIT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Perforce.SubmitEditor"); +const char PERFORCE_SUBMIT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Perforce.SubmitEditor"); const char PERFORCE_LOG_EDITOR_ID[] = "Perforce.LogEditor"; -const char PERFORCE_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Perforce Log Editor"); +const char PERFORCE_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Perforce Log Editor"); const char PERFORCE_DIFF_EDITOR_ID[] = "Perforce.DiffEditor"; -const char PERFORCE_DIFF_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Perforce Diff Editor"); +const char PERFORCE_DIFF_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Perforce Diff Editor"); const char PERFORCE_ANNOTATION_EDITOR_ID[] = "Perforce.AnnotationEditor"; -const char PERFORCE_ANNOTATION_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Perforce Annotation Editor"); +const char PERFORCE_ANNOTATION_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Perforce Annotation Editor"); // Ensure adding "..." to relative paths which is p4's convention // for the current directory diff --git a/src/plugins/perforce/perforcetr.h b/src/plugins/perforce/perforcetr.h index cd33f4574d..9fe8ea9005 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(QtC::Perforce) }; } // Perforce diff --git a/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp b/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp index 5765afb135..112252923f 100644 --- a/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp +++ b/src/plugins/perfprofiler/perfprofilerstatisticsmodel.cpp @@ -12,19 +12,19 @@ namespace PerfProfiler { namespace Internal { static const char *headerLabels[] = { - QT_TRANSLATE_NOOP("::PerfProfiler", "Address"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Function"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Source Location"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Binary Location"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Caller"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Callee"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Occurrences"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Occurrences in Percent"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Recursion in Percent"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Samples"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Samples in Percent"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Self Samples"), - QT_TRANSLATE_NOOP("::PerfProfiler", "Self in Percent") + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Address"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Function"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Source Location"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Binary Location"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Caller"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Callee"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Occurrences"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Occurrences in Percent"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Recursion in Percent"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Samples"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Samples in Percent"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Self Samples"), + QT_TRANSLATE_NOOP("QtC::PerfProfiler", "Self in Percent") }; Q_STATIC_ASSERT(sizeof(headerLabels) == diff --git a/src/plugins/perfprofiler/perfprofilertool.h b/src/plugins/perfprofiler/perfprofilertool.h index 0f158083a1..4244e7a282 100644 --- a/src/plugins/perfprofiler/perfprofilertool.h +++ b/src/plugins/perfprofiler/perfprofilertool.h @@ -83,7 +83,7 @@ private: void finalize(); Utils::Perspective m_perspective{Constants::PerfProfilerPerspectiveId, - QCoreApplication::translate("::PerfProfiler", + QCoreApplication::translate("QtC::PerfProfiler", "Performance Analyzer")}; QAction *m_startAction = nullptr; diff --git a/src/plugins/perfprofiler/perfprofilertr.h b/src/plugins/perfprofiler/perfprofilertr.h index 50a411b99b..88cc0c8419 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(QtC::PerfProfiler) }; } // namespace PerfProfiler diff --git a/src/plugins/projectexplorer/compileoutputwindow.h b/src/plugins/projectexplorer/compileoutputwindow.h index 6efd41a34f..e1f000de9a 100644 --- a/src/plugins/projectexplorer/compileoutputwindow.h +++ b/src/plugins/projectexplorer/compileoutputwindow.h @@ -37,7 +37,7 @@ public: QWidget *outputWidget(QWidget *) override; QList<QWidget *> toolBarWidgets() const override; QString displayName() const override { - return QCoreApplication::translate("::ProjectExplorer","Compile Output"); } + return QCoreApplication::translate("QtC::ProjectExplorer","Compile Output"); } int priorityInStatusBar() const override; void clearContents() override; bool canFocus() const override; diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h index 59d361d977..1ebf33ddec 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("QtC::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("QtC::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("QtC::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("QtC::ProjectExplorer", "Import Project"); // Wizard extra values const char PREFERRED_PROJECT_NODE[] = "ProjectExplorer.PreferredProjectNode"; diff --git a/src/plugins/projectexplorer/projectexplorertr.h b/src/plugins/projectexplorer/projectexplorertr.h index aea1735514..fbe405f881 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(QtC::ProjectExplorer) }; } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/projectwelcomepage.h b/src/plugins/projectexplorer/projectwelcomepage.h index a4e039f070..a9c8145963 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.h +++ b/src/plugins/projectexplorer/projectwelcomepage.h @@ -43,7 +43,7 @@ class ProjectWelcomePage : public Core::IWelcomePage public: ProjectWelcomePage(); - QString title() const override { return QCoreApplication::translate("::ProjectExplorer", "Projects"); } + QString title() const override { return QCoreApplication::translate("QtC::ProjectExplorer", "Projects"); } int priority() const override { return 20; } Utils::Id id() const override; QWidget *createWidget() const override; diff --git a/src/plugins/python/pythontr.h b/src/plugins/python/pythontr.h index f2cb90e754..eeeaaf4d58 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(QtC::Python) }; } // namespace Python diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h index 124b481940..8b35e0f088 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h @@ -71,7 +71,7 @@ const char XCODE_SDK[] = "xcode.sdk"; // Settings page const char QBS_SETTINGS_CATEGORY[] = "K.Qbs"; -const char QBS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("::QbsProjectManager", "Qbs"); +const char QBS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("QtC::QbsProjectManager", "Qbs"); const char QBS_SETTINGS_CATEGORY_ICON[] = ":/projectexplorer/images/build.png"; const char QBS_PROFILING_ENV[] = "QTC_QBS_PROFILING"; diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagertr.h b/src/plugins/qbsprojectmanager/qbsprojectmanagertr.h index 2dacbdd215..4e1e01fc1f 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(QtC::QbsProjectManager) }; } // namespace QbsProjectManager diff --git a/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp b/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp index ab84b1ce37..f261594e59 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodetreebuilder.cpp @@ -41,19 +41,19 @@ public: }; const FileTypeDataStorage fileTypeDataStorage[] = { - { FileType::Header, QT_TRANSLATE_NOOP("::QmakeProjectManager", "Headers"), + { FileType::Header, QT_TRANSLATE_NOOP("QtC::QmakeProjectManager", "Headers"), ProjectExplorer::Constants::FILEOVERLAY_H, "*.h; *.hh; *.hpp; *.hxx;"}, - { FileType::Source, QT_TRANSLATE_NOOP("::QmakeProjectManager", "Sources"), + { FileType::Source, QT_TRANSLATE_NOOP("QtC::QmakeProjectManager", "Sources"), ProjectExplorer::Constants::FILEOVERLAY_CPP, "*.c; *.cc; *.cpp; *.cp; *.cxx; *.c++;" }, - { FileType::Form, QT_TRANSLATE_NOOP("::QmakeProjectManager", "Forms"), + { FileType::Form, QT_TRANSLATE_NOOP("QtC::QmakeProjectManager", "Forms"), ProjectExplorer::Constants::FILEOVERLAY_UI, "*.ui;" }, - { FileType::StateChart, QT_TRANSLATE_NOOP("::QmakeProjectManager", "State charts"), + { FileType::StateChart, QT_TRANSLATE_NOOP("QtC::QmakeProjectManager", "State charts"), ProjectExplorer::Constants::FILEOVERLAY_SCXML, "*.scxml;" }, - { FileType::Resource, QT_TRANSLATE_NOOP("::QmakeProjectManager", "Resources"), + { FileType::Resource, QT_TRANSLATE_NOOP("QtC::QmakeProjectManager", "Resources"), ProjectExplorer::Constants::FILEOVERLAY_QRC, "*.qrc;" }, - { FileType::QML, QT_TRANSLATE_NOOP("::QmakeProjectManager", "QML"), + { FileType::QML, QT_TRANSLATE_NOOP("QtC::QmakeProjectManager", "QML"), ProjectExplorer::Constants::FILEOVERLAY_QML, "*.qml;" }, - { FileType::Unknown, QT_TRANSLATE_NOOP("::QmakeProjectManager", "Other files"), + { FileType::Unknown, QT_TRANSLATE_NOOP("QtC::QmakeProjectManager", "Other files"), ProjectExplorer::Constants::FILEOVERLAY_UNKNOWN, "*;" } }; diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h index 1eb7ca38fc..06174c5d0a 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagertr.h @@ -9,7 +9,7 @@ namespace QmakeProjectManager { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::QmakeProjectManager) + Q_DECLARE_TR_FUNCTIONS(QtC::QmakeProjectManager) }; } // namespace QmakeProjectManager diff --git a/src/plugins/qmldesigner/qmldesignertr.h b/src/plugins/qmldesigner/qmldesignertr.h index 71ecd7dc25..5c57d49d21 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(QtC::QmlDesigner) }; } // namespace QmlDesigner diff --git a/src/plugins/qmljseditor/qmljseditortr.h b/src/plugins/qmljseditor/qmljseditortr.h index 1061481fd1..1b31528a68 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(QtC::QmlJSEditor) }; } // namespace QmlJSEditor diff --git a/src/plugins/qmljstools/qmljstoolsconstants.h b/src/plugins/qmljstools/qmljstoolsconstants.h index d6302e110a..f7555f54a7 100644 --- a/src/plugins/qmljstools/qmljstoolsconstants.h +++ b/src/plugins/qmljstools/qmljstoolsconstants.h @@ -17,7 +17,7 @@ const char JS_MIMETYPE[] = "application/javascript"; const char JSON_MIMETYPE[] = "application/json"; 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_CODE_STYLE_SETTINGS_NAME[] = QT_TRANSLATE_NOOP("QtC::QmlJSTools", "Code Style"); const char QML_JS_SETTINGS_ID[] = "QmlJS"; diff --git a/src/plugins/qmljstools/qmljstoolstr.h b/src/plugins/qmljstools/qmljstoolstr.h index 3da70ba463..bcac491e61 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(QtC::QmlJSTools) }; } // namespace QmlJSTools diff --git a/src/plugins/qmlpreview/qmlpreviewtr.h b/src/plugins/qmlpreview/qmlpreviewtr.h index 84904bb184..0130071917 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(QtC::QmlPreview) }; } // namespace QmlPreview diff --git a/src/plugins/qmlprofiler/debugmessagesmodel.cpp b/src/plugins/qmlprofiler/debugmessagesmodel.cpp index c4ef1ad257..3ccb384351 100644 --- a/src/plugins/qmlprofiler/debugmessagesmodel.cpp +++ b/src/plugins/qmlprofiler/debugmessagesmodel.cpp @@ -27,11 +27,11 @@ QRgb DebugMessagesModel::color(int index) const } static const char *messageTypes[] = { - QT_TRANSLATE_NOOP("::QmlProfiler", "Debug Message"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Warning Message"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Critical Message"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Fatal Message"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Info Message"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Debug Message"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Warning Message"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Critical Message"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Fatal Message"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Info Message"), }; QString DebugMessagesModel::messageType(uint i) diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index af3134a69d..082090262d 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -22,19 +22,19 @@ namespace QmlProfiler { static const char *ProfileFeatureNames[] = { - QT_TRANSLATE_NOOP("::QmlProfiler", "JavaScript"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Memory Usage"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Pixmap Cache"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Scene Graph"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Animations"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Painting"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Compiling"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Creating"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Binding"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Handling Signal"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Input Events"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Debug Messages"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Quick3D") + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "JavaScript"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Memory Usage"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Pixmap Cache"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Scene Graph"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Animations"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Painting"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Compiling"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Creating"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Binding"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Handling Signal"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Input Events"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Debug Messages"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Quick3D") }; Q_STATIC_ASSERT(sizeof(ProfileFeatureNames) == sizeof(char *) * MaximumProfileFeature); diff --git a/src/plugins/qmlprofiler/qmlprofilertr.h b/src/plugins/qmlprofiler/qmlprofilertr.h index e8326c0b64..b63f73b5cb 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(QtC::QmlProfiler) }; } // namespace QmlProfiler diff --git a/src/plugins/qmlprofiler/quick3dmodel.cpp b/src/plugins/qmlprofiler/quick3dmodel.cpp index fc0b9fff1e..259eadb233 100644 --- a/src/plugins/qmlprofiler/quick3dmodel.cpp +++ b/src/plugins/qmlprofiler/quick3dmodel.cpp @@ -30,27 +30,27 @@ QRgb Quick3DModel::color(int index) const } static const char *messageTypes[] = { - QT_TRANSLATE_NOOP("::QmlProfiler", "Render Frame"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Synchronize Frame"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Prepare Frame"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Mesh Load"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Custom Mesh Load"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Load"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Generate Shader"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Load Shader"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Particle Update"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Render Call"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Render Pass"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Event Data"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Render Frame"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Synchronize Frame"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Prepare Frame"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Mesh Load"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Custom Mesh Load"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Texture Load"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Generate Shader"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Load Shader"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Particle Update"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Render Call"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Render Pass"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Event Data"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Mesh Memory consumption"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Memory consumption"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Mesh Memory consumption"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Texture Memory consumption"), }; static const char *unloadMessageTypes[] = { - QT_TRANSLATE_NOOP("::QmlProfiler", "Mesh Unload"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Custom Mesh Unload"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Unload"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Mesh Unload"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Custom Mesh Unload"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Texture Unload"), }; QString Quick3DModel::messageType(uint i) diff --git a/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp b/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp index 395e78cbf7..586b9f6313 100644 --- a/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp +++ b/src/plugins/qmlprofiler/scenegraphtimelinemodel.cpp @@ -15,32 +15,32 @@ namespace QmlProfiler { namespace Internal { static const char *ThreadLabels[] = { - QT_TRANSLATE_NOOP("::QmlProfiler", "GUI Thread"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Render Thread"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Render Thread Details") + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "GUI Thread"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Render Thread"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Render Thread Details") }; static const char *StageLabels[] = { - QT_TRANSLATE_NOOP("::QmlProfiler", "Polish"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Wait"), - QT_TRANSLATE_NOOP("::QmlProfiler", "GUI Thread Sync"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Animations"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Render Thread Sync"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Render"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Swap"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Render Preprocess"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Render Update"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Render Bind"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Render Render"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Material Compile"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Glyph Render"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Glyph Upload"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Bind"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Convert"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Swizzle"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Upload"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Mipmap"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Texture Delete") + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Polish"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Wait"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "GUI Thread Sync"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Animations"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Render Thread Sync"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Render"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Swap"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Render Preprocess"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Render Update"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Render Bind"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Render Render"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Material Compile"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Glyph Render"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Glyph Upload"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Texture Bind"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Texture Convert"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Texture Swizzle"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Texture Upload"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Texture Mipmap"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Texture Delete") }; enum SceneGraphCategoryType { diff --git a/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp b/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp index 321cadc5eb..837e19c990 100644 --- a/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp +++ b/src/plugins/qmlprofiler/tests/debugmessagesmodel_test.cpp @@ -50,11 +50,11 @@ void DebugMessagesModelTest::testColor() } static const char *messageTypes[] = { - QT_TRANSLATE_NOOP("::QmlProfiler", "Debug Message"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Warning Message"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Critical Message"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Fatal Message"), - QT_TRANSLATE_NOOP("::QmlProfiler", "Info Message"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Debug Message"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Warning Message"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Critical Message"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Fatal Message"), + QT_TRANSLATE_NOOP("QtC::QmlProfiler", "Info Message"), }; void DebugMessagesModelTest::testLabels() diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp index 08e236504d..279b48ccb1 100644 --- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp @@ -30,7 +30,7 @@ using namespace Utils; namespace QmlProjectManager { const char M_CURRENT_FILE[] = "CurrentFile"; -const char CURRENT_FILE[] = QT_TRANSLATE_NOOP("::QmlProjectManager", "<Current File>"); +const char CURRENT_FILE[] = QT_TRANSLATE_NOOP("QtC::QmlProjectManager", "<Current File>"); static bool caseInsensitiveLessThan(const FilePath &s1, const FilePath &s2) { diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanagertr.h b/src/plugins/qmlprojectmanager/qmlprojectmanagertr.h index 0921f0549e..b9d8198bce 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(QtC::QmlProjectManager) }; } // namespace QmlProjectManager diff --git a/src/plugins/qnx/qnxtr.h b/src/plugins/qnx/qnxtr.h index e0666aafd6..9410828e97 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(QtC::Qnx) }; } // namespace Qnx diff --git a/src/plugins/qtsupport/externaleditors.cpp b/src/plugins/qtsupport/externaleditors.cpp index afff6a0b77..e65d85ea25 100644 --- a/src/plugins/qtsupport/externaleditors.cpp +++ b/src/plugins/qtsupport/externaleditors.cpp @@ -36,7 +36,7 @@ enum { debug = 0 }; namespace QtSupport::Internal { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::QmakeProjectManager) + Q_DECLARE_TR_FUNCTIONS(QtC::QmakeProjectManager) }; // Locate a binary in a directory, applying all kinds of diff --git a/src/plugins/qtsupport/qtsupporttr.h b/src/plugins/qtsupport/qtsupporttr.h index 6bd9ac0865..3c14a22d5c 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(QtC::QtSupport) }; } // namespace QtSupport diff --git a/src/plugins/remotelinux/remotelinuxtr.h b/src/plugins/remotelinux/remotelinuxtr.h index 99e2f79ae8..77a2b6a284 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(QtC::RemoteLinux) }; } // namespace RemoteLinux diff --git a/src/plugins/resourceeditor/resourceeditortr.h b/src/plugins/resourceeditor/resourceeditortr.h index 2fac00c620..4eaf445b38 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(QtC::ResourceEditor) }; } // namespace ResourceEditor diff --git a/src/plugins/scxmleditor/common/search.h b/src/plugins/scxmleditor/common/search.h index 6a25299d3e..9a5d9a028b 100644 --- a/src/plugins/scxmleditor/common/search.h +++ b/src/plugins/scxmleditor/common/search.h @@ -40,7 +40,7 @@ public: QString title() const override { - return QCoreApplication::translate("::ScxmlEditor", "Search"); + return QCoreApplication::translate("QtC::ScxmlEditor", "Search"); } QIcon icon() const override diff --git a/src/plugins/scxmleditor/scxmleditortr.h b/src/plugins/scxmleditor/scxmleditortr.h index c25dbc764a..bafd5fd429 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(QtC::ScxmlEditor) }; } // namespace ScxmlEditor diff --git a/src/plugins/serialterminal/serialterminalconstants.h b/src/plugins/serialterminal/serialterminalconstants.h index cc2f67ef33..bcd94afe3b 100644 --- a/src/plugins/serialterminal/serialterminalconstants.h +++ b/src/plugins/serialterminal/serialterminalconstants.h @@ -8,7 +8,7 @@ namespace SerialTerminal { namespace Constants { -const char OUTPUT_PANE_TITLE[] = QT_TRANSLATE_NOOP("::SerialTerminal", "Serial Terminal"); +const char OUTPUT_PANE_TITLE[] = QT_TRANSLATE_NOOP("QtC::SerialTerminal", "Serial Terminal"); const char LOGGING_CATEGORY[] = "qtc.serialterminal.outputpane"; diff --git a/src/plugins/serialterminal/serialterminaltr.h b/src/plugins/serialterminal/serialterminaltr.h index 0dc1fb5234..9145de8cd2 100644 --- a/src/plugins/serialterminal/serialterminaltr.h +++ b/src/plugins/serialterminal/serialterminaltr.h @@ -9,7 +9,7 @@ namespace SerialTerminal { struct Tr { - Q_DECLARE_TR_FUNCTIONS(::SerialTerminal) + Q_DECLARE_TR_FUNCTIONS(QtC::SerialTerminal) }; } // namespace SerialTerminal diff --git a/src/plugins/silversearcher/silversearchertr.h b/src/plugins/silversearcher/silversearchertr.h index 13bc074be8..a5e95f2a18 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(QtC::SilverSearcher) }; } // namespace SilverSearcher diff --git a/src/plugins/squish/deletesymbolicnamedialog.cpp b/src/plugins/squish/deletesymbolicnamedialog.cpp index 8b9f6eba09..0f2a909c13 100644 --- a/src/plugins/squish/deletesymbolicnamedialog.cpp +++ b/src/plugins/squish/deletesymbolicnamedialog.cpp @@ -104,7 +104,7 @@ DeleteSymbolicNameDialog::~DeleteSymbolicNameDialog() = default; void DeleteSymbolicNameDialog::updateDetailsLabel(const QString &nameToDelete) { - const char *detailsText = QT_TRANSLATE_NOOP("::Squish", + const char *detailsText = QT_TRANSLATE_NOOP("QtC::Squish", "The Symbolic Name <span style='white-space: nowrap'>\"%1\"</span> you " "want to remove is used in Multi Property Names. Select the action to " "apply to references in these Multi Property Names."); diff --git a/src/plugins/squish/squishtr.h b/src/plugins/squish/squishtr.h index 5488c59136..7c7d2795f1 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(QtC::Squish) }; } // namespace Squish diff --git a/src/plugins/studiowelcome/studiowelcometr.h b/src/plugins/studiowelcome/studiowelcometr.h index 12d8be459a..ef31416b6f 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(QtC::StudioWelcome) }; } // namespace StudioWelcome diff --git a/src/plugins/subversion/subversionconstants.h b/src/plugins/subversion/subversionconstants.h index c2bbf07c2e..b0d6ce8f45 100644 --- a/src/plugins/subversion/subversionconstants.h +++ b/src/plugins/subversion/subversionconstants.h @@ -16,15 +16,15 @@ enum { debug = 0 }; const char SUBVERSION_CONTEXT[] = "Subversion Context"; const char SUBVERSION_COMMIT_EDITOR_ID[] = "Subversion Commit Editor"; -const char SUBVERSION_COMMIT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Subversion Commit Editor"); +const char SUBVERSION_COMMIT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Subversion Commit Editor"); const char SUBVERSION_SUBMIT_MIMETYPE[] = "text/vnd.qtcreator.svn.submit"; const char SUBVERSION_LOG_EDITOR_ID[] = "Subversion File Log Editor"; -const char SUBVERSION_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Subversion File Log Editor"); +const char SUBVERSION_LOG_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Subversion File Log Editor"); const char SUBVERSION_LOG_MIMETYPE[] = "text/vnd.qtcreator.svn.log"; const char SUBVERSION_BLAME_EDITOR_ID[] = "Subversion Annotation Editor"; -const char SUBVERSION_BLAME_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::VcsBase", "Subversion Annotation Editor"); +const char SUBVERSION_BLAME_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("QtC::VcsBase", "Subversion Annotation Editor"); const char SUBVERSION_BLAME_MIMETYPE[] = "text/vnd.qtcreator.svn.annotation"; } // namespace Constants diff --git a/src/plugins/subversion/subversiontr.h b/src/plugins/subversion/subversiontr.h index 628ba80f1b..097ee445b2 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(QtC::Subversion) }; } // namespace Subversion diff --git a/src/plugins/texteditor/texteditortr.h b/src/plugins/texteditor/texteditortr.h index d705758e0c..b4170aabce 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(QtC::TextEditor) }; } // namespace TextEditor diff --git a/src/plugins/todo/todotr.h b/src/plugins/todo/todotr.h index 27b367c527..fbb2f486c2 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(QtC::Todo) }; } // namespace Todo diff --git a/src/plugins/updateinfo/updateinfotr.h b/src/plugins/updateinfo/updateinfotr.h index 2cd606187f..ee0096c3cb 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(QtC::UpdateInfo) }; } // namespace UpdateInfo diff --git a/src/plugins/valgrind/valgrindtr.h b/src/plugins/valgrind/valgrindtr.h index c6a13e1178..0f598332bb 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(QtC::Valgrind) }; } // namespace Valgrind diff --git a/src/plugins/vcsbase/vcsbasetr.h b/src/plugins/vcsbase/vcsbasetr.h index 3bede77b17..0ba55f79a6 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(QtC::VcsBase) }; } // namespace VcsBase diff --git a/src/plugins/webassembly/webassemblytr.h b/src/plugins/webassembly/webassemblytr.h index fc05192eea..ce8b0f5d7b 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(QtC::WebAssembly) }; } // namespace WebAssembly diff --git a/src/plugins/welcome/welcometr.h b/src/plugins/welcome/welcometr.h index 28798fbdb0..33fc46b663 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(QtC::Welcome) }; } // namespace Welcome |
