[Libreoffice-commits] core.git: unoxml/inc unoxml/source

Stephan Bergmann sbergman at redhat.com
Tue Oct 17 07:06:23 UTC 2017


 unoxml/inc/event.hxx                |    4 ++--
 unoxml/inc/eventdispatcher.hxx      |    4 ++--
 unoxml/inc/mouseevent.hxx           |    4 ++--
 unoxml/inc/mutationevent.hxx        |    4 ++--
 unoxml/inc/uievent.hxx              |    4 ++--
 unoxml/source/dom/characterdata.cxx |    2 +-
 unoxml/source/dom/document.cxx      |   10 +++++-----
 unoxml/source/dom/element.cxx       |    2 +-
 unoxml/source/dom/node.cxx          |    4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit acfdfdf28a98b5841e4f8f669d9b6efe195926d9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 16 23:42:34 2017 +0200

    Move unoxml/source/events include files to common include directory
    
    ...that are included from various source directories.  Change done in
    preparation of loplugin:includeform.
    
    Change-Id: I186ab7581ee7896c54a600e5cde8721a97b26425
    Reviewed-on: https://gerrit.libreoffice.org/43444
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/unoxml/source/events/event.hxx b/unoxml/inc/event.hxx
similarity index 96%
rename from unoxml/source/events/event.hxx
rename to unoxml/inc/event.hxx
index ed07d59f2639..598f8702e985 100644
--- a/unoxml/source/events/event.hxx
+++ b/unoxml/inc/event.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_EVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_EVENT_HXX
+#ifndef INCLUDED_UNOXML_INC_EVENT_HXX
+#define INCLUDED_UNOXML_INC_EVENT_HXX
 
 #include <sal/types.h>
 
diff --git a/unoxml/source/events/eventdispatcher.hxx b/unoxml/inc/eventdispatcher.hxx
similarity index 95%
rename from unoxml/source/events/eventdispatcher.hxx
rename to unoxml/inc/eventdispatcher.hxx
index d992ff30d8d3..ee8bec567590 100644
--- a/unoxml/source/events/eventdispatcher.hxx
+++ b/unoxml/inc/eventdispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_EVENTDISPATCHER_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_EVENTDISPATCHER_HXX
+#ifndef INCLUDED_UNOXML_INC_EVENTDISPATCHER_HXX
+#define INCLUDED_UNOXML_INC_EVENTDISPATCHER_HXX
 
 #include <map>
 #include <vector>
diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/inc/mouseevent.hxx
similarity index 97%
rename from unoxml/source/events/mouseevent.hxx
rename to unoxml/inc/mouseevent.hxx
index 87ea75a2bb66..3f6788e89f13 100644
--- a/unoxml/source/events/mouseevent.hxx
+++ b/unoxml/inc/mouseevent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_MOUSEEVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_MOUSEEVENT_HXX
+#ifndef INCLUDED_UNOXML_INC_MOUSEEVENT_HXX
+#define INCLUDED_UNOXML_INC_MOUSEEVENT_HXX
 
 #include <com/sun/star/xml/dom/events/PhaseType.hpp>
 #include <com/sun/star/xml/dom/events/XMouseEvent.hpp>
diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/inc/mutationevent.hxx
similarity index 96%
rename from unoxml/source/events/mutationevent.hxx
rename to unoxml/inc/mutationevent.hxx
index c8dfc3aed1a0..5499b5a93633 100644
--- a/unoxml/source/events/mutationevent.hxx
+++ b/unoxml/inc/mutationevent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_MUTATIONEVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_MUTATIONEVENT_HXX
+#ifndef INCLUDED_UNOXML_INC_MUTATIONEVENT_HXX
+#define INCLUDED_UNOXML_INC_MUTATIONEVENT_HXX
 
 #include <sal/types.h>
 
diff --git a/unoxml/source/events/uievent.hxx b/unoxml/inc/uievent.hxx
similarity index 96%
rename from unoxml/source/events/uievent.hxx
rename to unoxml/inc/uievent.hxx
index c82e600c24c6..7f7d4397a218 100644
--- a/unoxml/source/events/uievent.hxx
+++ b/unoxml/inc/uievent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_UIEVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_UIEVENT_HXX
+#ifndef INCLUDED_UNOXML_INC_UIEVENT_HXX
+#define INCLUDED_UNOXML_INC_UIEVENT_HXX
 
 #include <sal/types.h>
 
diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx
index e8ac2aee7c23..0e929522546b 100644
--- a/unoxml/source/dom/characterdata.cxx
+++ b/unoxml/source/dom/characterdata.cxx
@@ -27,7 +27,7 @@
 
 #include <com/sun/star/xml/dom/events/XDocumentEvent.hpp>
 
-#include "../events/mutationevent.hxx"
+#include "mutationevent.hxx"
 
 using namespace css::uno;
 using namespace css::xml::dom;
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index bc2969c7abec..580926273758 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -34,11 +34,11 @@
 #include <entity.hxx>
 #include <notation.hxx>
 
-#include "../events/event.hxx"
-#include "../events/mutationevent.hxx"
-#include "../events/uievent.hxx"
-#include "../events/mouseevent.hxx"
-#include "../events/eventdispatcher.hxx"
+#include "event.hxx"
+#include "mutationevent.hxx"
+#include "uievent.hxx"
+#include "mouseevent.hxx"
+#include "eventdispatcher.hxx"
 
 #include <string.h>
 
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index b14890fa29d7..8e415f74eadb 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -36,7 +36,7 @@
 #include <attributesmap.hxx>
 #include <document.hxx>
 
-#include "../events/mutationevent.hxx"
+#include "mutationevent.hxx"
 
 using namespace css::uno;
 using namespace css::xml::dom;
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index aeb77cfcd0a5..4386cfdd0637 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -39,8 +39,8 @@
 #include <attr.hxx>
 #include <childlist.hxx>
 
-#include "../events/eventdispatcher.hxx"
-#include "../events/mutationevent.hxx"
+#include "eventdispatcher.hxx"
+#include "mutationevent.hxx"
 
 using namespace css;
 using namespace css::uno;


More information about the Libreoffice-commits mailing list