Formatting

include/Managers/ActionManager.h

@@ -11,33 +11,35 @@
 
 namespace Managers
 {
-    class ActionManager
-    {
-    public:
-        ActionManager(char**, int);
 
-        Models::IcarusAction retrieveIcarusAction() const;
-    private:
-        constexpr std::array<const char*, 12> supportedFlags() noexcept;
-        constexpr std::array<const char*, 4> supportedActions() noexcept;
+class ActionManager
+{
+public:
+    ActionManager(char**, int);
 
-        bool isNumber(const std::string_view) noexcept;
+    Models::IcarusAction retrieveIcarusAction() const;
+private:
+    constexpr std::array<const char*, 12> supportedFlags() noexcept;
+    constexpr std::array<const char*, 4> supportedActions() noexcept;
 
-        void initialize();
-        void validateFlags();
+    bool isNumber(const std::string_view) noexcept;
 
-        std::vector<std::string> parsedFlags();
+    void initialize();
+    void validateFlags();
 
-        void printAction() noexcept;
-        void printFlags() noexcept;
+    std::vector<std::string> parsedFlags();
 
-        std::string action;
-        
-        std::vector<Models::Flags> flags;
+    void printAction() noexcept;
+    void printFlags() noexcept;
+
+    std::string action;
+    
+    std::vector<Models::Flags> flags;
+
+    char **params;
+    int paramCount;
+};
 
-        char **params;
-        int paramCount;
-    };
 }
 
 #endif

include/Managers/CommitManager.h

@@ -10,40 +10,42 @@
 
 namespace Managers
 {
-    class CommitManager
+
+class CommitManager
+{
+public:
+    CommitManager(Models::IcarusAction&);
+
+    void commitAction();
+
+    enum class RetrieveTypes
     {
-    public:
-        CommitManager(Models::IcarusAction&);
-
-        void commitAction();
-
-        enum class RetrieveTypes
-        {
-            songs
-        };
-
-    private:
-        enum class ActionValues;
-
-        std::map<std::string, ActionValues> mapActions() noexcept;
-
-        Models::Token parseToken(Models::API);
-
-        void deleteSong();
-        void downloadSong();
-        void retrieveObjects();
-        void uploadSong();
-
-        enum class ActionValues
-        {
-            deleteAct,
-            downloadAct,
-            retrieveAct,
-            uploadAct
-        };
-
-        Models::IcarusAction icaAction;
+        songs
     };
+
+private:
+    enum class ActionValues;
+
+    std::map<std::string, ActionValues> mapActions() noexcept;
+
+    Models::Token parseToken(Models::API);
+
+    void deleteSong();
+    void downloadSong();
+    void retrieveObjects();
+    void uploadSong();
+
+    enum class ActionValues
+    {
+        deleteAct,
+        downloadAct,
+        retrieveAct,
+        uploadAct
+    };
+
+    Models::IcarusAction icaAction;
+};
+
 }
 
 #endif

include/Managers/FileManager.h

@@ -5,25 +5,27 @@
 
 namespace Managers
 {
-    class FileManager
-    {
-    public:
-        FileManager();
-        FileManager(std::string);
 
-        void saveFile(std::string);
-        void modifyFilePath(std::string);
+class FileManager
+{
+public:
+    FileManager();
+    FileManager(std::string);
 
-        char* retrieveFileBuffer() const;
-        int retrieveFileBufferLength() const;
-    private:
-        void readFile();
+    void saveFile(std::string);
+    void modifyFilePath(std::string);
+
+    char* retrieveFileBuffer() const;
+    int retrieveFileBufferLength() const;
+private:
+    void readFile();
+
+    std::string filePath;
+    char* fileBuffer;
+    bool fileRead;
+    int fileBufferLength;
+};
 
-        std::string filePath;
-        char* fileBuffer;
-        bool fileRead;
-        int fileBufferLength;
-    };
 }
 
 #endif

include/Managers/TokenManager.h

@@ -7,17 +7,19 @@
 
 namespace Managers
 {
-    class TokenManager
-    {
-    public:
-        TokenManager(const Models::User&);
-        TokenManager(const Models::User&, Models::API&);
 
-        Models::Token requestToken();
-    private:
-        Models::API api;
-        Models::User user;
-    };
+class TokenManager
+{
+public:
+    TokenManager(const Models::User&);
+    TokenManager(const Models::User&, Models::API&);
+
+    Models::Token requestToken();
+private:
+    Models::API api;
+    Models::User user;
+};
+
 }
 
 #endif

include/Managers/UserManager.h

