Revert "Applied clang-format on source"

This reverts commit 5e5c9c07291f6b09623d31c92b1fb61c4ede576e.

1 files changed, 113 insertions, 98 deletions

diff --git a/src/syncoverwritedialog.cpp b/src/syncoverwritedialog.cpp
index 3220f356..f03e29c5 100644
--- a/src/syncoverwritedialog.cpp
+++ b/src/syncoverwritedialog.cpp
@@ -20,133 +20,148 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "syncoverwritedialog.h"

 

 #include "ui_syncoverwritedialog.h"

-#include <report.h>

 #include <utility.h>

+#include <report.h>

 

-#include <QComboBox>

 #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);

 

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

-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)

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

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

+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);

+

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

+#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)

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

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

 #else

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

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

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

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

 #endif

 }

 

-SyncOverwriteDialog::~SyncOverwriteDialog() { delete ui; }

 

-static void addToComboBox(QComboBox* box, const QString& name, const QVariant& userData) {

-    if (QString::compare(name, "overwrite", Qt::CaseInsensitive) != 0) {

-        box->addItem(name, userData);

-    }

+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;

-        }

+static void addToComboBox(QComboBox *box, const QString &name, const QVariant &userData)

+{

+  if (QString::compare(name, "overwrite", Qt::CaseInsensitive) != 0) {

+    box->addItem(name, userData);

+  }

+}

 

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

 

-        if (fileInfo.isDir()) {

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

-            if (subDir != nullptr) {

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

-            } else {

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

-                delete newItem;

-                newItem = nullptr;

-            }

-        } else {

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

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

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

-            if (entry.get() != nullptr) {

-                bool ignore;

-                int origin = entry->getOrigin(ignore);

-                addToComboBox(combo, ToQString(m_DirectoryStructure->getOriginByID(origin).getName()), origin);

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

-                for (std::vector<std::pair<int, std::wstring>>::const_iterator iter = alternatives.begin();

-                     iter != alternatives.end(); ++iter) {

-                    addToComboBox(combo, ToQString(m_DirectoryStructure->getOriginByID(iter->first).getName()),

-                                  iter->first);

-                }

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

-            } else {

-                combo->setCurrentIndex(0);

-            }

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

-        }

-        if (newItem != nullptr) {

-            subTree->addChild(newItem);

+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 != nullptr) {

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

+      } else {

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

+        delete newItem;

+        newItem = nullptr;

+      }

+    } else {

+      const FileEntry::Ptr entry = directoryStructure->findFile(ToWString(file));

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

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

+      if (entry.get() != nullptr) {

+        bool ignore;

+        int origin = entry->getOrigin(ignore);

+        addToComboBox(combo, ToQString(m_DirectoryStructure->getOriginByID(origin).getName()), origin);

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

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

+          addToComboBox(combo, ToQString(m_DirectoryStructure->getOriginByID(iter->first).getName()), iter->first);

         }

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

+      } else {

+        combo->setCurrentIndex(0);

+      }

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

     }

+    if (newItem != nullptr) {

+      subTree->addChild(newItem);

+    }

+  }

 }

 

-void SyncOverwriteDialog::refresh(const QString& path) {

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

-    readTree(path, m_DirectoryStructure, rootItem);

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

-    ui->syncTree->expandAll();

+

+void SyncOverwriteDialog::refresh(const QString &path)

+{

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

+  readTree(path, m_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 + "/" + 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 != nullptr) {

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

-                if (originID != -1) {

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

-                    QString source = m_SourcePath + "/" + filePath;

-                    QString destination = modDirectory + "/" + ToQString(origin.getName()) + "/" + 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::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 + "/" + 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 != nullptr) {

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

+        if (originID != -1) {

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

+          QString source = m_SourcePath + "/" + filePath;

+          QString destination = modDirectory + "/" + ToQString(origin.getName()) + "/" + 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));

+          }

         }

+      }

     }

+  }

 

-    QDir dir(m_SourcePath + "/" + path);

-    if ((path.length() > 0) && (dir.count() == 2)) {

-        dir.rmpath(".");

-    }

+  QDir dir(m_SourcePath + "/" + path);

+  if ((path.length() > 0) && (dir.count() == 2)) {

+    dir.rmpath(".");

+  }

 }

 

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

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

+

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

+{

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

 }