[ekiga/gnome-2-26] Use the "get" method of gmref_ptr instead of doing "&*"

From: Eugen Dedu <ededu src gnome org>
To: svn-commits-list gnome org
Subject: [ekiga/gnome-2-26] Use the "get" method of gmref_ptr instead of doing "&*"
Date: Mon, 27 Apr 2009 11:58:35 -0400 (EDT)
commit b1630a879a838ecb73a54911770a9384398dbb7f
Author: Julien Puydt <jpuydt src gnome org>
Date:   Mon Mar 23 20:40:30 2009 +0000

    Use the "get" method of gmref_ptr instead of doing "&*"
    
    svn path=/trunk/; revision=7803
---
 .../videooutput-manager-common.cpp                 |    2 +-
 lib/engine/components/libnotify/libnotify-main.cpp |    2 +-
 .../local-roster/local-roster-bridge.cpp           |    2 +-
 .../mlogo-videoinput/videoinput-manager-mlogo.cpp  |    2 +-
 .../null-audioinput/audioinput-manager-null.cpp    |    2 +-
 .../null-audiooutput/audiooutput-manager-null.cpp  |    2 +-
 lib/engine/components/opal/h323-endpoint.cpp       |    2 +-
 lib/engine/components/opal/opal-call-manager.cpp   |    4 ++--
 lib/engine/components/opal/opal-call.cpp           |    2 +-
 lib/engine/components/opal/opal-videoinput.cpp     |    2 +-
 lib/engine/components/opal/opal-videooutput.cpp    |    2 +-
 lib/engine/components/opal/sip-endpoint.cpp        |    4 ++--
 .../components/ptlib/audioinput-manager-ptlib.cpp  |    2 +-
 .../components/ptlib/audiooutput-manager-ptlib.cpp |    2 +-
 .../components/ptlib/videoinput-manager-ptlib.cpp  |    2 +-
 lib/engine/gui/gtk-frontend/addressbook-window.cpp |    4 ++--
 lib/engine/gui/gtk-frontend/book-view-gtk.cpp      |    4 ++--
 .../gui/gtk-frontend/call-history-view-gtk.cpp     |    2 +-
 lib/engine/gui/gtk-frontend/chat-area.cpp          |    2 +-
 lib/engine/gui/gtk-frontend/presentity-view.cpp    |    2 +-
 lib/engine/gui/gtk-frontend/roster-view-gtk.cpp    |   16 ++++++++--------
 21 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/lib/engine/components/common-videooutput/videooutput-manager-common.cpp b/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
index ceb40e1..cba0104 100644
--- a/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
+++ b/lib/engine/components/common-videooutput/videooutput-manager-common.cpp
@@ -52,7 +52,7 @@ GMVideoOutputManager::GMVideoOutputManager(Ekiga::ServiceCore & _core)
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference on smart in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
 }
 
 GMVideoOutputManager::~GMVideoOutputManager ()
diff --git a/lib/engine/components/libnotify/libnotify-main.cpp b/lib/engine/components/libnotify/libnotify-main.cpp
index 6c3bfc0..89ba65f 100644
--- a/lib/engine/components/libnotify/libnotify-main.cpp
+++ b/lib/engine/components/libnotify/libnotify-main.cpp
@@ -166,7 +166,7 @@ LibNotify::on_notification_added (gmref_ptr<Ekiga::Notification> notification)
 				   urgency, NULL);
 
   g_signal_connect (notif, "closed",
-		    G_CALLBACK (on_notif_closed), &*notification);
+		    G_CALLBACK (on_notif_closed), notification.get ());
   sigc::connection conn = notification->removed.connect (sigc::bind (sigc::mem_fun (this, &LibNotify::on_notification_removed), notification));
 
   live[notification] = std::pair<sigc::connection, NotifyNotification*> (conn, notif);
