X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.h;h=9fbc24ea297fa71176aeb5085f54b74d4288a79c;hb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;hp=80db0d0e07996f0dc4aa1d17c210bfb433c27315;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222;p=quassel.git

diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h
index 80db0d0e..9fbc24ea 100644
--- a/src/core/coreidentity.h
+++ b/src/core/coreidentity.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 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  *
@@ -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,8 +36,7 @@ class SignalProxy;
 class CoreIdentity;
 class CoreCertManager : public CertManager
 {
-    SYNCABLE_OBJECT
-        Q_OBJECT
+    Q_OBJECT
 
 public:
     CoreCertManager(CoreIdentity &identity);
@@ -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