From 926c17ddff8496a84fb9a026216b937ab2f66076 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Sat, 20 Sep 2014 06:33:19 +0200
Subject: [PATCH] * After fooling me a thousand times, I've finally decided to
 rename WhatsHotWidget to ChartsWidget. There's potential danger in colliding
 with lingering old whatshot-page plugins, but I'd rather do it now than
 later. Please wipe your build / install dirs. Sorry :-)

---
 admin/mac/macdeploy.py                                      | 2 +-
 src/libtomahawk/ViewManager.cpp                             | 2 +-
 src/viewpages/{whatshot => charts}/CMakeLists.txt           | 6 +++---
 .../WhatsHotWidget.cpp => charts/ChartsWidget.cpp}          | 4 ++--
 .../{whatshot/WhatsHotWidget.h => charts/ChartsWidget.h}    | 0
 .../{whatshot/WhatsHotWidget.ui => charts/ChartsWidget.ui}  | 0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename src/viewpages/{whatshot => charts}/CMakeLists.txt (61%)
 rename src/viewpages/{whatshot/WhatsHotWidget.cpp => charts/ChartsWidget.cpp} (99%)
 rename src/viewpages/{whatshot/WhatsHotWidget.h => charts/ChartsWidget.h} (100%)
 rename src/viewpages/{whatshot/WhatsHotWidget.ui => charts/ChartsWidget.ui} (100%)

diff --git a/admin/mac/macdeploy.py b/admin/mac/macdeploy.py
index 6454b30a1..fffcf912c 100755
--- a/admin/mac/macdeploy.py
+++ b/admin/mac/macdeploy.py
@@ -222,7 +222,7 @@ TOMAHAWK_PLUGINS = [
   'libtomahawk_infoplugin_spotify.so',
   'libtomahawk_viewpage_dashboard.so',
 #  'libtomahawk_viewpage_networkactivity.so',
-  'libtomahawk_viewpage_whatshot.so',
+  'libtomahawk_viewpage_charts.so',
   'libtomahawk_viewpage_whatsnew_0_8.so',
 ]
 
diff --git a/src/libtomahawk/ViewManager.cpp b/src/libtomahawk/ViewManager.cpp
index 1a0b4ece7..58e0ca160 100644
--- a/src/libtomahawk/ViewManager.cpp
+++ b/src/libtomahawk/ViewManager.cpp
@@ -828,7 +828,7 @@ ViewManager::addDynamicPage( Tomahawk::ViewPagePlugin* viewPage, const QString&
 
     if ( m_dynamicPages.contains( pageId ) || m_dynamicPagePlugins.contains( pageId ) )
     {
-        tLog() << "Not adding a second ViewPage with name" << pageName;
+        tDebug() << Q_FUNC_INFO << "Not adding a second page with id" << pageId << "- old colliding plugin found, please clean your install dir.";
         Q_ASSERT( false );
     }
 
diff --git a/src/viewpages/whatshot/CMakeLists.txt b/src/viewpages/charts/CMakeLists.txt
similarity index 61%
rename from src/viewpages/whatshot/CMakeLists.txt
rename to src/viewpages/charts/CMakeLists.txt
index 74dea6008..e6653fde4 100644
--- a/src/viewpages/whatshot/CMakeLists.txt
+++ b/src/viewpages/charts/CMakeLists.txt
@@ -1,10 +1,10 @@
-tomahawk_add_plugin(whatshot
+tomahawk_add_plugin(charts
     TYPE viewpage
     EXPORT_MACRO TOMAHAWK_VIEWPAGE_EXPORT_PRO
     SOURCES
-        WhatsHotWidget.cpp
+        ChartsWidget.cpp
     UI
-        WhatsHotWidget.ui
+        ChartsWidget.ui
     LINK_LIBRARIES
         tomahawk-widgets
 )
diff --git a/src/viewpages/whatshot/WhatsHotWidget.cpp b/src/viewpages/charts/ChartsWidget.cpp
similarity index 99%
rename from src/viewpages/whatshot/WhatsHotWidget.cpp
rename to src/viewpages/charts/ChartsWidget.cpp
index 824acd53a..ea13c4bc3 100644
--- a/src/viewpages/whatshot/WhatsHotWidget.cpp
+++ b/src/viewpages/charts/ChartsWidget.cpp
@@ -20,8 +20,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "WhatsHotWidget.h"
-#include "ui_WhatsHotWidget.h"
+#include "ChartsWidget.h"
+#include "ui_ChartsWidget.h"
 
 #include "MetaPlaylistInterface.h"
 #include "TomahawkSettings.h"
diff --git a/src/viewpages/whatshot/WhatsHotWidget.h b/src/viewpages/charts/ChartsWidget.h
similarity index 100%
rename from src/viewpages/whatshot/WhatsHotWidget.h
rename to src/viewpages/charts/ChartsWidget.h
diff --git a/src/viewpages/whatshot/WhatsHotWidget.ui b/src/viewpages/charts/ChartsWidget.ui
similarity index 100%
rename from src/viewpages/whatshot/WhatsHotWidget.ui
rename to src/viewpages/charts/ChartsWidget.ui