Qt: code refactoring to improve readability

I decreased indentation on the existing source code.
This code refactoring will help developers understand and
improve readability.

Change-Id: I5edd527a69dd8fd181a28d80025b1d53273ebeb7
Signed-off-by: Jihye Won <jihye.won1@samsung.com>

diff --git a/tizen/src/ui/menu/contextmenu.cpp b/tizen/src/ui/menu/contextmenu.cpp
index 44c51002241e6c4af79ad5e41f20989e132e1e1c..db2f603234bacad8628974b953258346ce4accbc 100644 (file)
--- a/tizen/src/ui/menu/contextmenu.cpp
+++ b/tizen/src/ui/menu/contextmenu.cpp
@@ -598,20 +598,21 @@ QAction *ContextMenu::addGeneralAction(QMenu *menu,
 bool ContextMenu::eventFilter(QObject *obj, QEvent *event)
 {
     ContextMenu *menu = dynamic_cast<ContextMenu *>(obj);
+    if (menu == NULL) {
+        return QObject::eventFilter(obj, event);
+    }
 
-    if (menu != NULL) {
-        if (event->type() == QEvent::MouseButtonPress ||
-            event->type() == QEvent::MouseButtonRelease) {
-            QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent *>(event);
+    if (event->type() == QEvent::MouseButtonPress ||
+        event->type() == QEvent::MouseButtonRelease) {
+        QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent *>(event);
 
-            if (mouseEvent != NULL && mouseEvent->button() == Qt::RightButton) {
-                mouseEvent->ignore(); /* filtering */
-                return true;
-            }
-        } else if (event->type() == QEvent::Show) {
-            if (parent->getMainView()->isGrabWindow() == true) {
-                parent->getMainView()->releaseWindow();
-            }
+        if (mouseEvent != NULL && mouseEvent->button() == Qt::RightButton) {
+            mouseEvent->ignore(); /* filtering */
+            return true;
+        }
+    } else if (event->type() == QEvent::Show) {
+        if (parent->getMainView()->isGrabWindow() == true) {
+            parent->getMainView()->releaseWindow();
         }
     }
 

diff --git a/tizen/src/ui/transwidget.cpp b/tizen/src/ui/transwidget.cpp
index 7a0777992c12fff4414d9476d745b8f9b6cb4f17..ba7ef4abe11fbd9573f69bb4d155332aa70b04ff 100644 (file)
--- a/tizen/src/ui/transwidget.cpp
+++ b/tizen/src/ui/transwidget.cpp
@@ -58,38 +58,38 @@ TransWidget::TransWidget(QWidget *parent) : QWidget(parent)
 bool TransWidget::eventFilter(QObject *obj, QEvent *event)
 {
     TransWidget *widget = dynamic_cast<TransWidget *>(obj);
+    if (widget == NULL) {
+        return QObject::eventFilter(obj, event);
+    }
 
-    if (widget != NULL) {
+    QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent *>(event);
+    if (mouseEvent == NULL) {
+        return QObject::eventFilter(obj, event);
+    }
 
-        QMouseEvent *mouseEvent = dynamic_cast<QMouseEvent *>(event);
-        if (mouseEvent == NULL) {
-            return QObject::eventFilter(obj, event);
-        }
+    MainWindow *parent = qobject_cast<MainWindow*>(this->parent());
+    if (parent == NULL) {
+        qWarning() << "parent object(MainWindow) is null.";
+        return QObject::eventFilter(obj, event);
+    }
 
-        MainWindow *parent = qobject_cast<MainWindow*>(this->parent());
-        if (parent == NULL) {
-            qWarning() << "parent object(MainWindow) is null.";
-            return QObject::eventFilter(obj, event);
+    if (event->type() == QEvent::MouseButtonPress) {
+        if (mouseEvent->button() == Qt::LeftButton) {
+            isGrab = true;
+            grabPos = parent->mapToGlobal(QPoint(0,0)) - mouseEvent->globalPos();
         }
-
-        if (event->type() == QEvent::MouseButtonPress) {
-            if (mouseEvent->button() == Qt::LeftButton) {
-                isGrab = true;
-                grabPos = parent->mapToGlobal(QPoint(0,0)) - mouseEvent->globalPos();
-            }
-            if (mouseEvent->button() == Qt::RightButton) {
-                mouseEvent->ignore(); /* filtering */
-                return true;
-            }
-        } else if (event->type() == QEvent::MouseMove) {
-            if(isGrab == true) {
-                parent->move(mouseEvent->globalPos() + grabPos);
-            }
-        } else if (event->type() == QEvent::MouseButtonRelease) {
-            qDebug() << "The position of the emulator: " << this->mapToGlobal(QPoint(0,0));
-            close();
+        if (mouseEvent->button() == Qt::RightButton) {
+            mouseEvent->ignore(); /* filtering */
             return true;
         }
+    } else if (event->type() == QEvent::MouseMove) {
+        if(isGrab == true) {
+            parent->move(mouseEvent->globalPos() + grabPos);
+        }
+    } else if (event->type() == QEvent::MouseButtonRelease) {
+        qDebug() << "The position of the emulator: " << this->mapToGlobal(QPoint(0,0));
+        close();
+        return true;
     }
 
     return QObject::eventFilter(obj, event);