Removed MessageManager and MessageService classes.

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 8db5c88..f764b48 100644 (file)
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -40,8 +40,6 @@
 #include "situareservice/situareservice.h"
 #include "ui/mainwindow.h"
 
-#include "messageservice/messageservice.h"
-
 #include "engine.h"
 
 const QString SETTINGS_GPS_ENABLED = "GPS_ENABLED"; ///< GPS setting
@@ -134,8 +132,6 @@ SituareEngine::SituareEngine()
 
     m_mce = new MCE(this);
     connect(m_mce, SIGNAL(displayOff(bool)), this, SLOT(setPowerSaving(bool)));
-
-    MessageService *m_messageService = new MessageService(this);
 }
 
 SituareEngine::~SituareEngine()

diff --git a/src/messageservice/messagemanager.cpp b/src/messageservice/messagemanager.cpp
deleted file mode 100644 (file)
index 7f12047..0000000
--- a/src/messageservice/messagemanager.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <QDebug>
-
-#include <QMessageAccountId>
-
-#include "messagemanager.h"
-
-MessageManager::MessageManager(QObject *parent) :
-    QMessageManager(parent),
-    m_messageAccountId(QMessageAccountId())
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    QMessageAccountFilter messageAccountFilter = QMessageAccountFilter::byName("facebook");
-    QMessageAccountIdList messageAccountIdList = queryAccounts(messageAccountFilter);
-
-    foreach (QMessageAccountId messageAccountId, messageAccountIdList) {
-        qWarning() << __PRETTY_FUNCTION__ << messageAccountId.toString();
-    }
-
-    if (!messageAccountIdList.isEmpty())
-        m_messageAccountId = messageAccountIdList.first();
-}
-
-QMessageAccountId MessageManager::messageAccountId() const
-{
-    return m_messageAccountId;
-}

diff --git a/src/messageservice/messagemanager.h b/src/messageservice/messagemanager.h
deleted file mode 100644 (file)
index 48d31c4..0000000
--- a/src/messageservice/messagemanager.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef MESSAGEMANAGER_H
-#define MESSAGEMANAGER_H
-
-#include <QMessageAccountId>
-#include <QMessageManager>
-
-QTM_USE_NAMESPACE
-
-class MessageManager : public QMessageManager
-{
-    Q_OBJECT
-public:
-    MessageManager(QObject *parent = 0);
-
-    QMessageAccountId messageAccountId() const;
-
-signals:
-
-public slots:
-
-private:
-    QMessageAccountId m_messageAccountId;
-
-};
-
-#endif // MESSAGEMANAGER_H

diff --git a/src/messageservice/messageservice.cpp b/src/messageservice/messageservice.cpp
deleted file mode 100644 (file)
index c813cd5..0000000
--- a/src/messageservice/messageservice.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <QDebug>
-
-#include <QMessage>
-
-#include "messagemanager.h"
-
-#include "messageservice.h"
-
-MessageService::MessageService(QObject *parent) :
-    QMessageService(parent)
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-    MessageManager messageManager;
-
-    QMessage message;
-    message.setTo(QMessageAddress(QMessageAddress::InstantMessage, "-1000000139211584"));
-    message.setBody("Tuleeko?");
-    message.setParentAccountId(messageManager.messageAccountId());
-
-    send(message);
-}

diff --git a/src/messageservice/messageservice.h b/src/messageservice/messageservice.h
deleted file mode 100644 (file)
index 35d694d..0000000
--- a/src/messageservice/messageservice.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef MESSAGESERVICE_H
-#define MESSAGESERVICE_H
-
-#include <QMessageService>
-
-QTM_USE_NAMESPACE
-
-class MessageService : public QMessageService
-{
-    Q_OBJECT
-public:
-
-    MessageService(QObject *parent = 0);
-
-signals:
-
-public slots:
-
-};
-
-#endif // MESSAGESERVICE_H

diff --git a/src/src.pro b/src/src.pro
index 4919998..c5de3a6 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -81,9 +81,7 @@ SOURCES += main.cpp \
     ui/routewaypointlistitem.cpp \
     ui/routewaypointlistview.cpp \
     user/user.cpp \
-    ui/meetpeoplepanel.cpp \
-    messageservice/messageservice.cpp \
-    messageservice/messagemanager.cpp
+    ui/meetpeoplepanel.cpp
 HEADERS += application.h \
     common.h \
     coordinates/geocoordinate.h \
@@ -162,9 +160,7 @@ HEADERS += application.h \
     ui/routewaypointlistitem.h \
     ui/routewaypointlistview.h \
     user/user.h \
-    ui/meetpeoplepanel.h \
-    messageservice/messageservice.h \
-    messageservice/messagemanager.h
+    ui/meetpeoplepanel.h
 QT += network \
     webkit