Author: jkupec Date: Fri Nov 23 19:59:32 2007 New Revision: 7907 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7907&view=rev Log: - renamed gSettings -> GlobalOptions Modified: trunk/zypper/src/zypper-info.cc trunk/zypper/src/zypper-main.h trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper-search.h trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/src/zypper-info.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-info.cc?rev=7907&r1=7906&r2=7907&view=diff ============================================================================== --- trunk/zypper/src/zypper-info.cc (original) +++ trunk/zypper/src/zypper-info.cc Fri Nov 23 19:59:32 2007 @@ -18,7 +18,7 @@ using boost::format; extern ZYpp::Ptr God; -extern Settings gSettings; +extern GlobalOptions gSettings; /** * Modified: trunk/zypper/src/zypper-main.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-main.h?rev=7907&r1=7906&r2=7907&view=diff ============================================================================== --- trunk/zypper/src/zypper-main.h (original) +++ trunk/zypper/src/zypper-main.h Fri Nov 23 19:59:32 2007 @@ -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) Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=7907&r1=7906&r2=7907&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Fri Nov 23 19:59:32 2007 @@ -37,7 +37,7 @@ extern ZYpp::Ptr God; extern RuntimeData gData; -extern Settings gSettings; +extern GlobalOptions gSettings; void cond_init_target () { Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=7907&r1=7906&r2=7907&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Fri Nov 23 19:59:32 2007 @@ -33,7 +33,7 @@ extern ZYpp::Ptr God; extern RuntimeData gData; -extern Settings gSettings; +extern GlobalOptions gSettings; static bool refresh_raw_metadata(const Zypper & zypper, Modified: trunk/zypper/src/zypper-search.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-search.h?rev=7907&r1=7906&r2=7907&view=diff ============================================================================== --- trunk/zypper/src/zypper-search.h (original) +++ trunk/zypper/src/zypper-search.h Fri Nov 23 19:59:32 2007 @@ -26,7 +26,7 @@ #include "zypper-getopt.h" #include "zypper-tabulator.h" -extern Settings gSettings; +extern GlobalOptions gSettings; /** * Represents zypper search options. Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=7907&r1=7906&r2=7907&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Fri Nov 23 19:59:32 2007 @@ -47,7 +47,7 @@ ZYpp::Ptr God = NULL; RuntimeData gData; -Settings gSettings; +GlobalOptions gSettings; parsed_opts copts; // command options Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=7907&r1=7906&r2=7907&view=diff ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Fri Nov 23 19:59:32 2007 @@ -66,9 +66,9 @@ /** * Structure for holding various start-up setting. */ -struct Settings +struct GlobalOptions { - Settings() + GlobalOptions() : verbosity(0), disable_system_sources(false), @@ -94,13 +94,12 @@ * </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 @@ }; extern RuntimeData gData; -extern Settings gSettings; +extern GlobalOptions gSettings; extern std::ostream no_stream; #endif /*ZYPPER_H*/ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org