mainapplication: remove gnutls init/deinit

This is moved to libjami in commit e4fa507.
Also bump libjami to e4fa507.

Change-Id: I5414f0b4987aec6474c09d8ecc4d1675c565853d

daemon

@@ -1 +1 @@
-Subproject commit a204b71769f168f4ece750e0faf369f4b91f7ce2
+Subproject commit e4fa5074cac04f7ba5f8e86b4ce371a3af6a0961

src/app/mainapplication.cpp

@@ -52,10 +52,6 @@
 #include "dbuserrorhandler.h"
 #endif
 
-#if defined _MSC_VER
-#include <gnutls/gnutls.h>
-#endif
-
 static QString
 getRenderInterfaceString()
 {
@@ -140,10 +136,6 @@ MainApplication::init()
     settingsManager_->loadTranslations();
     setApplicationFont();
 
-#if defined _MSC_VER
-    gnutls_global_init();
-#endif
-
     initLrc(runOptions_[Option::UpdateUrl].toString(),
             connectivityMonitor_.get(),
             runOptions_[Option::Debug].toBool() && !runOptions_[Option::MuteJamid].toBool());

tests/qml/main.cpp

@@ -40,17 +40,17 @@
 #include <windows.h>
 #endif
 
-#if defined _MSC_VER && !COMPILE_ONLY
-#include <gnutls/gnutls.h>
-#endif
-
-class Setup : public QObject {
+class Setup : public QObject
+{
     Q_OBJECT
 
 public:
-  Setup(bool muteDring = false) : muteDring_(muteDring) {}
+    Setup(bool muteDring = false)
+        : muteDring_(muteDring)
+    {}
 
-  void init() {
+    void init()
+    {
         connectivityMonitor_.reset(new ConnectivityMonitor(this));
         settingsManager_.reset(new AppSettingsManager(this));
         systemTray_.reset(new SystemTray(settingsManager_.get(), this));
@@ -61,20 +61,24 @@ public:
         gnutls_global_init();
 #endif
 
-    lrcInstance_.reset(new LRCInstance(nullptr, nullptr, "",
-                                       connectivityMonitor_.get(), muteDring_));
+        lrcInstance_.reset(
+            new LRCInstance(nullptr, nullptr, "", connectivityMonitor_.get(), muteDring_));
         lrcInstance_->subscribeToDebugReceived();
 
         auto downloadPath = settingsManager_->getValue(Settings::Key::DownloadPath);
-    lrcInstance_->accountModel().downloadDirectory =
-        downloadPath.toString() + "/";
+        lrcInstance_->accountModel().downloadDirectory = downloadPath.toString() + "/";
     }
 
-  void qmlEngineRegistration(QQmlEngine *engine) {
+    void qmlEngineRegistration(QQmlEngine* engine)
+    {
         // Expose custom types to the QML engine.
-    Utils::registerTypes(engine, systemTray_.get(), lrcInstance_.get(),
-                         settingsManager_.get(), previewEngine_.get(),
-                         &screenInfo_, this);
+        Utils::registerTypes(engine,
+                             systemTray_.get(),
+                             lrcInstance_.get(),
+                             settingsManager_.get(),
+                             previewEngine_.get(),
+                             &screenInfo_,
+                             this);
     }
 
 public Q_SLOTS:
@@ -94,14 +98,14 @@ public Q_SLOTS:
      * This function can be used to register QML types and add import paths,
      * amongst other things.
      */
-  void qmlEngineAvailable(QQmlEngine *engine) {
+    void qmlEngineAvailable(QQmlEngine* engine)
+    {
         auto videoProvider = new VideoProvider(lrcInstance_->avModel(), this);
         engine->rootContext()->setContextProperty("videoProvider", videoProvider);
 #ifdef WITH_WEBENGINE
         engine->rootContext()->setContextProperty("WITH_WEBENGINE", QVariant(true));
 #else
-    engine->rootContext()->setContextProperty("WITH_WEBENGINE",
-                                              QVariant(false));
+        engine->rootContext()->setContextProperty("WITH_WEBENGINE", QVariant(false));
 #endif
         qmlEngineRegistration(engine);
     }
@@ -121,10 +125,12 @@ private:
     QScopedPointer<PreviewEngine> previewEngine_;
     ScreenInfo screenInfo_;
 
-  bool muteDring_{false};
+    bool muteDring_ {false};
 };
 
-int main(int argc, char **argv) {
+int
+main(int argc, char** argv)
+{
     QDir tempDir(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
 
     auto jamiDataDir = tempDir.absolutePath() + "\\jami_test\\jami";
@@ -137,11 +143,11 @@ int main(int argc, char **argv) {
     if (!envSet)
         return 1;
 
-  bool muteDring{false};
+    bool muteDring {false};
 
     // Remove "-mutejamid" from argv, as quick_test_main_with_setup() will
     // fail if given an invalid command-line argument.
-  auto end = std::remove_if(argv + 1, argv + argc, [](char *argv) {
+    auto end = std::remove_if(argv + 1, argv + argc, [](char* argv) {
         return (strcmp(argv, "-mutejamid") == 0);
     });
 

tests/unittests/globaltestenvironment.h

@@ -33,10 +33,6 @@
 #include <windows.h>
 #endif
 
-#if defined _MSC_VER && !COMPILE_ONLY
-#include <gnutls/gnutls.h>
-#endif
-
 class TestEnvironment
 {
 public: