X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fctcpparser.h;h=7fd2a837c950615206dee11b38235685e3a3b023;hp=e68e737b761bff3a968dbac325bcf1729040476f;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=88b350153eb364853e75d237d3eed2dfaf839d59

diff --git a/src/core/ctcpparser.h b/src/core/ctcpparser.h
index e68e737b..7fd2a837 100644
--- a/src/core/ctcpparser.h
+++ b/src/core/ctcpparser.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 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,80 +15,89 @@
  *   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 CTCPPARSER_H
 #define CTCPPARSER_H
 
 #include <QUuid>
+#include <utility>
 
 #include "corenetwork.h"
 #include "eventmanager.h"
 #include "ircevent.h"
+#include "ctcpevent.h"
 
 class CoreSession;
 class CtcpEvent;
 
-class CtcpParser : public QObject {
-  Q_OBJECT
+class CtcpParser : public QObject
+{
+    Q_OBJECT
 
 public:
-  CtcpParser(CoreSession *coreSession, QObject *parent = 0);
+    CtcpParser(CoreSession *coreSession, QObject *parent = nullptr);
 
-  inline CoreSession *coreSession() const { return _coreSession; }
+    inline CoreSession *coreSession() const { return _coreSession; }
 
-  void query(CoreNetwork *network, const QString &bufname, const QString &ctcpTag, const QString &message);
-  void reply(CoreNetwork *network, const QString &bufname, const QString &ctcpTag, const QString &message);
+    void query(CoreNetwork *network, const QString &bufname, const QString &ctcpTag, const QString &message);
+    void reply(CoreNetwork *network, const QString &bufname, const QString &ctcpTag, const QString &message);
 
-  Q_INVOKABLE void processIrcEventRawNotice(IrcEventRawMessage *event);
-  Q_INVOKABLE void processIrcEventRawPrivmsg(IrcEventRawMessage *event);
+    Q_INVOKABLE void processIrcEventRawNotice(IrcEventRawMessage *event);
+    Q_INVOKABLE void processIrcEventRawPrivmsg(IrcEventRawMessage *event);
 
-  Q_INVOKABLE void sendCtcpEvent(CtcpEvent *event);
+    Q_INVOKABLE void sendCtcpEvent(CtcpEvent *event);
 
 signals:
-  void newEvent(Event *event);
+    void newEvent(Event *event);
 
 protected:
-  inline CoreNetwork *coreNetwork(NetworkEvent *e) const { return qobject_cast<CoreNetwork *>(e->network()); }
+    inline CoreNetwork *coreNetwork(NetworkEvent *e) const { return qobject_cast<CoreNetwork *>(e->network()); }
 
-  // FIXME duplicates functionality in EventStringifier, maybe want to put that in something common
-  //! Creates and sends a MessageEvent
-  void displayMsg(NetworkEvent *event,
-                  Message::Type msgType,
-                  const QString &msg,
-                  const QString &sender = QString(),
-                  const QString &target = QString(),
-                  Message::Flags msgFlags = Message::None);
+    // FIXME duplicates functionality in EventStringifier, maybe want to put that in something common
+    //! Creates and sends a MessageEvent
+    void displayMsg(NetworkEvent *event,
+        Message::Type msgType,
+        const QString &msg,
+        const QString &sender = QString(),
+        const QString &target = QString(),
+        Message::Flags msgFlags = Message::None);
 
-  void parse(IrcEventRawMessage *event, Message::Type msgType);
+    void parse(IrcEventRawMessage *event, Message::Type msgType);
+    void parseSimple(IrcEventRawMessage *e, Message::Type messagetype, QByteArray dequotedMessage, CtcpEvent::CtcpType ctcptype, Message::Flags flags);
+    void parseStandard(IrcEventRawMessage *e, Message::Type messagetype, QByteArray dequotedMessage, CtcpEvent::CtcpType ctcptype, Message::Flags flags);
 
-  QByteArray lowLevelQuote(const QByteArray &);
-  QByteArray lowLevelDequote(const QByteArray &);
-  QByteArray xdelimQuote(const QByteArray &);
-  QByteArray xdelimDequote(const QByteArray &);
+    QByteArray lowLevelQuote(const QByteArray &);
+    QByteArray lowLevelDequote(const QByteArray &);
+    QByteArray xdelimQuote(const QByteArray &);
+    QByteArray xdelimDequote(const QByteArray &);
 
-  QByteArray pack(const QByteArray &ctcpTag, const QByteArray &message);
-  void packedReply(CoreNetwork *network, const QString &bufname, const QList<QByteArray> &replies);
+    QByteArray pack(const QByteArray &ctcpTag, const QByteArray &message);
+    void packedReply(CoreNetwork *network, const QString &bufname, const QList<QByteArray> &replies);
+
+private slots:
+    void setStandardCtcp(bool enabled);
 
 private:
-  inline QString targetDecode(IrcEventRawMessage *e, const QByteArray &msg) { return coreNetwork(e)->userDecode(e->target(), msg); }
+    inline QString targetDecode(IrcEventRawMessage *e, const QByteArray &msg) { return coreNetwork(e)->userDecode(e->target(), msg); }
 
-  CoreSession *_coreSession;
+    CoreSession *_coreSession;
 
-  struct CtcpReply {
-    CoreNetwork *network;
-    QString bufferName;
-    QList<QByteArray> replies;
+    struct CtcpReply {
+        CoreNetwork *network{nullptr};
+        QString bufferName;
+        QList<QByteArray> replies;
 
-    CtcpReply() : network(0) {}
-    CtcpReply(CoreNetwork *net, const QString &buf) : network(net), bufferName(buf) {}
-  };
+        CtcpReply()  {}
+        CtcpReply(CoreNetwork *net, QString buf) : network(net), bufferName(std::move(buf)) {}
+    };
 
-  QHash<QUuid, CtcpReply> _replies;
+    QHash<QUuid, CtcpReply> _replies;
 
-  QHash<QByteArray, QByteArray> _ctcpMDequoteHash;
-  QHash<QByteArray, QByteArray> _ctcpXDelimDequoteHash;
+    QHash<QByteArray, QByteArray> _ctcpMDequoteHash;
+    QHash<QByteArray, QByteArray> _ctcpXDelimDequoteHash;
 };
 
+
 #endif