Fixed earlier commit

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..2e47ba7
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,210 @@
+#############################################################################
+# Makefile for building: Situare
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri Mar 26 10:35:39 2010
+# Project:  Situare.pro
+# Template: app
+# Command: /home/lampehe-local/qtsdk-2010.02/qt/bin/qmake -spec ../../qtsdk-2010.02/qt/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Situare.pro
+#############################################################################
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS        = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS      = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
+INCPATH       = -I../../qtsdk-2010.02/qt/mkspecs/linux-g++ -I. -I../../qtsdk-2010.02/qt/include/QtCore -I../../qtsdk-2010.02/qt/include/QtGui -I../../qtsdk-2010.02/qt/include -I.
+LINK          = g++
+LFLAGS        = -Wl,-rpath,/home/lampehe-local/qtsdk-2010.02/qt/lib
+LIBS          = $(SUBLIBS)  -L/home/lampehe-local/qtsdk-2010.02/qt/lib -lQtGui -L/home/lampehe-local/qtsdk-2010.02/qt/lib -L/usr/X11R6/lib -lQtCore -lpthread 
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /home/lampehe-local/qtsdk-2010.02/qt/bin/qmake
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = $(COPY)
+COPY_DIR      = $(COPY) -r
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR   = ./
+
+####### Files
+
+SOURCES       = src/main.cpp \
+               src/ui/mainwindow.cpp moc_mainwindow.cpp
+OBJECTS       = main.o \
+               mainwindow.o \
+               moc_mainwindow.o
+DIST          = ../../qtsdk-2010.02/qt/mkspecs/common/g++.conf \
+               ../../qtsdk-2010.02/qt/mkspecs/common/unix.conf \
+               ../../qtsdk-2010.02/qt/mkspecs/common/linux.conf \
+               ../../qtsdk-2010.02/qt/mkspecs/qconfig.pri \
+               ../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/debug.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/qt.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/moc.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/resources.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/uic.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/lex.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf \
+               Situare.pro
+QMAKE_TARGET  = Situare
+DESTDIR       = 
+TARGET        = Situare
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+       $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(OBJECTS)  
+       $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: Situare.pro  ../../qtsdk-2010.02/qt/mkspecs/linux-g++/qmake.conf ../../qtsdk-2010.02/qt/mkspecs/common/g++.conf \
+               ../../qtsdk-2010.02/qt/mkspecs/common/unix.conf \
+               ../../qtsdk-2010.02/qt/mkspecs/common/linux.conf \
+               ../../qtsdk-2010.02/qt/mkspecs/qconfig.pri \
+               ../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/debug.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/qt.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/moc.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/resources.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/uic.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/lex.prf \
+               ../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf \
+               /home/lampehe-local/qtsdk-2010.02/qt/lib/libQtGui.prl \
+               /home/lampehe-local/qtsdk-2010.02/qt/lib/libQtCore.prl
+       $(QMAKE) -spec ../../qtsdk-2010.02/qt/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Situare.pro
+../../qtsdk-2010.02/qt/mkspecs/common/g++.conf:
+../../qtsdk-2010.02/qt/mkspecs/common/unix.conf:
+../../qtsdk-2010.02/qt/mkspecs/common/linux.conf:
+../../qtsdk-2010.02/qt/mkspecs/qconfig.pri:
+../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/debug.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/qt.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/moc.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/resources.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/uic.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/lex.prf:
+../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf:
+/home/lampehe-local/qtsdk-2010.02/qt/lib/libQtGui.prl:
+/home/lampehe-local/qtsdk-2010.02/qt/lib/libQtCore.prl:
+qmake:  FORCE
+       @$(QMAKE) -spec ../../qtsdk-2010.02/qt/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Situare.pro
+
+dist: 
+       @$(CHK_DIR_EXISTS) .tmp/Situare1.0.0 || $(MKDIR) .tmp/Situare1.0.0 
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/Situare1.0.0/ && $(COPY_FILE) --parents src/ui/mainwindow.h .tmp/Situare1.0.0/ && $(COPY_FILE) --parents src/main.cpp src/ui/mainwindow.cpp .tmp/Situare1.0.0/ && (cd `dirname .tmp/Situare1.0.0` && $(TAR) Situare1.0.0.tar Situare1.0.0 && $(COMPRESS) Situare1.0.0.tar) && $(MOVE) `dirname .tmp/Situare1.0.0`/Situare1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/Situare1.0.0
+
+
+clean:compiler_clean 
+       -$(DEL_FILE) $(OBJECTS)
+       -$(DEL_FILE) *~ core *.core
+
+
+####### Sub-libraries
+
+distclean: clean
+       -$(DEL_FILE) $(TARGET) 
+       -$(DEL_FILE) Makefile
+
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+compiler_moc_header_make_all: moc_mainwindow.cpp
+compiler_moc_header_clean:
+       -$(DEL_FILE) moc_mainwindow.cpp
+moc_mainwindow.cpp: src/ui/mainwindow.h
+       /home/lampehe-local/qtsdk-2010.02/qt/bin/moc $(DEFINES) $(INCPATH) src/ui/mainwindow.h -o moc_mainwindow.cpp
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_image_collection_make_all: qmake_image_collection.cpp
+compiler_image_collection_clean:
+       -$(DEL_FILE) qmake_image_collection.cpp
+compiler_moc_source_make_all:
+compiler_moc_source_clean:
+compiler_uic_make_all:
+compiler_uic_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean: compiler_moc_header_clean 
+
+####### Compile
+
+main.o: src/main.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o src/main.cpp
+
+mainwindow.o: src/ui/mainwindow.cpp src/ui/mainwindow.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o src/ui/mainwindow.cpp
+
+moc_mainwindow.o: moc_mainwindow.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp
+
+####### Install
+
+install:   FORCE
+
+uninstall:   FORCE
+
+FORCE:
+

