Renamed common.h to mapcommon.h and moved to src/map.

diff --git a/src/common.h b/src/common.h
deleted file mode 100644 (file)
index dcd3399..0000000
--- a/src/common.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef COMMON_H
-#define COMMON_H
-
-#include <QtCore>
-
-static const int TILE_SIZE_X = 256; ///< Tile image size in x direction
-static const int TILE_SIZE_Y = 256; ///< Tile image size in y direction
-
-static const int MIN_MAP_ZOOM_LEVEL = 0; ///< Minimum zoom level
-static const int MAX_MAP_ZOOM_LEVEL = 18; ///< Maximum zoom level
-static const int MIN_MAP_SCENE_NORMAL_LEVEL = MAX_MAP_ZOOM_LEVEL + 1;
-
-static const int ZOOM_FPS = 30; ///< FPS for the zoom effect
-static const qreal ZOOM_TIME = 0.25; ///< Length of the zoom effect (seconds)
-
-static const qreal MIN_LATITUDE = -85.0511; ///< Minimum latitude value
-static const qreal MAX_LATITUDE = 85.0511;  ///< Maximum latitude value
-static const qreal MIN_LONGITUDE = -180.0;  ///< Minimum longitude value
-static const qreal MAX_LONGITUDE = 180.0;  ///< Maximum longitude value
-
-static const int GRID_WIDTH = 4;
-static const int GRID_HEIGHT = 4;
-static const int GRID_PADDING = 1;
-
-/**
-* \var UNDEFINED
-* \brief Value to be used when zoom level, tile numbers or position are not defined
-*/
-static const int UNDEFINED = -1;
-
-#endif // COMMON_H

diff --git a/src/map/mapengine.h b/src/map/mapengine.h
index eca611f..127af9f 100644 (file)
--- a/src/map/mapengine.h
+++ b/src/map/mapengine.h
@@ -25,7 +25,7 @@
 
 #include <QtCore>
 
-#include "common.h"
+#include "mapcommon.h"
 #include "mapfetcher.h"
 #include "mapscene.h"
 #include "maptile.h"

diff --git a/src/map/maptile.cpp b/src/map/maptile.cpp
index 6cf0733..7e63a52 100644 (file)
--- a/src/map/maptile.cpp
+++ b/src/map/maptile.cpp
@@ -22,7 +22,7 @@
 #include <QDebug>
 #include <QTransform>
 
-#include "common.h"
+#include "mapcommon.h"
 #include "mapengine.h"
 #include "maptile.h"
 

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index fe86baf..827cc7c 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -32,7 +32,7 @@
     #include <QAbstractKineticScroller>
 #endif // Q_WS_MAEMO_5
 
-#include "common.h"
+#include "mapcommon.h"
 #include "mapview.h"
 
 MapView::MapView(QWidget *parent) : QGraphicsView(parent)

diff --git a/src/src.pro b/src/src.pro
index 32081e4..1e08da3 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,13 +1,8 @@
-#-------------------------------------------------
-#
+# -------------------------------------------------
 # Project created by QtCreator 2010-03-26T07:57:35
-#
-#-------------------------------------------------
-
+# -------------------------------------------------
 TARGET = ../situare
 TEMPLATE = app
-
-
 SOURCES += main.cpp \
     ui/mainwindow.cpp \
     ui/mapviewscreen.cpp \
@@ -17,7 +12,6 @@ SOURCES += main.cpp \
     map/mapscene.cpp \
     map/maptile.cpp \
     map/mapfetcher.cpp
-    
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
     ui/listviewscreen.h \
@@ -26,14 +20,12 @@ HEADERS += ui/mainwindow.h \
     map/mapscene.h \
     map/maptile.h \
     map/mapfetcher.h \
-    common.h
-
+    map/mapcommon.h
 QT += network \
-      webkit
-
+    webkit
 
 # use don't use OpenGL when building in scratchbox
-!maemo5 {
+!maemo5 { 
     QT += opengl
     message(OpenGL built in)
     message(Make sure you have OpenGL development headers installed)
@@ -41,28 +33,23 @@ QT += network \
 }
 
 # -----------------------------------------------------------------
-#                      Debian packetizing additions
+# Debian packetizing additions
 # -----------------------------------------------------------------
-unix {
-#VARIABLES
-    isEmpty(PREFIX) {
-        PREFIX = /usr
-    }
-BINDIR = $$PREFIX/bin
-DATADIR =$$PREFIX/share
-
-DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
-
-#MAKE INSTALL
-
-desktop.path = $$DATADIR/applications/hildon
-desktop.files += situare.desktop
-INSTALLS += desktop
-
-icon26.path = $$DATADIR/icons/hicolor/26x26/apps
-icon26.files += situare.png
-INSTALLS += icon26
-
-target.path = $$BINDIR
-INSTALLS += target
+unix { 
+    # VARIABLES
+    isEmpty(PREFIX):PREFIX = /usr
+    BINDIR = $$PREFIX/bin
+    DATADIR = $$PREFIX/share
+    DEFINES += DATADIR=\\\"$$DATADIR\\\" \
+        PKGDATADIR=\\\"$$PKGDATADIR\\\"
+    
+    # MAKE INSTALL
+    desktop.path = $$DATADIR/applications/hildon
+    desktop.files += situare.desktop
+    INSTALLS += desktop
+    icon26.path = $$DATADIR/icons/hicolor/26x26/apps
+    icon26.files += situare.png
+    INSTALLS += icon26
+    target.path = $$BINDIR
+    INSTALLS += target
 }