[gnome-commander] GnomeCmdConList: more C++ rework

[Piotr Eljasiak <epiotr src gnome org>]

commit 9fe9b8299988a9a6431f8e47f37e4fb4a201d638
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Mon Sep 5 21:28:28 2011 +0200

    GnomeCmdConList: more C++ rework

 src/gnome-cmd-con-list.cc      |   46 +++++++++++++++++++--------------------
 src/gnome-cmd-con-list.h       |    7 +++--
 src/gnome-cmd-data.cc          |    4 +-
 src/gnome-cmd-remote-dialog.cc |    4 +-
 4 files changed, 30 insertions(+), 31 deletions(-)
---
diff --git a/src/gnome-cmd-con-list.cc b/src/gnome-cmd-con-list.cc
index b35e0e1..ff0f080 100755
--- a/src/gnome-cmd-con-list.cc
+++ b/src/gnome-cmd-con-list.cc
@@ -206,50 +206,48 @@ void GnomeCmdConList::unlock()
 }
 
 
-void gnome_cmd_con_list_add_ftp (GnomeCmdConList *con_list, GnomeCmdConFtp *ftp_con)
+void GnomeCmdConList::add(GnomeCmdConFtp *con)
 {
-    g_return_if_fail (GNOME_CMD_IS_CON_LIST (con_list));
-    g_return_if_fail (g_list_index (con_list->priv->all_cons, ftp_con) == -1);
-    g_return_if_fail (g_list_index (con_list->priv->ftp_cons, ftp_con) == -1);
+    g_return_if_fail (g_list_index (priv->all_cons, con) == -1);
+    g_return_if_fail (g_list_index (priv->ftp_cons, con) == -1);
 
-    con_list->priv->all_cons = g_list_append (con_list->priv->all_cons, ftp_con);
-    con_list->priv->ftp_cons = g_list_append (con_list->priv->ftp_cons, ftp_con);
+    priv->all_cons = g_list_append (priv->all_cons, con);
+    priv->ftp_cons = g_list_append (priv->ftp_cons, con);
 
-    g_signal_connect (ftp_con, "updated", G_CALLBACK (on_con_updated), con_list);
+    g_signal_connect (con, "updated", G_CALLBACK (on_con_updated), this);
 
-    if (con_list->priv->update_lock)
+    if (priv->update_lock)
     {
-        con_list->priv->changed = TRUE;
-        con_list->priv->ftp_cons_changed = TRUE;
+        priv->changed = TRUE;
+        priv->ftp_cons_changed = TRUE;
     }
     else
     {
-        gtk_signal_emit (GTK_OBJECT (con_list), signals[LIST_CHANGED]);
-        gtk_signal_emit (GTK_OBJECT (con_list), signals[FTP_LIST_CHANGED]);
+        gtk_signal_emit (*this, signals[LIST_CHANGED]);
+        gtk_signal_emit (*this, signals[FTP_LIST_CHANGED]);
     }
 }
 
 
-void gnome_cmd_con_list_remove_ftp (GnomeCmdConList *con_list, GnomeCmdConFtp *ftp_con)
+void GnomeCmdConList::remove(GnomeCmdConFtp *con)
 {
-    g_return_if_fail (GNOME_CMD_IS_CON_LIST (con_list));
-    g_return_if_fail (g_list_index (con_list->priv->all_cons, ftp_con) != -1);
-    g_return_if_fail (g_list_index (con_list->priv->ftp_cons, ftp_con) != -1);
+    g_return_if_fail (g_list_index (priv->all_cons, con) != -1);
+    g_return_if_fail (g_list_index (priv->ftp_cons, con) != -1);
 
-    con_list->priv->all_cons = g_list_remove (con_list->priv->all_cons, ftp_con);
-    con_list->priv->ftp_cons = g_list_remove (con_list->priv->ftp_cons, ftp_con);
+    priv->all_cons = g_list_remove (priv->all_cons, con);
+    priv->ftp_cons = g_list_remove (priv->ftp_cons, con);
 
-    g_signal_handlers_disconnect_by_func (ftp_con, (gpointer) on_con_updated, con_list);
+    g_signal_handlers_disconnect_by_func (con, (gpointer) on_con_updated, this);
 
-    if (con_list->priv->update_lock)
+    if (priv->update_lock)
     {
-        con_list->priv->changed = TRUE;
-        con_list->priv->ftp_cons_changed = TRUE;
+        priv->changed = TRUE;
+        priv->ftp_cons_changed = TRUE;
     }
     else
     {
-        gtk_signal_emit (GTK_OBJECT (con_list), signals[LIST_CHANGED]);
-        gtk_signal_emit (GTK_OBJECT (con_list), signals[FTP_LIST_CHANGED]);
+        gtk_signal_emit (*this, signals[LIST_CHANGED]);
+        gtk_signal_emit (*this, signals[FTP_LIST_CHANGED]);
     }
 }
 
