XML: removed returning allocated memory in parser

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

diff --git a/tizen/src/ui/layout/hardwarekey.cpp b/tizen/src/ui/layout/hardwarekey.cpp
index db1d584934d6eba7e3a4033ff2d7408ee9b57a1a..3c8ee3ea0d12511f2ad65fa01876a382e234a137 100644 (file)
--- a/tizen/src/ui/layout/hardwarekey.cpp
+++ b/tizen/src/ui/layout/hardwarekey.cpp
@@ -29,7 +29,7 @@
 
 #include "hardwarekey.h"
 
-HardwareKey::HardwareKey(QString name, KeycodeType *keycodeType,
+HardwareKey::HardwareKey(QString name, const KeycodeType &keycodeType,
     QRect region, QString tooltip, QKeySequence keySequence)
 {
     this->name = name;
@@ -37,10 +37,6 @@ HardwareKey::HardwareKey(QString name, KeycodeType *keycodeType,
     this->region = region;
     this->tooltip = tooltip;
     this->keySequence = keySequence;
-
-    if (keycodeType == NULL) {
-        this->keycodeType = new KeycodeType(-1, -1);
-    }
 }
 
 QString HardwareKey::getName()
@@ -48,19 +44,19 @@ QString HardwareKey::getName()
     return name;
 }
 
-KeycodeType *HardwareKey::getKeycodeType()
+KeycodeType &HardwareKey::getKeycodeType()
 {
     return keycodeType;
 }
 
 int HardwareKey::getKeycode()
 {
-    return getKeycodeType()->getShortPressKeycode();
+    return keycodeType.getShortPressKeycode();
 }
 
 bool HardwareKey::hasLongPressKeycode()
 {
-    return (keycodeType->getLongPressKeycode() > 0);
+    return (keycodeType.getLongPressKeycode() > 0);
 }
 
 QRect &HardwareKey::getRect()
@@ -80,7 +76,5 @@ QKeySequence HardwareKey::getKeySequence()
 
 HardwareKey::~HardwareKey()
 {
-    if (keycodeType != NULL) {
-        delete keycodeType;
-    }
+    /* do nothing */
 }

diff --git a/tizen/src/ui/layout/hardwarekey.h b/tizen/src/ui/layout/hardwarekey.h
index af25b9f59acb40fad865fb825cff4f8f4ccc4cbe..3e20a02210ae911705a12d24e5408bbf975b4a41 100644 (file)
--- a/tizen/src/ui/layout/hardwarekey.h
+++ b/tizen/src/ui/layout/hardwarekey.h
@@ -37,12 +37,12 @@
 class HardwareKey
 {
 public:
-    HardwareKey(QString name, KeycodeType *keycodeType,
+    HardwareKey(QString name, const KeycodeType &keycodeType,
         QRect region, QString tooltip, QKeySequence keySequence);
     ~HardwareKey();
 
     QString getName();
-    KeycodeType *getKeycodeType();
+    KeycodeType &getKeycodeType();
     int getKeycode();
     bool hasLongPressKeycode();
     QRect &getRect();
@@ -51,7 +51,7 @@ public:
 
 private:
     QString name;
-    KeycodeType *keycodeType;
+    KeycodeType keycodeType;
     QRect region;
     QString tooltip;
     QKeySequence keySequence;

diff --git a/tizen/src/ui/layout/hovertype.cpp b/tizen/src/ui/layout/hovertype.cpp
index 764ebb8f359cec4b66d62dd3401f14bbb0e24091..a20be556f3bbebe196ede31a72fe75cf99fb4159 100644 (file)
--- a/tizen/src/ui/layout/hovertype.cpp
+++ b/tizen/src/ui/layout/hovertype.cpp
@@ -29,6 +29,12 @@
 
 #include "hovertype.h"
 
+HoverType::HoverType()
+{
+    this->color = QColor(Qt::white);
+    this->fill = false;
+}
+
 HoverType::HoverType(const QColor &color)
 {
     this->color = color;

diff --git a/tizen/src/ui/layout/hovertype.h b/tizen/src/ui/layout/hovertype.h
index b54d764f1d337ba6a76f457aaf144dad0312cd67..2714126c9ae69192bb24ccedfdceb78a99adda19 100644 (file)
--- a/tizen/src/ui/layout/hovertype.h
+++ b/tizen/src/ui/layout/hovertype.h
@@ -35,6 +35,7 @@
 class HoverType
 {
 public:
+    HoverType();
     HoverType(const QColor &color);
     ~HoverType();
 

diff --git a/tizen/src/ui/layout/keycodetype.cpp b/tizen/src/ui/layout/keycodetype.cpp
index 5974957b34bd2cbd6162c1f96c672a4aef6986ec..fd8bf973207958d3364937efdbee196fa04fa979 100644 (file)
--- a/tizen/src/ui/layout/keycodetype.cpp
+++ b/tizen/src/ui/layout/keycodetype.cpp
@@ -31,6 +31,12 @@
 
 #include "keycodetype.h"
 
+KeycodeType::KeycodeType()
+{
+    this->shortPress = 0;
+    this->longPress = -1;
+}
+
 KeycodeType::KeycodeType(int shortPress)
 {
     this->shortPress = shortPress;

diff --git a/tizen/src/ui/layout/keycodetype.h b/tizen/src/ui/layout/keycodetype.h
index 5de6677610390a3b0ff5fa44e9096733624baf39..3899db44dbe705e23c04ad46cfe2b17c412a2ed0 100644 (file)
--- a/tizen/src/ui/layout/keycodetype.h
+++ b/tizen/src/ui/layout/keycodetype.h
@@ -35,6 +35,7 @@
 class KeycodeType
 {
 public:
+    KeycodeType();
     KeycodeType(int shortPress);
     KeycodeType(int shortPress, int longPress);
     ~KeycodeType();

diff --git a/tizen/src/ui/layout/layoutform.cpp b/tizen/src/ui/layout/layoutform.cpp
index 6bf106693d5f0bb76c89b1ec1d596706a46b4176..23f49645f74aa5ce065275fd28834c95a3c0a9f5 100644 (file)
--- a/tizen/src/ui/layout/layoutform.cpp
+++ b/tizen/src/ui/layout/layoutform.cpp
@@ -35,7 +35,6 @@ LayoutForm::LayoutForm(const QString &name)
 {
     this->name = name;
     this->generalPurpose = false;
-    this->hoverType = NULL;
 }
 
 QString LayoutForm::getName()
@@ -58,12 +57,12 @@ QList<HardwareKey *> &LayoutForm::getKeyList()
     return keyList;
 }
 
-void LayoutForm::setHoverType(HoverType *hover)
+void LayoutForm::setHoverType(const HoverType &hover)
 {
     hoverType = hover;
 }
 
-HoverType *LayoutForm::getHoverType()
+HoverType &LayoutForm::getHoverType()
 {
     return hoverType;
 }
@@ -74,8 +73,4 @@ LayoutForm::~LayoutForm()
         delete keyList.at(i);
     }
     keyList.clear();
-
-    if (hoverType != NULL) {
-        delete hoverType;
-    }
 }

diff --git a/tizen/src/ui/layout/layoutform.h b/tizen/src/ui/layout/layoutform.h
index 3a0e60175334cb11ba1a5d0049a342ae70ea3f89..dfe0042f276c3beb2e047303df9d2349b085e755 100644 (file)
--- a/tizen/src/ui/layout/layoutform.h
+++ b/tizen/src/ui/layout/layoutform.h
@@ -48,8 +48,8 @@ public:
     bool isGeneralPurpose();
 
     QList<HardwareKey *> &getKeyList();
-    void setHoverType(HoverType *hover);
-    HoverType *getHoverType();
+    void setHoverType(const HoverType &hover);
+    HoverType &getHoverType();
 
     QImage skinImg[2];
     enum SkinImgType {
@@ -62,7 +62,7 @@ private:
     bool generalPurpose;
 
     QList<HardwareKey *> keyList;
-    HoverType *hoverType;
+    HoverType hoverType;
 };
 
 #endif // LAYOUTFORM_H

diff --git a/tizen/src/ui/skinkeyitem.cpp b/tizen/src/ui/skinkeyitem.cpp
index cae4c3a8af78d72e5cd7831203da33e400922b36..8d1bded5cfc313cf5df341463c7c1203dfbcff08 100644 (file)
--- a/tizen/src/ui/skinkeyitem.cpp
+++ b/tizen/src/ui/skinkeyitem.cpp
@@ -38,7 +38,7 @@ extern "C" {
 }
 
 SkinKeyItem::SkinKeyItem(QGraphicsItem *parent, HardwareKey *hwKey,
-    QImage pressedImg, bool reMasking, HoverType *hover) :
+    QImage pressedImg, bool reMasking, HoverType &hover) :
     QGraphicsRectItem(hwKey->getRect(), parent)
 {
     this->viewer = (SkinView *)scene()->views().at(0);
@@ -46,14 +46,9 @@ SkinKeyItem::SkinKeyItem(QGraphicsItem *parent, HardwareKey *hwKey,
     this->hwKey = hwKey;
     this->pressedImg = pressedImg;
     this->reMasking = reMasking;
-    this->isPressed = false;
-
-    if (hover != NULL) {
-        hoverColor = hover->getColor();
-    } else {
-        hoverColor = QColor(Qt::white);
-    }
+    this->hoverColor = hover.getColor();
 
+    this->isPressed = false;
     hoverPen.setColor(Qt::transparent);
 
     longPressTimer = new QTimer();
@@ -135,7 +130,7 @@ void SkinKeyItem::longPressHook()
     /* long press detected */
 
     if (hwKey->hasLongPressKeycode() == true) {
-        const int keycode = hwKey->getKeycodeType()->getLongPressKeycode();
+        const int keycode = hwKey->getKeycodeType().getLongPressKeycode();
         qDebug() << hwKey->getName() << "key long pressed:" << keycode;
         do_hw_key_event(KEY_PRESSED, keycode);
         qDebug() << hwKey->getName() << "key released:" << keycode;

diff --git a/tizen/src/ui/skinkeyitem.h b/tizen/src/ui/skinkeyitem.h
index 0032f8f4346bb9cab9c57f985bcc98b7317f59ce..374677afde5df6f52d2dc605b6bdd2cf9de3caac 100644 (file)
--- a/tizen/src/ui/skinkeyitem.h
+++ b/tizen/src/ui/skinkeyitem.h
@@ -46,7 +46,7 @@ class SkinKeyItem : public QObject, public QGraphicsRectItem
 
 public:
     SkinKeyItem(QGraphicsItem *parent, HardwareKey *hwKey,
-        QImage pressedImg, bool reMasking, HoverType *hover);
+        QImage pressedImg, bool reMasking, HoverType &hover);
     ~SkinKeyItem();
 
 protected:

diff --git a/tizen/src/ui/xmllayoutparser.cpp b/tizen/src/ui/xmllayoutparser.cpp
index ee44618805f6c88b30f7c8f889cedbd8dcfc2cbc..88789681c4698e8c91a3dcb460599db2fc988429 100644 (file)
--- a/tizen/src/ui/xmllayoutparser.cpp
+++ b/tizen/src/ui/xmllayoutparser.cpp
@@ -65,7 +65,7 @@ QColor XmlLayoutParser::parseColor(QXmlStreamReader &xml)
     return QColor(red, green, blue, 255);
 }
 
-HoverType *XmlLayoutParser::parseHover(QXmlStreamReader &xml)
+HoverType XmlLayoutParser::parseHover(QXmlStreamReader &xml)
 {
     QColor color(255, 255, 255);
 
@@ -87,7 +87,7 @@ HoverType *XmlLayoutParser::parseHover(QXmlStreamReader &xml)
         token = xml.readNext();
     }
 
-    return new HoverType(color);
+    return HoverType(color);
 }
 
 QRect XmlLayoutParser::parseRegion(QXmlStreamReader &xml)
@@ -161,7 +161,7 @@ DisplayType *XmlLayoutParser::parseDisplay(QXmlStreamReader &xml)
     return new DisplayType(displayRect, angle, maskImage);
 }
 
-KeycodeType *XmlLayoutParser::parseKeycode(QXmlStreamReader &xml)
+KeycodeType XmlLayoutParser::parseKeycode(QXmlStreamReader &xml)
 {
     int longPress = -1, shortPress = 0;
 
@@ -170,13 +170,13 @@ KeycodeType *XmlLayoutParser::parseKeycode(QXmlStreamReader &xml)
 
     shortPress = xml.readElementText().toInt();
 
-    return new KeycodeType(shortPress, longPress);
+    return KeycodeType(shortPress, longPress);
 }
 
 HardwareKey *XmlLayoutParser::parseKey(QXmlStreamReader &xml)
 {
     QRect keyRegion;
-    KeycodeType *keycodeType = NULL;
+    KeycodeType keycodeType;
     QString keyTooptip;
     QKeySequence keySequence;
 

diff --git a/tizen/src/ui/xmllayoutparser.h b/tizen/src/ui/xmllayoutparser.h
index 804ce41573e0a9463b9e4f4a5fa9c8ac56ff115e..de643d10cdd853d9165f2e84a5c63b3484d2805d 100644 (file)
--- a/tizen/src/ui/xmllayoutparser.h
+++ b/tizen/src/ui/xmllayoutparser.h
@@ -51,10 +51,10 @@ public:
 
 private:
     QColor parseColor(QXmlStreamReader &xml);
-    HoverType *parseHover(QXmlStreamReader &xml);
+    HoverType parseHover(QXmlStreamReader &xml);
     QRect parseRegion(QXmlStreamReader &xml);
     DisplayType *parseDisplay(QXmlStreamReader &xml);
-    KeycodeType *parseKeycode(QXmlStreamReader &xml);
+    KeycodeType parseKeycode(QXmlStreamReader &xml);
     HardwareKey *parseKey(QXmlStreamReader &xml);
     int parseKeyList(QXmlStreamReader &xml, QList<HardwareKey *> &list);
     MainForm *parseMainForm(QXmlStreamReader &xml);