common: Simplify SyncableObject macros and usage

[quassel.git] / src / common / ircchannel.h

diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h
index b27ea90..68c3683 100644 (file)
--- a/src/common/ircchannel.h
+++ b/src/common/ircchannel.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 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 IRCCHANNEL_H
-#define IRCCHANNEL_H
+#pragma once
 
 #include <QHash>
 #include <QSet>
@@ -34,16 +33,16 @@ class Network;
 
 class IrcChannel : public SyncableObject
 {
-    SYNCABLE_OBJECT
     Q_OBJECT
+    SYNCABLE_OBJECT
 
-    Q_PROPERTY(QString name READ name STORED false)
-    Q_PROPERTY(QString topic READ topic WRITE setTopic STORED false)
-    Q_PROPERTY(QString password READ password WRITE setPassword STORED false)
-    Q_PROPERTY(bool encrypted READ encrypted WRITE setEncrypted STORED false)
+    Q_PROPERTY(QString name READ name)
+    Q_PROPERTY(QString topic READ topic WRITE setTopic)
+    Q_PROPERTY(QString password READ password WRITE setPassword)
+    Q_PROPERTY(bool encrypted READ encrypted WRITE setEncrypted)
 
 public :
-        IrcChannel(const QString &channelname, Network *network);
+    IrcChannel(const QString &channelname, Network *network);
     ~IrcChannel();
 
     bool isKnownUser(IrcUser *ircuser) const;
@@ -150,6 +149,3 @@ private:
     QHash<QChar, QString> _C_channelModes;
     QSet<QChar> _D_channelModes;
 };
-
-
-#endif