X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreircchannel.h;h=7cf2ae3f00e3a3d6e64b104c52e8d96e7013e4a4;hp=84932d5df5374161d0860ee6f7481f14d7db4f82;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222 diff --git a/src/core/coreircchannel.h b/src/core/coreircchannel.h index 84932d5d..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 * @@ -18,28 +18,24 @@ * 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