dbaccess/source/core/inc/ModelImpl.hxx | 6 +++---
dbaccess/source/core/inc/bookmarkcontainer.hxx | 6 +++---
dbaccess/source/core/inc/databasecontext.hxx | 6 +++---
dbaccess/source/core/inc/documentevents.hxx | 6 +++---
dbaccess/source/core/misc/services.cxx | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit f6fcd29e339ab6d8596588410d4280d214f1f294
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Oct 16 17:16:51 2017 +0200
Move dbaccess/source/core/dataaccess include files to common include
directory
...that are included from both dbaccess/source/core/dataaccess and
dbaccess/source/core/misc. Change done in preparation of
loplugin:includeform.
Change-Id: I0572322810d8b4cd66a1b1f9e9deec893cafdbca
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx
b/dbaccess/source/core/inc/ModelImpl.hxx
similarity index 99%
rename from dbaccess/source/core/dataaccess/ModelImpl.hxx
rename to dbaccess/source/core/inc/ModelImpl.hxx
index 034e1bbd4b8d..c3fdbad0af80 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/inc/ModelImpl.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MODELIMPL_HXX
-#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MODELIMPL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_MODELIMPL_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_MODELIMPL_HXX
#include "apitools.hxx"
#include "bookmarkcontainer.hxx"
@@ -606,6 +606,6 @@ public:
} // namespace dbaccess
-#endif // _DBA_COREDATAACCESS_DATALINK_HXX_
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
b/dbaccess/source/core/inc/bookmarkcontainer.hxx
similarity index 96%
rename from dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
rename to dbaccess/source/core/inc/bookmarkcontainer.hxx
index 1f0f453add87..97a61141005d 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
+++ b/dbaccess/source/core/inc/bookmarkcontainer.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX
-#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_BOOKMARKCONTAINER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_BOOKMARKCONTAINER_HXX
#include <sal/config.h>
@@ -151,6 +151,6 @@ inline bool OBookmarkContainer::checkExistence(const
OUString& _rName)
} // namespace dbaccess
-#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx
b/dbaccess/source/core/inc/databasecontext.hxx
similarity index 97%
rename from dbaccess/source/core/dataaccess/databasecontext.hxx
rename to dbaccess/source/core/inc/databasecontext.hxx
index b51425d3e312..52b2a90ce579 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/inc/databasecontext.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX
-#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DATABASECONTEXT_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DATABASECONTEXT_HXX
#include <sal/config.h>
@@ -186,6 +186,6 @@ private:
} // namespace dbaccess
-#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx
b/dbaccess/source/core/inc/documentevents.hxx
similarity index 92%
rename from dbaccess/source/core/dataaccess/documentevents.hxx
rename to dbaccess/source/core/inc/documentevents.hxx
index 8db1f8c3e25b..9a04074a3c68 100644
--- a/dbaccess/source/core/dataaccess/documentevents.hxx
+++ b/dbaccess/source/core/inc/documentevents.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTS_HXX
-#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DOCUMENTEVENTS_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DOCUMENTEVENTS_HXX
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -73,6 +73,6 @@ namespace dbaccess
} // namespace dbaccess
-#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTS_HXX
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/services.cxx
b/dbaccess/source/core/misc/services.cxx
index 80c20a1aa160..555d88824f80 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -22,7 +22,7 @@
#include "DatabaseDataProvider.hxx"
#include "dbadllapi.hxx"
-#include <../dataaccess/databasecontext.hxx>
+#include <databasecontext.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
