skin: remove memory leak

1. remove resource leak in SkinPainter object
2. delete unnecessary null checking

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

diff --git a/tizen/src/ui/mainwindow.cpp b/tizen/src/ui/mainwindow.cpp
index 729c026c08ba7fc426b20561a9e988c030805c6b..e449175513be158dd7322dfe070ed8f34a7fba06 100644 (file)
--- a/tizen/src/ui/mainwindow.cpp
+++ b/tizen/src/ui/mainwindow.cpp
@@ -144,10 +144,8 @@ DisplayBase *MainWindow::createDisplay(DisplayType *displayForm)
         /* display swapper */
         swapperThread = new QThread(this);
 
-        if (context) {
-            context->doneCurrent();
-            context->moveToThread(swapperThread);
-        }
+        context->doneCurrent();
+        context->moveToThread(swapperThread);
 
         swapper = new DisplaySwapper(context);
         swapper->moveToThread(swapperThread);

diff --git a/tizen/src/ui/skinpainter.cpp b/tizen/src/ui/skinpainter.cpp
index 65baf3c04de29b594419a9c3f6c0c43a06f59475..57ce10a7b8f8e425a1f61cba08d8d0597c2b8018 100644 (file)
--- a/tizen/src/ui/skinpainter.cpp
+++ b/tizen/src/ui/skinpainter.cpp
@@ -105,3 +105,12 @@ QRect SkinPainter::getCenteralRect()
 {
     return centeralRect;
 }
+
+SkinPainter::~SkinPainter()
+{
+    qDebug("destroy skin painter");
+
+    if (skin != NULL) {
+        delete skin;
+    }
+}

diff --git a/tizen/src/ui/skinpainter.h b/tizen/src/ui/skinpainter.h
index e2541e33bb00080630ac9d9c7e1566f694962970..653e1204c916431425779e88b9296b26bee3410b 100644 (file)
--- a/tizen/src/ui/skinpainter.h
+++ b/tizen/src/ui/skinpainter.h
@@ -39,6 +39,7 @@ class SkinPainter
 public:
     SkinPainter(QString patchPath, QSize centerPatch, int degree,
         QPoint tagLeftTop, QColor tagColor);
+    ~SkinPainter();
 
     QImage getSkinImage();
     QRect getCenteralRect();