@@ -8,19 +8,21 @@
 
 namespace Managers
 {
-    class UserManager
-    {
-    public:
-        UserManager(Models::User);
-        UserManager(const Models::IcarusAction);
 
-        Models::User retrieveUser() const;
-    private:
-        void parseUserFromActions();
+class UserManager
+{
+public:
+    UserManager(Models::User);
+    UserManager(const Models::IcarusAction);
+
+    Models::User retrieveUser() const;
+private:
+    void parseUserFromActions();
+
+    Models::User user;
+    Models::IcarusAction icaAction;
+};
 
-        Models::User user;
-        Models::IcarusAction icaAction;
-    };
 }
 
 #endif

include/Models/API.h

@@ -5,12 +5,15 @@
 
 namespace Models
 {
-    struct API
-    {
-        std::string url;
-        std::string endpoint;
-        std::string version;
-    };
+
+class API
+{
+public:
+    std::string url;
+    std::string endpoint;
+    std::string version;
+};
+
 }
 
 #endif

include/Models/Flags.h

@@ -5,11 +5,13 @@
 
 namespace Models
 {
-    struct Flags
-    {
-        std::string flag;
-        std::string value;
-    };
+
+struct Flags
+{
+    std::string flag;
+    std::string value;
+};
+
 }
 
 #endif

include/Models/IcarusAction.h

@@ -8,11 +8,13 @@
 
 namespace Models
 {
-    struct IcarusAction
-    {
-        std::string action;
-        std::vector<Flags> flags;
-    };
+
+struct IcarusAction
+{
+    std::string action;
+    std::vector<Flags> flags;
+};
+
 }
 
 #endif

include/Models/Song.h

@@ -6,19 +6,21 @@
 
 namespace Models
 {
-    struct Song
-    {
-        int id;
-        std::string title;
-        std::string artist;
-        std::string album;
-        std::string genre;
-        int year;
-        int duration;
-        int track;
-        std::string data;
-        std::string songPath;
-    };
+
+struct Song
+{
+    int id;
+    std::string title;
+    std::string artist;
+    std::string album;
+    std::string genre;
+    int year;
+    int duration;
+    int track;
+    std::string data;
+    std::string songPath;
+};
+
 } 
 
 #endif

include/Models/Token.h

@@ -5,12 +5,14 @@
 
 namespace Models
 {
-    struct Token
-    {
-        std::string accessToken;
-        std::string tokenType;
-        int expiration;
-    };
+
+struct Token
+{
+    std::string accessToken;
+    std::string tokenType;
+    int expiration;
+};
+
 }
 
 #endif

include/Models/UploadForm.h

@@ -6,11 +6,13 @@
 
 namespace Models
 {
-    struct UploadForm
-    {
-        std::string url;
-        std::string filePath;
-    };
+
+struct UploadForm
+{
+    std::string url;
+    std::string filePath;
+};
+
 } 
 
 #endif

include/Models/User.h

@@ -5,11 +5,13 @@
 
 namespace Models
 {
-    struct User
-    {
-        std::string username;
-        std::string password;
-    };
+
+struct User
+{
+    std::string username;
+    std::string password;
+};
+
 }
 
 #endif

include/Parsers/APIParser.h

@@ -6,18 +6,20 @@
 
 namespace Parsers
 {
-    class APIParser
-    {
-    public:
-        APIParser(Models::IcarusAction);
 
-        Models::API retrieveAPI() const;
-    private:
-        void parseAPI();
+class APIParser
+{
+public:
+    APIParser(Models::IcarusAction);
+
+    Models::API retrieveAPI() const;
+private:
+    void parseAPI();
+
+    Models::API api;
+    Models::IcarusAction icaAct;
+};
 
-        Models::API api;
-        Models::IcarusAction icaAct;
-    };
 }
 
 #endif

include/Syncers/Delete.h

@@ -9,15 +9,17 @@
 
 namespace Syncers
 {
-    class Delete : SyncerBase
-    {
-    public:
-        Delete(Models::API);
 
-        void deleteSong(const Models::Token, Models::Song);
-    private:
-        std::string retrieveUrl(Models::Song);
-    };
+class Delete : SyncerBase
+{
+public:
+    Delete(Models::API);
+
+    void deleteSong(const Models::Token, Models::Song);
+private:
+    std::string retrieveUrl(Models::Song);
+};
+
 }
 
 #endif

include/Syncers/Download.h

