From b80b01cbda724d10e6ad8443616c45196e38e94c Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 12 Jul 2020 00:58:29 +0200
Subject: [PATCH] replace more QString c'tors
used script:
t = re.sub(r'new QString\(("[^"]*?")\)', r'###NEW(\1)', t)
t = re.sub(r'QString\(("[^"]*?")\)(\s*\+\s*)', r'###ADD(\1)\2', t)
t = re.sub(r'QString\(("[^"]*?")\)(\s*\.)', r'###ADD(\1)\2', t)
t = re.sub(r'QString\(("[^"]*?")\)', r'\1', t)
t = re.sub(r'###NEW\(("[^"]*?")\)', r'new QString(\1)', t)
t = re.sub(r'###ADD\(("[^"]*?")\)', r'QString(\1)', t)
---
GUI/coregui/Models/BeamItems.cpp | 4 ++--
GUI/coregui/Models/JobWorker.cpp | 4 ++--
GUI/coregui/Models/SampleValidator.cpp | 2 +-
.../IntensityDataWidgets/SavePlotAssistant.cpp | 2 +-
.../SaveProjectionsAssistant.cpp | 4 ++--
.../Views/RealSpaceWidgets/RealSpaceCanvas.cpp | 2 +-
GUI/coregui/Views/SampleDesigner/NodeEditorPort.h | 2 +-
.../Views/SimulationWidgets/PythonScriptWidget.cpp | 2 +-
GUI/coregui/mainwindow/UpdateNotifier.cpp | 2 +-
GUI/coregui/mainwindow/projectdocument.cpp | 2 +-
GUI/coregui/utils/GUIHelpers.cpp | 14 +++++++-------
Tests/UnitTests/GUI/TestComboProperty.cpp | 2 +-
Tests/UnitTests/GUI/TestExternalProperty.cpp | 2 +-
Tests/UnitTests/GUI/TestGUIHelpers.cpp | 4 ++--
.../UnitTests/GUI/TestParticleDistributionItem.cpp | 2 +-
Tests/UnitTests/GUI/TestTranslations.cpp | 8 ++++----
16 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/GUI/coregui/Models/BeamItems.cpp b/GUI/coregui/Models/BeamItems.cpp
index 3f7d52b894b..614aa117053 100644
--- a/GUI/coregui/Models/BeamItems.cpp
+++ b/GUI/coregui/Models/BeamItems.cpp
@@ -43,7 +43,7 @@ const QString BeamItem::P_INTENSITY = QString::fromStdString("Intensity");
const QString BeamItem::P_WAVELENGTH = QString::fromStdString("Wavelength");
const QString BeamItem::P_INCLINATION_ANGLE = QString::fromStdString("InclinationAngle");
const QString BeamItem::P_AZIMUTHAL_ANGLE = QString::fromStdString("AzimuthalAngle");
-const QString BeamItem::P_POLARIZATION = QString("Polarization");
+const QString BeamItem::P_POLARIZATION = "Polarization";
BeamItem::BeamItem(const QString& beam_model) : SessionItem(beam_model)
{
@@ -132,7 +132,7 @@ void BeamItem::setWavelengthProperty(const QString& wavelength_type)
// Specular beam item
/* ------------------------------------------------------------------------- */
-const QString SpecularBeamItem::P_FOOPTPRINT = QString("Footprint");
+const QString SpecularBeamItem::P_FOOPTPRINT = "Footprint";
const QString footprint_group_label("Type");
diff --git a/GUI/coregui/Models/JobWorker.cpp b/GUI/coregui/Models/JobWorker.cpp
index 071356ef595..89dc47a0929 100644
--- a/GUI/coregui/Models/JobWorker.cpp
+++ b/GUI/coregui/Models/JobWorker.cpp
@@ -59,7 +59,7 @@ void JobWorker::start()
m_job_status = "Failed";
m_percentage_done = 100;
m_failure_message =
- QString("JobRunner::start() -> Simulation failed with exception throw:\n\n");
+ "JobRunner::start() -> Simulation failed with exception throw:\n\n";
m_failure_message.append(QString(ex.what()));
}
@@ -67,7 +67,7 @@ void JobWorker::start()
} else {
m_job_status = "Failed";
m_percentage_done = 100;
- m_failure_message = QString("JobRunner::start() -> Error. Simulation doesn't exist.");
+ m_failure_message = "JobRunner::start() -> Error. Simulation doesn't exist.";
}
emit progressUpdate();
diff --git a/GUI/coregui/Models/SampleValidator.cpp b/GUI/coregui/Models/SampleValidator.cpp
index 4999de4487c..0438d5f2772 100644
--- a/GUI/coregui/Models/SampleValidator.cpp
+++ b/GUI/coregui/Models/SampleValidator.cpp
@@ -56,7 +56,7 @@ void SampleValidator::validateItem(const SessionItem* item)
}
if (!diagnosis.isEmpty()) {
m_valid_sample = false;
- m_validation_message += QString("* ") + diagnosis + QString("\n");
+ m_validation_message += QString("* ") + diagnosis + "\n";
}
}
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
index a4ce2e4c14c..c8cc41a7d78 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
@@ -55,7 +55,7 @@ void SavePlotAssistant::savePlot(const QString& dirname, QCustomPlot* plot,
{
QString selectedFilter("*.png");
- QString defaultName = dirname + QString("/untitled");
+ QString defaultName = dirname + "/untitled";
QString fileName = QFileDialog::getSaveFileName(0, "Save Plot", defaultName, getFilterString(),
&selectedFilter);
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
index 31234ace333..48ff790fb12 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SaveProjectionsAssistant.cpp
@@ -51,7 +51,7 @@ void SaveProjectionsAssistant::saveProjections(QWidget* parent, IntensityDataIte
{
Q_ASSERT(intensityItem);
- QString defaultName = ProjectUtils::userExportDir() + QString("/untitled.txt");
+ QString defaultName = ProjectUtils::userExportDir() + "/untitled.txt";
QString fileName = QFileDialog::getSaveFileName(parent, "Save projections data", defaultName);
if (fileName.isEmpty())
@@ -95,7 +95,7 @@ QString SaveProjectionsAssistant::projectionsToString(const QString& projections
auto bin_centers = projData.bin_centers;
for (int i_point = 0; i_point < bin_centers.size(); ++i_point) {
- out << to_double_str(bin_centers[i_point]) << QString(" ");
+ out << to_double_str(bin_centers[i_point]) << " ";
for (auto& data : projData.projections) {
out << to_scientific_str(data.bin_values[i_point]);
}
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
index b39e89f89aa..94fbcd7ee89 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceCanvas.cpp
@@ -143,7 +143,7 @@ void RealSpaceCanvas::savePicture(const QPixmap& pixmap)
QString dirname = AppSvc::projectManager()->userExportDir();
QString defaultExtension = ".png";
QString selectedFilter("*" + defaultExtension);
- QString defaultName = dirname + QString("/untitled");
+ QString defaultName = dirname + "/untitled";
QString fileName = QFileDialog::getSaveFileName(nullptr, "Save 3D real space view", defaultName,
selectedFilter);
QString nameToSave =
diff --git a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
index c3cd3fba08c..33b5d4b19ff 100644
--- a/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
+++ b/GUI/coregui/Views/SampleDesigner/NodeEditorPort.h
@@ -38,7 +38,7 @@ public:
//! port direction
enum EPortDirection { INPUT, OUTPUT };
- NodeEditorPort(QGraphicsItem* parent = 0, const QString& name = QString("unnamed"),
+ NodeEditorPort(QGraphicsItem* parent = 0, const QString& name = "unnamed",
EPortDirection direction = INPUT, EPortType port_type = DEFAULT);
virtual ~NodeEditorPort();
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
index fe7f66ee948..137b1ff15fc 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.cpp
@@ -112,7 +112,7 @@ void PythonScriptWidget::onExportToFileButton()
QString filters("Python scripts (*.py)");
QString defaultFilter("Python scripts (*.py)");
- QString defaultName = dirname + QString("/untitled");
+ QString defaultName = dirname + "/untitled";
QString fileName =
QFileDialog::getSaveFileName(nullptr, "Save file", defaultName, filters, &defaultFilter);
diff --git a/GUI/coregui/mainwindow/UpdateNotifier.cpp b/GUI/coregui/mainwindow/UpdateNotifier.cpp
index 9278801b27c..2f0d5ff43eb 100644
--- a/GUI/coregui/mainwindow/UpdateNotifier.cpp
+++ b/GUI/coregui/mainwindow/UpdateNotifier.cpp
@@ -56,7 +56,7 @@ void UpdateNotifier::replyFinished(QNetworkReply* reply)
QString myVersion = GUIHelpers::getBornAgainVersionString();
// Testwise degrade version
- // myVersion = QString("1.1.0");
+ // myVersion = "1.1.0";
if (GUIHelpers::versionCode(versionString) > GUIHelpers::versionCode(myVersion)) {
QString message("New version is available: <a href=\"");
diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/coregui/mainwindow/projectdocument.cpp
index a50f72652d8..36aec7f4745 100644
--- a/GUI/coregui/mainwindow/projectdocument.cpp
+++ b/GUI/coregui/mainwindow/projectdocument.cpp
@@ -76,7 +76,7 @@ void ProjectDocument::setProjectFileName(const QString& projectFileName)
QString ProjectDocument::projectFileExtension()
{
- return QString(".pro");
+ return ".pro";
}
void ProjectDocument::setApplicationModels(ApplicationModels* applicationModels)
diff --git a/GUI/coregui/utils/GUIHelpers.cpp b/GUI/coregui/utils/GUIHelpers.cpp
index 23c06bcf537..29f2149dbdd 100644
--- a/GUI/coregui/utils/GUIHelpers.cpp
+++ b/GUI/coregui/utils/GUIHelpers.cpp
@@ -29,13 +29,13 @@ namespace
QMap<QString, QString> initializeCharacterMap()
{
QMap<QString, QString> result;
- result["\\"] = QString("_backslash_");
- result["/"] = QString("_slash_");
- result["\""] = QString("_quote_");
- result["<"] = QString("_lessthan_");
- result[">"] = QString("_greaterthan_");
- result["|"] = QString("_pipe_");
- result["?"] = QString("_questionmark_");
+ result["\\"] = "_backslash_";
+ result["/"] = "_slash_";
+ result["\""] = "_quote_";
+ result["<"] = "_lessthan_";
+ result[">"] = "_greaterthan_";
+ result["|"] = "_pipe_";
+ result["?"] = "_questionmark_";
return result;
}
diff --git a/Tests/UnitTests/GUI/TestComboProperty.cpp b/Tests/UnitTests/GUI/TestComboProperty.cpp
index 0112417eafe..c4cc3b27f99 100644
--- a/Tests/UnitTests/GUI/TestComboProperty.cpp
+++ b/Tests/UnitTests/GUI/TestComboProperty.cpp
@@ -106,7 +106,7 @@ TEST_F(TestComboProperty, stringOfValues)
EXPECT_EQ(combo.selectedIndices(), QVector<int>({0}));
// setting new string of values, containing current value. Current values should remain.
- stringOfValues = QString("c1;b1;c3");
+ stringOfValues = "c1;b1;c3";
combo.setStringOfValues(stringOfValues);
EXPECT_EQ(combo.stringOfValues(), stringOfValues);
EXPECT_EQ(combo.getValue(), "b1");
diff --git a/Tests/UnitTests/GUI/TestExternalProperty.cpp b/Tests/UnitTests/GUI/TestExternalProperty.cpp
index 4de88b559b5..13bc99481fc 100644
--- a/Tests/UnitTests/GUI/TestExternalProperty.cpp
+++ b/Tests/UnitTests/GUI/TestExternalProperty.cpp
@@ -27,7 +27,7 @@ TEST_F(TestExternalProperty, test_initialState)
property.setColor(QColor());
EXPECT_TRUE(property.isValid() == false);
property.setText("aaa");
- EXPECT_TRUE(property.text() == QString("aaa"));
+ EXPECT_TRUE(property.text() == "aaa");
EXPECT_TRUE(property.isValid() == true);
property.setText(QString());
EXPECT_TRUE(property.isValid() == false);
diff --git a/Tests/UnitTests/GUI/TestGUIHelpers.cpp b/Tests/UnitTests/GUI/TestGUIHelpers.cpp
index 40574ee42f0..4135eda9299 100644
--- a/Tests/UnitTests/GUI/TestGUIHelpers.cpp
+++ b/Tests/UnitTests/GUI/TestGUIHelpers.cpp
@@ -9,12 +9,12 @@ TEST_F(TestGUIHelpers, test_VersionString)
{
int vmajor(0), vminor(0), vpatch(0);
- EXPECT_EQ(true, GUIHelpers::parseVersion(QString("1.5.0"), vmajor, vminor, vpatch));
+ EXPECT_EQ(true, GUIHelpers::parseVersion("1.5.0", vmajor, vminor, vpatch));
EXPECT_EQ(1, vmajor);
EXPECT_EQ(5, vminor);
EXPECT_EQ(0, vpatch);
- EXPECT_FALSE(GUIHelpers::parseVersion(QString("15.0"), vmajor, vminor, vpatch));
+ EXPECT_FALSE(GUIHelpers::parseVersion("15.0", vmajor, vminor, vpatch));
QString min_version("1.5.0");
EXPECT_EQ(GUIHelpers::isVersionMatchMinimal("1.5.0", min_version), true);
diff --git a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
index ad08f9eb788..477e5ff7d3b 100644
--- a/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
+++ b/Tests/UnitTests/GUI/TestParticleDistributionItem.cpp
@@ -252,7 +252,7 @@ TEST_F(TestParticleDistributionItem, test_FromDomainLinked)
linkedProp =
distItem->getItemValue(ParticleDistributionItem::P_LINKED_PARAMETER).value<ComboProperty>();
- QStringList expectedLinked = QStringList() << QString("Particle/Cylinder/Height");
+ QStringList expectedLinked = QStringList() << "Particle/Cylinder/Height";
EXPECT_EQ(linkedProp.selectedValues(), expectedLinked);
EXPECT_EQ(linkedProp.getValue(), expectedLinked.at(0));
}
diff --git a/Tests/UnitTests/GUI/TestTranslations.cpp b/Tests/UnitTests/GUI/TestTranslations.cpp
index 5070f82f505..4b59647dd42 100644
--- a/Tests/UnitTests/GUI/TestTranslations.cpp
+++ b/Tests/UnitTests/GUI/TestTranslations.cpp
@@ -26,7 +26,7 @@ TEST_F(TestTranslations, test_TranslatePosition)
SessionItem* xItem = positionItem->getItem(VectorItem::P_X);
EXPECT_EQ(ModelPath::itemPathTranslation(*xItem, multilayer->parent()),
- QString("MultiLayer/Layer/ParticleLayout/Particle/PositionX"));
+ "MultiLayer/Layer/ParticleLayout/Particle/PositionX");
}
TEST_F(TestTranslations, test_TranslateRotation)
@@ -45,7 +45,7 @@ TEST_F(TestTranslations, test_TranslateRotation)
SessionItem* angleItem = rotationItem->getItem(XRotationItem::P_ANGLE);
EXPECT_EQ(ModelPath::itemPathTranslation(*angleItem, multilayer->parent()),
- QString("MultiLayer/Layer/ParticleLayout/Particle/XRotation/Angle"));
+ "MultiLayer/Layer/ParticleLayout/Particle/XRotation/Angle");
}
TEST_F(TestTranslations, test_BeamDistributionNone)
@@ -61,12 +61,12 @@ TEST_F(TestTranslations, test_BeamDistributionNone)
SessionItem* value = distr->getItem(DistributionNoneItem::P_MEAN);
EXPECT_EQ(ModelPath::itemPathTranslation(*value, instrument->parent()),
- QString("Instrument/Beam/Wavelength"));
+ "Instrument/Beam/Wavelength");
SessionItem* inclinationAngle = beam->getItem(BeamItem::P_INCLINATION_ANGLE);
distr = inclinationAngle->getGroupItem(BeamDistributionItem::P_DISTRIBUTION);
value = distr->getItem(DistributionNoneItem::P_MEAN);
EXPECT_EQ(ModelPath::itemPathTranslation(*value, instrument->parent()),
- QString("Instrument/Beam/InclinationAngle"));
+ "Instrument/Beam/InclinationAngle");
}
--
GitLab