diff options
author | Mateu Batle <mateu.batle@collabora.co.uk> | 2011-04-06 16:15:04 -0500 |
---|---|---|
committer | Mateu Batle <mateu.batle@collabora.co.uk> | 2011-04-06 16:17:23 -0500 |
commit | 6eede14d2743d7f56e78208e21c8a47664f70494 (patch) | |
tree | 182426553540a539b60df8c2290c6fc6f1d54d95 | |
parent | f3356a80dcd9015a7fb0c67e8726764c934c48f1 (diff) |
Models: Fix compile problem with Tp::ChannelChatState
-rw-r--r-- | TelepathyQt4Yell/Models/abstract-conversation-model.h | 4 | ||||
-rw-r--r-- | TelepathyQt4Yell/Models/session-conversation-model.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/TelepathyQt4Yell/Models/abstract-conversation-model.h b/TelepathyQt4Yell/Models/abstract-conversation-model.h index 6dc2eab..7bf2220 100644 --- a/TelepathyQt4Yell/Models/abstract-conversation-model.h +++ b/TelepathyQt4Yell/Models/abstract-conversation-model.h @@ -64,10 +64,6 @@ public: QModelIndex index(const ConversationItem *item) const; -protected: - // work around moc namespace limitations - typedef Tp::ChannelChatState ChannelChatState; - private: struct Private; friend struct Private; diff --git a/TelepathyQt4Yell/Models/session-conversation-model.cpp b/TelepathyQt4Yell/Models/session-conversation-model.cpp index b8f753f..d4d039c 100644 --- a/TelepathyQt4Yell/Models/session-conversation-model.cpp +++ b/TelepathyQt4Yell/Models/session-conversation-model.cpp @@ -86,7 +86,7 @@ void SessionConversationModel::onMessageReceived(const Tp::ReceivedMessage &mess mPriv->mChannel->acknowledge(QList<Tp::ReceivedMessage>() << message); } -void SessionConversationModel::onChatStateChanged(const Tp::ContactPtr &contact, ChannelChatState state) +void SessionConversationModel::onChatStateChanged(const Tp::ContactPtr &contact, Tp::ChannelChatState state) { // ignore events originating from self if (contact == mPriv->mSelf) { |