forked from qt-creator/qt-creator
Fix lupdate issues
Change-Id: Ifea13b2eca4f4b0cdc548202beac748ada1df578 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
|
||||
#include "manager.h"
|
||||
|
||||
#include "appstatisticsmonitortr.h"
|
||||
#include "chart.h"
|
||||
#include "idataprovider.h"
|
||||
|
||||
@@ -125,8 +126,8 @@ AppStatisticsMonitorView::AppStatisticsMonitorView(AppStatisticsMonitorManager *
|
||||
m_comboBox = new QComboBox(this);
|
||||
form->addRow(m_comboBox);
|
||||
|
||||
m_chartMem = std::make_unique<AppStatisticsMonitorChart>(tr("Memory consumption"));
|
||||
m_chartCpu = std::make_unique<AppStatisticsMonitorChart>(tr("CPU consumption"));
|
||||
m_chartMem = std::make_unique<AppStatisticsMonitorChart>(Tr::tr("Memory consumption"));
|
||||
m_chartCpu = std::make_unique<AppStatisticsMonitorChart>(Tr::tr("CPU consumption"));
|
||||
|
||||
form->addRow(m_chartMem->chartView());
|
||||
form->addRow(m_chartCpu->chartView());
|
||||
|
@@ -341,7 +341,7 @@ public:
|
||||
|
||||
Command *newScriptCommand = ActionBuilder(this, ACTION_NEW_SCRIPT)
|
||||
.setScriptable(true)
|
||||
.setText(tr("New Script..."))
|
||||
.setText(Tr::tr("New Script..."))
|
||||
.addToContainer(M_SCRIPT)
|
||||
.addOnTriggered([]() {
|
||||
auto command = Core::ActionManager::command(Utils::Id("Wizard.Impl.Q.QCreatorScript"));
|
||||
|
@@ -1718,7 +1718,7 @@ Utils::FilePath findEffectFile(const ModelNode &effectNode)
|
||||
QDirIterator::Subdirectories});
|
||||
if (matches.isEmpty()) {
|
||||
QMessageBox msgBox;
|
||||
msgBox.setText(QObject::tr("Effect file %1 not found in the project.").arg(effectFile));
|
||||
msgBox.setText(::QObject::tr("Effect file %1 not found in the project.").arg(effectFile));
|
||||
msgBox.setStandardButtons(QMessageBox::Ok);
|
||||
msgBox.setDefaultButton(QMessageBox::Ok);
|
||||
msgBox.setIcon(QMessageBox::Warning);
|
||||
|
@@ -105,24 +105,24 @@ QString ModelNode::getIdValidityErrorMessage(const QString &id)
|
||||
return {}; // valid
|
||||
|
||||
if (id.at(0).isUpper())
|
||||
return QObject::tr("ID cannot start with an uppercase character (%1).").arg(id);
|
||||
return ::QObject::tr("ID cannot start with an uppercase character (%1).").arg(id);
|
||||
|
||||
if (id.at(0).isDigit())
|
||||
return QObject::tr("ID cannot start with a number (%1).").arg(id);
|
||||
return ::QObject::tr("ID cannot start with a number (%1).").arg(id);
|
||||
|
||||
if (id.contains(' '))
|
||||
return QObject::tr("ID cannot include whitespace (%1).").arg(id);
|
||||
return ::QObject::tr("ID cannot include whitespace (%1).").arg(id);
|
||||
|
||||
if (ModelUtils::isQmlKeyword(id))
|
||||
return QObject::tr("%1 is a reserved QML keyword.").arg(id);
|
||||
return ::QObject::tr("%1 is a reserved QML keyword.").arg(id);
|
||||
|
||||
if (ModelUtils::isQmlBuiltinType(id))
|
||||
return QObject::tr("%1 is a reserved Qml type.").arg(id);
|
||||
return ::QObject::tr("%1 is a reserved Qml type.").arg(id);
|
||||
|
||||
if (ModelUtils::isDiscouragedQmlId(id))
|
||||
return QObject::tr("%1 is a reserved property keyword.").arg(id);
|
||||
return ::QObject::tr("%1 is a reserved property keyword.").arg(id);
|
||||
|
||||
return QObject::tr("ID includes invalid characters (%1).").arg(id);
|
||||
return ::QObject::tr("ID includes invalid characters (%1).").arg(id);
|
||||
}
|
||||
|
||||
bool ModelNode::hasId() const
|
||||
|
Reference in New Issue
Block a user