X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorenetwork.h;h=c67d47921910cf84f6acc4857d930d075bc853be;hp=99e5fc2539410f2c60eed4f2d0992489a2d4e5b7;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=1ccf9666ade9a46880ffb68feeac81b7c39e570b diff --git a/src/core/corenetwork.h b/src/core/corenetwork.h index 99e5fc25..c67d4792 100644 --- a/src/core/corenetwork.h +++ b/src/core/corenetwork.h @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef CORENETWORK_H -#define CORENETWORK_H +#pragma once #include "network.h" #include "coreircchannel.h" @@ -52,14 +51,11 @@ class Event; class CoreNetwork : public Network { - SYNCABLE_OBJECT - Q_OBJECT + Q_OBJECT public: CoreNetwork(const NetworkId &networkid, CoreSession *session); - virtual ~CoreNetwork(); - - inline virtual const QMetaObject *syncMetaObject() const { return &Network::staticMetaObject; } + ~CoreNetwork() override; inline CoreIdentity *identityPtr() const { return coreSession()->identity(identity()); } inline CoreSession *coreSession() const { return _coreSession; } @@ -139,7 +135,7 @@ public: */ inline bool isPongReplyPending() const { return _pongReplyPending; } - QList> splitMessage(const QString &cmd, const QString &message, std::function(QString &)> cmdGenerator); + QList> splitMessage(const QString &cmd, const QString &message, const std::function(QString &)> &cmdGenerator); // IRCv3 capability negotiation @@ -148,8 +144,7 @@ public: * * @returns True if in progress, otherwise false */ - inline bool capNegotiationInProgress() const { return (!_capsQueuedIndividual.empty() || - !_capsQueuedBundled.empty()); } + inline bool capNegotiationInProgress() const { return (!_capsQueuedIndividual.empty() || !_capsQueuedBundled.empty()); } /** * Queues a capability to be requested. @@ -207,15 +202,15 @@ public: }; public slots: - virtual void setMyNick(const QString &mynick); + void setMyNick(const QString &mynick) override; - virtual void requestConnect() const; - virtual void requestDisconnect() const; - virtual void requestSetNetworkInfo(const NetworkInfo &info); + void requestConnect() const override; + void requestDisconnect() const override; + void requestSetNetworkInfo(const NetworkInfo &info) override; - virtual void setUseAutoReconnect(bool); - virtual void setAutoReconnectInterval(quint32); - virtual void setAutoReconnectRetries(quint16); + void setUseAutoReconnect(bool) override; + void setAutoReconnectInterval(quint32) override; + void setAutoReconnectRetries(quint16) override; void setPingInterval(int interval); @@ -260,7 +255,7 @@ public slots: */ bool forceDisconnect(int msecs = 1000); - void userInput(BufferInfo bufferInfo, QString msg); + void userInput(const BufferInfo &bufferInfo, QString msg); /** * Sends the raw (encoded) line, adding to the queue if needed, optionally with higher priority. @@ -273,7 +268,7 @@ public slots: * PING/PONG replies, the other side will close the connection. * @endparmblock */ - void putRawLine(const QByteArray input, const bool prepend = false); + void putRawLine(const QByteArray &input, bool prepend = false); /** * Sends the command with encoded parameters, with optional prefix or high priority. @@ -288,7 +283,7 @@ public slots: * maintain PING/PONG replies, the other side will close the connection. * @endparmblock */ - void putCmd(const QString &cmd, const QList ¶ms, const QByteArray &prefix = QByteArray(), const bool prepend = false); + void putCmd(const QString &cmd, const QList ¶ms, const QByteArray &prefix = {}, bool prepend = false); /** * Sends the command for each set of encoded parameters, with optional prefix or high priority. @@ -307,7 +302,7 @@ public slots: * cannot maintain PING/PONG replies, the other side will close the connection. * @endparmblock */ - void putCmd(const QString &cmd, const QList> ¶ms, const QByteArray &prefix = QByteArray(), const bool prependAll = false); + void putCmd(const QString &cmd, const QList> ¶ms, const QByteArray &prefix = {}, bool prependAll = false); void setChannelJoined(const QString &channel); void setChannelParted(const QString &channel); @@ -428,7 +423,7 @@ public slots: */ inline void resetPongReplyPending() { _pongReplyPending = false; } - inline void displayMsg(Message::Type msgType, BufferInfo::Type bufferType, const QString &target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None) + void onDisplayMsg(Message::Type msgType, BufferInfo::Type bufferType, const QString &target, const QString &text, const QString &sender, Message::Flags flags) { emit displayMsg(networkId(), msgType, bufferType, target, text, sender, flags); } @@ -437,7 +432,7 @@ public slots: signals: void recvRawServerMsg(QString); void displayStatusMsg(QString); - void displayMsg(NetworkId, Message::Type, BufferInfo::Type, const QString &target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None); + void displayMsg(NetworkId, Message::Type, BufferInfo::Type, const QString &target, const QString &text, const QString &sender, Message::Flags flags); void disconnected(NetworkId networkId); void connectionError(const QString &errorMsg); @@ -449,8 +444,8 @@ signals: void socketDisconnected(const CoreIdentity *identity, const QHostAddress &localAddress, quint16 localPort, const QHostAddress &peerAddress, quint16 peerPort, qint64 socketId); protected: - inline virtual IrcChannel *ircChannelFactory(const QString &channelname) { return new CoreIrcChannel(channelname, this); } - inline virtual IrcUser *ircUserFactory(const QString &hostmask) { return new CoreIrcUser(hostmask, this); } + inline IrcChannel *ircChannelFactory(const QString &channelname) override { return new CoreIrcChannel(channelname, this); } + inline IrcUser *ircUserFactory(const QString &hostmask) override { return new CoreIrcUser(hostmask, this); } protected slots: // TODO: remove cached cipher keys, when appropriate @@ -459,12 +454,13 @@ protected slots: //virtual void removeChansAndUsers(); private slots: - void socketHasData(); - void socketError(QAbstractSocket::SocketError); - void socketInitialized(); - void socketCloseTimeout(); - void socketDisconnected(); - void socketStateChanged(QAbstractSocket::SocketState); + void onSocketHasData(); + void onSocketError(QAbstractSocket::SocketError); + void onSocketInitialized(); + void onSocketCloseTimeout(); + void onSocketDisconnected(); + void onSocketStateChanged(QAbstractSocket::SocketState); + void networkInitialized(); void sendPerform(); @@ -477,7 +473,7 @@ private slots: void startAutoWhoCycle(); #ifdef HAVE_SSL - void sslErrors(const QList &errors); + void onSslErrors(const QList &errors); #endif /** @@ -501,6 +497,17 @@ private slots: void writeToSocket(const QByteArray &data); +private: + void showMessage(Message::Type msgType, + BufferInfo::Type bufferType, + const QString &target, + const QString &text, + const QString &sender = "", + Message::Flags flags = Message::None) + { + emit displayMsg(networkId(), msgType, bufferType, target, text, sender, flags); + } + private: CoreSession *_coreSession; @@ -601,6 +608,3 @@ private: // List of blowfish keys for channels QHash _cipherKeys; }; - - -#endif //CORENETWORK_H