From eefb23b702792347482b8028764fe1c6d53161df Mon Sep 17 00:00:00 2001
From: Jan Kupec <jkupec@suse.cz>
Date: Sun, 4 Nov 2007 10:58:03 +0000
Subject: [PATCH] - code clean-up

---
 src/zypp-checkpatches.cc |  1 -
 src/zypper-misc.cc       |  2 ++
 src/zypper-sources.cc    |  1 +
 src/zypper.cc            |  8 +++++++-
 src/zypper.h             | 12 ------------
 5 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/zypp-checkpatches.cc b/src/zypp-checkpatches.cc
index ffd2704..fef1b55 100644
--- a/src/zypp-checkpatches.cc
+++ b/src/zypp-checkpatches.cc
@@ -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
diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index a04b5f1..35bee82 100644
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -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>
diff --git a/src/zypper-sources.cc b/src/zypper-sources.cc
index c25993a..b6919ef 100644
--- a/src/zypper-sources.cc
+++ b/src/zypper-sources.cc
@@ -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>
 
diff --git a/src/zypper.cc b/src/zypper.cc
index 52a42e0..e50adec 100644
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -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;
diff --git a/src/zypper.h b/src/zypper.h
index 332b9fb..e635078 100644
--- a/src/zypper.h
+++ b/src/zypper.h
@@ -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
-- 
2.7.4