summaryrefslogtreecommitdiffstats
path: root/src/client/DeprecatedLoader.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/client/DeprecatedLoader.hpp')
-rw-r--r--src/client/DeprecatedLoader.hpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/client/DeprecatedLoader.hpp b/src/client/DeprecatedLoader.hpp
index c1af52c2..f7213aca 100644
--- a/src/client/DeprecatedLoader.hpp
+++ b/src/client/DeprecatedLoader.hpp
@@ -62,11 +62,12 @@ public:
string find_file(const string& filename, const string& additional_path = "");
- string load_patch(const Glib::ustring& filename,
- boost::optional<Path> parent_path,
- string name,
- GraphObject::Variables initial_data,
- bool existing = false);
+ string load_patch(const Glib::ustring& filename,
+ bool merge,
+ boost::optional<Path> parent_path,
+ boost::optional<Symbol> name,
+ GraphObject::Variables initial_data,
+ bool existing = false);
private:
void add_variable(GraphObject::Variables& data, string key, string value);