[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/irc/libkirc
From:       Michel Hermier <michel.hermier () gmail ! com>
Date:       2008-02-29 22:07:18
Message-ID: 1204322838.282228.16297.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780742 by hermier:

Commit my work, still not usable.

 M  +4 -3      CMakeLists.txt  
 M  +2 -2      client/kircclientcommands.cpp  
 M  +3 -2      client/kircclientcommands.h  
 A             client/kircclientsocket_p.h   [License: GPL (v2+)]
 D             kernel/CMakeLists.txt  
 M  +7 -0      kernel/kircbytearrayescaper.cpp  
 M  +2 -0      kernel/kircbytearrayescaper.h  
 A             kernel/kirccontext.cpp   [License: GPL (v2+)]
 A             kernel/kirccontext.h   [License: GPL (v2+)]
 M  +8 -0      kernel/kircevent.cpp  
 M  +9 -0      kernel/kircevent.h  
 A             kernel/kirceventhandler.cpp   [License: GPL (v2+)]
 A             kernel/kirceventhandler.h   [License: GPL (v2+)]
 A             kernel/kirceventhandlerfactory.cpp   [License: GPL (v2+)]
 A             kernel/kirceventhandlerfactory.h   [License: GPL (v2+)]
 A             kernel/kirceventhandlerplugin.cpp   [License: GPL (v2+)]
 A             kernel/kirceventhandlerplugin.h   [License: GPL (v2+)]
 M  +0 -1      kernel/kircsocket.h  
 A             kernel/kircsocket_p.h   [License: GPL (v2+)]


--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/CMakeLists.txt #780741:780742
@@ -6,18 +6,19 @@
 )
 
 set(libkirc_SRCS
-	kernel/kbytearrayescaper.cpp
-	kernel/kbytearraylist.cpp
 	kernel/kcmdline.cpp
 
+	kernel/kircbytearrayescaper.cpp
 #	kernel/kirccommand.cpp
 	kernel/kircconst.cpp 
 	kernel/kirccontext.cpp
 	kernel/kircentity.cpp 
 	kernel/kircevent.cpp 
+	kernel/kirceventhandler.cpp
+	kernel/kirceventhandlerfactory.cpp
+	kernel/kirceventhandlerplugin.cpp
 	kernel/kircmessage.cpp 
 	kernel/kircmessageutil.cpp 
-	kernel/kircplugin.cpp
 	kernel/kircsocket.cpp 
 #	kernel/kircstdmessages.cpp 
 	kernel/kirctask.cpp
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/client/kircclientcommands.cpp #780741:780742
@@ -34,7 +34,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 /*
-class ClientCommands::Private
+class KIrc::ClientCommandsPrivate
 {
 public:
 };
@@ -42,7 +42,7 @@
 using namespace KIrc;
 
 ClientCommands::ClientCommands(QObject *parent)
-	: KIrc::Plugin(parent)
+	: KIrc::EventHandler(parent)
 	, d(0)
 {
 }
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/client/kircclientcommands.h #780741:780742
@@ -20,7 +20,8 @@
 #ifndef KIRCCLIENTCOMMANDS_H
 #define KIRCCLIENTCOMMANDS_H
 
-#include "kircplugin.h"
+#include "kirceventhandler.h"
+#include "kircmessage.h"
 
 namespace KIrc
 {
@@ -33,7 +34,7 @@
  * @author Jason Keirstead <jason@keirstead.org>
  */
 class ClientCommands
-	: public KIrc::Plugin
+	: public KIrc::EventHandler
 {
 	Q_OBJECT
 
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/kernel/kircbytearrayescaper.cpp #780741:780742
@@ -146,3 +146,10 @@
 
 	return ret;
 }
+
+#if 0
+QList<QByteArray> ByteArrayEscaper::split(const QByteArray &buffer, char sep) const
+{
+}
+#endif
+
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/kernel/kircbytearrayescaper.h #780741:780742
@@ -52,6 +52,8 @@
 //	QByteArray join(const QList<QByteArray> &buffers, const char *sep) const;
 //	QByteArray join(const QList<QByteArray> &buffers, const QByteArray &sep) const;
 
+//	QList<QByteArray> split(const QByteArray &buffer, char sep) const;
+
 private:
 	class Private;
 	Private * const d;
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/kernel/kircevent.cpp #780741:780742
@@ -19,3 +19,11 @@
 
 using namespace KIrc;
 
+const int KIrc::CommandEvent::Command = registerEventType();
+
+const int KIrc::MessageEvent::MessageReveived = registerEventType();
+
+//const int KIrc::MessageEvent::MessageSending = registerEventType();
+
+//const int KIrc::MessageEvent::MessageDispatch = registerEventType();
+
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/kernel/kircevent.h #780741:780742
@@ -57,6 +57,7 @@
 class KIRC_EXPORT CommandEvent
 	: public KIrc::Event
 {
+	static const int Command;
 public:
 //	explicit CommandEvent();
 
@@ -66,6 +67,14 @@
 class KIRC_EXPORT MessageEvent
 	: public Event
 {
+	// Generic message, usually a command message
+	static const int MessageReveived;
+
+//	static const int MessageSending;
+
+	// Message as to be redispatched to other sockets.
+//	static const int MessageDispatch;
+
 public:
 	MessageEvent(Type type, const KIrc::Message &message, KIrc::Socket *socket)
 		: KIrc::Event(type), m_message(message), m_socket(socket)
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/kernel/kircsocket.h #780741:780742
@@ -20,7 +20,6 @@
 #define KIRCSOCKET_H
 
 #include "kircentity.h"
-#include "kircevent.h"
 #include "kircmessage.h"
 
 #include <QtCore/QUrl>
[prev in list] [next in list] [prev in thread] [next in thread]