X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglobal.h;h=93ad6f7f9484a23ecdba2b373f60413b587cb37f;hb=bf5a50feb0f84a4627a65c5b82c3ca2d2eefe54b;hp=c0f019aa839ab9cba999ad0b72e3911785af9a80;hpb=6a7baa2814a8b4d0b93df776a4c99689bcfb3ffa;p=architektonas

diff --git a/src/global.h b/src/global.h
index c0f019a..93ad6f7 100644
--- a/src/global.h
+++ b/src/global.h
@@ -5,6 +5,7 @@
 // to do any instantiation shite.
 
 #include <stdint.h>
+#include <string>
 #include <vector>
 #include <QRectF>
 #include "vector.h"
@@ -13,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
 {
@@ -20,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;
@@ -44,6 +48,11 @@ class Global
 
 		static float scale;
 
+		static float penWidth;
+		static int penStyle;
+		static uint32_t penColor;
+		static bool penStamp;
+
 		static Point intersectPoint[16]; // Overkill, yes
 		static double intersectParam[16]; // Ditto
 		static int numIntersectPoints;
@@ -51,8 +60,9 @@ class Global
 
 		static int activeLayer;
 		static int numLayers;
-		static std::vector<bool> layerHidden;
-		static std::vector<bool> layerLocked;
+		static BVector layerHidden;
+		static BVector layerLocked;
+		static SVector layerName;
 };
 
 #endif	// __GLOBALS_H__