[ekiga/ds-fix-boost-leaks] MenuBuilder: Removed now useless code.

From: Damien Sandras <dsandras src gnome org>
To: commits-list gnome org
Cc:
Subject: [ekiga/ds-fix-boost-leaks] MenuBuilder: Removed now useless code.
Date: Tue, 13 Oct 2015 18:08:48 +0000 (UTC)
commit c852df2084c4693d06f2807d701e30719c713c54
Author: Damien Sandras <dsandras seconix com>
Date:   Sun Oct 11 19:16:30 2015 +0200

    MenuBuilder: Removed now useless code.

 lib/Makefile.am                                    |    8 -
 lib/engine/account/account-core.h                  |    1 -
 lib/engine/components/opal/opal-account.cpp        |    1 -
 lib/engine/components/opal/opal-bank.cpp           |    1 -
 lib/engine/framework/dynamic-object.h              |    2 +-
 lib/engine/framework/menu-builder-tools.cpp        |  303 --------------------
 lib/engine/framework/menu-builder-tools.h          |  248 ----------------
 lib/engine/framework/menu-builder.cpp              |   77 -----
 lib/engine/framework/menu-builder.h                |  100 -------
 lib/engine/framework/menu-xml.cpp                  |  187 ------------
 lib/engine/framework/menu-xml.h                    |   95 ------
 lib/engine/gui/gtk-core/menu-builder-gtk.cpp       |  130 ---------
 lib/engine/gui/gtk-core/menu-builder-gtk.h         |   74 -----
 lib/engine/gui/gtk-frontend/addressbook-window.cpp |    1 -
 lib/engine/gui/gtk-frontend/book-view-gtk.cpp      |    2 -
 .../gui/gtk-frontend/call-history-view-gtk.cpp     |    2 -
 lib/engine/gui/gtk-frontend/call-window.cpp        |    2 -
 lib/engine/gui/gtk-frontend/chat-window.cpp        |    2 -
 lib/engine/gui/gtk-frontend/ekiga-window.cpp       |    2 -
 lib/engine/gui/gtk-frontend/roster-view-gtk.cpp    |    1 -
 plugins/avahi/avahi-cluster.cpp                    |    8 -
 plugins/avahi/avahi-cluster.h                      |    2 -
 plugins/avahi/avahi-heap.cpp                       |   12 -
 plugins/avahi/avahi-heap.h                         |    6 -
 plugins/evolution/evolution-book.cpp               |    8 -
 plugins/evolution/evolution-book.h                 |    2 -
 plugins/evolution/evolution-contact.cpp            |    1 -
 plugins/evolution/evolution-source.cpp             |    7 -
 plugins/evolution/evolution-source.h               |    2 -
 plugins/ldap/ldap-book.cpp                         |   14 -
 plugins/ldap/ldap-book.h                           |    2 -
 plugins/ldap/ldap-contact.cpp                      |    1 -
 plugins/ldap/ldap-source.cpp                       |   13 -
 plugins/ldap/ldap-source.h                         |    2 -
 34 files changed, 1 insertions(+), 1318 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1846442..6f77b07 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -157,18 +157,12 @@ libekiga_la_SOURCES += \
        engine/framework/robust-xml.cpp \
        engine/framework/form-visitor.h \
        engine/framework/runtime.h \
-       engine/framework/menu-builder.h \
-       engine/framework/menu-builder.cpp \
-       engine/framework/menu-builder-tools.h \
-       engine/framework/menu-builder-tools.cpp \
        engine/framework/form-builder.cpp \
        engine/framework/form-dumper.cpp \
        engine/framework/form-request-simple.cpp \
        engine/framework/runtime-glib.cpp \
        engine/framework/services.cpp \
        engine/framework/trigger.h \
-       engine/framework/menu-xml.h \
-       engine/framework/menu-xml.cpp \
        engine/framework/kickstart.h \
        engine/framework/kickstart.cpp \
        engine/framework/personal-details.h \
@@ -323,8 +317,6 @@ libekiga_la_SOURCES += \
 ##
 
 libekiga_la_SOURCES += \
-       engine/gui/gtk-core/menu-builder-gtk.h \
-       engine/gui/gtk-core/menu-builder-gtk.cpp \
        engine/gui/gtk-core/form-dialog-gtk.h \
        engine/gui/gtk-core/form-dialog-gtk.cpp \
        engine/gui/gtk-core/gactor-menu.h \
diff --git a/lib/engine/account/account-core.h b/lib/engine/account/account-core.h
index e1b4341..c2a842f 100644
--- a/lib/engine/account/account-core.h
+++ b/lib/engine/account/account-core.h
@@ -38,7 +38,6 @@
 #include <list>
 #include <string>
 
