Author: jkupec Date: Wed Mar 12 13:28:41 2008 New Revision: 9102 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9102&view=rev Log: - removed the old release(bool eject) methods Modified: trunk/libzypp/zypp/media/MediaAccess.cc trunk/libzypp/zypp/media/MediaAccess.h trunk/libzypp/zypp/media/MediaCD.cc trunk/libzypp/zypp/media/MediaCD.h trunk/libzypp/zypp/media/MediaCurl.cc trunk/libzypp/zypp/media/MediaCurl.h trunk/libzypp/zypp/media/MediaDIR.cc trunk/libzypp/zypp/media/MediaDIR.h trunk/libzypp/zypp/media/MediaDISK.cc trunk/libzypp/zypp/media/MediaDISK.h trunk/libzypp/zypp/media/MediaHandler.h trunk/libzypp/zypp/media/MediaISO.cc trunk/libzypp/zypp/media/MediaISO.h trunk/libzypp/zypp/media/MediaManager.cc trunk/libzypp/zypp/media/MediaManager.h Modified: trunk/libzypp/zypp/media/MediaAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaAccess.cc?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaAccess.cc (original) +++ trunk/libzypp/zypp/media/MediaAccess.cc Wed Mar 12 13:28:41 2008 @@ -266,12 +266,6 @@ _handler->disconnect(); } -// release attached media -void -MediaAccess::release( bool eject ) -{ - release(""); -} void MediaAccess::release( const std::string & ejectDev ) @@ -420,7 +414,7 @@ media.open( u ); media.attach(); media._handler->provideFileCopy( base, to ); - media.release(""); + media.release(); } catch (const MediaException & excpt_r) { Modified: trunk/libzypp/zypp/media/MediaAccess.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaAccess.h?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaAccess.h (original) +++ trunk/libzypp/zypp/media/MediaAccess.h Wed Mar 12 13:28:41 2008 @@ -204,15 +204,6 @@ */ void disconnect(); - /** - * Use concrete handler to release the media. - * @param eject if true, physically eject the media * (i.e. CD-ROM) - * - * \throws MediaException - * - **/ - void release( bool eject = false ) ZYPP_DEPRECATED; - /** * Use concrete handler to release the media. * @param ejectDev Device to eject. None if empty. Modified: trunk/libzypp/zypp/media/MediaCD.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCD.cc?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaCD.cc (original) +++ trunk/libzypp/zypp/media/MediaCD.cc Wed Mar 12 13:28:41 2008 @@ -544,10 +544,6 @@ DBG << _lastdev << " " << count << endl; } - void MediaCD::releaseFrom( bool eject ) - { - releaseFrom(""); - } /////////////////////////////////////////////////////////////////// // Modified: trunk/libzypp/zypp/media/MediaCD.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCD.h?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaCD.h (original) +++ trunk/libzypp/zypp/media/MediaCD.h Wed Mar 12 13:28:41 2008 @@ -45,8 +45,6 @@ protected: virtual void attachTo (bool next = false); - /** \deprecated in favor of releaseFrom(string&) */ - virtual void releaseFrom( bool eject ) ZYPP_DEPRECATED; virtual void releaseFrom( const std::string & ejectDev ); virtual void getFile( const Pathname & filename ) const; virtual void getDir( const Pathname & dirname, bool recurse_r ) const; Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Wed Mar 12 13:28:41 2008 @@ -660,11 +660,6 @@ } } -// deprecated -void MediaCurl::releaseFrom( bool eject ) -{ - releaseFrom(""); -} /////////////////////////////////////////////////////////////////// // Modified: trunk/libzypp/zypp/media/MediaCurl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.h?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.h (original) +++ trunk/libzypp/zypp/media/MediaCurl.h Wed Mar 12 13:28:41 2008 @@ -32,8 +32,6 @@ protected: virtual void attachTo (bool next = false); - /** \deprecated in favor of releaseFrom(string&) */ - virtual void releaseFrom( bool eject ) ZYPP_DEPRECATED; virtual void releaseFrom( const std::string & ejectDev ); virtual void getFile( const Pathname & filename ) const; virtual void getDir( const Pathname & dirname, bool recurse_r ) const; Modified: trunk/libzypp/zypp/media/MediaDIR.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaDIR.cc?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaDIR.cc (original) +++ trunk/libzypp/zypp/media/MediaDIR.cc Wed Mar 12 13:28:41 2008 @@ -122,12 +122,6 @@ return; } - // deprecated - void MediaDIR::releaseFrom( bool eject ) - { - return; - } - /////////////////////////////////////////////////////////////////// // // Modified: trunk/libzypp/zypp/media/MediaDIR.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaDIR.h?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaDIR.h (original) +++ trunk/libzypp/zypp/media/MediaDIR.h Wed Mar 12 13:28:41 2008 @@ -30,8 +30,6 @@ protected: virtual void attachTo (bool next = false); - /** \deprecated in favor of releaseFrom(string&) */ - virtual void releaseFrom( bool eject ) ZYPP_DEPRECATED; virtual void releaseFrom( const std::string & ejectDev ); virtual void getFile( const Pathname & filename ) const; virtual void getDir( const Pathname & dirname, bool recurse_r ) const; Modified: trunk/libzypp/zypp/media/MediaDISK.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaDISK.cc?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaDISK.cc (original) +++ trunk/libzypp/zypp/media/MediaDISK.cc Wed Mar 12 13:28:41 2008 @@ -389,11 +389,6 @@ mount.umount(attachPoint().asString()); } - void MediaDISK::releaseFrom( bool eject ) - { - releaseFrom(""); - } - /////////////////////////////////////////////////////////////////// // // METHOD NAME : MediaDISK::getFile Modified: trunk/libzypp/zypp/media/MediaDISK.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaDISK.h?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaDISK.h (original) +++ trunk/libzypp/zypp/media/MediaDISK.h Wed Mar 12 13:28:41 2008 @@ -36,8 +36,6 @@ protected: virtual void attachTo (bool next = false); - /** \deprecated in favor of releaseFrom(string&) */ - virtual void releaseFrom( bool eject ) ZYPP_DEPRECATED; virtual void releaseFrom( const std::string & ejectDev ); virtual void getFile( const Pathname & filename ) const; virtual void getDir( const Pathname & dirname, bool recurse_r ) const; Modified: trunk/libzypp/zypp/media/MediaHandler.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaHandler.h?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaHandler.h (original) +++ trunk/libzypp/zypp/media/MediaHandler.h Wed Mar 12 13:28:41 2008 @@ -323,8 +323,6 @@ **/ virtual void disconnectFrom() { return; } - ZYPP_DEPRECATED virtual void releaseFrom( bool eject = false ) = 0; - /** * Call concrete handler to release the media. * @@ -561,7 +559,7 @@ * * \throws MediaException **/ - void release( const std::string & ejectDev = ""); + void release( const std::string & ejectDev = "" ); /** * Use concrete handler to provide file denoted by path below Modified: trunk/libzypp/zypp/media/MediaISO.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaISO.cc?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaISO.cc (original) +++ trunk/libzypp/zypp/media/MediaISO.cc Wed Mar 12 13:28:41 2008 @@ -158,7 +158,7 @@ ZYPP_CAUGHT(e1); try { - manager.release(_parentId, false); + manager.release(_parentId); } catch(const MediaException &e2) { @@ -233,7 +233,7 @@ try { mount.umount(attachPoint().asString()); - manager.release(_parentId, ""); + manager.release(_parentId); } catch (const MediaException & excpt_r) { @@ -256,19 +256,13 @@ if( _parentId) { MediaManager manager; - manager.release(_parentId, ""); + manager.release(_parentId); } // else: // the media manager has reset the _parentId // and will destroy the parent handler itself. } - // deprecated - void MediaISO::releaseFrom(bool eject) - { - releaseFrom(); - } - // --------------------------------------------------------------- void MediaISO::getFile(const Pathname &filename) const { Modified: trunk/libzypp/zypp/media/MediaISO.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaISO.h?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaISO.h (original) +++ trunk/libzypp/zypp/media/MediaISO.h Wed Mar 12 13:28:41 2008 @@ -42,8 +42,6 @@ protected: virtual void attachTo (bool next = false); - /** \deprecated in favor of releaseFrom(string&) */ - virtual void releaseFrom( bool eject ) ZYPP_DEPRECATED; virtual void releaseFrom( const std::string & ejectDev = "" ); virtual void getFile( const Pathname & filename ) const; virtual void getDir( const Pathname & dirname, bool recurse_r ) const; Modified: trunk/libzypp/zypp/media/MediaManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaManager.cc?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaManager.cc (original) +++ trunk/libzypp/zypp/media/MediaManager.cc Wed Mar 12 13:28:41 2008 @@ -597,7 +597,7 @@ ZYPP_RETHROW(ex); if (ref.handler->isAttached()) - ref.handler->release(""); + ref.handler->release(); } MIL << "checkDesired(" << accessId << ") of first device failed," @@ -625,7 +625,7 @@ AttachedMedia media(ref.handler->attachedMedia()); DBG << "Skipping " << media.mediaSource->asString() << ": not desired media." << std::endl; - ref.handler->release(""); + ref.handler->release(); } catch (const MediaException & ex) { @@ -637,7 +637,7 @@ AttachedMedia media(ref.handler->attachedMedia()); DBG << "Skipping " << media.mediaSource->asString() << " because of exception thrown by attach(true)" << std::endl; - if (ref.handler->isAttached()) ref.handler->release(""); + if (ref.handler->isAttached()) ref.handler->release(); } } } @@ -673,7 +673,7 @@ DBG << "Forcing release of handler depending on access id " << accessId << std::endl; m->second.desired = false; - m->second.handler->release(""); + m->second.handler->release(); } catch(const MediaException &e) { Modified: trunk/libzypp/zypp/media/MediaManager.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaManager.h?rev=9102&r1=9101&r2=9102&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaManager.h (original) +++ trunk/libzypp/zypp/media/MediaManager.h Wed Mar 12 13:28:41 2008 @@ -587,14 +587,10 @@ /** * Release the attached media and optionally eject. * - * If the \p eject parameter is set to true and there - * is currently an attached drive, all other access - * id's are released and the drive (CD/DVD drive) is + * If the \p ejectDev parameter is not empty all other access + * id's are released and the specified drive (CD/DVD drive) is * ejected. - * In case that there is currently no attached drive, - * a \p eject set to true causes to eject all drives - * that are _not_ used by another access id's. - * + * * \param accessId A media access id. * \param ejectDev Device to eject. None if empty. * \throws MediaNotOpenException for invalid access id. @@ -602,9 +598,6 @@ void release(MediaAccessId accessId, const std::string & ejectDev = ""); - void - release(MediaAccessId accessId, bool eject = false) ZYPP_DEPRECATED; - /** * Release all attached media. */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org