Start of bringing back missing forms/dialogs

[architektonas] / src / base / rs_graphicview.cpp

diff --git a/src/base/rs_graphicview.cpp b/src/base/rs_graphicview.cpp
index 28d86c9852815bd877e6121e38328b51cb2509bc..73500e211f8d16baef514699fc55dfb4c9550519 100644 (file)
--- a/src/base/rs_graphicview.cpp
+++ b/src/base/rs_graphicview.cpp
@@ -16,10 +16,10 @@
 
 #include <stdio.h>
 #include "rs_actioninterface.h"
-#include "rs_application.h"
 #include "rs_block.h"
-#include "rs_eventhandler.h"
+#include "rs_dialogfactory.h"
 #include "drawing.h"
+#include "rs_eventhandler.h"
 #include "rs_grid.h"
 #include "rs_insert.h"
 #include "rs_layer.h"
@@ -565,8 +565,7 @@ void RS_GraphicView::mouseReleaseEvent(QMouseEvent * e)
 
        if (eventHandler != NULL)
        {
-               if (RS2::qtToRsButtonState(e->button()) != RS2::RightButton
-                       || eventHandler->hasAction())
+               if (e->button() != Qt::RightButton || eventHandler->hasAction())
                {
                        eventHandler->mouseReleaseEvent(e);
                        //e->accept();
@@ -574,10 +573,7 @@ void RS_GraphicView::mouseReleaseEvent(QMouseEvent * e)
                else
                {
                        back();
-//#if QT_VERSION>=0x030000
                        e->accept();
-//#endif
-
                }
        }