More miscellaneous changes.

[architektonas] / src / global.cpp

diff --git a/src/global.cpp b/src/global.cpp
index f9e016fef6cd92e09ce0439750c9316476dc9678..83236414a39fd1a4fdb2886891e1c493832b39db 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -25,9 +25,9 @@ QRectF Global::selection;
 
 int Global::tool = TTNone;
 int Global::toolState = TSNone;
+bool Global::toolSuppressCrosshair = false;
 
 double Global::gridSpacing;
-int Global::currentLayer = 0;
 Point Global::snapPoint;
 bool Global::snapPointIsValid = false;
 uint32_t Global::objectID = 1;
@@ -42,6 +42,7 @@ float Global::penWidth = 1.0;
 int Global::penStyle = 1;
 uint32_t Global::penColor = 0x000000;
 bool Global::penStamp = false;
+bool Global::penDropper = false;
 
 Point Global::intersectPoint[16]; // Overkill, yes
 double Global::intersectParam[16]; // Ditto
@@ -50,6 +51,6 @@ int Global::numIntersectParams = 0;
 
 int Global::activeLayer = 0;
 int Global::numLayers = 1;
-std::vector<bool> Global::layerHidden;
-std::vector<bool> Global::layerLocked;
-std::vector<std::string> Global::layerName;
+BVector Global::layerHidden;
+BVector Global::layerLocked;
+SVector Global::layerName;