[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [oxygen-gtk/1.4] demo: Delete pages in DemoDialog destructor, as it should.
From:       Hugo Pereira Da Costa <hugo () oxygen-icons ! org>
Date:       2014-01-19 19:33:27
Message-ID: E1W4y7b-0003zM-Qe () scm ! kde ! org
[Download RAW message or body]

Git commit 575b9bf22da7448212e26c6d8d2450ed5f9ab424 by Hugo Pereira Da Costa.
Committed on 17/01/2014 at 14:05.
Pushed by hpereiradacosta into branch '1.4'.

Delete pages in DemoDialog destructor, as it should.

M  +5    -1    demo/oxygendemodialog.cpp
M  +2    -1    demo/oxygendemodialog.h

http://commits.kde.org/oxygen-gtk/575b9bf22da7448212e26c6d8d2450ed5f9ab424

diff --git a/demo/oxygendemodialog.cpp b/demo/oxygendemodialog.cpp
index 90d4ab3..efcfc3a 100644
--- a/demo/oxygendemodialog.cpp
+++ b/demo/oxygendemodialog.cpp
@@ -183,7 +183,11 @@ namespace Oxygen
 
     //_____________________________________________
     DemoDialog::~DemoDialog( void )
-    {}
+    {
+        // delete pages
+        for( PageMap::iterator iter = _pages.begin(); iter != _pages.end(); ++iter )
+        { delete iter->second; }
+    }
 
     //_____________________________________________
     void DemoDialog::addPage( DemoWidget* page )
diff --git a/demo/oxygendemodialog.h b/demo/oxygendemodialog.h
index b6fda56..23cb656 100644
--- a/demo/oxygendemodialog.h
+++ b/demo/oxygendemodialog.h
@@ -78,7 +78,8 @@ namespace Oxygen
         GtkListStore* _model;
 
         //! map page index and page widget
-        std::map<int, DemoWidget*> _pages;
+        typedef std::map<int, DemoWidget*> PageMap;
+        PageMap _pages;
         SliderDemoWidget* _sliderDemoWidget;
 
         //! enable state button

[prev in list] [next in list] [prev in thread] [next in thread]