Renamed situareservice, added situareservice class, cookiehandler class and related...

diff --git a/src/situare_service/README.txt b/src/situare_service/README.txt
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/src.pro b/src/src.pro
index 353b8c1..7145f9b 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,10 +6,17 @@ TEMPLATE = app
 SOURCES += main.cpp \
     ui/mainwindow.cpp \
     ui/mapviewscreen.cpp \
-    ui/listviewscreen.cpp
+    ui/listviewscreen.cpp \
+    situareservice/situareservice.cpp \
+    cookiehandler/cookiehandler.cpp
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
-    ui/listviewscreen.h
+    ui/listviewscreen.h \
+    situareservice/situareservice.h \
+    situareservice/situarecommon.h \
+    cookiehandler/cookiehandler.h
+QT += core \
+    network
 
 # -----------------------------------------------------------------
 # Debian packetizing additions

diff --git a/tests/testUI/testtabs/testtabs b/tests/testUI/testtabs/testtabs
deleted file mode 100755 (executable)
index 0fce2ba..0000000
Binary files a/tests/testUI/testtabs/testtabs and /dev/null differ

diff --git a/tests/testUI/testtabs/testtabs.cpp b/tests/testUI/testtabs/testtabs.cpp
deleted file mode 100644 (file)
index cc96df6..0000000
--- a/tests/testUI/testtabs/testtabs.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
- /*
-    Situare - A location system for Facebook
-    Copyright (C) 2010  Ixonos Plc. Authors:
-
-        Kaj Wallin - kaj.wallin@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.
- */
-
-#include <QtTest/QtTest>
-#include <QtCore>
-#include <QtGui>
-
-#include "../../../src/ui/mapviewscreen.h"
-#include "../../../src/ui/listviewscreen.h"
-#include "../../../src/ui/mainwindow.h"
-
-class testTabs : public QObject
-{
-    Q_OBJECT
-private slots:
-    void testTabChanges();
-};
-
-void testTabs::testTabChanges()
-{
-    MainWindow mainwindow;
-    mainwindow.toListView();
-    QCOMPARE(mainwindow.getViewIndex(), 0);
-    mainwindow.toMapView();
-    QCOMPARE(mainwindow.getViewIndex(), 1);
-    mainwindow.toMapView();
-    QCOMPARE(mainwindow.getViewIndex(), 1);
-    mainwindow.toListView();
-    QCOMPARE(mainwindow.getViewIndex(), 0);
-}
-
-QTEST_MAIN(testTabs)
-#include "testtabs.moc"

diff --git a/tests/testUI/testtabs/testtabs.pro b/tests/testUI/testtabs/testtabs.pro
deleted file mode 100644 (file)
index 33542ea..0000000
--- a/tests/testUI/testtabs/testtabs.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Wed Mar 31 10:55:19 2010
-######################################################################
-
-CONFIG += qtestlib
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-HEADERS += ../../../src/ui/mapviewscreen.h \
-           ../../../src/ui/listviewscreen.h \
-           ../../../src/ui/mainwindow.h \
-           testtabs.moc
-SOURCES += testtabs.cpp \
-           ../../../src/ui/mapviewscreen.cpp \
-           ../../../src/ui/listviewscreen.cpp \
-           ../../../src/ui/mainwindow.cpp