X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.h;h=8c65146eb3d7ac19da19b6bac95147855d385357;hp=513bdea110bbbea4d9fbde9548f84eaaf9a79feb;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf

diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h
index 513bdea1..8c65146e 100644
--- a/src/core/coreidentity.h
+++ b/src/core/coreidentity.h
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREIDENTITY_H
-#define COREIDENTITY_H
+#pragma once
 
 #include "identity.h"
 
@@ -37,19 +36,18 @@ class SignalProxy;
 class CoreIdentity;
 class CoreCertManager : public CertManager
 {
-    SYNCABLE_OBJECT
-        Q_OBJECT
+    Q_OBJECT
 
 public:
     CoreCertManager(CoreIdentity &identity);
 
 #ifdef HAVE_SSL
-    virtual const QSslKey &sslKey() const;
-    virtual const QSslCertificate &sslCert() const;
+    const QSslKey &sslKey() const override;
+    const QSslCertificate &sslCert() const override;
 
 public slots:
-    virtual void setSslKey(const QByteArray &encoded);
-    virtual void setSslCert(const QByteArray &encoded);
+    void setSslKey(const QByteArray &encoded) override;
+    void setSslCert(const QByteArray &encoded) override;
 #endif
 
     void setId(IdentityId id);
@@ -66,13 +64,12 @@ private:
 // =========================================
 class CoreIdentity : public Identity
 {
-    SYNCABLE_OBJECT
-        Q_OBJECT
+    Q_OBJECT
 
 public:
-    CoreIdentity(IdentityId id, QObject *parent = 0);
-    CoreIdentity(const Identity &other, QObject *parent = 0);
-    CoreIdentity(const CoreIdentity &other, QObject *parent = 0);
+    CoreIdentity(IdentityId id, QObject *parent = nullptr);
+    CoreIdentity(const Identity &other, QObject *parent = nullptr);
+    CoreIdentity(const CoreIdentity &other, QObject *parent = nullptr);
 
     void synchronize(SignalProxy *proxy);
 
@@ -109,7 +106,4 @@ inline const QSslCertificate &CoreCertManager::sslCert() const
     return identity.sslCert();
 }
 
-
 #endif
-
-#endif //COREIDENTITY_H