[gnome-commander] noop: code cleanup (gnome_cmd_dialog_get_type() -> GNOME_CMD_TYPE_DIALOG)



commit def5145503f5cf74ee01c2e457485b402aae172c
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sat Jan 22 21:47:18 2011 +0100

    noop: code cleanup (gnome_cmd_dialog_get_type() -> GNOME_CMD_TYPE_DIALOG)

 libgcmd/gnome-cmd-dialog.cc          |    2 +-
 libgcmd/gnome-cmd-dialog.h           |   10 ++++------
 libgcmd/gnome-cmd-string-dialog.cc   |    4 ++--
 src/gnome-cmd-chmod-dialog.cc        |    4 ++--
 src/gnome-cmd-chown-dialog.cc        |    4 ++--
 src/gnome-cmd-options-dialog.cc      |    4 ++--
 src/gnome-cmd-patternsel-dialog.cc   |    4 ++--
 src/gnome-cmd-prepare-xfer-dialog.cc |    4 ++--
 src/gnome-cmd-remote-dialog.cc       |    4 ++--
 src/gnome-cmd-search-dialog.cc       |    4 ++--
 10 files changed, 21 insertions(+), 23 deletions(-)
---
diff --git a/libgcmd/gnome-cmd-dialog.cc b/libgcmd/gnome-cmd-dialog.cc
index 20c7e23..8c4354c 100644
--- a/libgcmd/gnome-cmd-dialog.cc
+++ b/libgcmd/gnome-cmd-dialog.cc
@@ -145,7 +145,7 @@ GtkType gnome_cmd_dialog_get_type ()
 
 GtkWidget *gnome_cmd_dialog_new (const gchar *title)
 {
-    GnomeCmdDialog *dialog = (GnomeCmdDialog *) gtk_type_new (gnome_cmd_dialog_get_type ());
+    GnomeCmdDialog *dialog = (GnomeCmdDialog *) gtk_type_new (GNOME_CMD_TYPE_DIALOG);
 
     if (title)
         gnome_cmd_dialog_setup (dialog, title);
diff --git a/libgcmd/gnome-cmd-dialog.h b/libgcmd/gnome-cmd-dialog.h
index 96550c4..c59069f 100644
--- a/libgcmd/gnome-cmd-dialog.h
+++ b/libgcmd/gnome-cmd-dialog.h
@@ -21,12 +21,10 @@
 #ifndef __GNOME_CMD_DIALOG_H__
 #define __GNOME_CMD_DIALOG_H__
 
-#define GNOME_CMD_DIALOG(obj) \
-    GTK_CHECK_CAST (obj, gnome_cmd_dialog_get_type (), GnomeCmdDialog)
-#define GNOME_CMD_DIALOG_CLASS(klass) \
-    GTK_CHECK_CLASS_CAST (klass, gnome_cmd_dialog_get_type (), GnomeCmdDialogClass)
-#define GNOME_CMD_IS_DIALOG(obj) \
-    GTK_CHECK_TYPE (obj, gnome_cmd_dialog_get_type ())
+#define GNOME_CMD_TYPE_DIALOG         (gnome_cmd_dialog_get_type ())
+#define GNOME_CMD_DIALOG(obj)         (GTK_CHECK_CAST (obj, GNOME_CMD_TYPE_DIALOG, GnomeCmdDialog))
+#define GNOME_CMD_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST (klass, GNOME_CMD_TYPE_DIALOG, GnomeCmdDialogClass))
+#define GNOME_CMD_IS_DIALOG(obj)      (GTK_CHECK_TYPE (obj, GNOME_CMD_TYPE_DIALOG))
 
 
 typedef struct _GnomeCmdDialog GnomeCmdDialog;
diff --git a/libgcmd/gnome-cmd-string-dialog.cc b/libgcmd/gnome-cmd-string-dialog.cc
index b5cf841..e7d7063 100644
--- a/libgcmd/gnome-cmd-string-dialog.cc
+++ b/libgcmd/gnome-cmd-string-dialog.cc
@@ -102,7 +102,7 @@ static void class_init (GnomeCmdStringDialogClass *klass)
     object_class = GTK_OBJECT_CLASS (klass);
     widget_class = GTK_WIDGET_CLASS (klass);
 
-    parent_class = (GnomeCmdDialogClass *) gtk_type_class (gnome_cmd_dialog_get_type ());
+    parent_class = (GnomeCmdDialogClass *) gtk_type_class (GNOME_CMD_TYPE_DIALOG);
     object_class->destroy = destroy;
     widget_class->map = map;
 }
