Renamed global PackageManager object to package_manager to reduce confusion

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@907 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-05-31 14:45:04 +00:00
parent 74545e8724
commit f3ff6f22ae
18 changed files with 33 additions and 33 deletions
+1 -1
View File
@@ -57,7 +57,7 @@ String PackageChoiceValue::toString() const {
PackagedP PackageChoiceValue::getPackage() const {
if (package_name.empty()) return nullptr;
else return packages.openAny(package_name, true);
else return package_manager.openAny(package_name, true);
}
bool PackageChoiceValue::update(Context& ctx) {
+1 -1
View File
@@ -30,7 +30,7 @@ Game::Game()
{}
GameP Game::byName(const String& name) {
return packages.open<Game>(name + _(".mse-game"));
return package_manager.open<Game>(name + _(".mse-game"));
}
bool Game::isMagic() const {
+1 -1
View File
@@ -151,7 +151,7 @@ void Installer::addPackage(const String& package) {
if (fn.GetExt() == _("mse-installer")) {
prefered_filename = package;
} else {
PackagedP p = ::packages.openAny(package);
PackagedP p = package_manager.openAny(package);
addPackage(*p);
}
}
+1 -1
View File
@@ -27,7 +27,7 @@ LocaleP the_locale;
String Locale::typeName() const { return _("locale"); }
LocaleP Locale::byName(const String& name) {
return packages.open<Locale>(name + _(".mse-locale"));
return package_manager.open<Locale>(name + _(".mse-locale"));
}
IMPLEMENT_REFLECTION_NO_SCRIPT(Locale) {
+2 -2
View File
@@ -33,9 +33,9 @@ StyleSheetP StyleSheet::byGameAndName(const Game& game, const String& name) {
try {
map<String, String>::const_iterator it = stylesheet_alternatives.find(full_name);
if (it != stylesheet_alternatives.end()) {
return packages.open<StyleSheet>(it->second);
return package_manager.open<StyleSheet>(it->second);
} else {
return packages.open<StyleSheet>(full_name);
return package_manager.open<StyleSheet>(full_name);
}
} catch (PackageNotFoundError& e) {
if (stylesheet_for_reading()) {
+1 -1
View File
@@ -42,7 +42,7 @@ String SymbolFont::typeNameStatic() { return _("symbol-font"); }
String SymbolFont::typeName() const { return _("symbol-font"); }
SymbolFontP SymbolFont::byName(const String& name) {
return packages.open<SymbolFont>(
return package_manager.open<SymbolFont>(
name.size() > 16 && is_substr(name, name.size() - 16, _(".mse-symbol-font"))
? name : name + _(".mse-symbol-font"));
}