[poppler] glib/poppler-structure-element.cc glib/poppler-structure-element.h

[Carlos Garcia Campos]

 glib/poppler-structure-element.cc |   14 +++++++-------
 glib/poppler-structure-element.h  |   12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 9282b5a26e9ce81d81d42c0cbe449543c8366b7c
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Wed Mar 5 17:37:38 2014 +0100

    glib: Rename PopplerStructureScope as PopplerStructureTableScope
    
    It's a table specific attribute

diff --git a/glib/poppler-structure-element.cc b/glib/poppler-structure-element.cc
index dace212..e15bf4b 100644
--- a/glib/poppler-structure-element.cc
+++ b/glib/poppler-structure-element.cc
@@ -365,11 +365,11 @@ ENUM_VALUES (PopplerStructureFormState, checked)
   { NULL }
 };
 
-ENUM_VALUES (PopplerStructureScope, Scope)
+ENUM_VALUES (PopplerStructureTableScope, Scope)
 {
-  { "Row",    POPPLER_STRUCTURE_SCOPE_ROW    },
-  { "Column", POPPLER_STRUCTURE_SCOPE_COLUMN },
-  { "Both",   POPPLER_STRUCTURE_SCOPE_BOTH   },
+  { "Row",    POPPLER_STRUCTURE_TABLE_SCOPE_ROW    },
+  { "Column", POPPLER_STRUCTURE_TABLE_SCOPE_COLUMN },
+  { "Both",   POPPLER_STRUCTURE_TABLE_SCOPE_BOTH   },
   { NULL }
 };
 
@@ -2199,12 +2199,12 @@ poppler_structure_element_get_table_headers (PopplerStructureElement *poppler_st
  *
  * Since: 0.26
  */
-PopplerStructureScope
+PopplerStructureTableScope
 poppler_structure_element_get_table_scope (PopplerStructureElement *poppler_structure_element)
 {
   g_return_val_if_fail (poppler_structure_element_get_kind (poppler_structure_element) == POPPLER_STRUCTURE_ELEMENT_TABLE,
-                        EnumNameValue<PopplerStructureScope>::values[0].value);
-  return attr_to_enum<PopplerStructureScope> (poppler_structure_element);
+                        EnumNameValue<PopplerStructureTableScope>::values[0].value);
+  return attr_to_enum<PopplerStructureTableScope> (poppler_structure_element);
 }
 
 /**
diff --git a/glib/poppler-structure-element.h b/glib/poppler-structure-element.h
index eae9459..53bdca0 100644
--- a/glib/poppler-structure-element.h
+++ b/glib/poppler-structure-element.h
@@ -229,13 +229,13 @@ typedef enum {
 } PopplerStructureFormState;
 
 /**
- * PopplerStructureScope:
+ * PopplerStructureTableScope:
  */
 typedef enum {
-  POPPLER_STRUCTURE_SCOPE_ROW,
-  POPPLER_STRUCTURE_SCOPE_COLUMN,
-  POPPLER_STRUCTURE_SCOPE_BOTH,
-} PopplerStructureScope;
+  POPPLER_STRUCTURE_TABLE_SCOPE_ROW,
+  POPPLER_STRUCTURE_TABLE_SCOPE_COLUMN,
+  POPPLER_STRUCTURE_TABLE_SCOPE_BOTH,
+} PopplerStructureTableScope;
 
 
 typedef struct _PopplerTextSpan PopplerTextSpan;
@@ -319,7 +319,7 @@ gchar                           *poppler_structure_element_get_form_description
 guint                            poppler_structure_element_get_table_row_span     (PopplerStructureElement     *poppler_structure_element);
 guint                            poppler_structure_element_get_table_column_span  (PopplerStructureElement     *poppler_structure_element);
 gchar                          **poppler_structure_element_get_table_headers      (PopplerStructureElement     *poppler_structure_element);
-PopplerStructureScope            poppler_structure_element_get_table_scope        (PopplerStructureElement     *poppler_structure_element);
+PopplerStructureTableScope       poppler_structure_element_get_table_scope        (PopplerStructureElement     *poppler_structure_element);
 gchar                           *poppler_structure_element_get_table_summary      (PopplerStructureElement     *poppler_structure_element);
 
 #define POPPLER_TYPE_STRUCTURE_ELEMENT_ITER                                       (poppler_structure_element_iter_get_type ())