From f3ff6f22ae0d2594778922771c5d8400e6c1ba05 Mon Sep 17 00:00:00 2001 From: twanvl Date: Sat, 31 May 2008 14:45:04 +0000 Subject: [PATCH] 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 --- src/data/field/package_choice.cpp | 2 +- src/data/game.cpp | 2 +- src/data/installer.cpp | 2 +- src/data/locale.cpp | 2 +- src/data/stylesheet.cpp | 4 ++-- src/data/symbol_font.cpp | 2 +- src/gui/control/package_list.cpp | 2 +- src/gui/packages_window.cpp | 16 ++++++++-------- src/gui/preferences_window.cpp | 2 +- src/gui/set/window.cpp | 4 ++-- src/gui/update_checker.cpp | 2 +- src/main.cpp | 4 ++-- src/render/value/package_choice.cpp | 2 +- src/script/parser.cpp | 2 +- src/util/io/package.cpp | 4 ++-- src/util/io/package_manager.cpp | 8 ++++---- src/util/io/package_manager.hpp | 4 ++-- src/util/io/reader.cpp | 2 +- 18 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/data/field/package_choice.cpp b/src/data/field/package_choice.cpp index 7f8c5bf9..a1d1a54d 100644 --- a/src/data/field/package_choice.cpp +++ b/src/data/field/package_choice.cpp @@ -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) { diff --git a/src/data/game.cpp b/src/data/game.cpp index 135bc03f..b74d0883 100644 --- a/src/data/game.cpp +++ b/src/data/game.cpp @@ -30,7 +30,7 @@ Game::Game() {} GameP Game::byName(const String& name) { - return packages.open(name + _(".mse-game")); + return package_manager.open(name + _(".mse-game")); } bool Game::isMagic() const { diff --git a/src/data/installer.cpp b/src/data/installer.cpp index bf383c50..10aa64a0 100644 --- a/src/data/installer.cpp +++ b/src/data/installer.cpp @@ -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); } } diff --git a/src/data/locale.cpp b/src/data/locale.cpp index 2a5f5e98..6ade651a 100644 --- a/src/data/locale.cpp +++ b/src/data/locale.cpp @@ -27,7 +27,7 @@ LocaleP the_locale; String Locale::typeName() const { return _("locale"); } LocaleP Locale::byName(const String& name) { - return packages.open(name + _(".mse-locale")); + return package_manager.open(name + _(".mse-locale")); } IMPLEMENT_REFLECTION_NO_SCRIPT(Locale) { diff --git a/src/data/stylesheet.cpp b/src/data/stylesheet.cpp index 7c920f82..8452539f 100644 --- a/src/data/stylesheet.cpp +++ b/src/data/stylesheet.cpp @@ -33,9 +33,9 @@ StyleSheetP StyleSheet::byGameAndName(const Game& game, const String& name) { try { map::const_iterator it = stylesheet_alternatives.find(full_name); if (it != stylesheet_alternatives.end()) { - return packages.open(it->second); + return package_manager.open(it->second); } else { - return packages.open(full_name); + return package_manager.open(full_name); } } catch (PackageNotFoundError& e) { if (stylesheet_for_reading()) { diff --git a/src/data/symbol_font.cpp b/src/data/symbol_font.cpp index caa14b71..86252c46 100644 --- a/src/data/symbol_font.cpp +++ b/src/data/symbol_font.cpp @@ -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( + return package_manager.open( name.size() > 16 && is_substr(name, name.size() - 16, _(".mse-symbol-font")) ? name : name + _(".mse-symbol-font")); } diff --git a/src/gui/control/package_list.cpp b/src/gui/control/package_list.cpp index 596ecb10..2c73dd17 100644 --- a/src/gui/control/package_list.cpp +++ b/src/gui/control/package_list.cpp @@ -62,7 +62,7 @@ void PackageList::showData(const String& pattern) { packages.clear(); // find matching packages vector matching; - ::packages.findMatching(pattern, matching); + package_manager.findMatching(pattern, matching); FOR_EACH(p, matching) { // open image InputStreamP stream = p->openIconFile(); diff --git a/src/gui/packages_window.cpp b/src/gui/packages_window.cpp index 00350a19..7902808d 100644 --- a/src/gui/packages_window.cpp +++ b/src/gui/packages_window.cpp @@ -182,7 +182,7 @@ void PackagesWindow::init(Window* parent, bool show_only_installable) { // get packages wxBusyCursor busy; - packages.installedPackages(installable_packages); + package_manager.findAllInstalledPackages(installable_packages); FOR_EACH(p, installable_packages) p->determineStatus(); checkInstallerList(false); @@ -254,12 +254,12 @@ void PackagesWindow::onOk(wxCommandEvent& ev) { wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_CAN_ABORT | wxPD_SMOOTH ); // Clear package list - packages.reset(); + package_manager.reset(); // Download installers - int package_pos = 0, progress = 0; + int package_pos = 0, step = 0; FOR_EACH(ip, installable_packages) { - ++package_pos; ++progress; - if (!progress.Update(progress, String::Format(_ERROR_("downloading updates"), package_pos, total))) { + ++package_pos; ++step; + if (!progress.Update(step, String::Format(_ERROR_("downloading updates"), package_pos, total))) { return; // aborted } if ((ip->action & PACKAGE_INSTALL) && ip->installer && !ip->installer->installer) { @@ -281,11 +281,11 @@ void PackagesWindow::onOk(wxCommandEvent& ev) { // Install stuff package_pos = 0 ; FOR_EACH(ip, installable_packages) { - ++package_pos; ++progress; - if (!progress.Update(progress, String::Format(_ERROR_("installing updates"), package_pos, total))) { + ++package_pos; ++step; + if (!progress.Update(step, String::Format(_ERROR_("installing updates"), package_pos, total))) { // don't allow abort. } - packages.install(*ip); + package_manager.install(*ip); } // Done // Continue event propagation into the dialog window so that it closes. diff --git a/src/gui/preferences_window.cpp b/src/gui/preferences_window.cpp index ad5b25f4..151310bd 100644 --- a/src/gui/preferences_window.cpp +++ b/src/gui/preferences_window.cpp @@ -139,7 +139,7 @@ GlobalPreferencesPage::GlobalPreferencesPage(Window* parent) language = new wxComboBox(this, wxID_ANY, _(""), wxDefaultPosition, wxDefaultSize, 0, nullptr, wxCB_READONLY); // set values vector locales; - ::packages.findMatching(_("*.mse-locale"), locales); + package_manager.findMatching(_("*.mse-locale"), locales); sort(locales.begin(), locales.end(), compare_package_name); int n = 0; FOR_EACH(package, locales) { diff --git a/src/gui/set/window.cpp b/src/gui/set/window.cpp index fabe04b1..3e1f608f 100644 --- a/src/gui/set/window.cpp +++ b/src/gui/set/window.cpp @@ -564,8 +564,8 @@ void SetWindow::onFileReload(wxCommandEvent&) { vector::const_iterator card_it = find(set->cards.begin(), set->cards.end(), current_panel->selectedCard()); if (card_it != set->cards.end()) card_pos = card_it - set->cards.begin(); } - packages.reset(); // unload all packages - settings.read(); // reload settings + package_manager.reset(); // unload all packages + settings.read(); // reload settings setSet(import_set(filename)); // reselect card if (card_pos < set->cards.size()) { diff --git a/src/gui/update_checker.cpp b/src/gui/update_checker.cpp index 57780ba5..a0cd1c8a 100644 --- a/src/gui/update_checker.cpp +++ b/src/gui/update_checker.cpp @@ -75,7 +75,7 @@ bool update_available() { FOR_EACH_CONST(p, update_version_data->packages) { if (!settings.check_updates_all && p->package != mse_package) continue; Version v; - if (packages.installedVersion(p->package, v) && v < p->version) { + if (package_manager.installedVersion(p->package, v) && v < p->version) { return true; } } diff --git a/src/main.cpp b/src/main.cpp index 008a80fb..7ef5ec6d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -79,7 +79,7 @@ int MSE::OnRun() { wxFileSystem::AddHandler(new wxInternetFSHandler); // needed for update checker init_script_variables(); init_file_formats(); - packages.init(); + package_manager.init(); settings.read(); the_locale = Locale::byName(settings.locale); check_updates(); @@ -212,7 +212,7 @@ int MSE::OnRun() { int MSE::OnExit() { thumbnail_thread.abortAll(); settings.write(); - packages.destroy(); + package_manager.destroy(); return 0; } diff --git a/src/render/value/package_choice.cpp b/src/render/value/package_choice.cpp index 36e2342c..289d1224 100644 --- a/src/render/value/package_choice.cpp +++ b/src/render/value/package_choice.cpp @@ -29,7 +29,7 @@ struct PackageChoiceValueViewer::ComparePackagePosHint { void PackageChoiceValueViewer::initItems() { vector choices; - packages.findMatching(field().match, choices); + package_manager.findMatching(field().match, choices); sort(choices.begin(), choices.end(), ComparePackagePosHint()); FOR_EACH(p, choices) { Item i; diff --git a/src/script/parser.cpp b/src/script/parser.cpp index 892c928c..50747985 100644 --- a/src/script/parser.cpp +++ b/src/script/parser.cpp @@ -194,7 +194,7 @@ void TokenIterator::readToken() { // read the entire file, and start at the beginning of it pos = 0; filename = include_file; - InputStreamP is = packages.openFileFromPackage(package, include_file); + InputStreamP is = package_manager.openFileFromPackage(package, include_file); input = read_utf8_line(*is, true, true); } else if (isAlpha(c) || c == _('_')) { // name diff --git a/src/util/io/package.cpp b/src/util/io/package.cpp index b782212d..7e618bdf 100644 --- a/src/util/io/package.cpp +++ b/src/util/io/package.cpp @@ -179,7 +179,7 @@ InputStreamP Package::openIn(const String& file) { if (!file.empty() && file.GetChar(0) == _('/')) { // absolute path, open file from another package Packaged* p = dynamic_cast(this); - return packages.openFileFromPackage(p, file); + return package_manager.openFileFromPackage(p, file); } FileInfos::iterator it = files.find(normalize_internal_filename(file)); if (it == files.end()) { @@ -547,7 +547,7 @@ void Packaged::validate(Version) { } // check dependencies FOR_EACH(dep, dependencies) { - packages.checkDependency(*dep, true); + package_manager.checkDependency(*dep, true); } } diff --git a/src/util/io/package_manager.cpp b/src/util/io/package_manager.cpp index 4bcf1b2d..b06a55f3 100644 --- a/src/util/io/package_manager.cpp +++ b/src/util/io/package_manager.cpp @@ -24,7 +24,7 @@ DECLARE_TYPEOF_COLLECTION(PackageVersion::FileInfo); // ----------------------------------------------------------------------------- : PackageManager : in memory -PackageManager packages; +PackageManager package_manager; void PackageManager::init() { @@ -148,7 +148,7 @@ bool PackageManager::installedVersion(const String& package_name, Version& versi } } -void PackageManager::installedPackages(vector& packages) { +void PackageManager::findAllInstalledPackages(vector& packages) { // from directories vector more_packages; global.installedPackages(packages); @@ -229,7 +229,7 @@ void PackageDirectory::installedPackages(vector& packages_o if (it1 == packages.end() || (*it1)->name > *it2) { // add new package to db try { - PackagedP pack = ::packages.openAny(*it2, true); + PackagedP pack = package_manager.openAny(*it2, true); db_changed = true; PackageVersionP ver(new PackageVersion( is_local ? PackageVersion::STATUS_LOCAL : PackageVersion::STATUS_GLOBAL)); @@ -244,7 +244,7 @@ void PackageDirectory::installedPackages(vector& packages_o } else { // ok, a package already in the db try { - PackagedP pack = ::packages.openAny(*it2, true); + PackagedP pack = package_manager.openAny(*it2, true); (*it1)->check_status(*pack); packages_out.push_back(new_intrusive2(new_intrusive1(*pack), *it1)); } catch (const Error&) { db_changed = true; } diff --git a/src/util/io/package_manager.hpp b/src/util/io/package_manager.hpp index d6e724aa..5712940c 100644 --- a/src/util/io/package_manager.hpp +++ b/src/util/io/package_manager.hpp @@ -149,7 +149,7 @@ class PackageManager { bool installedVersion(const String& pkg, Version& version_out); /// Get all installed packages - void installedPackages(vector& packages); + void findAllInstalledPackages(vector& packages); /// Install/uninstall a package void install(const InstallablePackage& package); @@ -162,7 +162,7 @@ class PackageManager { }; /// The global PackageManager instance -extern PackageManager packages; +extern PackageManager package_manager; // ----------------------------------------------------------------------------- : PackageVersion diff --git a/src/util/io/reader.cpp b/src/util/io/reader.cpp index 7509611c..f2d50416 100644 --- a/src/util/io/reader.cpp +++ b/src/util/io/reader.cpp @@ -29,7 +29,7 @@ Reader::Reader(Packaged* pkg, const String& filename) : indent(0), expected_indent(0), state(OUTSIDE) , ignore_invalid(false) , filename(filename), package(pkg), line_number(0), previous_line_number(0) - , input(packages.openFileFromPackage(package, filename)) + , input(package_manager.openFileFromPackage(package, filename)) { moveNext(); handleAppVersion();