gui: remove memory leak

delete MainWindow class before emulator exit

Change-Id: Id694cf58d2eebfbb2237e86a4fb7ea42d205bcb1
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/tizen/src/ui/input/keyboardhelper.cpp b/tizen/src/ui/input/keyboardhelper.cpp
index 57560cb130c668669f74435c02f10a2b3f54abaa..08370c0dc0e8e2c35f48a36fa5b2a40d43ab05d6 100644 (file)
--- a/tizen/src/ui/input/keyboardhelper.cpp
+++ b/tizen/src/ui/input/keyboardhelper.cpp
@@ -597,5 +597,5 @@ void KeyboardHelper::keyReleased(QKeyEvent *event)
 
 KeyboardHelper::~KeyboardHelper()
 {
-    qDebug("destroy keyboard helper");
+    /* do nothing */
 }

diff --git a/tizen/src/ui/input/keyboardshortcut.cpp b/tizen/src/ui/input/keyboardshortcut.cpp
index 10be0ad3f1932c4fc2baeb95211a9217bf2d7c45..c14f2cfdb6700f637d7830f19a924cf14798f982 100644 (file)
--- a/tizen/src/ui/input/keyboardshortcut.cpp
+++ b/tizen/src/ui/input/keyboardshortcut.cpp
@@ -104,7 +104,5 @@ void KeyboardShortcut::slotHwKeyShortcut(int keycode)
 
 KeyboardShortcut::~KeyboardShortcut()
 {
-    qDebug("destroy keyboard shortcut");
-
     hwKeyShortcutMap.clear();
 }

diff --git a/tizen/src/ui/input/touchscreenhelper.cpp b/tizen/src/ui/input/touchscreenhelper.cpp
index 4d197c57477646843dc783332e0473b0c5731d68..eb168c132f4817874968976f37286100371f402e 100644 (file)
--- a/tizen/src/ui/input/touchscreenhelper.cpp
+++ b/tizen/src/ui/input/touchscreenhelper.cpp
@@ -112,8 +112,6 @@ void TouchScreenHelper::touchMoved(QPoint hostPos, QPoint guestPos)
 
 TouchScreenHelper::~TouchScreenHelper()
 {
-    qDebug("destroy touch screen helper");
-
     if (mtTracker != NULL) {
         delete mtTracker;
     }

diff --git a/tizen/src/ui/layout/mainform.cpp b/tizen/src/ui/layout/mainform.cpp
index 048924506527254535b1b8b6dee4a40495bebc6f..1ecf548adfa2f6884893f8fe66736610ed3fb761 100644 (file)
--- a/tizen/src/ui/layout/mainform.cpp
+++ b/tizen/src/ui/layout/mainform.cpp
@@ -57,8 +57,6 @@ QPixmap *MainForm::getRotaryImage()
 
 MainForm::~MainForm()
 {
-    qDebug("destroy main form");
-
     if (displayType != NULL) {
         delete displayType;
     }

diff --git a/tizen/src/ui/menu/advancedmenuitem.cpp b/tizen/src/ui/menu/advancedmenuitem.cpp
index 5f4eea45fe993ed491babc0186d38b1050146a9d..7cbe5561feda9412fc9c3360b789e8b573b4332a 100644 (file)
--- a/tizen/src/ui/menu/advancedmenuitem.cpp
+++ b/tizen/src/ui/menu/advancedmenuitem.cpp
@@ -42,8 +42,6 @@ QList<MenuItem *> &AdvancedMenuItem::getMenuList()
 
 AdvancedMenuItem::~AdvancedMenuItem()
 {
-    qDebug("destroy an advanced menu item");
-
     for (int i = 0; i < menuList.count(); i++) {
         delete menuList.at(i);
     }

diff --git a/tizen/src/ui/menu/scalemenuitem.cpp b/tizen/src/ui/menu/scalemenuitem.cpp
index 931996ec002a8f0bd05e1e3d87e899bc80601e31..d088eba3bc9f6323dcf1d05df2f625be26fc2696 100644 (file)
--- a/tizen/src/ui/menu/scalemenuitem.cpp
+++ b/tizen/src/ui/menu/scalemenuitem.cpp
@@ -52,7 +52,5 @@ int ScaleMenuItem::getDefaultScaleFactor()
 
 ScaleMenuItem::~ScaleMenuItem()
 {
-    qDebug("destroy a scale menu item");
-
     factorMap.clear();
 }

diff --git a/tizen/src/ui/menu/shellopener.cpp b/tizen/src/ui/menu/shellopener.cpp
index 20a95a4dce898abd8060eb4bb68621cf3102baf1..cd1bc1d62df837513ef87e9ecbc61642f3b7b705 100644 (file)
--- a/tizen/src/ui/menu/shellopener.cpp
+++ b/tizen/src/ui/menu/shellopener.cpp
@@ -84,5 +84,5 @@ void ShellOpener::openShell(QString title)
 
 ShellOpener::~ShellOpener()
 {
-    qDebug("destroy shell opener");
+    /* do nothing */
 }

diff --git a/tizen/src/ui/qt5_supplement.cpp b/tizen/src/ui/qt5_supplement.cpp
index 589cec0b450c80fd4a5c4e68b75512df3ec9d714..f3346e23f3e026cac1439565f52a6290db349cfc 100644 (file)
--- a/tizen/src/ui/qt5_supplement.cpp
+++ b/tizen/src/ui/qt5_supplement.cpp
@@ -269,6 +269,8 @@ void qt5_destroy()
 {
     qDebug("qt5 destroy");
 
+    mainwindow->terminateDisplaySwapper();
+
     /* write most recently used data information */
     QString mruPath(
         uiInfo->getVmDataPath() + QDir::separator() + GUI_PROPERTIES_FILE);
@@ -300,17 +302,15 @@ void qt5_destroy()
     qt5App->flush();
 
     mainwindow->closeController();
-    mainwindow->terminateDisplaySwapper();
 
     qt5App->processEvents(QEventLoop::ExcludeUserInputEvents);
     qt5App->quit();
 
-#if 0
-    //FIXME: It causes SIGSEGV now...
-    delete mainwindow;
+    delete mainwindow; /* All child widgets will be deleted automatically
+    in accordance with parent-child chain. */
     mainwindow = NULL;
-#endif
-
+    delete qt5App;
+    qt5App = NULL;
     delete uiInfo;
     uiInfo = NULL;
 }

diff --git a/tizen/src/ui/skinbezelitem.cpp b/tizen/src/ui/skinbezelitem.cpp
index 57889d371cc16a619980a65216fa58c7d3b3634a..910aed773f0613ef3e73f6aaafc5f2ac6d19b7c6 100644 (file)
--- a/tizen/src/ui/skinbezelitem.cpp
+++ b/tizen/src/ui/skinbezelitem.cpp
@@ -55,5 +55,5 @@ bool SkinBezelItem::isHWKeyHandling()
 
 SkinBezelItem::~SkinBezelItem()
 {
-    qDebug("destroy bezel item");
+    /* do nothing */
 }