Merge branch 'remove_list_view'

Conflicts:
	src/ui/mainwindow.cpp

diff --cc src/src.pro
index eecab14,28f2006..9f7f6e2
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -41,12 -38,9 +38,11 @@@ SOURCES += main.cpp 
      ui/friendlistpanel.cpp \
      ui/userpanel.cpp \
      ui/panelsidebar.cpp \
 -    ui/panelsliderbar.cpp
 +    ui/panelsliderbar.cpp \
 +    map/friendgroupitem.cpp \
 +    map/frienditemshandler.cpp
  HEADERS += ui/mainwindow.h \
      ui/mapviewscreen.h \
-     ui/listviewscreen.h \
      map/mapengine.h \
      map/mapview.h \
      map/mapscene.h \

diff --cc src/ui/mainwindow.cpp
index edcacaa,9ccdd2b..e61f1a6
--- 1/src/ui/mainwindow.cpp
--- 2/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@@ -50,29 -47,16 +47,14 @@@ MainWindow::MainWindow(QWidget *parent
              SIGNAL(statusUpdate(QString,bool)));
  
      connect(this, SIGNAL(userLocationReady(User*)),
 -            m_mapViewScreen, SLOT(userLocationReady(User*)));
 +            m_mapViewScreen, SIGNAL(userLocationReady(User*)));
      connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
 -            m_mapViewScreen, SLOT(friendsLocationsReady(QList<User*>&)));
 +            m_mapViewScreen, SIGNAL(friendsLocationsReady(QList<User*>&)));
  
-     connect(this, SIGNAL(userLocationReady(User*)),
-             m_listViewScreen, SLOT(userDataReceived(User*)));
--    connect(this, SIGNAL(friendsLocationsReady(QList<User*>&)),
-             m_listViewScreen, SLOT(friendInfoReceived(QList<User*>&)));
-     connect(m_listViewScreen, SIGNAL(updateFriendsData()),
-             this, SIGNAL(refreshUserData()));
 -            m_mapViewScreen, SIGNAL(SIG_friendsLocationsReady(QList<User*>&)));
  
 -    toggleProgressIndicator(true);
 +    this->toggleProgressIndicator(true);
  }
  
- MainWindow::~MainWindow()
- {
-     qDebug() << __PRETTY_FUNCTION__;
-     delete m_toListViewAct;
-     delete m_toMapViewAct;
-     delete m_toSettingsAct;
-     delete m_situareViews;
- }
- 
  void MainWindow::toggleProgressIndicator(bool value)
  {
      qDebug() << __PRETTY_FUNCTION__;

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