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

List:       kde-commits
Subject:    [oxygen-gtk] demo: make sure signals are disconnected at destruction
From:       Hugo Pereira Da Costa <hugo () oxygen-icons ! org>
Date:       2014-01-19 19:32:18
Message-ID: E1W4y6U-0003wR-HE () scm ! kde ! org
[Download RAW message or body]

Git commit 284053b5ec8466246954d55ef9c49b5ed6874b55 by Hugo Pereira Da Costa.
Committed on 17/01/2014 at 14:58.
Pushed by hpereiradacosta into branch 'master'.

make sure signals are disconnected at destruction

M  +5    -1    demo/oxygenbuttondemowidget.cpp
M  +6    -0    demo/oxygendemodialog.cpp
M  +1    -1    demo/oxygenframedemowidget.cpp
M  +7    -1    demo/oxygeninputdemowidget.cpp
M  +4    -1    demo/oxygensliderdemowidget.cpp
M  +7    -0    demo/oxygensliderdemowidget.h
M  +1    -1    demo/oxygentabdemowidget.cpp

http://commits.kde.org/oxygen-gtk/284053b5ec8466246954d55ef9c49b5ed6874b55

diff --git a/demo/oxygenbuttondemowidget.cpp b/demo/oxygenbuttondemowidget.cpp
index 11f2343..4d60d27 100644
--- a/demo/oxygenbuttondemowidget.cpp
+++ b/demo/oxygenbuttondemowidget.cpp
@@ -394,7 +394,11 @@ namespace Oxygen
 
     //____________________________________________________
     ButtonDemoWidget::~ButtonDemoWidget( void )
-    {}
+    {
+        // disconnect signals
+        _toolBarStyleChangedId.disconnect();
+        _iconSizeChangedId.disconnect();
+    }
 
     //____________________________________________________
     void ButtonDemoWidget::toolBarStyleChanged( GtkComboBox* comboBox, gpointer data \
                )
diff --git a/demo/oxygendemodialog.cpp b/demo/oxygendemodialog.cpp
index 59f3a2a..0e8bd36 100644
--- a/demo/oxygendemodialog.cpp
+++ b/demo/oxygendemodialog.cpp
@@ -186,6 +186,12 @@ namespace Oxygen
         // delete pages
         for( PageMap::iterator iter = _pages.begin(); iter != _pages.end(); ++iter )
         { delete iter->second; }
+
+        // disconnect signals
+        _selectionChangedId.disconnect();
+        _toggleEnableStateId.disconnect();
+        _toggleWidgetDirectionId.disconnect();
+        _keyPressId.disconnect();
     }
 
     //_____________________________________________
diff --git a/demo/oxygenframedemowidget.cpp b/demo/oxygenframedemowidget.cpp
index 6f37dbf..43dcebe 100644
--- a/demo/oxygenframedemowidget.cpp
+++ b/demo/oxygenframedemowidget.cpp
@@ -161,7 +161,7 @@ namespace Oxygen
 
     //____________________________________________________
     FrameDemoWidget::~FrameDemoWidget( void )
-    {}
+    { _changedId.disconnect(); }
 
     //____________________________________________________
     void FrameDemoWidget::shadowChanged( GtkToggleButton* button, gpointer pointer )
diff --git a/demo/oxygeninputdemowidget.cpp b/demo/oxygeninputdemowidget.cpp
index 34e6140..51b786d 100644
--- a/demo/oxygeninputdemowidget.cpp
+++ b/demo/oxygeninputdemowidget.cpp
@@ -197,7 +197,13 @@ namespace Oxygen
 
     //____________________________________________________
     InputDemoWidget::~InputDemoWidget( void )
-    {}
+    {
+
+        // disconnect signals
+        _flatModeChangedId.disconnect();
+        _wrapModeChangedId.disconnect();
+
+    }
 
     //____________________________________________________
     void InputDemoWidget::flatModeChanged( GtkToggleButton* button, gpointer data )
diff --git a/demo/oxygensliderdemowidget.cpp b/demo/oxygensliderdemowidget.cpp
index 05c95c5..35fbd3f 100644
--- a/demo/oxygensliderdemowidget.cpp
+++ b/demo/oxygensliderdemowidget.cpp
@@ -155,7 +155,10 @@ namespace Oxygen
 
     //____________________________________________________
     SliderDemoWidget::~SliderDemoWidget( void )
-    {}
+    {
+        _horizontalSliders.disconnect();
+        _verticalSliders.disconnect();
+    }
 
     //____________________________________________________
     gboolean SliderDemoWidget::pulseProgressBar( gpointer pointer )
diff --git a/demo/oxygensliderdemowidget.h b/demo/oxygensliderdemowidget.h
index 91d5fac..2ccb210 100644
--- a/demo/oxygensliderdemowidget.h
+++ b/demo/oxygensliderdemowidget.h
@@ -82,6 +82,13 @@ namespace Oxygen
                 _scrollValueChangedId.connect( G_OBJECT( _scrollBar ), \
"value-changed", function, data );  }
 
+            //! disconnect
+            void disconnect( void )
+            {
+                _scaleValueChangedId.disconnect();
+                _scrollValueChangedId.disconnect();
+            }
+
             //! change value
             void setValue( const double& value ) const;
 
diff --git a/demo/oxygentabdemowidget.cpp b/demo/oxygentabdemowidget.cpp
index 793771f..b234223 100644
--- a/demo/oxygentabdemowidget.cpp
+++ b/demo/oxygentabdemowidget.cpp
@@ -145,7 +145,7 @@ namespace Oxygen
 
     //____________________________________________________
     TabDemoWidget::~TabDemoWidget( void )
-    {}
+    { _changedId.disconnect(); }
 
     //____________________________________________________
     void TabDemoWidget::addPage( const std::string& title, GtkWidget* widget ) const


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