mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 21:06:59 -04:00
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:
@@ -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
@@ -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 {
|
||||
|
||||
@@ -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
@@ -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) {
|
||||
|
||||
@@ -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()) {
|
||||
|
||||
@@ -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"));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user