Author: aschnell
Date: Thu Oct 30 17:42:33 2008
New Revision: 52768
URL: http://svn.opensuse.org/viewcvs/yast?rev=52768&view=rev
Log:
- make getCommitActions const
Modified:
trunk/storage/libstorage/src/Storage.cc
trunk/storage/libstorage/src/Storage.h
trunk/storage/libstorage/src/StorageInterface.h
Modified: trunk/storage/libstorage/src/Storage.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=52768&r1=52767&r2=52768&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Storage.cc (original)
+++ trunk/storage/libstorage/src/Storage.cc Thu Oct 30 17:42:33 2008
@@ -3482,15 +3482,16 @@
return(ret);
}
-deque<string> Storage::getCommitActions( bool mark_destructive )
+
+deque<string> Storage::getCommitActions( bool mark_destructive ) const
{
deque<string> ret;
- CPair p = cPair();
+ ConstContPair p = contPair();
y2milestone( "empty:%d", p.empty() );
if( !p.empty() )
{
list ac;
- for( ContIterator i = p.begin(); i != p.end(); ++i )
+ for( ConstContIterator i = p.begin(); i != p.end(); ++i )
{
list l;
i->getCommitActions( l );
@@ -3516,10 +3517,11 @@
delete *i;
}
}
- y2milestone( "ret.size():%zd", ret.size() );
- return( ret );
+ y2mil("ret.size():" << ret.size());
+ return ret;
}
+
static bool sort_cont_up( const Container* rhs, const Container* lhs )
{
return( *rhs > *lhs );
Modified: trunk/storage/libstorage/src/Storage.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h?rev=52768&r1=52767&r2=52768&view=diff
==============================================================================
--- trunk/storage/libstorage/src/Storage.h (original)
+++ trunk/storage/libstorage/src/Storage.h Thu Oct 30 17:42:33 2008
@@ -444,7 +444,7 @@
int removeDmraid( const string& name );
- deque<string> getCommitActions( bool mark_destructive );
+ deque<string> getCommitActions( bool mark_destructive ) const;
const string& getLastAction() const { return lastAction; }
const string& getExtendedErrorMessage() const { return extendedError; }
void eraseFreeInfo( const string& device );
Modified: trunk/storage/libstorage/src/StorageInterface.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/StorageInterface.h?rev=52768&r1=52767&r2=52768&view=diff
==============================================================================
--- trunk/storage/libstorage/src/StorageInterface.h (original)
+++ trunk/storage/libstorage/src/StorageInterface.h Thu Oct 30 17:42:33 2008
@@ -1820,7 +1820,7 @@
* destructive actions (like e.g. deletion, formatting, ...)
* @return list of strings presentable to the user
*/
- virtual deque<string> getCommitActions( bool mark_destructive ) = 0;
+ virtual deque<string> getCommitActions( bool mark_destructive ) const = 0;
/**
* Gets action performed last during previous call to commit()
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org