diff --git a/src/gnome-cmd-con-list.h b/src/gnome-cmd-con-list.h
index d779eb8..27a7e9b 100755
--- a/src/gnome-cmd-con-list.h
+++ b/src/gnome-cmd-con-list.h
@@ -51,6 +51,10 @@ struct GnomeCmdConList
     void lock();
     void unlock();
 
+    void add(GnomeCmdConFtp *con);
+
+    void remove(GnomeCmdConFtp *con);
+
     GnomeCmdCon *find_alias(const gchar *alias) const;
     gboolean has_alias(const gchar *alias) const            {  return find_alias(alias)!=NULL;  }
 };
@@ -77,9 +81,6 @@ inline GnomeCmdConList *gnome_cmd_con_list_get ()
     return (GnomeCmdConList *) gnome_cmd_data_get_con_list ();
 }
 
-void gnome_cmd_con_list_add_ftp (GnomeCmdConList *list, GnomeCmdConFtp *ftp_con);
-void gnome_cmd_con_list_remove_ftp (GnomeCmdConList *list, GnomeCmdConFtp *ftp_con);
-
 void gnome_cmd_con_list_add_quick_ftp (GnomeCmdConList *list, GnomeCmdConFtp *ftp_con);
 void gnome_cmd_con_list_remove_quick_ftp (GnomeCmdConList *list, GnomeCmdConFtp *ftp_con);
 
diff --git a/src/gnome-cmd-data.cc b/src/gnome-cmd-data.cc
index 260a35c..b490903 100644
--- a/src/gnome-cmd-data.cc
+++ b/src/gnome-cmd-data.cc
@@ -311,7 +311,7 @@ inline gboolean load_connections (const gchar *fname)
                                 //  ????
                             }
                             else
-                                gnome_cmd_con_list_add_ftp (gnome_cmd_data.priv->con_list, server);
+                                gnome_cmd_data.priv->con_list->add(server);
                         }
 
                         g_free (alias);
@@ -347,7 +347,7 @@ inline gboolean load_connections (const gchar *fname)
     if (!g_list_length (gnome_cmd_con_list_get_all_ftp (gnome_cmd_data.priv->con_list)))
     {
         GnomeCmdConFtp *server = gnome_cmd_con_ftp_new (_("GNOME Commander"), "ftp://anonymous ftp gnome org/pub/GNOME/sources/gnome-commander/");
-        gnome_cmd_con_list_add_ftp (gnome_cmd_data.priv->con_list, server);
+        gnome_cmd_data.priv->con_list->add(server);
     }
 
     return fd!=NULL && g_list_length (gnome_cmd_con_list_get_all_ftp (gnome_cmd_data.priv->con_list))>prev_ftp_cons_no;
diff --git a/src/gnome-cmd-remote-dialog.cc b/src/gnome-cmd-remote-dialog.cc
index ff07e0d..94456a1 100644
--- a/src/gnome-cmd-remote-dialog.cc
+++ b/src/gnome-cmd-remote-dialog.cc
@@ -175,7 +175,7 @@ static void on_new_btn_clicked (GtkButton *button, GnomeCmdRemoteDialog *ftp_dia
     GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (ftp_dialog->priv->connection_list)));
     GtkTreeIter iter;
 
-    gnome_cmd_con_list_add_ftp (gnome_cmd_con_list_get (), server);
+    gnome_cmd_con_list_get()->add(server);
     gtk_list_store_append (store, &iter);
     set_server (store, &iter, server);
 }
@@ -209,7 +209,7 @@ static void on_remove_btn_clicked (GtkButton *button, GnomeCmdRemoteDialog *dial
 
         gtk_tree_model_get (model, &iter, COL_FTP_CON, &server, -1);
         gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-        gnome_cmd_con_list_remove_ftp (gnome_cmd_con_list_get (), server);
+        gnome_cmd_con_list_get()->remove(server);
     }
     else
         g_printerr (_("No server selected"));