X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fwidgets%2Fqg_graphicview.cpp;h=7c0b632076f5eb2281be0f3a53edb0e20343c952;hb=be33e866f2121c48db93e06d743c5ae3826c1948;hp=96cdebfe222c316cc5e705e8089826eff0859aca;hpb=47beade308343557117edbae58009bf0e02833ef;p=architektonas

diff --git a/src/widgets/qg_graphicview.cpp b/src/widgets/qg_graphicview.cpp
index 96cdebf..7c0b632 100644
--- a/src/widgets/qg_graphicview.cpp
+++ b/src/widgets/qg_graphicview.cpp
@@ -20,7 +20,7 @@
 #include "rs_actionmodifydelete.h"
 #include "rs_actionselectsingle.h"
 #include "rs_dialogfactory.h"
-#include "rs_graphicview.h"
+#include "graphicview.h"
 #include "rs_preview.h"
 #include "drawing.h"
 #include "settings.h"
@@ -36,7 +36,7 @@
  * Constructor.
  */
 QG_GraphicView::QG_GraphicView(QWidget * parent, const char */*name*/, Qt::WindowFlags f):
-	QWidget(parent, f), RS_GraphicView()//, refCount(0)
+	QWidget(parent, f), GraphicView()//, refCount(0)
 {
 	setBackground(background);
 	buffer = NULL;
@@ -178,7 +178,7 @@ int QG_GraphicView::getHeight()
  */
 void QG_GraphicView::setBackground(const RS_Color & bg)
 {
-	RS_GraphicView::setBackground(bg);
+	GraphicView::setBackground(bg);
 
 //	setBackgroundColor(bg);
 	QPalette palette;
@@ -361,14 +361,14 @@ void QG_GraphicView::mousePressEvent(QMouseEvent * e)
 	if (e->button() == Qt::MidButton /*|| (e->state()==Qt::LeftButton|Qt::AltButton)*/)
 		setCurrentAction(new RS_ActionZoomPan(*container, *this));
 
-	RS_GraphicView::mousePressEvent(e);
+	GraphicView::mousePressEvent(e);
 	QWidget::mousePressEvent(e);
 }
 
 void QG_GraphicView::mouseReleaseEvent(QMouseEvent * e)
 {
 	RS_DEBUG->print("QG_GraphicView::mouseReleaseEvent");
-	RS_GraphicView::mouseReleaseEvent(e);
+	GraphicView::mouseReleaseEvent(e);
 	//QWidget::mouseReleaseEvent(e);
 
 	if (!e->isAccepted())
@@ -388,7 +388,7 @@ void QG_GraphicView::mouseMoveEvent(QMouseEvent * e)
 	//RS_DEBUG->print("QG_GraphicView::mouseMoveEvent begin");
 	//QMouseEvent rsm = QG_Qt2Rs::mouseEvent(e);
 
-	RS_GraphicView::mouseMoveEvent(e);
+	GraphicView::mouseMoveEvent(e);
 	QWidget::mouseMoveEvent(e);
 
 //What kind of cacamamie crap is this???
@@ -479,13 +479,13 @@ void QG_GraphicView::tabletEvent(QTabletEvent * e)
 
 void QG_GraphicView::leaveEvent(QEvent * e)
 {
-	RS_GraphicView::mouseLeaveEvent();
+	GraphicView::mouseLeaveEvent();
 	QWidget::leaveEvent(e);
 }
 
 void QG_GraphicView::enterEvent(QEvent * e)
 {
-	RS_GraphicView::mouseEnterEvent();
+	GraphicView::mouseEnterEvent();
 	QWidget::enterEvent(e);
 }
 
@@ -497,7 +497,7 @@ void QG_GraphicView::focusOutEvent(QFocusEvent * e)
 void QG_GraphicView::focusInEvent(QFocusEvent * e)
 {
 //printf("-->QG_GraphicView::focusInEvent(): Start. this %s focus...\n", (hasFocus() ? "has" : "DOES NOT HAVE"));
-	RS_GraphicView::mouseEnterEvent();
+	GraphicView::mouseEnterEvent();
 	QWidget::focusInEvent(e);
 //printf("-->QG_GraphicView::focusInEvent(): End.   this %s focus...\n", (hasFocus() ? "has" : "DOES NOT HAVE"));
 }
@@ -594,12 +594,12 @@ void QG_GraphicView::keyPressEvent(QKeyEvent * e)
 	if (scroll)
 		setCurrentAction(new RS_ActionZoomScroll(direction, *container, *this));
 
-	RS_GraphicView::keyPressEvent(e);
+	GraphicView::keyPressEvent(e);
 }
 
 void QG_GraphicView::keyReleaseEvent(QKeyEvent * e)
 {
-	RS_GraphicView::keyReleaseEvent(e);
+	GraphicView::keyReleaseEvent(e);
 }
 
 /**