-#include "menu-builder.h"
 #include "form-request.h"
 #include "chain-of-responsibility.h"
 #include "services.h"
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index 285202a..27d0c60 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -53,7 +53,6 @@
 
 #include "robust-xml.h"
 #include "form-request-simple.h"
-#include "menu-builder-tools.h"
 #include "platform.h"
 
 #include "opal-presentity.h"
diff --git a/lib/engine/components/opal/opal-bank.cpp b/lib/engine/components/opal/opal-bank.cpp
index f8b8f16..e8d56e8 100644
--- a/lib/engine/components/opal/opal-bank.cpp
+++ b/lib/engine/components/opal/opal-bank.cpp
@@ -41,7 +41,6 @@
 
 #include <glib/gi18n.h>
 
-#include "menu-builder.h"
 #include "form-request-simple.h"
 
 #include "opal-bank.h"
diff --git a/lib/engine/framework/dynamic-object.h b/lib/engine/framework/dynamic-object.h
index e13bbf3..6f49ff7 100644
--- a/lib/engine/framework/dynamic-object.h
+++ b/lib/engine/framework/dynamic-object.h
@@ -35,6 +35,7 @@
 #ifndef __DYNAMIC_OBJECT_H__
 #define __DYNAMIC_OBJECT_H__
 
+#include <boost/signals2.hpp>
 #include <boost/smart_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
@@ -43,7 +44,6 @@
 #include <iostream>
 #endif
 
-#include "menu-builder.h"
 
 namespace Ekiga
 {
diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.cpp 
b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
index 25ea30d..42fa6ca 100644
--- a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
+++ b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
@@ -38,7 +38,6 @@
 
 #include "addressbook-window.h"
 #include "book-view-gtk.h"
-#include "menu-builder-gtk.h"
 #include "form-dialog-gtk.h"
 #include "scoped-connections.h"
 #include "gactor-menu.h"
diff --git a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
index a604ffc..c0992dc 100644
--- a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
@@ -44,8 +44,6 @@
 #include "filterable.h"
 
 #include "gactor-menu.h"
-#include "menu-builder-tools.h"
-#include "menu-builder-gtk.h"
 #include "scoped-connections.h"
 
 /*
diff --git a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp 
b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
index 650fd0c..e237c6c 100644
--- a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
@@ -40,8 +40,6 @@
 
 #include "call-history-view-gtk.h"
 
-#include "menu-builder-tools.h"
-#include "menu-builder-gtk.h"
 #include "gm-cell-renderer-bitext.h"
 #include "gactor-menu.h"
 #include "scoped-connections.h"
diff --git a/lib/engine/gui/gtk-frontend/call-window.cpp b/lib/engine/gui/gtk-frontend/call-window.cpp
index c5165bb..6065d28 100644
--- a/lib/engine/gui/gtk-frontend/call-window.cpp
+++ b/lib/engine/gui/gtk-frontend/call-window.cpp
@@ -52,8 +52,6 @@
 #include "gactor-menu.h"
 #include "trigger.h"
 #include "scoped-connections.h"
-#include "menu-builder-tools.h"
-#include "menu-builder-gtk.h"
 #include "form-dialog-gtk.h"
 #include "ext-window.h"
 
diff --git a/lib/engine/gui/gtk-frontend/chat-window.cpp b/lib/engine/gui/gtk-frontend/chat-window.cpp
index bf914a5..af7c8b6 100644
--- a/lib/engine/gui/gtk-frontend/chat-window.cpp
+++ b/lib/engine/gui/gtk-frontend/chat-window.cpp
@@ -39,8 +39,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
-#include "menu-builder-gtk.h"
-
 #include "chat-core.h"
 #include "audiooutput-core.h"
 #include "notification-core.h"
diff --git a/lib/engine/gui/gtk-frontend/ekiga-window.cpp b/lib/engine/gui/gtk-frontend/ekiga-window.cpp
index 75ef942..171a559 100644
--- a/lib/engine/gui/gtk-frontend/ekiga-window.cpp
+++ b/lib/engine/gui/gtk-frontend/ekiga-window.cpp
@@ -44,8 +44,6 @@
 #include "statusmenu.h"
 #include "gm-entry.h"
 
-#include "menu-builder-tools.h"
-#include "menu-builder-gtk.h"
 #include "gm-info-bar.h"
 #include "scoped-connections.h"
 
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index 35890ca..df3a000 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -48,7 +48,6 @@
 
 #include "gm-cell-renderer-bitext.h"
 #include "gm-cell-renderer-expander.h"
-#include "menu-builder-tools.h"
 #include "roster-view-gtk.h"
 #include "form-dialog-gtk.h"
 #include "scoped-connections.h"
diff --git a/plugins/avahi/avahi-cluster.cpp b/plugins/avahi/avahi-cluster.cpp
index 5742d33..2bafa04 100644
--- a/plugins/avahi/avahi-cluster.cpp
+++ b/plugins/avahi/avahi-cluster.cpp
@@ -68,11 +68,3 @@ Avahi::Cluster::Cluster (Ekiga::ServiceCore &_core): core(_core)
 Avahi::Cluster::~Cluster ()
 {
 }
-
-
-bool
-Avahi::Cluster::populate_menu (Ekiga::MenuBuilder &/*builder*/)
-{
-  /* nothing */
-  return false;
-}
diff --git a/plugins/avahi/avahi-cluster.h b/plugins/avahi/avahi-cluster.h
index 58a2bfc..28578b2 100644
--- a/plugins/avahi/avahi-cluster.h
+++ b/plugins/avahi/avahi-cluster.h
@@ -61,8 +61,6 @@ namespace Avahi
 
     ~Cluster ();
 
