Applied clang-format on source

1 files changed, 130 insertions, 142 deletions

diff --git a/src/categories.h b/src/categories.h
index 66299c30..0ed627d1 100644
--- a/src/categories.h
+++ b/src/categories.h
@@ -20,12 +20,10 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CATEGORIES_H

 #define CATEGORIES_H

 

-

 #include <QString>

-#include <vector>

-#include <map>

 #include <functional>

-

+#include <map>

+#include <vector>

 

 /**

  * @brief Manage the available mod categories

@@ -34,180 +32,170 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
  **/

 class CategoryFactory {

 

-  friend class CategoriesDialog;

+    friend class CategoriesDialog;

 

 public:

+    static const int CATEGORY_NONE = 0;

 

-  static const int CATEGORY_NONE = 0;

-

-  static const int CATEGORY_SPECIAL_FIRST = 10000;

-  static const int CATEGORY_SPECIAL_CHECKED = CATEGORY_SPECIAL_FIRST;

-  static const int CATEGORY_SPECIAL_UNCHECKED = 10001;

-  static const int CATEGORY_SPECIAL_UPDATEAVAILABLE = 10002;

-  static const int CATEGORY_SPECIAL_NOCATEGORY = 10003;

-  static const int CATEGORY_SPECIAL_CONFLICT = 10004;

-  static const int CATEGORY_SPECIAL_NOTENDORSED = 10005;

-  static const int CATEGORY_SPECIAL_MANAGED = 10006;

-  static const int CATEGORY_SPECIAL_UNMANAGED = 10007;

+    static const int CATEGORY_SPECIAL_FIRST = 10000;

+    static const int CATEGORY_SPECIAL_CHECKED = CATEGORY_SPECIAL_FIRST;

+    static const int CATEGORY_SPECIAL_UNCHECKED = 10001;

+    static const int CATEGORY_SPECIAL_UPDATEAVAILABLE = 10002;

+    static const int CATEGORY_SPECIAL_NOCATEGORY = 10003;

+    static const int CATEGORY_SPECIAL_CONFLICT = 10004;

+    static const int CATEGORY_SPECIAL_NOTENDORSED = 10005;

+    static const int CATEGORY_SPECIAL_MANAGED = 10006;

+    static const int CATEGORY_SPECIAL_UNMANAGED = 10007;

 

 public:

+    struct Category {

+        Category(int sortValue, int id, const QString& name, const std::vector<int>& nexusIDs, int parentID)

+            : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false), m_NexusIDs(nexusIDs),

+              m_ParentID(parentID) {}

+        int m_SortValue;

+        int m_ID;

+        int m_ParentID;

+        bool m_HasChildren;

+        QString m_Name;

+        std::vector<int> m_NexusIDs;

 

-  struct Category {

-    Category(int sortValue, int id, const QString &name, const std::vector<int> &nexusIDs, int parentID)

-      : m_SortValue(sortValue), m_ID(id), m_Name(name), m_HasChildren(false),

-        m_NexusIDs(nexusIDs), m_ParentID(parentID) {}

-    int m_SortValue;

-    int m_ID;

-    int m_ParentID;

-    bool m_HasChildren;

-    QString m_Name;

-    std::vector<int> m_NexusIDs;

-

-    friend bool operator<(const Category &LHS, const Category &RHS) {

-      return LHS.m_SortValue < RHS.m_SortValue;

-    }

-  };

+        friend bool operator<(const Category& LHS, const Category& RHS) { return LHS.m_SortValue < RHS.m_SortValue; }

+    };

 

 public:

+    /**

+     * @brief reset the list of categories

+     **/

+    void reset();

 

-  /**

-   * @brief reset the list of categories

-   **/

-  void reset();

-

-  /**

-   * @brief read categories from file

-   */

-  void loadCategories();

+    /**

+     * @brief read categories from file

+     */

+    void loadCategories();

 

-  /**

-   * @brief save the categories to the categories.dat file

-   **/

-  void saveCategories();

+    /**

+     * @brief save the categories to the categories.dat file

+     **/

+    void saveCategories();

 

-  int addCategory(const QString &name, const std::vector<int> &nexusIDs, int parentID);

+    int addCategory(const QString& name, const std::vector<int>& nexusIDs, int parentID);

 

-  /**

-   * @brief retrieve the number of available categories

-   *

-   * @return unsigned int number of categories

-   **/

-   size_t numCategories() const { return m_Categories.size(); }

+    /**

+     * @brief retrieve the number of available categories

+     *

+     * @return unsigned int number of categories

+     **/

+    size_t numCategories() const { return m_Categories.size(); }

 

-  /**

-   * @brief count all categories that match a specified filter

-   * @param filter the filter to test

-   * @return number of matching categories

-   */

-  unsigned int countCategories(std::tr1::function<bool (const Category &category)> filter);

+    /**

+     * @brief count all categories that match a specified filter

+     * @param filter the filter to test

+     * @return number of matching categories

+     */

+    unsigned int countCategories(std::tr1::function<bool(const Category& category)> filter);

 

