Author: aschnell Date: Wed Mar 25 16:23:28 2009 New Revision: 56392 URL: http://svn.opensuse.org/viewcvs/yast?rev=56392&view=rev Log: - getToCommit can be const - some cleanup Modified: trunk/storage/libstorage/src/Container.cc trunk/storage/libstorage/src/Container.h trunk/storage/libstorage/src/Dasd.cc trunk/storage/libstorage/src/Dasd.h trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/Disk.h trunk/storage/libstorage/src/DmPart.h trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/DmPartCo.h trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/LvmVg.h trunk/storage/libstorage/src/Partition.h trunk/storage/libstorage/src/Volume.h Modified: trunk/storage/libstorage/src/Container.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.cc?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/Container.cc (original) +++ trunk/storage/libstorage/src/Container.cc Wed Mar 25 16:23:28 2009 @@ -58,7 +58,7 @@ void -Container::getToCommit(CommitStage stage, list& col, list& vol) +Container::getToCommit(CommitStage stage, list& col, list& vol) const { unsigned long oco = col.size(); unsigned long ovo = vol.size(); @@ -66,8 +66,8 @@ { case DECREASE: { - VolPair p = volPair( stageDecrease ); - for( VolIterator i=p.begin(); i!=p.end(); ++i ) + ConstVolPair p = volPair( stageDecrease ); + for( ConstVolIterator i=p.begin(); i!=p.end(); ++i ) vol.push_back( &(*i) ); if( deleted() ) col.push_back( this ); @@ -75,8 +75,8 @@ break; case INCREASE: { - VolPair p = volPair( stageCreate ); - for( VolIterator i=p.begin(); i!=p.end(); ++i ) + ConstVolPair p = volPair( stageCreate ); + for( ConstVolIterator i=p.begin(); i!=p.end(); ++i ) vol.push_back( &(*i) ); if( created() ) col.push_back( this ); @@ -84,15 +84,15 @@ break; case FORMAT: { - VolPair p = volPair( stageFormat ); - for( VolIterator i=p.begin(); i!=p.end(); ++i ) + ConstVolPair p = volPair( stageFormat ); + for( ConstVolIterator i=p.begin(); i!=p.end(); ++i ) vol.push_back( &(*i) ); } break; case MOUNT: { - VolPair p = volPair( stageMount ); - for( VolIterator i=p.begin(); i!=p.end(); ++i ) + ConstVolPair p = volPair( stageMount ); + for( ConstVolIterator i=p.begin(); i!=p.end(); ++i ) vol.push_back( &(*i) ); } break; Modified: trunk/storage/libstorage/src/Container.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Container.h?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/Container.h (original) +++ trunk/storage/libstorage/src/Container.h Wed Mar 25 16:23:28 2009 @@ -50,9 +50,9 @@ virtual string getDiffString( const Container& c ) const; virtual void logDifference( const Container& c ) const; - virtual void getCommitActions( std::liststorage::commitAction*& l ) const; + virtual void getCommitActions(liststorage::commitAction*& l) const; virtual void getToCommit(storage::CommitStage stage, list& col, - list& vol); + list& vol) const; virtual int commitChanges( storage::CommitStage stage ); virtual int commitChanges( storage::CommitStage stage, Volume* vol ); Modified: trunk/storage/libstorage/src/Dasd.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.cc?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dasd.cc (original) +++ trunk/storage/libstorage/src/Dasd.cc Wed Mar 25 16:23:28 2009 @@ -482,13 +482,13 @@ void -Dasd::getToCommit(CommitStage stage, list& col, list& vol) +Dasd::getToCommit(CommitStage stage, list& col, list& vol) const { unsigned long oco = col.size(); unsigned long ovo = vol.size(); if( stage==DECREASE ) { - VolPair p = volPair( stageDecrease ); + ConstVolPair p = volPair( stageDecrease ); if( !p.empty() ) vol.push_back( &(*(p.begin())) ); if( deleted() || init_disk ) @@ -496,7 +496,7 @@ } else if( stage==INCREASE ) { - VolPair p = volPair( stageCreate ); + ConstVolPair p = volPair( stageCreate ); if( !p.empty() ) vol.push_back( &(*(p.begin())) ); } Modified: trunk/storage/libstorage/src/Dasd.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Dasd.h?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/Dasd.h (original) +++ trunk/storage/libstorage/src/Dasd.h Wed Mar 25 16:23:28 2009 @@ -29,9 +29,9 @@ string fdasdText() const; string dasdfmtText( bool doing ) const; static string dasdfmtTexts( bool single, const string& devs ); - void getCommitActions( std::liststorage::commitAction*& l ) const; + void getCommitActions(liststorage::commitAction*& l) const; void getToCommit(storage::CommitStage stage, list& col, - list& vol); + list& vol) const; int commitChanges( storage::CommitStage stage ); bool detectGeometry(); Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Wed Mar 25 16:23:28 2009 @@ -1756,15 +1756,15 @@ void -Disk::getToCommit(CommitStage stage, list& col, list& vol) +Disk::getToCommit(CommitStage stage, list& col, list& vol) const { unsigned long oco = col.size(); unsigned long ovo = vol.size(); Container::getToCommit( stage, col, vol ); if( stage==INCREASE ) { - PartPair p = partPair( Partition::toChangeId ); - for( PartIter i=p.begin(); i!=p.end(); ++i ) + ConstPartPair p = partPair( Partition::toChangeId ); + for( ConstPartIter i=p.begin(); i!=p.end(); ++i ) if( find( vol.begin(), vol.end(), &(*i) )==vol.end() ) vol.push_back( &(*i) ); } Modified: trunk/storage/libstorage/src/Disk.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.h?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/Disk.h (original) +++ trunk/storage/libstorage/src/Disk.h Wed Mar 25 16:23:28 2009 @@ -81,9 +81,9 @@ string& device) const; int destroyPartitionTable( const string& new_label ); unsigned availablePartNumber(storage::PartitionType type = storage::PRIMARY) const; - virtual void getCommitActions( std::liststorage::commitAction*& l ) const; + virtual void getCommitActions(liststorage::commitAction*& l) const; virtual void getToCommit(storage::CommitStage stage, list& col, - list& vol); + list& vol) const; virtual int commitChanges( storage::CommitStage stage ); int commitChanges( storage::CommitStage stage, Volume* vol ); int freeCylindersAfterPartition(const Partition* p, unsigned long& freeCyls) const; Modified: trunk/storage/libstorage/src/DmPart.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPart.h?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmPart.h (original) +++ trunk/storage/libstorage/src/DmPart.h Wed Mar 25 16:23:28 2009 @@ -30,7 +30,7 @@ void updateMinor(); void updateSize( ProcPart& pp ); void updateSize(); - void getCommitActions( std::liststorage::commitAction*& l ) const; + void getCommitActions(liststorage::commitAction*& l) const; void addUdevData(); virtual const std::list<string> udevId() const; virtual string setTypeText( bool doing=true ) const; Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.cc?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Wed Mar 25 16:23:28 2009 @@ -657,7 +657,7 @@ void -DmPartCo::getToCommit(CommitStage stage, list& col, list& vol) +DmPartCo::getToCommit(CommitStage stage, list& col, list& vol) const { y2mil("col:" << col.size() << " vol:" << vol.size()); getStorage()->logCo( this ); @@ -666,8 +666,8 @@ Container::getToCommit( stage, col, vol ); if( stage==INCREASE ) { - DmPartPair p = dmpartPair( toChangeId ); - for( DmPartIter i=p.begin(); i!=p.end(); ++i ) + ConstDmPartPair p = dmpartPair( toChangeId ); + for( ConstDmPartIter i=p.begin(); i!=p.end(); ++i ) if( find( vol.begin(), vol.end(), &(*i) )==vol.end() ) vol.push_back( &(*i) ); } Modified: trunk/storage/libstorage/src/DmPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.h?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.h (original) +++ trunk/storage/libstorage/src/DmPartCo.h Wed Mar 25 16:23:28 2009 @@ -75,9 +75,9 @@ { return disk->kbToCylinder( val ); } string getPartName( unsigned nr ) const; - virtual void getCommitActions( std::liststorage::commitAction*& l ) const; + virtual void getCommitActions(liststorage::commitAction*& l) const; virtual void getToCommit(storage::CommitStage stage, list& col, - list& vol); + list& vol) const; virtual int commitChanges( storage::CommitStage stage ); int commitChanges( storage::CommitStage stage, Volume* vol ); Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Wed Mar 25 16:23:28 2009 @@ -904,7 +904,7 @@ void -LvmVg::getToCommit(CommitStage stage, list& col, list& vol) +LvmVg::getToCommit(CommitStage stage, list& col, list& vol) const { unsigned long oco = col.size(); unsigned long ovo = vol.size(); Modified: trunk/storage/libstorage/src/LvmVg.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.h?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/LvmVg.h (original) +++ trunk/storage/libstorage/src/LvmVg.h Wed Mar 25 16:23:28 2009 @@ -45,10 +45,10 @@ int setPeSize( long long unsigned peSizeK ); void normalizeDmDevices(); - void getCommitActions( std::liststorage::commitAction*& l ) const; - int commitChanges( storage::CommitStage stage ); + void getCommitActions(liststorage::commitAction*& l) const; void getToCommit(storage::CommitStage stage, list& col, - list& vol); + list& vol) const; + int commitChanges( storage::CommitStage stage ); int resizeVolume( Volume* v, unsigned long long newSize ); int removeVolume( Volume* v ); void getInfo( storage::LvmVgInfo& info ) const; Modified: trunk/storage/libstorage/src/Partition.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Partition.h?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/Partition.h (original) +++ trunk/storage/libstorage/src/Partition.h Wed Mar 25 16:23:28 2009 @@ -53,7 +53,7 @@ string createText( bool doing=true ) const; string formatText(bool doing=true) const; string resizeText(bool doing=true) const; - void getCommitActions( std::liststorage::commitAction*& l ) const; + void getCommitActions(liststorage::commitAction*& l) const; string setTypeText( bool doing=true ) const; int setFormat( bool format=true, storage::FsType fs=storage::REISERFS ); int changeMount( const string& val ); Modified: trunk/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.h?rev=56392&r1=56391&r2=56392&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.h (original) +++ trunk/storage/libstorage/src/Volume.h Wed Mar 25 16:23:28 2009 @@ -153,7 +153,7 @@ virtual string createText(bool doing=true) const; virtual string resizeText(bool doing=true) const; virtual string formatText(bool doing=true) const; - virtual void getCommitActions( std::liststorage::commitAction*& l ) const; + virtual void getCommitActions(liststorage::commitAction*& l) const; string mountText( bool doing=true ) const; string labelText( bool doing=true ) const; string losetupText( bool doing=true ) const; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org