From 8651bcadd45d805909a9c14e0e66296206ecfab9 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 26 Apr 2016 15:38:49 +0300 Subject: [PATCH 1/8] GCC warning. --HG-- branch : develop --- src/app/valentina/mainwindow.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 4125aed5d..27c5f65b4 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -1016,9 +1016,6 @@ void MainWindow::ClosedDialogGroup(int result) SCASSERT(dialogTool != nullptr); if (result == QDialog::Accepted) { - VMainGraphicsScene *scene = qobject_cast(currentScene); - SCASSERT(scene != nullptr); - DialogGroup *dialog = qobject_cast(dialogTool); SCASSERT(dialog != nullptr); const QDomElement group = doc->CreateGroup(pattern->getNextId(), dialog->GetName(), dialog->GetGroup()); From 433efd08c7bf746a9535d0325444d8314774cc11 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 26 Apr 2016 15:39:50 +0300 Subject: [PATCH 2/8] Little optimization for the layout generator. --HG-- branch : develop --- src/libs/vlayout/vlayoutpaper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/vlayout/vlayoutpaper.cpp b/src/libs/vlayout/vlayoutpaper.cpp index 593b06fc0..16aab53ba 100644 --- a/src/libs/vlayout/vlayoutpaper.cpp +++ b/src/libs/vlayout/vlayoutpaper.cpp @@ -200,7 +200,7 @@ bool VLayoutPaper::AddToSheet(const VLayoutDetail &detail, volatile bool &stop) for (int j=1; j <= d->globalContour.GlobalEdgesCount(); ++j) { - for (int i=1; i<= detail.EdgesCount(); i++) + for (int i=1; i<= detail.EdgesCount(); ++i) { VPosition *thread = new VPosition(d->globalContour, j, detail, i, &stop, d->rotate, d->rotationIncrease, d->saveLength); From afb3c20820cbab33a40097076918841b597c5233 Mon Sep 17 00:00:00 2001 From: Valentina Zhuravska Date: Mon, 2 May 2016 03:44:33 +0300 Subject: [PATCH 3/8] Resolved issue #478 --HG-- branch : develop --- share/translations/valentina.ts | 8 ++++---- share/translations/valentina_cs_CZ.ts | 4 ++-- share/translations/valentina_de_DE.ts | 4 ++-- share/translations/valentina_en_CA.ts | 8 ++++---- share/translations/valentina_en_IN.ts | 8 ++++---- share/translations/valentina_en_US.ts | 8 ++++---- share/translations/valentina_es_ES.ts | 4 ++-- share/translations/valentina_fi_FI.ts | 4 ++-- share/translations/valentina_fr_FR.ts | 4 ++-- share/translations/valentina_he_IL.ts | 4 ++-- share/translations/valentina_id_ID.ts | 4 ++-- share/translations/valentina_it_IT.ts | 4 ++-- share/translations/valentina_nl_NL.ts | 4 ++-- share/translations/valentina_pt_BR.ts | 4 ++-- share/translations/valentina_ro_RO.ts | 4 ++-- share/translations/valentina_ru_RU.ts | 8 ++++---- share/translations/valentina_uk_UA.ts | 8 ++++---- share/translations/valentina_zh_CN.ts | 4 ++-- src/app/valentina/mainwindow.ui | 4 ++-- 19 files changed, 50 insertions(+), 50 deletions(-) diff --git a/share/translations/valentina.ts b/share/translations/valentina.ts index 76e1167e0..0e7c11cc9 100644 --- a/share/translations/valentina.ts +++ b/share/translations/valentina.ts @@ -5007,8 +5007,8 @@ Do you want to save your changes? Print - Print tiled - Print tiled + Print tiled PDF + Print tiled PDF Split and print a layout into smaller pages (for regular printers) @@ -5216,8 +5216,8 @@ Do you want to save your changes? Print an original layout - Print preview tiled - Print preview tiled + Preview tiled PDF + Preview tiled PDF Print preview tiled layout diff --git a/share/translations/valentina_cs_CZ.ts b/share/translations/valentina_cs_CZ.ts index a427d86c1..11297721d 100644 --- a/share/translations/valentina_cs_CZ.ts +++ b/share/translations/valentina_cs_CZ.ts @@ -4851,7 +4851,7 @@ Chcete uložit své změny? - Print tiled + Print tiled PDF @@ -5060,7 +5060,7 @@ Chcete uložit své změny? - Print preview tiled + Preview tiled PDF diff --git a/share/translations/valentina_de_DE.ts b/share/translations/valentina_de_DE.ts index c18f8ca59..e72bc9adb 100644 --- a/share/translations/valentina_de_DE.ts +++ b/share/translations/valentina_de_DE.ts @@ -5007,7 +5007,7 @@ Sollen die Änderungen gespeichert werden? Drucken - Print tiled + Print tiled PDF Gekachelt drucken @@ -5216,7 +5216,7 @@ Sollen die Änderungen gespeichert werden? Originales Layout drucken - Print preview tiled + Preview tiled PDF Druckvorschau gekachelt diff --git a/share/translations/valentina_en_CA.ts b/share/translations/valentina_en_CA.ts index 0673666cd..c1351e376 100644 --- a/share/translations/valentina_en_CA.ts +++ b/share/translations/valentina_en_CA.ts @@ -4999,8 +4999,8 @@ Do you want to save your changes? Print - Print tiled - Print tiled + Print tiled PDF + Print tiled PDF Split and print a layout into smaller pages (for regular printers) @@ -5208,8 +5208,8 @@ Do you want to save your changes? Print an original layout - Print preview tiled - Print preview tiled + Preview tiled PDF + Preview tiled PDF Print preview tiled layout diff --git a/share/translations/valentina_en_IN.ts b/share/translations/valentina_en_IN.ts index b8bd0c7f3..db6a1b01c 100644 --- a/share/translations/valentina_en_IN.ts +++ b/share/translations/valentina_en_IN.ts @@ -4999,8 +4999,8 @@ Do you want to save your changes? Print - Print tiled - Print tiled + Print tiled PDF + Print tiled PDF Split and print a layout into smaller pages (for regular printers) @@ -5208,8 +5208,8 @@ Do you want to save your changes? Print an original layout - Print preview tiled - Print preview tiled + Preview tiled PDF + Preview tiled PDF Print preview tiled layout diff --git a/share/translations/valentina_en_US.ts b/share/translations/valentina_en_US.ts index 885231170..ac7da62e4 100644 --- a/share/translations/valentina_en_US.ts +++ b/share/translations/valentina_en_US.ts @@ -4999,8 +4999,8 @@ Do you want to save your changes? Print - Print tiled - Print tiled + Print tiled PDF + Print tiled PDF Split and print a layout into smaller pages (for regular printers) @@ -5208,8 +5208,8 @@ Do you want to save your changes? Print an original layout - Print preview tiled - Print preview tiled + Preview tiled PDF + Preview tiled PDF Print preview tiled layout diff --git a/share/translations/valentina_es_ES.ts b/share/translations/valentina_es_ES.ts index 477241a68..e003a73ac 100644 --- a/share/translations/valentina_es_ES.ts +++ b/share/translations/valentina_es_ES.ts @@ -4899,7 +4899,7 @@ Quiere guardar los cambios? - Print tiled + Print tiled PDF @@ -5108,7 +5108,7 @@ Quiere guardar los cambios? - Print preview tiled + Preview tiled PDF diff --git a/share/translations/valentina_fi_FI.ts b/share/translations/valentina_fi_FI.ts index e7733235f..909218f74 100644 --- a/share/translations/valentina_fi_FI.ts +++ b/share/translations/valentina_fi_FI.ts @@ -4851,7 +4851,7 @@ Haluatko tallentaa muutokset? - Print tiled + Print tiled PDF @@ -5060,7 +5060,7 @@ Haluatko tallentaa muutokset? - Print preview tiled + Preview tiled PDF diff --git a/share/translations/valentina_fr_FR.ts b/share/translations/valentina_fr_FR.ts index 59f58db3e..868b5c920 100644 --- a/share/translations/valentina_fr_FR.ts +++ b/share/translations/valentina_fr_FR.ts @@ -4986,7 +4986,7 @@ Voulez-vous sauvegarder les changements ? Imprimer - Print tiled + Print tiled PDF @@ -5195,7 +5195,7 @@ Voulez-vous sauvegarder les changements ? - Print preview tiled + Preview tiled PDF diff --git a/share/translations/valentina_he_IL.ts b/share/translations/valentina_he_IL.ts index 260d30ffd..89f54e41f 100644 --- a/share/translations/valentina_he_IL.ts +++ b/share/translations/valentina_he_IL.ts @@ -4330,7 +4330,7 @@ Do you want to save your changes? - Print tiled + Print tiled PDF @@ -4539,7 +4539,7 @@ Do you want to save your changes? - Print preview tiled + Preview tiled PDF diff --git a/share/translations/valentina_id_ID.ts b/share/translations/valentina_id_ID.ts index c65d977ce..f9cf0796d 100644 --- a/share/translations/valentina_id_ID.ts +++ b/share/translations/valentina_id_ID.ts @@ -4572,7 +4572,7 @@ Apakah anda ingin menyimpan perubahan anda? - Print tiled + Print tiled PDF @@ -4781,7 +4781,7 @@ Apakah anda ingin menyimpan perubahan anda? - Print preview tiled + Preview tiled PDF diff --git a/share/translations/valentina_it_IT.ts b/share/translations/valentina_it_IT.ts index 1b8ee78d8..bb456813c 100644 --- a/share/translations/valentina_it_IT.ts +++ b/share/translations/valentina_it_IT.ts @@ -5000,7 +5000,7 @@ Vuoi salvare i cambiamenti? Stampa - Print tiled + Print tiled PDF Stampa porzionato @@ -5209,7 +5209,7 @@ Vuoi salvare i cambiamenti? Stampa un layout originale - Print preview tiled + Preview tiled PDF Anteprima di stampa piastrellata diff --git a/share/translations/valentina_nl_NL.ts b/share/translations/valentina_nl_NL.ts index 965684ea0..bf4d56c99 100644 --- a/share/translations/valentina_nl_NL.ts +++ b/share/translations/valentina_nl_NL.ts @@ -4981,7 +4981,7 @@ Do you want to save your changes? Print - Print tiled + Print tiled PDF Print A0 in A4 formaat @@ -5190,7 +5190,7 @@ Do you want to save your changes? Print een originele opmaak - Print preview tiled + Preview tiled PDF Print voorbeeldweergave papierformaatindeling diff --git a/share/translations/valentina_pt_BR.ts b/share/translations/valentina_pt_BR.ts index 3b9703079..0271a50c5 100644 --- a/share/translations/valentina_pt_BR.ts +++ b/share/translations/valentina_pt_BR.ts @@ -4425,7 +4425,7 @@ Do you want to save your changes? - Print tiled + Print tiled PDF @@ -4634,7 +4634,7 @@ Do you want to save your changes? - Print preview tiled + Preview tiled PDF diff --git a/share/translations/valentina_ro_RO.ts b/share/translations/valentina_ro_RO.ts index 2dd8c297d..2e437ad1d 100644 --- a/share/translations/valentina_ro_RO.ts +++ b/share/translations/valentina_ro_RO.ts @@ -4834,7 +4834,7 @@ Do you want to save your changes? - Print tiled + Print tiled PDF @@ -5043,7 +5043,7 @@ Do you want to save your changes? - Print preview tiled + Preview tiled PDF diff --git a/share/translations/valentina_ru_RU.ts b/share/translations/valentina_ru_RU.ts index 9b26fec14..45b315615 100644 --- a/share/translations/valentina_ru_RU.ts +++ b/share/translations/valentina_ru_RU.ts @@ -4998,8 +4998,8 @@ Do you want to save your changes? Печать - Print tiled - Печать плиткой + Print tiled PDF + Печать плиткой PDF Split and print a layout into smaller pages (for regular printers) @@ -5208,8 +5208,8 @@ Do you want to save your changes? Печать оригинальной расскладки - Print preview tiled - Предварительный просмотр плиткой + Preview tiled PDF + Предварительный просмотр плиткой PDF Print preview tiled layout diff --git a/share/translations/valentina_uk_UA.ts b/share/translations/valentina_uk_UA.ts index 9472a519a..fb0900ccf 100644 --- a/share/translations/valentina_uk_UA.ts +++ b/share/translations/valentina_uk_UA.ts @@ -5000,8 +5000,8 @@ Do you want to save your changes? Друк - Print tiled - Друк плиткою + Print tiled PDF + Друк плиткою PDF Split and print a layout into smaller pages (for regular printers) @@ -5209,8 +5209,8 @@ Do you want to save your changes? Друк оригінальної розкладки - Print preview tiled - Попередній перегляд плитки + Preview tiled PDF + Попередній перегляд плитки PDF Print preview tiled layout diff --git a/share/translations/valentina_zh_CN.ts b/share/translations/valentina_zh_CN.ts index 367eff236..b72871bb2 100644 --- a/share/translations/valentina_zh_CN.ts +++ b/share/translations/valentina_zh_CN.ts @@ -4222,7 +4222,7 @@ Do you want to save your changes? - Print tiled + Print tiled PDF @@ -4431,7 +4431,7 @@ Do you want to save your changes? - Print preview tiled + Preview tiled PDF diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui index 51eb11f32..3226e1efc 100644 --- a/src/app/valentina/mainwindow.ui +++ b/src/app/valentina/mainwindow.ui @@ -2081,7 +2081,7 @@ - Print tiled + Print tiled PDF Split and print a layout into smaller pages (for regular printers) @@ -2119,7 +2119,7 @@ - Print preview tiled + Preview tiled PDF Print preview tiled layout From d795d71ae42dae2fbaceeff82fa5d70209dcfa8f Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 2 May 2016 19:38:17 +0300 Subject: [PATCH 4/8] Added link to the wiki. --HG-- branch : develop --- README.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.txt b/README.txt index 9cf2ec54b..f70203cb8 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,8 @@ Pattern making program Author Roman Telezhynskyi Copyright (C) 2013-2015 Valentina project -Valentina Web page: http://www.valentina-project.org/ +Valentina Web page: http://www.valentina-project.org/ +Wiki: https://wiki.valentinaproject.org Valentina user manual https://bitbucket.org/dismine/valentina/wiki/manual/Content Valentina main repository: https://bitbucket.org/dismine/valentina/overview Valentina mail list (forum) https://groups.google.com/forum/#!forum/valentina-project-list From 613fa5d6da07e3787fbf381aefbfa54e82dbb28a Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 2 May 2016 19:41:23 +0300 Subject: [PATCH 5/8] Fixed build on Mac OS X with Qt 5.6. Minimally supported target is now 10.7. --HG-- branch : develop --- src/app/tape/tape.pro | 2 +- src/app/valentina/valentina.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index 5cdf2052c..a04fbeb47 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -200,7 +200,7 @@ unix{ # Some macx stuff QMAKE_MAC_SDK = macosx - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 # Path to resources in app bundle #RESOURCES_DIR = "Contents/Resources" defined in translation.pri FRAMEWORKS_DIR = "Contents/Frameworks" diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index c3508774f..ece8b356e 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -252,7 +252,7 @@ unix{ # Some macx stuff QMAKE_MAC_SDK = macosx - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 # Path to resources in app bundle #RESOURCES_DIR = "Contents/Resources" defined in translation.pri FRAMEWORKS_DIR = "Contents/Frameworks" From 95bb0c054d0733098f758663fa39d2a3721ea893 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 2 May 2016 19:45:36 +0300 Subject: [PATCH 6/8] Hide Qt's warning related to the bug 'Assertion when reading an icns file'. --HG-- branch : develop --- src/app/valentina/core/vapplication.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/app/valentina/core/vapplication.cpp b/src/app/valentina/core/vapplication.cpp index c0bd9c5e7..f2355020f 100644 --- a/src/app/valentina/core/vapplication.cpp +++ b/src/app/valentina/core/vapplication.cpp @@ -87,6 +87,14 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con { type = QtDebugMsg; } + + // Hide Qt bug 'Assertion when reading an icns file' + // https://bugreports.qt.io/browse/QTBUG-45537 + // Remove after Qt fix will be released + if ((type == QtWarningMsg) && msg.contains("QICNSHandler::read()")) + { + type = QtDebugMsg; + } #endif // this is another one that doesn't make sense as just a debug message. pretty serious From 6f56b46d262fdb198840716cf39d8a8859a29faf Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 3 May 2016 19:50:37 +0300 Subject: [PATCH 7/8] Fixed Clang warnings. --HG-- branch : develop --- common.pri | 2 ++ src/app/tape/mapplication.h | 2 +- src/app/valentina/core/vapplication.h | 4 ++-- src/app/valentina/core/vformulaproperty.h | 2 +- src/app/valentina/core/vformulapropertyeditor.h | 2 +- src/app/valentina/xml/vpattern.h | 2 +- src/libs/ifc/exception/vexception.h | 2 +- src/libs/ifc/xml/vpatternconverter.h | 2 +- src/libs/ifc/xml/vvitconverter.h | 2 +- src/libs/ifc/xml/vvstconverter.h | 2 +- src/libs/vdxf/dxflib/dl_entities.h | 13 +++++++++++++ src/libs/vdxf/dxflib/dl_extrusion.h | 4 +--- src/libs/vdxf/dxflib/dl_writer_ascii.cpp | 2 +- src/libs/vformat/vmeasurements.h | 2 +- src/libs/vgeometry/varc.h | 4 ++-- src/libs/vgeometry/vellipticalarc.h | 4 ++-- src/libs/vgeometry/vspline.cpp | 2 -- src/libs/vlayout/vlayoutgenerator.cpp | 4 ++-- .../plugins/Vector3d/vvector3dproperty.h | 2 +- .../plugins/vcolorpropertyeditor.h | 2 +- .../vpropertyexplorer/plugins/vfilepropertyeditor.h | 10 +++++----- .../plugins/vshortcutpropertyeditor.h | 2 +- src/libs/vpropertyexplorer/vpropertyformview.h | 2 +- src/libs/vpropertyexplorer/vpropertymodel.h | 2 +- src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp | 4 ++-- .../vtools/dialogs/tools/dialogcubicbezierpath.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogspline.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogsplinepath.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogtool.h | 2 +- src/libs/vtools/dialogs/tools/dialogtriangle.h | 2 +- src/libs/vtools/dialogs/tools/dialoguniondetails.h | 2 +- .../tools/drawTools/toolcurve/vtoolsplinepath.cpp | 2 +- .../toolpoint/toolsinglepoint/vtoolbasepoint.h | 2 +- src/libs/vtools/tools/nodeDetails/vabstractnode.h | 2 +- src/libs/vtools/tools/nodeDetails/vnodearc.cpp | 2 -- src/libs/vtools/tools/nodeDetails/vnodepoint.cpp | 1 - src/libs/vtools/tools/nodeDetails/vnodespline.cpp | 1 - .../vtools/tools/nodeDetails/vnodesplinepath.cpp | 2 -- src/libs/vtools/tools/vtooluniondetails.cpp | 2 -- src/libs/vwidgets/vgraphicssimpletextitem.h | 2 +- 40 files changed, 59 insertions(+), 56 deletions(-) diff --git a/common.pri b/common.pri index 7ae533b01..43c450566 100644 --- a/common.pri +++ b/common.pri @@ -301,6 +301,7 @@ CLANG_DEBUG_CXXFLAGS += \ -Wbad-array-new-length \ -Wbad-function-cast \ -Wbind-to-temporary-copy \ + -Wno-c++98-compat-bind-to-temporary-copy \ -Wbitfield-constant-conversion \ -Wbitwise-op-parentheses \ -Wbool-conversion \ @@ -446,6 +447,7 @@ CLANG_DEBUG_CXXFLAGS += \ -Wliteral-conversion \ -Wliteral-range \ -Wlocal-type-template-args \ + -Wno-c++98-compat-local-type-template-args \ -Wlogical-not-parentheses \ -Wlogical-op-parentheses \ -Wlong-long \ diff --git a/src/app/tape/mapplication.h b/src/app/tape/mapplication.h index 6efda298b..17cd27d84 100644 --- a/src/app/tape/mapplication.h +++ b/src/app/tape/mapplication.h @@ -57,7 +57,7 @@ public: virtual bool notify(QObject * receiver, QEvent * event) Q_DECL_OVERRIDE; bool IsTestMode() const; - virtual bool IsAppInGUIMode() const; + virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE; TMainWindow *MainWindow(); QList MainWindows(); diff --git a/src/app/valentina/core/vapplication.h b/src/app/valentina/core/vapplication.h index 5edc5fd8f..ccfad04fd 100644 --- a/src/app/valentina/core/vapplication.h +++ b/src/app/valentina/core/vapplication.h @@ -71,14 +71,14 @@ public: void StartLogging(); QTextStream *LogFile(); - virtual const VTranslateVars *TrVars(); + virtual const VTranslateVars *TrVars() Q_DECL_OVERRIDE; #if defined(Q_OS_WIN) && defined(Q_CC_GNU) static void DrMingw(); void CollectReports() const; #endif // defined(Q_OS_WIN) && defined(Q_CC_GNU) bool static IsGUIMode(); - virtual bool IsAppInGUIMode() const; + virtual bool IsAppInGUIMode() const Q_DECL_OVERRIDE; virtual void OpenSettings() Q_DECL_OVERRIDE; VSettings *ValentinaSettings(); diff --git a/src/app/valentina/core/vformulaproperty.h b/src/app/valentina/core/vformulaproperty.h index e6c5dcf6f..4a8c0525b 100644 --- a/src/app/valentina/core/vformulaproperty.h +++ b/src/app/valentina/core/vformulaproperty.h @@ -43,7 +43,7 @@ public: virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; //! Returns item flags - Qt::ItemFlags flags(int column = DPC_Name) const; + virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE; //! Returns an editor widget, or NULL if it doesn't supply one //! \param parent The widget to which the editor will be added as a child diff --git a/src/app/valentina/core/vformulapropertyeditor.h b/src/app/valentina/core/vformulapropertyeditor.h index 062d5b380..a8dbdc09e 100644 --- a/src/app/valentina/core/vformulapropertyeditor.h +++ b/src/app/valentina/core/vformulapropertyeditor.h @@ -52,7 +52,7 @@ public: VFormula GetFormula() const; //! Needed for proper event handling - bool eventFilter(QObject *obj, QEvent *ev); + virtual bool eventFilter(QObject *obj, QEvent *ev) Q_DECL_OVERRIDE; signals: //! This is emitted, when the user changes the color diff --git a/src/app/valentina/xml/vpattern.h b/src/app/valentina/xml/vpattern.h index 92c57cd13..a08c7b362 100644 --- a/src/app/valentina/xml/vpattern.h +++ b/src/app/valentina/xml/vpattern.h @@ -93,7 +93,7 @@ public: static const QString AttrReadOnly; public slots: - void LiteParseTree(const Document &parse); + virtual void LiteParseTree(const Document &parse) Q_DECL_OVERRIDE; protected: virtual void customEvent(QEvent * event) Q_DECL_OVERRIDE; diff --git a/src/libs/ifc/exception/vexception.h b/src/libs/ifc/exception/vexception.h index c3fb3e056..20e79217a 100644 --- a/src/libs/ifc/exception/vexception.h +++ b/src/libs/ifc/exception/vexception.h @@ -54,7 +54,7 @@ public: QString WhatUtf8() const V_NOEXCEPT_EXPR (true); void AddMoreInformation(const QString &info); QString MoreInformation() const; - virtual const char* what() const V_NOEXCEPT_EXPR (true); + virtual const char* what() const V_NOEXCEPT_EXPR (true) Q_DECL_OVERRIDE; protected: /** @brief error string with error */ diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 1a4de28d8..9cf256872 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -48,7 +48,7 @@ protected: virtual QString MinVerStr() const Q_DECL_OVERRIDE; virtual QString MaxVerStr() const Q_DECL_OVERRIDE; - QString XSDSchema(int ver) const; + virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE; virtual void ApplyPatches() Q_DECL_OVERRIDE; virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE; diff --git a/src/libs/ifc/xml/vvitconverter.h b/src/libs/ifc/xml/vvitconverter.h index befde03e0..ac6fa638e 100644 --- a/src/libs/ifc/xml/vvitconverter.h +++ b/src/libs/ifc/xml/vvitconverter.h @@ -48,7 +48,7 @@ protected: virtual QString MinVerStr() const Q_DECL_OVERRIDE; virtual QString MaxVerStr() const Q_DECL_OVERRIDE; - QString XSDSchema(int ver) const; + virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE; virtual void ApplyPatches() Q_DECL_OVERRIDE; virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE; diff --git a/src/libs/ifc/xml/vvstconverter.h b/src/libs/ifc/xml/vvstconverter.h index e6ed806ee..2d1672250 100644 --- a/src/libs/ifc/xml/vvstconverter.h +++ b/src/libs/ifc/xml/vvstconverter.h @@ -48,7 +48,7 @@ protected: virtual QString MinVerStr() const Q_DECL_OVERRIDE; virtual QString MaxVerStr() const Q_DECL_OVERRIDE; - QString XSDSchema(int ver) const; + virtual QString XSDSchema(int ver) const Q_DECL_OVERRIDE; virtual void ApplyPatches() Q_DECL_OVERRIDE; virtual void DowngradeToCurrentMaxVersion() Q_DECL_OVERRIDE; diff --git a/src/libs/vdxf/dxflib/dl_entities.h b/src/libs/vdxf/dxflib/dl_entities.h index ca2248809..34a16202d 100644 --- a/src/libs/vdxf/dxflib/dl_entities.h +++ b/src/libs/vdxf/dxflib/dl_entities.h @@ -844,6 +844,19 @@ struct DXFLIB_EXPORT DL_TextData angle(angle) {} + DL_TextData(const DL_TextData &d) + : ipx(d.ipx), ipy(d.ipy), ipz(d.ipz), + apx(d.apx), apy(d.apy), apz(d.apz), + height(d.height), xScaleFactor(d.xScaleFactor), + textGenerationFlags(d.textGenerationFlags), + hJustification(d.hJustification), + vJustification(d.vJustification), + text(d.text), + style(d.style), + angle(d.angle) + { + } + virtual ~DL_TextData() {} diff --git a/src/libs/vdxf/dxflib/dl_extrusion.h b/src/libs/vdxf/dxflib/dl_extrusion.h index 2ab9ca427..46eb8bdff 100644 --- a/src/libs/vdxf/dxflib/dl_extrusion.h +++ b/src/libs/vdxf/dxflib/dl_extrusion.h @@ -67,8 +67,6 @@ public: /** * Constructor for DXF extrusion. * - * @param direction Vector of axis along which the entity shall be extruded - * this is also the Z axis of the Entity coordinate system * @param elevation Distance of the entities XY plane from the origin of the * world coordinate system */ @@ -103,7 +101,7 @@ public: /** - * @return direction vector. + * @param dir vector. */ void getDirection(double dir[]) const { diff --git a/src/libs/vdxf/dxflib/dl_writer_ascii.cpp b/src/libs/vdxf/dxflib/dl_writer_ascii.cpp index bb90536e6..ccc27e834 100644 --- a/src/libs/vdxf/dxflib/dl_writer_ascii.cpp +++ b/src/libs/vdxf/dxflib/dl_writer_ascii.cpp @@ -79,7 +79,7 @@ void DL_WriterA::dxfReal(int gc, double value) const // Cut away those zeros at the end: bool dot = false; int end = -1; - for (quint32 i=0, sz = strlen(str); i(strlen(str)); i GetPoints () const; + virtual QVector GetPoints () const Q_DECL_OVERRIDE; QPointF CutArc (const qreal &length, VArc &arc1, VArc &arc2) const; QPointF CutArc (const qreal &length) const; virtual void setId(const quint32 &id) Q_DECL_OVERRIDE; diff --git a/src/libs/vgeometry/vellipticalarc.h b/src/libs/vgeometry/vellipticalarc.h index b2d608c20..a52ac3884 100644 --- a/src/libs/vgeometry/vellipticalarc.h +++ b/src/libs/vgeometry/vellipticalarc.h @@ -81,14 +81,14 @@ public: QString GetFormulaLength () const; void SetFormulaLength (const QString &formula, qreal value); - qreal GetLength () const; + virtual qreal GetLength () const Q_DECL_OVERRIDE; QPointF GetP1() const; QPointF GetP2 () const; qreal AngleArc() const; QVector GetAngles () const; - QVector GetPoints () const; + virtual QVector GetPoints () const Q_DECL_OVERRIDE; QPointF CutArc (const qreal &length, VEllipticalArc &arc1, VEllipticalArc &arc2) const; QPointF CutArc (const qreal &length) const; virtual void setId(const quint32 &id) Q_DECL_OVERRIDE; diff --git a/src/libs/vgeometry/vspline.cpp b/src/libs/vgeometry/vspline.cpp index 9fb3eef30..51d1b839a 100644 --- a/src/libs/vgeometry/vspline.cpp +++ b/src/libs/vgeometry/vspline.cpp @@ -96,8 +96,6 @@ VSpline::VSpline (VPointF p1, QPointF p2, QPointF p3, VPointF p4, quint32 idObje * @param c1LengthFormula formula length from first point to first control point. * @param c2Length length from second point to first control point. * @param c2LengthFormula formula length from second point to first control point. - * @param idObject - * @param mode */ VSpline::VSpline(VPointF p1, VPointF p4, qreal angle1, const QString &angle1Formula, qreal angle2, const QString &angle2Formula, qreal c1Length, const QString &c1LengthFormula, qreal c2Length, diff --git a/src/libs/vlayout/vlayoutgenerator.cpp b/src/libs/vlayout/vlayoutgenerator.cpp index 99ec8dc1f..c914057ee 100644 --- a/src/libs/vlayout/vlayoutgenerator.cpp +++ b/src/libs/vlayout/vlayoutgenerator.cpp @@ -299,7 +299,7 @@ void VLayoutGenerator::GatherPages() VLayoutPaper paper(PageHeight(), PageWidth()); paper.SetShift(shift); paper.SetLayoutWidth(bank->GetLayoutWidth()); - paper.SetPaperIndex(i); + paper.SetPaperIndex(static_cast(i)); paper.SetRotate(rotate); paper.SetRotationIncrease(rotationIncrease); paper.SetSaveLength(saveLength); @@ -361,7 +361,7 @@ void VLayoutGenerator::UnitePages() VLayoutPaper paper(qFloor(papersLength.at(i)), PageWidth()); paper.SetShift(shift); paper.SetLayoutWidth(bank->GetLayoutWidth()); - paper.SetPaperIndex(i); + paper.SetPaperIndex(static_cast(i)); paper.SetRotate(rotate); paper.SetRotationIncrease(rotationIncrease); paper.SetSaveLength(saveLength); diff --git a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h index 0da181c86..eb256f78f 100644 --- a/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h +++ b/src/libs/vpropertyexplorer/plugins/Vector3d/vvector3dproperty.h @@ -61,7 +61,7 @@ public: virtual QVariant data (int column = DPC_Name, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; //! Returns item flags - Qt::ItemFlags flags(int column = DPC_Name) const; + virtual Qt::ItemFlags flags(int column = DPC_Name) const Q_DECL_OVERRIDE; //! Returns the Vector3d virtual Vector3D getVector() const; diff --git a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h index bbd7b0e40..05760823c 100644 --- a/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h +++ b/src/libs/vpropertyexplorer/plugins/vcolorpropertyeditor.h @@ -59,7 +59,7 @@ public: static QString GetColorString(const QColor& color); //! Needed for proper event handling - bool eventFilter(QObject *obj, QEvent *ev); + virtual bool eventFilter(QObject *obj, QEvent *ev) Q_DECL_OVERRIDE; signals: //! This is emitted, when the user changes the color diff --git a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h index a6fcbf9b4..da0ce3e17 100644 --- a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h +++ b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h @@ -45,7 +45,7 @@ public: QString getFile() const; //! Needed for proper event handling - bool eventFilter(QObject* obj, QEvent* ev); + virtual bool eventFilter(QObject* obj, QEvent* ev) Q_DECL_OVERRIDE; //! Returns the directory/file setting //! \return True, if a directory dialog is being shown, false if a file dialog @@ -82,10 +82,10 @@ private slots: void onToolButtonClicked(); protected: - void dragEnterEvent(QDragEnterEvent* event); - void dragMoveEvent(QDragMoveEvent* event); - void dragLeaveEvent(QDragLeaveEvent* event); - void dropEvent(QDropEvent* event); + virtual void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE; + virtual void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE; + virtual void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE; + virtual void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE; //! This function checks the mime data, if it is compatible with the filters virtual bool checkMimeData(const QMimeData* data, QString& getFile) const; diff --git a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h index db75b531c..fa85aa7f8 100644 --- a/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h +++ b/src/libs/vpropertyexplorer/plugins/vshortcutpropertyeditor.h @@ -41,7 +41,7 @@ public: virtual ~VShortcutEditWidget() Q_DECL_OVERRIDE; //! Needed for proper event handling - bool eventFilter(QObject* obj, QEvent* evenvt); + virtual bool eventFilter(QObject* obj, QEvent* evenvt) Q_DECL_OVERRIDE; //! Returns the currently set shortcut QString getShortcutAsString() const; diff --git a/src/libs/vpropertyexplorer/vpropertyformview.h b/src/libs/vpropertyexplorer/vpropertyformview.h index 3b5573b41..abe3c7592 100644 --- a/src/libs/vpropertyexplorer/vpropertyformview.h +++ b/src/libs/vpropertyexplorer/vpropertyformview.h @@ -84,7 +84,7 @@ private slots: void dataSubmitted(VProperty* property); protected: - void showEvent(QShowEvent* event); + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; //! Rebuilds the widegt only if it is visible void updatePropertyList(); diff --git a/src/libs/vpropertyexplorer/vpropertymodel.h b/src/libs/vpropertyexplorer/vpropertymodel.h index aebb5938f..485ab088b 100644 --- a/src/libs/vpropertyexplorer/vpropertymodel.h +++ b/src/libs/vpropertyexplorer/vpropertymodel.h @@ -75,7 +75,7 @@ public: virtual VProperty* getProperty(const QString& id); //! Returns the item flags for the given index - virtual Qt::ItemFlags flags (const QModelIndex& index) const; + virtual Qt::ItemFlags flags (const QModelIndex& index) const Q_DECL_OVERRIDE; //! Sets the role data for the item at index to value virtual bool setData (const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp index ae71ca539..c33761b7e 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp @@ -192,8 +192,8 @@ void DialogCubicBezier::PointNameChanged() if (not data->IsUnique(spline.name())) { - newDuplicate = DNumber(spline.name()); - spline.SetDuplicate(newDuplicate); + newDuplicate = static_cast(DNumber(spline.name())); + spline.SetDuplicate(static_cast(newDuplicate)); } ui->lineEditSplineName->setText(spline.name()); } diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp index 24ffff2b6..a53098c78 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp @@ -229,8 +229,8 @@ void DialogCubicBezierPath::currentPointChanged(int index) if (not data->IsUnique(newPath.name())) { - newDuplicate = DNumber(newPath.name()); - newPath.SetDuplicate(newDuplicate); + newDuplicate = static_cast(DNumber(newPath.name())); + newPath.SetDuplicate(static_cast(newDuplicate)); } ui->lineEditSplPathName->setText(newPath.name()); diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index fdc42c3e1..2a893b92e 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -483,8 +483,8 @@ void DialogSpline::PointNameChanged() if (not data->IsUnique(spline.name())) { - newDuplicate = DNumber(spline.name()); - spline.SetDuplicate(newDuplicate); + newDuplicate = static_cast(DNumber(spline.name())); + spline.SetDuplicate(static_cast(newDuplicate)); } ui->lineEditSplineName->setText(spline.name()); } diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index abf519d32..1a4771378 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -677,8 +677,8 @@ void DialogSplinePath::currentPointChanged(int index) if (not data->IsUnique(newPath.name())) { - newDuplicate = DNumber(newPath.name()); - newPath.SetDuplicate(newDuplicate); + newDuplicate = static_cast(DNumber(newPath.name())); + newPath.SetDuplicate(static_cast(newDuplicate)); } ui->lineEditSplPathName->setText(newPath.name()); diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index 2eeec1370..e1c51a5da 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -250,7 +250,7 @@ protected: */ virtual void SaveData() {} void MoveCursorToEnd(QPlainTextEdit *plainTextEdit); - bool eventFilter(QObject *object, QEvent *event); + virtual bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; quint32 DNumber(const QString &baseName) const; private: void FillList(QComboBox *box, const QMap &list)const; diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.h b/src/libs/vtools/dialogs/tools/dialogtriangle.h index 01ad7c42b..8fd47ee2b 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.h +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.h @@ -63,7 +63,7 @@ public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; virtual void PointNameChanged() Q_DECL_OVERRIDE; protected: - virtual void ShowVisualization(); + virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables */ diff --git a/src/libs/vtools/dialogs/tools/dialoguniondetails.h b/src/libs/vtools/dialogs/tools/dialoguniondetails.h index 03c6e7f86..5f7290d6a 100644 --- a/src/libs/vtools/dialogs/tools/dialoguniondetails.h +++ b/src/libs/vtools/dialogs/tools/dialoguniondetails.h @@ -51,7 +51,7 @@ public: int getIndexD1() const; int getIndexD2() const; public slots: - void ChosenObject(quint32 id, const SceneObject &type); + virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; private: Q_DISABLE_COPY(DialogUnionDetails) diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index 17dc867dd..2456396d9 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -289,7 +289,7 @@ void VToolSplinePath::SetSplinePathAttributes(QDomElement &domElement, const VSp /** * @brief UpdatePathPoints update spline path in pattern file. * @param doc dom document container. - * @param node tag in file. + * @param element tag in file. * @param path spline path. */ void VToolSplinePath::UpdatePathPoints(VAbstractPattern *doc, QDomElement &element, const VSplinePath &path) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h index e817dc982..5c6b57f60 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolbasepoint.h @@ -63,7 +63,7 @@ signals: protected: virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ) Q_DECL_OVERRIDE; virtual void AddToFile() Q_DECL_OVERRIDE; - QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); + virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; virtual void DeleteTool(bool ask = true) Q_DECL_OVERRIDE; virtual void SaveDialog(QDomElement &domElement) Q_DECL_OVERRIDE; virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent * event ) Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/tools/nodeDetails/vabstractnode.h b/src/libs/vtools/tools/nodeDetails/vabstractnode.h index 9ebc987ce..ac9119b08 100644 --- a/src/libs/vtools/tools/nodeDetails/vabstractnode.h +++ b/src/libs/vtools/tools/nodeDetails/vabstractnode.h @@ -69,7 +69,7 @@ protected: QColor currentColor; void AddToModeling(const QDomElement &domElement); - virtual void SetVisualization() {} + virtual void SetVisualization() Q_DECL_OVERRIDE {} virtual void ShowNode()=0; virtual void HideNode()=0; diff --git a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp index d252c5a24..a0f53931a 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodearc.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodearc.cpp @@ -44,7 +44,6 @@ const QString VNodeArc::ToolType = QStringLiteral("modeling"); * @param typeCreation way we create this tool. * @param idTool tool id. * @param qoParent QObject parent - * @param parent parent object. */ VNodeArc::VNodeArc(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Source &typeCreation, const quint32 &idTool, QObject *qoParent) @@ -63,7 +62,6 @@ VNodeArc::VNodeArc(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 * @param parse parser file mode. * @param typeCreation way we create this tool. * @param idTool tool id. - * @param parent QObject parent */ void VNodeArc::Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idArc, const Document &parse, const Source &typeCreation, const quint32 &idTool) diff --git a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp index ba8215936..9b22b2337 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodepoint.cpp @@ -77,7 +77,6 @@ VNodePoint::VNodePoint(VAbstractPattern *doc, VContainer *data, quint32 id, quin * @param parse parser file mode. * @param typeCreation way we create this tool. * @param idTool tool id. - * @param parent QObject parent */ void VNodePoint::Create(VAbstractPattern *doc, VContainer *data, VMainGraphicsScene *scene, quint32 id, quint32 idPoint, const Document &parse, diff --git a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp index 393c63cfd..2690e01df 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodespline.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodespline.cpp @@ -44,7 +44,6 @@ const QString VNodeSpline::ToolType = QStringLiteral("modelingSpline"); * @param typeCreation way we create this tool. * @param idTool id node. * @param qoParent QObject parent. - * @param parent QGraphicsItem parent. */ VNodeSpline::VNodeSpline(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Source &typeCreation, const quint32 &idTool, QObject *qoParent) diff --git a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp index 32ffdda54..91a7f7e4d 100644 --- a/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp +++ b/src/libs/vtools/tools/nodeDetails/vnodesplinepath.cpp @@ -45,7 +45,6 @@ const QString VNodeSplinePath::ToolType = QStringLiteral("modelingPath"); * @param typeCreation way we create this tool. * @param idTool tool id. * @param qoParent QObject parent. - * @param parent parent object. */ VNodeSplinePath::VNodeSplinePath(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Source &typeCreation, const quint32 &idTool, QObject *qoParent) @@ -64,7 +63,6 @@ VNodeSplinePath::VNodeSplinePath(VAbstractPattern *doc, VContainer *data, quint3 * @param parse parser file mode. * @param typeCreation way we create this tool. * @param idTool tool id. - * @param parent QObject parent. */ void VNodeSplinePath::Create(VAbstractPattern *doc, VContainer *data, quint32 id, quint32 idSpline, const Document &parse, const Source &typeCreation, const quint32 &idTool) diff --git a/src/libs/vtools/tools/vtooluniondetails.cpp b/src/libs/vtools/tools/vtooluniondetails.cpp index f0706e462..585dd541b 100644 --- a/src/libs/vtools/tools/vtooluniondetails.cpp +++ b/src/libs/vtools/tools/vtooluniondetails.cpp @@ -90,7 +90,6 @@ VToolUnionDetails::VToolUnionDetails(VAbstractPattern *doc, VContainer *data, co //--------------------------------------------------------------------------------------------------------------------- /** * @brief AddToNewDetail create united detail adding one node per time. - * @param tool tool that make union. * @param doc dom document container. * @param data container with variables. * @param newDetail united detail. @@ -278,7 +277,6 @@ void VToolUnionDetails::AddToNewDetail(VMainGraphicsScene *scene, VAbstractPatte //--------------------------------------------------------------------------------------------------------------------- /** * @brief UpdatePoints update data for united details. - * @param idDetail id united detail. * @param data container with variables. * @param det detail what we union. * @param i index node in detail. diff --git a/src/libs/vwidgets/vgraphicssimpletextitem.h b/src/libs/vwidgets/vgraphicssimpletextitem.h index 031879075..44c164e04 100644 --- a/src/libs/vwidgets/vgraphicssimpletextitem.h +++ b/src/libs/vwidgets/vgraphicssimpletextitem.h @@ -65,7 +65,7 @@ signals: void PointChoosed(); void PointSelected(bool selected); protected: - QVariant itemChange ( GraphicsItemChange change, const QVariant &value ); + virtual QVariant itemChange ( GraphicsItemChange change, const QVariant &value ) Q_DECL_OVERRIDE; virtual void hoverEnterEvent ( QGraphicsSceneHoverEvent *event ) Q_DECL_OVERRIDE; virtual void hoverLeaveEvent ( QGraphicsSceneHoverEvent *event ) Q_DECL_OVERRIDE; virtual void contextMenuEvent ( QGraphicsSceneContextMenuEvent *event ) Q_DECL_OVERRIDE; From cc84b6e7d6c4f24cb33565fd2f5412f3763c8b4d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 3 May 2016 20:13:17 +0300 Subject: [PATCH 8/8] Fix problem with updating localization. --HG-- branch : develop --- src/app/translations.pri | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/translations.pri b/src/app/translations.pri index 0753c96a4..82335c869 100755 --- a/src/app/translations.pri +++ b/src/app/translations.pri @@ -61,6 +61,7 @@ for(_translation_name, INSTALL_TRANSLATIONS) { } system(rm -fv $${OUT_PWD}/$$DESTDIR/translations/*.qm) } + QMAKE_CLEAN += $$shell_path($$_translation_name) } }