From 5e5c9c07291f6b09623d31c92b1fb61c4ede576e Mon Sep 17 00:00:00 2001
From: Sandro Jäckel <sandro.jaeckel@gmail.com>
Date: Thu, 22 Feb 2018 16:54:34 +0100
Subject: Applied clang-format on source

---
 src/modinfowithconflictinfo.h | 62 +++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 38 deletions(-)

(limited to 'src/modinfowithconflictinfo.h')

diff --git a/src/modinfowithconflictinfo.h b/src/modinfowithconflictinfo.h
index be31f20f..05ee6ee1 100644
--- a/src/modinfowithconflictinfo.h
+++ b/src/modinfowithconflictinfo.h
@@ -5,60 +5,46 @@
 
 #include <QTime>
 
-class ModInfoWithConflictInfo : public ModInfo
-{
+class ModInfoWithConflictInfo : public ModInfo {
 
 public:
+    ModInfoWithConflictInfo(MOShared::DirectoryEntry** directoryStructure);
 
-  ModInfoWithConflictInfo(MOShared::DirectoryEntry **directoryStructure);
+    std::vector<ModInfo::EFlag> getFlags() const;
 
-  std::vector<ModInfo::EFlag> getFlags() const;
+    /**
+     * @brief clear all caches held for this mod
+     */
+    virtual void clearCaches();
 
-  /**
-   * @brief clear all caches held for this mod
-   */
-  virtual void clearCaches();
+    virtual std::set<unsigned int> getModOverwrite() { return m_OverwriteList; }
 
-  virtual std::set<unsigned int> getModOverwrite() { return m_OverwriteList; }
+    virtual std::set<unsigned int> getModOverwritten() { return m_OverwrittenList; }
 
-  virtual std::set<unsigned int> getModOverwritten() { return m_OverwrittenList; }
-
-  virtual void doConflictCheck() const;
+    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 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 this mod is completely replaced by others
+     */
+    bool isRedundant() const;
 
 private:
+    MOShared::DirectoryEntry** m_DirectoryStructure;
 
-  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 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
 };
 
-
-
 #endif // MODINFOWITHCONFLICTINFO_H
-- 
cgit v1.3.1