Skip to content

Commit

Permalink
Merge pull request #5 from sailfishos/remove_unimplemented
Browse files Browse the repository at this point in the history
Remove unimplemented methods. Fixes JB#55332
  • Loading branch information
pvuorela committed Sep 1, 2021
2 parents a188e61 + 6506ba1 commit 3dbcc0e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 15 deletions.
2 changes: 1 addition & 1 deletion plugins/declarative/src/voicecallhandler.cpp
Expand Up @@ -146,7 +146,6 @@ void VoiceCallHandler::initialize(bool notifyError)
emit childCallsChanged();
}

emit isReadyChanged();
} else if (notifyError) {
emit this->error("Failed to getProperties() from VCM D-Bus service.");
}
Expand Down Expand Up @@ -232,6 +231,7 @@ void VoiceCallHandler::onMultipartyHandlerIdChanged(QString handlerId)

void VoiceCallHandler::onChildCallsChanged(const QStringList &calls)
{
Q_UNUSED(calls);
TRACE
emit childCallsListChanged();
}
Expand Down
3 changes: 0 additions & 3 deletions plugins/declarative/src/voicecallhandler.h
Expand Up @@ -26,7 +26,6 @@ class VoiceCallHandler : public QObject
Q_PROPERTY(bool isEmergency READ isEmergency NOTIFY emergencyChanged)
Q_PROPERTY(bool isMultiparty READ isMultiparty NOTIFY multipartyChanged)
Q_PROPERTY(bool isForwarded READ isForwarded NOTIFY forwardedChanged)
Q_PROPERTY(bool isReady READ isReady NOTIFY isReadyChanged)
Q_PROPERTY(bool isRemoteHeld READ isRemoteHeld NOTIFY remoteHeldChanged)
Q_PROPERTY(VoiceCallModel* childCalls READ childCalls NOTIFY childCallsChanged)
Q_PROPERTY(VoiceCallHandler* parentCall READ parentCall NOTIFY parentCallChanged)
Expand Down Expand Up @@ -59,7 +58,6 @@ class VoiceCallHandler : public QObject
bool isMultiparty() const;
bool isEmergency() const;
bool isForwarded() const;
bool isReady() const;
bool isRemoteHeld() const;
VoiceCallModel* childCalls() const;
VoiceCallHandler* parentCall() const;
Expand All @@ -73,7 +71,6 @@ class VoiceCallHandler : public QObject
void emergencyChanged();
void multipartyChanged();
void forwardedChanged();
void isReadyChanged();
void remoteHeldChanged();
void childCallsChanged();
void childCallsListChanged();
Expand Down
2 changes: 0 additions & 2 deletions plugins/providers/ofono/src/ofonovoicecallprovider.h
Expand Up @@ -46,8 +46,6 @@ class OfonoVoiceCallProvider : public AbstractVoiceCallProvider
public Q_SLOTS:
bool dial(const QString &msisdn);

bool setPoweredAndOnline(bool on = true);

protected Q_SLOTS:
void interfacesChanged(const QStringList &interfaces);
void onCallAdded(const QString &call);
Expand Down
7 changes: 2 additions & 5 deletions plugins/providers/telepathy/src/callchannelhandler.cpp
Expand Up @@ -293,9 +293,6 @@ void CallChannelHandler::onCallChannelChannelReady(Tp::PendingOperation *op)
QObject::connect(d->channel.data(),
SIGNAL(callStateChanged(Tp::CallState)),
SLOT(onCallChannelCallStateChanged(Tp::CallState)));
QObject::connect(d->channel.data(),
SIGNAL(localHoldStateChanged(Tp::LocalHoldState,Tp::LocalHoldStateReason)),
SLOT(onCallChannelCallLocalHoldStateChanged(Tp::LocalHoldState,Tp::LocalHoldStateReason)));

if(d->channel->hasInitialAudio())
{
Expand Down Expand Up @@ -323,10 +320,10 @@ void CallChannelHandler::onCallChannelChannelReady(Tp::PendingOperation *op)
DEBUG_T("Call Content");
Tp::CallStreams streams = content->streams();
foreach (const Tp::CallStreamPtr &stream, streams) {
DEBUG_T(" Call stream: localSendingState=%1", qPrintable(stream->localSendingState()));
DEBUG_T(" Call stream: localSendingState=%i", stream->localSendingState());
DEBUG_T(" members: %u", stream.data()->remoteMembers().size());
foreach(const Tp::ContactPtr contact, stream.data()->remoteMembers()) {
DEBUG_T(" member %s remoteSendingState=%s", qPrintable(contact->id()), qPrintable(stream->remoteSendingState(contact)));
DEBUG_T(" member %s remoteSendingState=%i", qPrintable(contact->id()), stream->remoteSendingState(contact));
}
//onStreamAdded(stream);
}
Expand Down
7 changes: 3 additions & 4 deletions plugins/providers/telepathy/src/callchannelhandler.h
Expand Up @@ -58,7 +58,7 @@ class CallChannelHandler : public BaseChannelHandler
Tp::ChannelPtr channel() const override;

// TODO: unimplemented
void setParentHandlerId(const QString &handler) override {}
void setParentHandlerId(const QString &/*handler*/) override {}

public Q_SLOTS:
/*** AbstractVoiceCallHandler Implementation ***/
Expand All @@ -83,7 +83,6 @@ protected Q_SLOTS:

void onCallChannelCallContentAdded(Tp::CallContentPtr content);
void onCallChannelCallContentRemoved(Tp::CallContentPtr content, Tp::CallStateReason reason);
void onCallChannelCallLocalHoldStateChanged(Tp::LocalHoldState state,Tp::LocalHoldStateReason reason);

void onCallChannelAcceptCallFinished(Tp::PendingOperation *op);
void onCallChannelHangupCallFinished(Tp::PendingOperation *op);
Expand All @@ -95,8 +94,8 @@ protected Q_SLOTS:
void timerEvent(QTimerEvent *event);

// TODO: unimplemented
void addChildCall(BaseChannelHandler *handler) override {}
void removeChildCall(BaseChannelHandler *handler) override {}
void addChildCall(BaseChannelHandler */*handler*/) override {}
void removeChildCall(BaseChannelHandler */*handler*/) override {}

private:
void setStatus(VoiceCallStatus newStatus);
Expand Down

0 comments on commit 3dbcc0e

Please sign in to comment.