[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/ui
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2010-11-20 10:31:31
Message-ID: 20101120103131.678CFAC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199004 by rempt:

remove deprecated qt3 stuff

 M  +21 -11    kis_popup_palette.cpp  


--- trunk/koffice/krita/ui/kis_popup_palette.cpp #1199003:1199004
@@ -40,17 +40,23 @@
         QMouseEvent* mouseEvent = 0;
         switch(event->type())
         {
-            case QEvent::TabletPress: mouseEvent = new \
                QMouseEvent(QEvent::MouseButtonPress, event->pos(),
-                                                                Qt::LeftButton, \
event->modifiers()); +        case QEvent::TabletPress:
+            mouseEvent = new QMouseEvent(QEvent::MouseButtonPress, event->pos(),
+                                         Qt::LeftButton, Qt::LeftButton, \
event->modifiers());  m_dragging = true;
                                       mousePressEvent(mouseEvent);
                                       break;
-            case QEvent::TabletMove: mouseEvent = new QMouseEvent(QEvent::MouseMove, \
event->pos(), +        case QEvent::TabletMove:
+            mouseEvent = new QMouseEvent(QEvent::MouseMove, event->pos(),
+                                         (m_dragging) ? Qt::LeftButton : \
                Qt::NoButton,
                                                                   (m_dragging) ? \
Qt::LeftButton : Qt::NoButton, event->modifiers());  mouseMoveEvent(mouseEvent);
                                      break;
-            case QEvent::TabletRelease: mouseEvent = new \
                QMouseEvent(QEvent::MouseButtonRelease, event->pos(),
-                                                                    Qt::LeftButton, \
event->modifiers()); +        case QEvent::TabletRelease:
+            mouseEvent = new QMouseEvent(QEvent::MouseButtonRelease, event->pos(),
+                                         Qt::LeftButton,
+                                         Qt::LeftButton,
+                                         event->modifiers());
                                         m_dragging = false;
                                         mouseReleaseEvent(mouseEvent);
                                         break;
@@ -453,16 +459,20 @@
     QMouseEvent* mouseEvent = 0;
     switch(event->type())
     {
-        case QEvent::TabletPress: mouseEvent = new \
                QMouseEvent(QEvent::MouseButtonPress, event->pos(),
-                                                               Qt::LeftButton, \
event->modifiers()); +    case QEvent::TabletPress:
+
+        mouseEvent = new QMouseEvent(QEvent::MouseButtonPress, event->pos(),
+                                     Qt::LeftButton, Qt::LeftButton, \
event->modifiers());  mousePressEvent(mouseEvent);
                                   break;
-        case QEvent::TabletMove: mouseEvent = new QMouseEvent(QEvent::MouseMove, \
                event->pos(),
-                                                              Qt::NoButton, \
event->modifiers()); +    case QEvent::TabletMove:
+        mouseEvent = new QMouseEvent(QEvent::MouseMove, event->pos(),
+                                     Qt::NoButton, Qt::NoButton, \
event->modifiers());  mouseMoveEvent(mouseEvent);
                                  break;
-        case QEvent::TabletRelease: mouseEvent = new \
                QMouseEvent(QEvent::MouseButtonRelease, event->pos(),
-                                                                 Qt::LeftButton, \
event->modifiers()); +    case QEvent::TabletRelease:
+        mouseEvent = new QMouseEvent(QEvent::MouseButtonRelease, event->pos(),
+                                     Qt::LeftButton, Qt::LeftButton, \
event->modifiers());  mouseReleaseEvent(mouseEvent);
                                     break;
         default: break;


[prev in list] [next in list] [prev in thread] [next in thread]