Merge branch 'master' into locationlistview

Conflicts:
	src/engine/engine.cpp
	src/routing/routingservice.cpp
	src/src.pro

diff --cc src/engine/engine.cpp
index 18eda77,4c1183f..1590cb9
--- 1/src/engine/engine.cpp
--- 2/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@@ -559,6 -572,14 +565,14 @@@ void SituareEngine::signalsFromFacebook
              m_ui, SLOT(loginUsingCookies()));
  }
  
+ void SituareEngine::signalsFromGeocodingService()
+ {
+     qDebug() << __PRETTY_FUNCTION__;
+ 
+     connect(m_geocodingService, SIGNAL(locationDataParsed(QList<Location>&)),
 -            this, SLOT(locationDataReady(QList<Location>&)));
++            m_ui, SIGNAL(locationDataParsed(QList<Location>&)));
+ }
+ 
  void SituareEngine::signalsFromGPS()
  {
      qDebug() << __PRETTY_FUNCTION__;

diff --cc src/engine/engine.h
Simple merge

diff --cc src/map/mapengine.cpp
Simple merge

diff --cc src/src.pro
index 01451ba,18b79dc..20ad86d
--- 1/src/src.pro
--- 2/src/src.pro
+++ b/src/src.pro
@@@ -67,12 -67,7 +67,13 @@@ SOURCES += main.cpp 
      ui/listitemdelegate.cpp \
      ui/friendlistitemdelegate.cpp \
      ui/searchdialog.cpp \
 +    ui/locationlistitem.cpp \
 +    ui/extendedlistitem.cpp \
 +    ui/extendedlistitemstore.cpp \
 +    ui/extendedlistitemdelegate.cpp \
 +    ui/locationlistview.cpp \
-     ui/friendlistview.cpp
++    ui/friendlistview.cpp \
+     routing/geocodingservice.cpp
  HEADERS += application.h \
      common.h \
      engine/engine.h \
@@@ -140,12 -135,8 +141,15 @@@
      ui/friendlistitemdelegate.h \
      ui/listcommon.h \
      ui/searchdialog.h \
 +    ui/locationlistitem.h \
 +    ui/extendedlistitem.h \
 +    ui/extendedlistitemstore.h \
 +    ui/extendedlistitemdelegate.h \
 +    ui/locationlistview.h \
-     ui/friendlistview.h
++    ui/friendlistview.h \
+     error.h \
+     routing/geocodingservice.h
++
  QT += network \
      webkit
  

diff --cc src/ui/locationlistitem.cpp
index c59c1c3,0000000..20accca
mode 100644,000000..100644
--- 1/src/ui/locationlistitem.cpp
--- /dev/null
+++ b/src/ui/locationlistitem.cpp
@@@ -1,67 -1,0 +1,67 @@@
 +#include <QDebug>
 +
 +#include "../common.h"
 +#include "listcommon.h"
 +
 +#include "locationlistitem.h"
 +
 +const int LOCATION_SUBITEM_TEXT_MAX_WIDTH = SUBITEM_TEXT_MAX_WIDTH + MARGIN + IMAGE_WIDTH;
 +
 +LocationListItem::LocationListItem()
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +
 +    setSubitemTextWidth(LOCATION_SUBITEM_TEXT_MAX_WIDTH);
 +}
 +
 +GeoCoordinate LocationListItem::coordinates()
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +
 +    return m_location.coordinates();
 +}
 +
 +QString LocationListItem::id() const
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +
 +    return QString();
 +}
 +
 +void LocationListItem::setLocationData(const Location &location)
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +
 +    m_location = location;
 +
 +    QStringList addressComponents = m_location.addressComponents();
 +
 +    if (addressComponents.count() > 0)
 +        setName(shortenText(addressComponents.at(0), ITEM_WIDTH - 3*MARGIN,
 +                            ListItem::TEXT_SIZE_NORMAL));
 +
 +    QString addressTail;
 +
 +    for (int i = 1; i < addressComponents.count(); ++i) {
 +        addressTail.append(addressComponents.at(i));
 +
 +        if (i < (addressComponents.count() - 1))
 +            addressTail.append(", ");
 +    }
 +
 +    clearSubItems();
 +    addSubItem(addressTail, QPixmap(":/res/images/compass.png"));
 +
 +}
 +
 +void LocationListItem::bounds(GeoCoordinate &swBound, GeoCoordinate &neBound)
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +
-     m_location.bounds(swBound, neBound);
++    m_location.viewport(swBound, neBound);
 +}
 +
 +LocationListItem::~LocationListItem()
 +{
 +    qDebug() << __PRETTY_FUNCTION__;
 +}

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