matteo/sgpemv2
matteo/sgpemv2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Renamed GlobalSettings to GlobalPreferences

Browse source 
git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@621 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
elvez 2006-06-12 14:04:06 +00:00
parent 65ed285807
commit 1706119e4d
5 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/pyloader/src/python_policy_manager.cc
View file

@ -19,7 +19,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "python_policy_manager.hh"
#include "global_settings.hh"
#include "global_preferences.hh"
#include <Python.h>
#include <glibmm/ustring.h>
@ -108,8 +108,8 @@ PythonPolicyManager::init()
Glib::ustring importdirs = "import sys\n"
"sys.path[:0] = [ ";
for_each(GlobalSettings::instance().policies_dir_begin(),
GlobalSettings::instance().policies_dir_end(),
for_each(GlobalPreferences::instance().policies_dir_begin(),
GlobalPreferences::instance().policies_dir_end(),
pol_dirs_concat(importdirs));
importdirs += " '" SHAREDIR "' ]\n";
@ -130,8 +130,8 @@ PythonPolicyManager::get_avail_policies()
void
PythonPolicyManager::collect_policies()
{
GlobalSettings::dir_iterator dir_it = GlobalSettings::instance().policies_dir_begin();
GlobalSettings::dir_iterator dir_end = GlobalSettings::instance().policies_dir_end();
GlobalPreferences::dir_iterator dir_it = GlobalPreferences::instance().policies_dir_begin();
GlobalPreferences::dir_iterator dir_end = GlobalPreferences::instance().policies_dir_end();
for(; dir_it != dir_end; ++dir_it)
{

4
plugins/pyloader/src/testsuite/test-python_loader.cc
View file

@ -24,7 +24,7 @@
#include "../python_policy_manager.hh"
#include "../python_policy.hh"
#include "global_settings.hh"
#include "global_preferences.hh"
#include "schedulable_queue.hh"
#include "scheduler.hh"
#include "user_interrupt_exception.hh"
@ -62,7 +62,7 @@ main(int argc, char** argv) {
}
else
// Add argv[1] as the directory to search for uninstalled policies
sgpem::GlobalSettings::instance().add_policies_dir(argv[1]);
sgpem::GlobalPreferences::instance().add_policies_dir(argv[1]);
// Self-register itself to Scheduler, however we don't care about it
TestPythonPolicyManager polman;