Beginnings of new render path (Snapper)...

[architektonas] / src / mainapp / graphicview.h

diff --git a/src/mainapp/graphicview.h b/src/mainapp/graphicview.h
index 8af908b314e60d84dd8ceedb91d82d48ed4655da..e2d7b5456a39912eaee93d74764e3b3d07960c2c 100644 (file)
--- a/src/mainapp/graphicview.h
+++ b/src/mainapp/graphicview.h
@@ -4,6 +4,7 @@
 #include <QtGui>
 #include "rs.h"
 #include "rs_color.h"
+#include "rs_snapper.h"
 #include "vector.h"
 
 class Drawing;
@@ -18,7 +19,6 @@ class RS_Preview;
 class RS_Grid;
 class RS_Pen;
 class RS_EventHandler;
-class QG_ScrollBar;
 
 class GraphicView
 {
@@ -283,6 +283,11 @@ class GraphicView
                //! Last position (for rapid move)
                Vector simulationLast;
 
+       public://for now
+               // We use this here instead of deriving ActionInterface from it because
+               // this makes more sense.
+               RS_Snapper snapper;
+
        protected:
                // crap to make painting with update() possible
                RS_Preview * previewEntity;
@@ -298,11 +303,11 @@ class GraphicView
                int lastWidth;
                int lastHeight;
                //! Horizontal scrollbar.
-               QG_ScrollBar * hScrollBar;
+               QScrollBar * hScrollBar;
                //! Vertical scrollbar.
-               QG_ScrollBar * vScrollBar;
-               //! Layout used to fit in the view and the scrollbars.
-               QGridLayout * layout;
+               QScrollBar * vScrollBar;
+//             //! Layout used to fit in the view and the scrollbars.
+//             QGridLayout * layout;
                //! Label for grid spacing.
                QLabel * gridStatus;
                //! CAD mouse cursor