]> Shamusworld >> Repos - architektonas/blobdiff - src/global.h
Whitespace changes. :-P
[architektonas] / src / global.h
index 06c04e80d288c688e91826f473b648bf2a207e3d..796cc45944f8dd4bb2df10234554e29b199f39b3 100644 (file)
@@ -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
 {
@@ -21,7 +25,6 @@ class Global
                static double gridSpacing;
                static bool selectionInProgress;
                static QRectF selection;
-               static int currentLayer;
                static QFont * font;
                static Point snapPoint;
                static bool snapPointIsValid;
@@ -49,6 +52,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 +61,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__
-