From 00e98b8913e57db36d954170be41e6bc1e42e649 Mon Sep 17 00:00:00 2001
From: val177 <none@none>
Date: Fri, 4 Sep 2015 15:39:01 +0300
Subject: [PATCH] Fixed issue #345

--HG--
branch : develop
---
 src/libs/vmisc/def.h                         | 3 +++
 src/libs/vpatterndb/variables/varcradius.h   | 2 +-
 src/libs/vpatterndb/variables/vcurveangle.h  | 2 +-
 src/libs/vpatterndb/variables/vcurvelength.h | 2 +-
 src/libs/vpatterndb/variables/vlineangle.h   | 2 +-
 src/libs/vpatterndb/variables/vlinelength.h  | 2 +-
 src/libs/vpatterndb/variables/vvariable.h    | 2 +-
 src/libs/vtools/tools/drawTools/vdrawtool.h  | 4 ++--
 src/libs/vtools/tools/vabstracttool.h        | 8 ++++----
 9 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h
index c7cfdb09c..80b3ab5cd 100644
--- a/src/libs/vmisc/def.h
+++ b/src/libs/vmisc/def.h
@@ -32,6 +32,9 @@
 #include <csignal>
 #include <QtGlobal>
 #include <QStringList>
+#ifdef Q_OS_WIN
+    #include <windows.h>
+#endif /* Q_OS_WIN */
 
 #define SceneSize 50000
 #define DefPointRadius 1.5//mm
diff --git a/src/libs/vpatterndb/variables/varcradius.h b/src/libs/vpatterndb/variables/varcradius.h
index 68f53de81..f39659f75 100644
--- a/src/libs/vpatterndb/variables/varcradius.h
+++ b/src/libs/vpatterndb/variables/varcradius.h
@@ -29,7 +29,7 @@
 #ifndef VARCRADIUS_H
 #define VARCRADIUS_H
 
-#include "vcurvevariable.h"
+#include "../vpatterndb/variables/vcurvevariable.h"
 #include "../ifc/ifcdef.h"
 
 class VArc;
diff --git a/src/libs/vpatterndb/variables/vcurveangle.h b/src/libs/vpatterndb/variables/vcurveangle.h
index 4761af7fa..53cdacfc6 100644
--- a/src/libs/vpatterndb/variables/vcurveangle.h
+++ b/src/libs/vpatterndb/variables/vcurveangle.h
@@ -29,7 +29,7 @@
 #ifndef VCURVEANGLE_H
 #define VCURVEANGLE_H
 
-#include "vcurvevariable.h"
+#include "../vpatterndb/variables/vcurvevariable.h"
 
 class VAbstractCurve;
 
diff --git a/src/libs/vpatterndb/variables/vcurvelength.h b/src/libs/vpatterndb/variables/vcurvelength.h
index 3878d1ab8..adba697e4 100644
--- a/src/libs/vpatterndb/variables/vcurvelength.h
+++ b/src/libs/vpatterndb/variables/vcurvelength.h
@@ -29,7 +29,7 @@
 #ifndef VCURVELENGTH_H
 #define VCURVELENGTH_H
 
-#include "vcurvevariable.h"
+#include "../vpatterndb/variables/vcurvevariable.h"
 #include "../ifc/ifcdef.h"
 
 class VAbstractCurve;
diff --git a/src/libs/vpatterndb/variables/vlineangle.h b/src/libs/vpatterndb/variables/vlineangle.h
index acd50004c..cd15bd3ec 100644
--- a/src/libs/vpatterndb/variables/vlineangle.h
+++ b/src/libs/vpatterndb/variables/vlineangle.h
@@ -29,7 +29,7 @@
 #ifndef VLINEANGLE_H
 #define VLINEANGLE_H
 
-#include "vinternalvariable.h"
+#include "../vpatterndb/variables/vinternalvariable.h"
 
 class VPointF;
 class VLineAngleData;
diff --git a/src/libs/vpatterndb/variables/vlinelength.h b/src/libs/vpatterndb/variables/vlinelength.h
index 4a13d412e..47d9b6c5e 100644
--- a/src/libs/vpatterndb/variables/vlinelength.h
+++ b/src/libs/vpatterndb/variables/vlinelength.h
@@ -29,7 +29,7 @@
 #ifndef VLINELENGTH_H
 #define VLINELENGTH_H
 
-#include "vinternalvariable.h"
+#include "../vpatterndb/variables/vinternalvariable.h"
 #include "../ifc/ifcdef.h"
 
 class VPointF;
diff --git a/src/libs/vpatterndb/variables/vvariable.h b/src/libs/vpatterndb/variables/vvariable.h
index a97cc3da2..3fbf24c08 100644
--- a/src/libs/vpatterndb/variables/vvariable.h
+++ b/src/libs/vpatterndb/variables/vvariable.h
@@ -29,7 +29,7 @@
 #ifndef VVARIABLE_H
 #define VVARIABLE_H
 
-#include "vinternalvariable.h"
+#include "../vpatterndb/variables/vinternalvariable.h"
 #include "../ifc/ifcdef.h"
 
 class VVariableData;
diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h
index 9eb5f76e5..7cfa120cc 100644
--- a/src/libs/vtools/tools/drawTools/vdrawtool.h
+++ b/src/libs/vtools/tools/drawTools/vdrawtool.h
@@ -31,8 +31,8 @@
 
 #include "../vabstracttool.h"
 #include "../../dialogs/tools/dialogtool.h"
-#include "../../../vwidgets/vmaingraphicsscene.h"
-#include "../../../vwidgets/vmaingraphicsview.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "../vwidgets/vmaingraphicsview.h"
 
 #include <QMenu>
 #include <QGraphicsSceneContextMenuEvent>
diff --git a/src/libs/vtools/tools/vabstracttool.h b/src/libs/vtools/tools/vabstracttool.h
index 08affb508..d157d6244 100644
--- a/src/libs/vtools/tools/vabstracttool.h
+++ b/src/libs/vtools/tools/vabstracttool.h
@@ -30,10 +30,10 @@
 #define VABSTRACTTOOL_H
 
 #include "vdatatool.h"
-#include "../../ifc/xml/vabstractpattern.h"
-#include "../../vmisc/vabstractapplication.h"
-#include "../../vwidgets/vmaingraphicsscene.h"
-#include "../visualization/visualization.h"
+#include "../ifc/xml/vabstractpattern.h"
+#include "../vmisc/vabstractapplication.h"
+#include "../vwidgets/vmaingraphicsscene.h"
+#include "visualization/visualization.h"
 
 class QDomElement;
 class QLineF;