[gnome-builder/wip/slaf/xml-pack: 556/572] xml-pack: add a types include



commit 5ed9933e1b723aa921d4ca1abc662e2c16691985
Author: Sebastien Lafargue <slafargue gnome org>
Date:   Sun May 14 22:16:16 2017 +0200

    xml-pack: add a types include
    
    To avoid cycles in include calls,
    we move IdeXmlPositionKind to
    ide-xml-types.h

 plugins/xml-pack/Makefile.am           |    1 +
 plugins/xml-pack/ide-xml-position.h    |    8 +-------
 plugins/xml-pack/ide-xml-service.c     |    1 +
 plugins/xml-pack/ide-xml-symbol-node.h |    1 +
 4 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/plugins/xml-pack/Makefile.am b/plugins/xml-pack/Makefile.am
index cb4bb9d..5bf0ea6 100644
--- a/plugins/xml-pack/Makefile.am
+++ b/plugins/xml-pack/Makefile.am
@@ -44,6 +44,7 @@ libxml_pack_plugin_la_SOURCES =              \
        ide-xml-tree-builder.h               \
        ide-xml-tree-builder-utils.c         \
        ide-xml-tree-builder-utils-private.h \
+       ide-xml-types.h                      \
        ide-xml-validator.c                  \
        ide-xml-validator.h                  \
        ide-xml.c                            \
diff --git a/plugins/xml-pack/ide-xml-position.h b/plugins/xml-pack/ide-xml-position.h
index 441256b..d021d9e 100644
--- a/plugins/xml-pack/ide-xml-position.h
+++ b/plugins/xml-pack/ide-xml-position.h
@@ -21,19 +21,13 @@
 
 #include <glib-object.h>
 
+#include "ide-xml-types.h"
 #include "ide-xml-symbol-node.h"
 
 G_BEGIN_DECLS
 
 #define IDE_TYPE_XML_POSITION (ide_xml_position_get_type())
 
-typedef enum
-{
-  IDE_XML_POSITION_KIND_IN_START_TAG,
-  IDE_XML_POSITION_KIND_IN_END_TAG,
-  IDE_XML_POSITION_KIND_IN_CONTENT
-} IdeXmlPositionKind;
-
 typedef struct _IdeXmlPosition IdeXmlPosition;
 
 struct _IdeXmlPosition
diff --git a/plugins/xml-pack/ide-xml-service.c b/plugins/xml-pack/ide-xml-service.c
index a9cc6cb..64b3886 100644
--- a/plugins/xml-pack/ide-xml-service.c
+++ b/plugins/xml-pack/ide-xml-service.c
@@ -25,6 +25,7 @@
 #include "ide-xml-analysis.h"
 #include "ide-xml-schema-cache-entry.h"
 #include "ide-xml-tree-builder.h"
+#include "ide-xml-types.h"
 
 #include "ide-xml-service.h"
 
diff --git a/plugins/xml-pack/ide-xml-symbol-node.h b/plugins/xml-pack/ide-xml-symbol-node.h
index 85d71b1..3458d27 100644
--- a/plugins/xml-pack/ide-xml-symbol-node.h
+++ b/plugins/xml-pack/ide-xml-symbol-node.h
@@ -19,6 +19,7 @@
 #ifndef IDE_XML_SYMBOL_NODE_H
 #define IDE_XML_SYMBOL_NODE_H
 
+#include "ide-xml-types.h"
 #include "ide-xml-symbol-resolver.h"
 
 #include <ide.h>


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