-  /**

-   * @brief get the id of the parent category

-   *

-   * @param index the index to look up

-   * @return int id of the parent category

-   **/

-  int getParentID(unsigned int index) const;

+    /**

+     * @brief get the id of the parent category

+     *

+     * @param index the index to look up

+     * @return int id of the parent category

+     **/

+    int getParentID(unsigned int index) const;

 

-  /**

-   * @brief determine if a category exists (by id)

-   *

-   * @param id the id to check for existance

-   * @return true if the category exists, false otherwise

-   **/

-  bool categoryExists(int id) const;

+    /**

+     * @brief determine if a category exists (by id)

+     *

+     * @param id the id to check for existance

+     * @return true if the category exists, false otherwise

+     **/

+    bool categoryExists(int id) const;

 

-  /**

-   * @brief test if a category is child of a second one

-   * @param id       the presumed child id

-   * @param parentID the parent id to test for

-   * @return true if id is a child of parentID

-   **/

-  bool isDecendantOf(int id, int parentID) const;

+    /**

+     * @brief test if a category is child of a second one

+     * @param id       the presumed child id

+     * @param parentID the parent id to test for

+     * @return true if id is a child of parentID

+     **/

+    bool isDecendantOf(int id, int parentID) const;

 

-  /**

-   * @brief test if the specified category has child categories

-   *

-   * @param index index of the category to look up

-   * @return bool true if the category has child categories

-   **/

-  bool hasChildren(unsigned int index) const;

+    /**

+     * @brief test if the specified category has child categories

+     *

+     * @param index index of the category to look up

+     * @return bool true if the category has child categories

+     **/

+    bool hasChildren(unsigned int index) const;

 

-  /**

-   * @brief retrieve the name of a category

-   *

-   * @param index index of the category to look up

-   * @return QString name of the category

-   **/

-  QString getCategoryName(unsigned int index) const;

+    /**

+     * @brief retrieve the name of a category

+     *

+     * @param index index of the category to look up

+     * @return QString name of the category

+     **/

+    QString getCategoryName(unsigned int index) const;

 

-  /**

-   * @brief look up the id of a category by its index

-   *

-   * @param index index of the category to look up

-   * @return int id of the category

-   **/

-  int getCategoryID(unsigned int index) const;

+    /**

+     * @brief look up the id of a category by its index

+     *

+     * @param index index of the category to look up

+     * @return int id of the category

+     **/

+    int getCategoryID(unsigned int index) const;

 

-  /**

-   * @brief look up the id of a category by its name

-   * @note O(n)

-   */

-  int getCategoryID(const QString &name) const;

+    /**

+     * @brief look up the id of a category by its name

+     * @note O(n)

+     */

+    int getCategoryID(const QString& name) const;

 

-  /**

-   * @brief look up the index of a category by its id

-   *

-   * @param id index of the category to look up

-   * @return unsigned int index of the category

-   **/

-  int getCategoryIndex(int ID) const;

+    /**

+     * @brief look up the index of a category by its id

+     *

+     * @param id index of the category to look up

+     * @return unsigned int index of the category

+     **/

+    int getCategoryIndex(int ID) const;

 

-  /**

-   * @brief retrieve the index of a category by its nexus id

-   *

-   * @param nexusID nexus id of the category to look up

-   * @return unsigned int index of the category or 0 if no category matches

-   **/

-  unsigned int resolveNexusID(int nexusID) const;

+    /**

+     * @brief retrieve the index of a category by its nexus id

+     *

+     * @param nexusID nexus id of the category to look up

+     * @return unsigned int index of the category or 0 if no category matches

+     **/

+    unsigned int resolveNexusID(int nexusID) const;

 

 public:

+    /**

+     * @brief retrieve a reference to the singleton instance

+     *

+     * @return the reference to the singleton

+     **/

+    static CategoryFactory& instance();

 

-  /**

-   * @brief retrieve a reference to the singleton instance

-   *

-   * @return the reference to the singleton

-   **/

-  static CategoryFactory &instance();

-

-  /**

-   * @return path to the file that contains the categories list

-   */

-  static QString categoriesFilePath();

+    /**

+     * @return path to the file that contains the categories list

+     */

+    static QString categoriesFilePath();

 

 private:

+    CategoryFactory();

 

-  CategoryFactory();

-

-  void loadDefaultCategories();

+    void loadDefaultCategories();

 

-  void addCategory(int id, const QString &name, const std::vector<int> &nexusID, int parentID);

+    void addCategory(int id, const QString& name, const std::vector<int>& nexusID, int parentID);

 

-  void setParents();

+    void setParents();

 

-  static void cleanup();

+    static void cleanup();

 

 private:

+    static CategoryFactory* s_Instance;

 

-  static CategoryFactory *s_Instance;

-

-  std::vector<Category> m_Categories;

-  std::map<int, unsigned int> m_IDMap;

-  std::map<int, unsigned int> m_NexusMap;

+    std::vector<Category> m_Categories;

+    std::map<int, unsigned int> m_IDMap;

+    std::map<int, unsigned int> m_NexusMap;

 

 private:

-

 };

 

-

 #endif // CATEGORIES_H