[evolution/webkit-composer: 113/130] Move e-editor-selection.h enums to e-util-enums.h.



commit bd2995af745d030efc390c578671da547c79b1b3
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Jan 17 16:10:13 2013 -0500

    Move e-editor-selection.h enums to e-util-enums.h.

 e-util/e-editor-selection.h |   41 +----------------------------------------
 e-util/e-util-enums.h       |   40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 40 deletions(-)
---
diff --git a/e-util/e-editor-selection.h b/e-util/e-editor-selection.h
index 1585278..d85935b 100644
--- a/e-util/e-editor-selection.h
+++ b/e-util/e-editor-selection.h
@@ -27,6 +27,7 @@
 
 #include <glib-object.h>
 #include <gdk/gdk.h>
+#include <e-util/e-util-enums.h>
 
 /* Standard GObject macros */
 #define E_TYPE_EDITOR_SELECTION \
@@ -49,50 +50,10 @@
 
 G_BEGIN_DECLS
 
-typedef struct _EEditorWidget EEditorWidget;
 typedef struct _EEditorSelection EEditorSelection;
 typedef struct _EEditorSelectionClass EEditorSelectionClass;
 typedef struct _EEditorSelectionPrivate EEditorSelectionPrivate;
 
-typedef enum {
-	E_EDITOR_SELECTION_BLOCK_FORMAT_NONE = 0,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_H1,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_H2,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_H3,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_H4,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_H5,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_H6,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_BLOCKQUOTE,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_PRE,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_ADDRESS,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_UNORDERED_LIST,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST_ROMAN,
-	E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST_ALPHA,
-} EEditorSelectionBlockFormat;
-
-typedef enum {
-	E_EDITOR_SELECTION_FONT_SIZE_TINY	= 1, /* The values match actual */
-	E_EDITOR_SELECTION_FONT_SIZE_SMALL	= 2, /* size in <font size="X"> */
-	E_EDITOR_SELECTION_FONT_SIZE_NORMAL	= 3,
-	E_EDITOR_SELECTION_FONT_SIZE_BIG	= 4,
-	E_EDITOR_SELECTION_FONT_SIZE_BIGGER	= 5,
-	E_EDITOR_SELECTION_FONT_SIZE_LARGE	= 6,
-	E_EDITOR_SELECTION_FONT_SIZE_VERY_LARGE	= 7
-} EEditorSelectionFontSize;
-
-typedef enum {
-	E_EDITOR_SELECTION_ALIGNMENT_LEFT,
-	E_EDITOR_SELECTION_ALIGNMENT_CENTER,
-	E_EDITOR_SELECTION_ALIGNMENT_RIGHT
-} EEditorSelectionAlignment;
-
-typedef enum {
-	E_EDITOR_SELECTION_GRANULARITY_CHARACTER,
-	E_EDITOR_SELECTION_GRANULARITY_WORD
-} EEditorSelectionGranularity;
-
 struct _EEditorSelection {
 	GObject parent;
 	EEditorSelectionPrivate *priv;
diff --git a/e-util/e-util-enums.h b/e-util/e-util-enums.h
index b2da504..2b32709 100644
--- a/e-util/e-util-enums.h
+++ b/e-util/e-util-enums.h
@@ -40,6 +40,46 @@ typedef enum {
 	E_DURATION_DAYS
 } EDurationType;
 
+typedef enum {
+	E_EDITOR_SELECTION_BLOCK_FORMAT_NONE = 0,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_H1,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_H2,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_H3,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_H4,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_H5,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_H6,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_PARAGRAPH,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_BLOCKQUOTE,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_PRE,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_ADDRESS,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_UNORDERED_LIST,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST_ROMAN,
+	E_EDITOR_SELECTION_BLOCK_FORMAT_ORDERED_LIST_ALPHA,
+} EEditorSelectionBlockFormat;
+
+/* The values match the actual size in <font size="n"> */
+typedef enum {
+	E_EDITOR_SELECTION_FONT_SIZE_TINY	= 1,
+	E_EDITOR_SELECTION_FONT_SIZE_SMALL	= 2,
+	E_EDITOR_SELECTION_FONT_SIZE_NORMAL	= 3,
+	E_EDITOR_SELECTION_FONT_SIZE_BIG	= 4,
+	E_EDITOR_SELECTION_FONT_SIZE_BIGGER	= 5,
+	E_EDITOR_SELECTION_FONT_SIZE_LARGE	= 6,
+	E_EDITOR_SELECTION_FONT_SIZE_VERY_LARGE	= 7
+} EEditorSelectionFontSize;
+
+typedef enum {
+	E_EDITOR_SELECTION_ALIGNMENT_LEFT,
+	E_EDITOR_SELECTION_ALIGNMENT_CENTER,
+	E_EDITOR_SELECTION_ALIGNMENT_RIGHT
+} EEditorSelectionAlignment;
+
+typedef enum {
+	E_EDITOR_SELECTION_GRANULARITY_CHARACTER,
+	E_EDITOR_SELECTION_GRANULARITY_WORD
+} EEditorSelectionGranularity;
+
 G_END_DECLS
 
 #endif /* E_UTIL_ENUMS_H */



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