Renamed SituareListView and SituareMapView classes to ListViewScreen

and MapViewScreen. Renamed source and header files similarly to follow
naming convention. Also edited testtabs test to reflect the change.

diff --git a/Situare.pro b/Situare.pro
index 7feb438..c9acacc 100644 (file)
--- a/Situare.pro
+++ b/Situare.pro
@@ -5,8 +5,8 @@ TARGET = Situare
 TEMPLATE = app
 SOURCES += src/main.cpp \
     src/ui/mainwindow.cpp \
-    src/ui/listviewtab.cpp \
-    src/ui/mapviewtab.cpp
+    src/ui/listviewscreen.cpp \
+    src/ui/mapviewscreen.cpp
 HEADERS += src/ui/mainwindow.h \
-    src/ui/listviewtab.h \
-    src/ui/mapviewtab.h
+    src/ui/listviewscreen.h \
+    src/ui/mapviewscreen.h

diff --git a/src/ui/listviewscreen.cpp b/src/ui/listviewscreen.cpp
new file mode 100644 (file)
index 0000000..c1084d2
--- /dev/null
+++ b/src/ui/listviewscreen.cpp
@@ -0,0 +1,31 @@
+/*
+   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 "listviewscreen.h"
+
+ListViewScreen::ListViewScreen(QWidget *parent)
+   : QWidget(parent)
+{
+   QPushButton *listViewButton = new QPushButton(tr("This is listview"));
+   QHBoxLayout *listViewLayout = new QHBoxLayout;
+   listViewLayout->addWidget(listViewButton);
+   setLayout(listViewLayout);
+}

diff --git a/src/ui/listviewscreen.h b/src/ui/listviewscreen.h
new file mode 100644 (file)
index 0000000..fbefb6b
--- /dev/null
+++ b/src/ui/listviewscreen.h
@@ -0,0 +1,39 @@
+ /*
+    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.
+ */
+
+
+#ifndef LISTVIEWTAB_H
+#define LISTVIEWTAB_H
+
+#include <QtGui>
+
+/**
+* @brief List View class. Used for displaying List of friends
+*
+* @class ListViewScreen mainwindow.h "src/ui/mainwindow.h"
+*/
+class ListViewScreen : public QWidget
+{
+public:
+    ListViewScreen(QWidget *parent = 0);
+};
+
+#endif // LISTVIEWTAB_H

diff --git a/src/ui/listviewtab.cpp b/src/ui/listviewtab.cpp
deleted file mode 100644 (file)
index b32684e..0000000
--- a/src/ui/listviewtab.cpp
+++ /dev/null
@@ -1,31 +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 "listviewtab.h"
-
-SituareListView::SituareListView(QWidget *parent)
-   : QWidget(parent)
-{
-   QPushButton *listViewButton = new QPushButton(tr("This is listview"));
-   QHBoxLayout *listViewLayout = new QHBoxLayout;
-   listViewLayout->addWidget(listViewButton);
-   setLayout(listViewLayout);
-}

diff --git a/src/ui/listviewtab.h b/src/ui/listviewtab.h
deleted file mode 100644 (file)
index 1dc669a..0000000
--- a/src/ui/listviewtab.h
+++ /dev/null
@@ -1,39 +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.
- */
-
-
-#ifndef LISTVIEWTAB_H
-#define LISTVIEWTAB_H
-
-#include <QtGui>
-
-/**
-* @brief List View class. Used for displaying List of friends
-*
-* @class SituareListView mainwindow.h "src/ui/mainwindow.h"
-*/
-class SituareListView : public QWidget
-{
-public:
-    SituareListView(QWidget *parent = 0);
-};
-
-#endif // LISTVIEWTAB_H

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index ada24b9..1d8ff63 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -22,8 +22,8 @@
 
 #include <QtGui>
 #include "mainwindow.h"
-#include "listviewtab.h"
-#include "mapviewtab.h"
+#include "listviewscreen.h"
+#include "mapviewscreen.h"
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -68,8 +68,8 @@ void MainWindow::createViews()
 {
     qDebug() << __PRETTY_FUNCTION__;
     situareViews = new QStackedWidget(this);
-    situareViews->addWidget(new SituareListView(this));
-    situareViews->addWidget(new SituareMapView(this));
+    situareViews->addWidget(new ListViewScreen(this));
+    situareViews->addWidget(new MapViewScreen(this));
 }
 
 void MainWindow::toListView()

