common: Simplify SyncableObject macros and usage

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

diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h
index 0c35c5b..698cd4c 100644 (file)
--- a/src/core/coreidentity.h
+++ b/src/core/coreidentity.h
@@ -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,11 +15,10 @@
  *   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.         *
  ***************************************************************************/
 
-#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,8 +64,7 @@ private:
 // =========================================
 class CoreIdentity : public Identity
 {
-    SYNCABLE_OBJECT
-        Q_OBJECT
+    Q_OBJECT
 
 public:
     CoreIdentity(IdentityId id, QObject *parent = 0);
@@ -109,7 +106,4 @@ inline const QSslCertificate &CoreCertManager::sslCert() const
     return identity.sslCert();
 }
 
-
 #endif
-
-#endif //COREIDENTITY_H