Move things around to a more logical layout

src/accounts/hatchet/CMakeLists.txt

@@ -37,13 +37,12 @@ tomahawk_add_plugin(hatchet
     TYPE account
     EXPORT_MACRO ACCOUNTDLLEXPORT_PRO
     SOURCES
-        HatchetHelpers.cpp
+        utils/HatchetHelpers.cpp
         account/HatchetAccount.cpp
         account/HatchetAccountConfig.cpp
-        sip/WebSocket.cpp
+        utils/WebSocket.cpp
-        sip/WebSocketThreadController.cpp
+        utils/WebSocketThreadController.cpp
         sip/HatchetSip.cpp
-        #sip/HatchetCredentialFetcher.cpp
     UI
         account/HatchetAccountConfig.ui
     LINK_LIBRARIES

src/accounts/hatchet/account/HatchetAccount.cpp

@@ -18,7 +18,6 @@
 
 #include "HatchetAccount.h"
 
-#include "HatchetHelpers.h"
 #include "HatchetAccountConfig.h"
 #include "sip/HatchetSip.h"
 #include "utils/Closure.h"

src/accounts/hatchet/account/HatchetAccount.h

@@ -20,7 +20,7 @@
 #define HATCHET_ACCOUNT_H
 
 #include "TomahawkPlugin.h"
-#include "HatchetHelpers.h"
+#include "utils/HatchetHelpers.h"
 
 #include <accounts/Account.h>
 #include <accounts/AccountDllMacro.h>

src/accounts/hatchet/kiva/KivaHandler.cpp

@@ -0,0 +1,18 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2014,      Jeff Mitchell <jeff@tomahawk-player.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+

src/accounts/hatchet/kiva/KivaHandler.h

@@ -0,0 +1,25 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2014,      Jeff Mitchell <jeff@tomahawk-player.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef KIVA_HANDLER_H
+#define KIVA_HANDLER_H
+
+class KivaHandler : public QObject {
+};
+
+#endif

src/accounts/hatchet/sip/HatchetSip.cpp

@@ -19,8 +19,7 @@
 #include "HatchetSip.h"
 
 #include "account/HatchetAccount.h"
-#include "WebSocketThreadController.h"
+#include "utils/WebSocketThreadController.h"
-//#include "WebSocket.h"
 
 #include <database/Database.h>
 #include <database/DatabaseImpl.h>