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

Refactoring. Use QString default constructor instead of empty string.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2018-03-14 16:01:24 +02:00
parent c1cea4c441
commit 6a7405b4d4
80 changed files with 163 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/tape/tmainwindow.cpp
View File

@ -385,7 +385,7 @@ void TMainWindow::FileNew()
mIsReadOnly = m->IsReadOnly();
UpdatePadlock(mIsReadOnly);
SetCurrentFile("");
SetCurrentFile(QString());
MeasurementsWasSaved(false);
InitWindow();
@ -449,7 +449,7 @@ void TMainWindow::OpenTemplate()
if (m != nullptr)
{// The file was opened.
SetCurrentFile(""); // Force user to to save new file
SetCurrentFile(QString()); // Force user to to save new file
lock.reset();// remove lock from template
}
}
@ -1134,15 +1134,15 @@ void TMainWindow::Remove()
ui->actionExportToCSV->setEnabled(false);
ui->lineEditName->blockSignals(true);
ui->lineEditName->setText("");
ui->lineEditName->setText(QString());
ui->lineEditName->blockSignals(false);
ui->plainTextEditDescription->blockSignals(true);
ui->plainTextEditDescription->setPlainText("");
ui->plainTextEditDescription->setPlainText(QString());
ui->plainTextEditDescription->blockSignals(false);
ui->lineEditFullName->blockSignals(true);
ui->lineEditFullName->setText("");
ui->lineEditFullName->setText(QString());
ui->lineEditFullName->blockSignals(false);
if (mType == MeasurementsType::Multisize)
@ -1152,7 +1152,7 @@ void TMainWindow::Remove()
ui->doubleSpinBoxInSizes->blockSignals(true);
ui->doubleSpinBoxInHeights->blockSignals(true);
ui->labelCalculatedValue->setText("");
ui->labelCalculatedValue->setText(QString());
ui->doubleSpinBoxBaseValue->setValue(0);
ui->doubleSpinBoxInSizes->setValue(0);
ui->doubleSpinBoxInHeights->setValue(0);
@ -1165,11 +1165,11 @@ void TMainWindow::Remove()
else
{
ui->labelCalculatedValue->blockSignals(true);
ui->labelCalculatedValue->setText("");
ui->labelCalculatedValue->setText(QString());
ui->labelCalculatedValue->blockSignals(false);
ui->plainTextEditFormula->blockSignals(true);
ui->plainTextEditFormula->setPlainText("");
ui->plainTextEditFormula->setPlainText(QString());
ui->plainTextEditFormula->blockSignals(false);
}
}
@ -2994,7 +2994,7 @@ void TMainWindow::CreateWindowMenu(QMenu *menu)
const int index = title.lastIndexOf("[*]");
if (index != -1)
{
window->isWindowModified() ? title.replace(index, 3, "*") : title.replace(index, 3, "");
window->isWindowModified() ? title.replace(index, 3, "*") : title.replace(index, 3, QString());
}
QAction *action = menu->addAction(title, this, SLOT(ShowWindow()));

2
src/app/valentina/core/vtooloptionspropertybrowser.cpp
View File

@ -496,7 +496,7 @@ void VToolOptionsPropertyBrowser::itemClicked(QGraphicsItem *item)
currentItem = item;
if (currentItem == nullptr)
{
formView->setTitle("");
formView->setTitle(QString());
return;
}

2
src/app/valentina/dialogs/dialoghistory.cpp
View File

@ -498,7 +498,7 @@ void DialogHistory::RetranslateUi()
QTableWidgetItem *item = ui->tableWidget->item(cursorRow, 0);
SCASSERT(item != nullptr)
item->setIcon(QIcon(""));
item->setIcon(QIcon(QString()));
cursorRow = currentRow;
cellClicked(cursorRow, 0);

16
src/app/valentina/mainwindow.cpp
View File

