[gnome-commander] GnomeCmdFileInfo: migration to C++

[Piotr Eljasiak <epiotr src gnome org>]

commit 34306b8ac0ea661633fbb4a6be6eaf9633eefb3e
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sat Aug 7 23:49:23 2010 +0200

    GnomeCmdFileInfo: migration to C++

 libgcmd/gnome-cmd-file-info.cc |   11 -----------
 libgcmd/gnome-cmd-file-info.h  |   20 +++++++-------------
 2 files changed, 7 insertions(+), 24 deletions(-)
---
diff --git a/libgcmd/gnome-cmd-file-info.cc b/libgcmd/gnome-cmd-file-info.cc
index 7690578..6e7cebf 100644
--- a/libgcmd/gnome-cmd-file-info.cc
+++ b/libgcmd/gnome-cmd-file-info.cc
@@ -24,13 +24,6 @@
 
 static GtkObjectClass *parent_class = NULL;
 
-struct _GnomeCmdFileInfoPrivate
-{
-#ifdef __sun
-    gchar dummy;  // Sun's forte compiler does not like empty structs
-#endif
-};
-
 
 /*******************************
  * Gtk class implementation
@@ -44,8 +37,6 @@ static void destroy (GtkObject *object)
     if (f->uri)
         gnome_vfs_uri_unref (f->uri);
 
-    g_free (f->priv);
-
     if (GTK_OBJECT_CLASS (parent_class)->destroy)
         (*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
@@ -66,8 +57,6 @@ static void init (GnomeCmdFileInfo *f)
 {
     f->info = NULL;
     f->uri = NULL;
-
-    f->priv = g_new0 (GnomeCmdFileInfoPrivate, 1);
 }
 
 
diff --git a/libgcmd/gnome-cmd-file-info.h b/libgcmd/gnome-cmd-file-info.h
index d492104..d659fe1 100644
--- a/libgcmd/gnome-cmd-file-info.h
+++ b/libgcmd/gnome-cmd-file-info.h
@@ -26,21 +26,17 @@
 #define GNOME_CMD_IS_FILE_INFO(obj)       GTK_CHECK_TYPE (obj, gnome_cmd_file_info_get_type ())
 
 
-typedef struct _GnomeCmdFileInfo        GnomeCmdFileInfo;
-typedef struct _GnomeCmdFileInfoClass   GnomeCmdFileInfoClass;
-typedef struct _GnomeCmdFileInfoPrivate GnomeCmdFileInfoPrivate;
-
-struct _GnomeCmdFileInfo
+struct GnomeCmdFileInfo
 {
     GtkObject parent;
 
     GnomeVFSURI *uri;
     GnomeVFSFileInfo *info;
-
-    GnomeCmdFileInfoPrivate *priv;
+    
+    void setup(GnomeVFSURI *uri, GnomeVFSFileInfo *info);
 };
 
-struct _GnomeCmdFileInfoClass
+struct GnomeCmdFileInfoClass
 {
     GtkObjectClass parent_class;
 };
@@ -49,12 +45,10 @@ struct _GnomeCmdFileInfoClass
 GtkType gnome_cmd_file_info_get_type ();
 
 
-inline void gnome_cmd_file_info_setup (GnomeCmdFileInfo *f, GnomeVFSURI *uri, GnomeVFSFileInfo *info)
+inline void GnomeCmdFileInfo::setup(GnomeVFSURI *uri, GnomeVFSFileInfo *info)
 {
-    g_return_if_fail (GNOME_CMD_IS_FILE_INFO (f));
-
-    f->info = info;
-    f->uri = uri;
+    this->info = info;
+    this->uri = uri;
 }
 
 #endif //__GNOME_CMD_FILE_INFO_H__