diff --git a/Situare.pro b/Situare.pro
new file mode 100644 (file)
index 0000000..26f1ef4
--- /dev/null
+++ b/Situare.pro
@@ -0,0 +1,14 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2010-03-26T07:57:35
+#
+#-------------------------------------------------
+
+TARGET = Situare
+TEMPLATE = app
+
+
+SOURCES += src/main.cpp\
+        src/ui/mainwindow.cpp
+
+HEADERS  += src/ui/mainwindow.h

diff --git a/src/main.cpp b/src/main.cpp
new file mode 100644 (file)
index 0000000..b5978ac
--- /dev/null
+++ b/src/main.cpp
@@ -0,0 +1,32 @@
+/*
+    Situare - A location system for Facebook
+    Copyright (C) 2010  Ixonos Plc. Authors:
+
+       Henri Lampela - henri.lampela@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 <QtGui/QApplication>
+#include "ui/mainwindow.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    MainWindow w;
+    w.show();
+    return a.exec();
+}

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
new file mode 100644 (file)
index 0000000..bf1473b
--- /dev/null
+++ b/src/ui/mainwindow.cpp
@@ -0,0 +1,34 @@
+/*
+    Situare - A location system for Facebook
+    Copyright (C) 2010  Ixonos Plc. Authors:
+
+       Henri Lampela - henri.lampela@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 "mainwindow.h"
+
+MainWindow::MainWindow(QWidget *parent)
+    : QMainWindow(parent)
+{
+    this->setWindowTitle(tr("Situare"));
+}
+
+MainWindow::~MainWindow()
+{
+
+}

diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
new file mode 100644 (file)
index 0000000..78c5ceb
--- /dev/null
+++ b/src/ui/mainwindow.h
@@ -0,0 +1,36 @@
+/*
+    Situare - A location system for Facebook
+    Copyright (C) 2010  Ixonos Plc. Authors:
+
+       Henri Lampela - henri.lampela@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 MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QtGui/QMainWindow>
+
+class MainWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+    MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+};
+
+#endif // MAINWINDOW_H

diff --git a/tests/testUI/Makefile b/tests/testUI/Makefile
new file mode 100644 (file)
index 0000000..199bad7
--- /dev/null
+++ b/tests/testUI/Makefile
@@ -0,0 +1,221 @@
+#############################################################################
+# Makefile for building: testUI
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri Mar 26 11:22:21 2010
+# Project:  testUI.pro
+# Template: app
+# Command: /home/lampehe-local/qtsdk-2010.02/qt/bin/qmake -unix -o Makefile testUI.pro
+#############################################################################
+
+####### Compiler, tools and options
+
+CC            = gcc
+CXX           = g++
+DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS        = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS      = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
+INCPATH       = -I../../../../qtsdk-2010.02/qt/mkspecs/linux-g++ -I. -I../../../../qtsdk-2010.02/qt/include/QtCore -I../../../../qtsdk-2010.02/qt/include/QtGui -I../../../../qtsdk-2010.02/qt/include -I../../../../qtsdk-2010.02/qt/include/QtTest -I. -I.
+LINK          = g++
+LFLAGS        = -Wl,-O1 -Wl,-rpath,/home/lampehe-local/qtsdk-2010.02/qt/lib
+LIBS          = $(SUBLIBS)  -L/home/lampehe-local/qtsdk-2010.02/qt/lib -lQtTest -L/home/lampehe-local/qtsdk-2010.02/qt/lib -lQtGui -L/usr/X11R6/lib -lQtCore -lpthread 
+AR            = ar cqs
+RANLIB        = 
+QMAKE         = /home/lampehe-local/qtsdk-2010.02/qt/bin/qmake
+TAR           = tar -cf
+COMPRESS      = gzip -9f
+COPY          = cp -f
+SED           = sed
+COPY_FILE     = $(COPY)
+COPY_DIR      = $(COPY) -r
+STRIP         = strip
+INSTALL_FILE  = install -m 644 -p
+INSTALL_DIR   = $(COPY_DIR)
+INSTALL_PROGRAM = install -m 755 -p
+DEL_FILE      = rm -f
+SYMLINK       = ln -f -s
+DEL_DIR       = rmdir
+MOVE          = mv -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
+
+####### Output directory
+
+OBJECTS_DIR   = ./
+
+####### Files
+
+SOURCES       = testui.cpp \
+               ../../src/ui/mainwindow.cpp moc_mainwindow.cpp
+OBJECTS       = testui.o \
+               mainwindow.o \
+               moc_mainwindow.o
+DIST          = ../../../../qtsdk-2010.02/qt/mkspecs/common/g++.conf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/common/unix.conf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/common/linux.conf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/qconfig.pri \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/release.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/qtestlib.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/qt.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/moc.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/resources.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/uic.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/lex.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf \
+               testUI.pro
+QMAKE_TARGET  = testUI
+DESTDIR       = 
+TARGET        = testUI
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+       $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile $(TARGET)
+
+$(TARGET):  $(OBJECTS)  
+       $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+Makefile: testUI.pro  ../../../../qtsdk-2010.02/qt/mkspecs/linux-g++/qmake.conf ../../../../qtsdk-2010.02/qt/mkspecs/common/g++.conf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/common/unix.conf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/common/linux.conf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/qconfig.pri \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/release.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/qtestlib.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/qt.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/moc.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/resources.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/uic.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/lex.prf \
+               ../../../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf \
+               /home/lampehe-local/qtsdk-2010.02/qt/lib/libQtTest.prl \
+               /home/lampehe-local/qtsdk-2010.02/qt/lib/libQtCore.prl \
+               /home/lampehe-local/qtsdk-2010.02/qt/lib/libQtGui.prl
+       $(QMAKE) -unix -o Makefile testUI.pro
+../../../../qtsdk-2010.02/qt/mkspecs/common/g++.conf:
+../../../../qtsdk-2010.02/qt/mkspecs/common/unix.conf:
+../../../../qtsdk-2010.02/qt/mkspecs/common/linux.conf:
+../../../../qtsdk-2010.02/qt/mkspecs/qconfig.pri:
+../../../../qtsdk-2010.02/qt/mkspecs/features/qt_functions.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/qt_config.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/exclusive_builds.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/default_pre.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/release.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/default_post.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/qtestlib.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/warn_on.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/qt.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/unix/thread.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/moc.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/resources.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/uic.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/yacc.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/lex.prf:
+../../../../qtsdk-2010.02/qt/mkspecs/features/include_source_dir.prf:
+/home/lampehe-local/qtsdk-2010.02/qt/lib/libQtTest.prl:
+/home/lampehe-local/qtsdk-2010.02/qt/lib/libQtCore.prl:
+/home/lampehe-local/qtsdk-2010.02/qt/lib/libQtGui.prl:
+qmake:  FORCE
+       @$(QMAKE) -unix -o Makefile testUI.pro
+
+dist: 
+       @$(CHK_DIR_EXISTS) .tmp/testUI1.0.0 || $(MKDIR) .tmp/testUI1.0.0 
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/testUI1.0.0/ && $(COPY_FILE) --parents ../../src/ui/mainwindow.h testui.moc .tmp/testUI1.0.0/ && $(COPY_FILE) --parents testui.cpp ../../src/ui/mainwindow.cpp .tmp/testUI1.0.0/ && (cd `dirname .tmp/testUI1.0.0` && $(TAR) testUI1.0.0.tar testUI1.0.0 && $(COMPRESS) testUI1.0.0.tar) && $(MOVE) `dirname .tmp/testUI1.0.0`/testUI1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/testUI1.0.0
+
+
+clean:compiler_clean 
+       -$(DEL_FILE) $(OBJECTS)
+       -$(DEL_FILE) *~ core *.core
+
+
+####### Sub-libraries
+
+distclean: clean
+       -$(DEL_FILE) $(TARGET) 
+       -$(DEL_FILE) Makefile
+
+
+mocclean: compiler_moc_header_clean compiler_moc_source_clean
+
+mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+
+compiler_moc_header_make_all: moc_mainwindow.cpp
+compiler_moc_header_clean:
+       -$(DEL_FILE) moc_mainwindow.cpp
+moc_mainwindow.cpp: ../../src/ui/mainwindow.h
+       /home/lampehe-local/qtsdk-2010.02/qt/bin/moc $(DEFINES) $(INCPATH) ../../src/ui/mainwindow.h -o moc_mainwindow.cpp
+
+compiler_rcc_make_all:
+compiler_rcc_clean:
+compiler_image_collection_make_all: qmake_image_collection.cpp
+compiler_image_collection_clean:
+       -$(DEL_FILE) qmake_image_collection.cpp
+compiler_moc_source_make_all: testui.moc
+compiler_moc_source_clean:
+       -$(DEL_FILE) testui.moc
+testui.moc: ../../src/ui/mainwindow.h \
+               testui.cpp
+       /home/lampehe-local/qtsdk-2010.02/qt/bin/moc $(DEFINES) $(INCPATH) testui.cpp -o testui.moc
+
+compiler_uic_make_all:
+compiler_uic_clean:
+compiler_yacc_decl_make_all:
+compiler_yacc_decl_clean:
+compiler_yacc_impl_make_all:
+compiler_yacc_impl_clean:
+compiler_lex_make_all:
+compiler_lex_clean:
+compiler_clean: compiler_moc_header_clean compiler_moc_source_clean 
+
+####### Compile
+
+testui.o: testui.cpp ../../src/ui/mainwindow.h \
+               testui.moc
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o testui.o testui.cpp
+
+mainwindow.o: ../../src/ui/mainwindow.cpp ../../src/ui/mainwindow.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o mainwindow.o ../../src/ui/mainwindow.cpp
+
+moc_mainwindow.o: moc_mainwindow.cpp 
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp
+
+####### Install
+
+install:   FORCE
+
+uninstall:   FORCE
+
+FORCE:
+

diff --git a/tests/testUI/mainwindow.o b/tests/testUI/mainwindow.o
new file mode 100644 (file)
index 0000000..42fe703
Binary files /dev/null and b/tests/testUI/mainwindow.o differ

diff --git a/tests/testUI/moc_mainwindow.cpp b/tests/testUI/moc_mainwindow.cpp
new file mode 100644 (file)
index 0000000..2fd4838
--- /dev/null
+++ b/tests/testUI/moc_mainwindow.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'mainwindow.h'
+**
+** Created: Fri Mar 26 11:03:22 2010
+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#include "../../src/ui/mainwindow.h"
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'mainwindow.h' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 62
+#error "This file was generated using the moc from 4.6.2. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_MainWindow[] = {
+
+ // content:
+       4,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       0,    0, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_MainWindow[] = {
+    "MainWindow\0"
+};
+
+const QMetaObject MainWindow::staticMetaObject = {
+    { &QMainWindow::staticMetaObject, qt_meta_stringdata_MainWindow,
+      qt_meta_data_MainWindow, 0 }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &MainWindow::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *MainWindow::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *MainWindow::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_MainWindow))
+        return static_cast<void*>(const_cast< MainWindow*>(this));
+    return QMainWindow::qt_metacast(_clname);
+}
+
+int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QMainWindow::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    return _id;
+}
+QT_END_MOC_NAMESPACE

diff --git a/tests/testUI/moc_mainwindow.o b/tests/testUI/moc_mainwindow.o
new file mode 100644 (file)
index 0000000..6c3a507
Binary files /dev/null and b/tests/testUI/moc_mainwindow.o differ

diff --git a/tests/testUI/testUI b/tests/testUI/testUI
new file mode 100755 (executable)
index 0000000..206a7ba
Binary files /dev/null and b/tests/testUI/testUI differ

diff --git a/tests/testUI/testUI.pro b/tests/testUI/testUI.pro
new file mode 100644 (file)
index 0000000..405e8f4
--- /dev/null
+++ b/tests/testUI/testUI.pro
@@ -0,0 +1,13 @@
+######################################################################
+# Automatically generated by qmake (2.01a) Fri Mar 26 11:22:18 2010
+######################################################################
+
+CONFIG += qtestlib
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+
+# Input
+HEADERS += ../../src/ui/mainwindow.h testui.moc
+SOURCES += testui.cpp ../../src/ui/mainwindow.cpp

diff --git a/tests/testUI/testui.cpp b/tests/testUI/testui.cpp
new file mode 100755 (executable)
index 0000000..651ee5d
--- /dev/null
+++ b/tests/testUI/testui.cpp
@@ -0,0 +1,47 @@
+/*
+    Situare - A location system for Facebook
+    Copyright (C) 2010  Ixonos Plc. Authors:
+
+       Henri Lampela - henri.lampela@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 <QtGui>
+#include <QtTest/QtTest>
+#include "../../src/ui/mainwindow.h"
+
+class TestUi: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testUi();
+
+
+};
+
+void TestUi::testUi()
+{
+    QLineEdit lineEdit;
+
+    QTest::keyClicks(&lineEdit, "UI test");
+
+    QCOMPARE(lineEdit.text(), QString("UI test"));
+}
+
+
+QTEST_MAIN(TestUi)
+#include "testui.moc"

diff --git a/tests/testUI/testui.cpp~ b/tests/testUI/testui.cpp~
new file mode 100644 (file)
index 0000000..74b4c32
--- /dev/null
+++ b/tests/testUI/testui.cpp~
@@ -0,0 +1,65 @@
+/*
+    Situare - A location system for Facebook
+    Copyright (C) 2010  Ixonos Plc. Authors:
+
+       Henri Lampela - henri.lampela@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 <QtGui>
+#include <QtTest/QtTest>
+#include "../../src/ui/mainwindow.h"
+
+class TestUi: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    //void testUi();
+    void testConstructUi();
+    void testDestructUi();
+
+};
+
+
+//void TestUi::testUi()
+//{
+//    QLineEdit lineEdit;
+//
+//    QTest::keyClicks(&lineEdit, "hello world");
+//
+//    QCOMPARE(lineEdit.text(), QString("hello world"));
+
+
+//}
+
+void TestUi::testConstructUi()
+{
+    QWidget widget;
+    MainWindow mainWindow;
+    mainWindow.MainWindow(widget);
+
+}
+
+void TestUi::testDestructUi()
+{
+    MainWindow mainWindow;
+    mainWindow.~MainWindow();
+}
+
+
+QTEST_MAIN(TestUi)
+#include "testui.moc"

diff --git a/tests/testUI/testui.moc b/tests/testUI/testui.moc
new file mode 100644 (file)
index 0000000..ee64298
--- /dev/null
+++ b/tests/testUI/testui.moc
@@ -0,0 +1,78 @@
+/****************************************************************************
+** Meta object code from reading C++ file 'testui.cpp'
+**
+** Created: Fri Mar 26 11:22:23 2010
+**      by: The Qt Meta Object Compiler version 62 (Qt 4.6.2)
+**
+** WARNING! All changes made in this file will be lost!
+*****************************************************************************/
+
+#if !defined(Q_MOC_OUTPUT_REVISION)
+#error "The header file 'testui.cpp' doesn't include <QObject>."
+#elif Q_MOC_OUTPUT_REVISION != 62
+#error "This file was generated using the moc from 4.6.2. It"
+#error "cannot be used with the include files from this version of Qt."
+#error "(The moc has changed too much.)"
+#endif
+
+QT_BEGIN_MOC_NAMESPACE
+static const uint qt_meta_data_TestUi[] = {
+
+ // content:
+       4,       // revision
+       0,       // classname
+       0,    0, // classinfo
+       1,   14, // methods
+       0,    0, // properties
+       0,    0, // enums/sets
+       0,    0, // constructors
+       0,       // flags
+       0,       // signalCount
+
+ // slots: signature, parameters, type, tag, flags
+       8,    7,    7,    7, 0x08,
+
+       0        // eod
+};
+
+static const char qt_meta_stringdata_TestUi[] = {
+    "TestUi\0\0testUi()\0"
+};
+
+const QMetaObject TestUi::staticMetaObject = {
+    { &QObject::staticMetaObject, qt_meta_stringdata_TestUi,
+      qt_meta_data_TestUi, 0 }
+};
+
+#ifdef Q_NO_DATA_RELOCATION
+const QMetaObject &TestUi::getStaticMetaObject() { return staticMetaObject; }
+#endif //Q_NO_DATA_RELOCATION
+
+const QMetaObject *TestUi::metaObject() const
+{
+    return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject;
+}
+
+void *TestUi::qt_metacast(const char *_clname)
+{
+    if (!_clname) return 0;
+    if (!strcmp(_clname, qt_meta_stringdata_TestUi))
+        return static_cast<void*>(const_cast< TestUi*>(this));
+    return QObject::qt_metacast(_clname);
+}
+
+int TestUi::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
+{
+    _id = QObject::qt_metacall(_c, _id, _a);
+    if (_id < 0)
+        return _id;
+    if (_c == QMetaObject::InvokeMetaMethod) {
+        switch (_id) {
+        case 0: testUi(); break;
+        default: ;
+        }
+        _id -= 1;
+    }
+    return _id;
+}
+QT_END_MOC_NAMESPACE

diff --git a/tests/testUI/testui.o b/tests/testUI/testui.o
new file mode 100644 (file)
index 0000000..2601fb2
Binary files /dev/null and b/tests/testUI/testui.o differ