-    bool populate_menu (Ekiga::MenuBuilder &builder);
-
     /* this is a service */
     const std::string get_name () const
     { return "avahi-core"; }
diff --git a/plugins/avahi/avahi-heap.cpp b/plugins/avahi/avahi-heap.cpp
index b495cb7..dcdfde1 100644
--- a/plugins/avahi/avahi-heap.cpp
+++ b/plugins/avahi/avahi-heap.cpp
@@ -147,18 +147,6 @@ Avahi::Heap::get_name () const
   return _("Neighbours");
 }
 
-bool
-Avahi::Heap::populate_menu (Ekiga::MenuBuilder& /*builder*/)
-{
-  return false;
-}
-
-bool
-Avahi::Heap::populate_menu_for_group (const std::string /*name*/,
-                                     Ekiga::MenuBuilder& /*builder*/)
-{
-  return false;
-}
 
 void
 Avahi::Heap::ClientCallback (AvahiClient *_client,
diff --git a/plugins/avahi/avahi-heap.h b/plugins/avahi/avahi-heap.h
index d012a9b..b59c723 100644
--- a/plugins/avahi/avahi-heap.h
+++ b/plugins/avahi/avahi-heap.h
@@ -72,12 +72,6 @@ namespace Avahi
 
     const std::string get_name () const;
 
-    bool populate_menu (Ekiga::MenuBuilder &builder);
-
-    bool populate_menu_for_group (const std::string name,
-                                 Ekiga::MenuBuilder& builder);
-
-
     /* The PresenceFetcher interface: we don't do what we're told ;-) */
     void fetch (std::string) {}
     void unfetch (std::string) {}
diff --git a/plugins/evolution/evolution-book.cpp b/plugins/evolution/evolution-book.cpp
index e28d2c2..ebe6fdd 100644
--- a/plugins/evolution/evolution-book.cpp
+++ b/plugins/evolution/evolution-book.cpp
@@ -303,14 +303,6 @@ Evolution::Book::get_ebook () const
   return book;
 }
 
