mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Added compact syntax for package dependencies:
"depends on: package version" git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@777 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -615,6 +615,12 @@
|
||||
<File
|
||||
RelativePath=".\gui\control\package_list.hpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\gui\control\tree_list.cpp">
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\gui\control\tree_list.hpp">
|
||||
</File>
|
||||
<Filter
|
||||
Name="card_list"
|
||||
Filter="">
|
||||
|
||||
+19
-3
@@ -436,9 +436,25 @@ String Package::toStandardName(const String& name) {
|
||||
|
||||
// ----------------------------------------------------------------------------- : Packaged
|
||||
|
||||
IMPLEMENT_REFLECTION(PackageDependency) {
|
||||
REFLECT(package);
|
||||
REFLECT(version);
|
||||
template <> void Reader::handle(PackageDependency& dep) {
|
||||
if (!isComplex()) {
|
||||
handle(dep.package);
|
||||
size_t pos = dep.package.find_first_of(_(' '));
|
||||
if (pos != String::npos) {
|
||||
dep.version = Version::fromString(dep.package.substr(pos+1));
|
||||
dep.package = dep.package.substr(0,pos);
|
||||
}
|
||||
} else {
|
||||
handle(_("package"), dep.package);
|
||||
handle(_("version"), dep.version);
|
||||
}
|
||||
}
|
||||
template <> void Writer::handle(const PackageDependency& dep) {
|
||||
if (dep.version != Version()) {
|
||||
handle(dep.package + _(" ") + dep.version.toString());
|
||||
} else {
|
||||
handle(dep.package);
|
||||
}
|
||||
}
|
||||
|
||||
// note: reflection must be declared before it is used
|
||||
|
||||
Reference in New Issue
Block a user