- 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, 131 insertions, 127 deletions

diff --git a/src/syncoverwritedialog.cpp b/src/syncoverwritedialog.cpp
index 0fac8a7d..aae0fd7c 100644
--- a/src/syncoverwritedialog.cpp
+++ b/src/syncoverwritedialog.cpp
@@ -17,130 +17,134 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "syncoverwritedialog.h"

-#include "ui_syncoverwritedialog.h"

-#include <utility.h>

-#include <report.h>

-#include <gameinfo.h>

-#include <QDir>

-#include <QDirIterator>

-#include <QComboBox>

-#include <QStringList>

-

-

-SyncOverwriteDialog::SyncOverwriteDialog(const QString &path, DirectoryEntry *directoryStructure, QWidget *parent)

-  : TutorableDialog("SyncOverwrite", parent),

-    ui(new Ui::SyncOverwriteDialog), m_SourcePath(path), m_DirectoryStructure(directoryStructure)

-{

-  ui->setupUi(this);

-  refresh(path, directoryStructure);

-

-  QHeaderView *headerView = ui->syncTree->header();

-#if QT_VERSION >= 0x050000

-  headerView->setSectionResizeMode(0, QHeaderView::Stretch);

-  headerView->setSectionResizeMode(1, QHeaderView::Interactive);

-#else

-  headerView->setResizeMode(0, QHeaderView::Stretch);

-  headerView->setResizeMode(1, QHeaderView::Interactive);

-#endif

-}

-

-

-SyncOverwriteDialog::~SyncOverwriteDialog()

-{

-  delete ui;

-}

-

-

-void SyncOverwriteDialog::readTree(const QString &path, DirectoryEntry *directoryStructure, QTreeWidgetItem *subTree)

-{

-  QDir overwrite(path);

-  overwrite.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);

-  QDirIterator dirIter(overwrite);

-  while (dirIter.hasNext()) {

-    dirIter.next();

-    QFileInfo fileInfo = dirIter.fileInfo();

-

-    QString file = fileInfo.fileName();

-    if (file == "meta.ini") {

-      continue;

-    }

-

-    QTreeWidgetItem *newItem = new QTreeWidgetItem(subTree, QStringList(file));

-

-    if (fileInfo.isDir()) {

-      DirectoryEntry *subDir = directoryStructure->findSubDirectory(ToWString(file));

-      if (subDir != NULL) {

-        readTree(fileInfo.absoluteFilePath(), subDir, newItem);

-      } else {

-        qCritical("no directory structure for %s?", file.toUtf8().constData());

-        delete newItem;

-        newItem = NULL;

-      }

-    } else {

-      const FileEntry *entry = directoryStructure->findFile(ToWString(file));

-      QComboBox* combo = new QComboBox(ui->syncTree);

-      combo->addItem(tr("<don't sync>"), -1);

-      if (entry != NULL) {

-        const std::vector<int> &alternatives = entry->getAlternatives();

-        for (std::vector<int>::const_iterator iter = alternatives.begin(); iter != alternatives.end(); ++iter) {

-          combo->addItem(ToQString(m_DirectoryStructure->getOriginByID(*iter).getName()), *iter);

-        }

-        combo->setCurrentIndex(combo->count() - 1);

-      } else {

-        combo->setCurrentIndex(0);

-      }

-      ui->syncTree->setItemWidget(newItem, 1, combo);

-    }

-    if (newItem != NULL) {

-      subTree->addChild(newItem);

-    }

-  }

-}

-

-

-void SyncOverwriteDialog::refresh(const QString &path, DirectoryEntry *directoryStructure)

-{

-  QTreeWidgetItem *rootItem = new QTreeWidgetItem(ui->syncTree, QStringList("<data>"));

-  readTree(path, directoryStructure, rootItem);

-  ui->syncTree->addTopLevelItem(rootItem);

-  ui->syncTree->expandAll();

-}

-

-

-void SyncOverwriteDialog::applyTo(QTreeWidgetItem *item, const QString &path, const QString &modDirectory)

-{

-  for (int i = 0; i < item->childCount(); ++i) {

-    QTreeWidgetItem *child = item->child(i);

-    QString filePath;

-    if (path.length() != 0) {

-      filePath = path.mid(0).append("/").append(child->text(0));

-    } else {

-      filePath = child->text(0);

-    }

-    if (child->childCount() != 0) {

-      applyTo(child, filePath, modDirectory);

-    } else {

-      QComboBox *comboBox = qobject_cast<QComboBox*>(ui->syncTree->itemWidget(child, 1));

-      if (comboBox != NULL) {

-        int originID = comboBox->itemData(comboBox->currentIndex(), Qt::UserRole).toInt();

-        if (originID != -1) {

-          FilesOrigin &origin = m_DirectoryStructure->getOriginByID(originID);

-          QString source = m_SourcePath.mid(0).append("/").append(filePath);

-          QString destination = modDirectory.mid(0).append("/").append(ToQString(origin.getName())).append("/").append(filePath);

-          if (!QFile::remove(destination)) {

-            reportError(tr("failed to remove %1").arg(destination));

-          } else if (!QFile::rename(source, destination)) {

-            reportError(tr("failed to move %1 to %2").arg(source).arg(destination));

-          }

-        }

-      }

-    }

-  }

-}

-

-

-void SyncOverwriteDialog::apply(const QString &modDirectory)

