ekiga r7815 - in trunk/lib/engine: chat components/echo components/opal gui/gtk-frontend

[jpuydt svn gnome org]

Author: jpuydt
Date: Tue Mar 24 21:08:39 2009
New Revision: 7815
URL: http://svn.gnome.org/viewvc/ekiga?rev=7815&view=rev

Log:
Syntactic sugar for the chat stack too (FooPtr for gmref_ptr<Foo>)

Modified:
   trunk/lib/engine/chat/chat-core.cpp
   trunk/lib/engine/chat/chat-core.h
   trunk/lib/engine/chat/chat-multiple.h
   trunk/lib/engine/chat/chat-simple.h
   trunk/lib/engine/chat/dialect-impl.h
   trunk/lib/engine/chat/dialect.h
   trunk/lib/engine/components/echo/echo-dialect.cpp
   trunk/lib/engine/components/echo/echo-dialect.h
   trunk/lib/engine/components/echo/echo-simple.h
   trunk/lib/engine/components/opal/sip-chat-simple.h
   trunk/lib/engine/components/opal/sip-dialect.cpp
   trunk/lib/engine/components/opal/sip-dialect.h
   trunk/lib/engine/gui/gtk-frontend/chat-window.cpp
   trunk/lib/engine/gui/gtk-frontend/multiple-chat-page.cpp
   trunk/lib/engine/gui/gtk-frontend/multiple-chat-page.h
   trunk/lib/engine/gui/gtk-frontend/simple-chat-page.cpp
   trunk/lib/engine/gui/gtk-frontend/simple-chat-page.h

Modified: trunk/lib/engine/chat/chat-core.cpp
==============================================================================
--- trunk/lib/engine/chat/chat-core.cpp	(original)
+++ trunk/lib/engine/chat/chat-core.cpp	Tue Mar 24 21:08:39 2009
@@ -42,7 +42,7 @@
 }
 
 void
-Ekiga::ChatCore::add_dialect (gmref_ptr<Dialect> dialect)
+Ekiga::ChatCore::add_dialect (DialectPtr dialect)
 {
   dialects.push_back (dialect);
   dialect->questions.add_handler (questions.make_slot ());
@@ -50,11 +50,11 @@
 }
 
 void
-Ekiga::ChatCore::visit_dialects (sigc::slot1<bool, gmref_ptr<Dialect> > visitor)
+Ekiga::ChatCore::visit_dialects (sigc::slot1<bool, DialectPtr > visitor)
 {
   bool go_on = true;
 
-  for (std::list<gmref_ptr<Dialect> >::iterator iter = dialects.begin ();
+  for (std::list<DialectPtr >::iterator iter = dialects.begin ();
        iter != dialects.end () && go_on;
        iter++)
     go_on = visitor (*iter);
@@ -65,7 +65,7 @@
 {
   bool result = false;
 
-  for (std::list<gmref_ptr<Dialect> >::iterator iter = dialects.begin ();
+  for (std::list<DialectPtr >::iterator iter = dialects.begin ();
        iter != dialects.end ();
        ++iter)
     result = (*iter)->populate_menu (builder) || result;

Modified: trunk/lib/engine/chat/chat-core.h
==============================================================================
--- trunk/lib/engine/chat/chat-core.h	(original)
+++ trunk/lib/engine/chat/chat-core.h	Tue Mar 24 21:08:39 2009
@@ -88,23 +88,23 @@
     /** Adds a dialect to the ContactCore service.
      * @param The dialect to be added.
      */
-    void add_dialect (gmref_ptr<Dialect> dialect);
+    void add_dialect (DialectPtr dialect);
 
     /** Triggers a callback for all Ekiga::Dialect dialects of the
      * ChatCore service.
      * @param The callback (the return value means "go on" and allows stopping
      * the visit)
      */
-    void visit_dialects (sigc::slot1<bool, gmref_ptr<Dialect> > visitor);
+    void visit_dialects (sigc::slot1<bool, DialectPtr > visitor);
 
     /** This signal is emitted when an Ekiga::Dialect has been added to
      * the ChatCore service.
      */
-    sigc::signal1<void, gmref_ptr<Dialect> > dialect_added;
+    sigc::signal1<void, DialectPtr > dialect_added;
 
   private:
 
-    std::list<gmref_ptr<Dialect> > dialects;
+    std::list<DialectPtr > dialects;
 
     /*** Misc ***/
   public:

Modified: trunk/lib/engine/chat/chat-multiple.h
==============================================================================
--- trunk/lib/engine/chat/chat-multiple.h	(original)
+++ trunk/lib/engine/chat/chat-multiple.h	Tue Mar 24 21:08:39 2009
@@ -60,6 +60,8 @@
     virtual HeapPtr get_heap () const = 0;
   };
 
+  typedef gmref_ptr<MultipleChat> MultipleChatPtr;
+
 };
 
 #endif

Modified: trunk/lib/engine/chat/chat-simple.h
==============================================================================
--- trunk/lib/engine/chat/chat-simple.h	(original)
+++ trunk/lib/engine/chat/chat-simple.h	Tue Mar 24 21:08:39 2009
@@ -60,6 +60,7 @@
     virtual PresentityPtr get_presentity () const = 0;
   };
 
+  typedef gmref_ptr<SimpleChat> SimpleChatPtr;
 };
 
 #endif

