summaryrefslogtreecommitdiff
path: root/unoxml
diff options
context:
space:
mode:
authorBurcin Akalin <brcnakalin@gmail.com>2016-01-30 17:50:41 +0200
committerMichael Meeks <michael.meeks@collabora.com>2016-05-01 10:18:20 +0000
commit60fbe5099bb174039a9d9b397477607c9be50e78 (patch)
treeac2c3a42a3ea2f98da1240b95062232d679ff98b /unoxml
parentc6e8c96d50fc2082a3c4b9553196a42bbdd6df37 (diff)
tdf#95416 Get rid of #include "../foo/bar.hxx" style includes
Change-Id: If7b44c772744c63e603740be6267453118cfd01b Signed-off-by: Burcin Akalin <brcnakalin@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/21937 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'unoxml')
-rw-r--r--unoxml/Library_unoxml.mk5
-rw-r--r--unoxml/inc/node.hxx (renamed from unoxml/source/dom/node.hxx)6
-rw-r--r--unoxml/source/events/event.hxx2
-rw-r--r--unoxml/source/xpath/xpathapi.cxx2
4 files changed, 10 insertions, 5 deletions
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 275fdb3882ff..5fcd48d5e299 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -74,4 +74,9 @@ $(eval $(call gb_Library_add_exception_objects,unoxml,\
unoxml/source/service/services \
))
+$(eval $(call gb_Library_set_include,unoxml,\
+ -I$(SRCDIR)/unoxml/inc \
+ $$(INCLUDE) \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/unoxml/source/dom/node.hxx b/unoxml/inc/node.hxx
index 076b2bc26ba0..4be2fe0e66a3 100644
--- a/unoxml/source/dom/node.hxx
+++ b/unoxml/inc/node.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_UNOXML_SOURCE_DOM_NODE_HXX
-#define INCLUDED_UNOXML_SOURCE_DOM_NODE_HXX
+#ifndef INCLUDED_UNOXML_INC_NODE_HXX
+#define INCLUDED_UNOXML_INC_NODE_HXX
#include <libxml/tree.h>
@@ -329,6 +329,6 @@ namespace DOM
void nscleanup(const xmlNodePtr aNode, const xmlNodePtr aParent);
}
-#endif
+#endif // INCLUDED_UNOXML_INC_NODE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx
index 472caa46dc3d..929416838dea 100644
--- a/unoxml/source/events/event.hxx
+++ b/unoxml/source/events/event.hxx
@@ -29,7 +29,7 @@
#include <cppuhelper/implbase.hxx>
-#include "../dom/node.hxx"
+#include "node.hxx"
namespace DOM {namespace events
{
diff --git a/unoxml/source/xpath/xpathapi.cxx b/unoxml/source/xpath/xpathapi.cxx
index 9e1eabd0677e..cd3b915b1606 100644
--- a/unoxml/source/xpath/xpathapi.cxx
+++ b/unoxml/source/xpath/xpathapi.cxx
@@ -32,7 +32,7 @@
#include <nodelist.hxx>
#include <xpathobject.hxx>
-#include "../dom/node.hxx"
+#include "node.hxx"
#include "../dom/document.hxx"
#include <cppuhelper/supportsservice.hxx>