@@ -169,7 +169,7 @@ GtkType gnome_cmd_string_dialog_get_type ()
             (GtkClassInitFunc) NULL
         };
 
-        dlg_type = gtk_type_unique (gnome_cmd_dialog_get_type (), &dlg_info);
+        dlg_type = gtk_type_unique (GNOME_CMD_TYPE_DIALOG, &dlg_info);
     }
     return dlg_type;
 }
diff --git a/src/gnome-cmd-chmod-dialog.cc b/src/gnome-cmd-chmod-dialog.cc
index 61c9006..d69fa5a 100644
--- a/src/gnome-cmd-chmod-dialog.cc
+++ b/src/gnome-cmd-chmod-dialog.cc
@@ -177,7 +177,7 @@ static void class_init (GnomeCmdChmodDialogClass *klass)
     GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-    parent_class = (GnomeCmdDialogClass *) gtk_type_class (gnome_cmd_dialog_get_type ());
+    parent_class = (GnomeCmdDialogClass *) gtk_type_class (GNOME_CMD_TYPE_DIALOG);
     object_class->destroy = destroy;
     widget_class->map = ::map;
 }
@@ -274,7 +274,7 @@ GtkType gnome_cmd_chmod_dialog_get_type ()
             (GtkClassInitFunc) NULL
         };
 
-        dlg_type = gtk_type_unique (gnome_cmd_dialog_get_type (), &dlg_info);
+        dlg_type = gtk_type_unique (GNOME_CMD_TYPE_DIALOG, &dlg_info);
     }
     return dlg_type;
 }
diff --git a/src/gnome-cmd-chown-dialog.cc b/src/gnome-cmd-chown-dialog.cc
index 8ba2a7b..c372685 100644
--- a/src/gnome-cmd-chown-dialog.cc
+++ b/src/gnome-cmd-chown-dialog.cc
@@ -157,7 +157,7 @@ class_init (GnomeCmdChownDialogClass *klass)
     GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-    parent_class = (GnomeCmdDialogClass *) gtk_type_class (gnome_cmd_dialog_get_type ());
+    parent_class = (GnomeCmdDialogClass *) gtk_type_class (GNOME_CMD_TYPE_DIALOG);
     object_class->destroy = destroy;
     widget_class->map = ::map;
 }
@@ -232,7 +232,7 @@ GtkType gnome_cmd_chown_dialog_get_type ()
             (GtkClassInitFunc) NULL
         };
 
-        dlg_type = gtk_type_unique (gnome_cmd_dialog_get_type (), &dlg_info);
+        dlg_type = gtk_type_unique (GNOME_CMD_TYPE_DIALOG, &dlg_info);
     }
     return dlg_type;
 }
diff --git a/src/gnome-cmd-options-dialog.cc b/src/gnome-cmd-options-dialog.cc
index 66859e9..df7d887 100644
--- a/src/gnome-cmd-options-dialog.cc
+++ b/src/gnome-cmd-options-dialog.cc
@@ -1998,7 +1998,7 @@ static void class_init (GnomeCmdOptionsDialogClass *klass)
     object_class = GTK_OBJECT_CLASS (klass);
     widget_class = GTK_WIDGET_CLASS (klass);
 
-    parent_class = (GnomeCmdDialogClass *) gtk_type_class (gnome_cmd_dialog_get_type ());
+    parent_class = (GnomeCmdDialogClass *) gtk_type_class (GNOME_CMD_TYPE_DIALOG);
 
     object_class->destroy = destroy;
 
@@ -2099,7 +2099,7 @@ GtkType gnome_cmd_options_dialog_get_type ()
             (GtkClassInitFunc) NULL
         };
 
-        dlg_type = gtk_type_unique (gnome_cmd_dialog_get_type (), &dlg_info);
+        dlg_type = gtk_type_unique (GNOME_CMD_TYPE_DIALOG, &dlg_info);
     }
 
     return dlg_type;
