Fixed a few merge problems

diff --git a/src/src.pro b/src/src.pro
index 1196186..06b4362 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -76,7 +76,7 @@ HEADERS += ui/mainwindow.h \
     map/friendgroupitem.h \
     map/frienditemshandler.h \
     gps/gpspositioninterface.h \
-    ui/zoombuttonpanel.h
+    ui/zoombuttonpanel.h \
     situarecommon.h
 QT += network \
     webkit

diff --git a/src/ui/mapviewscreen.cpp b/src/ui/mapviewscreen.cpp
index 06c7d80..f0da52e 100644 (file)
--- a/src/ui/mapviewscreen.cpp
+++ b/src/ui/mapviewscreen.cpp
@@ -55,9 +55,9 @@ MapViewScreen::MapViewScreen(QWidget *parent)
             m_mapEngine, SLOT(viewZoomFinished()));
 
     connect(this, SIGNAL(zoomInKeyPressed()),
-            mapEngine, SLOT(zoomIn()));
+            m_mapEngine, SLOT(zoomIn()));
     connect(this, SIGNAL(zoomOutKeyPressed()),
-            mapEngine, SLOT(zoomOut()));
+            m_mapEngine, SLOT(zoomOut()));
 
     connect(mapView, SIGNAL(viewResizedNewSize(int,int)),
             this, SLOT(drawOsmLicense(int, int)));