From 6516a6b7c19713de28db7142612f1c095e541317 Mon Sep 17 00:00:00 2001 From: Tannin Date: Sun, 17 Feb 2013 09:26:29 +0100 Subject: - moved shared and uibase libraries to namespaces - bugfix: the "fix mods" function was accessing the save game data incorrectly, causing a crash --- src/fomodinstallerdialog.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/fomodinstallerdialog.h') diff --git a/src/fomodinstallerdialog.h b/src/fomodinstallerdialog.h index 875146a6..be4e34b2 100644 --- a/src/fomodinstallerdialog.h +++ b/src/fomodinstallerdialog.h @@ -98,7 +98,7 @@ public: * @param tree input tree. (TODO isn't this the same as the tree passed in the constructor?) * @return DataTree* a new tree with only the selected options and directories arranged correctly. The caller takes custody of this pointer! **/ - DirectoryTree *updateTree(DirectoryTree *tree); + MOBase::DirectoryTree *updateTree(MOBase::DirectoryTree *tree); protected: @@ -170,7 +170,7 @@ private: static PluginType getPluginType(const QString &typeString); static bool byPriority(const FileDescriptor *LHS, const FileDescriptor *RHS); - bool copyFileIterator(DirectoryTree *sourceTree, DirectoryTree *destinationTree, FileDescriptor *descriptor); + bool copyFileIterator(MOBase::DirectoryTree *sourceTree, MOBase::DirectoryTree *destinationTree, FileDescriptor *descriptor); void readFileList(QXmlStreamReader &reader, std::vector &fileList); void readPluginType(QXmlStreamReader &reader, Plugin &plugin); void readConditionFlags(QXmlStreamReader &reader, Plugin &plugin); @@ -190,10 +190,10 @@ private: bool testVisible(int pageIndex); bool nextPage(); void activateCurrentPage(); - void moveTree(DirectoryTree::Node *target, DirectoryTree::Node *source); - DirectoryTree::Node *findNode(DirectoryTree::Node *node, const QString &path, bool create); - void copyLeaf(DirectoryTree::Node *sourceTree, const QString &sourcePath, - DirectoryTree::Node *destinationTree, const QString &destinationPath); + void moveTree(MOBase::DirectoryTree::Node *target, MOBase::DirectoryTree::Node *source); + MOBase::DirectoryTree::Node *findNode(MOBase::DirectoryTree::Node *node, const QString &path, bool create); + void copyLeaf(MOBase::DirectoryTree::Node *sourceTree, const QString &sourcePath, + MOBase::DirectoryTree::Node *destinationTree, const QString &destinationPath); private: -- cgit v1.3.1