unoxml/Library_unoxml.mk | 5 unoxml/inc/node.hxx | 334 +++++++++++++++++++++++++++++++++++++++ unoxml/source/dom/node.hxx | 334 --------------------------------------- unoxml/source/events/event.hxx | 2 unoxml/source/xpath/xpathapi.cxx | 2 5 files changed, 341 insertions(+), 336 deletions(-)
New commits: commit 60fbe5099bb174039a9d9b397477607c9be50e78 Author: Burcin Akalin <[email protected]> Date: Sat Jan 30 17:50:41 2016 +0200 tdf#95416 Get rid of #include "../foo/bar.hxx" style includes Change-Id: If7b44c772744c63e603740be6267453118cfd01b Signed-off-by: Burcin Akalin <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/21937 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Meeks <[email protected]> Tested-by: Michael Meeks <[email protected]> diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk index 275fdb3..5fcd48d 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 similarity index 99% rename from unoxml/source/dom/node.hxx rename to unoxml/inc/node.hxx index 076b2bc..4be2fe0 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 472caa4..9294168 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 9e1eabd..cd3b915 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> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
