Author: jkupec Date: Mon Apr 14 13:11:58 2008 New Revision: 9606 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9606&view=rev Log: - remove the overkill zypp::locks namespace Modified: trunk/libzypp/tests/zypp/Locks_test.cc trunk/libzypp/zypp/Locks.cc trunk/libzypp/zypp/Locks.h trunk/libzypp/zypp/ZYppCallbacks.h trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc Modified: trunk/libzypp/tests/zypp/Locks_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/Locks_test.cc?rev=9606&r1=9605&r2=9606&view=diff ============================================================================== --- trunk/libzypp/tests/zypp/Locks_test.cc (original) +++ trunk/libzypp/tests/zypp/Locks_test.cc Mon Apr 14 13:11:58 2008 @@ -16,7 +16,6 @@ using std::endl; using std::string; using namespace zypp; -using namespace zypp::locks; using namespace boost::unit_test; bool isLocked( const sat::Solvable & solvable ) Modified: trunk/libzypp/zypp/Locks.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Locks.cc?rev=9606&r1=9605&r2=9606&view=diff ============================================================================== --- trunk/libzypp/zypp/Locks.cc (original) +++ trunk/libzypp/zypp/Locks.cc Mon Apr 14 13:11:58 2008 @@ -33,8 +33,6 @@ namespace zypp { -namespace locks -{ Locks& Locks::instance() { @@ -79,7 +77,7 @@ private: OutputIterator& out; - }; +}; void Locks::loadLocks( const Pathname& file ) { @@ -117,7 +115,6 @@ q.addKind( selectable.kind() ); q.setMatchExact(); q.setCaseSensitive(true); - q.requireAll(); addLock( q ); } @@ -337,5 +334,4 @@ report->finish(SavingLocksReport::NO_ERROR); } -} // ns locks } // ns zypp Modified: trunk/libzypp/zypp/Locks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Locks.h?rev=9606&r1=9605&r2=9606&view=diff ============================================================================== --- trunk/libzypp/zypp/Locks.h (original) +++ trunk/libzypp/zypp/Locks.h Mon Apr 14 13:11:58 2008 @@ -1,4 +1,3 @@ - #ifndef ZYPP_LOCKS_H #define ZYPP_LOCKS_H @@ -7,52 +6,48 @@ #include "zypp/PoolQuery.h" #include "zypp/ZConfig.h" #include "zypp/ui/Selectable.h" - + namespace zypp { - namespace locks + class Locks { - class Locks - { - public: - class Impl; + public: + class Impl; - static Locks& instance(); + static Locks& instance(); - /** - * locks all solvables which is result of query - */ - void addLock( const PoolQuery& query ); + /** + * locks all solvables which is result of query + */ + void addLock( const PoolQuery& query ); - /** - * locks selectable - */ - void addLock( const ui::Selectable& selectable ); + /** + * locks selectable + */ + void addLock( const ui::Selectable& selectable ); - /** - * unlocks all solvables which is result of query. - * Can call callback - */ - void unlock( const PoolQuery& query ); + /** + * unlocks all solvables which is result of query. + * Can call callback + */ + void unlock( const PoolQuery& query ); - void unlock( const ui::Selectable& selectable ); + void unlock( const ui::Selectable& selectable ); - void loadLocks( const Pathname& file = ZConfig::instance().locksFile() ); + void loadLocks( const Pathname& file = ZConfig::instance().locksFile() ); - void saveLocks( const Pathname& file = ZConfig::instance().locksFile() ); + void saveLocks( const Pathname& file = ZConfig::instance().locksFile() ); - bool existEmptyLocks(); + bool existEmptyLocks(); - void removeEmptyLocks(); + void removeEmptyLocks(); - private: - Locks(); - - RW_pointer _pimpl; + private: + Locks(); + + RW_pointer _pimpl; - }; - } + }; } #endif - Modified: trunk/libzypp/zypp/ZYppCallbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZYppCallbacks.h?rev=9606&r1=9605&r2=9606&view=diff ============================================================================== --- trunk/libzypp/zypp/ZYppCallbacks.h (original) +++ trunk/libzypp/zypp/ZYppCallbacks.h Mon Apr 14 13:11:58 2008 @@ -622,81 +622,75 @@ } // namespace target /////////////////////////////////////////////////////////////////// -class PoolQuery; - /////////////////////////////////////////////////////////////////// - namespace locks + class PoolQuery; + + struct CleanEmptyLocksReport : public callback::ReportBase { - struct CleanEmptyLocksReport : public callback::ReportBase - { - enum Action { - ABORT, // abort and return error - DELETE, // delete empty lock - IGNORE // skip empty lock - }; - - enum Error { - NO_ERROR, - ABORTED // cleaning aborted - }; + enum Action { + ABORT, // abort and return error + DELETE, // delete empty lock + IGNORE // skip empty lock + }; - virtual void start( - ) {} + enum Error { + NO_ERROR, + ABORTED // cleaning aborted + }; - virtual bool progress(int /*value*/) - { return true; } + virtual void start( + ) {} + + virtual bool progress(int /*value*/) + { return true; } + + /** + * When find empty lock ask what to do with it + */ + virtual Action execute( + const PoolQuery& /*error*/ + ) { return DELETE; } + + virtual void finish( + Error /*error*/ + ) {} - /** - * When find empty lock ask what to do with it - */ - virtual Action execute( - const PoolQuery& /*error*/ - ) { return DELETE; } - - virtual void finish( - Error /*error*/ - ) {} + }; + struct SavingLocksReport : public callback::ReportBase + { + enum Action { + ABORT, // abort and return error + DELETE, // delete conflicted lock + IGNORE // skip conflict lock }; - struct SavingLocksReport : public callback::ReportBase - { - enum Action { - ABORT, // abort and return error - DELETE, // delete conflicted lock - IGNORE // skip conflict lock - }; - - enum Error { - NO_ERROR, - ABORTED // cleaning aborted - }; - - enum ConflictState{ - SAME_RESULTS, - INTERSECT - }; - - virtual void start() {} - - virtual bool progress() /*still alive*/ - { return true; } - - /** - * When user unlock something which is locked by non-identical query - */ - virtual Action conflict( - const PoolQuery&, /*problematic query*/ - ConflictState - ) { return DELETE; } - - virtual void finish( - Error /*error*/ - ) {} + enum Error { + NO_ERROR, + ABORTED // cleaning aborted + }; + enum ConflictState{ + SAME_RESULTS, + INTERSECT }; - ///////////////////////////////////////////////////////////////// - } // namespace locks - /////////////////////////////////////////////////////////////////// + + virtual void start() {} + + virtual bool progress() /*still alive*/ + { return true; } + + /** + * When user unlock something which is locked by non-identical query + */ + virtual Action conflict( + const PoolQuery&, /*problematic query*/ + ConflictState + ) { return DELETE; } + + virtual void finish( + Error /*error*/ + ) {} + }; ///////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc?rev=9606&r1=9605&r2=9606&view=diff ============================================================================== --- trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc (original) +++ trunk/libzypp/zypp/zypp_detail/ZYppImpl.cc Mon Apr 14 13:11:58 2008 @@ -183,7 +183,7 @@ return 0; //TODO catch posibble exceptions - locks::Locks::instance().loadLocks(); + Locks::instance().loadLocks(); //current locks api doesn't support counting lock //so count it after -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org