#include <QSettings>
#include <QStringList>
#include <QVariantMap>
-#include <QWebView>
+#include <QtWebKit/QWebView>
#ifdef Q_WS_MAEMO_5
#include <QMaemo5InformationBox>
#include <QtAlgorithms>
#include <QtGlobal>
-#include "database.h"
#include "../error.h"
#include "network/networkaccessmanager.h"
#include "situarecommon.h"
this, SLOT(imageReceived(QString,QPixmap)));
connect(m_imageFetcher, SIGNAL(error(int, int)),
this, SIGNAL(error(int, int)));
-
- m_database = new Database(this);
- m_database->openDatabase();
- m_database->createNotificationTable();
- m_database->createUserTable();
- m_database->createTagTable();
- m_database->createUserTagTable();
}
SituareService::~SituareService()
#include "imagefetcher.h"
#include "message.h"
-class Database;
class NetworkAccessManager;
class QNetworkReply;
class QNetworkRequest;
/**
* @brief Adds tags to the Situare server
*
- * CURRENTLY TAGS ARE UPDATED TO THE LOCAL DATABASE, NOT SITUARE SERVER
* @param tags list of user's tags
*/
void addTags(const QStringList &tags);
/**
* @brief Retrieves popular tags.
*
- * Tags are fetch from local database instead of Situare server.
*/
void fetchPopularTags();
QString m_session; ///< Session data
- Database *m_database; ///< Instance of the database
ImageFetcher *m_imageFetcher; ///< Instance of the image fetcher
NetworkAccessManager *m_networkManager; ///< Pointer to QNetworkAccessManager
User *m_user; ///< Pointer to User
*/
#include <QtAlgorithms>
-#include <QtWebKit>
+#include <QtWebKit/QtWebKit>
#include <QAction>
#include <QApplication>
#
#-------------------------------------------------
-QT += testlib network sql
+QT += testlib network sql webkit
CONFIG += console
CONFIG -= app_bundle
../../src/situareservice/situareservice.cpp \
../../src/user/user.cpp \
../../tests/stubs/stubbase.cpp \
- ../../src/facebookservice/facebookauthentication.cpp \
- ../../src/facebookservice/facebookcredentials.cpp \
- ../../src/situareservice/database.cpp \
../../src/coordinates/geocoordinate.cpp \
../../src/coordinates/scenecoordinate.cpp \
../../src/ui/avatarimage.cpp \
../../src/network/networkaccessmanager.h \
../../src/situareservice/imagefetcher.h \
../../tests/stubs/stubbase.h \
- ../../src/facebookservice/facebookauthentication.h \
- ../../src/facebookservice/facebookcredentials.h \
- ../../src/situareservice/database.h \
../../src/coordinates/geocoordinate.h \
../../src/coordinates/scenecoordinate.h \
../../src/ui/avatarimage.h \
QList<ParameterBase *> params;
params.append(new Parameter<const QString &>(id));
params.append(new Parameter<const QUrl &>(url));
- stubMethodEntered("fetchImage");
+ stubMethodEntered("fetchImage", params);
}
void ImageFetcherStub::downloadFinished(QNetworkReply *reply)
{
public:
virtual void MessageListItemConstructor();
- virtual GeoCoordinate &coordinates() const;
- virtual QString &id() const;
- virtual QString &newMessageReceiverId() const;
+ virtual GeoCoordinate coordinates() const;
+ virtual QString id() const;
+ virtual QString newMessageReceiverId() const;
virtual void setNewMessageReceiverId(const QString &newMessageReceiverId);
virtual void setMessageData(const Message &message);
};
}
-GeoCoordinate &MessageListItemStub::coordinates() const
+GeoCoordinate MessageListItemStub::coordinates() const
{
return stubReturnValue<GeoCoordinate>("coordinates");
}
-QString &MessageListItemStub::id() const
+QString MessageListItemStub::id() const
{
return stubReturnValue<QString>("id");
}
-QString &MessageListItemStub::newMessageReceiverId() const
+QString MessageListItemStub::newMessageReceiverId() const
{
return stubReturnValue<QString>("newMessageReceiverId");
}
}
-GeoCoordinate &MessageListItem::coordinates() const
+GeoCoordinate MessageListItem::coordinates() const
{
return messageListItemStub->coordinates();
}
-QString &MessageListItem::id() const
+QString MessageListItem::id() const
{
return messageListItemStub->id();
}
-QString &MessageListItem::newMessageReceiverId() const
+QString MessageListItem::newMessageReceiverId() const
{
return messageListItemStub->newMessageReceiverId();
}
map/maprouteitem \
ui/friendlistview \
ui/friendlistitem \
- ui/tabbedpanel \
ui/avatarimage \
user \
routing/route \
routing/routesegment \
- situareservice
+ situareservice \
+ ui/meetpeoplepanel \
+ ui/messagedialog \
+ ui/messagelistitem \
+ ui/messagelistview \
+ ui/messagepanel \
+ ui/tagsdialog
../../stubs/listitemstub.h \
../../stubs/extendedlistitemstub.h \
../../../src/ui/extendedlistitemdelegate.h \
+../../../src/ui/friendlistitemdelegate.h \
../../../src/ui/headerlistitemdelegate.h \
../../../src/ui/listitemdelegate.h \
../../../src/ui/meetpeoplepanel.h \
../../../src/coordinates/geocoordinate.cpp \
../../../src/coordinates/scenecoordinate.cpp \
../../../src/ui/extendedlistitemstore.cpp \
+ ../../../src/ui/friendlistitemdelegate.cpp \
testmeetpeoplepanel.cpp
return messages;
}
+typedef QPair<QString, QString> ReceiverPair;
+Q_DECLARE_METATYPE(ReceiverPair);
+qRegisterMetaType< QPair<QString, QString> >("QPair<QString,QString>");
+
void TestMessagePanel::messageButtonPressed()
{
MessageListItem messageItem;
messageItem.setMessageData(getMessages().at(0));
messageListItemStub->stubSetReturnValue("newMessageReceiverId", QString("1"));
- typedef QPair<QString, QString> ReceiverPair;
- Q_DECLARE_METATYPE(ReceiverPair);
- qRegisterMetaType< QPair<QString, QString> >("QPair<QString,QString>");
-
QSignalSpy requestMessageDialogSpy(m_messagePanel,
SIGNAL(requestMessageDialog(QPair<QString,QString>)));
QVERIFY(requestMessageDialogSpy.isValid());
+QT += network
CONFIG += qtestlib
TEMPLATE = app
INCLUDEPATH += "../../../src"
../../../src/ui/panelcontextbuttonbar.cpp \
../../../src/ui/paneltab.cpp \
../../../src/ui/paneltabbar.cpp \
- ../../../src/ui/listitemcontextbuttonbar.cpp
+ ../../../src/ui/listitemcontextbuttonbar.cpp \
+ ../../../src/ui/mainwindow.cpp
HEADERS += \
../../../src/ui/tabbedpanel.h \
../../../src/ui/panelbar.h \
../../../src/ui/paneltab.h \
../../../src/ui/paneltabbar.h \
../../../src/ui/panelcommon.h \
- ../../../src/ui/listitemcontextbuttonbar.h
+ ../../../src/ui/listitemcontextbuttonbar.h \
+../../../src/ui/mainwindow.h
RESOURCES += ../../../images.qrc
DEFINES += QT_NO_DEBUG_OUTPUT