- moved shared and uibase libraries to namespaces

- bugfix: the "fix mods" function was accessing the save game data incorrectly, causing a crash

1 files changed, 76 insertions, 76 deletions

diff --git a/src/baincomplexinstallerdialog.h b/src/baincomplexinstallerdialog.h
index c2f74745..136a4e54 100644
--- a/src/baincomplexinstallerdialog.h
+++ b/src/baincomplexinstallerdialog.h
@@ -17,79 +17,79 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef BAINCOMPLEXINSTALLERDIALOG_H

-#define BAINCOMPLEXINSTALLERDIALOG_H

-

-

-#include "mytree.h"

-#include "installdialog.h"

-#include "tutorabledialog.h"

-

-

-namespace Ui {

-class BainComplexInstallerDialog;

-}

-

-

-/**

- * @brief Dialog to choose from options offered by a (complex) bain package

- **/

-class BainComplexInstallerDialog : public TutorableDialog

-{

-  Q_OBJECT

-  

-public:

- /**

-  * @brief Constructor

-  *

-  * @param tree the directory tree of the archive. The caller is resonsible to verify this actually qualifies as a bain installer

-  * @param modName proposed name for the mod. The dialog allows the user to change this

-  * @param hasPackageTXT set to true if a package.txt is available for this archive. The file has to be unpacked to QDir::tempPath before displaying the dialog!

-  * @param parent parent widget

-  **/

- explicit BainComplexInstallerDialog(DirectoryTree *tree, const QString &modName, bool hasPackageTXT, QWidget *parent);

-  ~BainComplexInstallerDialog();

-

-  /**

-   * @return bool true if the user requested the manual dialog

-   **/

-  bool manualRequested() const { return m_Manual; }

-

-  /**

-   * @return QString the (user-modified) name to be used for the mod

-   **/

-  QString getName() const;

-

-  /**

-   * @brief retrieve the updated archive tree from the dialog. The caller is responsible to delete the returned tree.

-   * 

-   * @note This call is destructive on the input tree!

-   *

-   * @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);

-

-private slots:

-

-  void on_manualBtn_clicked();

-

-  void on_okBtn_clicked();

-

-  void on_cancelBtn_clicked();

-

-  void on_packageBtn_clicked();

-

-private:

-

-  void moveTreeUp(DirectoryTree *target, DirectoryTree::Node *child);

-

-private:

-

-  Ui::BainComplexInstallerDialog *ui;

-

-  bool m_Manual;

-

-};

-

-#endif // BAINCOMPLEXINSTALLERDIALOG_H

+#ifndef BAINCOMPLEXINSTALLERDIALOG_H
+#define BAINCOMPLEXINSTALLERDIALOG_H
+
+
+#include "mytree.h"
+#include "installdialog.h"
+#include "tutorabledialog.h"
+
+
+namespace Ui {
+class BainComplexInstallerDialog;
+}
+
+
+/**
+ * @brief Dialog to choose from options offered by a (complex) bain package
+ **/
+class BainComplexInstallerDialog : public MOBase::TutorableDialog
+{
+  Q_OBJECT
+  
+public:
+ /**
+  * @brief Constructor
+  *
+  * @param tree the directory tree of the archive. The caller is resonsible to verify this actually qualifies as a bain installer
+  * @param modName proposed name for the mod. The dialog allows the user to change this
+  * @param hasPackageTXT set to true if a package.txt is available for this archive. The file has to be unpacked to QDir::tempPath before displaying the dialog!
+  * @param parent parent widget
+  **/
+ explicit BainComplexInstallerDialog(MOBase::DirectoryTree *tree, const QString &modName, bool hasPackageTXT, QWidget *parent);
+  ~BainComplexInstallerDialog();
+
+  /**
+   * @return bool true if the user requested the manual dialog
+   **/
+  bool manualRequested() const { return m_Manual; }
+
+  /**
+   * @return QString the (user-modified) name to be used for the mod
+   **/
+  QString getName() const;
+
+  /**
+   * @brief retrieve the updated archive tree from the dialog. The caller is responsible to delete the returned tree.
+   * 
+   * @note This call is destructive on the input tree!
+   *
+   * @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!
+   **/
+  MOBase::DirectoryTree *updateTree(MOBase::DirectoryTree *tree);
+
+private slots:
+
+  void on_manualBtn_clicked();
+
+  void on_okBtn_clicked();
+
+  void on_cancelBtn_clicked();
+
+  void on_packageBtn_clicked();
+
+private:
+
+  void moveTreeUp(MOBase::DirectoryTree *target, MOBase::DirectoryTree::Node *child);
+
+private:
+
+  Ui::BainComplexInstallerDialog *ui;
+
+  bool m_Manual;
+
+};
+
+#endif // BAINCOMPLEXINSTALLERDIALOG_H