More miscellaneous changes.

[architektonas] / src / global.h

diff --git a/src/global.h b/src/global.h
index cdcd204e800d153b67ce45eb39f0073b41b3a4e3..18faa979093537e3a42e03201362220fa5ed3e56 100644 (file)
--- a/src/global.h
+++ b/src/global.h
@@ -14,6 +14,10 @@ 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
 {
@@ -37,6 +41,7 @@ class Global
                static uint32_t objectID;
                static int tool;
                static int toolState;
+               static bool toolSuppressCrosshair;
 
                static Point origin;
                static double zoom;
@@ -48,6 +53,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
@@ -56,10 +62,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__
-