Revert "Applied clang-format on source"

This reverts commit 5e5c9c07291f6b09623d31c92b1fb61c4ede576e.

1 files changed, 38 insertions, 24 deletions

diff --git a/src/modinfowithconflictinfo.h b/src/modinfowithconflictinfo.h
index 05ee6ee1..be31f20f 100644
--- a/src/modinfowithconflictinfo.h
+++ b/src/modinfowithconflictinfo.h
@@ -5,46 +5,60 @@
 
 #include <QTime>
 
-class ModInfoWithConflictInfo : public ModInfo {
+class ModInfoWithConflictInfo : public ModInfo
+{
 
 public:
-    ModInfoWithConflictInfo(MOShared::DirectoryEntry** directoryStructure);
 
-    std::vector<ModInfo::EFlag> getFlags() const;
+  ModInfoWithConflictInfo(MOShared::DirectoryEntry **directoryStructure);
 
-    /**
-     * @brief clear all caches held for this mod
-     */
-    virtual void clearCaches();
+  std::vector<ModInfo::EFlag> getFlags() const;
 
-    virtual std::set<unsigned int> getModOverwrite() { return m_OverwriteList; }
+  /**
+   * @brief clear all caches held for this mod
+   */
+  virtual void clearCaches();
 
-    virtual std::set<unsigned int> getModOverwritten() { return m_OverwrittenList; }
+  virtual std::set<unsigned int> getModOverwrite() { return m_OverwriteList; }
 
-    virtual void doConflictCheck() const;
+  virtual std::set<unsigned int> getModOverwritten() { return m_OverwrittenList; }
+
+  virtual void doConflictCheck() const;
 
 private:
-    enum EConflictType { CONFLICT_NONE, CONFLICT_OVERWRITE, CONFLICT_OVERWRITTEN, CONFLICT_MIXED, CONFLICT_REDUNDANT };
+
+  enum EConflictType {
+    CONFLICT_NONE,
+    CONFLICT_OVERWRITE,
+    CONFLICT_OVERWRITTEN,
+    CONFLICT_MIXED,
+    CONFLICT_REDUNDANT
+  };
 
 private:
-    /**
-     * @return true if there is a conflict for files in this mod
-     */
-    EConflictType isConflicted() const;
 
-    /**
-     * @return true if this mod is completely replaced by others
-     */
-    bool isRedundant() const;
+  /**
+   * @return true if there is a conflict for files in this mod
+   */
+  EConflictType isConflicted() const;
+
+  /**
+   * @return true if this mod is completely replaced by others
+   */
+  bool isRedundant() const;
 
 private:
-    MOShared::DirectoryEntry** m_DirectoryStructure;
 
-    mutable EConflictType m_CurrentConflictState;
-    mutable QTime m_LastConflictCheck;
+  MOShared::DirectoryEntry **m_DirectoryStructure;
+
+  mutable EConflictType m_CurrentConflictState;
+  mutable QTime m_LastConflictCheck;
+
+  mutable std::set<unsigned int> m_OverwriteList;   // indices of mods overritten by this mod
+  mutable std::set<unsigned int> m_OverwrittenList; // indices of mods overwriting this mod
 
-    mutable std::set<unsigned int> m_OverwriteList;   // indices of mods overritten by this mod
-    mutable std::set<unsigned int> m_OverwrittenList; // indices of mods overwriting this mod
 };
 
+
+
 #endif // MODINFOWITHCONFLICTINFO_H