-bool
-Evolution::Book::populate_menu (Ekiga::MenuBuilder &builder)
-{
-  builder.add_action ("add", _("A_dd Contact"),
-                     boost::bind (&Evolution::Book::new_contact_action, this));
-  return true;
-}
-
 void
 Evolution::Book::set_search_filter (const std::string _search_filter)
 {
diff --git a/plugins/evolution/evolution-book.h b/plugins/evolution/evolution-book.h
index 2024380..7ecd64d 100644
--- a/plugins/evolution/evolution-book.h
+++ b/plugins/evolution/evolution-book.h
@@ -76,8 +76,6 @@ namespace Evolution
 
     EBook *get_ebook () const;
 
-    bool populate_menu (Ekiga::MenuBuilder &builder);
-
     void set_search_filter (const std::string search_filter);
 
     const std::string get_search_filter () const;
diff --git a/plugins/evolution/evolution-contact.cpp b/plugins/evolution/evolution-contact.cpp
index bdab791..0b1784e 100644
--- a/plugins/evolution/evolution-contact.cpp
+++ b/plugins/evolution/evolution-contact.cpp
@@ -38,7 +38,6 @@
 
 #include "evolution-contact.h"
 #include "form-request-simple.h"
-#include "menu-builder-tools.h"
 
 /* at one point we will return a smart pointer on this... and if we don't use
  * a false smart pointer, we will crash : the reference count isn't embedded!
diff --git a/plugins/evolution/evolution-source.cpp b/plugins/evolution/evolution-source.cpp
index bac0ee1..cbee37d 100644
--- a/plugins/evolution/evolution-source.cpp
+++ b/plugins/evolution/evolution-source.cpp
@@ -231,13 +231,6 @@ Evolution::Source::~Source ()
 #endif
 }
 
-bool
-Evolution::Source::populate_menu (Ekiga::MenuBuilder &/*builder*/)
-{
-  /* FIXME: add back creating a new addressbook later */
-  return false;
-}
-
 void
 Evolution::Source::load ()
 {
diff --git a/plugins/evolution/evolution-source.h b/plugins/evolution/evolution-source.h
index 8b172b1..2ee27dc 100644
--- a/plugins/evolution/evolution-source.h
+++ b/plugins/evolution/evolution-source.h
@@ -70,8 +70,6 @@ namespace Evolution
 
     ~Source ();
 
-    bool populate_menu (Ekiga::MenuBuilder &builder);
-
     /* this object is an Ekiga::Service too */
     const std::string get_name () const
     { return "evolution-source"; }
diff --git a/plugins/ldap/ldap-book.cpp b/plugins/ldap/ldap-book.cpp
index eeabd21..eba4c94 100644
--- a/plugins/ldap/ldap-book.cpp
+++ b/plugins/ldap/ldap-book.cpp
@@ -443,20 +443,6 @@ OPENLDAP::Book::get_name () const
   return bookinfo.name;
 }
 
-bool
-OPENLDAP::Book::populate_menu (Ekiga::MenuBuilder &builder)
-{
-  builder.add_action ("refresh", _("_Refresh"),
-                     boost::bind (&OPENLDAP::Book::refresh, this));
-  builder.add_separator ();
-  builder.add_action ("remove", _("_Remove addressbook"),
-                     boost::bind (&OPENLDAP::Book::remove, this));
-  builder.add_action ("edit", _("Addressbook _properties"),
-                     boost::bind (&OPENLDAP::Book::edit, this));
-
-  return true;
-}
-
 void
 OPENLDAP::Book::set_search_filter (const std::string _search_filter)
 {
diff --git a/plugins/ldap/ldap-book.h b/plugins/ldap/ldap-book.h
index 5ebeea2..f57e4bc 100644
--- a/plugins/ldap/ldap-book.h
+++ b/plugins/ldap/ldap-book.h
@@ -107,8 +107,6 @@ namespace OPENLDAP
 
     const std::string get_name () const;
 
-    bool populate_menu (Ekiga::MenuBuilder &builder);
-
     void set_search_filter (const std::string search_string);
 
     const std::string get_search_filter () const;
diff --git a/plugins/ldap/ldap-contact.cpp b/plugins/ldap/ldap-contact.cpp
index 19bf757..9a3831d 100644
--- a/plugins/ldap/ldap-contact.cpp
+++ b/plugins/ldap/ldap-contact.cpp
@@ -36,7 +36,6 @@
  */
 
 #include "ldap-contact.h"
-#include "menu-builder-tools.h"
 
 /* at one point we will return a smart pointer on this... and if we don't use
  * a false smart pointer, we will crash : the reference count isn't embedded!
diff --git a/plugins/ldap/ldap-source.cpp b/plugins/ldap/ldap-source.cpp
index c9d3779..1c5a7ee 100644
--- a/plugins/ldap/ldap-source.cpp
+++ b/plugins/ldap/ldap-source.cpp
@@ -95,19 +95,6 @@ OPENLDAP::Source::common_add (BookPtr book)
   save ();
 }
 
-bool
-OPENLDAP::Source::populate_menu (Ekiga::MenuBuilder &builder)
-{
-  builder.add_action ("add", _("Add an LDAP Address Book"),
-                     boost::bind (&OPENLDAP::Source::new_book, this));
-  if (!has_ekiga_net_book ()) {
-
-    builder.add_action ("add", _("Add the Ekiga.net Directory"),
-                       boost::bind (&OPENLDAP::Source::new_ekiga_net_book, this));
-  }
-  return true;
-}
-
 void
 OPENLDAP::Source::new_book ()
 {
diff --git a/plugins/ldap/ldap-source.h b/plugins/ldap/ldap-source.h
index 7ef0ab4..4e1d21a 100644
--- a/plugins/ldap/ldap-source.h
+++ b/plugins/ldap/ldap-source.h
@@ -67,8 +67,6 @@ namespace OPENLDAP
 
     ~Source ();
 
-    bool populate_menu (Ekiga::MenuBuilder &builder);
-
     const std::string get_name () const
     { return "ldap-source"; }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]