[gnome-commander] convert 'typedef enum {} X' -> 'enum X {}'



commit 751fb7bd7ad0860179ee5e81bad2157c0a0cdc3d
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Tue Nov 16 19:59:54 2010 +0100

    convert 'typedef enum {} X' -> 'enum X {}'

 src/eggcellrendererkeys.h     |    4 ++--
 src/gnome-cmd-app.h           |    4 ++--
 src/gnome-cmd-chmod-dialog.cc |    4 ++--
 src/gnome-cmd-con.h           |   12 ++++++------
 src/gnome-cmd-dir.h           |    4 ++--
 src/gnome-cmd-smb-net.h       |    4 ++--
 src/gnome-cmd-types.h         |    4 ++--
 src/gnome-cmd-xml-config.cc   |    4 ++--
 src/intviewer/image-render.h  |    4 ++--
 src/tags/gnome-cmd-tags.h     |    8 ++++----
 10 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/src/eggcellrendererkeys.h b/src/eggcellrendererkeys.h
index b07f87e..4d8ded7 100644
--- a/src/eggcellrendererkeys.h
+++ b/src/eggcellrendererkeys.h
@@ -77,11 +77,11 @@ GType egg_cell_renderer_keys_get_type ();
 GtkCellRenderer *egg_cell_renderer_keys_new ();
 
 #if !GTK_CHECK_VERSION (2, 10, 0)
-typedef enum
+enum GtkCellRendererAccelMode
 {
   GTK_CELL_RENDERER_ACCEL_MODE_GTK,
   GTK_CELL_RENDERER_ACCEL_MODE_OTHER
-} GtkCellRendererAccelMode;
+};
 #endif
 
 void  egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, guint keyval, GdkModifierType mask);
diff --git a/src/gnome-cmd-app.h b/src/gnome-cmd-app.h
index d271091..0a30fb8 100644
--- a/src/gnome-cmd-app.h
+++ b/src/gnome-cmd-app.h
@@ -24,13 +24,13 @@
 #include "gnome-cmd-file.h"
 #include "gnome-cmd-pixmap.h"
 
-typedef enum
+enum AppTarget
 {
     APP_TARGET_ALL_FILES,
     APP_TARGET_ALL_DIRS,
     APP_TARGET_ALL_DIRS_AND_FILES,
     APP_TARGET_SOME_FILES
-} AppTarget;
+};
 
 
 typedef struct _GnomeCmdApp GnomeCmdApp;
diff --git a/src/gnome-cmd-chmod-dialog.cc b/src/gnome-cmd-chmod-dialog.cc
index 8d4dde1..049afc0 100644
--- a/src/gnome-cmd-chmod-dialog.cc
+++ b/src/gnome-cmd-chmod-dialog.cc
@@ -34,12 +34,12 @@
 using namespace std;
 
 
-typedef enum
+enum ChmodRecursiveMode
 {
     CHMOD_ALL_FILES,
     CHMOD_DIRS_ONLY,
     CHMOD_MAX
-} ChmodRecursiveMode;
+};
 
 static gchar *recurse_opts[CHMOD_MAX] = {
     N_("All files"),
diff --git a/src/gnome-cmd-con.h b/src/gnome-cmd-con.h
index 2f2dac4..3fc086d 100644
--- a/src/gnome-cmd-con.h
+++ b/src/gnome-cmd-con.h
@@ -40,24 +40,24 @@ struct GnomeCmdConPrivate;
 #include "history.h"
 #include "utils.h"
 
-typedef enum
+enum ConState
 {
     CON_STATE_CLOSED,
     CON_STATE_OPEN,
     CON_STATE_OPENING,
     CON_STATE_CANCELLING
-} ConState;
+};
 
-typedef enum
+enum ConOpenResult
 {
     CON_OPEN_OK,
     CON_OPEN_FAILED,
     CON_OPEN_CANCELLED,
     CON_OPEN_IN_PROGRESS,
     CON_OPEN_NOT_STARTED
-} ConOpenResult;
+};
 
