[Libreoffice-commits] .: tools/bootstrp tools/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Jan 15 20:13:08 PST 2011
tools/bootstrp/prj.cxx | 55 ++++++++++++++++++++++++---------------------
tools/inc/bootstrp/prj.hxx | 8 ------
2 files changed, 31 insertions(+), 32 deletions(-)
New commits:
commit 83f8ab3c21fbc293a78a85fdba810053ad79c261
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Jan 15 20:10:34 2011 -0800
Remove DECLARE_LIST ( SolarFileList, String* )
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index 9ef259c..23446bf 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -549,7 +549,7 @@ Star::Star( GenericInformationList *pStandLst, ByteString &rVersion,
aPrjEntry += DirEntry( sPrjDir );
aPrjEntry += DirEntry( sSolarFile );
- pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND );
+ pFileList->push_back( new String( aPrjEntry.GetFull()) );
ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
}
@@ -592,25 +592,26 @@ void Star::Read( String &rFileName )
/*****************************************************************************/
{
ByteString aString;
- aFileList.Insert( new String( rFileName ));
+ aFileList.push_back( new String( rFileName ));
DirEntry aEntry( rFileName );
aEntry.ToAbs();
aEntry = aEntry.GetPath().GetPath().GetPath();
sSourceRoot = aEntry.GetFull();
- while( aFileList.Count()) {
- StarFile *pFile = new StarFile( *aFileList.GetObject(( ULONG ) 0 ));
+ for ( size_t i = 0, n = aFileList.size(); i < n; ++ i )
+ {
+ StarFile *pFile = new StarFile( *aFileList[ i ] );
if ( pFile->Exists()) {
- SimpleConfig aSolarConfig( *aFileList.GetObject(( ULONG ) 0 ));
+ SimpleConfig aSolarConfig( *aFileList[ i ] );
while (( aString = aSolarConfig.GetNext()) != "" )
InsertToken (( char * ) aString.GetBuffer());
}
aMutex.acquire();
aLoadedFilesList.Insert( pFile, LIST_APPEND );
aMutex.release();
- aFileList.Remove(( ULONG ) 0 );
}
+ aFileList.clear();
// resolve all dependencies recursive
Expand_Impl();
}
@@ -619,12 +620,13 @@ void Star::Read( String &rFileName )
void Star::Read( SolarFileList *pSolarFiles )
/*****************************************************************************/
{
- while( pSolarFiles->Count() ) {
+ for ( size_t i = 0, n = pSolarFiles->size(); i < n; ++ i )
+ {
ByteString aString;
- StarFile *pFile = new StarFile( *pSolarFiles->GetObject(( ULONG ) 0 ));
+ StarFile *pFile = new StarFile( *(*pSolarFiles)[ i ] );
if ( pFile->Exists()) {
- SimpleConfig aSolarConfig( *pSolarFiles->GetObject(( ULONG ) 0 ));
+ SimpleConfig aSolarConfig( *(*pSolarFiles)[ i ] );
while (( aString = aSolarConfig.GetNext()) != "" )
InsertToken (( char * ) aString.GetBuffer());
}
@@ -632,8 +634,9 @@ void Star::Read( SolarFileList *pSolarFiles )
aMutex.acquire();
aLoadedFilesList.Insert( pFile, LIST_APPEND );
aMutex.release();
- delete pSolarFiles->Remove(( ULONG ) 0 );
+ delete (*pSolarFiles)[ i ]; // TODO: isn't this deleting the object inserted into aLoadedFilesList?
}
+ pSolarFiles->clear();
delete pSolarFiles;
Expand_Impl();
@@ -665,8 +668,8 @@ void Star::InsertSolarList( String sProject )
// inserts a new solarlist part of another project
String sFileName( CreateFileName( sProject ));
- for ( ULONG i = 0; i < aFileList.Count(); i++ ) {
- if (( *aFileList.GetObject( i )) == sFileName )
+ for ( size_t i = 0; i < aFileList.size(); i++ ) {
+ if ( (*aFileList[ i ]) == sFileName )
return;
}
@@ -674,7 +677,7 @@ void Star::InsertSolarList( String sProject )
if ( HasProject( ssProject ))
return;
- aFileList.Insert( new String( sFileName ), LIST_APPEND );
+ aFileList.push_back( new String( sFileName ) );
}
/*****************************************************************************/
@@ -1082,7 +1085,7 @@ StarWriter::StarWriter( GenericInformationList *pStandLst, ByteString &rVersion,
aPrjEntry += DirEntry( sPrjDir );
aPrjEntry += DirEntry( sSolarFile );
- pFileList->Insert( new String( aPrjEntry.GetFull()), LIST_APPEND );
+ pFileList->push_back( new String( aPrjEntry.GetFull()) );
ByteString sFile( aPrjEntry.GetFull(), RTL_TEXTENCODING_ASCII_US );
fprintf( stdout, "%s\n", sFile.GetBuffer());
@@ -1111,18 +1114,18 @@ USHORT StarWriter::Read( String aFileName, BOOL bReadComments, USHORT nMode )
nStarMode = nMode;
ByteString aString;
- aFileList.Insert( new String( aFileName ));
+ aFileList.push_back( new String( aFileName ) );
DirEntry aEntry( aFileName );
aEntry.ToAbs();
aEntry = aEntry.GetPath().GetPath().GetPath();
sSourceRoot = aEntry.GetFull();
- while( aFileList.Count()) {
-
- StarFile *pFile = new StarFile( *aFileList.GetObject(( ULONG ) 0 ));
+ for ( size_t i = 0, n = aFileList.size(); i < n; ++i )
+ {
+ StarFile *pFile = new StarFile( *aFileList[ i ] );
if ( pFile->Exists()) {
- SimpleConfig aSolarConfig( *aFileList.GetObject(( ULONG ) 0 ));
+ SimpleConfig aSolarConfig( *aFileList[ i ] );
while (( aString = aSolarConfig.GetCleanedNextLine( bReadComments )) != "" )
InsertTokenLine ( aString );
}
@@ -1130,8 +1133,9 @@ USHORT StarWriter::Read( String aFileName, BOOL bReadComments, USHORT nMode )
aMutex.acquire();
aLoadedFilesList.Insert( pFile, LIST_APPEND );
aMutex.release();
- delete aFileList.Remove(( ULONG ) 0 );
+ delete aFileList[ i ]; // TODO: isn't this deleting the object inserted into aLoadedFilesList?
}
+ aFileList.clear();
// resolve all dependencies recursive
Expand_Impl();
@@ -1147,12 +1151,12 @@ USHORT StarWriter::Read( SolarFileList *pSolarFiles, BOOL bReadComments )
nStarMode = STAR_MODE_MULTIPLE_PARSE;
// this ctor is used by StarBuilder to get the information for the whole workspace
- while( pSolarFiles->Count()) {
+ for ( size_t i = 0, n = pSolarFiles->size(); i < n; ++i )
+ {
ByteString aString;
-
- StarFile *pFile = new StarFile( *pSolarFiles->GetObject(( ULONG ) 0 ));
+ StarFile *pFile = new StarFile( *(*pSolarFiles)[ i ] );
if ( pFile->Exists()) {
- SimpleConfig aSolarConfig( *pSolarFiles->GetObject(( ULONG ) 0 ));
+ SimpleConfig aSolarConfig( *(*pSolarFiles)[ i ] );
while (( aString = aSolarConfig.GetCleanedNextLine( bReadComments )) != "" )
InsertTokenLine ( aString );
}
@@ -1160,8 +1164,9 @@ USHORT StarWriter::Read( SolarFileList *pSolarFiles, BOOL bReadComments )
aMutex.acquire();
aLoadedFilesList.Insert( pFile, LIST_APPEND );
aMutex.release();
- delete pSolarFiles->Remove(( ULONG ) 0 );
+ delete (*pSolarFiles)[ i ]; // TODO: isn't this deleting the object inserted into aLoadedFilesList?
}
+ pSolarFiles->clear();
delete pSolarFiles;
Expand_Impl();
diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index 05fe155..ea1b3b5 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -51,11 +51,6 @@
class SByteStringList;
class GenericInformationList;
-/*
-// Pfade auf Konfigurationsdateien des Build-Servers
-
-#define REQUEST_DIR \\src\data4\source\b_server\server\newjob
-*/
/*********************************************************************
*
* Die Klasse CommandData haelte alle Informationen, die fuer die
@@ -279,8 +274,6 @@ public:
*
*********************************************************************/
-DECLARE_LIST ( SolarFileList, String* )
-
class StarFile
{
private:
@@ -307,6 +300,7 @@ DECLARE_LIST( StarFileList, StarFile * )
#define STAR_MODE_MULTIPLE_PARSE 0x0002
typedef ::std::vector< Prj* > StarList;
+typedef ::std::vector< String* > SolarFileList;
class Star
{
More information about the Libreoffice-commits
mailing list