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/gui/control/package_list.cpp

@@ -62,7 +62,7 @@ void PackageList::showData(const String& pattern) {
 	packages.clear();
 	// find matching packages
 	vector<PackagedP> matching;
-	::packages.findMatching(pattern, matching);
+	package_manager.findMatching(pattern, matching);
 	FOR_EACH(p, matching) {
 		// open image
 		InputStreamP stream = p->openIconFile();

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.

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<PackagedP> 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) {

src/gui/set/window.cpp

@@ -564,8 +564,8 @@ void SetWindow::onFileReload(wxCommandEvent&) {
 		vector<CardP>::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()) {

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;
 			}
 		}