diff options
Diffstat (limited to 'src/installationmanager.h')
| -rw-r--r-- | src/installationmanager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/installationmanager.h b/src/installationmanager.h index 8b1f8c9a..b25ea957 100644 --- a/src/installationmanager.h +++ b/src/installationmanager.h @@ -140,7 +140,7 @@ public: * @param modName current possible names for the mod * @return true if we can proceed with the installation, false if the user canceled or in case of an unrecoverable error */ - virtual bool testOverwrite(MOBase::GuessedValue<QString> &modName) const; + virtual bool testOverwrite(MOBase::GuessedValue<QString> &modName, bool *merge = NULL) const; private: @@ -165,7 +165,7 @@ private: bool isSimpleArchiveTopLayer(const MOBase::DirectoryTree::Node *node, bool bainStyle); MOBase::DirectoryTree::Node *getSimpleArchiveBase(MOBase::DirectoryTree *dataTree); - bool testOverwrite(const QString &modsDirectory, MOBase::GuessedValue<QString> &modName); + //bool testOverwrite(const QString &modsDirectory, MOBase::GuessedValue<QString> &modName, bool *merge = NULL); bool doInstall(MOBase::GuessedValue<QString> &modName, int modID, const QString &version, const QString &newestVersion, int categoryID); |