From c4bf5f8bff4f1be0fda65f1fc211ad05284975ee Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sun, 12 Jul 2020 00:26:51 +0200
Subject: [PATCH] "" instead of QString() in default argument or return value
---
GUI/coregui/Models/ComboProperty.h | 2 +-
GUI/coregui/Models/GUIDomainSampleVisitor.h | 2 +-
GUI/coregui/Models/GUIObjectBuilder.h | 4 +-
GUI/coregui/Models/GroupInfo.cpp | 2 +-
GUI/coregui/Models/GroupInfo.h | 2 +-
GUI/coregui/Models/JobItemUtils.cpp | 2 +-
GUI/coregui/Models/ModelPath.cpp | 2 +-
GUI/coregui/Models/ModelUtils.h | 2 +-
GUI/coregui/Models/SessionGraphicsItem.h | 2 +-
GUI/coregui/Models/SessionItem.h | 8 +-
GUI/coregui/Models/SessionItemTags.cpp | 4 +-
GUI/coregui/Models/SessionItemTags.h | 2 +-
GUI/coregui/Models/SessionModel.h | 10 +-
GUI/coregui/Models/SessionXML.h | 2 +-
.../CsvImportAssistant/CsvImportTable.cpp | 2 +-
.../RealDataPropertiesWidget.cpp | 2 +-
.../Views/InfoWidgets/ComboSelectorDialog.h | 2 +-
.../InfoWidgets/ProjectLoadWarningDialog.h | 2 +-
.../InfoWidgets/PythonSyntaxHighlighter.h | 2 +-
.../SavePlotAssistant.cpp | 2 +-
.../Views/MaskWidgets/MaskDrawingContext.cpp | 2 +-
.../Views/PropertyEditor/ComponentEditor.h | 2 +-
.../PropertyEditor/PropertyEditorFactory.cpp | 2 +-
GUI/coregui/Views/SampleDesigner/ILayerView.h | 2 +-
.../SimulationWidgets/PythonScriptWidget.h | 2 +-
.../Views/widgetbox/qdesigner_formbuilder_p.h | 6 +-
.../Views/widgetbox/qdesigner_utils_p.h | 22 +--
.../Views/widgetbox/qdesigner_widgetbox_p.h | 4 +-
GUI/coregui/Views/widgetbox/ui4_p.h | 130 +++++++++---------
GUI/coregui/Views/widgetbox/widgetbox.h | 2 +-
GUI/coregui/mainwindow/AutosaveController.cpp | 4 +-
GUI/coregui/mainwindow/PyImportAssistant.cpp | 4 +-
GUI/coregui/mainwindow/newprojectdialog.h | 4 +-
GUI/coregui/mainwindow/projectdocument.cpp | 2 +-
GUI/coregui/mainwindow/projectdocument.h | 2 +-
GUI/coregui/mainwindow/projectmanager.cpp | 4 +-
GUI/coregui/mainwindow/projectmanager.h | 4 +-
GUI/coregui/utils/GUIHelpers.cpp | 2 +-
GUI/coregui/utils/GUIHelpers.h | 8 +-
GUI/coregui/utils/ItemIDFactory.cpp | 2 +-
GUI/coregui/utils/MessageService.h | 2 +-
41 files changed, 135 insertions(+), 135 deletions(-)
diff --git a/GUI/coregui/Models/ComboProperty.h b/GUI/coregui/Models/ComboProperty.h
index d2d4c91bad7..c8cb09c48c9 100644
--- a/GUI/coregui/Models/ComboProperty.h
+++ b/GUI/coregui/Models/ComboProperty.h
@@ -29,7 +29,7 @@ public:
ComboProperty();
static ComboProperty fromList(const QStringList& values,
- const QString& current_value = QString());
+ const QString& current_value = "");
QString getValue() const;
void setValue(const QString& name);
diff --git a/GUI/coregui/Models/GUIDomainSampleVisitor.h b/GUI/coregui/Models/GUIDomainSampleVisitor.h
index ffc6c4d75d0..21a2abe30dc 100644
--- a/GUI/coregui/Models/GUIDomainSampleVisitor.h
+++ b/GUI/coregui/Models/GUIDomainSampleVisitor.h
@@ -37,7 +37,7 @@ public:
SessionItem* populateSampleModel(SampleModel* sampleModel, MaterialModel* materialModel,
const MultiLayer& sample,
- const QString& sample_name = QString());
+ const QString& sample_name = "");
using INodeVisitor::visit;
diff --git a/GUI/coregui/Models/GUIObjectBuilder.h b/GUI/coregui/Models/GUIObjectBuilder.h
index b10443ba9b7..ca05fe346a6 100644
--- a/GUI/coregui/Models/GUIObjectBuilder.h
+++ b/GUI/coregui/Models/GUIObjectBuilder.h
@@ -39,11 +39,11 @@ BA_CORE_API_ SessionItem* populateSampleModelFromSim(SampleModel* sampleModel,
BA_CORE_API_ SessionItem* populateSampleModel(SampleModel* sampleModel,
MaterialModel* materialModel,
const MultiLayer& sample,
- const QString& sample_name = QString());
+ const QString& sample_name = "");
BA_CORE_API_ SessionItem* populateInstrumentModel(InstrumentModel* p_instrument_model,
const Simulation& simulation,
- const QString& instrument_name = QString());
+ const QString& instrument_name = "");
BA_CORE_API_ SessionItem* populateDocumentModel(DocumentModel* p_documentModel,
const Simulation& simulation);
diff --git a/GUI/coregui/Models/GroupInfo.cpp b/GUI/coregui/Models/GroupInfo.cpp
index 340a682141d..3ba3cb546bf 100644
--- a/GUI/coregui/Models/GroupInfo.cpp
+++ b/GUI/coregui/Models/GroupInfo.cpp
@@ -39,7 +39,7 @@ void GroupInfo::add(const QString& itemType, const QString& itemLabel)
QString GroupInfo::defaultType() const
{
- if (m_defaultItemType == QString() && m_info.size() != 0)
+ if (m_defaultItemType == "" && m_info.size() != 0)
return m_info[0].m_itemType;
return m_defaultItemType;
}
diff --git a/GUI/coregui/Models/GroupInfo.h b/GUI/coregui/Models/GroupInfo.h
index 243be74877e..7d8d082c995 100644
--- a/GUI/coregui/Models/GroupInfo.h
+++ b/GUI/coregui/Models/GroupInfo.h
@@ -26,7 +26,7 @@
class BA_CORE_API_ GroupInfo
{
public:
- explicit GroupInfo(const QString& groupType = QString(), bool is_sorted = true);
+ explicit GroupInfo(const QString& groupType = "", bool is_sorted = true);
void add(const QString& itemType, const QString& itemLabel);
diff --git a/GUI/coregui/Models/JobItemUtils.cpp b/GUI/coregui/Models/JobItemUtils.cpp
index 8bea5605ed3..cc51abf3234 100644
--- a/GUI/coregui/Models/JobItemUtils.cpp
+++ b/GUI/coregui/Models/JobItemUtils.cpp
@@ -132,7 +132,7 @@ ComboProperty JobItemUtils::availableUnits(const IUnitConverter& converter)
ComboProperty result;
for (auto units : converter.availableUnits()) {
auto unit_name = nameFromAxesUnits(units);
- if (unit_name != QString())
+ if (unit_name != "")
result << unit_name;
}
diff --git a/GUI/coregui/Models/ModelPath.cpp b/GUI/coregui/Models/ModelPath.cpp
index 3790910735f..cf1249aff2a 100644
--- a/GUI/coregui/Models/ModelPath.cpp
+++ b/GUI/coregui/Models/ModelPath.cpp
@@ -28,7 +28,7 @@ QString ModelPath::getPathFromIndex(const QModelIndex& index)
std::reverse(namePath.begin(), namePath.end());
return namePath.join("/");
}
- return QString();
+ return "";
}
// TODO cover with unit tests and simplify
diff --git a/GUI/coregui/Models/ModelUtils.h b/GUI/coregui/Models/ModelUtils.h
index bc2d0a0c28d..cfe18ccc595 100644
--- a/GUI/coregui/Models/ModelUtils.h
+++ b/GUI/coregui/Models/ModelUtils.h
@@ -26,7 +26,7 @@ class SessionModel;
namespace ModelUtils
{
//! Returns list of top iten manes.
-BA_CORE_API_ QStringList topItemNames(SessionModel* model, const QString& modelType = QString());
+BA_CORE_API_ QStringList topItemNames(SessionModel* model, const QString& modelType = "");
//! Iterates through all model indices and calls user function.
BA_CORE_API_ void iterate(const QModelIndex& index, const QAbstractItemModel* model,
diff --git a/GUI/coregui/Models/SessionGraphicsItem.h b/GUI/coregui/Models/SessionGraphicsItem.h
index 85e9de65f27..1479c70b87b 100644
--- a/GUI/coregui/Models/SessionGraphicsItem.h
+++ b/GUI/coregui/Models/SessionGraphicsItem.h
@@ -25,7 +25,7 @@ public:
static const QString P_YPOS;
protected:
- explicit SessionGraphicsItem(const QString& model_type = QString());
+ explicit SessionGraphicsItem(const QString& model_type = "");
};
#endif // BORNAGAIN_GUI_COREGUI_MODELS_SESSIONGRAPHICSITEM_H
diff --git a/GUI/coregui/Models/SessionItem.h b/GUI/coregui/Models/SessionItem.h
index 2c15604ec38..5356a38eaf4 100644
--- a/GUI/coregui/Models/SessionItem.h
+++ b/GUI/coregui/Models/SessionItem.h
@@ -33,7 +33,7 @@ class BA_CORE_API_ SessionItem
public:
static const QString P_NAME;
- explicit SessionItem(const QString& modelType = QString());
+ explicit SessionItem(const QString& modelType = "");
virtual ~SessionItem();
SessionModel* model() const;
SessionItem* parent() const;
@@ -59,10 +59,10 @@ public:
QVector<QString> acceptableDefaultItemTypes() const;
// access tagged items
- SessionItem* getItem(const QString& tag = QString(), int row = 0) const;
+ SessionItem* getItem(const QString& tag = "", int row = 0) const;
template <typename T> T& item(const QString& tag) const;
- QVector<SessionItem*> getItems(const QString& tag = QString()) const;
- bool insertItem(int row, SessionItem* item, const QString& tag = QString());
+ QVector<SessionItem*> getItems(const QString& tag = "") const;
+ bool insertItem(int row, SessionItem* item, const QString& tag = "");
SessionItem* takeItem(int row, const QString& tag);
// convenience functions for properties
diff --git a/GUI/coregui/Models/SessionItemTags.cpp b/GUI/coregui/Models/SessionItemTags.cpp
index c7fd3128548..196ceaff52f 100644
--- a/GUI/coregui/Models/SessionItemTags.cpp
+++ b/GUI/coregui/Models/SessionItemTags.cpp
@@ -114,7 +114,7 @@ int SessionItemTags::insertIndexFromTagRow(const QString& tagName, int row)
QString SessionItemTags::tagFromIndex(int index) const
{
if (index < 0)
- return QString();
+ return "";
for (const auto& tag : m_tags) {
if (index < tag.childCount)
@@ -123,7 +123,7 @@ QString SessionItemTags::tagFromIndex(int index) const
index -= tag.childCount;
}
- return QString();
+ return "";
}
int SessionItemTags::childCount(const QString& tagName)
diff --git a/GUI/coregui/Models/SessionItemTags.h b/GUI/coregui/Models/SessionItemTags.h
index ca24a8d556f..0b4c7133ad3 100644
--- a/GUI/coregui/Models/SessionItemTags.h
+++ b/GUI/coregui/Models/SessionItemTags.h
@@ -27,7 +27,7 @@ class BA_CORE_API_ SessionItemTags
public:
bool registerTag(const QString& name, int min, int max, const QStringList& modelTypes);
- bool isValid(const QString& tagName, const QString& modelType = QString()) const;
+ bool isValid(const QString& tagName, const QString& modelType = "") const;
QStringList modelTypesForTag(const QString& tagName) const;
diff --git a/GUI/coregui/Models/SessionModel.h b/GUI/coregui/Models/SessionModel.h
index 258ef6ed635..943d0d3cb15 100644
--- a/GUI/coregui/Models/SessionModel.h
+++ b/GUI/coregui/Models/SessionModel.h
@@ -55,7 +55,7 @@ public:
QModelIndex indexOfItem(SessionItem* item) const;
SessionItem* insertNewItem(QString model_type, const QModelIndex& parent = QModelIndex(),
- int row = -1, QString tag = QString());
+ int row = -1, QString tag = "");
QString getModelTag() const;
QString getModelName() const;
@@ -63,8 +63,8 @@ public:
QVector<QString> acceptableDefaultItemTypes(const QModelIndex& parent) const;
virtual void clear();
- void load(const QString& filename = QString());
- void save(const QString& filename = QString());
+ void load(const QString& filename = "");
+ void save(const QString& filename = "");
// Sets mimedata pointer of item being dragged
void setDraggedItemType(const QString& type);
@@ -76,10 +76,10 @@ public:
void writeTo(QXmlStreamWriter* writer, SessionItem* parent = 0);
SessionItem* moveItem(SessionItem* item, SessionItem* new_parent = 0, int row = -1,
- const QString& tag = QString());
+ const QString& tag = "");
SessionItem* copyItem(const SessionItem* item_to_copy, SessionItem* new_parent = 0,
- const QString& tag = QString());
+ const QString& tag = "");
virtual SessionModel* createCopy(SessionItem* parent = 0);
diff --git a/GUI/coregui/Models/SessionXML.h b/GUI/coregui/Models/SessionXML.h
index b3392af4c2d..32b37656f4f 100644
--- a/GUI/coregui/Models/SessionXML.h
+++ b/GUI/coregui/Models/SessionXML.h
@@ -57,7 +57,7 @@ BA_CORE_API_ void writeItemAndChildItems(QXmlStreamWriter* writer, const Session
BA_CORE_API_ void writeVariant(QXmlStreamWriter* writer, QVariant variant, int role);
BA_CORE_API_ void readItems(QXmlStreamReader* reader, SessionItem* parent,
- QString topTag = QString(), MessageService* messageService = nullptr);
+ QString topTag = "", MessageService* messageService = nullptr);
BA_CORE_API_ QString readProperty(QXmlStreamReader* reader, SessionItem* item,
MessageService* messageService = nullptr);
} // namespace SessionXML
diff --git a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.cpp b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.cpp
index cb808525344..28a71e3a4f8 100644
--- a/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/CsvImportAssistant/CsvImportTable.cpp
@@ -161,7 +161,7 @@ double CsvImportData::multiplier(CsvImportData::DATA_TYPE type) const
QString CsvImportData::columnLabel(CsvImportData::DATA_TYPE type) const
{
if (m_selected_cols.find(type) == m_selected_cols.end())
- return QString();
+ return "";
return csv::HeaderLabels[m_selected_cols.at(type).name()];
}
diff --git a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
index 5d93d96352f..2c8681b4763 100644
--- a/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
+++ b/GUI/coregui/Views/ImportDataWidgets/RealDataPropertiesWidget.cpp
@@ -143,7 +143,7 @@ void RealDataPropertiesWidget::onInstrumentMapUpdate()
m_instrumentCombo->setCurrentIndex(index);
} else {
// instrument corresponding to m_current_id was deleted
- m_current_id = QString();
+ m_current_id = "";
m_instrumentCombo->setCurrentIndex(0);
}
setComboConnected(true);
diff --git a/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h b/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h
index d2a7a462e9e..0f54f51aa29 100644
--- a/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h
+++ b/GUI/coregui/Views/InfoWidgets/ComboSelectorDialog.h
@@ -31,7 +31,7 @@ class BA_CORE_API_ ComboSelectorDialog : public QDialog
public:
ComboSelectorDialog(QWidget* parent = 0);
- void addItems(const QStringList& selection, const QString& currentItem = QString());
+ void addItems(const QStringList& selection, const QString& currentItem = "");
void setTextTop(const QString& text);
void setTextBottom(const QString& text);
diff --git a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
index 730a5c6fdb9..cbad9c1290a 100644
--- a/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
+++ b/GUI/coregui/Views/InfoWidgets/ProjectLoadWarningDialog.h
@@ -34,7 +34,7 @@ class BA_CORE_API_ ProjectLoadWarningDialog : public QDialog
public:
ProjectLoadWarningDialog(QWidget* parent, const MessageService* messageService = 0,
- const QString& documentVersion = QString());
+ const QString& documentVersion = "");
private:
QWidget* createTopPanel();
diff --git a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
index a9cc419f2c8..004b445dba0 100644
--- a/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
+++ b/GUI/coregui/Views/InfoWidgets/PythonSyntaxHighlighter.h
@@ -82,7 +82,7 @@ private:
bool matchMultiline(const QString& text, const QRegExp& delimiter, const int inState,
const QTextCharFormat& style);
const QTextCharFormat getTextCharFormat(const QString& colorName,
- const QString& style = QString());
+ const QString& style = "");
QList<HighlightingRule> rules;
QRegExp triSingleQuote;
diff --git a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
index 22c23511213..a4ce2e4c14c 100644
--- a/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
+++ b/GUI/coregui/Views/IntensityDataWidgets/SavePlotAssistant.cpp
@@ -138,7 +138,7 @@ QString SavePlotAssistant::getExtensionFromFilterName(const QString& filterName)
return m_formats[i].m_file_extention;
}
}
- return QString();
+ return "";
}
bool SavePlotAssistant::isPngFile(const QString& fileName) const
diff --git a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
index 57fe23a11cf..63132236fc4 100644
--- a/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
+++ b/GUI/coregui/Views/MaskWidgets/MaskDrawingContext.cpp
@@ -128,7 +128,7 @@ QString MaskDrawingContext::activityToModelType() const
return "EllipseMask";
if (isROIMode())
return "RegionOfInterest";
- return QString();
+ return "";
}
//! Returns model row corresponding to given activity. All shapes, except ROI, will be added
diff --git a/GUI/coregui/Views/PropertyEditor/ComponentEditor.h b/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
index 8851cb0f53f..fc149e444b7 100644
--- a/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
+++ b/GUI/coregui/Views/PropertyEditor/ComponentEditor.h
@@ -50,7 +50,7 @@ public:
};
Q_DECLARE_FLAGS(EditorType, EditorFlags)
- ComponentEditor(EditorType editorType = HeaderTree, const QString& title = QString());
+ ComponentEditor(EditorType editorType = HeaderTree, const QString& title = "");
void setItem(SessionItem* item);
void clearEditor();
diff --git a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
index a891374b795..87c42c9ebdd 100644
--- a/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
+++ b/GUI/coregui/Views/PropertyEditor/PropertyEditorFactory.cpp
@@ -98,7 +98,7 @@ QString PropertyEditorFactory::toString(const QModelIndex& index)
: QString::number(item->value().toDouble(), 'f', item->decimals());
}
- return QString();
+ return "";
}
QWidget* PropertyEditorFactory::CreateEditor(const SessionItem& item, QWidget* parent)
diff --git a/GUI/coregui/Views/SampleDesigner/ILayerView.h b/GUI/coregui/Views/SampleDesigner/ILayerView.h
index 21ef053ffd8..d6ae86dd74e 100644
--- a/GUI/coregui/Views/SampleDesigner/ILayerView.h
+++ b/GUI/coregui/Views/SampleDesigner/ILayerView.h
@@ -31,7 +31,7 @@ public:
int type() const { return ViewTypes::LAYER; }
- virtual QString getLabel() const { return QString(); }
+ virtual QString getLabel() const { return ""; }
void updateLabel();
diff --git a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
index a3cc7fbf097..900c0ae99e2 100644
--- a/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
+++ b/GUI/coregui/Views/SimulationWidgets/PythonScriptWidget.h
@@ -38,7 +38,7 @@ public:
void generatePythonScript(const MultiLayerItem* sampleItem,
const InstrumentItem* instrumentItem,
const SimulationOptionsItem* optionItem = 0,
- const QString& outputDir = QString());
+ const QString& outputDir = "");
private slots:
void onExportToFileButton();
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h b/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h
index 20c200da0c3..9631accda4f 100644
--- a/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h
+++ b/GUI/coregui/Views/widgetbox/qdesigner_formbuilder_p.h
@@ -106,7 +106,7 @@ public:
const DeviceProfile& deviceProfile, QString* errorMessage);
// Convenience that pops up message boxes in case of failures.
static QWidget* createPreview(const QDesignerFormWindowInterface* fw,
- const QString& styleName = QString());
+ const QString& styleName = "");
// Create a preview widget (for integrations) or return 0. The widget has to be embedded into a
// main window.
static QWidget* createPreview(const QDesignerFormWindowInterface* fw, const QString& styleName,
@@ -117,8 +117,8 @@ public:
// Create a preview image
static QPixmap createPreviewPixmap(const QDesignerFormWindowInterface* fw,
- const QString& styleName = QString(),
- const QString& appStyleSheet = QString());
+ const QString& styleName = "",
+ const QString& appStyleSheet = "");
protected:
using QFormBuilder::create;
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_utils_p.h b/GUI/coregui/Views/widgetbox/qdesigner_utils_p.h
index bbb258d03cd..acbc7a3deaa 100644
--- a/GUI/coregui/Views/widgetbox/qdesigner_utils_p.h
+++ b/GUI/coregui/Views/widgetbox/qdesigner_utils_p.h
@@ -331,8 +331,8 @@ class QDESIGNER_SHARED_EXPORT PropertySheetTranslatableData
{
protected:
PropertySheetTranslatableData(bool translatable = true,
- const QString& disambiguation = QString(),
- const QString& comment = QString());
+ const QString& disambiguation = "",
+ const QString& comment = "");
bool equals(const PropertySheetTranslatableData& rhs) const;
public:
@@ -353,9 +353,9 @@ private:
class QDESIGNER_SHARED_EXPORT PropertySheetStringValue : public PropertySheetTranslatableData
{
public:
- PropertySheetStringValue(const QString& value = QString(), bool translatable = true,
- const QString& disambiguation = QString(),
- const QString& comment = QString());
+ PropertySheetStringValue(const QString& value = "", bool translatable = true,
+ const QString& disambiguation = "",
+ const QString& comment = "");
bool operator==(const PropertySheetStringValue& other) const { return equals(other); }
bool operator!=(const PropertySheetStringValue& other) const { return !equals(other); }
@@ -374,8 +374,8 @@ class QDESIGNER_SHARED_EXPORT PropertySheetStringListValue : public PropertyShee
{
public:
PropertySheetStringListValue(const QStringList& value = QStringList(), bool translatable = true,
- const QString& disambiguation = QString(),
- const QString& comment = QString());
+ const QString& disambiguation = "",
+ const QString& comment = "");
bool operator==(const PropertySheetStringListValue& other) const { return equals(other); }
bool operator!=(const PropertySheetStringListValue& other) const { return !equals(other); }
@@ -395,12 +395,12 @@ class QDESIGNER_SHARED_EXPORT PropertySheetKeySequenceValue : public PropertyShe
public:
PropertySheetKeySequenceValue(const QKeySequence& value = QKeySequence(),
bool translatable = true,
- const QString& disambiguation = QString(),
- const QString& comment = QString());
+ const QString& disambiguation = "",
+ const QString& comment = "");
PropertySheetKeySequenceValue(const QKeySequence::StandardKey& standardKey,
bool translatable = true,
- const QString& disambiguation = QString(),
- const QString& comment = QString());
+ const QString& disambiguation = "",
+ const QString& comment = "");
bool operator==(const PropertySheetKeySequenceValue& other) const { return equals(other); }
bool operator!=(const PropertySheetKeySequenceValue& other) const { return !equals(other); }
diff --git a/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h b/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h
index 0a40765351f..196aaf98c6c 100644
--- a/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h
+++ b/GUI/coregui/Views/widgetbox/qdesigner_widgetbox_p.h
@@ -81,11 +81,11 @@ public:
// Convenience to access the widget box icon of a widget. Empty category
// matches all
virtual QIcon iconForWidget(const QString& className,
- const QString& category = QString()) const = 0;
+ const QString& category = "") const = 0;
// Convenience to find a widget by class name. Empty category matches all
static bool findWidget(const QDesignerWidgetBoxInterface* wbox, const QString& className,
- const QString& category /* = QString() */, Widget* widgetData);
+ const QString& category /* = "" */, Widget* widgetData);
// Convenience functions to create a DomWidget from widget box xml.
static DomUI* xmlToUi(const QString& name, const QString& xml, bool insertFakeTopLevel,
QString* errorMessage);
diff --git a/GUI/coregui/Views/widgetbox/ui4_p.h b/GUI/coregui/Views/widgetbox/ui4_p.h
index d162e4d4cf0..da857ca9a99 100644
--- a/GUI/coregui/Views/widgetbox/ui4_p.h
+++ b/GUI/coregui/Views/widgetbox/ui4_p.h
@@ -165,7 +165,7 @@ public:
~DomUI();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -383,7 +383,7 @@ public:
~DomIncludes();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -413,7 +413,7 @@ public:
~DomInclude();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -462,7 +462,7 @@ public:
~DomResources();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -504,7 +504,7 @@ public:
~DomResource();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -541,7 +541,7 @@ public:
~DomActionGroup();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -595,7 +595,7 @@ public:
~DomAction();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -653,7 +653,7 @@ public:
~DomActionRef();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -690,7 +690,7 @@ public:
~DomButtonGroup();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -736,7 +736,7 @@ public:
~DomButtonGroups();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -766,7 +766,7 @@ public:
~DomImages();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -796,7 +796,7 @@ public:
~DomImage();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -841,7 +841,7 @@ public:
~DomImageData();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -890,7 +890,7 @@ public:
~DomCustomWidgets();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -920,7 +920,7 @@ public:
~DomHeader();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -957,7 +957,7 @@ public:
~DomCustomWidget();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1081,7 +1081,7 @@ public:
~DomProperties();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1111,7 +1111,7 @@ public:
~DomPropertyData();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1148,7 +1148,7 @@ public:
~DomSizePolicyData();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1186,7 +1186,7 @@ public:
~DomLayoutDefault();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1235,7 +1235,7 @@ public:
~DomLayoutFunction();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1284,7 +1284,7 @@ public:
~DomTabStops();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1314,7 +1314,7 @@ public:
~DomLayout();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1436,7 +1436,7 @@ public:
~DomLayoutItem();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1539,7 +1539,7 @@ public:
~DomRow();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1569,7 +1569,7 @@ public:
~DomColumn();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1599,7 +1599,7 @@ public:
~DomItem();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1657,7 +1657,7 @@ public:
~DomWidget();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1790,7 +1790,7 @@ public:
~DomSpacer();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1832,7 +1832,7 @@ public:
~DomColor();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1888,7 +1888,7 @@ public:
~DomGradientStop();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -1933,7 +1933,7 @@ public:
~DomGradient();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2119,7 +2119,7 @@ public:
~DomBrush();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2174,7 +2174,7 @@ public:
~DomColorRole();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2219,7 +2219,7 @@ public:
~DomColorGroup();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2253,7 +2253,7 @@ public:
~DomPalette();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2300,7 +2300,7 @@ public:
~DomFont();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2397,7 +2397,7 @@ public:
~DomPoint();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2435,7 +2435,7 @@ public:
~DomRect();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2485,7 +2485,7 @@ public:
~DomLocale();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2534,7 +2534,7 @@ public:
~DomSizePolicy();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2608,7 +2608,7 @@ public:
~DomSize();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2646,7 +2646,7 @@ public:
~DomDate();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2690,7 +2690,7 @@ public:
~DomTime();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2734,7 +2734,7 @@ public:
~DomDateTime();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2796,7 +2796,7 @@ public:
~DomStringList();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2862,7 +2862,7 @@ public:
~DomResourcePixmap();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -2911,7 +2911,7 @@ public:
~DomResourceIcon();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3026,7 +3026,7 @@ public:
~DomString();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3087,7 +3087,7 @@ public:
~DomPointF();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3125,7 +3125,7 @@ public:
~DomRectF();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3175,7 +3175,7 @@ public:
~DomSizeF();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3213,7 +3213,7 @@ public:
~DomChar();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3245,7 +3245,7 @@ public:
~DomUrl();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3278,7 +3278,7 @@ public:
~DomProperty();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3518,7 +3518,7 @@ public:
~DomConnections();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3548,7 +3548,7 @@ public:
~DomConnection();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3605,7 +3605,7 @@ public:
~DomConnectionHints();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3635,7 +3635,7 @@ public:
~DomConnectionHint();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3685,7 +3685,7 @@ public:
~DomScript();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3734,7 +3734,7 @@ public:
~DomWidgetData();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3764,7 +3764,7 @@ public:
~DomDesignerData();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3794,7 +3794,7 @@ public:
~DomSlots();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3828,7 +3828,7 @@ public:
~DomPropertySpecifications();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
@@ -3861,7 +3861,7 @@ public:
~DomStringPropertySpecification();
void read(QXmlStreamReader& reader);
- void write(QXmlStreamWriter& writer, const QString& tagName = QString()) const;
+ void write(QXmlStreamWriter& writer, const QString& tagName = "") const;
inline QString text() const { return m_text; }
inline void setText(const QString& s) { m_text = s; }
diff --git a/GUI/coregui/Views/widgetbox/widgetbox.h b/GUI/coregui/Views/widgetbox/widgetbox.h
index 2906dc9db62..334dccd790d 100644
--- a/GUI/coregui/Views/widgetbox/widgetbox.h
+++ b/GUI/coregui/Views/widgetbox/widgetbox.h
@@ -90,7 +90,7 @@ public:
virtual bool loadContents(const QString& contents);
virtual QIcon iconForWidget(const QString& className,
- const QString& category = QString()) const;
+ const QString& category = "") const;
protected:
virtual void dragEnterEvent(QDragEnterEvent* event);
diff --git a/GUI/coregui/mainwindow/AutosaveController.cpp b/GUI/coregui/mainwindow/AutosaveController.cpp
index 6f85680625a..3dd5ae0db64 100644
--- a/GUI/coregui/mainwindow/AutosaveController.cpp
+++ b/GUI/coregui/mainwindow/AutosaveController.cpp
@@ -61,7 +61,7 @@ QString AutosaveController::autosaveDir() const
if (m_document && m_document->hasValidNameAndPath())
return ProjectUtils::autosaveDir(m_document->projectFileName());
- return QString();
+ return "";
}
QString AutosaveController::autosaveName() const
@@ -69,7 +69,7 @@ QString AutosaveController::autosaveName() const
if (m_document && m_document->hasValidNameAndPath())
return ProjectUtils::autosaveName(m_document->projectFileName());
- return QString();
+ return "";
}
void AutosaveController::removeAutosaveDir()
diff --git a/GUI/coregui/mainwindow/PyImportAssistant.cpp b/GUI/coregui/mainwindow/PyImportAssistant.cpp
index 3fd96910255..1c48fc95aea 100644
--- a/GUI/coregui/mainwindow/PyImportAssistant.cpp
+++ b/GUI/coregui/mainwindow/PyImportAssistant.cpp
@@ -48,7 +48,7 @@ std::string bornagainDir()
QString getCandidate(const QStringList& funcNames)
{
if (funcNames.isEmpty())
- return QString();
+ return "";
for (auto str : funcNames) {
QString name = str.toLower();
@@ -149,7 +149,7 @@ QString PyImportAssistant::getPySampleFunctionName(const QString& snippet)
DetailedMessageBox warning(m_mainWindow, "Python failure", message, details);
warning.exec();
- return QString();
+ return "";
}
QApplication::restoreOverrideCursor();
diff --git a/GUI/coregui/mainwindow/newprojectdialog.h b/GUI/coregui/mainwindow/newprojectdialog.h
index 728c51da960..b5f00233231 100644
--- a/GUI/coregui/mainwindow/newprojectdialog.h
+++ b/GUI/coregui/mainwindow/newprojectdialog.h
@@ -26,8 +26,8 @@ class BA_CORE_API_ NewProjectDialog : public QDialog
{
Q_OBJECT
public:
- NewProjectDialog(QWidget* parent = 0, const QString& workingDirectory = QString(),
- const QString& projectName = QString());
+ NewProjectDialog(QWidget* parent = 0, const QString& workingDirectory = "",
+ const QString& projectName = "");
QString getWorkingDirectory() const;
void setWorkingDirectory(const QString& text);
diff --git a/GUI/coregui/mainwindow/projectdocument.cpp b/GUI/coregui/mainwindow/projectdocument.cpp
index c8792f077ab..a50f72652d8 100644
--- a/GUI/coregui/mainwindow/projectdocument.cpp
+++ b/GUI/coregui/mainwindow/projectdocument.cpp
@@ -65,7 +65,7 @@ QString ProjectDocument::projectFileName() const
if (!projectName().isEmpty())
return projectDir() + "/" + projectName() + projectFileExtension();
else
- return QString();
+ return "";
}
void ProjectDocument::setProjectFileName(const QString& projectFileName)
diff --git a/GUI/coregui/mainwindow/projectdocument.h b/GUI/coregui/mainwindow/projectdocument.h
index 637429bf611..8ac9364bc56 100644
--- a/GUI/coregui/mainwindow/projectdocument.h
+++ b/GUI/coregui/mainwindow/projectdocument.h
@@ -44,7 +44,7 @@ class BA_CORE_API_ ProjectDocument : public QObject
Q_OBJECT
public:
- ProjectDocument(const QString& projectFileName = QString());
+ ProjectDocument(const QString& projectFileName = "");
QString projectName() const;
void setProjectName(const QString& text);
diff --git a/GUI/coregui/mainwindow/projectmanager.cpp b/GUI/coregui/mainwindow/projectmanager.cpp
index 93e2d3977a0..8cefae52a00 100644
--- a/GUI/coregui/mainwindow/projectmanager.cpp
+++ b/GUI/coregui/mainwindow/projectmanager.cpp
@@ -121,7 +121,7 @@ QString ProjectManager::projectDir() const
if (m_project_document && m_project_document->hasValidNameAndPath())
return m_project_document->projectDir();
- return QString();
+ return "";
}
//! Returns directory name suitable for saving plots.
@@ -360,7 +360,7 @@ QString ProjectManager::acquireProjectFileName()
NewProjectDialog dialog(m_mainWindow, workingDirectory(), untitledProjectName());
if (dialog.exec() != QDialog::Accepted)
- return QString();
+ return "";
m_workingDirectory = dialog.getWorkingDirectory();
diff --git a/GUI/coregui/mainwindow/projectmanager.h b/GUI/coregui/mainwindow/projectmanager.h
index 6f1a727670d..0bef4533d78 100644
--- a/GUI/coregui/mainwindow/projectmanager.h
+++ b/GUI/coregui/mainwindow/projectmanager.h
@@ -55,9 +55,9 @@ public slots:
void clearRecentProjects();
void newProject();
bool closeCurrentProject();
- bool saveProject(QString projectFileName = QString());
+ bool saveProject(QString projectFileName = "");
bool saveProjectAs();
- void openProject(QString fileName = QString());
+ void openProject(QString fileName = "");
private:
void createNewProject();
diff --git a/GUI/coregui/utils/GUIHelpers.cpp b/GUI/coregui/utils/GUIHelpers.cpp
index 206d3284d48..23c06bcf537 100644
--- a/GUI/coregui/utils/GUIHelpers.cpp
+++ b/GUI/coregui/utils/GUIHelpers.cpp
@@ -187,7 +187,7 @@ QString fileDir(const QString& fileName)
if (info.exists()) {
return info.dir().path();
}
- return QString();
+ return "";
}
//! Returns base name of file.
diff --git a/GUI/coregui/utils/GUIHelpers.h b/GUI/coregui/utils/GUIHelpers.h
index 5aa1b8d1058..f182845bcc6 100644
--- a/GUI/coregui/utils/GUIHelpers.h
+++ b/GUI/coregui/utils/GUIHelpers.h
@@ -44,14 +44,14 @@ private:
};
BA_CORE_API_ void information(QWidget* parent, const QString& title, const QString& text,
- const QString& detailedText = QString());
+ const QString& detailedText = "");
BA_CORE_API_ void warning(QWidget* parent, const QString& title, const QString& text,
- const QString& detailedText = QString());
+ const QString& detailedText = "");
BA_CORE_API_ bool question(QWidget* parent, const QString& title, const QString& text,
- const QString& detailedText = QString(), const QString& yesText = "&Yes",
+ const QString& detailedText = "", const QString& yesText = "&Yes",
const QString& noText = "&No");
BA_CORE_API_ bool okToDelete(QWidget* parent, const QString& title, const QString& text,
- const QString& detailedText = QString());
+ const QString& detailedText = "");
BA_CORE_API_ QString getBornAgainVersionString();
diff --git a/GUI/coregui/utils/ItemIDFactory.cpp b/GUI/coregui/utils/ItemIDFactory.cpp
index 87b4ac0d34b..a4a2e17a366 100644
--- a/GUI/coregui/utils/ItemIDFactory.cpp
+++ b/GUI/coregui/utils/ItemIDFactory.cpp
@@ -42,7 +42,7 @@ QString ItemIDFactory::getID(SessionItem* existingItem)
if (instance().ItemtoIDMap.contains(existingItem))
return instance().ItemtoIDMap.value(existingItem);
else
- return QString();
+ return "";
}
SessionItem* ItemIDFactory::getItem(QString existingID)
diff --git a/GUI/coregui/utils/MessageService.h b/GUI/coregui/utils/MessageService.h
index af5288f590f..ccf6bd264a8 100644
--- a/GUI/coregui/utils/MessageService.h
+++ b/GUI/coregui/utils/MessageService.h
@@ -41,7 +41,7 @@ public:
QStringList senderList() const;
- int messageCount(const QObject* sender, const QString& message_type = QString()) const;
+ int messageCount(const QObject* sender, const QString& message_type = "") const;
int warningCount(const QObject* sender = 0) const;
int errorCount(const QObject* sender = 0) const;
--
GitLab