diff --git a/src/gnome-cmd-patternsel-dialog.cc b/src/gnome-cmd-patternsel-dialog.cc
index ce3bd2b..322f38a 100644
--- a/src/gnome-cmd-patternsel-dialog.cc
+++ b/src/gnome-cmd-patternsel-dialog.cc
@@ -97,7 +97,7 @@ static void class_init (GnomeCmdPatternselDialogClass *klass)
     GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-    parent_class = (GnomeCmdDialogClass *) gtk_type_class (gnome_cmd_dialog_get_type ());
+    parent_class = (GnomeCmdDialogClass *) gtk_type_class (GNOME_CMD_TYPE_DIALOG);
     object_class->destroy = destroy;
     widget_class->map = ::map;
 }
@@ -171,7 +171,7 @@ GtkType gnome_cmd_patternsel_dialog_get_type ()
             (GtkClassInitFunc) NULL
         };
 
-        dlg_type = gtk_type_unique (gnome_cmd_dialog_get_type (), &dlg_info);
+        dlg_type = gtk_type_unique (GNOME_CMD_TYPE_DIALOG, &dlg_info);
     }
     return dlg_type;
 }
diff --git a/src/gnome-cmd-prepare-xfer-dialog.cc b/src/gnome-cmd-prepare-xfer-dialog.cc
index 0f752cc..eb83c0f 100644
--- a/src/gnome-cmd-prepare-xfer-dialog.cc
+++ b/src/gnome-cmd-prepare-xfer-dialog.cc
@@ -291,7 +291,7 @@ static void class_init (GnomeCmdPrepareXferDialogClass *klass)
     GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-    parent_class = (GnomeCmdDialogClass *) gtk_type_class (gnome_cmd_dialog_get_type ());
+    parent_class = (GnomeCmdDialogClass *) gtk_type_class (GNOME_CMD_TYPE_DIALOG);
 
     object_class->destroy = destroy;
     widget_class->map = ::map;
@@ -361,7 +361,7 @@ GtkType gnome_cmd_prepare_xfer_dialog_get_type ()
             (GtkClassInitFunc) NULL
         };
 
-        dlg_type = gtk_type_unique (gnome_cmd_dialog_get_type (), &dlg_info);
+        dlg_type = gtk_type_unique (GNOME_CMD_TYPE_DIALOG, &dlg_info);
     }
     return dlg_type;
 }
diff --git a/src/gnome-cmd-remote-dialog.cc b/src/gnome-cmd-remote-dialog.cc
index 9db0940..ce64d79 100644
--- a/src/gnome-cmd-remote-dialog.cc
+++ b/src/gnome-cmd-remote-dialog.cc
@@ -430,7 +430,7 @@ static void class_init (GnomeCmdRemoteDialogClass *klass)
     GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-    parent_class = (GnomeCmdDialogClass *) gtk_type_class (gnome_cmd_dialog_get_type ());
+    parent_class = (GnomeCmdDialogClass *) gtk_type_class (GNOME_CMD_TYPE_DIALOG);
 
     object_class->destroy = destroy;
 
@@ -530,7 +530,7 @@ GtkType gnome_cmd_remote_dialog_get_type ()
             (GtkClassInitFunc) NULL
         };
 
-        dlg_type = gtk_type_unique (gnome_cmd_dialog_get_type (), &dlg_info);
+        dlg_type = gtk_type_unique (GNOME_CMD_TYPE_DIALOG, &dlg_info);
     }
     return dlg_type;
 }
diff --git a/src/gnome-cmd-search-dialog.cc b/src/gnome-cmd-search-dialog.cc
index 79d4b04..cb4f645 100644
--- a/src/gnome-cmd-search-dialog.cc
+++ b/src/gnome-cmd-search-dialog.cc
@@ -715,7 +715,7 @@ static void class_init (GnomeCmdSearchDialogClass *klass)
     GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
     GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
-    parent_class = (GnomeCmdDialogClass *) gtk_type_class (gnome_cmd_dialog_get_type ());
+    parent_class = (GnomeCmdDialogClass *) gtk_type_class (GNOME_CMD_TYPE_DIALOG);
 
     object_class->destroy = destroy;
 
@@ -963,7 +963,7 @@ GtkType gnome_cmd_search_dialog_get_type ()
             (GtkClassInitFunc) NULL
         };
 
-        dlg_type = gtk_type_unique (gnome_cmd_dialog_get_type (), &dlg_info);
+        dlg_type = gtk_type_unique (GNOME_CMD_TYPE_DIALOG, &dlg_info);
     }
     return dlg_type;
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]