Author: jkupec Date: Sun Nov 4 11:58:03 2007 New Revision: 7740 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7740&view=rev Log: - code clean-up Modified: trunk/zypper/src/zypp-checkpatches.cc trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-sources.cc trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/src/zypp-checkpatches.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypp-checkpatches.cc?r... ============================================================================== --- trunk/zypper/src/zypp-checkpatches.cc (original) +++ trunk/zypper/src/zypp-checkpatches.cc Sun Nov 4 11:58:03 2007 @@ -20,7 +20,6 @@ #include <zypp/PathInfo.h> #include "checkpatches-keyring-callbacks.h" -//#include "zypper.h" #include "zypper-updates.h" #undef ZYPP_BASE_LOGGER_LOGGROUP Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=774... ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Sun Nov 4 11:58:03 2007 @@ -4,6 +4,8 @@ #include <boost/format.hpp> #include <boost/logic/tribool_io.hpp> +#include <zypp/ZYppFactory.h> + #include <zypp/Edition.h> #include <zypp/Patch.h> #include <zypp/Package.h> Modified: trunk/zypper/src/zypper-sources.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev=... ============================================================================== --- trunk/zypper/src/zypper-sources.cc (original) +++ trunk/zypper/src/zypper-sources.cc Sun Nov 4 11:58:03 2007 @@ -4,6 +4,7 @@ #include <boost/logic/tribool.hpp> #include <boost/lexical_cast.hpp> +#include <zypp/ZYpp.h> #include <zypp/target/store/PersistentStorage.h> #include <zypp/base/IOStream.h> Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=7740&... ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Sun Nov 4 11:58:03 2007 @@ -20,7 +20,9 @@ #include <boost/logic/tribool.hpp> -#include <zypp/base/Logger.h> +#include <zypp/ZYppFactory.h> +#include <zypp/base/LogControl.h> + #include "zypp/base/UserRequestException.h" #include <zypp/repo/RepoException.h> #include <zypp/zypp_detail/ZYppReadOnlyHack.h> @@ -40,6 +42,10 @@ #include "zypper-command.h" #include "zypper-utils.h" +#define ZYPPER_LOG "/var/log/zypper.log" +#undef ZYPP_BASE_LOGGER_LOGGROUP +#define ZYPP_BASE_LOGGER_LOGGROUP "zypper" + using namespace std; using namespace zypp; using namespace zypp::detail; Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=7740&... ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Sun Nov 4 11:58:03 2007 @@ -3,25 +3,13 @@ #include <libintl.h> -#include <zypp/base/LogControl.h> #include <zypp/base/Logger.h> -#include <zypp/base/String.h> -#include <zypp/Locale.h> -#include <zypp/ZYpp.h> -#include <zypp/ZYppFactory.h> #include <zypp/ResStore.h> -#include <zypp/base/String.h> -#include <zypp/Digest.h> -#include <zypp/CapFactory.h> #include <zypp/RepoInfo.h> #include <zypp/RepoManager.h> #include "zypper-command.h" -#define ZYPPER_LOG "/var/log/zypper.log" -#undef ZYPP_BASE_LOGGER_LOGGROUP -#define ZYPP_BASE_LOGGER_LOGGROUP "zypper" - // ===== exit codes ====== #define ZYPPER_EXIT_OK 0 -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org