tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Un-break build. Apparently I didn't test as I thought I had.

Browse source
This commit is contained in:
Simon Redman 2018-12-12 22:49:33 -07:00
parent 019e8d6a1c
commit 7025fd6795
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/sms/conversationsdbusinterface.cpp
View file

@ -77,7 +77,7 @@ void ConversationsDbusInterface::requestConversation(const qint64& conversationI
void ConversationsDbusInterface::addMessages(const QList<ConversationMessage> &messages) void ConversationsDbusInterface::addMessages(const QList<ConversationMessage> &messages)
{ {
QSet<qint32> updatedConversationIDs; QSet<qint64> updatedConversationIDs;
for (const auto& message : messages) { for (const auto& message : messages) {
const qint32& threadId = message.threadID(); const qint32& threadId = message.threadID();
@ -122,7 +122,7 @@ QList<ConversationMessage> ConversationsDbusInterface::getConversation(const qin
return m_conversations.value(conversationID).values(); return m_conversations.value(conversationID).values();
} }
void ConversationsDbusInterface::updateConversation(const qint32& conversationID) void ConversationsDbusInterface::updateConversation(const qint64& conversationID)
{ {
waitingForMessagesLock.lock(); waitingForMessagesLock.lock();
qCDebug(KDECONNECT_CONVERSATIONS) << "Requesting conversation with ID" << conversationID << "from remote"; qCDebug(KDECONNECT_CONVERSATIONS) << "Requesting conversation with ID" << conversationID << "from remote";

4
smsapp/conversationmodel.h
View file

@ -50,7 +50,7 @@ public:
Q_ENUM(Roles) Q_ENUM(Roles)
qint32 threadId() const; qint64 threadId() const;
void setThreadId(const qint64& threadId); void setThreadId(const qint64& threadId);
QString deviceId() const { return m_deviceId; } QString deviceId() const { return m_deviceId; }
@ -67,7 +67,7 @@ private:
DeviceConversationsDbusInterface* m_conversationsInterface; DeviceConversationsDbusInterface* m_conversationsInterface;
QString m_deviceId; QString m_deviceId;
qint64 m_threadId = INVALID_THREAD_ID; qint64 m_threadId = INVALID_THREAD_ID;
QSet<qint32> knownMessageIDs; QSet<qint32> knownMessageIDs; // Set of known Message uIDs
}; };
#endif // CONVERSATIONMODEL_H #endif // CONVERSATIONMODEL_H