[zypp-commit] r8941 - in /trunk/zypper/src: zypper.cc zypper.h

Author: jkupec Date: Wed Feb 27 20:09:11 2008 New Revision: 8941 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8941&view=rev Log: - use scoped pointer for Zypper - cleanup Modified: trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8941&r1=8940&r2=8941&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Wed Feb 27 20:09:11 2008 @@ -47,14 +47,12 @@ using namespace std; using namespace zypp; -//using namespace zypp::detail; using namespace boost; ZYpp::Ptr God = NULL; RuntimeData gData; parsed_opts copts; // command options -IMPL_PTR_TYPE(Zypper); Zypper::Zypper() : _argc(0), _argv(NULL), _out_ptr(NULL), @@ -74,12 +72,12 @@ } -Zypper_Ptr Zypper::instance() +Zypper::Ptr & Zypper::instance() { - static Zypper_Ptr _instance; + static Zypper::Ptr _instance; if (!_instance) - _instance = new Zypper(); + _instance.reset(new Zypper()); else XXX << "Got an existing instance." << endl; Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=8941&r1=8940&r2=8941&view=diff ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Wed Feb 27 20:09:11 2008 @@ -5,7 +5,6 @@ #include <vector> #include "zypp/base/Exception.h" -#include "zypp/base/ReferenceCounted.h" #include "zypp/base/NonCopyable.h" #include "zypp/base/PtrTypes.h" @@ -74,13 +73,12 @@ bool license_auto_agree; }; - -DEFINE_PTR_TYPE(Zypper); - -class Zypper : public zypp::base::ReferenceCounted, private zypp::base::NonCopyable +class Zypper : private zypp::base::NonCopyable { public: - static Zypper_Ptr instance(); + typedef zypp::RW_pointer Ptr; + + static Ptr & instance(); int main(int argc, char ** argv); @@ -99,10 +97,11 @@ int argc() { return _running_shell ? _sh_argc : _argc; } char ** argv() { return _running_shell ? _sh_argv : _argv; } - + +public: + ~Zypper(); private: Zypper(); - ~Zypper(); void processGlobalOptions(); void processCommandOptions(); @@ -159,7 +158,6 @@ }; extern RuntimeData gData; -extern std::ostream no_stream; class ExitRequestException : public zypp::Exception { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org