@@ -12,20 +12,22 @@
 
 namespace Syncers
 {
-    class Download : SyncerBase
-    {
-    public:
-        Download();
-        Download(Models::API);
-        Download(std::string);
 
-        void downloadSong(const Models::Token token, Models::Song);
-    private:
-        std::string retrieveUrl(Models::Song);
+class Download : SyncerBase
+{
+public:
+    Download();
+    Download(Models::API);
+    Download(std::string);
+
+    void downloadSong(const Models::Token token, Models::Song);
+private:
+    std::string retrieveUrl(Models::Song);
+
+    std::string downloadFilePath;
+    void saveSong(Models::Song&);
+};
 
-        std::string downloadFilePath;
-        void saveSong(Models::Song&);
-    };
 }
 
 #endif

include/Syncers/RetrieveRecords.h

@@ -8,19 +8,21 @@
 
 namespace Syncers
 {
-    class RetrieveRecords: public SyncerBase
-    {
-    public:
-        RetrieveRecords();
-        RetrieveRecords(Models::API, Models::Token);
 
-        void retrieve(Managers::CommitManager::RetrieveTypes);
-    private:
-        void fetchSongs();
+class RetrieveRecords: public SyncerBase
+{
+public:
+    RetrieveRecords();
+    RetrieveRecords(Models::API, Models::Token);
+
+    void retrieve(Managers::CommitManager::RetrieveTypes);
+private:
+    void fetchSongs();
+
+    Models::API api;
+    Models::Token token;
+};
 
-        Models::API api;
-        Models::Token token;
-    };
 }
 
 #endif

include/Syncers/SyncerBase.h

