Merge branch 'new_panels' into locationlistview

Conflicts:
	src/ui/friendlistpanel.cpp
	src/ui/friendlistpanel.h
	src/ui/mainwindow.h
	tests/ui/friendlistitem/testfriendlistitem.cpp
	tests/ui/listview/testlistview.cpp

diff --cc src/ui/friendlistpanel.cpp
index 33d031f,8892ca4..73f1296
--- 1/src/ui/friendlistpanel.cpp
--- 2/src/ui/friendlistpanel.cpp
+++ b/src/ui/friendlistpanel.cpp
@@@ -19,13 -19,16 +19,17 @@@
      along with Situare; if not, write to the Free Software
      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
      USA.
-  */
+ */
+ 
+ #include <QHBoxLayout>
+ #include <QLabel>
+ #include <QPushButton>
  
 +#include "../user/user.h"
  #include "coordinates/geocoordinate.h"
 -#include "listview.h"
  #include "friendlistitem.h"
  #include "friendlistitemdelegate.h"
 +#include "friendlistview.h"
  #include "panelcommon.h"
  
  #include "friendlistpanel.h"

diff --cc src/ui/friendlistpanel.h
index 8a8738b,a3e6c6c..dc83e0b
--- 1/src/ui/friendlistpanel.h
--- 2/src/ui/friendlistpanel.h
+++ b/src/ui/friendlistpanel.h
@@@ -119,11 -103,11 +119,11 @@@ private
      QLabel *m_friendListLabel;          ///< Friend list label
  
      QPushButton *m_clearFilterButton;   ///< Button to clear list filtering
 +    QPushButton *m_routeButton;         ///< Button to route to friend
  
+     QWidget *m_friendListHeaderWidget;  ///< Friend list header widget
+ 
 -    FriendListItemDelegate *m_friendListItemDelegate;   ///< Friend list item delegate
 -    ListView *m_friendListView;                         ///< Friend list view
 +    FriendListView *m_friendListView;   ///< Friend list view
  };
  
  #endif // FRIENDLISTPANEL_H

diff --cc src/ui/mainwindow.cpp
Simple merge

diff --cc src/ui/mainwindow.h
index 5eb59c9,ab87f39..0c8d034
--- 1/src/ui/mainwindow.h
--- 2/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@@ -56,11 -54,10 +57,11 @@@ class TabbedPanel
  class User;
  class UserInfoPanel;
  class ZoomButtonPanel;
 +class Location;
  
  /**
- * @brief Main Window Class
- */
+  * @brief Main Window Class
+  */
  class MainWindow : public QMainWindow
  {
      Q_OBJECT

diff --cc tests/ui/friendlistitem/testfriendlistitem.cpp
index 68bd23d,652be3c..216c579
--- 1/tests/ui/friendlistitem/testfriendlistitem.cpp
--- 2/tests/ui/friendlistitem/testfriendlistitem.cpp
+++ b/tests/ui/friendlistitem/testfriendlistitem.cpp
@@@ -20,12 -20,11 +20,12 @@@
  */
  
  #include <QtTest>
- #include <QtGui>
  
- #include "../../../src/ui/friendlistitem.h"
- #include "../../../src/ui/extendedlistitemstore.h"
- #include "../../../src/user/user.h"
- #include "../../../src/ui/listcommon.h"
++#include "ui/extendedlistitemstore.h"
+ #include "ui/listcommon.h"
+ #include "user/user.h"
+ 
+ #include "ui/friendlistitem.h"
  
  class TestFriendListItem: public QObject
  {