mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 05:07:00 -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:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user