diff options
author | Asela Dasanayaka <rukmal.tb@gmail.com> | 2016-10-13 14:42:16 +0530 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-13 10:15:52 +0000 |
commit | 4f0f1b6b5554f49dfe8cca1088d3e5b342b4fd2a (patch) | |
tree | 660a1dd2ea9d4b26a83fde63c71ec04f15e38b4b /idlc/source | |
parent | LoadLibraryEx returns null on error (diff) | |
download | core-4f0f1b6b5554f49dfe8cca1088d3e5b342b4fd2a.tar.gz core-4f0f1b6b5554f49dfe8cca1088d3e5b342b4fd2a.zip |
tdf#96099 Reduce no of typedefs used for trivial containers
Removed various pinter typedefs in idlc module
Change-Id: Id850558a4550085d47a5e1122b1ce871f15956f2
Reviewed-on: https://gerrit.libreoffice.org/29754
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'idlc/source')
-rw-r--r-- | idlc/source/idlcmain.cxx | 4 | ||||
-rw-r--r-- | idlc/source/idlcproduce.cxx | 8 | ||||
-rw-r--r-- | idlc/source/parser.y | 22 |
3 files changed, 17 insertions, 17 deletions
diff --git a/idlc/source/idlcmain.cxx b/idlc/source/idlcmain.cxx index d610246dcc46..59a656aed142 100644 --- a/idlc/source/idlcmain.cxx +++ b/idlc/source/idlcmain.cxx @@ -72,14 +72,14 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) } idlc()->reset(); } - StringVector const & files = options.getInputFiles(); + std::vector< OString > const & files = options.getInputFiles(); if ( options.verbose() ) { fprintf( stdout, "%s: compiling %i source files ... \n", options.getProgramName().getStr(), (int)files.size() ); fflush( stdout ); } - for (StringVector::const_iterator i(files.begin()); + for (std::vector< OString >::const_iterator i(files.begin()); i != files.end() && nErrors == 0; ++i) { OString sysFileName( convertToAbsoluteSystemPath(*i) ); diff --git a/idlc/source/idlcproduce.cxx b/idlc/source/idlcproduce.cxx index 1588dd312154..32e53dbce537 100644 --- a/idlc/source/idlcproduce.cxx +++ b/idlc/source/idlcproduce.cxx @@ -39,7 +39,7 @@ using namespace ::osl; -StringList* pCreatedDirectories = nullptr; +std::list< OString >* pCreatedDirectories = nullptr; static bool checkOutputPath(const OString& completeName) { @@ -83,7 +83,7 @@ static bool checkOutputPath(const OString& completeName) } else { if ( !pCreatedDirectories ) - pCreatedDirectories = new StringList(); + pCreatedDirectories = new std::list< OString >(); pCreatedDirectories->push_front(buffer.getStr()); } } @@ -96,8 +96,8 @@ static bool cleanPath() { if ( pCreatedDirectories ) { - StringList::iterator iter = pCreatedDirectories->begin(); - StringList::iterator end = pCreatedDirectories->end(); + std::list< OString >::iterator iter = pCreatedDirectories->begin(); + std::list< OString >::iterator end = pCreatedDirectories->end(); while ( iter != end ) { //#ifdef SAL_UNX diff --git a/idlc/source/parser.y b/idlc/source/parser.y index c0459163ed80..6e7bf785154f 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -235,7 +235,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) { sal_uInt32 ulval; /* sal_uInt32 value */ double dval; /* double value */ float fval; /* float value */ - StringList* slval; /* StringList value */ + std::list< OString >* slval; /* StringList value */ AttributeExceptions::Part attexcpval; AttributeExceptions attexcval; } @@ -1624,8 +1624,8 @@ service_export : */ if ( pScope && $2 ) { - StringList::iterator iter = $2->begin(); - StringList::iterator end = $2->end(); + std::list< OString >::iterator iter = $2->begin(); + std::list< OString >::iterator end = $2->end(); while ( iter != end ) { @@ -1668,8 +1668,8 @@ service_export : */ if ( pScope && $2 ) { - StringList::iterator iter = $2->begin(); - StringList::iterator end = $2->end(); + std::list< OString >::iterator iter = $2->begin(); + std::list< OString >::iterator end = $2->end(); while ( iter != end ) { @@ -1714,8 +1714,8 @@ service_export : */ if ( pScope && $2 ) { - StringList::iterator iter = $2->begin(); - StringList::iterator end = $2->end(); + std::list< OString >::iterator iter = $2->begin(); + std::list< OString >::iterator end = $2->end(); while ( iter != end ) { @@ -1755,8 +1755,8 @@ service_export : */ if ( pScope && $2 ) { - StringList::iterator iter = $2->begin(); - StringList::iterator end = $2->end(); + std::list< OString >::iterator iter = $2->begin(); + std::list< OString >::iterator end = $2->end(); while ( iter != end ) { @@ -2140,7 +2140,7 @@ at_least_one_scoped_name : $$ = $2; } else { - StringList* pScopedNames = new StringList(); + std::list< OString >* pScopedNames = new std::list< OString >(); // coverity [copy_paste_error] pScopedNames->push_back(*$1); $$ = pScopedNames; @@ -2164,7 +2164,7 @@ scoped_names : $$ = $1; } else { - StringList* pNames = new StringList(); + std::list< OString >* pNames = new std::list< OString >(); pNames->push_back(*$4); $$ = pNames; } |