X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreircchannel.h;h=7cf2ae3f00e3a3d6e64b104c52e8d96e7013e4a4;hp=3ae7a2144df29397fdd6b812746af462d8781e11;hb=55ed2b3b4fac69d7d4bcb62f312b1fd233626577;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/core/coreircchannel.h b/src/core/coreircchannel.h
index 3ae7a214..7cf2ae3f 100644
--- a/src/core/coreircchannel.h
+++ b/src/core/coreircchannel.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  *
@@ -15,31 +15,27 @@
  *   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 COREIRCCHANNEL_H
-#define COREIRCCHANNEL_H
+#pragma once
 
 #include "ircchannel.h"
 
 #ifdef HAVE_QCA2
-#  include "cipher.h"
+#    include "cipher.h"
 #endif
 
 class CoreIrcChannel : public IrcChannel
 {
-    SYNCABLE_OBJECT
-        Q_OBJECT
+    Q_OBJECT
 
 public:
-    CoreIrcChannel(const QString &channelname, Network *network);
-    virtual ~CoreIrcChannel();
-
-    inline virtual const QMetaObject *syncMetaObject() const { return &IrcChannel::staticMetaObject; }
+    CoreIrcChannel(const QString& channelname, Network* network);
+    ~CoreIrcChannel() override;
 
 #ifdef HAVE_QCA2
-    Cipher *cipher() const;
+    Cipher* cipher() const;
     void setEncrypted(bool);
 #endif
 
@@ -50,9 +46,6 @@ private:
     bool _receivedWelcomeMsg;
 
 #ifdef HAVE_QCA2
-    mutable Cipher *_cipher;
+    mutable Cipher* _cipher;
 #endif
 };
-
-
-#endif //COREIRCCHANNEL_H