From b9e395e58969fb28bb402af61a7af647ae1535e0 Mon Sep 17 00:00:00 2001
From: Jan Kupec <jkupec@suse.cz>
Date: Fri, 23 Nov 2007 18:59:32 +0000
Subject: [PATCH] - renamed gSettings -> GlobalOptions

---
 src/zypper-info.cc  | 2 +-
 src/zypper-main.h   | 2 +-
 src/zypper-misc.cc  | 2 +-
 src/zypper-repos.cc | 2 +-
 src/zypper-search.h | 2 +-
 src/zypper.cc       | 2 +-
 src/zypper.h        | 9 ++++-----
 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/zypper-info.cc b/src/zypper-info.cc
index f02b84d..5d60640 100644
--- a/src/zypper-info.cc
+++ b/src/zypper-info.cc
@@ -18,7 +18,7 @@ using namespace zypp;
 using boost::format;
 
 extern ZYpp::Ptr God;
-extern Settings gSettings;
+extern GlobalOptions gSettings;
 
 /**
  * 
diff --git a/src/zypper-main.h b/src/zypper-main.h
index fcf9633..4e329dd 100644
--- a/src/zypper-main.h
+++ b/src/zypper-main.h
@@ -29,7 +29,7 @@
  * Macro to filter output above the current verbosity level.
  *
  * \see Output Macros
- * \see Settings::verbosity
+ * \see GlobalOptions::verbosity
  */
 #define COND_STREAM(STREAM,LEVEL) ((gSettings.verbosity >= LEVEL) ? STREAM : no_stream)
 
diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index 8893267..ba5bf5d 100644
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -37,7 +37,7 @@ using namespace boost;
 
 extern ZYpp::Ptr God;
 extern RuntimeData gData;
-extern Settings gSettings;
+extern GlobalOptions gSettings;
 
 
 void cond_init_target () {
diff --git a/src/zypper-repos.cc b/src/zypper-repos.cc
index c907434..426239d 100644
--- a/src/zypper-repos.cc
+++ b/src/zypper-repos.cc
@@ -33,7 +33,7 @@ using namespace zypp::parser;
 
 extern ZYpp::Ptr God;
 extern RuntimeData gData;
-extern Settings gSettings;
+extern GlobalOptions gSettings;
 
 
 static bool refresh_raw_metadata(const Zypper & zypper,
diff --git a/src/zypper-search.h b/src/zypper-search.h
index 5ca9bd6..8af1f85 100644
--- a/src/zypper-search.h
+++ b/src/zypper-search.h
@@ -26,7 +26,7 @@
 #include "zypper-getopt.h"
 #include "zypper-tabulator.h"
 
-extern Settings gSettings;
+extern GlobalOptions gSettings;
 
 /**
  * Represents zypper search options.
diff --git a/src/zypper.cc b/src/zypper.cc
index 9448a86..1f286ef 100644
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -47,7 +47,7 @@ using namespace boost;
 
 ZYpp::Ptr God = NULL;
 RuntimeData gData;
-Settings gSettings;
+GlobalOptions gSettings;
 parsed_opts copts; // command options
 
 
diff --git a/src/zypper.h b/src/zypper.h
index 17065f3..a7a91b4 100644
--- a/src/zypper.h
+++ b/src/zypper.h
@@ -66,9 +66,9 @@ private:
 /**
  * Structure for holding various start-up setting.
  */
-struct Settings
+struct GlobalOptions
 {
-  Settings()
+  GlobalOptions()
   :
   verbosity(0),  
   disable_system_sources(false),
@@ -94,13 +94,12 @@ struct Settings
    * </ul>
    */
   int verbosity;
-  std::string command;
   bool disable_system_sources;
   bool disable_system_resolvables;
   bool is_rug_compatible;
   bool non_interactive;
   bool no_gpg_checks;
-  bool license_auto_agree;
+  bool license_auto_agree; // TODO move to commandOptions
   bool machine_readable;
   std::string root_dir;
   zypp::RepoManagerOptions rm_options;
@@ -125,7 +124,7 @@ struct RuntimeData
 };
 
 extern RuntimeData gData;
-extern Settings gSettings;
+extern GlobalOptions gSettings;
 extern std::ostream no_stream;
 
 #endif /*ZYPPER_H*/
-- 
2.7.4