X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.cpp;h=8e561688b11104a02375df7bef72b2bcb2e51da8;hb=61f33c7895e324f6e95034d86897ad2e963653f1;hp=16e1c424676cb69fbf47e4bd9f3e57b3a842d566;hpb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;p=quassel.git

diff --git a/src/client/clientidentity.cpp b/src/client/clientidentity.cpp
index 16e1c424..8e561688 100644
--- a/src/client/clientidentity.cpp
+++ b/src/client/clientidentity.cpp
@@ -25,20 +25,12 @@
 
 CertIdentity::CertIdentity(IdentityId id, QObject *parent)
     : Identity(id, parent)
-#ifdef HAVE_SSL
-    ,  _certManager(nullptr),
-    _isDirty(false)
-#endif
 {
 }
 
 
 CertIdentity::CertIdentity(const Identity &other, QObject *parent)
     : Identity(other, parent)
-#ifdef HAVE_SSL
-    , _certManager(nullptr),
-    _isDirty(false)
-#endif
 {
 }
 
@@ -46,10 +38,9 @@ CertIdentity::CertIdentity(const Identity &other, QObject *parent)
 CertIdentity::CertIdentity(const CertIdentity &other, QObject *parent)
     : Identity(other, parent)
 #ifdef HAVE_SSL
-    , _certManager(nullptr),
-    _isDirty(other._isDirty),
-    _sslKey(other._sslKey),
-    _sslCert(other._sslCert)
+    , _isDirty(other._isDirty)
+    , _sslKey(other._sslKey)
+    , _sslCert(other._sslCert)
 #endif
 {
 }
@@ -64,8 +55,8 @@ void CertIdentity::enableEditSsl(bool enable)
     _certManager = new ClientCertManager(id(), this);
     if (isValid()) { // this means we are not a newly created Identity but have a proper Id
         Client::signalProxy()->synchronize(_certManager);
-        connect(_certManager, SIGNAL(updated()), this, SLOT(markClean()));
-        connect(_certManager, SIGNAL(initDone()), this, SLOT(markClean()));
+        connect(_certManager, &SyncableObject::updated, this, &CertIdentity::markClean);
+        connect(_certManager, &SyncableObject::initDone, this, &CertIdentity::markClean);
     }
 }