inline typedefs in connectivity/StdTypeDefs

Change-Id: I614833ed2418ff99057c7d496ddb64f06e8395db
Reviewed-on: https://gerrit.libreoffice.org/46809
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 8 insertions, 9 deletions

diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
index 777bcc89e27e..5820f2b82de1 100644
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ b/connectivity/source/inc/hsqldb/HCatalog.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCATALOG_HXX
 
 #include <connectivity/sdbcx/VCatalog.hxx>
-#include <connectivity/StdTypeDefs.hxx>
 
 namespace connectivity
 {
@@ -38,7 +37,7 @@ namespace connectivity
                 @param  _rNames
                     The container for the names to be filled.
             */
-            void refreshObjects(const css::uno::Sequence< OUString >& _sKindOfObject,TStringVector& _rNames);
+            void refreshObjects(const css::uno::Sequence< OUString >& _sKindOfObject,::std::vector< OUString>& _rNames);
 
         public:
             // implementation of the pure virtual methods
diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
index c639588f2c6f..f3fd008cd92f 100644
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ b/connectivity/source/inc/hsqldb/HColumns.hxx
@@ -32,7 +32,7 @@ namespace connectivity
         public:
             OHSQLColumns(   ::cppu::OWeakObject& _rParent
                             ,::osl::Mutex& _rMutex
-                            ,const TStringVector &_rVector
+                            ,const ::std::vector< OUString> &_rVector
                         );
         };
 
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
index f642d39a35d8..b479039cc7b0 100644
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
@@ -47,19 +47,19 @@ namespace connectivity
                 @param  _rNames
                     The column names.
             */
-            virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames) override;
+            virtual sdbcx::OCollection* createColumns(const ::std::vector< OUString>& _rNames) override;
 
             /** creates the key collection for the table
                 @param  _rNames
                     The key names.
             */
-            virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames) override;
+            virtual sdbcx::OCollection* createKeys(const ::std::vector< OUString>& _rNames) override;
 
             /** creates the index collection for the table
                 @param  _rNames
                     The index names.
             */
-            virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames) override;
+            virtual sdbcx::OCollection* createIndexes(const ::std::vector< OUString>& _rNames) override;
 
             /** used to implement the creation of the array helper which is shared amongst all instances of the class.
                 This method needs to be implemented in derived classes.
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
index a52d8b3e5e80..bf0580396df2 100644
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.hxx
@@ -39,7 +39,7 @@ namespace connectivity
             virtual OUString getNameForObject(const sdbcx::ObjectType& _xObject) override;
         public:
             OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
-                const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
+                const ::std::vector< OUString> &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector)
                 ,m_xMetaData(_rMetaData)
             {}
 
diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx
index 14d0bbea6306..392b3412a39b 100644
--- a/connectivity/source/inc/hsqldb/HUsers.hxx
+++ b/connectivity/source/inc/hsqldb/HUsers.hxx
@@ -43,7 +43,7 @@ namespace connectivity
         public:
             OUsers( ::cppu::OWeakObject& _rParent,
                     ::osl::Mutex& _rMutex,
-                    const TStringVector &_rVector,
+                    const ::std::vector< OUString> &_rVector,
                     const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
                     connectivity::sdbcx::IRefreshableUsers* _pParent);
         };
diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx
index f81a50a8cd9e..6f6724383e32 100644
--- a/connectivity/source/inc/hsqldb/HViews.hxx
+++ b/connectivity/source/inc/hsqldb/HViews.hxx
@@ -41,7 +41,7 @@ namespace connectivity
         public:
             HViews(
                 const css::uno::Reference< css::sdbc::XConnection >& _rxConnection,
-                ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector );
+                ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::std::vector< OUString> &_rVector );
 
             // only the name is identical to ::cppu::OComponentHelper
             virtual void disposing() override;