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

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))

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"

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>
 

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"

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

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>

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>

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>

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>

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"

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

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"

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>
 

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"