injection: place parent QObject as last parameter in ctors

Lrc object injection should never be a null pointer.

Change-Id: Ib574c751673fd35e223ce2447cee74bce7dfbf3e
Gitlab: #337

src/accountadapter.cpp

@@ -27,8 +27,8 @@
 
 #include <QtConcurrent/QtConcurrent>
 
-AccountAdapter::AccountAdapter(QObject* parent, LRCInstance* instance)
+AccountAdapter::AccountAdapter(LRCInstance* instance, QObject* parent)
-    : QmlAdapterBase(parent, instance)
+    : QmlAdapterBase(instance, parent)
 {}
 
 void

src/accountadapter.h

@@ -50,7 +50,7 @@ signals:
     void accountListSizeChanged();
 
 public:
-    explicit AccountAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit AccountAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~AccountAdapter() = default;
 
 protected:

src/avadapter.cpp

@@ -32,8 +32,8 @@
 #include <QPainter>
 #include <QScreen>
 
-AvAdapter::AvAdapter(QObject* parent, LRCInstance* instance)
+AvAdapter::AvAdapter(LRCInstance* instance, QObject* parent)
-    : QmlAdapterBase(parent, instance)
+    : QmlAdapterBase(instance, parent)
 {
     auto& avModel = lrcInstance_->avModel();
 

src/avadapter.h

@@ -29,7 +29,7 @@ class AvAdapter final : public QmlAdapterBase
     Q_OBJECT
 
 public:
-    explicit AvAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit AvAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~AvAdapter() = default;
 
 signals:

src/calladapter.cpp

@@ -27,8 +27,8 @@
 
 #include <QApplication>
 
-CallAdapter::CallAdapter(QObject* parent, LRCInstance* instance)
+CallAdapter::CallAdapter(LRCInstance* instance, QObject* parent)
-    : QmlAdapterBase(parent, instance)
+    : QmlAdapterBase(instance, parent)
     , oneSecondTimer_(new QTimer(this))
 {
     accountId_ = lrcInstance_->getCurrAccId();

src/calladapter.h

@@ -21,7 +21,6 @@
 
 #include "lrcinstance.h"
 #include "qmladapterbase.h"
-#include "globalsystemtray.h"
 #include "screensaver.h"
 
 #include <QObject>
@@ -37,7 +36,7 @@ public:
     enum MuteStates { UNMUTED, LOCAL_MUTED, MODERATOR_MUTED, BOTH_MUTED };
     Q_ENUM(MuteStates)
 
-    explicit CallAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit CallAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~CallAdapter() = default;
 
 protected:

src/contactadapter.cpp

@@ -22,8 +22,8 @@
 
 #include "lrcinstance.h"
 
-ContactAdapter::ContactAdapter(QObject* parent, LRCInstance* instance)
+ContactAdapter::ContactAdapter(LRCInstance* instance, QObject* parent)
-    : QmlAdapterBase(parent, instance)
+    : QmlAdapterBase(instance, parent)
 {
     selectableProxyModel_.reset(new SelectableProxyModel(smartListModel_.get()));
 }

src/contactadapter.h

@@ -72,7 +72,7 @@ class ContactAdapter final : public QmlAdapterBase
     Q_OBJECT
 
 public:
-    explicit ContactAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit ContactAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~ContactAdapter() = default;
 
 protected:

src/conversationsadapter.cpp

@@ -28,8 +28,8 @@
 
 #include <QApplication>
 
-ConversationsAdapter::ConversationsAdapter(QObject* parent, LRCInstance* instance)
+ConversationsAdapter::ConversationsAdapter(LRCInstance* instance, QObject* parent)
-    : QmlAdapterBase(parent, instance)
+    : QmlAdapterBase(instance, parent)
 {
     connect(this, &ConversationsAdapter::currentTypeFilterChanged, [this]() {
         lrcInstance_->getCurrentConversationModel()->setFilter(currentTypeFilter_);

src/conversationsadapter.h

@@ -32,7 +32,7 @@ class ConversationsAdapter final : public QmlAdapterBase
     Q_PROPERTY(lrc::api::profile::Type currentTypeFilter MEMBER currentTypeFilter_ NOTIFY
                    currentTypeFilterChanged)
 public:
-    explicit ConversationsAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit ConversationsAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~ConversationsAdapter() = default;
 
 protected:

src/messagesadapter.cpp

@@ -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)
+MessagesAdapter::MessagesAdapter(LRCInstance* instance, QObject* parent)
-    : QmlAdapterBase(parent, instance)
+    : 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();
 }

src/messagesadapter.h

@@ -31,7 +31,7 @@ class MessagesAdapter final : public QmlAdapterBase
     Q_PROPERTY(QVariantMap chatviewTranslatedStrings MEMBER chatviewTranslatedStrings_ CONSTANT)
 
 public:
-    explicit MessagesAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit MessagesAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~MessagesAdapter() = default;
 
 protected:

src/pluginadapter.cpp

@@ -20,8 +20,8 @@
 
 #include "lrcinstance.h"
 
-PluginAdapter::PluginAdapter(QObject* parent, LRCInstance* instance)
+PluginAdapter::PluginAdapter(LRCInstance* instance, QObject* parent)
-    : QmlAdapterBase(parent, instance)
+    : QmlAdapterBase(instance, parent)
 {}
 
 QVariant

src/pluginadapter.h

@@ -32,7 +32,7 @@ class PluginAdapter final : public QmlAdapterBase
 {
     Q_OBJECT
 public:
-    explicit PluginAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit PluginAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~PluginAdapter() = default;
 
 protected:

src/qmladapterbase.h

@@ -28,7 +28,7 @@ class QmlAdapterBase : public QObject
 {
     Q_OBJECT
 public:
-    explicit QmlAdapterBase(QObject* parent = nullptr, LRCInstance* instance = nullptr)
+    explicit QmlAdapterBase(LRCInstance* instance, QObject* parent = nullptr)
         : QObject(parent)
         , qmlObj_(nullptr)
         , lrcInstance_(instance) {};

src/settingsadapter.cpp

@@ -20,8 +20,8 @@
 
 #include "api/newdevicemodel.h"
 
-SettingsAdapter::SettingsAdapter(QObject* parent, LRCInstance* instance)
+SettingsAdapter::SettingsAdapter(LRCInstance* instance, QObject* parent)
-    : QmlAdapterBase(parent, instance)
+    : QmlAdapterBase(instance, parent)
 {}
 
 QString

src/settingsadapter.h

@@ -32,7 +32,7 @@ class SettingsAdapter : public QmlAdapterBase
 {
     Q_OBJECT
 public:
-    explicit SettingsAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit SettingsAdapter(LRCInstance* instance, QObject* parent = nullptr);
 
     void safeInit() override {}
 

src/updatemanager.cpp

@@ -18,7 +18,6 @@
 
 #include "updatemanager.h"
 
-#include "appsettingsmanager.h"
 #include "lrcinstance.h"
 #include "utils.h"
 #include "version.h"
@@ -39,10 +38,10 @@ UpdateManager::UpdateManager(const QString& url,
                              LRCInstance* instance,
                              QObject* parent)
     : NetWorkManager(cm, parent)
+    , lrcInstance_(instance)
     , baseUrl_(url.isEmpty() ? "https://dl.jami.net/windows" : url.toLatin1())
     , tempPath_(Utils::WinGetEnv("TEMP"))
     , updateTimer_(new QTimer(this))
-    , lrcInstance_(instance)
 {
     connect(updateTimer_, &QTimer::timeout, [this] {
         // Quiet period update check.

src/utilsadapter.cpp

@@ -31,8 +31,8 @@
 #include <QClipboard>
 #include <QFileInfo>
 
-UtilsAdapter::UtilsAdapter(QObject* parent, LRCInstance* instance)
+UtilsAdapter::UtilsAdapter(LRCInstance* instance, QObject* parent)
-    : QmlAdapterBase(parent, instance)
+    : QmlAdapterBase(instance, parent)
     , clipboard_(QApplication::clipboard())
 {}
 

src/utilsadapter.h

@@ -33,7 +33,7 @@ class UtilsAdapter final : public QmlAdapterBase
 {
     Q_OBJECT
 public:
-    explicit UtilsAdapter(QObject* parent = nullptr, LRCInstance* instance = nullptr);
+    explicit UtilsAdapter(LRCInstance* instance, QObject* parent = nullptr);
     ~UtilsAdapter() = default;
 
     void safeInit() override {}