Modified: trunk/lib/engine/chat/dialect-impl.h
==============================================================================
--- trunk/lib/engine/chat/dialect-impl.h	(original)
+++ trunk/lib/engine/chat/dialect-impl.h	Tue Mar 24 21:08:39 2009
@@ -63,13 +63,13 @@
      * @param: The callback (the return value means "go on" and allows
      * stopping the visit)
      */
-    void visit_simple_chats (sigc::slot1<bool, gmref_ptr<SimpleChat> > visitor);
+    void visit_simple_chats (sigc::slot1<bool, SimpleChatPtr > visitor);
 
     /** Triggers a callback for all multiple chats of the Dialect.
      * @param: The callback (the return value means "go on" and allows
      * stopping the visit)
      */
-    void visit_multiple_chats (sigc::slot1<bool, gmref_ptr<MultipleChat> > visitor);
+    void visit_multiple_chats (sigc::slot1<bool, MultipleChatPtr > visitor);
 
   protected:
 
@@ -159,7 +159,7 @@
 
 template<typename SimpleChatType, typename MultipleChatType>
 void
-Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_simple_chats (sigc::slot1<bool, gmref_ptr<SimpleChat> > visitor)
+Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_simple_chats (sigc::slot1<bool, SimpleChatPtr > visitor)
 {
   bool go_on = true;
 
@@ -173,7 +173,7 @@
 
 template<typename SimpleChatType, typename MultipleChatType>
 void
-Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_multiple_chats (sigc::slot1<bool, gmref_ptr<MultipleChat> > visitor)
+Ekiga::DialectImpl<SimpleChatType, MultipleChatType>::visit_multiple_chats (sigc::slot1<bool, MultipleChatPtr > visitor)
 {
   bool go_on = true;
 

Modified: trunk/lib/engine/chat/dialect.h
==============================================================================
--- trunk/lib/engine/chat/dialect.h	(original)
+++ trunk/lib/engine/chat/dialect.h	Tue Mar 24 21:08:39 2009
@@ -55,13 +55,13 @@
      * @param: The callback (the return value means "go on" and allows
      * stopping the visit)
      */
-    virtual void visit_simple_chats (sigc::slot1<bool, gmref_ptr<SimpleChat> > visitor) = 0;
+    virtual void visit_simple_chats (sigc::slot1<bool, SimpleChatPtr > visitor) = 0;
 
     /** Triggers a callback for all multiple chats of the Dialect.
      * @param: The callback (the return value means "go on" and allows
      * stopping the visit)
      */
-    virtual void visit_multiple_chats (sigc::slot1<bool, gmref_ptr<MultipleChat> > visitor) = 0;
+    virtual void visit_multiple_chats (sigc::slot1<bool, MultipleChatPtr > visitor) = 0;
 
 
     /** Feed possible actions on this Dialect to the given MenuBuilder
@@ -72,18 +72,20 @@
     /** This signal is emitted when an Ekiga::SimpleChat has been added to
      * the dialect.
      */
-    sigc::signal1<void, gmref_ptr<SimpleChat> > simple_chat_added;
+    sigc::signal1<void, SimpleChatPtr> simple_chat_added;
 
     /** This signal is emitted when an Ekiga::MultipleChat has been added to
      * the dialect.
      */
-    sigc::signal1<void, gmref_ptr<MultipleChat> > multiple_chat_added;
+    sigc::signal1<void, MultipleChatPtr> multiple_chat_added;
 
     /** This chain allows the Dialect to present forms to the user.
      */
     ChainOfResponsibility<FormRequest*> questions;
   };
 
+  typedef gmref_ptr<Dialect> DialectPtr;
+
 };
 
 #endif