@@ -7,21 +7,23 @@
 
 namespace Syncers
 {
-    class SyncerBase
-    {
-    protected:
-        Models::API api;
-        const int OK = 200;
-        const int UNAUTHORIZED = 401;
-        const int NOTFOUND = 404;
 
-        enum class Result 
-        {
-            OK = 200,
-            UNAUTHORIZED = 401,
-            NOTFOUND = 404
-        };
+class SyncerBase
+{
+protected:
+    Models::API api;
+    const int OK = 200;
+    const int UNAUTHORIZED = 401;
+    const int NOTFOUND = 404;
+
+    enum class Result 
+    {
+        OK = 200,
+        UNAUTHORIZED = 401,
+        NOTFOUND = 404
     };
+};
+
 }
 
 #endif

include/Syncers/Upload.h

@@ -18,31 +18,33 @@ namespace fs = std::filesystem;
 
 namespace Syncers
 {
-    class Upload
-    {
-        public:
-            Upload();
-            Upload(Models::API);
 
-            Models::Song uploadSong(const Models::Token&, Models::Song&);
-            void uploadSongsFromDirectory(const Models::Token&, 
-                    const std::string&, const bool, bool);
-        private:
-            Managers::FileManager fMgr;
-            Models::API api;
-            Models::Song song;
+class Upload
+{
+public:
+    Upload();
+    Upload(Models::API);
 
-            std::vector<Models::Song> retrieveAllSongsFromDirectory(const std::string&,
-                bool);
+    Models::Song uploadSong(const Models::Token&, Models::Song&);
+    void uploadSongsFromDirectory(const Models::Token&, 
+            const std::string&, const bool, bool);
+private:
+    Managers::FileManager fMgr;
+    Models::API api;
+    Models::Song song;
 
-            std::string retrieveUrl();
+    std::vector<Models::Song> retrieveAllSongsFromDirectory(const std::string&,
+        bool);
 
-            Models::Song retrieveSongPath(fs::directory_entry&);
+    std::string retrieveUrl();
+
+    Models::Song retrieveSongPath(fs::directory_entry&);
+
+    void printSongDetails();
+    void printSongDetails(std::vector<Models::Song>&);
+    void printJsonData(const nlohmann::json&);
+};
 
-            void printSongDetails();
-            void printSongDetails(std::vector<Models::Song>&);
-            void printJsonData(const nlohmann::json&);
-    };
 }
 
 #endif

include/UI/AboutWindow.h

@@ -13,22 +13,24 @@
 
 namespace UI
 {
-    class AboutWindow: public QDialog, public CommonWindow
-    {
-        Q_OBJECT
-    public:
-        AboutWindow(QWidget* parent=0);
-        ~AboutWindow() = default;
 
-    private:
-        void connections();
-        void setupWindow();
+class AboutWindow: public QDialog, public CommonWindow
+{
+    Q_OBJECT
+public:
+    AboutWindow(QWidget* parent=0);
+    ~AboutWindow() = default;
 
-        std::unique_ptr<QLabel> appName;
+private:
+    void connections();
+    void setupWindow();
+
+    std::unique_ptr<QLabel> appName;
+
+private slots:
+    void closeWindow();
+};
 
-    private slots:
-        void closeWindow();
-    };
 }
 
 #endif

include/UI/CommonWindow.h

@@ -10,6 +10,9 @@
 #include<QPushButton>
 
 
+namespace UI
+{
+
 class CommonWindow
 {
 public:
@@ -24,4 +27,7 @@ protected:
     std::unique_ptr<QVBoxLayout> subLayoutTwoQt;
     int windowHeight, windowWidth;
 };
+
+}
+
 #endif

include/UI/MainWindow.h

@@ -22,61 +22,63 @@
 
 namespace UI
 {
-    class MainWindow: public QMainWindow, public CommonWindow
-    {
-        Q_OBJECT
-    public:
-        MainWindow();
-        ~MainWindow() = default;
-    private:
-        void configureDownloadSection();
-        void configureUploadSection();
-        void configureWindowDimensions();
-        void configureWindowProperties();
-        void connections();
-        void createMenus();
-        void setupMainWidget();
-        void setupMainWindow();
-        void setupWindowLists();
+
+class MainWindow: public QMainWindow, public CommonWindow
+{
+    Q_OBJECT
+public:
+    MainWindow();
+    ~MainWindow() = default;
+private:
+    void configureDownloadSection();
+    void configureUploadSection();
+    void configureWindowDimensions();
+    void configureWindowProperties();
+    void connections();
+    void createMenus();
+    void setupMainWidget();
+    void setupMainWindow();
+    void setupWindowLists();
 
 
-        std::unique_ptr<QStackedWidget> widgetStack;
+    std::unique_ptr<QStackedWidget> widgetStack;
 
-        std::unique_ptr<QVBoxLayout> stackLayout;
+    std::unique_ptr<QVBoxLayout> stackLayout;
 
-            std::unique_ptr<QHBoxLayout> urlPortion;
-            std::unique_ptr<QHBoxLayout> songPathPortion;
+        std::unique_ptr<QHBoxLayout> urlPortion;
+        std::unique_ptr<QHBoxLayout> songPathPortion;
 
-        std::unique_ptr<QWidget> mainWidgetQt;
-        std::unique_ptr<QWidget> uploadSongWidgetQt;
+    std::unique_ptr<QWidget> mainWidgetQt;
+    std::unique_ptr<QWidget> uploadSongWidgetQt;
 
-        std::unique_ptr<QDockWidget> MainDockWidgetQt;
+    std::unique_ptr<QDockWidget> MainDockWidgetQt;
 
-        std::unique_ptr<QComboBox> windowComboBox;
-        
-        std::unique_ptr<QPushButton> uploadSongQt;
+    std::unique_ptr<QComboBox> windowComboBox;
+    
+    std::unique_ptr<QPushButton> uploadSongQt;
 
-        std::unique_ptr<QTextEdit> urlQt;
-        std::unique_ptr<QTextEdit> sourceFilePathQt;
+    std::unique_ptr<QTextEdit> urlQt;
+    std::unique_ptr<QTextEdit> sourceFilePathQt;
 
-            std::unique_ptr<QLabel> urlLabel;
-            std::unique_ptr<QLabel> songPath;
+        std::unique_ptr<QLabel> urlLabel;
+        std::unique_ptr<QLabel> songPath;
 
-        std::unique_ptr<QMenu> fileMenuQt;
-        std::unique_ptr<QMenu> editMenuQt;
-        std::unique_ptr<QMenu> helpMenuQt;
+    std::unique_ptr<QMenu> fileMenuQt;
+    std::unique_ptr<QMenu> editMenuQt;
+    std::unique_ptr<QMenu> helpMenuQt;
 
-        std::unique_ptr<QAction> closeApplicationQt;
-        std::unique_ptr<QAction> aboutApplicationQt;
+    std::unique_ptr<QAction> closeApplicationQt;
+    std::unique_ptr<QAction> aboutApplicationQt;
+
+    std::unique_ptr<AboutWindow> aboutWindow;
+signals:
+private slots:
+    void uploadSong();
+    void exitApplication();
+    void displaySoftwareInformation();
+    void setCurrentIndex(int);
+};
 
-        std::unique_ptr<AboutWindow> aboutWindow;
-    signals:
-    private slots:
-        void uploadSong();
-        void exitApplication();
-        void displaySoftwareInformation();
-        void setCurrentIndex(int);
-    };
 }
 
 #endif

include/Utilities/Conversions.h

@@ -6,17 +6,19 @@
 
 namespace Utilities
 {
-    class Conversions
-    {
-    public:
-        Conversions();
 
-        void initializeValues();
+class Conversions
+{
+public:
+    Conversions();
+
+    void initializeValues();
+
+    template <typename T>
+    void printValue(T);
+private:
+};
 
-        template <typename T>
-        void printValue(T);
-    private:
-    };
 }
 
 #endif