From 648b8312429f1e9b46a2e16d72f9215c5805420e Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Fri, 4 Apr 2014 11:14:59 -0400 Subject: [PATCH] Move things around to a more logical layout --- src/accounts/hatchet/CMakeLists.txt | 7 +++--- .../hatchet/account/HatchetAccount.cpp | 1 - src/accounts/hatchet/account/HatchetAccount.h | 2 +- src/accounts/hatchet/kiva/KivaHandler.cpp | 18 +++++++++++++ src/accounts/hatchet/kiva/KivaHandler.h | 25 +++++++++++++++++++ src/accounts/hatchet/sip/HatchetSip.cpp | 3 +-- .../hatchet/{ => utils}/HatchetHelpers.cpp | 0 .../hatchet/{ => utils}/HatchetHelpers.h | 0 .../hatchet/{sip => utils}/WebSocket.cpp | 0 .../hatchet/{sip => utils}/WebSocket.h | 0 .../WebSocketThreadController.cpp | 0 .../WebSocketThreadController.h | 0 .../hatchet/{sip => utils}/hatchet_config.hpp | 0 13 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 src/accounts/hatchet/kiva/KivaHandler.cpp create mode 100644 src/accounts/hatchet/kiva/KivaHandler.h rename src/accounts/hatchet/{ => utils}/HatchetHelpers.cpp (100%) rename src/accounts/hatchet/{ => utils}/HatchetHelpers.h (100%) rename src/accounts/hatchet/{sip => utils}/WebSocket.cpp (100%) rename src/accounts/hatchet/{sip => utils}/WebSocket.h (100%) rename src/accounts/hatchet/{sip => utils}/WebSocketThreadController.cpp (100%) rename src/accounts/hatchet/{sip => utils}/WebSocketThreadController.h (100%) rename src/accounts/hatchet/{sip => utils}/hatchet_config.hpp (100%) diff --git a/src/accounts/hatchet/CMakeLists.txt b/src/accounts/hatchet/CMakeLists.txt index 9cd9739b0..6ad50acdd 100644 --- a/src/accounts/hatchet/CMakeLists.txt +++ b/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 - sip/WebSocketThreadController.cpp + utils/WebSocket.cpp + utils/WebSocketThreadController.cpp sip/HatchetSip.cpp - #sip/HatchetCredentialFetcher.cpp UI account/HatchetAccountConfig.ui LINK_LIBRARIES diff --git a/src/accounts/hatchet/account/HatchetAccount.cpp b/src/accounts/hatchet/account/HatchetAccount.cpp index b91011d36..f4e560eef 100644 --- a/src/accounts/hatchet/account/HatchetAccount.cpp +++ b/src/accounts/hatchet/account/HatchetAccount.cpp @@ -18,7 +18,6 @@ #include "HatchetAccount.h" -#include "HatchetHelpers.h" #include "HatchetAccountConfig.h" #include "utils/Closure.h" #include "utils/Logger.h" diff --git a/src/accounts/hatchet/account/HatchetAccount.h b/src/accounts/hatchet/account/HatchetAccount.h index 9b1d8a829..37e4bb24f 100644 --- a/src/accounts/hatchet/account/HatchetAccount.h +++ b/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 #include diff --git a/src/accounts/hatchet/kiva/KivaHandler.cpp b/src/accounts/hatchet/kiva/KivaHandler.cpp new file mode 100644 index 000000000..dbe906a32 --- /dev/null +++ b/src/accounts/hatchet/kiva/KivaHandler.cpp @@ -0,0 +1,18 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2014, Jeff Mitchell + * + * 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 . + */ + diff --git a/src/accounts/hatchet/kiva/KivaHandler.h b/src/accounts/hatchet/kiva/KivaHandler.h new file mode 100644 index 000000000..92879aa9a --- /dev/null +++ b/src/accounts/hatchet/kiva/KivaHandler.h @@ -0,0 +1,25 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2014, Jeff Mitchell + * + * 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 . + */ + +#ifndef KIVA_HANDLER_H +#define KIVA_HANDLER_H + +class KivaHandler : public QObject { +}; + +#endif diff --git a/src/accounts/hatchet/sip/HatchetSip.cpp b/src/accounts/hatchet/sip/HatchetSip.cpp index bbdd6b9aa..c9b999ac8 100644 --- a/src/accounts/hatchet/sip/HatchetSip.cpp +++ b/src/accounts/hatchet/sip/HatchetSip.cpp @@ -19,8 +19,7 @@ #include "HatchetSip.h" #include "account/HatchetAccount.h" -#include "WebSocketThreadController.h" -//#include "WebSocket.h" +#include "utils/WebSocketThreadController.h" #include #include diff --git a/src/accounts/hatchet/HatchetHelpers.cpp b/src/accounts/hatchet/utils/HatchetHelpers.cpp similarity index 100% rename from src/accounts/hatchet/HatchetHelpers.cpp rename to src/accounts/hatchet/utils/HatchetHelpers.cpp diff --git a/src/accounts/hatchet/HatchetHelpers.h b/src/accounts/hatchet/utils/HatchetHelpers.h similarity index 100% rename from src/accounts/hatchet/HatchetHelpers.h rename to src/accounts/hatchet/utils/HatchetHelpers.h diff --git a/src/accounts/hatchet/sip/WebSocket.cpp b/src/accounts/hatchet/utils/WebSocket.cpp similarity index 100% rename from src/accounts/hatchet/sip/WebSocket.cpp rename to src/accounts/hatchet/utils/WebSocket.cpp diff --git a/src/accounts/hatchet/sip/WebSocket.h b/src/accounts/hatchet/utils/WebSocket.h similarity index 100% rename from src/accounts/hatchet/sip/WebSocket.h rename to src/accounts/hatchet/utils/WebSocket.h diff --git a/src/accounts/hatchet/sip/WebSocketThreadController.cpp b/src/accounts/hatchet/utils/WebSocketThreadController.cpp similarity index 100% rename from src/accounts/hatchet/sip/WebSocketThreadController.cpp rename to src/accounts/hatchet/utils/WebSocketThreadController.cpp diff --git a/src/accounts/hatchet/sip/WebSocketThreadController.h b/src/accounts/hatchet/utils/WebSocketThreadController.h similarity index 100% rename from src/accounts/hatchet/sip/WebSocketThreadController.h rename to src/accounts/hatchet/utils/WebSocketThreadController.h diff --git a/src/accounts/hatchet/sip/hatchet_config.hpp b/src/accounts/hatchet/utils/hatchet_config.hpp similarity index 100% rename from src/accounts/hatchet/sip/hatchet_config.hpp rename to src/accounts/hatchet/utils/hatchet_config.hpp