OSubComponent.hxx is included by a header from inc -> move

15 files changed, 14 insertions, 13 deletions

diff --git a/connectivity/Package_inc.mk b/connectivity/Package_inc.mk
index 89fddd6430a0..3325e604d55d 100644
--- a/connectivity/Package_inc.mk
+++ b/connectivity/Package_inc.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/filtermanage
 $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/formattedcolumnvalue.hxx,formattedcolumnvalue.hxx))
 $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/FValue.hxx,FValue.hxx))
 $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/IParseContext.hxx,IParseContext.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/OSubComponent.hxx,OSubComponent.hxx))
 $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/ParameterCont.hxx,ParameterCont.hxx))
 $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/parameters.hxx,parameters.hxx))
 $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/paramwrapper.hxx,paramwrapper.hxx))
diff --git a/connectivity/source/inc/OSubComponent.hxx b/connectivity/inc/connectivity/OSubComponent.hxx
index 8db7336b16d1..8db7336b16d1 100644
--- a/connectivity/source/inc/OSubComponent.hxx
+++ b/connectivity/inc/connectivity/OSubComponent.hxx
diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
index 95b963d959a9..dac591ee474b 100644
--- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
@@ -39,7 +39,7 @@
 #include <cppuhelper/compbase5.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include "connectivity/CommonTools.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include "connectivity/sdbcx/IRefreshable.hxx"
 #include "connectivity/StdTypeDefs.hxx"
 #include "connectivity/dbtoolsdllapi.hxx"
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 8fcb43993b6a..ebed52b5353d 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -87,7 +87,7 @@
 
 #include "resource/common_res.hrc"
 #include "resource/sharedresources.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 
 #include <algorithm>
 
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index c61d938ccf2c..31598de04f2b 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -32,7 +32,7 @@
 #include "NDriver.hxx"
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include "connectivity/CommonTools.hxx"
 #include "connectivity/warningscontainer.hxx"
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 36c1f7d359f0..d6154e4e6b1b 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -47,7 +47,7 @@
 #include "connectivity/FValue.hxx"
 #include "connectivity/warningscontainer.hxx"
 #include "NStatement.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include "NResultSetMetaData.hxx"
 
 namespace connectivity
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index e292a8fb317a..f64bc67be71c 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -43,7 +43,7 @@
 #include "connectivity/sqliterator.hxx"
 #include "connectivity/sqlparse.hxx"
 #include <connectivity/FValue.hxx>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include <com/sun/star/util/XCancellable.hpp>
 #include <cppuhelper/compbase5.hxx>
 #include <comphelper/propertycontainer.hxx>
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index b58460c0a80d..5da3726b14b3 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -30,7 +30,7 @@
 #define _CONNECTIVITY_KAB_CONNECTION_HXX_
 
 #include <map>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include "connectivity/CommonTools.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx
index f149847958b9..678e191609cd 100644
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
@@ -30,7 +30,7 @@
 #define _CONNECTIVITY_MACAB_CONNECTION_HXX_
 
 #include <map>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include "connectivity/CommonTools.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx
index 76dcb328c2c4..739feb46f112 100644
--- a/connectivity/source/drivers/mozab/MConnection.hxx
+++ b/connectivity/source/drivers/mozab/MConnection.hxx
@@ -32,7 +32,7 @@
 
 #include "MCatalog.hxx"
 #include "MColumnAlias.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include "TConnection.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx
index 4be35ae52fff..9fcde4164ca4 100644
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include <map>
 #include "connectivity/CommonTools.hxx"
 #include "OTypeInfo.hxx"
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index 244d8055b4a8..73a064f50c6f 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #ifndef _MAP_
 #include <map>
 #endif
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index bb2fd5f86500..b410c221da4c 100644
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
@@ -31,7 +31,7 @@
 #include "java/lang/Object.hxx"
 #include "TConnection.hxx"
 #include "connectivity/CommonTools.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include <cppuhelper/weakref.hxx>
 #include "AutoRetrievingBase.hxx"
 #include "java/sql/ConnectionLog.hxx"
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index b32989772d2e..ae4584b55e23 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -40,7 +40,7 @@
 #include <cppuhelper/compbase6.hxx>
 #include <comphelper/uno3.hxx>
 #include "connectivity/CommonTools.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/broadcasthelper.hxx>
 
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 8bf121e2b20d..1d8a5f02a211 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include "odbc/OFunctiondefs.hxx"
 #include "odbc/odbcbasedllapi.hxx"
-#include "OSubComponent.hxx"
+#include "connectivity/OSubComponent.hxx"
 #include "connectivity/CommonTools.hxx"
 #include "TConnection.hxx"
 #include "OTypeInfo.hxx"