Kaydet (Commit) 3bd8759f authored tarafından Arkadiy Illarionov's avatar Arkadiy Illarionov Kaydeden (comit) Noel Grandin

tdf#96099 Remove some trivial std::vector typedefs

Change-Id: I0e60ec7a3edae42b25ff0917828d0a893ed39a38
Reviewed-on: https://gerrit.libreoffice.org/55245Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst a901e485
......@@ -722,9 +722,8 @@ Assembly ^ TypeEmitter::type_resolve(
array< ::System::Type^>^ base_interfaces =
gcnew array< ::System::Type^>( vecBaseTypes.size() );
typedef std::vector<Reference<reflection::XInterfaceTypeDescription2> >::const_iterator it;
int index = 0;
for (it i = vecBaseTypes.begin(); i != vecBaseTypes.end(); ++i, ++index)
for (auto i = vecBaseTypes.begin(); i != vecBaseTypes.end(); ++i, ++index)
base_interfaces[ index ] = get_type( *i );
type_builder = m_module_builder->DefineType(
cts_name, attr, nullptr, base_interfaces );
......
......@@ -153,7 +153,6 @@ struct joaat_hash
typedef std::unordered_map<std::string, std::string, pref_hash> Stringtable;
typedef std::deque<std::string> LinkedList;
typedef std::vector<std::string> HashSet;
typedef std::unordered_map<std::string, LinkedList, pref_hash> Hashtable;
......@@ -165,7 +164,7 @@ public:
std::string document_module;
std::string document_title;
std::unique_ptr<HashSet> appl_hidlist;
std::unique_ptr< std::vector<std::string> > appl_hidlist;
std::unique_ptr<Hashtable> appl_keywords;
std::unique_ptr<Stringtable> appl_helptexts;
xmlDocPtr appl_doc;
......
......@@ -63,7 +63,7 @@ public:
private:
Stringtable additionalFiles;
HashSet helpFiles;
std::vector<std::string> helpFiles;
fs::path sourceRoot;
fs::path compactStylesheet;
fs::path embeddStylesheet;
......
......@@ -246,17 +246,17 @@ public:
std::string documentId;
std::string fileName;
std::string title;
std::unique_ptr<HashSet> hidlist;
std::unique_ptr< std::vector<std::string> > hidlist;
std::unique_ptr<Hashtable> keywords;
std::unique_ptr<Stringtable> helptexts;
private:
HashSet extendedHelpText;
std::vector<std::string> extendedHelpText;
public:
myparser(const std::string &indocumentId, const std::string &infileName,
const std::string &intitle) : documentId(indocumentId), fileName(infileName),
title(intitle)
{
hidlist.reset(new HashSet);
hidlist.reset(new std::vector<std::string>);
keywords.reset(new Hashtable);
helptexts.reset(new Stringtable);
}
......
......@@ -382,7 +382,7 @@ void HelpLinker::link()
// add once this as its own id.
addBookmark( pFileDbBase_DBHelp, documentPath, fileB, std::string(), jarfileB, titleB);
const HashSet *hidlist = streamTable.appl_hidlist.get();
const std::vector<std::string> *hidlist = streamTable.appl_hidlist.get();
if (hidlist && !hidlist->empty())
{
// now iterate over all elements of the hidlist
......
......@@ -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;
......
......@@ -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;
......
......@@ -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,
......
......@@ -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,
......
......@@ -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 ];
......
......@@ -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() )
......
......@@ -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 ) )
{
......
......@@ -41,13 +41,13 @@ struct UpDownBarsModel
struct TypeGroupModel
{
typedef ModelVector< SeriesModel > SeriesVector;
typedef ::std::vector< sal_Int32 > AxisIdVector;
typedef ModelRef< DataLabelsModel > DataLabelsRef;
typedef ModelRef< UpDownBarsModel > UpDownBarsRef;
typedef ModelRef< Shape > ShapeRef;
SeriesVector maSeries; /// Series attached to this chart type group.
AxisIdVector maAxisIds; /// List of axis identifiers used by this chart type.
std::vector<sal_Int32>
maAxisIds; /// List of axis identifiers used by this chart type.
DataLabelsRef mxLabels; /// Data point label settings for all series.
UpDownBarsRef mxUpDownBars; /// Up/down bars in stock charts.
ShapeRef mxSerLines; /// Connector lines in stacked bar charts.
......
......@@ -368,7 +368,7 @@ void PlotAreaConverter::convertFromModel( View3DModel& rView3DModel )
{
pAxesSet = &aAxesSets.create();
// find axis models used by the type group
const TypeGroupModel::AxisIdVector& rAxisIds = typeGroup->maAxisIds;
const std::vector<sal_Int32>& rAxisIds = typeGroup->maAxisIds;
if( rAxisIds.size() >= 1 )
pAxesSet->maAxes[ API_X_AXIS ] = aAxisMap.get( rAxisIds[ 0 ] );
if( rAxisIds.size() >= 2 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment