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, 11 insertions, 50 deletions

diff --git a/include/connectivity/StdTypeDefs.hxx b/include/connectivity/StdTypeDefs.hxx
deleted file mode 100644
index 04a9ad7f710d..000000000000
--- a/include/connectivity/StdTypeDefs.hxx
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX
-#define INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX
-
-#include <map>
-#include <vector>
-
-#include <rtl/ustring.hxx>
-
-
-namespace connectivity
-{
-    typedef ::std::vector< OUString>         TStringVector;
-    typedef ::std::map<sal_Int32,sal_Int32>  TInt2IntMap;
-}
-
-#endif // INCLUDED_CONNECTIVITY_STDTYPEDEFS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx
index 3aea77fd2955..b45cd4ed9aa0 100644
--- a/include/connectivity/TColumnsHelper.hxx
+++ b/include/connectivity/TColumnsHelper.hxx
@@ -47,7 +47,7 @@ namespace connectivity
         OColumnsHelper( ::cppu::OWeakObject& _rParent
                         ,bool _bCase
                         ,::osl::Mutex& _rMutex
-                        ,const TStringVector &_rVector
+                        ,const ::std::vector< OUString> &_rVector
                         ,bool _bUseHardRef
                     );
         virtual ~OColumnsHelper() override;
diff --git a/include/connectivity/TKeys.hxx b/include/connectivity/TKeys.hxx
index fa7f66424efd..1b78a88e85a6 100644
--- a/include/connectivity/TKeys.hxx
+++ b/include/connectivity/TKeys.hxx
@@ -43,7 +43,7 @@ namespace connectivity
     public:
         OKeysHelper(    OTableHelper* _pTable,
                 ::osl::Mutex& _rMutex,
-                const TStringVector& _rVector
+                const ::std::vector< OUString>& _rVector
                 );
 
         static void cloneDescriptorColumns(
diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx
index 72c7577e53b2..aa462dd50fc3 100644
--- a/include/connectivity/TTableHelper.hxx
+++ b/include/connectivity/TTableHelper.hxx
@@ -28,7 +28,6 @@
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/VTable.hxx>
 #include <connectivity/sdbcx/VKey.hxx>
-#include <connectivity/StdTypeDefs.hxx>
 #include <com/sun/star/sdb/tools/XTableRename.hpp>
 #include <com/sun/star/sdb/tools/XTableAlteration.hpp>
 #include <com/sun/star/sdb/tools/XKeyAlteration.hpp>
@@ -81,27 +80,27 @@ namespace connectivity
     {
         ::std::unique_ptr<OTableHelperImpl> m_pImpl;
 
-        void refreshPrimaryKeys(TStringVector& _rKeys);
-        void refreshForeignKeys(TStringVector& _rKeys);
+        void refreshPrimaryKeys(::std::vector< OUString>& _rKeys);
+        void refreshForeignKeys(::std::vector< OUString>& _rKeys);
 
     protected:
         /** creates the column collection for the table
             @param  _rNames
                 The column names.
         */
-        virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames) = 0;
+        virtual sdbcx::OCollection* createColumns(const ::std::vector< OUString>& _rNames) = 0;
 
         /** creates the key collection for the table
             @param  _rNames
                 The key names.
         */
-        virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames) = 0;
+        virtual sdbcx::OCollection* createKeys(const ::std::vector< OUString>& _rNames) = 0;
 
         /** creates the index collection for the table
             @param  _rNames
                 The index names.
         */
-        virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames) = 0;
+        virtual sdbcx::OCollection* createIndexes(const ::std::vector< OUString>& _rNames) = 0;
 
         /** this function is called upon disposing the component
         */
diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx
index 3f7710e43630..0b6ebc463e8e 100644
--- a/include/connectivity/sdbcx/VCatalog.hxx
+++ b/include/connectivity/sdbcx/VCatalog.hxx
@@ -32,7 +32,6 @@
 #include <connectivity/CommonTools.hxx>
 #include <connectivity/OSubComponent.hxx>
 #include <connectivity/sdbcx/IRefreshable.hxx>
-#include <connectivity/StdTypeDefs.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 
 namespace connectivity
@@ -86,7 +85,7 @@ namespace connectivity
                 @param  _rNames
                     The vector who will be filled.
             */
-            void fillNames(css::uno::Reference< css::sdbc::XResultSet >& _xResult,TStringVector& _rNames);
+            void fillNames(css::uno::Reference< css::sdbc::XResultSet >& _xResult,::std::vector< OUString>& _rNames);
 
         public:
             OCatalog(const css::uno::Reference< css::sdbc::XConnection> &_xConnection);
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index ead911083029..9bf5e4c54200 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <connectivity/CommonTools.hxx>
 #include <com/sun/star/container/XContainer.hpp>
-#include <connectivity/StdTypeDefs.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <memory>
 
@@ -69,7 +68,7 @@ namespace connectivity
             virtual void swapAll() = 0;
             virtual void swap() = 0;
             virtual void clear() = 0;
-            virtual void reFill(const TStringVector &_rVector) = 0;
+            virtual void reFill(const ::std::vector< OUString> &_rVector) = 0;
             virtual void insert(const OUString& _sName, const ObjectType& _xObject) = 0;
             virtual bool rename(const OUString& _sOldName, const OUString& _sNewName) = 0;
             virtual sal_Int32 size() = 0;
@@ -147,7 +146,7 @@ namespace connectivity
             OCollection(::cppu::OWeakObject& _rParent,
                         bool _bCase,
                         ::osl::Mutex& _rMutex,
-                        const TStringVector &_rVector,
+                        const ::std::vector< OUString> &_rVector,
                         bool _bUseIndexOnly = false,
                         bool _bUseHardRef = true);
 
@@ -171,7 +170,7 @@ namespace connectivity
             virtual ~OCollection();
             DECLARE_SERVICE_INFO();
 
-            void reFill(const TStringVector &_rVector);
+            void reFill(const ::std::vector< OUString> &_rVector);
             bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); }
             void renameObject(const OUString& _sOldName, const OUString& _sNewName);