modernize: Replace most remaining old-style connects by PMF ones

[quassel.git] / src / core / coreidentity.cpp

diff --git a/src/core/coreidentity.cpp b/src/core/coreidentity.cpp
index 2ea428d..9e6618a 100644 (file)
--- a/src/core/coreidentity.cpp
+++ b/src/core/coreidentity.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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  *
@@ -15,14 +15,13 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coreidentity.h"
 
 #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)