[Libreoffice-commits] core.git: editeng/CppunitTest_editeng_core.mk editeng/inc editeng/qa editeng/source

[Stephan Bergmann]

 editeng/CppunitTest_editeng_core.mk |    2 +-
 editeng/inc/editattr.hxx            |    6 +++---
 editeng/inc/editdoc.hxx             |    6 +++---
 editeng/inc/edtspell.hxx            |    6 +++---
 editeng/inc/eerdll2.hxx             |    6 +++---
 editeng/qa/unit/core-test.cxx       |    5 +++--
 6 files changed, 16 insertions(+), 15 deletions(-)

New commits:
commit 141873715bcb7cee7b25bde05e9e8e6e7a638ede
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 16 17:22:21 2017 +0200

    Move editeng/source/editeng include files to common include directory
    
    ...that are included from various source directories.  Change done in
    preparation of loplugin:includeform.
    
    Change-Id: I4c2160d1c682b37e93e1161796c67097866bf659

diff --git a/editeng/CppunitTest_editeng_core.mk b/editeng/CppunitTest_editeng_core.mk
index faf2d931f08a..752af13f5d82 100644
--- a/editeng/CppunitTest_editeng_core.mk
+++ b/editeng/CppunitTest_editeng_core.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_core,\
 ))
 
 $(eval $(call gb_CppunitTest_set_include,editeng_core,\
-    -I$(SRCDIR)/editeng/source \
+    -I$(SRCDIR)/editeng/inc \
     $$(INCLUDE) \
 ))
 
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/inc/editattr.hxx
similarity index 98%
rename from editeng/source/editeng/editattr.hxx
rename to editeng/inc/editattr.hxx
index 4307f4618538..b93c0bdd5f3a 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/inc/editattr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EDITATTR_HXX
-#define INCLUDED_EDITENG_SOURCE_EDITENG_EDITATTR_HXX
+#ifndef INCLUDED_EDITENG_INC_EDITATTR_HXX
+#define INCLUDED_EDITENG_INC_EDITATTR_HXX
 
 #include <editeng/eeitem.hxx>
 #include <svl/poolitem.hxx>
@@ -429,6 +429,6 @@ public:
 };
 
 
-#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EDITATTR_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/inc/editdoc.hxx
similarity index 99%
rename from editeng/source/editeng/editdoc.hxx
rename to editeng/inc/editdoc.hxx
index 5665b2ef3379..13414dfcb101 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EDITDOC_HXX
-#define INCLUDED_EDITENG_SOURCE_EDITENG_EDITDOC_HXX
+#ifndef INCLUDED_EDITENG_INC_EDITDOC_HXX
+#define INCLUDED_EDITENG_INC_EDITDOC_HXX
 
 #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
 
@@ -841,6 +841,6 @@ protected:
     virtual ~EditEngineItemPool() override;
 };
 
-#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EDITDOC_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/inc/edtspell.hxx
similarity index 97%
rename from editeng/source/editeng/edtspell.hxx
rename to editeng/inc/edtspell.hxx
index d61ad61cab25..3d4411b2dc79 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/inc/edtspell.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EDTSPELL_HXX
-#define INCLUDED_EDITENG_SOURCE_EDITENG_EDTSPELL_HXX
+#ifndef INCLUDED_EDITENG_INC_EDTSPELL_HXX
+#define INCLUDED_EDITENG_INC_EDTSPELL_HXX
 
 #include <editeng/editengdllapi.h>
 #include <editeng/splwrap.hxx>
@@ -148,6 +148,6 @@ public:
 
 };
 
-#endif  // EDTSPELL
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/eerdll2.hxx b/editeng/inc/eerdll2.hxx
similarity index 93%
rename from editeng/source/editeng/eerdll2.hxx
rename to editeng/inc/eerdll2.hxx
index b8ff6773e716..f7dcb13ec696 100644
--- a/editeng/source/editeng/eerdll2.hxx
+++ b/editeng/inc/eerdll2.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EERDLL2_HXX
-#define INCLUDED_EDITENG_SOURCE_EDITENG_EERDLL2_HXX
+#ifndef INCLUDED_EDITENG_INC_EERDLL2_HXX
+#define INCLUDED_EDITENG_INC_EERDLL2_HXX
 
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 #include <editeng/forbiddencharacterstable.hxx>
@@ -65,6 +65,6 @@ public:
     css::uno::Reference< css::linguistic2::XLanguageGuessing > const & GetLanguageGuesser();
 };
 
-#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EERDLL2_HXX
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 9cf295b45d82..792881a38841 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -12,14 +12,15 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
+#include "eerdll2.hxx"
+#include "editdoc.hxx"
+
 #include "sfx2/app.hxx"
 #include "svl/itempool.hxx"
 #include "editeng/eerdll.hxx"
-#include "editeng/eerdll2.hxx"
 #include "editeng/editeng.hxx"
 #include "editeng/eeitem.hxx"
 #include "editeng/editids.hrc"
-#include "editeng/editdoc.hxx"
 #include "editeng/svxacorr.hxx"
 #include "editeng/unofield.hxx"
 #include "editeng/wghtitem.hxx"