Author: aschnell
Date: Tue Mar 3 15:02:33 2009
New Revision: 55889
URL: http://svn.opensuse.org/viewcvs/yast?rev=55889&view=rev
Log:
- more cleanup
Modified:
trunk/storage/libstorage/src/AsciiFile.cc
trunk/storage/libstorage/src/AsciiFile.h
Modified: trunk/storage/libstorage/src/AsciiFile.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile.cc?rev=55889&r1=55888&r2=55889&view=diff
==============================================================================
--- trunk/storage/libstorage/src/AsciiFile.cc (original)
+++ trunk/storage/libstorage/src/AsciiFile.cc Tue Mar 3 15:02:33 2009
@@ -54,10 +54,6 @@
return Ret_bi;
}
-const string& AsciiFile::fileName() const
- {
- return Name_C;
- }
bool AsciiFile::appendFile( const string& Name_Cv )
{
@@ -230,9 +226,9 @@
Lines_C.push_back( Line_Ci );
}
-void AsciiFile::append( const list<string>& lines )
+void AsciiFile::append( const vector<string>& lines )
{
- for( list<string>::const_iterator i=lines.begin(); i!=lines.end(); ++i )
+ for( vector<string>::const_iterator i=lines.begin(); i!=lines.end(); ++i )
append( *i );
}
@@ -244,10 +240,10 @@
}
void AsciiFile::replace( unsigned int Start_iv, unsigned int Cnt_iv,
- const list<string>& lines )
+ const vector<string>& lines )
{
remove( Start_iv, Cnt_iv );
- for( list<string>::const_reverse_iterator i=lines.rbegin(); i!=lines.rend();
+ for( vector<string>::const_reverse_iterator i=lines.rbegin(); i!=lines.rend();
++i )
insert( Start_iv, *i );
}
@@ -369,31 +365,6 @@
return Ret_ii;
}
-unsigned AsciiFile::numLines() const
- {
- return Lines_C.size();
- }
-
-unsigned AsciiFile::differentLine( const AsciiFile& File_Cv ) const
- {
- int Ret_ii = -1;
- unsigned Cnt_ii = min( numLines(), File_Cv.numLines() );
- unsigned I_ii = 0;
- while( I_iiCnt_ii || File_Cv.numLines()>Cnt_ii )
- {
- Ret_ii = Cnt_ii;
- }
- return Ret_ii;
- }
-
void AsciiFile::removeLastIf (string& Text_Cr, char Char_cv) const
{
Modified: trunk/storage/libstorage/src/AsciiFile.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AsciiFile.h?rev=55889&r1=55888&r2=55889&view=diff
==============================================================================
--- trunk/storage/libstorage/src/AsciiFile.h (original)
+++ trunk/storage/libstorage/src/AsciiFile.h Tue Mar 3 15:02:33 2009
@@ -1,64 +1,74 @@
#ifndef ASCII_FILE_H
#define ASCII_FILE_H
+
+#include <string>
#include <vector>
-#include <list>
namespace storage
{
using std::string;
using std::vector;
-
-class Regex;
+
+ class Regex;
-class AsciiFile
+ class AsciiFile
{
public:
- AsciiFile( bool CreateBackup_bv=false,
+
+ AsciiFile( bool CreateBackup_bv=false,
const char* BackupExt_Cv=".orig" );
- AsciiFile( const string& Name_Cv, bool CreateBackup_bv=false,
+ AsciiFile( const char* Name_Cv, bool CreateBackup_bv=false,
const char* BackupExt_Cv=".orig" );
- AsciiFile( const char* Name_Cv, bool CreateBackup_bv=false,
+ AsciiFile( const string& Name_Cv, bool CreateBackup_bv=false,
const char* BackupExt_Cv=".orig" );
~AsciiFile();
+
bool insertFile( AsciiFile& File_Cv, unsigned int BeforeLine_iv=0 );
bool appendFile( AsciiFile& File_Cv );
bool insertFile( const string& Name_Cv, unsigned int BeforeLine_iv=0 );
bool appendFile( const string& Name_Cv );
+
+ string fileName() const { return Name_C; }
bool loadFile( const string& Name_Cv );
bool updateFile();
bool saveToFile( const string& Name_Cv );
+
void append( const string& Line_Cv );
- void append( const std::list<string>& Lines_Cv );
+ void append( const vector<string>& Lines_Cv );
void insert( unsigned int Before_iv, const string& Line_Cv );
void remove( unsigned int Start_iv, unsigned int Cnt_iv );
void replace( unsigned int Start_iv, unsigned int Cnt_iv,
const string& Line_Cv );
void replace( unsigned int Start_iv, unsigned int Cnt_iv,
- const std::list<string>& Line_Cv );
+ const vector<string>& Line_Cv );
+
const string& operator []( unsigned int Index_iv ) const;
string& operator []( unsigned int Index_iv );
+
int find( unsigned int Start_iv, const string& Pat_Cv ) const;
int find( unsigned int Start_iv, Regex& Pat_Cv ) const;
- unsigned numLines() const;
- const string& fileName() const;
- unsigned differentLine( const AsciiFile& File_Cv ) const;
+
+ unsigned numLines() const { return Lines_C.size(); }
+
bool removeIfEmpty() const;
const vector<string>& lines() const { return Lines_C; }
protected:
- bool appendFile( const string& Name_Cv, std::vector<string>& Lines_Cr ) const;
- bool appendFile( AsciiFile& File_Cv, std::vector<string>& Lines_Cr ) const;
+
+ bool appendFile( const string& Name_Cv, vector<string>& Lines_Cr ) const;
+ bool appendFile( AsciiFile& File_Cv, vector<string>& Lines_Cr ) const;
void removeLastIf(string& Text_Cr, char Char_cv) const;
bool BackupCreated_b;
string BackupExtension_C;
- std::vector<string> Lines_C;
+ vector<string> Lines_C;
string Name_C;
+
};
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org