From fabe2265bcdeaaa6392553f5470fe6eeb1b98e41 Mon Sep 17 00:00:00 2001 From: Pekka Nissinen Date: Fri, 14 May 2010 13:42:10 +0300 Subject: [PATCH] Made a few cosmetic changes --- src/engine/engine.cpp | 2 +- src/facebookservice/facebookauthentication.cpp | 2 +- src/map/mapengine.cpp | 3 ++- src/map/mapengine.h | 1 - src/ui/friendlistitem.cpp | 3 ++- src/ui/friendlistpanel.cpp | 3 ++- src/ui/mainwindow.cpp | 4 ++-- src/ui/mapviewscreen.cpp | 19 +++++++++---------- src/ui/mapviewscreen.h | 1 - src/ui/zoombuttonpanel.cpp | 1 + src/ui/zoombuttonpanel.h | 7 ++----- 11 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index 4f69067..2587f0d 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp @@ -21,8 +21,8 @@ USA. */ -#include "situarecommon.h" #include "engine.h" +#include "situarecommon.h" #include "ui/mainwindow.h" #include "gps/gpspositioninterface.h" diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp index 2f41d0e..687470e 100644 --- a/src/facebookservice/facebookauthentication.cpp +++ b/src/facebookservice/facebookauthentication.cpp @@ -31,9 +31,9 @@ #include #endif // Q_WS_MAEMO_5 -#include "situarecommon.h" #include "facebookauthentication.h" #include "facebookcommon.h" +#include "situarecommon.h" #include "parser.h" FacebookAuthentication::FacebookAuthentication(QObject *parent) diff --git a/src/map/mapengine.cpp b/src/map/mapengine.cpp index 78e3c87..256f0a2 100644 --- a/src/map/mapengine.cpp +++ b/src/map/mapengine.cpp @@ -32,6 +32,7 @@ #include #include "frienditemshandler.h" +#include "mapcommon.h" #include "mapengine.h" #include "maptile.h" @@ -315,7 +316,7 @@ QPoint MapEngine::convertLatLonToSceneCoordinate(QPointF latLonCoordinate) qreal y = static_cast((1.0 - log(tan(latitude * M_PI / 180.0) + 1.0 / cos(latitude * M_PI / 180.0)) / M_PI) / 2.0); - return QPointF(x*z*TILE_SIZE_X, y*z*TILE_SIZE_Y).toPoint(); + return QPointF(x * z * TILE_SIZE_X, y * z * TILE_SIZE_Y).toPoint(); } void MapEngine::receiveOwnLocation(User *user) diff --git a/src/map/mapengine.h b/src/map/mapengine.h index 84bf50b..e773169 100644 --- a/src/map/mapengine.h +++ b/src/map/mapengine.h @@ -27,7 +27,6 @@ #include -#include "mapcommon.h" #include "mapfetcher.h" #include "mapscene.h" #include "maptile.h" diff --git a/src/ui/friendlistitem.cpp b/src/ui/friendlistitem.cpp index ee7e8eb..e3e5996 100644 --- a/src/ui/friendlistitem.cpp +++ b/src/ui/friendlistitem.cpp @@ -123,7 +123,8 @@ FriendListItem::FriendListItem(QWidget *parent) m_backgroundMiddleImage.load(":/res/images/list_item_middle.png"); m_backgroundBottomImage.load(":/res/images/list_item_bottom.png"); - connect(m_findButton, SIGNAL(clicked()), this, SLOT(findButtonClicked())); + connect(m_findButton, SIGNAL(clicked()), + this, SLOT(findButtonClicked())); } void FriendListItem::setData(User *user) diff --git a/src/ui/friendlistpanel.cpp b/src/ui/friendlistpanel.cpp index 47e4b8e..27e2814 100644 --- a/src/ui/friendlistpanel.cpp +++ b/src/ui/friendlistpanel.cpp @@ -83,7 +83,8 @@ void FriendListPanel::friendInfoReceived(QList &friendList) foreach (User *user, friendList) { FriendListItem *item = new FriendListItem(m_friendListView); item->setData(user); - connect(item, SIGNAL(findFriend(QPointF)), this, SIGNAL(findFriend(QPointF))); + connect(item, SIGNAL(findFriend(QPointF)), + this, SIGNAL(findFriend(QPointF))); m_friendListView->addWidget(item); } } diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 30f917c..6fd9bbb 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -57,8 +57,8 @@ MainWindow::MainWindow(QWidget *parent) connect(this, SIGNAL(reverseGeoReady(QString)), m_locationDialog, SLOT(setAddress(QString))); - connect(m_locationDialog, SIGNAL(statusUpdate(QString,bool)), - this, SIGNAL(statusUpdate(QString,bool))); + connect(m_locationDialog, SIGNAL(statusUpdate(QString, bool)), + this, SIGNAL(statusUpdate(QString, bool))); connect(this, SIGNAL(userLocationReady(User*)), m_mapViewScreen, SIGNAL(userLocationReady(User*))); diff --git a/src/ui/mapviewscreen.cpp b/src/ui/mapviewscreen.cpp index f0da52e..c9dff1c 100644 --- a/src/ui/mapviewscreen.cpp +++ b/src/ui/mapviewscreen.cpp @@ -20,8 +20,7 @@ */ #include "mapviewscreen.h" -#include "../map/mapview.h" -#include "../map/mapengine.h" +#include "map/mapview.h" #include "panelcommon.h" #include "panelsidebar.h" @@ -59,14 +58,14 @@ MapViewScreen::MapViewScreen(QWidget *parent) connect(this, SIGNAL(zoomOutKeyPressed()), m_mapEngine, SLOT(zoomOut())); - connect(mapView, SIGNAL(viewResizedNewSize(int,int)), + connect(mapView, SIGNAL(viewResizedNewSize(int, int)), this, SLOT(drawOsmLicense(int, int))); - connect(mapView, SIGNAL(viewResizedNewSize(int,int)), - m_friendsListPanel, SLOT(reDrawFriendsPanel(int,int))); - connect(mapView, SIGNAL(viewResizedNewSize(int,int)), - m_userPanel, SLOT(reDrawUserPanel(int,int))); - connect(mapView, SIGNAL(viewResizedNewSize(int,int)), - friendsListPanelSidebar, SLOT(reDrawSidebar(int,int))); + connect(mapView, SIGNAL(viewResizedNewSize(int, int)), + m_friendsListPanel, SLOT(reDrawFriendsPanel(int, int))); + connect(mapView, SIGNAL(viewResizedNewSize(int, int)), + m_userPanel, SLOT(reDrawUserPanel(int, int))); + connect(mapView, SIGNAL(viewResizedNewSize(int, int)), + friendsListPanelSidebar, SLOT(reDrawSidebar(int, int))); connect(m_zoomButtonPanel->m_zoomInBtn, SIGNAL(clicked()), m_mapEngine, SLOT(zoomIn())); @@ -91,7 +90,7 @@ MapViewScreen::MapViewScreen(QWidget *parent) m_osmLicense = new QLabel(this); m_osmLicense->setAttribute(Qt::WA_TranslucentBackground, true); m_osmLicense->setAttribute(Qt::WA_TransparentForMouseEvents, true); - m_osmLicense->setText(""+OSM_LICENSE+""); + m_osmLicense->setText("" + OSM_LICENSE + ""); m_osmLicense->setFont(QFont("Nokia Sans", 9)); m_osmLicense->resize(m_osmLicense->fontMetrics().width(OSM_LICENSE), m_osmLicense->fontMetrics().height()); diff --git a/src/ui/mapviewscreen.h b/src/ui/mapviewscreen.h index 3793db9..e5959a3 100644 --- a/src/ui/mapviewscreen.h +++ b/src/ui/mapviewscreen.h @@ -51,7 +51,6 @@ public: * MEMBER FUNCTIONS AND SLOTS ******************************************************************************/ private slots: - /** * @brief Slot for enabling auto centering. * diff --git a/src/ui/zoombuttonpanel.cpp b/src/ui/zoombuttonpanel.cpp index fa6ad64..5f357ea 100644 --- a/src/ui/zoombuttonpanel.cpp +++ b/src/ui/zoombuttonpanel.cpp @@ -20,6 +20,7 @@ */ #include +#include #include "zoombuttonpanel.h" #include "panelcommon.h" diff --git a/src/ui/zoombuttonpanel.h b/src/ui/zoombuttonpanel.h index aab6dee..a28c5a9 100644 --- a/src/ui/zoombuttonpanel.h +++ b/src/ui/zoombuttonpanel.h @@ -22,13 +22,10 @@ #ifndef ZOOMBUTTONPANEL_H #define ZOOMBUTTONPANEL_H -#include #include -#include -#include +#include #include -#include -#include +#include #include "imagebutton.h" -- 1.7.9.5