Author: aschnell Date: Sun Apr 5 12:08:57 2009 New Revision: 56638 URL: http://svn.opensuse.org/viewcvs/yast?rev=56638&view=rev Log: - added some const Modified: trunk/storage/libstorage/src/Volume.cc trunk/storage/libstorage/src/Volume.h Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc?rev=56638&r1=56637&r2=56638&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Sun Apr 5 12:08:57 2009 @@ -114,7 +114,7 @@ storage::MountByType -Volume::defaultMountBy(const string& mp) +Volume::defaultMountBy(const string& mp) const { MountByType mb = cont->getStorage()->getDefaultMountBy(); y2mil( "mby:" << mb_names[mb] << " type:" << cType() ); @@ -138,7 +138,7 @@ // TODO: allowedMountBy is never used bool -Volume::allowedMountBy(storage::MountByType mby, const string& mp) +Volume::allowedMountBy(storage::MountByType mby, const string& mp) const { bool ret = true; if ((cType() != DISK && cType() != DMRAID && cType() != DMMULTIPATH) && (mby == MOUNTBY_ID || mby == MOUNTBY_PATH)) @@ -2272,7 +2272,7 @@ return( txt ); } -string Volume::getFstabDevice() +string Volume::getFstabDevice() const { string ret = dev; const Loop* l = NULL; @@ -2284,7 +2284,7 @@ return( ret ); } -string Volume::getFstabDentry() +string Volume::getFstabDentry() const { string ret; const Loop* l = NULL; @@ -2307,7 +2307,7 @@ return( ret ); } -void Volume::getFstabOpts( list<string>& l ) +void Volume::getFstabOpts(list<string>& l) const { if( fstab_opt.empty() ) { Modified: trunk/storage/libstorage/src/Volume.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.h?rev=56638&r1=56637&r2=56638&view=diff ============================================================================== --- trunk/storage/libstorage/src/Volume.h (original) +++ trunk/storage/libstorage/src/Volume.h Sun Apr 5 12:08:57 2009 @@ -7,6 +7,8 @@ namespace storage { + using std::list; + class SystemCmd; class ProcMounts; @@ -199,8 +201,8 @@ void setNameDev(); int checkDevice() const; int checkDevice(const string& device) const; - storage::MountByType defaultMountBy( const string& mp="" ); - bool allowedMountBy( storage::MountByType mby, const string& mp="" ); + storage::MountByType defaultMountBy(const string& mp = "") const; + bool allowedMountBy(storage::MountByType mby, const string& mp = "") const; void getFsData( SystemCmd& blkidData ); void getLoopData( SystemCmd& loopData ); void getMountData( const ProcMounts& mountData, bool swap_only=false ); @@ -211,9 +213,9 @@ string getMountByString( storage::MountByType mby, const string& dev, const string& uuid, const string& label ) const; - string getFstabDevice(); - string getFstabDentry(); - void getFstabOpts( std::list<string>& ol ); + string getFstabDevice() const; + string getFstabDentry() const; + void getFstabOpts(list<string>& ol) const; bool getLoopFile( string& fname ) const; void setExtError( const SystemCmd& cmd, bool serr=true ); string getDmcryptName() const; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org