@ -202,7 +202,7 @@ MainWindow::MainWindow(QWidget *parent)
ReadSettings();
setCurrentFile("");
setCurrentFile(QString());
WindowsLocale();
connect(ui->listWidget, &QListWidget::currentRowChanged, this, &MainWindow::ShowPaper);
@ -324,7 +324,7 @@ void MainWindow::AddPP(const QString &PPName)
QApplication::postEvent(this, new FitBestCurrentEvent());
ui->actionNewDraw->setEnabled(true);
m_statusLabel->setText("");
m_statusLabel->setText(QString());
}
//---------------------------------------------------------------------------------------------------------------------
@ -2170,7 +2170,7 @@ void MainWindow::CancelTool()
{
pointer->setChecked(false);
}
m_statusLabel->setText("");
m_statusLabel->setText(QString());
// Crash: using CRTL+Z while using line tool.
// related bug report:
@ -2381,7 +2381,7 @@ void MainWindow::ArrowTool(bool checked)
ui->view->viewport()->unsetCursor();
ui->view->viewport()->setCursor(QCursor(Qt::ArrowCursor));
ui->view->setCurrentCursorShape(); // Hack to fix problem with a cursor
m_statusLabel->setText("");
m_statusLabel->setText(QString());
ui->view->setShowToolOptions(true);
qCDebug(vMainWindow, "Enabled arrow tool.");
}
@ -2575,7 +2575,7 @@ void MainWindow::ActionDetails(bool checked)
ui->dockWidgetGroups->setVisible(isDockGroupsVisible);
ui->dockWidgetGroups->setToolTip(tr("Show which details will go in layout"));
m_statusLabel->setText("");
m_statusLabel->setText(QString());
}
else
{
@ -2676,7 +2676,7 @@ void MainWindow::ActionLayout(bool checked)
SetEnableWidgets(true);
ui->toolBox->setCurrentIndex(ui->toolBox->indexOf(ui->layoutPage));
mouseCoordinate->setText("");
mouseCoordinate->setText(QString());
if (qApp->patternType() == MeasurementsType::Multisize)
{
@ -2700,7 +2700,7 @@ void MainWindow::ActionLayout(bool checked)
ui->toolButtonLayoutSettings->click();
}
m_statusLabel->setText("");
m_statusLabel->setText(QString());
}
else
{
@ -5442,7 +5442,7 @@ QString MainWindow::GetMeasurementFileName()
{
if(doc->MPath().isEmpty())
{
return "";
return QString();
}
else
{

4
src/app/valentina/mainwindowsnogui.cpp
View File

@ -1229,7 +1229,7 @@ void MainWindowsNoGUI::RestoreTextAfterDXF(const QString &placeholder,
if(QGraphicsSimpleTextItem *textItem = qgraphicsitem_cast<QGraphicsSimpleTextItem *>(item))
{
QString text = textItem->text();
text.replace(placeholder, "");
text.replace(placeholder, QString());
textItem->setText(text);
}
}
@ -1412,7 +1412,7 @@ void MainWindowsNoGUI::SetPrinterSettings(QPrinter *printer, const PrintType &pr
break;
}
case PrintType::PrintNative:
printer->setOutputFileName("");//Disable printing to file if was enabled.
printer->setOutputFileName(QString());//Disable printing to file if was enabled.
printer->setOutputFormat(QPrinter::NativeFormat);
break;
case PrintType::PrintPreview: /*do nothing*/

26
src/app/valentina/xml/vpattern.cpp
View File

@ -383,7 +383,7 @@ quint32 VPattern::SPointActiveDraw()
const QDomElement domElement = domNode.toElement();
if (domElement.isNull() == false)
{
if (domElement.tagName() == TagPoint && domElement.attribute(AttrType, "") == VToolBasePoint::ToolType)
if (domElement.tagName() == TagPoint && domElement.attribute(AttrType, QString()) == VToolBasePoint::ToolType)
{
return GetParametrId(domElement);
}
@ -797,7 +797,7 @@ void VPattern::ParseDrawMode(const QDomNode &node, const Document &parse, const
{
case 0: // TagPoint
qCDebug(vXML, "Tag point.");
ParsePointElement(scene, domElement, parse, domElement.attribute(AttrType, ""));
ParsePointElement(scene, domElement, parse, domElement.attribute(AttrType, QString()));
break;
case 1: // TagLine
qCDebug(vXML, "Tag line.");
@ -805,23 +805,23 @@ void VPattern::ParseDrawMode(const QDomNode &node, const Document &parse, const
break;
case 2: // TagSpline
qCDebug(vXML, "Tag spline.");
ParseSplineElement(scene, domElement, parse, domElement.attribute(AttrType, ""));
ParseSplineElement(scene, domElement, parse, domElement.attribute(AttrType, QString()));
break;
case 3: // TagArc
qCDebug(vXML, "Tag arc.");
ParseArcElement(scene, domElement, parse, domElement.attribute(AttrType, ""));
ParseArcElement(scene, domElement, parse, domElement.attribute(AttrType, QString()));
break;
case 4: // TagTools
qCDebug(vXML, "Tag tools.");
ParseToolsElement(scene, domElement, parse, domElement.attribute(AttrType, ""));
ParseToolsElement(scene, domElement, parse, domElement.attribute(AttrType, QString()));
break;
case 5: // TagOperation
qCDebug(vXML, "Tag operation.");
ParseOperationElement(scene, domElement, parse, domElement.attribute(AttrType, ""));
ParseOperationElement(scene, domElement, parse, domElement.attribute(AttrType, QString()));
break;
case 6: // TagElArc
qCDebug(vXML, "Tag elliptical arc.");
ParseEllipticalArcElement(scene, domElement, parse, domElement.attribute(AttrType, ""));
ParseEllipticalArcElement(scene, domElement, parse, domElement.attribute(AttrType, QString()));
break;
case 7: // TagPath
qCDebug(vXML, "Tag path.");
@ -3140,7 +3140,7 @@ void VPattern::ParseToolRotation(VMainGraphicsScene *scene, QDomElement &domElem
initData.origin = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR);
initData.angle = GetParametrString(domElement, AttrAngle, "10");
const QString a = initData.angle;//need for saving fixed formula;
initData.suffix = GetParametrString(domElement, AttrSuffix, "");
initData.suffix = GetParametrString(domElement, AttrSuffix, QString());
VAbstractOperation::ExtractData(domElement, initData);
@ -3185,7 +3185,7 @@ void VPattern::ParseToolFlippingByLine(VMainGraphicsScene *scene, QDomElement &d
ToolsCommonAttributes(domElement, initData.id);
initData.firstLinePointId = GetParametrUInt(domElement, AttrP1Line, NULL_ID_STR);
initData.secondLinePointId = GetParametrUInt(domElement, AttrP2Line, NULL_ID_STR);
initData.suffix = GetParametrString(domElement, AttrSuffix, "");
initData.suffix = GetParametrString(domElement, AttrSuffix, QString());
VAbstractOperation::ExtractData(domElement, initData);
@ -3217,7 +3217,7 @@ void VPattern::ParseToolFlippingByAxis(VMainGraphicsScene *scene, QDomElement &d
ToolsCommonAttributes(domElement, initData.id);
initData.originPointId = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR);
initData.axisType = static_cast<AxisType>(GetParametrUInt(domElement, AttrAxisType, "1"));
initData.suffix = GetParametrString(domElement, AttrSuffix, "");
initData.suffix = GetParametrString(domElement, AttrSuffix, QString());
VAbstractOperation::ExtractData(domElement, initData);
@ -3253,7 +3253,7 @@ void VPattern::ParseToolMove(VMainGraphicsScene *scene, QDomElement &domElement,
const QString r = initData.formulaRotationAngle;//need for saving fixed formula;
initData.formulaLength = GetParametrString(domElement, AttrLength, "0");
const QString len = initData.formulaLength;//need for saving fixed formula;
initData.suffix = GetParametrString(domElement, AttrSuffix, "");
initData.suffix = GetParametrString(domElement, AttrSuffix, QString());
initData.rotationOrigin = GetParametrUInt(domElement, AttrCenter, NULL_ID_STR);
VAbstractOperation::ExtractData(domElement, initData);
@ -3316,7 +3316,7 @@ QDomElement VPattern::MakeEmptyIncrement(const QString &name)
QDomElement element = createElement(TagIncrement);
SetAttribute(element, AttrName, name);
SetAttribute(element, AttrFormula, QString("0"));
SetAttribute(element, AttrDescription, QString(""));
SetAttribute(element, AttrDescription, QString(QString()));
return element;
}
@ -3764,7 +3764,7 @@ void VPattern::ParseIncrementsElement(const QDomNode &node, const Document &pars
{
if (domElement.tagName() == TagIncrement)
{
const QString name = GetParametrString(domElement, AttrName, "");
const QString name = GetParametrString(domElement, AttrName, QString());
const QString desc = GetParametrEmptyString(domElement, AttrDescription);
const QString formula = GetParametrString(domElement, AttrFormula, "0");
bool ok = false;

6
src/libs/ifc/xml/vpatternconverter.cpp
View File

@ -2134,7 +2134,7 @@ void VPatternConverter::TagDetailToV0_4_0()
tagNode.setAttribute(*strMy, element.attribute(*strMy, "0"));
}
tagNode.setAttribute(*strType, element.attribute(*strType, ""));
tagNode.setAttribute(*strType, element.attribute(*strType, QString()));
tagNodes.appendChild(tagNode);
@ -2187,7 +2187,7 @@ QDomElement VPatternConverter::GetUnionDetailNodesV0_4_0(const QDomElement &deta
tagNode.setAttribute(*strReverse, node.attribute(*strReverse, "0"));
}
tagNode.setAttribute(*strType, node.attribute(*strType, ""));
tagNode.setAttribute(*strType, node.attribute(*strType, QString()));
tagNodes.appendChild(tagNode);
}
@ -2395,7 +2395,7 @@ void VPatternConverter::PortPieceLabelstoV0_6_0()
const int count = nodeListMCP.count();
try
{
if (not GetParametrString(dataTag, *strLetter, "").isEmpty())
if (not GetParametrString(dataTag, *strLetter, QString()).isEmpty())
{
AddLabelTemplateLineV0_6_0(dataTag, "%pLetter%", true, false, Qt::AlignHCenter, 6);
}

4
src/libs/ifc/xml/vvitconverter.cpp
View File

@ -242,8 +242,8 @@ QDomElement VVITConverter::AddMV0_3_0(const QString &name, qreal value)
SetAttribute(element, QStringLiteral("name"), name);
SetAttribute(element, QStringLiteral("value"), QString().setNum(value));
SetAttribute(element, QStringLiteral("description"), QString(""));
SetAttribute(element, QStringLiteral("full_name"), QString(""));
SetAttribute(element, QStringLiteral("description"), QString());
SetAttribute(element, QStringLiteral("full_name"), QString());
return element;
}

4
src/libs/ifc/xml/vvstconverter.cpp
View File

@ -264,8 +264,8 @@ QDomElement VVSTConverter::AddMV0_4_0(const QString &name, qreal value, qreal si
SetAttribute(element, QStringLiteral("base"), QString().setNum(value));
SetAttribute(element, QStringLiteral("size_increase"), QString().setNum(sizeIncrease));
SetAttribute(element, QStringLiteral("height_increase"), QString().setNum(heightIncrease));
SetAttribute(element, QStringLiteral("description"), QString(""));
SetAttribute(element, QStringLiteral("full_name"), QString(""));
SetAttribute(element, QStringLiteral("description"),QString());
SetAttribute(element, QStringLiteral("full_name"), QString());
return element;
}

4
src/libs/qmuparser/qmuformulabase.cpp
View File

@ -76,10 +76,10 @@ void QmuFormulaBase::InitCharSets()
// Defining identifier character sets
const QString nameChars = QString() + sign0 + sign1 + sign2 + sign3 + sign4 + sign5 + sign6 + sign7 + sign8 +
sign9 + QLatin1String("\\_@#'") + symbols.join("");
sign9 + QLatin1String("\\_@#'") + symbols.join(QString());
DefineNameChars(nameChars);
const QString oprtChars = symbols.join("") + positiveSign + negativeSign + QLatin1String("*^/?<>=!$%&|~'_");
const QString oprtChars = symbols.join(QString()) + positiveSign + negativeSign + QLatin1String("*^/?<>=!$%&|~'_");
DefineOprtChars(oprtChars);
const QString infixOprtChars = QString() + positiveSign + negativeSign + QLatin1String("*^/?<>=!$%&|~'_");

2
src/libs/qmuparser/qmuparsertest.cpp
View File

@ -721,7 +721,7 @@ int QmuParserTester::TestInfixOprt()
iStat += EqnTest ( "(-3)^2", 9, true );
iStat += EqnTest ( "-(-2^2)", 4, true );
iStat += EqnTest ( "3+-3^2", -6, true );
// The following assumes use of sqr as postfix operator ("") together
// The following assumes use of sqr as postfix operator (QString()) together
// with a sign operator of low priority:
iStat += EqnTest ( "-2'", -4, true );
iStat += EqnTest ( "-(1+1)'", -4, true );

2
src/libs/vdxf/vdxfengine.cpp
View File

@ -373,7 +373,7 @@ void VDxfEngine::drawTextItem(const QPointF & p, const QTextItem & textItem)
if (foundEndOfString)
{
t.replace(endStringPlaceholder, "");
t.replace(endStringPlaceholder, QString());
}
textBuffer->text += t.toStdString();

6
src/libs/vformat/vmeasurements.cpp
View File

@ -371,7 +371,7 @@ int VMeasurements::BaseHeight() const
//---------------------------------------------------------------------------------------------------------------------
QString VMeasurements::Notes() const
{
return UniqueTagText(TagNotes, "");
return UniqueTagText(TagNotes, QString());
}
//---------------------------------------------------------------------------------------------------------------------
@ -386,7 +386,7 @@ void VMeasurements::SetNotes(const QString &text)
//---------------------------------------------------------------------------------------------------------------------
QString VMeasurements::Customer() const
{
return UniqueTagText(TagCustomer, "");
return UniqueTagText(TagCustomer, QString());
}
//---------------------------------------------------------------------------------------------------------------------
@ -446,7 +446,7 @@ void VMeasurements::SetPMSystem(const QString &system)
//---------------------------------------------------------------------------------------------------------------------
QString VMeasurements::Email() const
{
return UniqueTagText(TagEmail, "");
return UniqueTagText(TagEmail, QString());
}
//---------------------------------------------------------------------------------------------------------------------

18
src/libs/vlayout/vtextmanager.cpp
View File

@ -126,15 +126,15 @@ QMap<QString, QString> PreparePlaceholders(const VAbstractPattern *doc)
}
// Piece tags
placeholders.insert(pl_pLetter, "");
placeholders.insert(pl_pAnnotation, "");
placeholders.insert(pl_pOrientation, "");
placeholders.insert(pl_pRotation, "");
placeholders.insert(pl_pTilt, "");
placeholders.insert(pl_pFoldPosition, "");
placeholders.insert(pl_pName, "");
placeholders.insert(pl_pQuantity, "");
placeholders.insert(pl_wOnFold, "");
placeholders.insert(pl_pLetter, QString());
placeholders.insert(pl_pAnnotation, QString());
placeholders.insert(pl_pOrientation, QString());
placeholders.insert(pl_pRotation, QString());
placeholders.insert(pl_pTilt, QString());
placeholders.insert(pl_pFoldPosition, QString());
placeholders.insert(pl_pName, QString());
placeholders.insert(pl_pQuantity, QString());
placeholders.insert(pl_wOnFold, QString());
placeholders.insert(pl_mFabric, QObject::tr("Fabric"));
placeholders.insert(pl_mLining, QObject::tr("Lining"));
placeholders.insert(pl_mInterfacing, QObject::tr("Interfacing"));

4
src/libs/vmisc/qxtcsvmodel.cpp
View File

@ -606,7 +606,7 @@ bool QxtCsvModel::toCSV(QIODevice* dest, QString &error, bool withHeader, QChar
}
if (withHeader)
{
data = "";
data = QString();
for (col = 0; col < cols; ++col)
{
if (col > 0)
@ -620,7 +620,7 @@ bool QxtCsvModel::toCSV(QIODevice* dest, QString &error, bool withHeader, QChar
for (row = 0; row < rows; ++row)
{
const QStringList& rowData = d_ptr.csvData[row];
data = "";
data = QString();
for (col = 0; col < cols; ++col)
{
if (col > 0)

2
src/libs/vpatterndb/vtranslatevars.cpp
View File

@ -1005,7 +1005,7 @@ QString VTranslateVars::FormulaToUser(const QString &formula, bool osSeparator)
QString dStr = loc.toString(d);// Number string in user locale
if (loc.groupSeparator().isSpace())
{
dStr.replace(loc.groupSeparator(), "");
dStr.replace(loc.groupSeparator(), QString());
}
newFormula.replace(nKeys.at(i), nValues.at(i).length(), dStr);
const int bias = nValues.at(i).length() - dStr.length();

2
src/libs/vpropertyexplorer/plugins/vlinetypeproperty.cpp
View File

@ -89,7 +89,7 @@ QWidget *VPE::VLineTypeProperty::createEditor(QWidget *parent, const QStyleOptio
QMap<QString, QIcon>::const_iterator i = styles.constBegin();
while (i != styles.constEnd())
{
tmpEditor->addItem(i.value(), "", QVariant(i.key()));
tmpEditor->addItem(i.value(), QString(), QVariant(i.key()));
++i;
}

18
src/libs/vtools/dialogs/support/dialogeditlabel.cpp
View File

@ -512,20 +512,20 @@ void DialogEditLabel::InitPlaceholders()
}
// Piece tags
m_placeholders.insert(pl_pLetter, qMakePair(tr("Piece letter"), QString("")));
m_placeholders.insert(pl_pAnnotation, qMakePair(tr("Piece annotation"), QString("")));
m_placeholders.insert(pl_pOrientation, qMakePair(tr("Piece orientation"), QString("")));
m_placeholders.insert(pl_pRotation, qMakePair(tr("Piece rotation"), QString("")));
m_placeholders.insert(pl_pTilt, qMakePair(tr("Piece tilt"), QString("")));
m_placeholders.insert(pl_pFoldPosition, qMakePair(tr("Piece fold position"), QString("")));
m_placeholders.insert(pl_pName, qMakePair(tr("Piece name"), QString("")));
m_placeholders.insert(pl_pQuantity, qMakePair(tr("Quantity"), QString("")));
m_placeholders.insert(pl_pLetter, qMakePair(tr("Piece letter"), QString(QString())));
m_placeholders.insert(pl_pAnnotation, qMakePair(tr("Piece annotation"), QString(QString())));
m_placeholders.insert(pl_pOrientation, qMakePair(tr("Piece orientation"), QString(QString())));
m_placeholders.insert(pl_pRotation, qMakePair(tr("Piece rotation"), QString(QString())));
m_placeholders.insert(pl_pTilt, qMakePair(tr("Piece tilt"), QString(QString())));
m_placeholders.insert(pl_pFoldPosition, qMakePair(tr("Piece fold position"), QString(QString())));
m_placeholders.insert(pl_pName, qMakePair(tr("Piece name"), QString(QString())));
m_placeholders.insert(pl_pQuantity, qMakePair(tr("Quantity"), QString(QString())));
m_placeholders.insert(pl_mFabric, qMakePair(tr("Material: Fabric"), tr("Fabric")));
m_placeholders.insert(pl_mLining, qMakePair(tr("Material: Lining"), tr("Lining")));
m_placeholders.insert(pl_mInterfacing, qMakePair(tr("Material: Interfacing"), tr("Interfacing")));
m_placeholders.insert(pl_mInterlining, qMakePair(tr("Material: Interlining"), tr("Interlining")));
m_placeholders.insert(pl_wCut, qMakePair(tr("Word: Cut"), tr("Cut")));
m_placeholders.insert(pl_wOnFold, qMakePair(tr("Word: on fold"), QString("")));// By default should be empty
m_placeholders.insert(pl_wOnFold, qMakePair(tr("Word: on fold"), QString(QString())));// By default should be empty
}
//---------------------------------------------------------------------------------------------------------------------

8
src/libs/vtools/dialogs/support/dialogeditwrongformula.cpp
View File

@ -162,7 +162,7 @@ void DialogEditWrongFormula::ValChanged(int row)
{
if (ui->tableWidget->rowCount() == 0)
{
ui->labelDescription->setText("");
ui->labelDescription->setText(QString());
return;
}
QTableWidgetItem *item = ui->tableWidget->item( row, ColumnName );
@ -508,7 +508,7 @@ void DialogEditWrongFormula::ShowVariable(const QMap<key, val> &var)
ui->tableWidget->clearContents();
ui->tableWidget->setRowCount(0);
ui->tableWidget->setColumnHidden(ColumnFullName, true);
ui->labelDescription->setText("");
ui->labelDescription->setText(QString());
QMapIterator<key, val> iMap(var);
while (iMap.hasNext())
@ -542,7 +542,7 @@ void DialogEditWrongFormula::ShowMeasurements(const QMap<QString, QSharedPointer
ui->tableWidget->clearContents();
ui->tableWidget->setRowCount(0);
ui->tableWidget->setColumnHidden(ColumnFullName, false);
ui->labelDescription->setText("");
ui->labelDescription->setText(QString());
QMapIterator<QString, QSharedPointer<VMeasurement>> iMap(var);
while (iMap.hasNext())
@ -590,7 +590,7 @@ void DialogEditWrongFormula::ShowFunctions()
ui->tableWidget->clearContents();
ui->tableWidget->setRowCount(0);
ui->tableWidget->setColumnHidden(ColumnFullName, true);
ui->labelDescription->setText("");
ui->labelDescription->setText(QString());
const QMap<QString, qmu::QmuTranslation> functions = qApp->TrVars()->GetFunctions();
QMap<QString, qmu::QmuTranslation>::const_iterator i = functions.constBegin();

2
src/libs/vtools/dialogs/tools/dialogalongline.cpp
View File

@ -184,7 +184,7 @@ void DialogAlongLine::ChosenObject(quint32 id, const SceneObject &type)
}
break;
case 1:
if (SetObject(id, ui->comboBoxSecondPoint, ""))
if (SetObject(id, ui->comboBoxSecondPoint, QString()))
{
if (flagError)
{

2
src/libs/vtools/dialogs/tools/dialogarc.cpp
View File

@ -256,7 +256,7 @@ void DialogArc::ChosenObject(quint32 id, const SceneObject &type)
{
if (type == SceneObject::Point)
{
if (SetObject(id, ui->comboBoxBasePoint, ""))
if (SetObject(id, ui->comboBoxBasePoint, QString()))
{
vis->VisualMode(id);
prepare = true;

2
src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
View File

@ -235,7 +235,7 @@ void DialogArcWithLength::ChosenObject(quint32 id, const SceneObject &type)
{
if (type == SceneObject::Point)
{
if (SetObject(id, ui->comboBoxCenter, ""))
if (SetObject(id, ui->comboBoxCenter, QString()))
{
vis->VisualMode(id);
prepare = true;

2
src/libs/vtools/dialogs/tools/dialogbisector.cpp
View File

@ -199,7 +199,7 @@ void DialogBisector::ChosenObject(quint32 id, const SceneObject &type)
if (set.size() == 3)
{
if (SetObject(id, ui->comboBoxThirdPoint, ""))
if (SetObject(id, ui->comboBoxThirdPoint, QString()))
{
line->setObject3Id(id);
line->RefreshGeometry();

2
src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp
View File

@ -153,7 +153,7 @@ void DialogCubicBezier::ChosenObject(quint32 id, const SceneObject &type)
case 3:
if (getCurrentObjectId(ui->comboBoxP1) != id)
{
if (SetObject(id, ui->comboBoxP4, ""))
if (SetObject(id, ui->comboBoxP4, QString()))
{
++number;

2
src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp
View File

@ -165,7 +165,7 @@ void DialogCubicBezierPath::ShowDialog(bool click)
{
if (size - VCubicBezierPath::SubSplPointsCount(path.CountSubSpl()) == 0)
{// Accept only if all subpaths are completed
emit ToolTip("");
emit ToolTip(QString());
if (not data->IsUnique(path.name()))
{

4
src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
View File

@ -216,7 +216,7 @@ void DialogCurveIntersectAxis::ShowDialog(bool click)
SCASSERT(line != nullptr)
this->SetAngle(line->Angle());//Show in dialog angle what user choose
emit ToolTip("");
emit ToolTip(QString());
DialogAccepted();// Just set default values and don't show dialog
}
@ -252,7 +252,7 @@ void DialogCurveIntersectAxis::ChosenObject(quint32 id, const SceneObject &type)
case (1):
if (type == SceneObject::Point)
{
if (SetObject(id, ui->comboBoxAxisPoint, ""))
if (SetObject(id, ui->comboBoxAxisPoint, QString()))
{
line->setAxisPointId(id);
line->RefreshGeometry();

2
src/libs/vtools/dialogs/tools/dialogcutarc.cpp
View File

@ -128,7 +128,7 @@ void DialogCutArc::ChosenObject(quint32 id, const SceneObject &type)
{
if (type == SceneObject::Arc)
{
if (SetObject(id, ui->comboBoxArc, ""))
if (SetObject(id, ui->comboBoxArc, QString()))
{
vis->VisualMode(id);
prepare = true;

2
src/libs/vtools/dialogs/tools/dialogcutspline.cpp
View File

@ -144,7 +144,7 @@ void DialogCutSpline::ChosenObject(quint32 id, const SceneObject &type)
{
if (type == SceneObject::Spline)
{
if (SetObject(id, ui->comboBoxSpline, ""))
if (SetObject(id, ui->comboBoxSpline, QString()))
{
vis->VisualMode(id);
prepare = true;

2
src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
View File

@ -144,7 +144,7 @@ void DialogCutSplinePath::ChosenObject(quint32 id, const SceneObject &type)
{
if (type == SceneObject::SplinePath)
{
if (SetObject(id, ui->comboBoxSplinePath, ""))
if (SetObject(id, ui->comboBoxSplinePath, QString()))
{
vis->VisualMode(id);
prepare = true;

2
src/libs/vtools/dialogs/tools/dialogellipticalarc.cpp
View File

@ -579,7 +579,7 @@ void DialogEllipticalArc::ChosenObject(quint32 id, const SceneObject &type)
{
if (type == SceneObject::Point)
{
if (SetObject(id, ui->comboBoxBasePoint, ""))
if (SetObject(id, ui->comboBoxBasePoint, QString()))
{
vis->VisualMode(id);
prepare = true;

4
src/libs/vtools/dialogs/tools/dialogendline.cpp
View File

@ -184,7 +184,7 @@ void DialogEndLine::ChosenObject(quint32 id, const SceneObject &type)
{
if (type == SceneObject::Point)
{
if (SetObject(id, ui->comboBoxBasePoint, ""))
if (SetObject(id, ui->comboBoxBasePoint, QString()))
{
vis->VisualMode(id);
VAbstractMainWindow *window = qobject_cast<VAbstractMainWindow *>(qApp->getMainWindow());
@ -328,7 +328,7 @@ void DialogEndLine::ShowDialog(bool click)
this->SetAngle(line->Angle());//Show in dialog angle what user choose
this->SetFormula(line->Length());
emit ToolTip("");
emit ToolTip(QString());
timerFormula->start();
this->show();
}

4
src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp
View File

@ -183,7 +183,7 @@ void DialogFlippingByAxis::ShowDialog(bool click)
else if (not stage1 && prepare && click)
{
setModal(true);
emit ToolTip("");
emit ToolTip(QString());
show();
}
}
@ -201,7 +201,7 @@ void DialogFlippingByAxis::ChosenObject(quint32 id, const SceneObject &type)
return;
}
if (SetObject(id, ui->comboBoxOriginPoint, ""))
if (SetObject(id, ui->comboBoxOriginPoint, QString()))
{
VisToolFlippingByAxis *operation = qobject_cast<VisToolFlippingByAxis *>(vis);
SCASSERT(operation != nullptr)

4
src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp
View File

@ -180,7 +180,7 @@ void DialogFlippingByLine::ShowDialog(bool click)
else if (not stage1 && prepare && click)
{
setModal(true);
emit ToolTip("");
emit ToolTip(QString());
show();
}
}
@ -219,7 +219,7 @@ void DialogFlippingByLine::ChosenObject(quint32 id, const SceneObject &type)
if (getCurrentObjectId(ui->comboBoxFirstLinePoint) != id)
{
if (SetObject(id, ui->comboBoxSecondLinePoint, ""))
if (SetObject(id, ui->comboBoxSecondLinePoint, QString()))
{
if (flagError)
{

2
src/libs/vtools/dialogs/tools/dialoggroup.cpp
View File

@ -76,7 +76,7 @@ void DialogGroup::ShowDialog(bool click)
SetName(tr("New group"));
setModal(true);
emit ToolTip("");
emit ToolTip(QString());
show();
}
}

2
src/libs/vtools/dialogs/tools/dialogheight.cpp
View File

@ -212,7 +212,7 @@ void DialogHeight::ChosenObject(quint32 id, const SceneObject &type)
if (set.size() == 3)
{
if (SetObject(id, ui->comboBoxP2Line, ""))
if (SetObject(id, ui->comboBoxP2Line, QString()))
{
line->setLineP2Id(id);
line->RefreshGeometry();

2
src/libs/vtools/dialogs/tools/dialogline.cpp
View File

@ -190,7 +190,7 @@ void DialogLine::ChosenObject(quint32 id, const SceneObject &type)
case 1:
if (getCurrentObjectId(ui->comboBoxFirstPoint) != id)
{
if (SetObject(id, ui->comboBoxSecondPoint, ""))
if (SetObject(id, ui->comboBoxSecondPoint, QString()))
{
if (flagError)
{

2
src/libs/vtools/dialogs/tools/dialoglineintersect.cpp
View File

@ -145,7 +145,7 @@ void DialogLineIntersect::ChosenObject(quint32 id, const SceneObject &type)
if (set.size() >= 3)
{
if (SetObject(id, ui->comboBoxP2Line2, ""))
if (SetObject(id, ui->comboBoxP2Line2, QString()))
{
line->setLine2P2Id(id);
line->RefreshGeometry();

4
src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
View File

@ -244,7 +244,7 @@ void DialogLineIntersectAxis::ShowDialog(bool click)
SCASSERT(line != nullptr)
this->SetAngle(line->Angle());//Show in dialog angle what user choose
emit ToolTip("");
emit ToolTip(QString());
DialogAccepted();// Just set default values and don't show dialog
}
@ -292,7 +292,7 @@ void DialogLineIntersectAxis::ChosenObject(quint32 id, const SceneObject &type)
if (set.size() == 3)
{
if (SetObject(id, ui->comboBoxAxisPoint, ""))
if (SetObject(id, ui->comboBoxAxisPoint, QString()))
{
line->setAxisPointId(id);
line->RefreshGeometry();

6
src/libs/vtools/dialogs/tools/dialogmove.cpp
View File

@ -310,7 +310,7 @@ void DialogMove::ShowDialog(bool click)
if (not optionalRotationOrigin)
{
operation->SetRotationOriginPointId(NULL_ID);
SetObject(NULL_ID, ui->comboBoxRotationOriginPoint, "");
SetObject(NULL_ID, ui->comboBoxRotationOriginPoint, QString());
operation->RefreshGeometry();
}
optionalRotationOrigin = false; // Handled, next click on empty filed will disable selection
@ -321,7 +321,7 @@ void DialogMove::ShowDialog(bool click)
SetLength(qApp->TrVars()->FormulaFromUser(formulaLength, qApp->Settings()->GetOsSeparator()));
SetRotationAngle(operation->RotationAngle());
setModal(true);
emit ToolTip("");
emit ToolTip(QString());
timerAngle->start();
timerRotationAngle->start();
timerLength->start();
@ -337,7 +337,7 @@ void DialogMove::ChosenObject(quint32 id, const SceneObject &type)
{
if (type == SceneObject::Point && QGuiApplication::keyboardModifiers() == Qt::ControlModifier)
{
if (SetObject(id, ui->comboBoxRotationOriginPoint, ""))
if (SetObject(id, ui->comboBoxRotationOriginPoint, QString()))
{
VisToolMove *operation = qobject_cast<VisToolMove *>(vis);
SCASSERT(operation != nullptr)

2
src/libs/vtools/dialogs/tools/dialognormal.cpp
View File

@ -176,7 +176,7 @@ void DialogNormal::ChosenObject(quint32 id, const SceneObject &type)
case 1:
if (getCurrentObjectId(ui->comboBoxFirstPoint) != id)
{
if (SetObject(id, ui->comboBoxSecondPoint, ""))
if (SetObject(id, ui->comboBoxSecondPoint, QString()))
{
line->setObject2Id(id);
line->RefreshGeometry();

2
src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
View File

@ -152,7 +152,7 @@ void DialogPointFromArcAndTangent::ChosenObject(quint32 id, const SceneObject &t
case 1:
if (type == SceneObject::Arc)
{
if (SetObject(id, ui->comboBoxArc, ""))
if (SetObject(id, ui->comboBoxArc, QString()))
{
number = 0;
point->setArcId(id);

2
src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
View File

@ -206,7 +206,7 @@ void DialogPointFromCircleAndTangent::ChosenObject(quint32 id, const SceneObject
case 1:
if (getCurrentObjectId(ui->comboBoxTangentPoint) != id)
{
if (SetObject(id, ui->comboBoxCircleCenter, ""))
if (SetObject(id, ui->comboBoxCircleCenter, QString()))
{
number = 0;
point->setObject2Id(id);

2
src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
View File

@ -197,7 +197,7 @@ void DialogPointOfContact::ChosenObject(quint32 id, const SceneObject &type)
if (set.size() == 3)
{
if (SetObject(id, ui->comboBoxCenter, ""))
if (SetObject(id, ui->comboBoxCenter, QString()))
{
line->setRadiusId(id);
line->RefreshGeometry();

2
src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp
View File

@ -122,7 +122,7 @@ void DialogPointOfIntersection::ChosenObject(quint32 id, const SceneObject &type
case 1:
if (getCurrentObjectId(ui->comboBoxFirstPoint) != id)
{
if (SetObject(id, ui->comboBoxSecondPoint, ""))
if (SetObject(id, ui->comboBoxSecondPoint, QString()))
{
line->setPoint2Id(id);
line->RefreshGeometry();

2
src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
View File

@ -155,7 +155,7 @@ void DialogPointOfIntersectionArcs::ChosenObject(quint32 id, const SceneObject &
case 1:
if (getCurrentObjectId(ui->comboBoxArc1) != id)
{
if (SetObject(id, ui->comboBoxArc2, ""))
if (SetObject(id, ui->comboBoxArc2, QString()))
{
number = 0;
point->setArc2Id(id);

2
src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
View File

@ -245,7 +245,7 @@ void DialogPointOfIntersectionCircles::ChosenObject(quint32 id, const SceneObjec
case 1:
if (getCurrentObjectId(ui->comboBoxCircle1Center) != id)
{
if (SetObject(id, ui->comboBoxCircle2Center, ""))
if (SetObject(id, ui->comboBoxCircle2Center, QString()))
{
number = 0;
point->setObject2Id(id);

2
src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp
View File

@ -181,7 +181,7 @@ void DialogPointOfIntersectionCurves::ChosenObject(quint32 id, const SceneObject
case 1:
if (getCurrentObjectId(ui->comboBoxCurve1) != id)
{
if (SetObject(id, ui->comboBoxCurve2, ""))
if (SetObject(id, ui->comboBoxCurve2, QString()))
{
number = 0;
point->setObject2Id(id);

4
src/libs/vtools/dialogs/tools/dialogrotation.cpp
View File

@ -229,7 +229,7 @@ void DialogRotation::ShowDialog(bool click)
SetAngle(operation->Angle());//Show in dialog angle that a user choose
setModal(true);
emit ToolTip("");
emit ToolTip(QString());
timerAngle->start();
show();
}
@ -253,7 +253,7 @@ void DialogRotation::ChosenObject(quint32 id, const SceneObject &type)
operation->SetObjects(objects.toVector());
}
if (SetObject(id, ui->comboBoxOriginPoint, ""))
if (SetObject(id, ui->comboBoxOriginPoint, QString()))
{
VAbstractMainWindow *window = qobject_cast<VAbstractMainWindow *>(qApp->getMainWindow());
SCASSERT(window != nullptr)

2
src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
View File

@ -201,7 +201,7 @@ void DialogShoulderPoint::ChosenObject(quint32 id, const SceneObject &type)
if (set.size() == 3)
{
if (SetObject(id, ui->comboBoxP2Line, ""))
if (SetObject(id, ui->comboBoxP2Line, QString()))
{
line->setLineP2Id(id);
line->RefreshGeometry();

2
src/libs/vtools/dialogs/tools/dialogspline.cpp
View File

@ -175,7 +175,7 @@ void DialogSpline::ChosenObject(quint32 id, const SceneObject &type)
{
if (getCurrentObjectId(ui->comboBoxP1) != id)
{
if (SetObject(id, ui->comboBoxP4, ""))
if (SetObject(id, ui->comboBoxP4, QString()))
{
++number;

2
src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
View File

@ -687,7 +687,7 @@ void DialogSplinePath::ShowDialog(bool click)
{
if (path.CountPoints() >= 3)
{
emit ToolTip("");
emit ToolTip(QString());
if (not data->IsUnique(path.name()))
{

6
src/libs/vtools/dialogs/tools/dialogtool.cpp
View File

@ -168,7 +168,7 @@ DialogTool::DialogTool(const VContainer *data, const quint32 &toolId, QWidget *p
//---------------------------------------------------------------------------------------------------------------------
DialogTool::~DialogTool()
{
emit ToolTip("");
emit ToolTip(QString());
if (not vis.isNull())
{
@ -327,7 +327,7 @@ void DialogTool::FillComboBoxTypeLine(QComboBox *box, const QMap<QString, QIcon>
QMap<QString, QIcon>::const_iterator i = stylesPics.constBegin();
while (i != stylesPics.constEnd())
{
box->addItem(i.value(), "", QVariant(i.key()));
box->addItem(i.value(), QString(), QVariant(i.key()));
++i;
}
@ -845,7 +845,7 @@ qreal DialogTool::Eval(const QString &text, bool &flag, QLabel *label, const QSt
flag = true;
ChangeColor(labelEditFormula, okColor);
label->setToolTip(tr("Value"));
emit ToolTip("");
emit ToolTip(QString());
}
}
}

2
src/libs/vtools/dialogs/tools/dialogtriangle.cpp
View File

@ -148,7 +148,7 @@ void DialogTriangle::ChosenObject(quint32 id, const SceneObject &type)
if (set.size() == 4)
{
if (SetObject(id, ui->comboBoxSecondPoint, ""))
if (SetObject(id, ui->comboBoxSecondPoint, QString()))
{
line->setHypotenuseP2Id(id);
line->RefreshGeometry();

2
src/libs/vtools/dialogs/tools/dialogtruedarts.cpp
View File

@ -290,7 +290,7 @@ void DialogTrueDarts::ChosenObject(quint32 id, const SceneObject &type)
if (set.size() == 5)
{
if (SetObject(id, ui->comboBoxThirdDartPoint, ""))
if (SetObject(id, ui->comboBoxThirdDartPoint, QString()))
{
points->setD3PointId(id);
points->RefreshGeometry();

2
src/libs/vtools/dialogs/tools/dialoguniondetails.cpp
View File

@ -174,7 +174,7 @@ void DialogUnionDetails::ChoosedDetail(const quint32 &id, const SceneObject &typ
if (numberD > 1)
{
++numberP;
emit ToolTip("");
emit ToolTip(QString());
this->setModal(true);
this->show();
}

2
src/libs/vtools/dialogs/tools/piece/dialogduplicatedetail.cpp
View File

@ -71,7 +71,7 @@ void DialogDuplicateDetail::ShowDialog(bool click)
m_mx = piece->Mx();
m_my = piece->My();
emit ToolTip("");
emit ToolTip(QString());
DialogAccepted();
}
}

10
src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp
View File

@ -184,7 +184,7 @@ void DialogPiecePath::ShowDialog(bool click)
{
if (CreatePath().CountNodes() > 0)
{
emit ToolTip("");
emit ToolTip(QString());
prepare = true;
if (not m_showMode)
@ -432,8 +432,8 @@ void DialogPiecePath::NodeChanged(int index)
}
else
{
ui->plainTextEditFormulaWidthBefore->setPlainText("");
ui->plainTextEditFormulaWidthAfter->setPlainText("");
ui->plainTextEditFormulaWidthBefore->setPlainText(QString());
ui->plainTextEditFormulaWidthAfter->setPlainText(QString());
ui->comboBoxAngle->setCurrentIndex(-1);
}
@ -717,7 +717,7 @@ void DialogPiecePath::EvalVisible()
{
labelEditFormula = ui->labelEditVisible;
QString formula = ui->plainTextEditFormulaVisible->toPlainText();
Eval(formula, m_flagFormulaVisible, ui->labelResultVisible, "", false, true);
Eval(formula, m_flagFormulaVisible, ui->labelResultVisible, QString(), false, true);
}
//---------------------------------------------------------------------------------------------------------------------
@ -806,7 +806,7 @@ void DialogPiecePath::VisibleChanged()
{
labelEditFormula = ui->labelEditVisible;
labelResultCalculation = ui->labelResultVisible;
ValFormulaChanged(m_flagFormulaVisible, ui->plainTextEditFormulaVisible, m_timerVisible, "");
ValFormulaChanged(m_flagFormulaVisible, ui->plainTextEditFormulaVisible, m_timerVisible, QString());
}
//---------------------------------------------------------------------------------------------------------------------

2
src/libs/vtools/dialogs/tools/piece/dialogpin.cpp
View File

@ -125,7 +125,7 @@ void DialogPin::ChosenObject(quint32 id, const SceneObject &type)
{
if (type == SceneObject::Point)
{
if (SetObject(id, ui->comboBoxPoint, ""))
if (SetObject(id, ui->comboBoxPoint, QString()))
{
vis->VisualMode(id);
CheckPoint();

2
src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp
View File

@ -266,7 +266,7 @@ void DialogPlaceLabel::ChosenObject(quint32 id, const SceneObject &type)
{
if (type == SceneObject::Point)
{
if (SetObject(id, ui->comboBoxPoint, ""))
if (SetObject(id, ui->comboBoxPoint, QString()))
{
vis->VisualMode(id);
CheckPoint();

2
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
View File

@ -452,7 +452,7 @@ void DialogSeamAllowance::ShowDialog(bool click)
{
if (click == false && uiTabPaths->listWidgetMainPath->count() > 0)
{
emit ToolTip("");
emit ToolTip(QString());
prepare = true;
if (not applyAllowed)

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.cpp
View File

@ -223,7 +223,7 @@ void VToolCutArc::SaveOptions(QDomElement &tag, QSharedPointer<VGObject> &obj)
//---------------------------------------------------------------------------------------------------------------------
void VToolCutArc::ReadToolAttributes(const QDomElement &domElement)
{
formula = doc->GetParametrString(domElement, AttrLength, "");
formula = doc->GetParametrString(domElement, AttrLength, QString());
curveCutId = doc->GetParametrUInt(domElement, AttrArc, NULL_ID_STR);
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.cpp
View File

@ -222,7 +222,7 @@ void VToolCutSpline::SaveOptions(QDomElement &tag, QSharedPointer<VGObject> &obj
//---------------------------------------------------------------------------------------------------------------------
void VToolCutSpline::ReadToolAttributes(const QDomElement &domElement)
{
formula = doc->GetParametrString(domElement, AttrLength, "");
formula = doc->GetParametrString(domElement, AttrLength, QString());
curveCutId = doc->GetParametrUInt(domElement, AttrSpline, NULL_ID_STR);
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.cpp
View File

@ -313,7 +313,7 @@ void VToolCutSplinePath::SaveOptions(QDomElement &tag, QSharedPointer<VGObject>
//---------------------------------------------------------------------------------------------------------------------
void VToolCutSplinePath::ReadToolAttributes(const QDomElement &domElement)
{
formula = doc->GetParametrString(domElement, AttrLength, "");
formula = doc->GetParametrString(domElement, AttrLength, QString());
curveCutId = doc->GetParametrUInt(domElement, AttrSplinePath, NULL_ID_STR);
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolalongline.cpp
View File

@ -123,7 +123,7 @@ void VToolAlongLine::ReadToolAttributes(const QDomElement &domElement)
{
m_lineType = doc->GetParametrString(domElement, AttrTypeLine, TypeLineLine);
lineColor = doc->GetParametrString(domElement, AttrLineColor, ColorBlack);
formulaLength = doc->GetParametrString(domElement, AttrLength, "");
formulaLength = doc->GetParametrString(domElement, AttrLength, QString());
basePointId = doc->GetParametrUInt(domElement, AttrFirstPoint, NULL_ID_STR);
secondPointId = doc->GetParametrUInt(domElement, AttrSecondPoint, NULL_ID_STR);
}

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolbisector.cpp
View File

@ -280,7 +280,7 @@ void VToolBisector::ReadToolAttributes(const QDomElement &domElement)
{
m_lineType = doc->GetParametrString(domElement, AttrTypeLine, TypeLineLine);
lineColor = doc->GetParametrString(domElement, AttrLineColor, ColorBlack);
formulaLength = doc->GetParametrString(domElement, AttrLength, "");
formulaLength = doc->GetParametrString(domElement, AttrLength, QString());
firstPointId = doc->GetParametrUInt(domElement, AttrFirstPoint, NULL_ID_STR);
basePointId = doc->GetParametrUInt(domElement, AttrSecondPoint, NULL_ID_STR);
thirdPointId = doc->GetParametrUInt(domElement, AttrThirdPoint, NULL_ID_STR);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolcurveintersectaxis.cpp
View File

@ -315,7 +315,7 @@ void VToolCurveIntersectAxis::ReadToolAttributes(const QDomElement &domElement)
lineColor = doc->GetParametrString(domElement, AttrLineColor, ColorBlack);
basePointId = doc->GetParametrUInt(domElement, AttrBasePoint, NULL_ID_STR);
curveId = doc->GetParametrUInt(domElement, AttrCurve, NULL_ID_STR);
formulaAngle = doc->GetParametrString(domElement, AttrAngle, "");
formulaAngle = doc->GetParametrString(domElement, AttrAngle, QString());
}
//---------------------------------------------------------------------------------------------------------------------

4
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolendline.cpp
View File

@ -208,9 +208,9 @@ void VToolEndLine::ReadToolAttributes(const QDomElement &domElement)
{
m_lineType = doc->GetParametrString(domElement, AttrTypeLine, TypeLineLine);
lineColor = doc->GetParametrString(domElement, AttrLineColor, ColorBlack);
formulaLength = doc->GetParametrString(domElement, AttrLength, "");
formulaLength = doc->GetParametrString(domElement, AttrLength, QString());
basePointId = doc->GetParametrUInt(domElement, AttrBasePoint, NULL_ID_STR);
formulaAngle = doc->GetParametrString(domElement, AttrAngle, "");
formulaAngle = doc->GetParametrString(domElement, AttrAngle, QString());
}
//---------------------------------------------------------------------------------------------------------------------

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollineintersectaxis.cpp
View File

@ -285,7 +285,7 @@ void VToolLineIntersectAxis::ReadToolAttributes(const QDomElement &domElement)
basePointId = doc->GetParametrUInt(domElement, AttrBasePoint, NULL_ID_STR);
firstPointId = doc->GetParametrUInt(domElement, AttrP1Line, NULL_ID_STR);
secondPointId = doc->GetParametrUInt(domElement, AttrP2Line, NULL_ID_STR);
formulaAngle = doc->GetParametrString(domElement, AttrAngle, "");
formulaAngle = doc->GetParametrString(domElement, AttrAngle, QString());
}
//---------------------------------------------------------------------------------------------------------------------

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolnormal.cpp
View File

@ -251,7 +251,7 @@ void VToolNormal::ReadToolAttributes(const QDomElement &domElement)
{
m_lineType = doc->GetParametrString(domElement, AttrTypeLine, TypeLineLine);
lineColor = doc->GetParametrString(domElement, AttrLineColor, ColorBlack);
formulaLength = doc->GetParametrString(domElement, AttrLength, "");
formulaLength = doc->GetParametrString(domElement, AttrLength, QString());
basePointId = doc->GetParametrUInt(domElement, AttrFirstPoint, NULL_ID_STR);
secondPointId = doc->GetParametrUInt(domElement, AttrSecondPoint, NULL_ID_STR);
angle = doc->GetParametrDouble(domElement, AttrAngle, "0");

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp
View File

@ -298,7 +298,7 @@ void VToolShoulderPoint::ReadToolAttributes(const QDomElement &domElement)
{
m_lineType = doc->GetParametrString(domElement, AttrTypeLine, TypeLineLine);
lineColor = doc->GetParametrString(domElement, AttrLineColor, ColorBlack);
formulaLength = doc->GetParametrString(domElement, AttrLength, "");
formulaLength = doc->GetParametrString(domElement, AttrLength, QString());
basePointId = doc->GetParametrUInt(domElement, AttrP1Line, NULL_ID_STR);
p2Line = doc->GetParametrUInt(domElement, AttrP2Line, NULL_ID_STR);
pShoulder = doc->GetParametrUInt(domElement, AttrPShoulder, NULL_ID_STR);

2
src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp
View File

@ -310,7 +310,7 @@ void VToolPointOfContact::SaveOptions(QDomElement &tag, QSharedPointer<VGObject>
//---------------------------------------------------------------------------------------------------------------------
void VToolPointOfContact::ReadToolAttributes(const QDomElement &domElement)
{
arcRadius = doc->GetParametrString(domElement, AttrRadius, "");
arcRadius = doc->GetParametrString(domElement, AttrRadius, QString());
center = doc->GetParametrUInt(domElement, AttrCenter, NULL_ID_STR);
firstPointId = doc->GetParametrUInt(domElement, AttrFirstPoint, NULL_ID_STR);
secondPointId = doc->GetParametrUInt(domElement, AttrSecondPoint, NULL_ID_STR);

2
src/libs/vtools/tools/drawTools/vdrawtool.h
View File

@ -250,7 +250,7 @@ QString VDrawTool::ObjectName(quint32 id) const
qCDebug(vTool, "Error! Couldn't get object name by id = %s. %s %s", qUtf8Printable(QString().setNum(id)),
qUtf8Printable(e.ErrorMessage()),
qUtf8Printable(e.DetailedInformation()));
return QString("");// Return empty string for property browser
return QString(QString());// Return empty string for property browser
}
}

2
src/libs/vtools/undocommands/deletepatternpiece.cpp
View File

@ -47,7 +47,7 @@ DeletePatternPiece::DeletePatternPiece(VAbstractPattern *doc, const QString &nam
const QDomElement previousPP = patternP.previousSibling().toElement();//find previous pattern piece
if (not previousPP.isNull() && previousPP.tagName() == VAbstractPattern::TagDraw)
{
previousPPName = doc->GetParametrString(previousPP, VAbstractPattern::AttrName, "");
previousPPName = doc->GetParametrString(previousPP, VAbstractPattern::AttrName, QString());
}
}

2
src/libs/vtools/visualization/path/vistoolcubicbezierpath.cpp
View File

@ -295,7 +295,7 @@ void VisToolCubicBezierPath::RefreshToolTip()
if (mode == Mode::Show)
{
Visualization::toolTip = "";
Visualization::toolTip = QString();
}
emit ToolTip(Visualization::toolTip);
}

2
src/libs/vtools/visualization/path/vistoolspline.cpp
View File

@ -80,7 +80,7 @@ VisToolSpline::VisToolSpline(const VContainer *data, QGraphicsItem *parent)
//---------------------------------------------------------------------------------------------------------------------
VisToolSpline::~VisToolSpline()
{
emit ToolTip("");
emit ToolTip(QString());
}
//---------------------------------------------------------------------------------------------------------------------

2
src/libs/vtools/visualization/path/vistoolsplinepath.cpp
View File

@ -63,7 +63,7 @@ VisToolSplinePath::VisToolSplinePath(const VContainer *data, QGraphicsItem *pare
//---------------------------------------------------------------------------------------------------------------------
VisToolSplinePath::~VisToolSplinePath()
{
emit ToolTip("");
emit ToolTip(QString());
}
//---------------------------------------------------------------------------------------------------------------------

24
src/test/ValentinaTest/tst_misc.cpp
View File

@ -55,18 +55,18 @@ void TST_Misc::TestRelativeFilePath_data()
<< "/home/user/patterns/pattern.val" << "/home/user/patterns/m.vit" << "m.vit";
QTest::newRow("Path to measurements is empty")
<< "/home/user/patterns/pattern.val" << "" << "";
<< "/home/user/patterns/pattern.val" << QString() << QString();
QTest::newRow("Path to a pattern file is empty. Ablosute measurements path.")
<< "" << "/home/user/patterns/m.vit" << "/home/user/patterns/m.vit";
<< QString() << "/home/user/patterns/m.vit" << "/home/user/patterns/m.vit";
QTest::newRow("Path to a pattern file is empty. Relative measurements path.")
<< "" << "measurements/m.vit" << "measurements/m.vit";
<< QString() << "measurements/m.vit" << "measurements/m.vit";
QTest::newRow("Relative measurements path.")
<< "/home/user/patterns/pattern.val" << "../measurements/m.vit" << "../measurements/m.vit";
QTest::newRow("Both paths are empty") << "" << "" << "";
QTest::newRow("Both paths are empty") << QString() << QString() << QString();
QTest::newRow("Path to measurements is relative")
<< "/home/user/patterns/pattern.val" << "m.vit" << "m.vit";
@ -114,15 +114,15 @@ void TST_Misc::TestAbsoluteFilePath_data()
QTest::newRow("Path to measurements is empty")
<< QCoreApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/pattern.val")
<< "" << "";
<< QString() << QString();
QTest::newRow("Path to a pattern file is empty. Ablosute measurements path.")
<< ""
<< QString()
<< QCoreApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/m.vit")
<< QCoreApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/m.vit");
QTest::newRow("Path to a pattern file is empty. Relative measurements path.")
<< ""
<< QString()
<< "measurements/m.vit"
<< "measurements/m.vit";
@ -131,7 +131,7 @@ void TST_Misc::TestAbsoluteFilePath_data()
<< "../measurements/m.vit"
<< QCoreApplication::applicationDirPath() + QStringLiteral("/home/user/measurements/m.vit");
QTest::newRow("Both paths are empty") << "" << "" << "";
QTest::newRow("Both paths are empty") << QString() << QString() << QString();
QTest::newRow("Path to measurements is relative")
<< QCoreApplication::applicationDirPath() + QStringLiteral("/home/user/patterns/pattern.val")
@ -153,18 +153,18 @@ void TST_Misc::TestAbsoluteFilePath_data()
<< "/home/user/patterns/pattern.val" << "m.vit" << "/home/user/patterns/m.vit";
QTest::newRow("Path to measurements is empty")
<< "/home/user/patterns/pattern.val" << "" << "";
<< "/home/user/patterns/pattern.val" << QString() << QString();
QTest::newRow("Path to a pattern file is empty. Ablosute measurements path.")
<< "" << "/home/user/patterns/m.vit" << "/home/user/patterns/m.vit";
<< QString() << "/home/user/patterns/m.vit" << "/home/user/patterns/m.vit";
QTest::newRow("Path to a pattern file is empty. Relative measurements path.")
<< "" << "measurements/m.vit" << "measurements/m.vit";
<< QString() << "measurements/m.vit" << "measurements/m.vit";
QTest::newRow("Relative measurements path.")
<< "/home/user/patterns/pattern.val" << "../measurements/m.vit" << "/home/user/measurements/m.vit";
QTest::newRow("Both paths are empty") << "" << "" << "";
QTest::newRow("Both paths are empty") << QString() << QString() << QString();
QTest::newRow("Path to measurements is relative")
<< "/home/user/patterns/pattern.val" << "m.vit" << "/home/user/patterns/m.vit";

4
src/test/ValentinaTest/tst_qmutokenparser.cpp
View File

@ -45,7 +45,7 @@ void TST_QmuTokenParser::IsSingle_data()
QTest::addColumn<QString>("formula");
QTest::addColumn<bool>("result");
QTest::newRow("Empty string") << "" << false;
QTest::newRow("Empty string") << QString() << false;
QTest::newRow("Single value") << "15.5" << true;
QTest::newRow("Two digits") << "2+2" << false;
QTest::newRow("Two digits") << "2-2" << false;
@ -53,7 +53,7 @@ void TST_QmuTokenParser::IsSingle_data()
QTest::newRow("Digit and variable") << "2+a" << false;
QTest::newRow("One variable twice") << "a+a" << false;
QTest::newRow("Two variables") << "a+b" << false;
QTest::newRow("Empty string") << "" << false;
QTest::newRow("Empty string") << QString() << false;
QTest::newRow("Several spaces") << " " << false;
QTest::newRow("Invalid formula") << "2*)))" << false;
QTest::newRow("Invalid formula") << "2*" << false;

4
src/test/ValentinaTest/tst_vspline.cpp
View File

@ -704,8 +704,8 @@ void TST_VSpline::CompareThreeWays()
VSpline spl2(spl1.GetP1(), static_cast<QPointF>(spl1.GetP2()), static_cast<QPointF>(spl1.GetP3()), spl1.GetP4(), 1);
spl2.SetApproximationScale(10);
VSpline spl3(spl1.GetP1(), spl1.GetP4(), spl1.GetStartAngle(), "", spl2.GetEndAngle(), "", spl2.GetC1Length(), "",
spl2.GetC2Length(), "", 1);
VSpline spl3(spl1.GetP1(), spl1.GetP4(), spl1.GetStartAngle(), QString(), spl2.GetEndAngle(), QString(), spl2.GetC1Length(), QString(),
spl2.GetC2Length(), QString(), 1);
spl3.SetApproximationScale(10);
QWARN("Comparing first and second splines.");

2
src/test/ValentinaTest/tst_vtranslatevars.cpp
View File

@ -132,7 +132,7 @@ void TST_VTranslateVars::PrepareValToUser(double d, const QLocale &locale)
QString formulaToUser = locale.toString(d);
if (locale.groupSeparator().isSpace())
{
formulaToUser.replace(locale.groupSeparator(), "");
formulaToUser.replace(locale.groupSeparator(), QString());
}
PrepareVal(formulaFromSystem, formulaToUser, locale);