ekiga r7776 - trunk/lib/engine/framework

[jpuydt svn gnome org]

Author: jpuydt
Date: Tue Mar 17 20:28:00 2009
New Revision: 7776
URL: http://svn.gnome.org/viewvc/ekiga?rev=7776&view=rev

Log:
Reviewed the menu builder tools - not 100% satisfying

Modified:
   trunk/lib/engine/framework/menu-builder-tools.cpp
   trunk/lib/engine/framework/menu-builder-tools.h

Modified: trunk/lib/engine/framework/menu-builder-tools.cpp
==============================================================================
--- trunk/lib/engine/framework/menu-builder-tools.cpp	(original)
+++ trunk/lib/engine/framework/menu-builder-tools.cpp	Tue Mar 17 20:28:00 2009
@@ -110,8 +110,10 @@
 				    const std::string label_,
 				    sigc::slot0<void> callback_):
     icon(icon_), label(label_), callback(callback_)
-  {
-  }
+  {}
+
+  ~TemporaryMenuBuilderHelperAction ()
+  {}
 
   bool populate_menu (Ekiga::MenuBuilder& builder)
   {
@@ -134,6 +136,9 @@
   TemporaryMenuBuilderHelperSeparator ()
   {}
 
+  ~TemporaryMenuBuilderHelperSeparator ()
+  {}
+
   bool populate_menu (Ekiga::MenuBuilder& builder)
   {
     builder.add_separator ();
@@ -149,8 +154,10 @@
   TemporaryMenuBuilderHelperGhost (const std::string icon_,
 				   const std::string label_):
     icon(icon_), label(label_)
-  {
-  }
+  {}
+
+  ~TemporaryMenuBuilderHelperGhost ()
+  {}
 
   bool populate_menu (Ekiga::MenuBuilder& builder)
   {
@@ -209,6 +216,12 @@
   helpers.push_back (helper);
 }
 
+bool
+Ekiga::TemporaryMenuBuilder::empty () const
+{
+  return (count == 0);
+}
+
 int
 Ekiga::TemporaryMenuBuilder::size () const
 {

Modified: trunk/lib/engine/framework/menu-builder-tools.h
==============================================================================
--- trunk/lib/engine/framework/menu-builder-tools.h	(original)
+++ trunk/lib/engine/framework/menu-builder-tools.h	Tue Mar 17 20:28:00 2009
@@ -158,6 +158,8 @@
   {
   public:
 
+    virtual ~TemporaryMenuBuilderHelper () {}
+
     virtual bool populate_menu (Ekiga::MenuBuilder& builder) = 0;
   };
 
@@ -178,6 +180,8 @@
     void add_ghost (const std::string icon,
 		    const std::string label);
 
+    bool empty () const;
+
     int size () const;
 
     /* this empties this temporary builder, so it can be reused */