QWidgetResizeHandler cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/widgets/qwidgetresizehandler.cpp b/src/gui/widgets/qwidgetresizehandler.cpp
index 9634961..260e7f1 100644 (file)
--- a/src/gui/widgets/qwidgetresizehandler.cpp
+++ b/src/gui/widgets/qwidgetresizehandler.cpp
@@ -110,7 +110,7 @@ bool QWidgetResizeHandler::eventFilter(QObject *o, QEvent *ee)
         return false;
     }
 
-    QMouseEvent *e = (QMouseEvent*)ee;
+    QMouseEvent *e = static_cast<QMouseEvent*>(ee);
     switch (e->type()) {
     case QEvent::MouseButtonPress: {
         if (w->isMaximized())
@@ -182,11 +182,11 @@ bool QWidgetResizeHandler::eventFilter(QObject *o, QEvent *ee)
         }
     } break;
     case QEvent::KeyPress:
-        keyPressEvent((QKeyEvent*)e);
+        keyPressEvent(static_cast<QKeyEvent*>(ee));
         break;
     case QEvent::ShortcutOverride:
         if (buttonDown) {
-            ((QKeyEvent*)ee)->accept();
+            static_cast<QKeyEvent*>(ee)->accept();
             return true;
         }
         break;
@@ -479,12 +479,13 @@ void QWidgetResizeHandler::keyPressEvent(QKeyEvent * e)
     case Qt::Key_Space:
     case Qt::Key_Return:
     case Qt::Key_Enter:
-    case Qt::Key_Escape:
+    case Qt::Key_Escape: {
         moveResizeMode = false;
         widget->releaseMouse();
         widget->releaseKeyboard();
         buttonDown = false;
         break;
+    }
     default:
         return;
     }

diff --git a/src/gui/widgets/qwidgetresizehandler_p.h b/src/gui/widgets/qwidgetresizehandler_p.h
index 9d6b410..2e8f260 100644 (file)
--- a/src/gui/widgets/qwidgetresizehandler_p.h
+++ b/src/gui/widgets/qwidgetresizehandler_p.h
@@ -61,9 +61,9 @@ class Q_GUI_EXPORT QWidgetResizeHandler : public QObject
 
 public:
     enum Action {
-        Move        = 0x01,
-        Resize        = 0x02,
-        Any        = Move|Resize
+        Move = 0x01,
+        Resize = 0x02,
+        Any = Move | Resize
     };
 
     explicit QWidgetResizeHandler(QWidget *parent, QWidget *cw = 0);
@@ -110,12 +110,12 @@ private:
     int fw;
     int extrahei;
     int range;
-    uint buttonDown            :1;
-    uint moveResizeMode            :1;
-    uint activeForResize    :1;
-    uint sizeprotect            :1;
-    uint movingEnabled                    :1;
-    uint activeForMove            :1;
+    bool buttonDown;
+    bool moveResizeMode;
+    bool activeForResize;
+    bool sizeprotect;
+    bool movingEnabled;
+    bool activeForMove;
 
     void setMouseCursor(MousePosition m);
     bool isMove() const {