diff --git a/lib/engine/components/local-roster/local-roster-bridge.cpp b/lib/engine/components/local-roster/local-roster-bridge.cpp
index 83acd10..e252352 100644
--- a/lib/engine/components/local-roster/local-roster-bridge.cpp
+++ b/lib/engine/components/local-roster/local-roster-bridge.cpp
@@ -91,7 +91,7 @@ Local::ContactDecorator::populate_menu (gmref_ptr<Ekiga::Contact> contact,
     if (!heap->has_presentity_with_uri (uri)) {
 
       builder.add_action ("add", _("Add to local roster"),
-			  sigc::bind (sigc::mem_fun (&*heap, &Local::Heap::new_presentity),
+			  sigc::bind (sigc::mem_fun (heap.get (), &Local::Heap::new_presentity),
 				      contact->get_name (), uri));
       populated = true;
     }
diff --git a/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp b/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
index 93abd44..4eba7ec 100644
--- a/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
+++ b/lib/engine/components/mlogo-videoinput/videoinput-manager-mlogo.cpp
@@ -46,7 +46,7 @@ GMVideoInputManager_mlogo::GMVideoInputManager_mlogo (Ekiga::ServiceCore & _core
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // keep a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state.opened  = false;
 }
 
diff --git a/lib/engine/components/null-audioinput/audioinput-manager-null.cpp b/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
index 761214d..24a678b 100644
--- a/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
+++ b/lib/engine/components/null-audioinput/audioinput-manager-null.cpp
@@ -44,7 +44,7 @@ GMAudioInputManager_null::GMAudioInputManager_null (Ekiga::ServiceCore & _core)
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state.opened = false;
 }
 
diff --git a/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp b/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
index 8a3d574..40b2496 100644
--- a/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
+++ b/lib/engine/components/null-audiooutput/audiooutput-manager-null.cpp
@@ -43,7 +43,7 @@ GMAudioOutputManager_null::GMAudioOutputManager_null (Ekiga::ServiceCore & _core
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state[Ekiga::primary].opened = false;
   current_state[Ekiga::secondary].opened = false;
 }
diff --git a/lib/engine/components/opal/h323-endpoint.cpp b/lib/engine/components/opal/h323-endpoint.cpp
index 50d5adf..6639c19 100644
--- a/lib/engine/components/opal/h323-endpoint.cpp
+++ b/lib/engine/components/opal/h323-endpoint.cpp
@@ -96,7 +96,7 @@ Opal::H323::EndPoint::EndPoint (Opal::CallManager & _manager, Ekiga::ServiceCore
   {
     gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
     smart->reference (); // take a reference in the main thread
-    runtime = &*smart;
+    runtime = smart.get ();
   }
 
   /* Initial requested bandwidth */
diff --git a/lib/engine/components/opal/opal-call-manager.cpp b/lib/engine/components/opal/opal-call-manager.cpp
index c1d03a9..35c4628 100644
--- a/lib/engine/components/opal/opal-call-manager.cpp
+++ b/lib/engine/components/opal/opal-call-manager.cpp
@@ -144,7 +144,7 @@ CallManager::CallManager (Ekiga::ServiceCore & _core)
   {
     gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
     smart->reference (); // take a reference in the main thread
-    runtime = &*smart;
+    runtime = smart.get ();
   }
 
   // used to communicate with the StunDetector
@@ -642,7 +642,7 @@ OpalCall *CallManager::CreateCall ()
   gmref_ptr<Opal::Call> call (new Opal::Call (*this, core));
   call_core->add_call (call, gmref_ptr<CallManager>(this));
 
-  return &*call;
+  return call.get ();
 }
 
 
diff --git a/lib/engine/components/opal/opal-call.cpp b/lib/engine/components/opal/opal-call.cpp
index 4c032de..155c3fe 100644
--- a/lib/engine/components/opal/opal-call.cpp
+++ b/lib/engine/components/opal/opal-call.cpp
@@ -80,7 +80,7 @@ Opal::Call::Call (OpalManager & _manager, Ekiga::ServiceCore & _core)
   {
     gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
     smart->reference (); // take a reference in the main thread
-    runtime = &*smart;
+    runtime = smart.get ();
   }
   re_a_bytes = tr_a_bytes = re_v_bytes = tr_v_bytes = 0.0;
   last_v_tick = last_a_tick = PTime ();
diff --git a/lib/engine/components/opal/opal-videoinput.cpp b/lib/engine/components/opal/opal-videoinput.cpp
index 34c28ca..e23fc46 100644
--- a/lib/engine/components/opal/opal-videoinput.cpp
+++ b/lib/engine/components/opal/opal-videoinput.cpp
@@ -83,7 +83,7 @@ PVideoInputDevice_EKIGA::PVideoInputDevice_EKIGA (Ekiga::ServiceCore & _core):
   {
     gmref_ptr<Ekiga::VideoInputCore> smart = core.get ("videoinput-core");
     smart->reference (); // take a reference in the main thread
-    videoinput_core = &*smart;
+    videoinput_core = smart.get ();
   }
   opened = false;
   is_active = false;
diff --git a/lib/engine/components/opal/opal-videooutput.cpp b/lib/engine/components/opal/opal-videooutput.cpp
index c1a97a5..457699e 100644
--- a/lib/engine/components/opal/opal-videooutput.cpp
+++ b/lib/engine/components/opal/opal-videooutput.cpp
@@ -90,7 +90,7 @@ PVideoOutputDevice_EKIGA::PVideoOutputDevice_EKIGA (Ekiga::ServiceCore & _core)
  {
    gmref_ptr<Ekiga::VideoOutputCore> smart = core.get ("videooutput-core");
    smart->reference (); // take a reference in the main thread
-   videooutput_core = &*smart;
+   videooutput_core = smart.get ();
  }
 
   is_active = FALSE;
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index c19b14a..764deb2 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -134,12 +134,12 @@ Opal::Sip::EndPoint::EndPoint (Opal::CallManager & _manager,
   {
     gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
     smart->reference (); // take a reference in the main thread
-    runtime = &*smart;
+    runtime = smart.get ();
   }
   {
     gmref_ptr<Opal::Bank> smart = core.get ("opal-account-store");
     smart->reference (); // take a reference in the main thread
-    bank = &*smart;
+    bank = smart.get ();
   }
 
 
diff --git a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
index 7c0cd34..7f1a216 100644
--- a/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp
@@ -47,7 +47,7 @@ GMAudioInputManager_ptlib::GMAudioInputManager_ptlib (Ekiga::ServiceCore & _core
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state.opened = false;
   input_device = NULL;
   expectedFrameSize = 0;
diff --git a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
index 178765b..fda5b21 100644
--- a/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp
@@ -46,7 +46,7 @@ GMAudioOutputManager_ptlib::GMAudioOutputManager_ptlib (Ekiga::ServiceCore & _co
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state[Ekiga::primary].opened = false;
   current_state[Ekiga::secondary].opened = false;
   output_device[Ekiga::primary] = NULL;
diff --git a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
index beb0d8a..79ca94e 100644
--- a/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
+++ b/lib/engine/components/ptlib/videoinput-manager-ptlib.cpp
@@ -46,7 +46,7 @@ GMVideoInputManager_ptlib::GMVideoInputManager_ptlib (Ekiga::ServiceCore & _core
 {
   gmref_ptr<Ekiga::Runtime> smart = core.get ("runtime");
   smart->reference (); // take a reference in the main thread
-  runtime = &*smart;
+  runtime = smart.get ();
   current_state.opened = false;
   input_device = NULL;
   expectedFrameSize = 0;
diff --git a/lib/engine/gui/gtk-frontend/addressbook-window.cpp b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
index c8eb107..3136ea9 100644
--- a/lib/engine/gui/gtk-frontend/addressbook-window.cpp
+++ b/lib/engine/gui/gtk-frontend/addressbook-window.cpp
@@ -449,7 +449,7 @@ addressbook_window_add_book (AddressBookWindow *self,
   gtk_tree_store_set (GTK_TREE_STORE (store), &iter,
                       COLUMN_PIXBUF, icon, 
                       COLUMN_NAME, book->get_name ().c_str (),
-                      COLUMN_BOOK_POINTER, &*book, 
+                      COLUMN_BOOK_POINTER, book.get (), 
                       COLUMN_VIEW, view,
                       -1);
 
@@ -533,7 +533,7 @@ find_iter_for_book (AddressBookWindow *self,
                           COLUMN_BOOK_POINTER, &book_iter,
                           -1);
 
-      if (&*book == book_iter) {
+      if (book.get () == book_iter) {
 
         break;
       }
diff --git a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
index 2689e45..34609a2 100644
--- a/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/book-view-gtk.cpp
@@ -352,7 +352,7 @@ book_view_gtk_add_contact (BookViewGtk *self,
   store = GTK_LIST_STORE (model);
 
   gtk_list_store_append (store, &iter);
-  gtk_list_store_set (store, &iter, COLUMN_CONTACT_POINTER, &*contact, -1);
+  gtk_list_store_set (store, &iter, COLUMN_CONTACT_POINTER, contact.get (), -1);
   book_view_gtk_update_contact (self, contact, &iter);
 }
 
@@ -417,7 +417,7 @@ book_view_gtk_find_iter_for_contact (BookViewGtk *view,
       gtk_tree_model_get (model, iter,
                           COLUMN_CONTACT_POINTER, &iter_contact,
                           -1);
-      if (iter_contact == &*contact)
+      if (iter_contact == contact.get ())
         found = TRUE;
 
     } while (!found && gtk_tree_model_iter_next (model, iter));
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 66065c9..e1ce825 100644
--- a/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/call-history-view-gtk.cpp
@@ -118,7 +118,7 @@ on_contact_added (gmref_ptr<Ekiga::Contact> contact,
 
   gtk_list_store_prepend (store, &iter);
   gtk_list_store_set (store, &iter,
-		      COLUMN_CONTACT, &*contact,
+		      COLUMN_CONTACT, contact.get (),
 		      COLUMN_PIXBUF, id,
 		      COLUMN_NAME, contact->get_name ().c_str (),
 		      COLUMN_INFO, info.str ().c_str (),
diff --git a/lib/engine/gui/gtk-frontend/chat-area.cpp b/lib/engine/gui/gtk-frontend/chat-area.cpp
index f1a1fe0..77523a4 100644
--- a/lib/engine/gui/gtk-frontend/chat-area.cpp
+++ b/lib/engine/gui/gtk-frontend/chat-area.cpp
@@ -1009,7 +1009,7 @@ GtkWidget*
 chat_area_new (gmref_ptr<Ekiga::Chat> chat)
 {
   return (GtkWidget*)g_object_new (TYPE_CHAT_AREA,
-				   "chat", &*chat,
+				   "chat", chat.get (),
 				   NULL);
 }
 
diff --git a/lib/engine/gui/gtk-frontend/presentity-view.cpp b/lib/engine/gui/gtk-frontend/presentity-view.cpp
index d42287d..a5a799d 100644
--- a/lib/engine/gui/gtk-frontend/presentity-view.cpp
+++ b/lib/engine/gui/gtk-frontend/presentity-view.cpp
@@ -252,6 +252,6 @@ GtkWidget*
 presentity_view_new (gmref_ptr<Ekiga::Presentity> presentity)
 {
   return (GtkWidget*)g_object_new (TYPE_PRESENTITY_VIEW,
-				   "presentity", &*presentity,
+				   "presentity", presentity.get (),
 				   NULL);
 }
diff --git a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
index 375c926..6921777 100644
--- a/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
+++ b/lib/engine/gui/gtk-frontend/roster-view-gtk.cpp
@@ -912,7 +912,7 @@ on_heap_updated (gmref_ptr<Ekiga::Cluster> /*cluster*/,
 
   gtk_tree_store_set (self->priv->store, &iter,
 		      COLUMN_TYPE, TYPE_HEAP,
-		      COLUMN_HEAP, &*heap,
+		      COLUMN_HEAP, heap.get (),
 		      COLUMN_NAME, heap->get_name ().c_str (),
 		      -1);
   gtk_tree_view_expand_all (self->priv->tree_view);
@@ -974,8 +974,8 @@ on_presentity_added (gmref_ptr<Ekiga::Cluster> /*cluster*/,
     gtk_tree_store_set (self->priv->store, &iter,
 			COLUMN_TYPE, TYPE_PRESENTITY,
 			COLUMN_OFFLINE, active,
-			COLUMN_HEAP, &*heap,
-			COLUMN_PRESENTITY, &*presentity,
+			COLUMN_HEAP, heap.get (),
+			COLUMN_PRESENTITY, presentity.get (),
 			COLUMN_NAME, presentity->get_name ().c_str (),
 			COLUMN_STATUS, presentity->get_status ().c_str (),
 			COLUMN_PRESENCE, presentity->get_presence ().c_str (),
@@ -991,8 +991,8 @@ on_presentity_added (gmref_ptr<Ekiga::Cluster> /*cluster*/,
     gtk_tree_store_set (self->priv->store, &iter,
 			COLUMN_TYPE, TYPE_PRESENTITY,
 			COLUMN_OFFLINE, active,
-			COLUMN_HEAP, &*heap,
-			COLUMN_PRESENTITY, &*presentity,
+			COLUMN_HEAP, heap.get (),
+			COLUMN_PRESENTITY, presentity.get (),
 			COLUMN_NAME, presentity->get_name ().c_str (),
 			COLUMN_STATUS, presentity->get_status ().c_str (),
 			COLUMN_PRESENCE, presentity->get_presence ().c_str (),
@@ -1111,7 +1111,7 @@ roster_view_gtk_find_iter_for_heap (RosterViewGtk *view,
     do {
 
       gtk_tree_model_get (model, iter, COLUMN_HEAP, &iter_heap, -1);
-      if (iter_heap == &*heap)
+      if (iter_heap == heap.get ())
 	found = TRUE;
     } while (!found && gtk_tree_model_iter_next (model, iter));
   }
@@ -1151,7 +1151,7 @@ roster_view_gtk_find_iter_for_group (RosterViewGtk *view,
     gtk_tree_store_append (view->priv->store, iter, heap_iter);
     gtk_tree_store_set (view->priv->store, iter,
                         COLUMN_TYPE, TYPE_GROUP,
-			COLUMN_HEAP, &*heap,
+			COLUMN_HEAP, heap.get (),
                         COLUMN_NAME, name.c_str (),
                         -1);
   }
@@ -1175,7 +1175,7 @@ roster_view_gtk_find_iter_for_presentity (RosterViewGtk *view,
     do {
 
       gtk_tree_model_get (model, iter, COLUMN_PRESENTITY, &iter_presentity, -1);
-      if (iter_presentity == &*presentity)
+      if (iter_presentity == presentity.get ())
 	found = TRUE;
     } while (!found && gtk_tree_model_iter_next (model, iter));
   }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]