Formatting pass

Author: Silarn

src/modinfooverwrite.cpp

@@ -3,9 +3,9 @@
 #include "settings.h"
 #include "shared/appconfig.h"
 
+#include "organizercore.h"
 #include <QApplication>
 #include <QDirIterator>
-#include "organizercore.h"
 
 ModInfoOverwrite::ModInfoOverwrite(OrganizerCore& core) : ModInfoWithConflictInfo(core)
 {}
@@ -31,7 +31,7 @@ bool ModInfoOverwrite::isEmpty() const
     if (iter.fileInfo().isFile() && iter.fileName() != "meta.ini")
       return false;
   }
-  
+
   return true;
 }
 

src/modlist.cpp

@@ -1044,7 +1044,8 @@ bool ModList::dropLocalFiles(const ModListDropInfo& dropInfo, int row,
               auto entry         = dirIter.nextFileInfo();
               QString sourceFile = entry.canonicalFilePath();
 
-              QFileInfo targetInfo(modDir.absoluteFilePath(overDir.relativeFilePath(entry.absoluteFilePath())));
+              QFileInfo targetInfo(modDir.absoluteFilePath(
+                  overDir.relativeFilePath(entry.absoluteFilePath())));
               sourceList << sourceFile;
               targetList << targetInfo.absoluteFilePath();
               relativePathList << QPair<QString, QString>(localUrl.relativePath,

src/modlistviewactions.cpp

@@ -1308,8 +1308,9 @@ void ModListViewActions::moveOverwriteContentsTo(const QString& absolutePath) co
       auto entry = iter.nextFileInfo();
       if (entry.isDir() && m_core.managedGame()->getModMappings().keys().contains(
                                entry.fileName(), Qt::CaseInsensitive)) {
-        successful = shellCopy((QDir::toNativeSeparators(entry.absolutePath())),
-                  (QDir::toNativeSeparators(absolutePath)), false, m_parent);
+        successful =
+            shellCopy((QDir::toNativeSeparators(entry.absolutePath())),
+                      (QDir::toNativeSeparators(absolutePath)), false, m_parent);
         QDirIterator subDirIter(entry.absoluteFilePath(),
                                 QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot);
         while (subDirIter.hasNext()) {
@@ -1321,8 +1322,9 @@ void ModListViewActions::moveOverwriteContentsTo(const QString& absolutePath) co
           }
         }
       } else {
-        successful = shellMove((QDir::toNativeSeparators(iter.filePath())),
-                  (QDir::toNativeSeparators(absolutePath)), false, m_parent);
+        successful =
+            shellMove((QDir::toNativeSeparators(iter.filePath())),
+                      (QDir::toNativeSeparators(absolutePath)), false, m_parent);
       }
       if (!successful)
         break;
@@ -1427,8 +1429,8 @@ void ModListViewActions::clearOverwrite() const
             tr("About to recursively delete:\n") + overwriteDir.absolutePath(),
             QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok) {
       QStringList delList;
-      for (auto f :
-           overwriteDir.entryInfoList(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot)) {
+      for (auto f : overwriteDir.entryInfoList(QDir::AllDirs | QDir::Files |
+                                               QDir::NoDotAndDotDot)) {
         if (f.isDir() && m_core.managedGame()->getModMappings().keys().contains(
                              f.fileName(), Qt::CaseInsensitive)) {
           for (auto sf :

src/overwriteinfodialog.cpp

@@ -28,7 +28,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace MOBase;
 
-OverwriteInfoDialog::OverwriteInfoDialog(ModInfo::Ptr modInfo, OrganizerCore &organizer,
+OverwriteInfoDialog::OverwriteInfoDialog(ModInfo::Ptr modInfo, OrganizerCore& organizer,
                                          QWidget* parent)
     : QDialog(parent), m_Organizer(organizer), ui(new Ui::OverwriteInfoDialog),
       m_FileSystemModel(nullptr), m_DeleteAction(nullptr), m_RenameAction(nullptr),
@@ -144,7 +144,9 @@ void OverwriteInfoDialog::delete_activated()
         return;
       } else if (selection->selectedRows().count() == 1) {
         for (auto modDir : m_Organizer.managedGame()->getModMappings().keys()) {
-          if (root.absoluteFilePath(modDir).compare(m_FileSystemModel->filePath(selection->selectedRows().at(0)), Qt::CaseInsensitive) == 0) {
+          if (root.absoluteFilePath(modDir).compare(
+                  m_FileSystemModel->filePath(selection->selectedRows().at(0)),
+                  Qt::CaseInsensitive) == 0) {
             return;
           }
         }
@@ -167,9 +169,8 @@ void OverwriteInfoDialog::delete_activated()
 
       foreach (QModelIndex index, selection->selectedRows()) {
         for (auto modDir : m_Organizer.managedGame()->getModMappings().keys()) {
-          if (root.absoluteFilePath(modDir).compare(
-                  m_FileSystemModel->filePath(index),
-                  Qt::CaseInsensitive) == 0) {
+          if (root.absoluteFilePath(modDir).compare(m_FileSystemModel->filePath(index),
+                                                    Qt::CaseInsensitive) == 0) {
             return;
           }
         }
@@ -209,9 +210,8 @@ void OverwriteInfoDialog::deleteTriggered()
 
   foreach (QModelIndex index, m_FileSelection) {
     for (auto modDir : m_Organizer.managedGame()->getModMappings().keys()) {
-      if (root.absoluteFilePath(modDir).compare(
-              m_FileSystemModel->filePath(index),
-              Qt::CaseInsensitive) == 0) {
+      if (root.absoluteFilePath(modDir).compare(m_FileSystemModel->filePath(index),
+                                                Qt::CaseInsensitive) == 0) {
         return;
       }
     }

src/overwriteinfodialog.h

@@ -36,7 +36,7 @@ class OverwriteFileSystemModel : public QFileSystemModel
   Q_OBJECT;
 
 public:
-  OverwriteFileSystemModel(QObject* parent, OrganizerCore &organizer)
+  OverwriteFileSystemModel(QObject* parent, OrganizerCore& organizer)
       : QFileSystemModel(parent), m_Organizer(organizer), m_RegularColumnCount(0)
   {}
 
@@ -73,7 +73,7 @@ class OverwriteFileSystemModel : public QFileSystemModel
   }
 
   virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row,
-    int column, const QModelIndex& parent)
+                            int column, const QModelIndex& parent)
   {
     ModListDropInfo dropInfo(data, m_Organizer);
     if (dropInfo.isLocalFileDrop()) {
@@ -92,15 +92,16 @@ class OverwriteFileSystemModel : public QFileSystemModel
 private:
   mutable int m_RegularColumnCount;
 
-  OrganizerCore &m_Organizer;
+  OrganizerCore& m_Organizer;
 };
 
 class OverwriteInfoDialog : public QDialog
 {
   Q_OBJECT
 
 public:
-  explicit OverwriteInfoDialog(ModInfo::Ptr modInfo, OrganizerCore &organizer, QWidget* parent = 0);
+  explicit OverwriteInfoDialog(ModInfo::Ptr modInfo, OrganizerCore& organizer,
+                               QWidget* parent = 0);
   ~OverwriteInfoDialog();
 
   ModInfo::Ptr modInfo() const { return m_ModInfo; }
@@ -143,7 +144,7 @@ private slots:
   QAction* m_NewFolderAction;
 
   ModInfo::Ptr m_ModInfo;
-  OrganizerCore &m_Organizer;
+  OrganizerCore& m_Organizer;
 };
 
 #endif  // OVERWRITEINFODIALOG_H

src/pluginlist.cpp

@@ -156,8 +156,8 @@ void PluginList::highlightPlugins(const std::vector<unsigned int>& modIndices,
       QStringList plugins;
       if (dir.exists()) {
         plugins = dir.entryList(QStringList() << "*.esp"
-                                                          << "*.esm"
-                                                          << "*.esl");
+                                              << "*.esm"
+                                              << "*.esl");
       }
       const MOShared::FilesOrigin& origin =
           directoryEntry.getOriginByName(selectedMod->internalName().toStdWString());

src/savestab.cpp

@@ -3,8 +3,8 @@
 #include "organizercore.h"
 #include "ui_mainwindow.h"
 #include <iplugingame.h>
-#include <localsavegames.h>
 #include <isavegameinfowidget.h>
+#include <localsavegames.h>
 
 using namespace MOBase;
 
@@ -136,7 +136,8 @@ QDir SavesTab::currentSavesDir() const
   } else {
     auto iniFiles = m_core.managedGame()->iniFiles();
 
-    if (iniFiles.isEmpty() || m_core.gameFeatures().gameFeature<LocalSavegames>() == nullptr) {
+    if (iniFiles.isEmpty() ||
+        m_core.gameFeatures().gameFeature<LocalSavegames>() == nullptr) {
       return m_core.managedGame()->savesDirectory();
     }
 

src/shared/directoryentry.cpp

@@ -24,9 +24,9 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "originconnection.h"
 #include "util.h"
 #include "windows_error.h"
+#include <filesystem>
 #include <log.h>
 #include <utility.h>
-#include <filesystem>
 
 namespace MOShared
 {
@@ -646,7 +646,6 @@ void DirectoryEntry::addFiles(env::DirectoryWalker& walker, FilesOrigin& origin,
           onFile((Context*)pcx, path, ft);
         });
   }
-
 }
 
 void DirectoryEntry::onDirectoryStart(Context* cx, std::wstring_view path)