X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglobal.h;h=6418b7f92587bdcec5730ed0fc811f73a38d7dff;hb=refs%2Fheads%2Fmaster;hp=06c04e80d288c688e91826f473b648bf2a207e3d;hpb=790c1a6d97f73f7457c7fad7e82fa29e5b6accd5;p=architektonas

diff --git a/src/global.h b/src/global.h
index 06c04e8..6418b7f 100644
--- a/src/global.h
+++ b/src/global.h
@@ -7,21 +7,24 @@
 #include <stdint.h>
 #include <string>
 #include <vector>
-#include <QRectF>
+#include "rect.h"
 #include "vector.h"
 
 class QFont;
 
 enum LineStyle { LSNone, LSSolid, LSDash, LSDot, LSDashDot, LSDashDotDot };
 
+typedef std::vector<void *> VPVector;
+typedef std::vector<void *>::iterator VPVectorIter;
+typedef std::vector<bool> BVector;
+typedef std::vector<std::string> SVector;
 
 class Global
 {
 	public:
 		static double gridSpacing;
 		static bool selectionInProgress;
-		static QRectF selection;
-		static int currentLayer;
+		static Rect selection;
 		static QFont * font;
 		static Point snapPoint;
 		static bool snapPointIsValid;
@@ -38,6 +41,10 @@ class Global
 		static uint32_t objectID;
 		static int tool;
 		static int toolState;
+		static bool toolSuppressCrosshair;
+		static double parallelDist;
+		static int parallelNum;
+		static int parallelBU;
 
 		static Point origin;
 		static double zoom;
@@ -49,6 +56,7 @@ class Global
 		static int penStyle;
 		static uint32_t penColor;
 		static bool penStamp;
+		static bool penDropper;
 
 		static Point intersectPoint[16]; // Overkill, yes
 		static double intersectParam[16]; // Ditto
@@ -57,10 +65,9 @@ class Global
 
 		static int activeLayer;
 		static int numLayers;
-		static std::vector<bool> layerHidden;
-		static std::vector<bool> layerLocked;
-		static std::vector<std::string> layerName;
+		static BVector layerHidden;
+		static BVector layerLocked;
+		static SVector layerName;
 };
 
 #endif	// __GLOBALS_H__
-