-typedef enum        // Keep this order in sync with strings in gnome-cmd-con-dialog.cc and gnome-cmd-con.cc
+enum ConnectionMethodID        // Keep this order in sync with strings in gnome-cmd-con-dialog.cc and gnome-cmd-con.cc
 {
     CON_SSH,
     CON_SFTP = CON_SSH,
@@ -68,7 +68,7 @@ typedef enum        // Keep this order in sync with strings in gnome-cmd-con-dia
     CON_DAVS,
     CON_URI,
     CON_LOCAL      // CON_FILE ???
-} ConnectionMethodID;
+};
 
 struct GnomeCmdCon
 {
diff --git a/src/gnome-cmd-dir.h b/src/gnome-cmd-dir.h
index 629fd5c..af5ff66 100644
--- a/src/gnome-cmd-dir.h
+++ b/src/gnome-cmd-dir.h
@@ -40,13 +40,13 @@ typedef void (* DirListDoneFunc) (GnomeCmdDir *dir, GList *files, GnomeVFSResult
 #include "gnome-cmd-path.h"
 #include "handle.h"
 
-typedef enum
+enum DirState
 {
     DIR_STATE_EMPTY,
     DIR_STATE_LISTED,
     DIR_STATE_LISTING,
     DIR_STATE_CANCELING
-} DirState;
+};
 
 struct GnomeCmdDir
 {
diff --git a/src/gnome-cmd-smb-net.h b/src/gnome-cmd-smb-net.h
index 12e7299..15ecc83 100644
--- a/src/gnome-cmd-smb-net.h
+++ b/src/gnome-cmd-smb-net.h
@@ -21,11 +21,11 @@
 #ifndef __GNOME_CMD_SMB_NET_H__
 #define __GNOME_CMD_SMB_NET_H__
 
-typedef enum
+enum SmbEntityType
 {
     SMB_WORKGROUP,
     SMB_HOST
-} SmbEntityType;
+};
 
 
 struct SmbEntity
diff --git a/src/gnome-cmd-types.h b/src/gnome-cmd-types.h
index 882af62..046c081 100644
--- a/src/gnome-cmd-types.h
+++ b/src/gnome-cmd-types.h
@@ -23,13 +23,13 @@
 typedef gchar *GnomeCmdDateFormat;
 
 
-typedef enum
+enum FileSelectorID
 {
     LEFT,
     RIGHT,
     ACTIVE,
     INACTIVE
-} FileSelectorID;
+};
 
 
 enum GnomeCmdLayout
diff --git a/src/gnome-cmd-xml-config.cc b/src/gnome-cmd-xml-config.cc
index 2e7bbeb..3ee2d1b 100644
--- a/src/gnome-cmd-xml-config.cc
+++ b/src/gnome-cmd-xml-config.cc
@@ -61,7 +61,7 @@ gchar *XML::xstream::escaped_text = NULL;
 
 
 #if !GLIB_CHECK_VERSION (2, 16, 0)
-typedef enum
+enum GMarkupCollectType
 {
   G_MARKUP_COLLECT_INVALID,
   G_MARKUP_COLLECT_STRING,
@@ -70,7 +70,7 @@ typedef enum
   G_MARKUP_COLLECT_TRISTATE,
 
   G_MARKUP_COLLECT_OPTIONAL = (1 << 16)
-} GMarkupCollectType;
+};
 
 
 static gboolean
diff --git a/src/intviewer/image-render.h b/src/intviewer/image-render.h
index d240886..2a5edf1 100644
--- a/src/intviewer/image-render.h
+++ b/src/intviewer/image-render.h
@@ -56,14 +56,14 @@ struct ImageRenderStatus
     gint     bits_per_sample;
 };
 
-typedef enum
+enum IMAGEOPERATION
 {
     ROTATE_CLOCKWISE,
     ROTATE_COUNTERCLOCKWISE,
     ROTATE_UPSIDEDOWN,
     FLIP_VERTICAL,
     FLIP_HORIZONTAL
-} IMAGEOPERATION;
+};
 
 GtkWidget     *image_render_new ();
 GtkType        image_render_get_type ();
diff --git a/src/tags/gnome-cmd-tags.h b/src/tags/gnome-cmd-tags.h
index 9b0737e..30b5e30 100644
--- a/src/tags/gnome-cmd-tags.h
+++ b/src/tags/gnome-cmd-tags.h
@@ -29,7 +29,7 @@
 #include "gnome-cmd-file.h"
 #include "utils.h"
 
-typedef enum
+enum GnomeCmdTagClass
 {
     TAG_NONE_CLASS  = 0,
     TAG_FILE        = -1,
@@ -46,10 +46,10 @@ typedef enum
     TAG_AUDIO       = TAG_APE | TAG_FLAC | TAG_ID3 | TAG_VORBIS,
     TAG_DOC         = TAG_CHM | TAG_PDF,
     TAG_IMAGE       = TAG_EXIF | TAG_IPTC | TAG_ICC
-} GnomeCmdTagClass;
+};
 
 
-typedef enum
+enum GnomeCmdTag
 {
     TAG_NONE,
     TAG_AUDIO_ALBUMARTIST,                  // artist of the album
@@ -477,7 +477,7 @@ typedef enum
     TAG_VORBIS_ORGANIZATION,                // organization producing the track
     TAG_VORBIS_VENDOR,                      // Vorbis vendor ID
     TAG_VORBIS_VERSION                      // Vorbis version
-} GnomeCmdTag;
+};
 
 
 void gcmd_tags_init();



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