aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring. Do not use QStringLiteral for empty strings.

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-10-24 17:27:41 +03:00
parent 7687a04ded
commit 2bd82fa340
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/container/vformula.cpp
View File

@ -36,13 +36,13 @@
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VFormula::VFormula() VFormula::VFormula()
:formula(QString()), value(QString(tr("Error"))), checkZero(true), data(nullptr), toolId(NULL_ID), :formula(QString()), value(QString(tr("Error"))), checkZero(true), data(nullptr), toolId(NULL_ID),
postfix(QStringLiteral("")), _error(true), dValue(0) postfix(QString()), _error(true), dValue(0)
{} {}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VFormula::VFormula(const QString &formula, const VContainer *container) VFormula::VFormula(const QString &formula, const VContainer *container)
:formula(qApp->FormulaToUser(formula)), value(QString(tr("Error"))), checkZero(true), data(container), :formula(qApp->FormulaToUser(formula)), value(QString(tr("Error"))), checkZero(true), data(container),
toolId(NULL_ID), postfix(QStringLiteral("")), _error(true), dValue(0) toolId(NULL_ID), postfix(QString()), _error(true), dValue(0)
{ {
this->formula.replace("\n", " ");// Replace line return with spaces for calc if exist this->formula.replace("\n", " ");// Replace line return with spaces for calc if exist
Eval(); Eval();

2
src/app/dialogs/tools/dialogeditwrongformula.cpp
View File

@ -32,7 +32,7 @@
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, const quint32 &toolId, QWidget *parent) DialogEditWrongFormula::DialogEditWrongFormula(const VContainer *data, const quint32 &toolId, QWidget *parent)
:DialogTool(data, toolId, parent), ui(new Ui::DialogEditWrongFormula), formula(QString()), formulaBaseHeight(0), :DialogTool(data, toolId, parent), ui(new Ui::DialogEditWrongFormula), formula(QString()), formulaBaseHeight(0),
checkZero(false), postfix(QStringLiteral("")), restoreCursor(false) checkZero(false), postfix(QString()), restoreCursor(false)
{ {
ui->setupUi(this); ui->setupUi(this);
InitVariables(ui); InitVariables(ui);

6
src/libs/vpropertyexplorer/plugins/vstringproperty.cpp
View File

@ -32,14 +32,14 @@ VPE::VStringProperty::VStringProperty(const QString &name, const QMap<QString, Q
: VProperty(name, QVariant::String), readOnly(false), typeForParent(0) : VProperty(name, QVariant::String), readOnly(false), typeForParent(0)
{ {
VProperty::setSettings(settings); VProperty::setSettings(settings);
d_ptr->VariantValue.setValue(QStringLiteral("")); d_ptr->VariantValue.setValue(QString());
d_ptr->VariantValue.convert(QVariant::String); d_ptr->VariantValue.convert(QVariant::String);
} }
VPE::VStringProperty::VStringProperty(const QString &name) VPE::VStringProperty::VStringProperty(const QString &name)
: VProperty(name), readOnly(false), typeForParent(0) : VProperty(name), readOnly(false), typeForParent(0)
{ {
d_ptr->VariantValue.setValue(QStringLiteral("")); d_ptr->VariantValue.setValue(QString());
d_ptr->VariantValue.convert(QVariant::String); d_ptr->VariantValue.convert(QVariant::String);
} }
@ -66,7 +66,7 @@ QVariant VPE::VStringProperty::getEditorData(const QWidget *editor) const
return tmpEditor->text(); return tmpEditor->text();
} }
return QVariant(QStringLiteral("")); return QVariant(QString());
} }
void VPE::VStringProperty::setReadOnly(bool readOnly) void VPE::VStringProperty::setReadOnly(bool readOnly)