X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Firclisthelper.h;h=aee7cf12302fc06f603da75ea396e8081984598b;hp=c6f5943e9544ff8616e6bba0f3074e62b5218de8;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce diff --git a/src/common/irclisthelper.h b/src/common/irclisthelper.h index c6f5943e..aee7cf12 100644 --- a/src/common/irclisthelper.h +++ b/src/common/irclisthelper.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,14 @@ * 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 IRCLISTHELPER_H -#define IRCLISTHELPER_H +#pragma once + +#include + +#include "common-export.h" #include "syncableobject.h" #include "types.h" @@ -32,19 +35,19 @@ * when RPL_LISTEND is received the clients will be informed, that they can pull the data * 3.) client pulls the data by calling requestChannelList again. receiving the data in receiveChannelList */ -class IrcListHelper : public SyncableObject +class COMMON_EXPORT IrcListHelper : public SyncableObject { + Q_OBJECT SYNCABLE_OBJECT - Q_OBJECT public: - inline IrcListHelper(QObject *parent = 0) : SyncableObject(parent) { setInitialized(); }; + inline IrcListHelper(QObject *parent = nullptr) : SyncableObject(parent) { setInitialized(); }; struct ChannelDescription { QString channelName; quint32 userCount; QString topic; - ChannelDescription(const QString &channelName_, quint32 userCount_, const QString &topic_) : channelName(channelName_), userCount(userCount_), topic(topic_) {}; + ChannelDescription(QString channelName_, quint32 userCount_, QString topic_) : channelName(std::move(channelName_)), userCount(userCount_), topic(std::move(topic_)) {}; }; public slots: @@ -53,6 +56,3 @@ public slots: inline virtual void reportFinishedList(const NetworkId &netId) { SYNC(ARG(netId)) } inline virtual void reportError(const QString &error) { SYNC(ARG(error)) } }; - - -#endif //IRCLISTHELPER_H