injection: place parent QObject as last parameter in ctors

Lrc object injection should never be a null pointer.

Change-Id: Ib574c751673fd35e223ce2447cee74bce7dfbf3e
Gitlab: #337
This commit is contained in:
Andreas Traczyk
2021-03-30 14:22:39 -04:00
parent 255252e3aa
commit e60eeff357
20 changed files with 30 additions and 33 deletions

View File

@@ -23,7 +23,6 @@
#include "messagesadapter.h"
#include "globalsystemtray.h"
#include "qtutils.h"
#include "utils.h"
#include "webchathelpers.h"
@@ -36,8 +35,8 @@
#include <QList>
#include <QUrl>
MessagesAdapter::MessagesAdapter(QObject* parent, LRCInstance* instance)
: QmlAdapterBase(parent, instance)
MessagesAdapter::MessagesAdapter(LRCInstance* instance, QObject* parent)
: QmlAdapterBase(instance, parent)
{}
void
@@ -714,7 +713,7 @@ MessagesAdapter::removeConversation(const QString& accountId,
}
lrcInstance_->getAccountInfo(accountId).conversationModel->removeConversation(convUid,
banContact);
banContact);
if (convUid == currentConvUid_)
currentConvUid_.clear();
}