From d97b83557bb26af761e630805ea6dd5b5a6311a8 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Fri, 1 Jun 2012 05:46:36 +0200
Subject: [PATCH] * Got rid of TreeHeader. Handled by ViewHeader now.

---
 src/libtomahawk/CMakeLists.txt          |  1 -
 src/libtomahawk/playlist/ArtistView.cpp |  5 ++--
 src/libtomahawk/playlist/ArtistView.h   |  4 +--
 src/libtomahawk/playlist/TreeHeader.cpp | 39 -------------------------
 src/libtomahawk/playlist/TreeHeader.h   | 39 -------------------------
 5 files changed, 5 insertions(+), 83 deletions(-)
 delete mode 100644 src/libtomahawk/playlist/TreeHeader.cpp
 delete mode 100644 src/libtomahawk/playlist/TreeHeader.h

diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 63cced25f..5b53750f9 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -48,7 +48,6 @@ set( libGuiSources
     playlist/TreeModel.cpp
     playlist/TreeProxyModel.cpp
     playlist/TreeProxyModelPlaylistInterface.cpp
-    playlist/TreeHeader.cpp
     playlist/TreeItemDelegate.cpp
     playlist/PlaylistModel.cpp
     playlist/PlaylistView.cpp
diff --git a/src/libtomahawk/playlist/ArtistView.cpp b/src/libtomahawk/playlist/ArtistView.cpp
index 7d04c7020..b62a9f16b 100644
--- a/src/libtomahawk/playlist/ArtistView.cpp
+++ b/src/libtomahawk/playlist/ArtistView.cpp
@@ -31,7 +31,7 @@
 
 #include "ContextMenu.h"
 #include "TomahawkSettings.h"
-#include "TreeHeader.h"
+#include "ViewHeader.h"
 #include "TreeItemDelegate.h"
 #include "TreeModel.h"
 #include "PlayableItem.h"
@@ -47,7 +47,7 @@ using namespace Tomahawk;
 
 ArtistView::ArtistView( QWidget* parent )
     : QTreeView( parent )
-    , m_header( new TreeHeader( this ) )
+    , m_header( new ViewHeader( this ) )
     , m_overlay( new OverlayWidget( this ) )
     , m_model( 0 )
     , m_proxyModel( 0 )
@@ -145,6 +145,7 @@ ArtistView::setTreeModel( TreeModel* model )
 
     guid(); // this will set the guid on the header
 
+    m_header->setDefaultColumnWeights( model->columnWeights() );
     if ( model->style() == PlayableModel::Large )
     {
         setHeaderHidden( true );
diff --git a/src/libtomahawk/playlist/ArtistView.h b/src/libtomahawk/playlist/ArtistView.h
index f113c78c3..47b01dc36 100644
--- a/src/libtomahawk/playlist/ArtistView.h
+++ b/src/libtomahawk/playlist/ArtistView.h
@@ -36,7 +36,7 @@ namespace Tomahawk
     class ContextMenu;
 };
 
-class TreeHeader;
+class ViewHeader;
 class AnimatedSpinner;
 class OverlayWidget;
 class TreeModel;
@@ -106,7 +106,7 @@ private slots:
     void onMenuTriggered( int action );
 
 private:
-    TreeHeader* m_header;
+    ViewHeader* m_header;
     OverlayWidget* m_overlay;
     TreeModel* m_model;
     TreeProxyModel* m_proxyModel;
diff --git a/src/libtomahawk/playlist/TreeHeader.cpp b/src/libtomahawk/playlist/TreeHeader.cpp
deleted file mode 100644
index 4aeccd17d..000000000
--- a/src/libtomahawk/playlist/TreeHeader.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@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/>.
- */
-
-#include "TreeHeader.h"
-
-#include "playlist/ArtistView.h"
-#include "utils/Logger.h"
-#include "Source.h"
-
-
-TreeHeader::TreeHeader( ArtistView* parent )
-    : ViewHeader( parent )
-    , m_parent( parent )
-{
-    QList< double > columnWeights;
-    columnWeights << 0.42 << 0.12 << 0.07 << 0.07 << 0.07 << 0.07 << 0.07; // << 0.11;
-
-    setDefaultColumnWeights( columnWeights );
-}
-
-
-TreeHeader::~TreeHeader()
-{
-}
diff --git a/src/libtomahawk/playlist/TreeHeader.h b/src/libtomahawk/playlist/TreeHeader.h
deleted file mode 100644
index d80cf872c..000000000
--- a/src/libtomahawk/playlist/TreeHeader.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@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 TREEHEADER_H
-#define TREEHEADER_H
-
-#include "ViewHeader.h"
-#include "DllMacro.h"
-
-class ArtistView;
-
-class DLLEXPORT TreeHeader : public ViewHeader
-{
-Q_OBJECT
-
-public:
-    explicit TreeHeader( ArtistView* parent = 0 );
-    ~TreeHeader();
-
-private:
-    ArtistView* m_parent;
-};
-
-#endif