diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.cpp b/src/libs/languageserverprotocol/jsonrpcmessages.cpp index 15f19b4c9a4..466477d7404 100644 --- a/src/libs/languageserverprotocol/jsonrpcmessages.cpp +++ b/src/libs/languageserverprotocol/jsonrpcmessages.cpp @@ -123,9 +123,6 @@ QJsonObject JsonRpcMessageHandler::toJsonObject(const QByteArray &_content, QTextCodec *codec, QString &parseError) { - auto tr = [](const char *message){ - return QCoreApplication::translate("JsonRpcMessageHandler", message); - }; if (_content.isEmpty()) return QJsonObject(); QByteArray content; diff --git a/src/libs/languageserverprotocol/jsonrpcmessages.h b/src/libs/languageserverprotocol/jsonrpcmessages.h index 3225fd48666..864e74a1c1c 100644 --- a/src/libs/languageserverprotocol/jsonrpcmessages.h +++ b/src/libs/languageserverprotocol/jsonrpcmessages.h @@ -64,6 +64,8 @@ private: class LANGUAGESERVERPROTOCOL_EXPORT JsonRpcMessageHandler { + Q_DECLARE_TR_FUNCTIONS(JsonRpcMessageHandler) + public: using MessageProvider = std::function; static void registerMessageProvider(const QString &method, MessageProvider provider); diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index d5e53e20b47..58a317d761a 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -442,8 +442,8 @@ BinEditorPluginPrivate::BinEditorPluginPrivate() ExtensionSystem::PluginManager::addObject(&m_factoryService); ExtensionSystem::PluginManager::addObject(&m_editorFactory); - m_undoAction = new QAction(tr("&Undo"), this); - m_redoAction = new QAction(tr("&Redo"), this); + m_undoAction = new QAction(BinEditorPlugin::tr("&Undo"), this); + m_redoAction = new QAction(BinEditorPlugin::tr("&Redo"), this); m_copyAction = new QAction(this); m_selectAllAction = new QAction(this); diff --git a/src/plugins/cppcheck/cppcheckoptions.cpp b/src/plugins/cppcheck/cppcheckoptions.cpp index 6e665417d03..1c8f0b21317 100644 --- a/src/plugins/cppcheck/cppcheckoptions.cpp +++ b/src/plugins/cppcheck/cppcheckoptions.cpp @@ -47,6 +47,7 @@ namespace Internal { class OptionsWidget final : public QWidget { + Q_DECLARE_TR_FUNCTIONS(CppcheckOptionsPage) public: explicit OptionsWidget(QWidget *parent = nullptr) : QWidget(parent), diff --git a/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp b/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp index e7d68465787..70432047cf9 100644 --- a/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp +++ b/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp @@ -112,7 +112,7 @@ void ClangDiagnosticConfigsSelectionWidget::connectToClangDiagnosticConfigsDialo ClangDiagnosticConfigsWidget *widget = new ClangDiagnosticConfigsWidget(currentConfigId()); widget->layout()->setMargin(0); QDialog dialog; - dialog.setWindowTitle(widget->tr("Diagnostic Configurations")); + dialog.setWindowTitle(ClangDiagnosticConfigsWidget::tr("Diagnostic Configurations")); dialog.setLayout(new QVBoxLayout); dialog.layout()->addWidget(widget); auto *buttonsBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index c1586e6edd4..47a8f7b012a 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -153,11 +153,11 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent) }); auto viewButton = new QToolButton; - viewButton->setText(tr("&Views")); + viewButton->setText(DebuggerMainWindow::tr("&Views")); auto closeButton = new QToolButton(); closeButton->setIcon(Utils::Icons::CLOSE_SPLIT_BOTTOM.icon()); - closeButton->setToolTip(tr("Leave Debug Mode")); + closeButton->setToolTip(DebuggerMainWindow::tr("Leave Debug Mode")); auto toolbar = new Utils::StyledBar; toolbar->setProperty("topBorder", true); @@ -187,7 +187,7 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent) hbox->addWidget(viewButton); hbox->addWidget(closeButton); - auto dock = new QDockWidget(tr("Toolbar"), q); + auto dock = new QDockWidget(DebuggerMainWindow::tr("Toolbar"), q); dock->setObjectName(QLatin1String("Toolbar")); dock->setFeatures(QDockWidget::NoDockWidgetFeatures); dock->setAllowedAreas(Qt::BottomDockWidgetArea); @@ -482,7 +482,8 @@ void DebuggerMainWindowPrivate::populateCurrentPerspective() QWidget *central = m_currentPerspective->centralWidget(); m_centralWidgetStack->addWidget(central ? central : m_editorPlaceHolder); - q->showCentralWidgetAction()->setText(central ? central->windowTitle() : tr("Editor")); + q->showCentralWidgetAction()->setText(central ? central->windowTitle() + : DebuggerMainWindow::tr("Editor")); m_statusLabel->clear(); diff --git a/src/plugins/debugger/enginemanager.cpp b/src/plugins/debugger/enginemanager.cpp index 7abc9a6858b..ef92bb2858a 100644 --- a/src/plugins/debugger/enginemanager.cpp +++ b/src/plugins/debugger/enginemanager.cpp @@ -278,11 +278,11 @@ bool EngineItem::setData(int row, const QVariant &value, int role) auto menu = new QMenu(ev.view()); - QAction *actCreate = menu->addAction(tr("Create Snapshot")); + QAction *actCreate = menu->addAction(EngineManager::tr("Create Snapshot")); actCreate->setEnabled(m_engine->hasCapability(SnapshotCapabilityRole)); menu->addSeparator(); - QAction *actRemove = menu->addAction(tr("Abort Debugger")); + QAction *actRemove = menu->addAction(EngineManager::tr("Abort Debugger")); actRemove->setEnabled(true); QAction *act = menu->exec(cmev->globalPos()); diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp index 5baf4b60144..c92b728f102 100644 --- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp +++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp @@ -63,7 +63,7 @@ public: GenericMakeCleanStepFactory makeCleanStepFactory; GenericBuildConfigurationFactory buildConfigFactory; - QAction editFilesAction{GenericProjectPluginPrivate::tr("Edit Files..."), nullptr}; + QAction editFilesAction{GenericProjectPlugin::tr("Edit Files..."), nullptr}; }; static GenericProjectPluginPrivate *dd = nullptr; diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index 31697e10509..0b8f966b736 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -114,6 +114,7 @@ private: class LanguageClientSettingsPage : public Core::IOptionsPage { + Q_DECLARE_TR_FUNCTIONS(LanguageClientSettingsPage) public: LanguageClientSettingsPage(); ~LanguageClientSettingsPage() override; @@ -147,9 +148,9 @@ LanguageClientSettingsPageWidget::LanguageClientSettingsPageWidget(LanguageClien return mimeType.name(); }); auto buttonLayout = new QVBoxLayout(); - auto addButton = new QPushButton(tr("&Add")); + auto addButton = new QPushButton(LanguageClientSettingsPage::tr("&Add")); connect(addButton, &QPushButton::pressed, this, &LanguageClientSettingsPageWidget::addItem); - auto deleteButton = new QPushButton(tr("&Delete")); + auto deleteButton = new QPushButton(LanguageClientSettingsPage::tr("&Delete")); connect(deleteButton, &QPushButton::pressed, this, &LanguageClientSettingsPageWidget::deleteItem); mainLayout->addLayout(layout); @@ -577,6 +578,7 @@ public: class MimeTypeDialog : public QDialog { + Q_DECLARE_TR_FUNCTIONS(MimeTypeDialog) public: explicit MimeTypeDialog(const QStringList &selectedMimeTypes, QWidget *parent = nullptr) : QDialog(parent) diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp index cecf44be2cd..aa23dc69c9d 100644 --- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp +++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp @@ -68,6 +68,7 @@ static void copyAspect(ProjectConfigurationAspect *source, ProjectConfigurationA class CustomExecutableDialog : public QDialog { + Q_DECLARE_TR_FUNCTIONS(CustomExecutableDialog) public: explicit CustomExecutableDialog(RunConfiguration *rc);