VariousHEADmaster

Ifdefed the WebSocket stuff that doesn't exist on Sailfish
Voice calls nearly working, except for a segfault on callEnded, which
might be a reentrant thing.

1 files changed, 10 insertions, 5 deletions

diff --git a/rockworkd/platformintegration/sailfish/voicecallmanager.h b/rockworkd/platformintegration/sailfish/voicecallmanager.h
index ec51230..92056c8 100644
--- a/rockworkd/platformintegration/sailfish/voicecallmanager.h
+++ b/rockworkd/platformintegration/sailfish/voicecallmanager.h
@@ -2,12 +2,15 @@
 #define VOICECALLMANAGER_H
 
 #include "voicecallhandler.h"
-#include "settings.h"
 
 #include <QObject>
 #include <QDBusInterface>
 #include <QDBusPendingCallWatcher>
 #include <QLoggingCategory>
+#include <QtContacts/QContactManager>
+#include <QtContacts/QContactDetailFilter>
+
+using namespace QtContacts;
 
 class VoiceCallProviderData
 {
@@ -45,7 +48,7 @@ class VoiceCallManager : public QObject
     Q_PROPERTY(bool isSpeakerMuted READ isSpeakerMuted WRITE setMuteSpeaker NOTIFY speakerMutedChanged)
 
 public:
-    explicit VoiceCallManager(Settings *settings, QObject *parent = 0);
+    explicit VoiceCallManager(QObject *parent = 0);
             ~VoiceCallManager();
 
     QDBusInterface* interface() const;
@@ -56,6 +59,8 @@ public:
     QString defaultProviderId() const;
 
     VoiceCallHandler* activeVoiceCall() const;
+    QString findPersonByNumber(QString number);
+    void hangUp(uint cookie);
 
     QString audioMode() const;
     bool isAudioRouted() const;
@@ -95,14 +100,14 @@ protected Q_SLOTS:
     void onProvidersChanged();
     void onVoiceCallsChanged();
     void onActiveVoiceCallChanged();
-
+    void onVoiceError(const QString &message);
     void onPendingCallFinished(QDBusPendingCallWatcher *watcher);
     void onPendingSilenceFinished(QDBusPendingCallWatcher *watcher);
 
 private:
     class VoiceCallManagerPrivate *d_ptr;
-
-    Settings *settings;
+    QContactManager *contacts;
+    QContactDetailFilter numberFilter;
 
     Q_DISABLE_COPY(VoiceCallManager)
     Q_DECLARE_PRIVATE(VoiceCallManager)