Modified: trunk/lib/engine/components/echo/echo-dialect.cpp
==============================================================================
--- trunk/lib/engine/components/echo/echo-dialect.cpp	(original)
+++ trunk/lib/engine/components/echo/echo-dialect.cpp	Tue Mar 24 21:08:39 2009
@@ -60,7 +60,7 @@
 void
 Echo::Dialect::new_chat ()
 {
-  gmref_ptr<SimpleChat> chat (new SimpleChat);
+  SimpleChatPtr chat (new SimpleChat);
   add_simple_chat (chat);
   chat->user_requested.emit ();
 }

Modified: trunk/lib/engine/components/echo/echo-dialect.h
==============================================================================
--- trunk/lib/engine/components/echo/echo-dialect.h	(original)
+++ trunk/lib/engine/components/echo/echo-dialect.h	Tue Mar 24 21:08:39 2009
@@ -64,6 +64,9 @@
 
     void new_chat ();
   };
+
+  typedef gmref_ptr<Dialect> DialectPtr;
+
 };
 
 #endif

Modified: trunk/lib/engine/components/echo/echo-simple.h
==============================================================================
--- trunk/lib/engine/components/echo/echo-simple.h	(original)
+++ trunk/lib/engine/components/echo/echo-simple.h	Tue Mar 24 21:08:39 2009
@@ -66,6 +66,9 @@
     std::list<gmref_ptr<Ekiga::ChatObserver> > observers;
     PresentityPtr presentity;
   };
+
+  typedef gmref_ptr<SimpleChat> SimpleChatPtr;
+
 };
 
 #endif

Modified: trunk/lib/engine/components/opal/sip-chat-simple.h
==============================================================================
--- trunk/lib/engine/components/opal/sip-chat-simple.h	(original)
+++ trunk/lib/engine/components/opal/sip-chat-simple.h	Tue Mar 24 21:08:39 2009
@@ -79,6 +79,9 @@
     Ekiga::PresentityPtr presentity;
     std::string uri;
   };
+
+  typedef gmref_ptr<SimpleChat> SimpleChatPtr;
+
 };
 
 #endif

Modified: trunk/lib/engine/components/opal/sip-dialect.cpp
==============================================================================
--- trunk/lib/engine/components/opal/sip-dialect.cpp	(original)
+++ trunk/lib/engine/components/opal/sip-dialect.cpp	Tue Mar 24 21:08:39 2009
@@ -54,7 +54,7 @@
 			    const std::string name,
 			    const std::string msg)
 {
-  gmref_ptr<SimpleChat> chat;
+  SimpleChatPtr chat;
 
   chat = open_chat_with (uri, name, false);
 
@@ -66,7 +66,7 @@
 			   const std::string name,
 			   const std::string msg)
 {
-  gmref_ptr<SimpleChat> chat;
+  SimpleChatPtr chat;
 
   chat = open_chat_with (uri, name, false);
 
@@ -91,7 +91,7 @@
 			      std::string name,
 			      bool user_request)
 {
-  gmref_ptr<SimpleChat> result;
+  SimpleChatPtr result;
 
   for (simple_iterator iter = simple_begin ();
        iter != simple_end ();
@@ -101,7 +101,7 @@
 
   if ( !result) {
 
-    result = gmref_ptr<SimpleChat> (new SimpleChat (core, name, uri, sigc::bind<0>(sender, uri)));
+    result = SimpleChatPtr (new SimpleChat (core, name, uri, sigc::bind<0>(sender, uri)));
     add_simple_chat (result);
   }
 

Modified: trunk/lib/engine/components/opal/sip-dialect.h
==============================================================================
--- trunk/lib/engine/components/opal/sip-dialect.h	(original)
+++ trunk/lib/engine/components/opal/sip-dialect.h	Tue Mar 24 21:08:39 2009
@@ -70,10 +70,13 @@
     /* the strings are : uri then msg */
     sigc::slot2<bool, std::string, std::string> sender;
 
-    gmref_ptr<SimpleChat> open_chat_with (std::string uri,
+    SimpleChatPtr open_chat_with (std::string uri,
 					  std::string name,
 					  bool user_request);
   };
+
+  typedef gmref_ptr<Dialect> DialectPtr;
+
 };
 
 #endif

Modified: trunk/lib/engine/gui/gtk-frontend/chat-window.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/chat-window.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/chat-window.cpp	Tue Mar 24 21:08:39 2009
@@ -88,11 +88,11 @@
 				     gpointer data);
 
 static bool on_dialect_added (ChatWindow* self,
-			      gmref_ptr<Ekiga::Dialect> dialect);
+			      Ekiga::DialectPtr dialect);
 static bool on_simple_chat_added (ChatWindow* self,
-				  gmref_ptr<Ekiga::SimpleChat> chat);
+				  Ekiga::SimpleChatPtr chat);
 static bool on_multiple_chat_added (ChatWindow* self,
-				    gmref_ptr<Ekiga::MultipleChat> chat);
+				    Ekiga::MultipleChatPtr chat);
 static void on_some_chat_user_requested (ChatWindow* self,
 					 GtkWidget* page);
 
