In the middle of major refactoring...

[architektonas] / src / widgets / qg_graphicview.h

diff --git a/src/widgets/qg_graphicview.h b/src/widgets/qg_graphicview.h
index af3528c14be074f90dbbcd916cc46a4985d81c08..b870809af51e246809d768aaa13defae1bd895d3 100644 (file)
--- a/src/widgets/qg_graphicview.h
+++ b/src/widgets/qg_graphicview.h
@@ -5,10 +5,10 @@
 #include "graphicview.h"
 #include "rs_layerlistlistener.h"
 #include "rs_blocklistlistener.h"
-#include "qg_scrollbar.h"
 
-class RS_Preview;
+class RS_Document;
 class PaintInterface;
+class RS_Preview;
 
 /**
  * This is the Qt implementation of a widget which can view a
@@ -17,14 +17,14 @@ class PaintInterface;
  * Instances of this class can be linked to layer lists using
  * addLayerListListener().
  */
-//class QG_GraphicView: public QWidget, public RS_GraphicView, //public Q3FilePreview,
-class QG_GraphicView: public QWidget, public GraphicView, //public Q3FilePreview,
-       public RS_LayerListListener, public RS_BlockListListener
+class QG_GraphicView: public QWidget, public GraphicView//, //public Q3FilePreview,
+//     public RS_LayerListListener, public RS_BlockListListener
 {
        Q_OBJECT
 
        public:
                QG_GraphicView(QWidget * parent = 0, const char * name = 0, Qt::WindowFlags f = 0);
+               QG_GraphicView(RS_Document * doc, QWidget * parent = 0);
                virtual ~QG_GraphicView();
 
                virtual int getWidth();
@@ -36,10 +36,12 @@ class QG_GraphicView: public QWidget, public GraphicView, //public Q3FilePreview
                virtual void setMouseCursor(RS2::CursorType c);
                virtual void updateGridStatusWidget(const QString & text);
 
+// This is just crap. Why have a klunky listener interface when we have slots/signals???
+// That's what I thought!!!
                // Methods from RS_LayerListListener Interface:
-               virtual void layerEdited(RS_Layer *);
-               virtual void layerRemoved(RS_Layer *);
-               virtual void layerToggled(RS_Layer *);
+//             virtual void layerEdited(RS_Layer *);
+//             virtual void layerRemoved(RS_Layer *);
+//             virtual void layerToggled(RS_Layer *);
 
        protected:
                virtual void emulateMouseMoveEvent();
@@ -61,23 +63,27 @@ class QG_GraphicView: public QWidget, public GraphicView, //public Q3FilePreview
 #warning "!!! File preview needs porting to Qt4 !!!"
 //             void previewUrl(const Q3Url &u);
 
+       private:
+               void CommonInitialization(void);
+
        private slots:
                void slotHScrolled(int value);
                void slotVScrolled(int value);
 
-       private:
-#warning "!!! Double buffering is not necessary anymore !!!"
-               //! Buffer for double-buffering
-               QPixmap * buffer;
+//     private:
+//#warning "!!! Double buffering is not necessary anymore !!!"
+//             //! Buffer for double-buffering
+//             QPixmap * buffer;
 //             int refCount;
 
+#if 0
        protected:
                int lastWidth;
                int lastHeight;
                //! Horizontal scrollbar.
-               QG_ScrollBar * hScrollBar;
+               QScrollBar * hScrollBar;
                //! Vertical scrollbar.
-               QG_ScrollBar * vScrollBar;
+               QScrollBar * vScrollBar;
                //! Layout used to fit in the view and the scrollbars.
                QGridLayout * layout;
                //! Label for grid spacing.
@@ -92,6 +98,7 @@ class QG_GraphicView: public QWidget, public GraphicView, //public Q3FilePreview
                QCursor * curMagnifier;
                //! Hand mouse cursor
                QCursor * curHand;
+#endif
 };
 
 #endif