diff --git a/src/ui/mapviewscreen.cpp b/src/ui/mapviewscreen.cpp
new file mode 100644 (file)
index 0000000..e05de43
--- /dev/null
+++ b/src/ui/mapviewscreen.cpp
@@ -0,0 +1,31 @@
+/*
+   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 "mapviewscreen.h"
+
+MapViewScreen::MapViewScreen(QWidget *parent)
+   : QWidget(parent)
+{
+   QPushButton *mapViewButton = new QPushButton(tr("This is MAPVIEW"));
+   QHBoxLayout *mapViewLayout = new QHBoxLayout;
+   mapViewLayout->addWidget(mapViewButton);
+   setLayout(mapViewLayout);
+}

diff --git a/src/ui/mapviewscreen.h b/src/ui/mapviewscreen.h
new file mode 100644 (file)
index 0000000..394dd4f
--- /dev/null
+++ b/src/ui/mapviewscreen.h
@@ -0,0 +1,39 @@
+ /*
+    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.
+ */
+
+
+#ifndef MAPVIEWTAB_H
+#define MAPVIEWTAB_H
+
+#include <QtGui>
+
+/**
+* @brief Map View class. Used to display Map
+*
+* @class MapViewScreen mainwindow.h "src/ui/mainwindow.h"
+*/
+class MapViewScreen : public QWidget
+{
+public:
+    MapViewScreen(QWidget *parent = 0);
+};
+
+#endif // MAPVIEWTAB_H

diff --git a/src/ui/mapviewtab.cpp b/src/ui/mapviewtab.cpp
deleted file mode 100644 (file)
index 37c65be..0000000
--- a/src/ui/mapviewtab.cpp
+++ /dev/null
@@ -1,31 +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 "mapviewtab.h"
-
-SituareMapView::SituareMapView(QWidget *parent)
-   : QWidget(parent)
-{
-   QPushButton *mapViewButton = new QPushButton(tr("This is MAPVIEW"));
-   QHBoxLayout *mapViewLayout = new QHBoxLayout;
-   mapViewLayout->addWidget(mapViewButton);
-   setLayout(mapViewLayout);
-}

diff --git a/src/ui/mapviewtab.h b/src/ui/mapviewtab.h
deleted file mode 100644 (file)
index 9d2c2ae..0000000
--- a/src/ui/mapviewtab.h
+++ /dev/null
@@ -1,39 +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.
- */
-
-
-#ifndef MAPVIEWTAB_H
-#define MAPVIEWTAB_H
-
-#include <QtGui>
-
-/**
-* @brief Map View class. Used to display Map
-*
-* @class SituareMapView mainwindow.h "src/ui/mainwindow.h"
-*/
-class SituareMapView : public QWidget
-{
-public:
-    SituareMapView(QWidget *parent = 0);
-};
-
-#endif // MAPVIEWTAB_H

diff --git a/tests/testUI/testtabs/testtabs b/tests/testUI/testtabs/testtabs
index 5c780c2..9ed46ce 100755 (executable)
Binary files a/tests/testUI/testtabs/testtabs and b/tests/testUI/testtabs/testtabs differ

diff --git a/tests/testUI/testtabs/testtabs.cpp b/tests/testUI/testtabs/testtabs.cpp
index 875af9c..8bca579 100644 (file)
--- a/tests/testUI/testtabs/testtabs.cpp
+++ b/tests/testUI/testtabs/testtabs.cpp
@@ -23,8 +23,8 @@
 #include <QtCore>
 #include <QtGui>
 
-#include "../../../src/ui/mapviewtab.h"
-#include "../../../src/ui/listviewtab.h"
+#include "../../../src/ui/mapviewscreen.h"
+#include "../../../src/ui/listviewscreen.h"
 #include "../../../src/ui/mainwindow.h"
 
 class testTabs : public QObject

diff --git a/tests/testUI/testtabs/testtabs.pro b/tests/testUI/testtabs/testtabs.pro
index c4f7930..33542ea 100644 (file)
--- a/tests/testUI/testtabs/testtabs.pro
+++ b/tests/testUI/testtabs/testtabs.pro
@@ -9,11 +9,11 @@ DEPENDPATH += .
 INCLUDEPATH += .
 
 # Input
-HEADERS += ../../../src/ui/mapviewtab.h \
-           ../../../src/ui/listviewtab.h \
+HEADERS += ../../../src/ui/mapviewscreen.h \
+           ../../../src/ui/listviewscreen.h \
            ../../../src/ui/mainwindow.h \
            testtabs.moc
 SOURCES += testtabs.cpp \
-           ../../../src/ui/mapviewtab.cpp \
-           ../../../src/ui/listviewtab.cpp \
+           ../../../src/ui/mapviewscreen.cpp \
+           ../../../src/ui/listviewscreen.cpp \
            ../../../src/ui/mainwindow.cpp