common: Simplify SyncableObject macros and usage

[quassel.git] / src / client / clientidentity.cpp

diff --git a/src/client/clientidentity.cpp b/src/client/clientidentity.cpp
index 3507a10..04b946e 100644 (file)
--- a/src/client/clientidentity.cpp
+++ b/src/client/clientidentity.cpp
@@ -23,7 +23,6 @@
 #include "client.h"
 #include "signalproxy.h"
 
-INIT_SYNCABLE_OBJECT(CertIdentity)
 CertIdentity::CertIdentity(IdentityId id, QObject *parent)
     : Identity(id, parent)
 #ifdef HAVE_SSL
@@ -111,10 +110,8 @@ void CertIdentity::markClean()
 void ClientCertManager::setSslKey(const QByteArray &encoded)
 {
     QSslKey key(encoded, QSsl::Rsa);
-#if QT_VERSION >= 0x050500
     if (key.isNull() && Client::isCoreFeatureEnabled(Quassel::Feature::EcdsaCertfpKeys))
         key = QSslKey(encoded, QSsl::Ec);
-#endif
     if (key.isNull())
         key = QSslKey(encoded, QSsl::Dsa);
     _certIdentity->setSslKey(key);
@@ -126,5 +123,4 @@ void ClientCertManager::setSslCert(const QByteArray &encoded)
     _certIdentity->setSslCert(QSslCertificate(encoded));
 }
 
-
 #endif // HAVE_SSL