diff options
Diffstat (limited to 'api/logic/meta/BaseEntity.h')
| -rw-r--r-- | api/logic/meta/BaseEntity.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/logic/meta/BaseEntity.h b/api/logic/meta/BaseEntity.h index 4483beab..418c979f 100644 --- a/api/logic/meta/BaseEntity.h +++ b/api/logic/meta/BaseEntity.h @@ -1,4 +1,4 @@ -/* Copyright 2015-2017 MultiMC Contributors +/* Copyright 2015-2018 MultiMC Contributors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ #include "QObjectPtr.h" #include "multimc_logic_export.h" +#include "net/Mode.h" class Task; namespace Meta @@ -45,7 +46,6 @@ public: /* types */ public: virtual ~BaseEntity(); - virtual void merge(const std::shared_ptr<BaseEntity> &other) = 0; virtual void parse(const QJsonObject &obj) = 0; virtual QString localFilename() const = 0; @@ -54,7 +54,7 @@ public: bool isLoaded() const; bool shouldStartRemoteUpdate() const; - void load(); + void load(Net::Mode loadType); shared_qobject_ptr<Task> getCurrentTask(); protected: /* methods */ |