-namespace Beautifier {
-namespace Internal {
+namespace Beautifier::Internal {
const char USE_PREDEFINED_STYLE[] = "usePredefinedStyle";
const char PREDEFINED_STYLE[] = "predefinedStyle";
@@ -111,7 +109,7 @@ void ClangFormatSettings::createDocumentationFile() const
const QString options = line.right(line.size() - firstSpace).trimmed();
const QString text = "" + keyword
+ " " + options
- + "
" + tr("No description available.") + "
";
+ + "" + Tr::tr("No description available.") + "
";
stream.writeStartElement(Constants::DOCUMENTATION_XMLENTRY);
stream.writeTextElement(Constants::DOCUMENTATION_XMLKEY, keyword);
stream.writeTextElement(Constants::DOCUMENTATION_XMLDOC, text);
@@ -215,5 +213,4 @@ void ClangFormatSettings::readStyles()
}
}
-} // namespace Internal
-} // namespace Beautifier
+} // Beautifier::Internal
diff --git a/src/plugins/beautifier/clangformat/clangformatsettings.h b/src/plugins/beautifier/clangformat/clangformatsettings.h
index b333b6627f9..310eeaf8926 100644
--- a/src/plugins/beautifier/clangformat/clangformatsettings.h
+++ b/src/plugins/beautifier/clangformat/clangformatsettings.h
@@ -5,13 +5,10 @@
#include "../abstractsettings.h"
-namespace Beautifier {
-namespace Internal {
+namespace Beautifier::Internal {
class ClangFormatSettings : public AbstractSettings
{
- Q_OBJECT
-
public:
explicit ClangFormatSettings();
@@ -40,5 +37,4 @@ private:
void readStyles() override;
};
-} // namespace Internal
-} // namespace Beautifier
+} // Beautifier::Internal
diff --git a/src/plugins/beautifier/configurationdialog.cpp b/src/plugins/beautifier/configurationdialog.cpp
index aa7765f8a92..8b2c61e7204 100644
--- a/src/plugins/beautifier/configurationdialog.cpp
+++ b/src/plugins/beautifier/configurationdialog.cpp
@@ -4,6 +4,7 @@
#include "configurationdialog.h"
#include "abstractsettings.h"
+#include "beautifiertr.h"
#include "configurationeditor.h"
#include
@@ -43,11 +44,11 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent)
Column {
Group {
- title(tr("Name")),
+ title(Tr::tr("Name")),
Column { m_name }
},
Group {
- title(tr("Value")),
+ title(Tr::tr("Value")),
Column {
m_editor,
m_documentationHeader,
@@ -151,9 +152,9 @@ void ConfigurationDialog::updateOkButton()
void ConfigurationDialog::updateDocumentation(const QString &word, const QString &docu)
{
if (word.isEmpty())
- m_documentationHeader->setText(tr("Documentation"));
+ m_documentationHeader->setText(Tr::tr("Documentation"));
else
- m_documentationHeader->setText(tr("Documentation for \"%1\"").arg(word));
+ m_documentationHeader->setText(Tr::tr("Documentation for \"%1\"").arg(word));
m_documentation->setHtml(docu);
}
diff --git a/src/plugins/beautifier/configurationdialog.h b/src/plugins/beautifier/configurationdialog.h
index 488f56d098f..417541fbd95 100644
--- a/src/plugins/beautifier/configurationdialog.h
+++ b/src/plugins/beautifier/configurationdialog.h
@@ -19,8 +19,6 @@ class ConfigurationEditor;
class ConfigurationDialog : public QDialog
{
- Q_OBJECT
-
public:
explicit ConfigurationDialog(QWidget *parent = nullptr);
~ConfigurationDialog() override;
diff --git a/src/plugins/beautifier/configurationeditor.cpp b/src/plugins/beautifier/configurationeditor.cpp
index bc116331eca..a90e6230a2f 100644
--- a/src/plugins/beautifier/configurationeditor.cpp
+++ b/src/plugins/beautifier/configurationeditor.cpp
@@ -14,8 +14,7 @@
#include
#include
-namespace Beautifier {
-namespace Internal {
+namespace Beautifier::Internal {
ConfigurationSyntaxHighlighter::ConfigurationSyntaxHighlighter(QTextDocument *parent) :
QSyntaxHighlighter(parent)
@@ -233,5 +232,4 @@ void ConfigurationEditor::updateDocumentation()
emit documentationChanged(word, doc);
}
-} // namespace Internal
-} // namespace Beautifier
+} // Beautifier::Internal
diff --git a/src/plugins/beautifier/configurationeditor.h b/src/plugins/beautifier/configurationeditor.h
index a17ef08512e..35b21d72866 100644
--- a/src/plugins/beautifier/configurationeditor.h
+++ b/src/plugins/beautifier/configurationeditor.h
@@ -16,15 +16,12 @@ class QStringListModel;
class QTextDocument;
QT_END_NAMESPACE
-namespace Beautifier {
-namespace Internal {
+namespace Beautifier::Internal {
class AbstractSettings;
class ConfigurationSyntaxHighlighter : public QSyntaxHighlighter
{
- Q_OBJECT
-
public:
explicit ConfigurationSyntaxHighlighter(QTextDocument *parent);
void setKeywords(const QStringList &keywords);
@@ -68,5 +65,4 @@ private:
QString m_lastDocumentation;
};
-} // namespace Internal
-} // namespace Beautifier
+} // Beautifier::Internal
diff --git a/src/plugins/beautifier/configurationpanel.cpp b/src/plugins/beautifier/configurationpanel.cpp
index 7c011763941..6aa0f5b2d9f 100644
--- a/src/plugins/beautifier/configurationpanel.cpp
+++ b/src/plugins/beautifier/configurationpanel.cpp
@@ -4,6 +4,7 @@
#include "configurationpanel.h"
#include "abstractsettings.h"
+#include "beautifiertr.h"
#include "configurationdialog.h"
#include
@@ -21,9 +22,9 @@ ConfigurationPanel::ConfigurationPanel(QWidget *parent)
m_configurations = new QComboBox;
m_configurations->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
- m_edit = new QPushButton(tr("Edit"));
- m_remove = new QPushButton(tr("Remove"));
- auto add = new QPushButton(tr("Add"));
+ m_edit = new QPushButton(Tr::tr("Edit"));
+ m_remove = new QPushButton(Tr::tr("Remove"));
+ auto add = new QPushButton(Tr::tr("Add"));
using namespace Utils::Layouting;
@@ -70,7 +71,7 @@ void ConfigurationPanel::remove()
void ConfigurationPanel::add()
{
ConfigurationDialog dialog;
- dialog.setWindowTitle(tr("Add Configuration"));
+ dialog.setWindowTitle(Tr::tr("Add Configuration"));
dialog.setSettings(m_settings);
if (dialog.exec() == QDialog::Accepted) {
const QString key = dialog.key();
@@ -83,7 +84,7 @@ void ConfigurationPanel::edit()
{
const QString key = m_configurations->currentText();
ConfigurationDialog dialog;
- dialog.setWindowTitle(tr("Edit Configuration"));
+ dialog.setWindowTitle(Tr::tr("Edit Configuration"));
dialog.setSettings(m_settings);
dialog.setKey(key);
if (dialog.exec() == QDialog::Accepted) {
diff --git a/src/plugins/beautifier/generaloptionspage.cpp b/src/plugins/beautifier/generaloptionspage.cpp
index 2ffbbf7e9b9..859f323e244 100644
--- a/src/plugins/beautifier/generaloptionspage.cpp
+++ b/src/plugins/beautifier/generaloptionspage.cpp
@@ -19,8 +19,6 @@ namespace Beautifier::Internal {
class GeneralOptionsPageWidget : public Core::IOptionsPageWidget
{
- Q_DECLARE_TR_FUNCTIONS(Beautifier::Internal::GeneralOptionsPageWidget)
-
public:
explicit GeneralOptionsPageWidget(const QStringList &toolIds);
@@ -39,20 +37,20 @@ GeneralOptionsPageWidget::GeneralOptionsPageWidget(const QStringList &toolIds)
auto settings = GeneralSettings::instance();
- m_autoFormat = new QCheckBox(tr("Enable auto format on file save"));
+ m_autoFormat = new QCheckBox(Tr::tr("Enable auto format on file save"));
m_autoFormat->setChecked(settings->autoFormatOnSave());
- auto toolLabel = new QLabel(tr("Tool:"));
+ auto toolLabel = new QLabel(Tr::tr("Tool:"));
toolLabel->setEnabled(false);
- auto mimeLabel = new QLabel(tr("Restrict to MIME types:"));
+ auto mimeLabel = new QLabel(Tr::tr("Restrict to MIME types:"));
mimeLabel->setEnabled(false);
m_autoFormatMime = new QLineEdit(settings->autoFormatMimeAsString());
m_autoFormatMime->setEnabled(false);
m_autoFormatOnlyCurrentProject =
- new QCheckBox(tr("Restrict to files contained in the current project"));
+ new QCheckBox(Tr::tr("Restrict to files contained in the current project"));
m_autoFormatOnlyCurrentProject->setEnabled(false);
m_autoFormatOnlyCurrentProject->setChecked(settings->autoFormatOnlyCurrentProject());
@@ -66,7 +64,7 @@ GeneralOptionsPageWidget::GeneralOptionsPageWidget(const QStringList &toolIds)
Column {
Group {
- title(tr("Automatic Formatting on File Save")),
+ title(Tr::tr("Automatic Formatting on File Save")),
Form {
Span(2, m_autoFormat), br,
toolLabel, m_autoFormatTool, br,
@@ -97,7 +95,7 @@ void GeneralOptionsPageWidget::apply()
GeneralOptionsPage::GeneralOptionsPage(const QStringList &toolIds)
{
setId(Constants::OPTION_GENERAL_ID);
- setDisplayName(GeneralOptionsPageWidget::tr("General"));
+ setDisplayName(Tr::tr("General"));
setCategory(Constants::OPTION_CATEGORY);
setDisplayCategory(Tr::tr("Beautifier"));
setWidgetCreator([toolIds] { return new GeneralOptionsPageWidget(toolIds); });
diff --git a/src/plugins/beautifier/generalsettings.cpp b/src/plugins/beautifier/generalsettings.cpp
index 65d47985140..218f6963f37 100644
--- a/src/plugins/beautifier/generalsettings.cpp
+++ b/src/plugins/beautifier/generalsettings.cpp
@@ -3,21 +3,17 @@
#include "generalsettings.h"
-#include "beautifierconstants.h"
-
#include
+
#include
#include
#include
-namespace Beautifier {
-namespace Internal {
+namespace Beautifier::Internal {
-namespace {
const char AUTO_FORMAT_TOOL[] = "autoFormatTool";
const char AUTO_FORMAT_MIME[] = "autoFormatMime";
const char AUTO_FORMAT_ONLY_CURRENT_PROJECT[] = "autoFormatOnlyCurrentProject";
-}
static GeneralSettings *m_instance;
@@ -117,5 +113,4 @@ void GeneralSettings::setAutoFormatOnlyCurrentProject(bool autoFormatOnlyCurrent
m_autoFormatOnlyCurrentProject = autoFormatOnlyCurrentProject;
}
-} // namespace Internal
-} // namespace Beautifier
+} // Beautifier::Internal
diff --git a/src/plugins/beautifier/generalsettings.h b/src/plugins/beautifier/generalsettings.h
index 180a72caece..b381dacb26a 100644
--- a/src/plugins/beautifier/generalsettings.h
+++ b/src/plugins/beautifier/generalsettings.h
@@ -7,8 +7,7 @@
#include
-namespace Beautifier {
-namespace Internal {
+namespace Beautifier::Internal {
class GeneralSettings
{
@@ -40,5 +39,4 @@ private:
QList m_autoFormatMime;
};
-} // namespace Internal
-} // namespace Beautifier
+} // Beautifier::Internal
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.cpp b/src/plugins/beautifier/uncrustify/uncrustify.cpp
index c3dbc1e0d0c..1ce90fbeff5 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustify.cpp
@@ -6,10 +6,10 @@
#include "uncrustify.h"
#include "uncrustifyconstants.h"
-#include "uncrustifyoptionspage.h"
#include "../beautifierconstants.h"
#include "../beautifierplugin.h"
+#include "../beautifiertr.h"
#include
#include
@@ -18,12 +18,15 @@
#include
#include
#include
+
#include
#include
#include
+
#include
#include
-#include
+
+#include
#include
#include
@@ -31,13 +34,12 @@
using namespace TextEditor;
-namespace Beautifier {
-namespace Internal {
+namespace Beautifier::Internal {
Uncrustify::Uncrustify()
{
Core::ActionContainer *menu = Core::ActionManager::createMenu("Uncrustify.Menu");
- menu->menu()->setTitle(tr("&Uncrustify"));
+ menu->menu()->setTitle(Tr::tr("&Uncrustify"));
m_formatFile = new QAction(BeautifierPlugin::msgFormatCurrentFile(), this);
Core::Command *cmd
@@ -73,7 +75,7 @@ void Uncrustify::formatFile()
const QString cfgFileName = configurationFile();
if (cfgFileName.isEmpty()) {
BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile(
- tr(Constants::UNCRUSTIFY_DISPLAY_NAME)));
+ Tr::tr(Constants::UNCRUSTIFY_DISPLAY_NAME)));
} else {
formatCurrentFile(command(cfgFileName));
}
@@ -84,7 +86,7 @@ void Uncrustify::formatSelectedText()
const QString cfgFileName = configurationFile();
if (cfgFileName.isEmpty()) {
BeautifierPlugin::showError(BeautifierPlugin::msgCannotGetConfigurationFile(
- tr(Constants::UNCRUSTIFY_DISPLAY_NAME)));
+ Tr::tr(Constants::UNCRUSTIFY_DISPLAY_NAME)));
return;
}
@@ -175,5 +177,4 @@ Command Uncrustify::command(const QString &cfgFile, bool fragment) const
return command;
}
-} // namespace Internal
-} // namespace Beautifier
+} // Beautifier::Internal
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.h b/src/plugins/beautifier/uncrustify/uncrustify.h
index 5e450d843ef..1261576274c 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.h
+++ b/src/plugins/beautifier/uncrustify/uncrustify.h
@@ -8,13 +8,10 @@
#include "uncrustifyoptionspage.h"
#include "uncrustifysettings.h"
-namespace Beautifier {
-namespace Internal {
+namespace Beautifier::Internal {
class Uncrustify : public BeautifierAbstractTool
{
- Q_OBJECT
-
public:
Uncrustify();
@@ -35,5 +32,4 @@ private:
UncrustifyOptionsPage m_page{&m_settings};
};
-} // namespace Internal
-} // namespace Beautifier
+} // Beautifier::Internal
diff --git a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h
index 404c4980e70..f6b4567098b 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifyconstants.h
+++ b/src/plugins/beautifier/uncrustify/uncrustifyconstants.h
@@ -5,10 +5,8 @@
#include
-namespace Beautifier {
-namespace Constants {
+namespace Beautifier::Constants {
-const char UNCRUSTIFY_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("Beautifier::Internal", "Uncrustify");
+const char UNCRUSTIFY_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("::Beautifier", "Uncrustify");
-} // namespace Constants
-} // namespace Beautifier
+} // Beautifier::Constants
diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
index 9faa6f79888..2102dd311f8 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
@@ -5,16 +5,15 @@
#include "uncrustifyconstants.h"
#include "uncrustifysettings.h"
-#include "uncrustify.h"
#include "../beautifierconstants.h"
#include "../beautifierplugin.h"
+#include "../beautifiertr.h"
#include "../configurationpanel.h"
#include
#include
-#include
#include
#include
#include
@@ -24,8 +23,6 @@ namespace Beautifier::Internal {
class UncrustifyOptionsPageWidget : public Core::IOptionsPageWidget
{
- Q_DECLARE_TR_FUNCTIONS(Beautifier::Internal::ClangFormat)
-
public:
explicit UncrustifyOptionsPageWidget(UncrustifySettings *settings);
@@ -54,22 +51,22 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set
m_mime = new QLineEdit(m_settings->supportedMimeTypesAsString());
- m_useOtherFiles = new QCheckBox(tr("Use file uncrustify.cfg defined in project files"));
+ m_useOtherFiles = new QCheckBox(Tr::tr("Use file uncrustify.cfg defined in project files"));
m_useOtherFiles->setChecked(m_settings->useOtherFiles());
- m_useSpecificFile = new QCheckBox(tr("Use file specific uncrustify.cfg"));
+ m_useSpecificFile = new QCheckBox(Tr::tr("Use file specific uncrustify.cfg"));
m_useSpecificFile->setChecked(m_settings->useSpecificConfigFile());
m_uncrusifyFilePath = new Utils::PathChooser;
m_uncrusifyFilePath->setExpectedKind(Utils::PathChooser::File);
- m_uncrusifyFilePath->setPromptDialogFilter(tr("Uncrustify file (*.cfg)"));
+ m_uncrusifyFilePath->setPromptDialogFilter(Tr::tr("Uncrustify file (*.cfg)"));
m_uncrusifyFilePath->setFilePath(m_settings->specificConfigFile());
- m_useHomeFile = new QCheckBox(tr("Use file uncrustify.cfg in HOME")
+ m_useHomeFile = new QCheckBox(Tr::tr("Use file uncrustify.cfg in HOME")
.replace( "HOME", QDir::toNativeSeparators(QDir::home().absolutePath())));
m_useHomeFile->setChecked(m_settings->useHomeFile());
- m_useCustomStyle = new QCheckBox(tr("Use customized style:"));
+ m_useCustomStyle = new QCheckBox(Tr::tr("Use customized style:"));
m_useCustomStyle->setChecked(m_settings->useCustomStyle());
m_configurations = new ConfigurationPanel;
@@ -77,17 +74,17 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set
m_configurations->setSettings(m_settings);
m_configurations->setCurrentConfiguration(m_settings->customStyle());
- m_formatEntireFileFallback = new QCheckBox(tr("Format entire file if no text was selected"));
- m_formatEntireFileFallback->setToolTip(tr("For action Format Selected Text"));
+ m_formatEntireFileFallback = new QCheckBox(Tr::tr("Format entire file if no text was selected"));
+ m_formatEntireFileFallback->setToolTip(Tr::tr("For action Format Selected Text"));
m_formatEntireFileFallback->setChecked(m_settings->formatEntireFileFallback());
m_command->setExpectedKind(Utils::PathChooser::ExistingCommand);
m_command->setCommandVersionArguments({"--version"});
m_command->setPromptDialogTitle(BeautifierPlugin::msgCommandPromptDialogTitle(
- Uncrustify::tr(Constants::UNCRUSTIFY_DISPLAY_NAME)));
+ Tr::tr(Constants::UNCRUSTIFY_DISPLAY_NAME)));
m_command->setFilePath(m_settings->command());
- auto options = new QGroupBox(tr("Options"));
+ auto options = new QGroupBox(Tr::tr("Options"));
using namespace Utils::Layouting;
@@ -101,10 +98,10 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set
Column {
Group {
- title(tr("Configuration")),
+ title(Tr::tr("Configuration")),
Form {
- tr("Uncrustify command:"), m_command, br,
- tr("Restrict to MIME types:"), m_mime
+ Tr::tr("Uncrustify command:"), m_command, br,
+ Tr::tr("Restrict to MIME types:"), m_mime
}
},
options,
@@ -134,7 +131,7 @@ void UncrustifyOptionsPageWidget::apply()
UncrustifyOptionsPage::UncrustifyOptionsPage(UncrustifySettings *settings)
{
setId("Uncrustify");
- setDisplayName(UncrustifyOptionsPageWidget::tr("Uncrustify"));
+ setDisplayName(Tr::tr("Uncrustify"));
setCategory(Constants::OPTION_CATEGORY);
setWidgetCreator([settings] { return new UncrustifyOptionsPageWidget(settings); });
}
diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
index c97ac943694..e827a8f7915 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp
@@ -3,8 +3,6 @@
#include "uncrustifysettings.h"
-#include "uncrustifyconstants.h"
-
#include "../beautifierconstants.h"
#include
@@ -18,8 +16,7 @@
using namespace Utils;
-namespace Beautifier {
-namespace Internal {
+namespace Beautifier::Internal {
const char USE_OTHER_FILES[] = "useOtherFiles";
const char USE_HOME_FILE[] = "useHomeFile";
@@ -188,5 +185,4 @@ void UncrustifySettings::createDocumentationFile() const
}
}
-} // namespace Internal
-} // namespace Beautifier
+} // Beautifier::Internal