@@ -265,7 +265,7 @@
 
 static bool
 on_dialect_added (ChatWindow* self,
-		  gmref_ptr<Ekiga::Dialect> dialect)
+		  Ekiga::DialectPtr dialect)
 {
   self->priv->connections.push_front (dialect->simple_chat_added.connect (sigc::hide_return (sigc::bind<0> (sigc::ptr_fun (on_simple_chat_added), self))));
   self->priv->connections.push_front (dialect->multiple_chat_added.connect (sigc::hide_return (sigc::bind<0> (sigc::ptr_fun (on_multiple_chat_added), self))));
@@ -278,7 +278,7 @@
 
 static bool
 on_simple_chat_added (ChatWindow* self,
-		      gmref_ptr<Ekiga::SimpleChat> chat)
+		      Ekiga::SimpleChatPtr chat)
 {
   GtkWidget* page = NULL;
   GtkWidget* hbox = NULL;
@@ -326,7 +326,7 @@
 
 static bool
 on_multiple_chat_added (ChatWindow* self,
-			gmref_ptr<Ekiga::MultipleChat> chat)
+			Ekiga::MultipleChatPtr chat)
 {
   GtkWidget* page = NULL;
   GtkWidget* label = NULL;

Modified: trunk/lib/engine/gui/gtk-frontend/multiple-chat-page.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/multiple-chat-page.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/multiple-chat-page.cpp	Tue Mar 24 21:08:39 2009
@@ -133,7 +133,7 @@
 /* implementation of the public api */
 
 GtkWidget*
-multiple_chat_page_new (gmref_ptr<Ekiga::MultipleChat> chat)
+multiple_chat_page_new (Ekiga::MultipleChatPtr chat)
 {
   MultipleChatPage* result = NULL;
   GtkWidget* area = NULL;

Modified: trunk/lib/engine/gui/gtk-frontend/multiple-chat-page.h
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/multiple-chat-page.h	(original)
+++ trunk/lib/engine/gui/gtk-frontend/multiple-chat-page.h	Tue Mar 24 21:08:39 2009
@@ -45,7 +45,7 @@
 
 /* public api */
 
-GtkWidget* multiple_chat_page_new (gmref_ptr<Ekiga::MultipleChat> chat);
+GtkWidget* multiple_chat_page_new (Ekiga::MultipleChatPtr chat);
 
 /* GObject boilerplate */
 

Modified: trunk/lib/engine/gui/gtk-frontend/simple-chat-page.cpp
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/simple-chat-page.cpp	(original)
+++ trunk/lib/engine/gui/gtk-frontend/simple-chat-page.cpp	Tue Mar 24 21:08:39 2009
@@ -162,7 +162,7 @@
 /* implementation of the public api */
 
 GtkWidget*
-simple_chat_page_new (gmref_ptr<Ekiga::SimpleChat> chat)
+simple_chat_page_new (Ekiga::SimpleChatPtr chat)
 {
   SimpleChatPage* result = NULL;
   GtkWidget* presentity_view = NULL;

Modified: trunk/lib/engine/gui/gtk-frontend/simple-chat-page.h
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/simple-chat-page.h	(original)
+++ trunk/lib/engine/gui/gtk-frontend/simple-chat-page.h	Tue Mar 24 21:08:39 2009
@@ -45,7 +45,7 @@
 
 /* public api */
 
-GtkWidget* simple_chat_page_new (gmref_ptr<Ekiga::SimpleChat> chat);
+GtkWidget* simple_chat_page_new (Ekiga::SimpleChatPtr chat);
 
 /* GObject boilerplate */