X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=network%2Fmessage.h;fp=network%2Fmessages.h;h=2620d7cef3dc83632f95ca33b5a22bbe0bec40c8;hp=c1a48ee436b34cae72c1f5f2615edb07bd102141;hb=7bcf3798d7e4edb49345f40c7c543f7a9bb97805;hpb=09494f0681def3c6cf585eda25b8bb236560ddac

diff --git a/network/messages.h b/network/message.h
similarity index 77%
rename from network/messages.h
rename to network/message.h
index c1a48ee4..2620d7ce 100644
--- a/network/messages.h
+++ b/network/message.h
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _MESSAGES_H_
-#define _MESSAGES_H_
+#ifndef _MESSAGE_H_
+#define _MESSAGE_H_
 
 #include <QHash>
 #include <QString>
@@ -37,6 +37,7 @@ typedef void (*recvHandlerType)(Message *);              // handler for incoming
  * Most of these are defined at compile time, but more may be added at runtime.
  */
 struct CmdType {
+  int type;
   QString cmd;
   QString cmdDescr;
   QString args;
@@ -51,23 +52,34 @@ struct CmdType {
 */
 class Message {
   public:
-    uint type;
-    QString prefix;
-    QString cmd;
-    QStringList params;
-
-    Message(QString cmd, QStringList args = QStringList());
+    Message(Server *server, Buffer *buffer, QString cmd, QString prefix, QStringList args = QStringList());
 
     virtual ~Message() {};
 
     static void init(recvHandlerType defaultRevcHandler, sendHandlerType defaultSendHandler);
+    static Message * createFromServerString(Server *server, QString srvMsg);
+    //static Message * createFromUserString(Server *server, Buffer *buffer, QString usrMsg);
     //static registerCmd();
     //static unregisterCmd();
 
-    recvHandlerType getRecvHandler();
-    sendHandlerType getSendHandler();
+    inline Server * getServer() { return server; }
+    inline Buffer * getBuffer() { return buffer; }
+    inline int getType() { return type; }
+    inline QString getPrefix() { return prefix; }
+    inline QString getCmd() { return cmd; }
+    inline QStringList getParams() { return params; }
+    inline recvHandlerType getRecvHandler();
+    inline sendHandlerType getSendHandler();
 
   protected:
+    Server *server;
+    Buffer *buffer;
+    int type;
+    QString prefix;
+    QString cmd;
+    QStringList params;
+    recvHandlerType recvHandler;
+    sendHandlerType sendHandler;
     static recvHandlerType defaultRecvHandler;
     static sendHandlerType defaultSendHandler;