From 9433a6b358b331d83f0d61cb5090b234525f3734 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 1 Apr 2017 15:27:24 +0300 Subject: [PATCH] Refactoring. Remove unused private functions. --HG-- branch : develop --- src/app/valentina/core/vapplication.h | 2 - .../dialogs/dialogpatternproperties.cpp | 13 ------ .../dialogs/dialogpatternproperties.h | 2 - src/app/valentina/mainwindow.cpp | 41 ----------------- src/app/valentina/mainwindow.h | 2 - src/libs/ifc/xml/vpatternconverter.cpp | 44 ------------------- src/libs/ifc/xml/vpatternconverter.h | 1 - .../vtools/dialogs/tools/dialogpiecepath.h | 1 - 8 files changed, 106 deletions(-) diff --git a/src/app/valentina/core/vapplication.h b/src/app/valentina/core/vapplication.h index 1043b4bc9..18df75d3b 100644 --- a/src/app/valentina/core/vapplication.h +++ b/src/app/valentina/core/vapplication.h @@ -98,8 +98,6 @@ private: std::shared_ptr> lockLog; std::shared_ptr out; - void InitLineWidth(); - #if defined(Q_OS_WIN) && defined(Q_CC_GNU) static const QString GistFileName; diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index d9d31db32..f217e37d3 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -416,25 +416,12 @@ void DialogPatternProperties::DescEdited() descriptionChanged = true; } -//--------------------------------------------------------------------------------------------------------------------- -void DialogPatternProperties::ToggleComboBox() -{ - ui->comboBoxHeight->setEnabled(ui->radioButtonDefFromP->isChecked()); - ui->comboBoxSize->setEnabled(ui->radioButtonDefFromP->isChecked()); -} - //--------------------------------------------------------------------------------------------------------------------- void DialogPatternProperties::DefValueChanged() { defaultChanged = true; } -//--------------------------------------------------------------------------------------------------------------------- -void DialogPatternProperties::SecurityValueChanged() -{ - securityChanged = true; -} - //--------------------------------------------------------------------------------------------------------------------- void DialogPatternProperties::GeneralInfoChanged() { diff --git a/src/app/valentina/dialogs/dialogpatternproperties.h b/src/app/valentina/dialogs/dialogpatternproperties.h index cbb963d09..ecdfae10d 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.h +++ b/src/app/valentina/dialogs/dialogpatternproperties.h @@ -52,9 +52,7 @@ public: signals: void UpdateGradation(); private slots: - void ToggleComboBox(); void DefValueChanged(); - void SecurityValueChanged(); void GeneralInfoChanged(); void Apply(); void Ok(); diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index f255b341a..a7bb330a7 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -4260,21 +4260,6 @@ void MainWindow::Preferences() } } -//--------------------------------------------------------------------------------------------------------------------- -void MainWindow::CreateMeasurements() -{ - const QString tape = qApp->TapeFilePath(); - const QString workingDirectory = QFileInfo(tape).absoluteDir().absolutePath(); - - QStringList arguments; - if (isNoScaling) - { - arguments.append(QLatin1String("--") + LONG_OPTION_NO_HDPI_SCALING); - } - - QProcess::startDetached(tape, arguments, workingDirectory); -} - //--------------------------------------------------------------------------------------------------------------------- void MainWindow::ExportLayoutAs() { @@ -5055,32 +5040,6 @@ void MainWindow::ToolSelectArc() const ui->view->AllowRubberBand(false); } -//--------------------------------------------------------------------------------------------------------------------- -void MainWindow::ToolSelectElArc() const -{ - // Only true for rubber band selection - emit EnableLabelSelection(false); - emit EnablePointSelection(false); - emit EnableLineSelection(false); - emit EnableArcSelection(false); - emit EnableElArcSelection(false); - emit EnableSplineSelection(false); - emit EnableSplinePathSelection(false); - - // Hovering - emit EnableLabelHover(false); - emit EnablePointHover(false); - emit EnableLineHover(false); - emit EnableArcHover(false); - emit EnableElArcHover(true); - emit EnableSplineHover(false); - emit EnableSplinePathHover(false); - - emit ItemsSelection(SelectionType::ByMouseRelease); - - ui->view->AllowRubberBand(false); -} - //--------------------------------------------------------------------------------------------------------------------- void MainWindow::ToolSelectPointArc() const { diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 39beb5c1b..dcb5f376f 100644 --- a/src/app/valentina/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -114,7 +114,6 @@ private slots: void ToolBarStyles(); void ShowPaper(int index); void Preferences(); - void CreateMeasurements(); void ExportLayoutAs(); void ArrowTool(); @@ -363,7 +362,6 @@ private: void ToolSelectSpline() const; void ToolSelectSplinePath() const; void ToolSelectArc() const; - void ToolSelectElArc() const; void ToolSelectPointArc() const; void ToolSelectCurve() const; void ToolSelectAllDrawObjects() const; diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 162d46935..3019d03dc 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -1301,50 +1301,6 @@ QDomElement VPatternConverter::TagIncrementsV0_1_4() const return element; } -//--------------------------------------------------------------------------------------------------------------------- -QStringList VPatternConverter::ListPathPointExpressionsV0_1_4() const -{ - // TODO. Delete if minimal supported version is 0.1.4 - Q_STATIC_ASSERT_X(VPatternConverter::PatternMinVer < CONVERTER_VERSION_CHECK(0, 1, 4), - "Time to refactor the code."); - - QStringList expressions; - const QDomNodeList list = elementsByTagName(strPathPoint); - for (int i=0; i < list.size(); ++i) - { - const QDomElement dom = list.at(i).toElement(); - - try - { - expressions.append(GetParametrString(dom, strKAsm1)); - } - catch (VExceptionEmptyParameter &e) - { - Q_UNUSED(e) - } - - try - { - expressions.append(GetParametrString(dom, strKAsm2)); - } - catch (VExceptionEmptyParameter &e) - { - Q_UNUSED(e) - } - - try - { - expressions.append(GetParametrString(dom, strAngle)); - } - catch (VExceptionEmptyParameter &e) - { - Q_UNUSED(e) - } - } - - return expressions; -} - //--------------------------------------------------------------------------------------------------------------------- void VPatternConverter::FixToolUnionToV0_2_4() { diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index fe53ef5ee..cb70cf7eb 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -131,7 +131,6 @@ private: QString MUnitV0_1_4() const; QDomElement TagMeasurementsV0_1_4() const; QDomElement TagIncrementsV0_1_4() const; - QStringList ListPathPointExpressionsV0_1_4() const; void FixToolUnionToV0_2_4(); void ParseModelingToV0_2_4(const QDomElement &modeling); diff --git a/src/libs/vtools/dialogs/tools/dialogpiecepath.h b/src/libs/vtools/dialogs/tools/dialogpiecepath.h index 0ac29a37c..e6a2a4aa2 100644 --- a/src/libs/vtools/dialogs/tools/dialogpiecepath.h +++ b/src/libs/vtools/dialogs/tools/dialogpiecepath.h @@ -110,7 +110,6 @@ private: void InitSeamAllowanceTab(); void InitPassmarksTab(); void InitPathTypes(); - void InitListPieces(); void InitNodesList(); void InitPassmarksList(); void NodeAngleChanged(int index);