[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:21:02 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=ce7f714
The following commit has been merged in the master branch:
commit ce7f7144edcfa17661b4c7277538ada8b7f3f619
Author: Lasath Fernando <kde at lasath.org>
Date: Tue Feb 7 07:57:14 2012 +1100
Rename slot in ConversationsModel
Renamed ConversationsModel::invalidate() to
ConversationsModel::onChannelInvalidated() becuase the purpose of
that function was unclear in the previous name.
---
plasmoid/declarative-plugin/conversation.cpp | 4 ++--
plasmoid/declarative-plugin/conversation.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plasmoid/declarative-plugin/conversation.cpp b/plasmoid/declarative-plugin/conversation.cpp
index 48193dc..c2f707a 100644
--- a/plasmoid/declarative-plugin/conversation.cpp
+++ b/plasmoid/declarative-plugin/conversation.cpp
@@ -47,7 +47,7 @@ Conversation::Conversation(const Tp::TextChannelPtr& channel,
d->valid = channel->isValid();
connect(channel.data(), SIGNAL(invalidated(Tp::DBusProxy*,QString,QString)),
- SLOT(invalidate(Tp::DBusProxy*,QString,QString)));
+ SLOT(onChannelInvalidated(Tp::DBusProxy*,QString,QString)));
}
Conversation::Conversation(QObject *parent) : QObject(parent)
@@ -71,7 +71,7 @@ bool Conversation::isValid()
return d->valid;
}
-void Conversation::invalidate(Tp::DBusProxy* proxy, const QString& errorName, const QString& errorMessage)
+void Conversation::onChannelInvalidated(Tp::DBusProxy* proxy, const QString& errorName, const QString& errorMessage)
{
kDebug() << proxy << errorName << ":" << errorMessage;
diff --git a/plasmoid/declarative-plugin/conversation.h b/plasmoid/declarative-plugin/conversation.h
index 3c491c7..78fd38d 100644
--- a/plasmoid/declarative-plugin/conversation.h
+++ b/plasmoid/declarative-plugin/conversation.h
@@ -57,7 +57,7 @@ public Q_SLOTS:
void requestClose();
private Q_SLOTS:
- void invalidate(Tp::DBusProxy *proxy, const QString &errorName, const QString &errorMessage);
+ void onChannelInvalidated(Tp::DBusProxy *proxy, const QString &errorName, const QString &errorMessage);
private:
class ConversationPrivate;
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list