Moved location update logic to new class called UpdateLocation.
[situare] / src / src.pro
index c880fed..4b3c123 100644 (file)
@@ -3,7 +3,6 @@
 # -------------------------------------------------
 TARGET = ../situare
 TEMPLATE = app
-INCLUDEPATH += /usr/include/qjson
 LIBS += -lqjson
 RESOURCES += ../images.qrc \
     ../languages.qrc
@@ -12,10 +11,10 @@ SOURCES += main.cpp \
     application.cpp \
     coordinates/geocoordinate.cpp \
     coordinates/scenecoordinate.cpp \
+    engine/contactmanager.cpp \
     engine/engine.cpp \
     engine/mce.cpp \
     facebookservice/facebookauthentication.cpp \
-    facebookservice/facebookcredentials.cpp \
     gps/gpsposition.cpp \
     map/baselocationitem.cpp \
     map/friendgroupitem.cpp \
@@ -45,38 +44,56 @@ SOURCES += main.cpp \
     ui/updatelocation/texteditautoresizer.cpp \
     ui/updatelocation/updatelocationdialog.cpp \
     ui/avatarimage.cpp \
+    ui/extendedlistitem.cpp \
+    ui/extendedlistitemdelegate.cpp \
+    ui/extendedlistitemstore.cpp \
     ui/friendlistitem.cpp \
+    ui/friendlistitemdelegate.cpp \
     ui/friendlistpanel.cpp \
+    ui/friendlistview.cpp \
     ui/fullscreenbutton.cpp \
     ui/imagebutton.cpp \
     ui/indicatorbutton.cpp \
+    ui/listitem.cpp \
+    ui/listitemdelegate.cpp \
+    ui/listview.cpp \
+    ui/locationlistitem.cpp \
+    ui/locationlistview.cpp \
     ui/indicatorbuttonpanel.cpp \
-    ui/logindialog.cpp \
+    ui/locationsearchpanel.cpp \
     ui/mainwindow.cpp \
     ui/mapscale.cpp \
+    ui/panelbar.cpp \
+    ui/panelbase.cpp \
+    ui/panelcontentstack.cpp \
+    ui/panelcontextbuttonbar.cpp \
+    ui/paneltab.cpp \
+    ui/paneltabbar.cpp \
+    ui/routingpanel.cpp \
+    ui/routewaypointlistitem.cpp \
+    ui/routewaypointlistview.cpp \    
+    ui/searchdialog.cpp \
+    ui/searchhistorylistitem.cpp \
+    ui/searchhistorylistview.cpp \
     ui/settingsdialog.cpp \
+    ui/tabbedpanel.cpp \
+    ui/textmodifier.cpp \
     ui/userinfo.cpp \
     ui/userinfopanel.cpp \
     ui/zoombutton.cpp \
     ui/zoombuttonpanel.cpp \
-    ui/listview.cpp \
-    ui/listitem.cpp \
-    ui/listitemdelegate.cpp \
-    ui/friendlistitemdelegate.cpp \
-    ui/searchdialog.cpp \
-    ui/paneltab.cpp \
-    ui/tabbedpanel.cpp \
-    ui/panelbar.cpp \
-    ui/panelcontent.cpp \
-    ui/panelbase.cpp \
-    user/user.cpp
+    user/user.cpp \
+    ui/listitemcontextbuttonbar.cpp \
+    engine/updatelocation.cpp
 HEADERS += application.h \
     common.h \
+    coordinates/geocoordinate.h \
+    coordinates/scenecoordinate.h \
+    engine/contactmanager.h \
     engine/engine.h \
+    engine/mce.h \
     error.h \
     facebookservice/facebookauthentication.h \
-    facebookservice/facebookcommon.h \
-    facebookservice/facebookcredentials.h \
     gps/gpscommon.h \
     gps/gpsposition.h \
     map/baselocationitem.h \
@@ -87,71 +104,86 @@ HEADERS += application.h \
     map/mapcommon.h \
     map/mapengine.h \
     map/mapfetcher.h \
+    map/maprouteitem.h \
     map/mapscene.h \
     map/mapscroller.h \
     map/maptile.h \
     map/maptilerequest.h \
     map/mapview.h \
+    map/osm.h \
     map/ownlocationitem.h \
     network/networkaccessmanager.h \
     network/networkcookiejar.h \
     network/networkhandler.h \
     network/networkreply.h \
+    routing/geocodingservice.h \
+    routing/location.h \
+    routing/route.h \
+    routing/routesegment.h \
+    routing/routingcommon.h \    
+    routing/routingservice.h \
     situareservice/imagefetcher.h \
     situareservice/situarecommon.h \
     situareservice/situareservice.h \
     ui/updatelocation/texteditautoresizer.h \
     ui/updatelocation/updatelocationdialog.h \
     ui/avatarimage.h \
