Renamed /src/situarecommon.h to /src/common.h

Reviewed by: Kaj Wallin

diff --git a/src/common.h b/src/common.h
new file mode 100644 (file)
index 0000000..89b7ea0
--- /dev/null
+++ b/src/common.h
@@ -0,0 +1,31 @@
+/*
+   Situare - A location system for Facebook
+   Copyright (C) 2010  Ixonos Plc. Authors:
+
+       Jussi Laitinen - jussi.laitinen@ixonos.com
+
+   Situare is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License
+   version 2 as published by the Free Software Foundation.
+
+   Situare is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Situare; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+   USA.
+*/
+
+#ifndef COMMON_H
+#define COMMON_H
+
+#include <QString>
+
+// QSettings identifiers
+const QString DIRECTORY_NAME = "Ixonos";
+const QString FILE_NAME = "Situare";
+
+#endif // COMMON_H

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 5572afc..a3dd8d9 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -22,7 +22,7 @@
  */
 
 #include "engine.h"
-#include "situarecommon.h"
+#include "common.h"
 #include "ui/mainwindow.h"
 #include "gps/gpspositioninterface.h"
 

diff --git a/src/facebookservice/facebookauthentication.cpp b/src/facebookservice/facebookauthentication.cpp
index 6e65072..b28fc63 100644 (file)
--- a/src/facebookservice/facebookauthentication.cpp
+++ b/src/facebookservice/facebookauthentication.cpp
@@ -33,7 +33,7 @@
 
 #include "facebookauthentication.h"
 #include "facebookcommon.h"
-#include "situarecommon.h"
+#include "common.h"
 #include "parser.h"
 
 FacebookAuthentication::FacebookAuthentication(QObject *parent)

diff --git a/src/situarecommon.h b/src/situarecommon.h
deleted file mode 100644 (file)
index fa8da52..0000000
--- a/src/situarecommon.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-   Situare - A location system for Facebook
-   Copyright (C) 2010  Ixonos Plc. Authors:
-
-       Jussi Laitinen - jussi.laitinen@ixonos.com
-
-   Situare is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   version 2 as published by the Free Software Foundation.
-
-   Situare is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Situare; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
-   USA.
-*/
-
-#ifndef SITUARECOMMON_H
-#define SITUARECOMMON_H
-
-#include <QString>
-
-// QSettings identifiers
-const QString DIRECTORY_NAME = "Ixonos";
-const QString FILE_NAME = "Situare";
-
-#endif // SITUARECOMMON_H

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

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index ffb301b..f7f555f 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -31,7 +31,7 @@
 #include "mapviewscreen.h"
 #include "settingsdialog.h"
 #include "facebookservice/facebookauthentication.h"
-#include "situarecommon.h"
+#include "common.h"
 
 #include <QtGui/QX11Info>
 #include <X11/Xlib.h>

diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp
index 9dcc31f..98d0d1f 100644 (file)
--- a/src/ui/settingsdialog.cpp
+++ b/src/ui/settingsdialog.cpp
@@ -21,7 +21,7 @@
 
 #include <QtGui>
 #include <QDebug>
-#include "situarecommon.h"
+#include "common.h"
 #include "settingsdialog.h"
 
 const QString AUTOMATIC_LOCATION_UPDATE("Automatic_location_update");