From 37ec3466ab93edb750e63323ae7de483f3605d3b Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 16 Jan 2014 18:14:44 +0100 Subject: [PATCH] Moved SocialWidget to src/tomahawk/widgets --- src/tomahawk/AudioControls.cpp | 14 +++++++------- src/tomahawk/CMakeLists.txt | 5 +++-- src/tomahawk/{ => widgets}/SocialWidget.cpp | 0 src/tomahawk/{ => widgets}/SocialWidget.h | 0 src/tomahawk/{ => widgets}/SocialWidget.ui | 0 5 files changed, 10 insertions(+), 9 deletions(-) rename src/tomahawk/{ => widgets}/SocialWidget.cpp (100%) rename src/tomahawk/{ => widgets}/SocialWidget.h (100%) rename src/tomahawk/{ => widgets}/SocialWidget.ui (100%) diff --git a/src/tomahawk/AudioControls.cpp b/src/tomahawk/AudioControls.cpp index 2d97ac3d0..ec7a9e97a 100644 --- a/src/tomahawk/AudioControls.cpp +++ b/src/tomahawk/AudioControls.cpp @@ -23,23 +23,23 @@ #include "Album.h" #include "DropJob.h" -#include "SocialWidget.h" #include "GlobalActionManager.h" -#include "ViewManager.h" #include "Source.h" +#include "ViewManager.h" #include "audio/AudioEngine.h" -#include "playlist/PlaylistView.h" #include "database/Database.h" -#include "widgets/ImageButton.h" +#include "playlist/PlaylistView.h" #include "utils/TomahawkUtilsGui.h" #include "utils/Logger.h" +#include "widgets/ImageButton.h" +#include "widgets/SocialWidget.h" -#include -#include -#include #include +#include #include +#include +#include const static int ALLOWED_MAX_DIVERSION = 300; diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt index 04ecdf082..5d28fa846 100644 --- a/src/tomahawk/CMakeLists.txt +++ b/src/tomahawk/CMakeLists.txt @@ -56,7 +56,6 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui} TomahawkTrayIcon.cpp AudioControls.cpp - SocialWidget.cpp TomahawkWindow.cpp widgets/ContainedMenuButton.cpp @@ -67,6 +66,7 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui} widgets/AccountsPopupWidget.cpp widgets/AccountsToolButton.cpp widgets/SlideSwitchButton.cpp + widgets/SocialWidget.cpp widgets/SplashWidget.cpp widgets/UnstyledFrame.cpp ) @@ -87,7 +87,8 @@ SET( tomahawkUI ${tomahawkUI} TomahawkWindow.ui AudioControls.ui - SocialWidget.ui + + widgets/SocialWidget.ui ) INCLUDE_DIRECTORIES( diff --git a/src/tomahawk/SocialWidget.cpp b/src/tomahawk/widgets/SocialWidget.cpp similarity index 100% rename from src/tomahawk/SocialWidget.cpp rename to src/tomahawk/widgets/SocialWidget.cpp diff --git a/src/tomahawk/SocialWidget.h b/src/tomahawk/widgets/SocialWidget.h similarity index 100% rename from src/tomahawk/SocialWidget.h rename to src/tomahawk/widgets/SocialWidget.h diff --git a/src/tomahawk/SocialWidget.ui b/src/tomahawk/widgets/SocialWidget.ui similarity index 100% rename from src/tomahawk/SocialWidget.ui rename to src/tomahawk/widgets/SocialWidget.ui