- Renamed GlobalSettings to GlobalPreferences
git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@621 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
parent
65ed285807
commit
1706119e4d
5 changed files with 16 additions and 16 deletions
|
@ -34,7 +34,7 @@
|
|||
#include "backend/process.hh"
|
||||
#include "backend/policy.hh"
|
||||
#include "backend/policy_parameters.hh"
|
||||
#include "backend/global_settings.hh"
|
||||
#include "backend/global_preferences.hh"
|
||||
#include "standard_io.hh"
|
||||
#include "text_simulation.hh"
|
||||
|
||||
|
@ -63,8 +63,8 @@ static void load_pyloader_plugin() {
|
|||
// Leaks willingly:
|
||||
Module* pyloader = 0;
|
||||
|
||||
GlobalSettings::dir_iterator it = GlobalSettings::instance().modules_dir_begin();
|
||||
while(it != GlobalSettings::instance().modules_dir_end()) {
|
||||
GlobalPreferences::dir_iterator it = GlobalPreferences::instance().modules_dir_begin();
|
||||
while(it != GlobalPreferences::instance().modules_dir_end()) {
|
||||
std::string pyloader_path = Module::build_path(*it, "pyloader");
|
||||
pyloader = new Module(pyloader_path);
|
||||
if(*pyloader) break;
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "config.h"
|
||||
#include "gettext.h"
|
||||
|
||||
#include "backend/global_settings.hh"
|
||||
#include "backend/global_preferences.hh"
|
||||
#include "parse_opts.hh"
|
||||
|
||||
#ifdef _GNU_SOURCE
|
||||
|
@ -39,7 +39,7 @@ static void display_help();
|
|||
void
|
||||
parse_options(int& argc, char**& argv)
|
||||
{
|
||||
using sgpem::GlobalSettings;
|
||||
using sgpem::GlobalPreferences;
|
||||
|
||||
print_license();
|
||||
|
||||
|
@ -80,10 +80,10 @@ parse_options(int& argc, char**& argv)
|
|||
// FIXME : to be written!
|
||||
break;
|
||||
case 'P':
|
||||
GlobalSettings::instance().add_policies_dir(optarg);
|
||||
GlobalPreferences::instance().add_policies_dir(optarg);
|
||||
break;
|
||||
case 'M':
|
||||
GlobalSettings::instance().add_modules_dir(optarg);
|
||||
GlobalPreferences::instance().add_modules_dir(optarg);
|
||||
break;
|
||||
case ':':
|
||||
printf(_("[EE] Wrong number of parameters. Please see \n"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue