diff options
21 files changed, 128 insertions, 107 deletions
diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp index b8d0d3463e..3d6d9d0596 100644 --- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp @@ -64,7 +64,7 @@ JLinkGdbServerProvider::JLinkGdbServerProvider() setResetCommands(defaultResetCommands()); setChannel("localhost", 2331); setSettingsKeyBase("BareMetal.JLinkGdbServerProvider"); - setTypeDisplayName(tr("JLink")); + setTypeDisplayName(GdbServerProvider::tr("JLink")); setConfigurationWidgetCreator([this] { return new JLinkGdbServerProviderConfigWidget(this); }); } diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp index 1f55539662..57692d0d53 100644 --- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp @@ -59,7 +59,7 @@ OpenOcdGdbServerProvider::OpenOcdGdbServerProvider() setResetCommands(defaultResetCommands()); setChannel("localhost", 3333); setSettingsKeyBase("BareMetal.OpenOcdGdbServerProvider"); - setTypeDisplayName(tr("OpenOCD")); + setTypeDisplayName(GdbServerProvider::tr("OpenOCD")); setConfigurationWidgetCreator([this] { return new OpenOcdGdbServerProviderConfigWidget(this); }); } diff --git a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp index c0a9276aaf..b37ff75ec9 100644 --- a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp @@ -82,7 +82,7 @@ public: SimulatorUvscServerProvider::SimulatorUvscServerProvider() : UvscServerProvider(Constants::UVSC_SIMULATOR_PROVIDER_ID) { - setTypeDisplayName(tr("uVision Simulator")); + setTypeDisplayName(UvscServerProvider::tr("uVision Simulator")); setConfigurationWidgetCreator([this] { return new SimulatorUvscServerProviderConfigWidget(this); }); setDriverSelection(defaultSimulatorDriverSelection()); } diff --git a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp index 5669f50f80..619560642e 100644 --- a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp @@ -141,7 +141,7 @@ bool StLinkUvscAdapterOptions::operator==(const StLinkUvscAdapterOptions &other) StLinkUvscServerProvider::StLinkUvscServerProvider() : UvscServerProvider(Constants::UVSC_STLINK_PROVIDER_ID) { - setTypeDisplayName(tr("uVision St-Link")); + setTypeDisplayName(UvscServerProvider::tr("uVision St-Link")); setConfigurationWidgetCreator([this] { return new StLinkUvscServerProviderConfigWidget(this); }); setSupportedDrivers({"STLink\\ST-LINKIII-KEIL_SWO.dll"}); } diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp index d81ecd4066..1c10441f1b 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp @@ -375,13 +375,16 @@ UvscServerProviderRunner::UvscServerProviderRunner(ProjectExplorer::RunControl * this->runControl()->setApplicationProcessHandle(pid); reportStarted(); }); - connect(&m_process, QOverload<int, QProcess::ExitStatus>::of(&QtcProcess::finished), - this, [this] (int exitCode, QProcess::ExitStatus status) { - const QString msg = (status == QProcess::CrashExit) - ? tr("%1 crashed.") : tr("%2 exited with code %1").arg(exitCode); - appendMessage(msg.arg(m_process.program()), Utils::NormalMessageFormat); - reportStopped(); - }); + connect(&m_process, + QOverload<int, QProcess::ExitStatus>::of(&QtcProcess::finished), + this, + [this](int exitCode, QProcess::ExitStatus status) { + const QString msg = (status == QProcess::CrashExit) + ? RunControl::tr("%1 crashed.") + : RunControl::tr("%2 exited with code %1").arg(exitCode); + appendMessage(msg.arg(m_process.program()), Utils::NormalMessageFormat); + reportStopped(); + }); connect(&m_process, &QtcProcess::errorOccurred, this, [this] (QProcess::ProcessError error) { if (error == QProcess::Timedout) return; // No actual change on the process side. diff --git a/src/plugins/beautifier/generaloptionspage.cpp b/src/plugins/beautifier/generaloptionspage.cpp index db59c07a40..3a6005c10c 100644 --- a/src/plugins/beautifier/generaloptionspage.cpp +++ b/src/plugins/beautifier/generaloptionspage.cpp @@ -34,6 +34,8 @@ namespace Internal { class GeneralOptionsPageWidget : public Core::IOptionsPageWidget { + Q_DECLARE_TR_FUNCTIONS(Beautifier::Internal::GeneralOptionsPageWidget) + public: explicit GeneralOptionsPageWidget(const QStringList &toolIds); @@ -69,7 +71,7 @@ void GeneralOptionsPageWidget::apply() GeneralOptionsPage::GeneralOptionsPage(const QStringList &toolIds) { setId(Constants::OPTION_GENERAL_ID); - setDisplayName(tr("General")); + setDisplayName(GeneralOptionsPageWidget::tr("General")); setCategory(Constants::OPTION_CATEGORY); setDisplayCategory(QCoreApplication::translate("Beautifier", "Beautifier")); setWidgetCreator([toolIds] { return new GeneralOptionsPageWidget(toolIds); }); diff --git a/src/plugins/clearcase/settingspage.cpp b/src/plugins/clearcase/settingspage.cpp index 35043fe7e9..0fac7ef662 100644 --- a/src/plugins/clearcase/settingspage.cpp +++ b/src/plugins/clearcase/settingspage.cpp @@ -123,7 +123,7 @@ void SettingsPageWidget::apply() ClearCaseSettingsPage::ClearCaseSettingsPage() { setId(ClearCase::Constants::VCS_ID_CLEARCASE); - setDisplayName(tr("ClearCase")); + setDisplayName(SettingsPageWidget::tr("ClearCase")); setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); setWidgetCreator([] { return new SettingsPageWidget; }); } diff --git a/src/plugins/coreplugin/dialogs/restartdialog.h b/src/plugins/coreplugin/dialogs/restartdialog.h index 07b3d26374..dd5bae773e 100644 --- a/src/plugins/coreplugin/dialogs/restartdialog.h +++ b/src/plugins/coreplugin/dialogs/restartdialog.h @@ -27,12 +27,15 @@ #include <coreplugin/core_global.h> +#include <QCoreApplication> #include <QMessageBox> namespace Core { class CORE_EXPORT RestartDialog : public QMessageBox { + Q_DECLARE_TR_FUNCTIONS(Core::RestartDialog) + public: RestartDialog(QWidget *parent, const QString &text); }; diff --git a/src/plugins/coreplugin/editormanager/openeditorsview.cpp b/src/plugins/coreplugin/editormanager/openeditorsview.cpp index 241a47ace9..3714905b12 100644 --- a/src/plugins/coreplugin/editormanager/openeditorsview.cpp +++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp @@ -134,7 +134,8 @@ OpenEditorsViewFactory::OpenEditorsViewFactory() { setId("Open Documents"); setDisplayName(OpenEditorsWidget::tr("Open Documents")); - setActivationSequence(QKeySequence(useMacShortcuts ? tr("Meta+O") : tr("Alt+O"))); + setActivationSequence(QKeySequence(useMacShortcuts ? OpenEditorsWidget::tr("Meta+O") + : OpenEditorsWidget::tr("Alt+O"))); setPriority(200); } diff --git a/src/plugins/cpaster/settingspage.h b/src/plugins/cpaster/settingspage.h index 5c2ed5f13a..5d8ecefe75 100644 --- a/src/plugins/cpaster/settingspage.h +++ b/src/plugins/cpaster/settingspage.h @@ -37,6 +37,7 @@ class Settings; class SettingsPage final : public Core::IOptionsPage { + Q_DECLARE_TR_FUNCTIONS(CodePaster::SettingsPage) public: SettingsPage(Settings *settings, const QStringList &protocolNames); }; diff --git a/src/plugins/cppcheck/cppcheckplugin.cpp b/src/plugins/cppcheck/cppcheckplugin.cpp index dcfb45aa4c..0bcbc952da 100644 --- a/src/plugins/cppcheck/cppcheckplugin.cpp +++ b/src/plugins/cppcheck/cppcheckplugin.cpp @@ -60,8 +60,7 @@ public: CppcheckOptionsPage options; DiagnosticsModel manualRunModel; CppcheckTool manualRunTool; - Utils::Perspective perspective{Constants::PERSPECTIVE_ID, - tr("Cppcheck", "CppcheckPlugin")}; + Utils::Perspective perspective{Constants::PERSPECTIVE_ID, CppcheckPlugin::tr("Cppcheck")}; QAction *manualRunAction; void startManualRun(); @@ -85,7 +84,7 @@ CppcheckPluginPrivate::CppcheckPluginPrivate() : auto action = new QAction(this); action->setEnabled(false); action->setIcon(Utils::Icons::PREV_TOOLBAR.icon()); - action->setToolTip(tr("Go to previous diagnostic.")); + action->setToolTip(CppcheckPlugin::tr("Go to previous diagnostic.")); connect(action, &QAction::triggered, manualRunView, &Debugger::DetailedErrorView::goBack); connect (&manualRunModel, &DiagnosticsModel::hasDataChanged, @@ -98,7 +97,7 @@ CppcheckPluginPrivate::CppcheckPluginPrivate() : auto action = new QAction(this); action->setEnabled(false); action->setIcon(Utils::Icons::NEXT_TOOLBAR.icon()); - action->setToolTip(tr("Go to next diagnostic.")); + action->setToolTip(CppcheckPlugin::tr("Go to next diagnostic.")); connect(action, &QAction::triggered, manualRunView, &Debugger::DetailedErrorView::goNext); connect (&manualRunModel, &DiagnosticsModel::hasDataChanged, @@ -111,7 +110,7 @@ CppcheckPluginPrivate::CppcheckPluginPrivate() : auto action = new QAction(this); action->setEnabled(false); action->setIcon(Utils::Icons::CLEAN_TOOLBAR.icon()); - action->setToolTip(tr("Clear")); + action->setToolTip(CppcheckPlugin::tr("Clear")); connect(action, &QAction::triggered, &manualRunModel, &DiagnosticsModel::clear); connect (&manualRunModel, &DiagnosticsModel::hasDataChanged, diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index f64327c30e..e5f735f711 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -601,7 +601,8 @@ void GenericBuildSystem::updateDeploymentData() void GenericBuildSystem::removeFiles(const QStringList &filesToRemove) { if (removeFiles(nullptr, filesToRemove, nullptr) == RemovedFilesFromProject::Error) { - TaskHub::addTask(BuildSystemTask(Task::Error, tr("Project files list update failed."), + TaskHub::addTask(BuildSystemTask(Task::Error, + GenericProject::tr("Project files list update failed."), filesFilePath())); } } diff --git a/src/plugins/help/docsettingspage.cpp b/src/plugins/help/docsettingspage.cpp index dca464a462..86cf3b6515 100644 --- a/src/plugins/help/docsettingspage.cpp +++ b/src/plugins/help/docsettingspage.cpp @@ -58,15 +58,6 @@ public: static bool operator<(const DocEntry &d1, const DocEntry &d2) { return d1.name < d2.name; } -static DocEntry createEntry(const QString &nameSpace, const QString &fileName, bool userManaged) -{ - DocEntry result; - result.name = userManaged ? nameSpace : DocSettingsPage::tr("%1 (auto-detected)").arg(nameSpace); - result.fileName = fileName; - result.nameSpace = nameSpace; - return result; -} - class DocModel : public QAbstractListModel { public: @@ -87,6 +78,46 @@ private: DocEntries m_docEntries; }; +class DocSettingsPageWidget : public Core::IOptionsPageWidget +{ + Q_DECLARE_TR_FUNCTIONS(Help::DocSettingsPageWidget) + +public: + DocSettingsPageWidget(); + +private: + void apply() final; + + void addDocumentation(); + + bool eventFilter(QObject *object, QEvent *event) final; + void removeDocumentation(const QList<QModelIndex> &items); + + QList<QModelIndex> currentSelection() const; + + Ui::DocSettingsPage m_ui; + + QString m_recentDialogPath; + + using NameSpaceToPathHash = QHash<QString, QString>; + NameSpaceToPathHash m_filesToRegister; + QHash<QString, bool> m_filesToRegisterUserManaged; + NameSpaceToPathHash m_filesToUnregister; + + QSortFilterProxyModel m_proxyModel; + DocModel m_model; +}; + +static DocEntry createEntry(const QString &nameSpace, const QString &fileName, bool userManaged) +{ + DocEntry result; + result.name = userManaged ? nameSpace + : DocSettingsPageWidget::tr("%1 (auto-detected)").arg(nameSpace); + result.fileName = fileName; + result.nameSpace = nameSpace; + return result; +} + QVariant DocModel::data(const QModelIndex &index, int role) const { QVariant result; @@ -129,65 +160,43 @@ void DocModel::removeAt(int row) using namespace Help::Internal; -class DocSettingsPageWidget : public Core::IOptionsPageWidget +DocSettingsPageWidget::DocSettingsPageWidget() { - Q_DECLARE_TR_FUNCTIONS(Help::DocSettingsPage) + m_ui.setupUi(this); -public: - DocSettingsPageWidget() - { - m_ui.setupUi(this); - - const QStringList nameSpaces = HelpManager::registeredNamespaces(); - const QSet<QString> userDocumentationPaths = HelpManager::userDocumentationPaths(); - - DocModel::DocEntries entries; - entries.reserve(nameSpaces.size()); - for (const QString &nameSpace : nameSpaces) { - const QString filePath = HelpManager::fileFromNamespace(nameSpace); - bool user = userDocumentationPaths.contains(filePath); - entries.append(createEntry(nameSpace, filePath, user)); - m_filesToRegister.insert(nameSpace, filePath); - m_filesToRegisterUserManaged.insert(nameSpace, user); - } - std::stable_sort(entries.begin(), entries.end()); - m_model.setEntries(entries); + const QStringList nameSpaces = HelpManager::registeredNamespaces(); + const QSet<QString> userDocumentationPaths = HelpManager::userDocumentationPaths(); - m_proxyModel.setSourceModel(&m_model); - m_ui.docsListView->setModel(&m_proxyModel); - m_ui.filterLineEdit->setFiltering(true); - connect(m_ui.filterLineEdit, &QLineEdit::textChanged, - &m_proxyModel, &QSortFilterProxyModel::setFilterFixedString); - - connect(m_ui.addButton, &QAbstractButton::clicked, this, &DocSettingsPageWidget::addDocumentation); - connect(m_ui.removeButton, &QAbstractButton::clicked, this, - [this] () { removeDocumentation(currentSelection()); }); - - m_ui.docsListView->installEventFilter(this); + DocModel::DocEntries entries; + entries.reserve(nameSpaces.size()); + for (const QString &nameSpace : nameSpaces) { + const QString filePath = HelpManager::fileFromNamespace(nameSpace); + bool user = userDocumentationPaths.contains(filePath); + entries.append(createEntry(nameSpace, filePath, user)); + m_filesToRegister.insert(nameSpace, filePath); + m_filesToRegisterUserManaged.insert(nameSpace, user); } + std::stable_sort(entries.begin(), entries.end()); + m_model.setEntries(entries); + + m_proxyModel.setSourceModel(&m_model); + m_ui.docsListView->setModel(&m_proxyModel); + m_ui.filterLineEdit->setFiltering(true); + connect(m_ui.filterLineEdit, + &QLineEdit::textChanged, + &m_proxyModel, + &QSortFilterProxyModel::setFilterFixedString); + + connect(m_ui.addButton, + &QAbstractButton::clicked, + this, + &DocSettingsPageWidget::addDocumentation); + connect(m_ui.removeButton, &QAbstractButton::clicked, this, [this]() { + removeDocumentation(currentSelection()); + }); -private: - void apply() final; - - void addDocumentation(); - - bool eventFilter(QObject *object, QEvent *event) final; - void removeDocumentation(const QList<QModelIndex> &items); - - QList<QModelIndex> currentSelection() const; - - Ui::DocSettingsPage m_ui; - - QString m_recentDialogPath; - - using NameSpaceToPathHash = QHash<QString, QString>; - NameSpaceToPathHash m_filesToRegister; - QHash<QString, bool> m_filesToRegisterUserManaged; - NameSpaceToPathHash m_filesToUnregister; - - QSortFilterProxyModel m_proxyModel; - DocModel m_model; -}; + m_ui.docsListView->installEventFilter(this); +} void DocSettingsPageWidget::addDocumentation() { diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index 571d841e7a..2a35abbf84 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -271,10 +271,10 @@ QVariant McuToolChainPackage::debuggerId() const if (!debugger) { DebuggerItem newDebugger; newDebugger.setCommand(command); - const QString displayName = - m_type == TypeArmGcc - ? tr("Arm GDB at %1") : m_type == TypeIAR - ? QLatin1String("/foo/bar-iar-gdb") : QLatin1String("/bar/foo-keil-gdb"); + const QString displayName = m_type == TypeArmGcc + ? McuPackage::tr("Arm GDB at %1") + : m_type == TypeIAR ? QLatin1String("/foo/bar-iar-gdb") + : QLatin1String("/bar/foo-keil-gdb"); newDebugger.setUnexpandedDisplayName(displayName.arg(command.toUserOutput())); debuggerId = DebuggerItemManager::registerDebugger(newDebugger); } else { diff --git a/src/plugins/nim/settings/nimtoolssettingspage.cpp b/src/plugins/nim/settings/nimtoolssettingspage.cpp index c487ab06d3..129e4c24c0 100644 --- a/src/plugins/nim/settings/nimtoolssettingspage.cpp +++ b/src/plugins/nim/settings/nimtoolssettingspage.cpp @@ -61,7 +61,7 @@ NimToolsSettingsPage::NimToolsSettingsPage(NimSettings *settings) setId(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_ID); setDisplayName(NimToolsSettingsWidget::tr(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_DISPLAY)); setCategory(Nim::Constants::C_NIMTOOLSSETTINGSPAGE_CATEGORY); - setDisplayCategory(tr("Nim")); + setDisplayCategory(NimToolsSettingsWidget::tr("Nim")); setCategoryIconPath(":/nim/images/settingscategory_nim.png"); } diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 4cc128cc0c..42975294b3 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -120,8 +120,6 @@ private: int m_tabIndexForMiddleClick = -1; }; -} // Internal - TabWidget::TabWidget(QWidget *parent) : QTabWidget(parent) { @@ -894,7 +892,8 @@ AppOutputSettingsPage::AppOutputSettingsPage() setWidgetCreator([] { return new AppOutputSettingsWidget; }); } -} // ProjectExplorer +} // namespace Internal +} // namespace ProjectExplorer #include "appoutputpane.moc" diff --git a/src/plugins/projectexplorer/kitoptionspage.cpp b/src/plugins/projectexplorer/kitoptionspage.cpp index 433d2a2413..fa25871129 100644 --- a/src/plugins/projectexplorer/kitoptionspage.cpp +++ b/src/plugins/projectexplorer/kitoptionspage.cpp @@ -51,7 +51,7 @@ namespace Internal { class KitOptionsPageWidget : public QWidget { - Q_DECLARE_TR_FUNCTIONS(ProjextExplorer::Internal::KitOptionsPage) + Q_DECLARE_TR_FUNCTIONS(ProjextExplorer::Internal::KitOptionsPageWidget) public: KitOptionsPageWidget(); @@ -88,16 +88,14 @@ KitOptionsPageWidget::KitOptionsPageWidget() m_kitsView->setSizePolicy(m_kitsView->sizePolicy().horizontalPolicy(), QSizePolicy::Ignored); - m_addButton = new QPushButton(KitOptionsPage::tr("Add"), this); - m_cloneButton = new QPushButton(KitOptionsPage::tr("Clone"), this); - m_delButton = new QPushButton(KitOptionsPage::tr("Remove"), this); - m_makeDefaultButton = new QPushButton(KitOptionsPage::tr("Make Default"), this); - m_filterButton = new QPushButton(KitOptionsPage::tr("Settings Filter..."), this); - m_filterButton->setToolTip(KitOptionsPage::tr( - "Choose which settings to display for this kit.")); - m_defaultFilterButton = new QPushButton(KitOptionsPage::tr("Default Settings Filter..."), this); - m_defaultFilterButton->setToolTip(KitOptionsPage::tr( - "Choose which kit settings to display by default.")); + m_addButton = new QPushButton(tr("Add"), this); + m_cloneButton = new QPushButton(tr("Clone"), this); + m_delButton = new QPushButton(tr("Remove"), this); + m_makeDefaultButton = new QPushButton(tr("Make Default"), this); + m_filterButton = new QPushButton(tr("Settings Filter..."), this); + m_filterButton->setToolTip(tr("Choose which settings to display for this kit.")); + m_defaultFilterButton = new QPushButton(tr("Default Settings Filter..."), this); + m_defaultFilterButton->setToolTip(tr("Choose which kit settings to display by default.")); auto buttonLayout = new QVBoxLayout; buttonLayout->setSpacing(6); diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp index 7078ff1966..125d445631 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.cpp +++ b/src/plugins/projectexplorer/projectwelcomepage.cpp @@ -495,7 +495,8 @@ public: } if (button == Qt::RightButton) { QMenu contextMenu; - QAction *action = new QAction(tr("Remove Project from Recent Projects")); + QAction *action = new QAction( + ProjectWelcomePage::tr("Remove Project from Recent Projects")); const auto projectModel = qobject_cast<ProjectModel *>(model); contextMenu.addAction(action); connect(action, &QAction::triggered, [idx, projectModel](){ @@ -505,7 +506,7 @@ public: projectModel->resetProjects(); }); contextMenu.addSeparator(); - action = new QAction(tr("Clear Recent Project List")); + action = new QAction(ProjectWelcomePage::tr("Clear Recent Project List")); connect(action, &QAction::triggered, [projectModel]() { ProjectExplorerPlugin::clearRecentProjects(); projectModel->resetProjects(); diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index 43852a6469..b2f2b2764b 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -571,7 +571,7 @@ ToolChainTreeItem *ToolChainOptionsWidget::currentTreeItem() ToolChainOptionsPage::ToolChainOptionsPage() { setId(Constants::TOOLCHAIN_SETTINGS_PAGE_ID); - setDisplayName(ToolChainOptionsWidget::tr("Compilers")); + setDisplayName(ToolChainOptionsPage::tr("Compilers")); setCategory(Constants::KITS_SETTINGS_CATEGORY); setWidgetCreator([] { return new ToolChainOptionsWidget; }); } diff --git a/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp b/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp index 3f75b0f9bd..4d1f478a6c 100644 --- a/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp +++ b/src/plugins/qmlprofiler/qmlprofileroptionspage.cpp @@ -38,7 +38,7 @@ QmlProfilerOptionsPage::QmlProfilerOptionsPage() setId(Constants::SETTINGS); setDisplayName(QmlProfilerConfigWidget::tr("QML Profiler")); setCategory("T.Analyzer"); - setDisplayCategory(tr("Analyzer")); + setDisplayCategory(QmlProfilerConfigWidget::tr("Analyzer")); setCategoryIconPath(Analyzer::Icons::SETTINGSCATEGORY_ANALYZER); } diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp index f0e1bca968..5609c6f3b9 100644 --- a/src/plugins/texteditor/fontsettingspage.cpp +++ b/src/plugins/texteditor/fontsettingspage.cpp @@ -108,7 +108,7 @@ private: class FontSettingsPageWidget : public Core::IOptionsPageWidget { - Q_DECLARE_TR_FUNCTIONS(TextEditor::FontSettingsPage) + Q_DECLARE_TR_FUNCTIONS(TextEditor::FontSettingsPageWidget) public: FontSettingsPageWidget(FontSettingsPage *q, const FormatDescriptions &fd, FontSettings *fontSettings) @@ -361,6 +361,8 @@ void FontSettingsPageWidget::fontSelected(const QFont &font) updatePointSizes(); } +namespace Internal { + void FontSettingsPageWidget::updatePointSizes() { // Update point sizes @@ -621,6 +623,8 @@ void FontSettingsPageWidget::finish() m_value = m_lastValue; } +} // namespace Internal + // FontSettingsPage FontSettingsPage::FontSettingsPage(FontSettings *fontSettings, const FormatDescriptions &fd) |