amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-11 13:17:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Renamed global PackageManager object to package_manager to reduce confusion

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/util/io/package.cpp
+2 -2
View File
@@ -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<Packaged*>(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);
}
}
src/util/io/package_manager.cpp
+4 -4
View File
@@ -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<InstallablePackageP>& packages) {
void PackageManager::findAllInstalledPackages(vector<InstallablePackageP>& packages) {
// from directories
vector<InstallablePackageP> more_packages;
global.installedPackages(packages);
@@ -229,7 +229,7 @@ void PackageDirectory::installedPackages(vector<InstallablePackageP>& 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<InstallablePackageP>& 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<InstallablePackage>(new_intrusive1<PackageDescription>(*pack), *it1));
} catch (const Error&) { db_changed = true; }
src/util/io/package_manager.hpp
+2 -2
View File
@@ -149,7 +149,7 @@ class PackageManager {
bool installedVersion(const String& pkg, Version& version_out);
/// Get all installed packages
void installedPackages(vector<InstallablePackageP>& packages);
void findAllInstalledPackages(vector<InstallablePackageP>& 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
src/util/io/reader.cpp
+1 -1
View File
@@ -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();