-{

-  applyTo(ui->syncTree->topLevelItem(0), "", modDirectory);

-}

+#include "syncoverwritedialog.h"
+#include "ui_syncoverwritedialog.h"
+#include <utility.h>
+#include <report.h>
+#include <gameinfo.h>
+#include <QDir>
+#include <QDirIterator>
+#include <QComboBox>
+#include <QStringList>
+
+
+using namespace MOBase;
+using namespace MOShared;
+
+
+SyncOverwriteDialog::SyncOverwriteDialog(const QString &path, DirectoryEntry *directoryStructure, QWidget *parent)
+  : TutorableDialog("SyncOverwrite", parent),
+    ui(new Ui::SyncOverwriteDialog), m_SourcePath(path), m_DirectoryStructure(directoryStructure)
+{
+  ui->setupUi(this);
+  refresh(path, directoryStructure);
+
+  QHeaderView *headerView = ui->syncTree->header();
+#if QT_VERSION >= 0x050000
+  headerView->setSectionResizeMode(0, QHeaderView::Stretch);
+  headerView->setSectionResizeMode(1, QHeaderView::Interactive);
+#else
+  headerView->setResizeMode(0, QHeaderView::Stretch);
+  headerView->setResizeMode(1, QHeaderView::Interactive);
+#endif
+}
+
+
+SyncOverwriteDialog::~SyncOverwriteDialog()
+{
+  delete ui;
+}
+
+
+void SyncOverwriteDialog::readTree(const QString &path, DirectoryEntry *directoryStructure, QTreeWidgetItem *subTree)
+{
+  QDir overwrite(path);
+  overwrite.setFilter(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
+  QDirIterator dirIter(overwrite);
+  while (dirIter.hasNext()) {
+    dirIter.next();
+    QFileInfo fileInfo = dirIter.fileInfo();
+
+    QString file = fileInfo.fileName();
+    if (file == "meta.ini") {
+      continue;
+    }
+
+    QTreeWidgetItem *newItem = new QTreeWidgetItem(subTree, QStringList(file));
+
+    if (fileInfo.isDir()) {
+      DirectoryEntry *subDir = directoryStructure->findSubDirectory(ToWString(file));
+      if (subDir != NULL) {
+        readTree(fileInfo.absoluteFilePath(), subDir, newItem);
+      } else {
+        qCritical("no directory structure for %s?", file.toUtf8().constData());
+        delete newItem;
+        newItem = NULL;
+      }
+    } else {
+      const FileEntry *entry = directoryStructure->findFile(ToWString(file));
+      QComboBox* combo = new QComboBox(ui->syncTree);
+      combo->addItem(tr("<don't sync>"), -1);
+      if (entry != NULL) {
+        const std::vector<int> &alternatives = entry->getAlternatives();
+        for (std::vector<int>::const_iterator iter = alternatives.begin(); iter != alternatives.end(); ++iter) {
+          combo->addItem(ToQString(m_DirectoryStructure->getOriginByID(*iter).getName()), *iter);
+        }
+        combo->setCurrentIndex(combo->count() - 1);
+      } else {
+        combo->setCurrentIndex(0);
+      }
+      ui->syncTree->setItemWidget(newItem, 1, combo);
+    }
+    if (newItem != NULL) {
+      subTree->addChild(newItem);
+    }
+  }
+}
+
+
+void SyncOverwriteDialog::refresh(const QString &path, DirectoryEntry *directoryStructure)
+{
+  QTreeWidgetItem *rootItem = new QTreeWidgetItem(ui->syncTree, QStringList("<data>"));
+  readTree(path, directoryStructure, rootItem);
+  ui->syncTree->addTopLevelItem(rootItem);
+  ui->syncTree->expandAll();
+}
+
+
+void SyncOverwriteDialog::applyTo(QTreeWidgetItem *item, const QString &path, const QString &modDirectory)
+{
+  for (int i = 0; i < item->childCount(); ++i) {
+    QTreeWidgetItem *child = item->child(i);
+    QString filePath;
+    if (path.length() != 0) {
+      filePath = path.mid(0).append("/").append(child->text(0));
+    } else {
+      filePath = child->text(0);
+    }
+    if (child->childCount() != 0) {
+      applyTo(child, filePath, modDirectory);
+    } else {
+      QComboBox *comboBox = qobject_cast<QComboBox*>(ui->syncTree->itemWidget(child, 1));
+      if (comboBox != NULL) {
+        int originID = comboBox->itemData(comboBox->currentIndex(), Qt::UserRole).toInt();
+        if (originID != -1) {
+          FilesOrigin &origin = m_DirectoryStructure->getOriginByID(originID);
+          QString source = m_SourcePath.mid(0).append("/").append(filePath);
+          QString destination = modDirectory.mid(0).append("/").append(ToQString(origin.getName())).append("/").append(filePath);
+          if (!QFile::remove(destination)) {
+            reportError(tr("failed to remove %1").arg(destination));
+          } else if (!QFile::rename(source, destination)) {
+            reportError(tr("failed to move %1 to %2").arg(source).arg(destination));
+          }
+        }
+      }
+    }
+  }
+}
+
+
+void SyncOverwriteDialog::apply(const QString &modDirectory)
+{
+  applyTo(ui->syncTree->topLevelItem(0), "", modDirectory);
+}