summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorArkadiy Illarionov <qarkai@gmail.com>2018-06-03 16:00:14 +0300
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-06-11 08:57:06 +0200
commit3bd8759f5ed0393b2cc5560cab1b5d4052bd9728 (patch)
treed48d1325fff62b343fe2d9a0f609f97316485d51 /idl
parenta901e48579e203a28cc0871ceed0356ae6a5798b (diff)
tdf#96099 Remove some trivial std::vector typedefs
Change-Id: I0e60ec7a3edae42b25ff0917828d0a893ed39a38 Reviewed-on: https://gerrit.libreoffice.org/55245 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'idl')
-rw-r--r--idl/inc/command.hxx5
-rw-r--r--idl/inc/database.hxx2
-rw-r--r--idl/inc/object.hxx2
-rw-r--r--idl/inc/slot.hxx2
-rw-r--r--idl/source/objects/object.cxx4
-rw-r--r--idl/source/objects/slot.cxx2
-rw-r--r--idl/source/prj/command.cxx4
7 files changed, 9 insertions, 12 deletions
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 6be70f446e81..ea5e0f4464f5 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -23,13 +23,10 @@
#include <rtl/ustring.hxx>
#include <vector>
-typedef ::std::vector< OUString > StringList;
-typedef ::std::vector< OString* > ByteStringList;
-
class SvCommand
{
public:
- StringList aInFileList;
+ std::vector<OUString> aInFileList;
OUString aSlotMapFile;
OUString aPath;
OUString aTargetFile;
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 65ef714d939b..6b3904b55c1a 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -70,7 +70,7 @@ class SvIdlDataBase
OUString aExportFile;
sal_uInt32 nUniqueId;
sal_uInt32 nVerbosity;
- StringList aIdFileList;
+ std::vector<OUString> aIdFileList;
std::unique_ptr<SvStringHashTable> pIdTable;
SvRefMemberList<SvMetaType *> aTypeList;
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index d385fe0367cc..5b4bdb1eb6eb 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -59,7 +59,7 @@ private:
static void WriteSlotStubs( const OString& rShellName,
SvSlotElementList & rSlotList,
- ByteStringList & rList,
+ std::vector<OString*> & rList,
SvStream & rOutStm );
static sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
SvSlotElementList & rSlotList,
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 1aa6ebca6913..deef59ca6373 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -119,7 +119,7 @@ public:
virtual bool ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ) override;
virtual void Insert( SvSlotElementList& ) override;
void WriteSlotStubs( const OString& rShellName,
- ByteStringList & rList,
+ std::vector<OString*> & rList,
SvStream & rOutStm ) const;
sal_uInt16 WriteSlotMap( const OString& rShellName,
sal_uInt16 nCount,
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index fd77df3a3a16..cdff9c074232 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -250,7 +250,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList )
void SvMetaClass::WriteSlotStubs( const OString& rShellName,
SvSlotElementList & rSlotList,
- ByteStringList & rList,
+ std::vector<OString*> & rList,
SvStream & rOutStm )
{
// write all attributes
@@ -305,7 +305,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
rOutStm << endl;
rOutStm.WriteCharPtr( "};" ) << endl << endl;
- ByteStringList aStringList;
+ std::vector<OString*> aStringList;
WriteSlotStubs( GetName(), aSlotList, aStringList, rOutStm );
for ( size_t i = 0, n = aStringList.size(); i < n; ++i )
delete aStringList[ i ];
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 349ed4b0913d..e04edb927e5b 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -354,7 +354,7 @@ static OString MakeSlotName( SvStringHashEntry const * pEntry )
};
void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
- ByteStringList & rList,
+ std::vector<OString*> & rList,
SvStream & rOutStm ) const
{
if ( !GetExport() && !GetHidden() )
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 740d384add60..b04892165057 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -132,7 +132,7 @@ bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
return true;
}
-static bool ResponseFile( StringList * pList, int argc, char ** argv )
+static bool ResponseFile( std::vector<OUString> * pList, int argc, char ** argv )
{
// program name
pList->push_back( OUString::createFromAscii(*argv) );
@@ -174,7 +174,7 @@ static bool ResponseFile( StringList * pList, int argc, char ** argv )
SvCommand::SvCommand( int argc, char ** argv )
: nVerbosity(1)
{
- StringList aList;
+ std::vector<OUString> aList;
if( ResponseFile( &aList, argc, argv ) )
{