+    ui/extendedlistitem.h \
+    ui/extendedlistitemdelegate.h \
+    ui/extendedlistitemstore.h \
     ui/friendlistitem.h \
+    ui/friendlistitemdelegate.h \
     ui/friendlistpanel.h \
+    ui/friendlistview.h \
+    ui/fullscreenbutton.h \
     ui/imagebutton.h \
-    ui/logindialog.h \
+    ui/indicatorbutton.h \
+    ui/indicatorbuttonpanel.h \
+    ui/listcommon.h \    
+    ui/listview.h \
+    ui/listitem.h \
+    ui/listitemdelegate.h \
+    ui/locationlistitem.h \
+    ui/locationlistview.h \
+    ui/locationsearchpanel.h \
     ui/mainwindow.h \
     ui/mapscale.h \
+    ui/panelbar.h \
+    ui/panelbase.h \
     ui/panelcommon.h \
+    ui/panelcontentstack.h \
+    ui/panelcontextbuttonbar.h \
+    ui/paneltab.h \
+    ui/paneltabbar.h \
+    ui/routingpanel.h \
+    ui/routewaypointlistitem.h \
+    ui/routewaypointlistview.h \
+    ui/searchdialog.h \
+    ui/searchhistorylistitem.h \
+    ui/searchhistorylistview.h \
     ui/settingsdialog.h \
+    ui/tabbedpanel.h \
+    ui/textmodifier.h \
     ui/userinfo.h \
     ui/userinfopanel.h \
     ui/zoombutton.h \
     ui/zoombuttonpanel.h \
     user/user.h \
-    ui/fullscreenbutton.h \
-    engine/mce.h \
-    ui/indicatorbutton.h \
-    ui/indicatorbuttonpanel.h \
-    routing/geocodingservice.h \
-    routing/routingservice.h \
-    routing/routingcommon.h \
-    routing/routesegment.h \
-    routing/route.h \
-    routing/location.h \
-    map/maprouteitem.h \
-    map/osm.h \
-    coordinates/scenecoordinate.h \
-    coordinates/geocoordinate.h \
-    ui/listview.h \
-    ui/listitem.h \
-    ui/listitemdelegate.h \
-    ui/friendlistitemdelegate.h \
-    ui/listcommon.h \
-    ui/searchdialog.h \
-    ui/paneltab.h \
-    ui/tabbedpanel.h \
-    ui/panelbar.h \
-    ui/panelcontent.h \
-    ui/panelbase.h
+    ui/listitemcontextbuttonbar.h \
+    engine/updatelocation.h
 QT += network \
     webkit
-
 DEFINES += QT_NO_DEBUG_OUTPUT
 
 simulator {
     SOURCES += network/networkhandlerprivatestub.cpp \
-               gps/gpspositionprivate.cpp
+               gps/gpspositionprivate.cpp \
+               engine/contactmanagerprivatestub.cpp \
+               engine/mceprivatestub.cpp
     HEADERS += network/networkhandlerprivatestub.h \
-               gps/gpspositionprivate.h
-    QT += maemo5
+               gps/gpspositionprivate.h \
+               engine/contactmanagerprivatestub.h \
+               engine/mceprivatestub.h
     CONFIG += mobility
     MOBILITY += location
 } else:maemo5 {
@@ -171,8 +203,14 @@ simulator {
                    gps/liblocationwrapper.h \
                    gps/geopositioninfo.h
         CONFIG += link_pkgconfig
-        PKGCONFIG += glib-2.0 liblocation mce
+        PKGCONFIG += glib-2.0 liblocation mce gtk+-2.0 libosso-abook-1.0
         LIBS += -llocation
+        SOURCES += engine/contactmanagerprivate.cpp \
+                   ui/ossoabookdialog.cpp
+        HEADERS += engine/contactmanagerprivate.h \
+                   ui/ossoabookdialog.h
+        CONFIG += mobility
+        MOBILITY += contacts
     } else {
         SOURCES += gps/gpspositionprivatestub.cpp \
                    network/networkhandlerprivatestub.cpp \
@@ -180,6 +218,8 @@ simulator {
         HEADERS += gps/gpspositionprivatestub.h \
                    network/networkhandlerprivatestub.h \
                    engine/mceprivatestub.h
+        SOURCES += engine/contactmanagerprivatestub.cpp
+        HEADERS += engine/contactmanagerprivatestub.h
     }
 
     QT += maemo5
@@ -200,6 +240,8 @@ simulator {
     HEADERS += gps/gpspositionprivatestub.h \
                network/networkhandlerprivatestub.h \
                engine/mceprivatestub.h
+    SOURCES += engine/contactmanagerprivatestub.cpp
+    HEADERS += engine/contactmanagerprivatestub.h
     message(QJson built in)
     message(Make sure you have QJson development headers installed)
     message(install headers with: sudo apt-get install libqjson-dev)