From 791d874c9a781816f4271fc4c87c47211c2c482d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 12 Feb 2016 15:49:59 +0200 Subject: [PATCH] Little refactoring. --HG-- branch : feature --- src/app/valentina/mainwindow.cpp | 8 ++++++++ src/app/valentina/mainwindow.h | 15 +++++++-------- src/libs/vtools/dialogs/tools/dialogendline.cpp | 2 +- src/libs/vtools/tools/drawTools/vdrawtool.h | 2 -- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 80eefb518..122b2b302 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -48,6 +48,12 @@ #include "../ifc/xml/vvstconverter.h" #include "../ifc/xml/vvitconverter.h" #include "../vwidgets/vwidgetpopup.h" +#include "../vwidgets/vmaingraphicsscene.h" +#include "tools/drawTools/drawtools.h" +#include "../vtools/dialogs/tooldialogs.h" +#include "tools/vtooldetail.h" +#include "tools/vtooluniondetails.h" +#include "dialogs/dialogs.h" #include #include @@ -66,6 +72,8 @@ #include #include #include +#include +#include #if defined(Q_OS_MAC) #include diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 17d776d30..e3cfc6140 100644 --- a/src/app/valentina/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -30,17 +30,10 @@ #define MAINWINDOW_H #include "mainwindowsnogui.h" -#include "../vwidgets/vmaingraphicsview.h" -#include "../vtools/dialogs/tooldialogs.h" -#include "dialogs/dialogs.h" -#include "tools/vtooldetail.h" -#include "tools/vtooluniondetails.h" -#include "tools/drawTools/drawtools.h" #include "core/vcmdexport.h" #include "../vmisc/vlockguard.h" -#include -#include +#include namespace Ui { @@ -49,6 +42,12 @@ namespace Ui class VToolOptionsPropertyBrowser; class VMeasurements; +class VMainGraphicsScene; +class QFileSystemWatcher; +class QLabel; +class DialogIncrements; +class DialogTool; +class DialogHistory; /** * @brief The MainWindow class main windows. diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp index 668fc5a92..6f6f3df63 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp @@ -279,7 +279,7 @@ void DialogEndLine::ShowDialog(bool click) { if (click) { - /*We will ignore click if poinet is in point circle*/ + /*We will ignore click if pointer is in point circle*/ VMainGraphicsScene *scene = qobject_cast(qApp->getCurrentScene()); SCASSERT(scene != nullptr); const QSharedPointer point = data->GeometricObject(GetBasePointId()); diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index 530cf4e17..5c6512247 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -31,12 +31,10 @@ #include "../vabstracttool.h" #include "../../dialogs/tools/dialogtool.h" -#include "../vwidgets/vmaingraphicsscene.h" #include "../vwidgets/vmaingraphicsview.h" #include #include -#include /** * @brief The VDrawTool abstract class for all draw tool.