tdf#96099 Remove some trivial std::deque typedefs

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

5 files changed, 25 insertions, 33 deletions

diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 37c5d77b79aa..40ccfd8f6bef 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -62,8 +62,6 @@ namespace backend {
 namespace component {
 namespace {
 
-typedef std::deque<OUString> t_stringlist;
-
 #define IMPLEMENTATION_NAME  "com.sun.star.comp.deployment.component.PackageRegistryBackend"
 
 /** return a vector of bootstrap variables which have been provided
@@ -241,13 +239,13 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     };
     friend class OtherPlatformPackageImpl;
 
-    t_stringlist m_jar_typelibs;
-    t_stringlist m_rdb_typelibs;
-    t_stringlist m_components;
+    std::deque<OUString> m_jar_typelibs;
+    std::deque<OUString> m_rdb_typelibs;
+    std::deque<OUString> m_components;
 
     enum RcItem { RCITEM_JAR_TYPELIB, RCITEM_RDB_TYPELIB, RCITEM_COMPONENTS };
 
-    t_stringlist & getRcItemList( RcItem kind ) {
+    std::deque<OUString> & getRcItemList( RcItem kind ) {
         switch (kind)
         {
         case RCITEM_JAR_TYPELIB:
@@ -862,8 +860,8 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
 
     if (! m_jar_typelibs.empty())
     {
-        t_stringlist::const_iterator iPos( m_jar_typelibs.begin() );
-        t_stringlist::const_iterator const iEnd( m_jar_typelibs.end() );
+        auto iPos( m_jar_typelibs.cbegin() );
+        auto const iEnd( m_jar_typelibs.cend() );
         buf.append( "UNO_JAVA_CLASSPATH=" );
         while (iPos != iEnd) {
             // encoded ASCII file-urls:
@@ -878,8 +876,8 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
     }
     if (! m_rdb_typelibs.empty())
     {
-        t_stringlist::const_iterator iPos( m_rdb_typelibs.begin() );
-        t_stringlist::const_iterator const iEnd( m_rdb_typelibs.end() );
+        auto iPos( m_rdb_typelibs.cbegin() );
+        auto const iEnd( m_rdb_typelibs.cend() );
         buf.append( "UNO_TYPES=" );
         while (iPos != iEnd) {
             buf.append( '?' );
@@ -972,7 +970,7 @@ void BackendImpl::addToUnoRc( RcItem kind, OUString const & url_,
     const OUString rcterm( dp_misc::makeRcTerm(url_) );
     const ::osl::MutexGuard guard( getMutex() );
     unorc_verify_init( xCmdEnv );
-    t_stringlist & rSet = getRcItemList(kind);
+    std::deque<OUString> & rSet = getRcItemList(kind);
     if (std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) {
         rSet.push_front( rcterm ); // prepend to list, thus overriding
         // write immediately:
@@ -989,7 +987,7 @@ void BackendImpl::removeFromUnoRc(
     const OUString rcterm( dp_misc::makeRcTerm(url_) );
     const ::osl::MutexGuard guard( getMutex() );
     unorc_verify_init( xCmdEnv );
-    t_stringlist & aRcItemList = getRcItemList(kind);
+    std::deque<OUString> & aRcItemList = getRcItemList(kind);
     aRcItemList.erase(std::remove(aRcItemList.begin(), aRcItemList.end(), rcterm), aRcItemList.end());
     // write immediately:
     m_unorc_modified = true;
@@ -1002,7 +1000,7 @@ bool BackendImpl::hasInUnoRc(
 {
     const OUString rcterm( dp_misc::makeRcTerm(url_) );
     const ::osl::MutexGuard guard( getMutex() );
-    t_stringlist const & rSet = getRcItemList(kind);
+    std::deque<OUString> const & rSet = getRcItemList(kind);
     return std::find( rSet.begin(), rSet.end(), rcterm ) != rSet.end();
 }
 
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index dc83fe547ba7..b9b8645dfc44 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -61,9 +61,6 @@ namespace backend {
 namespace configuration {
 namespace {
 
-typedef std::deque<OUString> t_stringlist;
-
-
 class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
 {
     class PackageImpl : public ::dp_registry::backend::Package
@@ -97,9 +94,9 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
     };
     friend class PackageImpl;
 
-    t_stringlist m_xcs_files;
-    t_stringlist m_xcu_files;
-    t_stringlist & getFiles( bool xcs ) {
+    std::deque<OUString> m_xcs_files;
+    std::deque<OUString> m_xcu_files;
+    std::deque<OUString> & getFiles( bool xcs ) {
         return xcs ? m_xcs_files : m_xcu_files;
     }
 
@@ -422,8 +419,8 @@ void BackendImpl::configmgrini_flush(
     OStringBuffer buf;
     if (! m_xcs_files.empty())
     {
-        t_stringlist::const_iterator iPos( m_xcs_files.begin() );
-        t_stringlist::const_iterator const iEnd( m_xcs_files.end() );
+        auto iPos( m_xcs_files.cbegin() );
+        auto const iEnd( m_xcs_files.cend() );
         buf.append( "SCHEMA=" );
         while (iPos != iEnd) {
             // encoded ASCII file-urls:
@@ -438,8 +435,8 @@ void BackendImpl::configmgrini_flush(
     }
     if (! m_xcu_files.empty())
     {
-        t_stringlist::const_iterator iPos( m_xcu_files.begin() );
-        t_stringlist::const_iterator const iEnd( m_xcu_files.end() );
+        auto iPos( m_xcu_files.cbegin() );
+        auto const iEnd( m_xcu_files.cend() );
         buf.append( "DATA=" );
         while (iPos != iEnd) {
             // encoded ASCII file-urls:
@@ -472,7 +469,7 @@ void BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const &
     const OUString rcterm( isURL ? dp_misc::makeRcTerm(url_) : url_ );
     const ::osl::MutexGuard guard( getMutex() );
     configmgrini_verify_init( xCmdEnv );
-    t_stringlist & rSet = getFiles(isSchema);
+    std::deque<OUString> & rSet = getFiles(isSchema);
     if (std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) {
         rSet.push_front( rcterm ); // prepend to list, thus overriding
         // write immediately:
@@ -489,8 +486,8 @@ bool BackendImpl::removeFromConfigmgrIni(
     const OUString rcterm( dp_misc::makeRcTerm(url_) );
     const ::osl::MutexGuard guard( getMutex() );
     configmgrini_verify_init( xCmdEnv );
-    t_stringlist & rSet = getFiles(isSchema);
-    t_stringlist::iterator i(std::find(rSet.begin(), rSet.end(), rcterm));
+    std::deque<OUString> & rSet = getFiles(isSchema);
+    auto i(std::find(rSet.begin(), rSet.end(), rcterm));
     if (i == rSet.end() && !isSchema)
     {
         //in case the xcu contained %origin% then the configmr.ini contains the
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 85877cbdf81d..208e708ccf90 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -396,10 +396,8 @@ uno::Any SwXTextPortionEnumeration::nextElement()
     return any;
 }
 
-typedef std::deque< sal_Int32 > FieldMarks_t;
-
 static void
-lcl_FillFieldMarkArray(FieldMarks_t & rFieldMarks, SwUnoCursor const & rUnoCursor,
+lcl_FillFieldMarkArray(std::deque<sal_Int32> & rFieldMarks, SwUnoCursor const & rUnoCursor,
         const sal_Int32 i_nStartPos)
 {
     const SwTextNode * const pTextNode =
@@ -1316,7 +1314,7 @@ static void lcl_CreatePortions(
 
     SwDoc * const pDoc = pUnoCursor->GetDoc();
 
-    FieldMarks_t FieldMarks;
+    std::deque<sal_Int32> FieldMarks;
     lcl_FillFieldMarkArray(FieldMarks, *pUnoCursor, i_nStartPos);
 
     SwXBookmarkPortion_ImplList Bookmarks;
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index c22b79841e0a..289303da11c1 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -817,7 +817,6 @@ private:
     SwWW8ImplReader& mrReader;
     std::deque<wwSection> maSegments;
     typedef std::deque<wwSection>::iterator mySegIter;
-    typedef std::deque<wwSection>::reverse_iterator mySegrIter;
 
     //Num of page desc's entered into the document
     sal_uInt16 mnDesc;
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 227fe8937a0f..2f81599eb5b6 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -635,8 +635,8 @@ SwSectionFormat *wwSectionManager::InsertSection(
         return nullptr;
 
     SwPageDesc *pPage = nullptr;
-    mySegrIter aEnd = maSegments.rend();
-    for (mySegrIter aIter = maSegments.rbegin(); aIter != aEnd; ++aIter)
+    auto aEnd = maSegments.rend();
+    for (auto aIter = maSegments.rbegin(); aIter != aEnd; ++aIter)
     {
         if (nullptr != (pPage = aIter->mpPage))
             break;