X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.cpp;h=9e6618a07c5e147532596f2bedc61f59cd1bf740;hp=8e6fc596428363dc9bd0f550331fc5d8d0bd29fc;hb=8f2ee00f4edef1693628d3af0bdee84d725eb754;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a

diff --git a/src/core/coreidentity.cpp b/src/core/coreidentity.cpp
index 8e6fc596..9e6618a0 100644
--- a/src/core/coreidentity.cpp
+++ b/src/core/coreidentity.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,7 +22,6 @@
 
 #include "signalproxy.h"
 
-INIT_SYNCABLE_OBJECT(CoreIdentity)
 CoreIdentity::CoreIdentity(IdentityId id, QObject *parent)
     : Identity(id, parent)
 #ifdef HAVE_SSL
@@ -30,8 +29,8 @@ CoreIdentity::CoreIdentity(IdentityId id, QObject *parent)
 #endif
 {
 #ifdef HAVE_SSL
-    connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
-    connect(&_certManager, SIGNAL(updated()), this, SIGNAL(updated()));
+    connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
+    connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
 #endif
 }
 
@@ -43,8 +42,8 @@ CoreIdentity::CoreIdentity(const Identity &other, QObject *parent)
 #endif
 {
 #ifdef HAVE_SSL
-    connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
-    connect(&_certManager, SIGNAL(updated()), this, SIGNAL(updated()));
+    connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
+    connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
 #endif
 }
 
@@ -58,8 +57,8 @@ CoreIdentity::CoreIdentity(const CoreIdentity &other, QObject *parent)
 #endif
 {
 #ifdef HAVE_SSL
-    connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
-    connect(&_certManager, SIGNAL(updated()), this, SIGNAL(updated()));
+    connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
+    connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
 #endif
 }
 
@@ -77,6 +76,8 @@ void CoreIdentity::synchronize(SignalProxy *proxy)
 void CoreIdentity::setSslKey(const QByteArray &encoded)
 {
     QSslKey key(encoded, QSsl::Rsa);
+    if (key.isNull())
+        key = QSslKey(encoded, QSsl::Ec);
     if (key.isNull())
         key = QSslKey(encoded, QSsl::Dsa);
     setSslKey(key);
@@ -106,7 +107,7 @@ CoreIdentity &CoreIdentity::operator=(const CoreIdentity &identity)
 // ========================================
 //  CoreCertManager
 // ========================================
-INIT_SYNCABLE_OBJECT(CoreCertManager)
+
 CoreCertManager::CoreCertManager(CoreIdentity &identity)
     : CertManager(identity.id()),
     identity(identity)