Commit ac7b88c0 authored by Lasath Fernando's avatar Lasath Fernando Committed by David Edmundson
Browse files

Fixed some further minor issues.

parent 90ade1cb
......@@ -31,7 +31,7 @@ void Queable::enqueSelf()
m_queManager->enque(this);
}
void Queable::removeSelfFromQue()
void Queable::removeSelfFromQueue()
{
m_queManager->remove(this);
}
......
......@@ -33,7 +33,7 @@ protected:
virtual ~Queable();
void enqueSelf();
void removeSelfFromQue();
void removeSelfFromQueue();
virtual void selfDequed() = 0;
private:
......
......@@ -45,7 +45,7 @@ public:
}
};
class MessagesModel::ConversationModelPrivate
class MessagesModel::MessagesModelPrivate
{
public:
Tp::TextChannelPtr textChannel;
......@@ -55,7 +55,7 @@ public:
MessagesModel::MessagesModel(QObject* parent):
QAbstractListModel(parent),
d(new ConversationModelPrivate)
d(new MessagesModelPrivate)
{
kDebug();
......@@ -116,6 +116,7 @@ void MessagesModel::setTextChannel(Tp::TextChannelPtr channel)
//Tp::Message has an == operator. maybe I can use that?
if (current.id == message.messageToken()) {
messageAlreadyInModel = true;
break;
}
}
if (!messageAlreadyInModel) {
......@@ -247,7 +248,7 @@ void MessagesModel::acknowledgeAllMessages()
kDebug() << "Conversation Visible, Acknowledging " << queue.size() << " messages.";
d->textChannel->acknowledge(queue);
removeSelfFromQue();
removeSelfFromQueue();
Q_EMIT unreadCountChanged(queue.size());
}
......
......@@ -78,8 +78,8 @@ private:
void removeChannelSignals(Tp::TextChannelPtr channel);
virtual void selfDequed();
class ConversationModelPrivate;
ConversationModelPrivate *d;
class MessagesModelPrivate;
MessagesModelPrivate *d;
};
#endif // CONVERSATION_MODEL_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment