[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-04-02 20:45:09
Message-ID: 1207169109.327955.26986.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 793011 by hermier:
Cleaning the code, renamed some class, still not compilable nor usable.
M +2 -12 CMakeLists.txt
D client/kircclientcommandhandler.cpp
D client/kircclientcommandhandler.h
D client/kircclientcommands.cpp
D client/kircclientcommands.h
A client/kircclienteventhandler.cpp \
client/tasks/kircclienttask.cpp#792964 [License: GPL (v2+)] A \
client/kircclienteventhandler.h client/tasks/kircclienttask.h#792964 [License: GPL \
(v2+)] D client/kirctransferhandler.cpp
D client/tasks/kircclienttask.cpp
D client/tasks/kircclienttask.h
M +4 -11 kernel/kirccontext.cpp
M +2 -3 kernel/kirccontext.h
D kernel/kircentitymanager.cpp
D kernel/kircentitymanager.h
M +3 -5 kernel/kircevent.cpp
M +25 -46 kernel/kircevent.h
M +4 -0 kernel/kircmessage.h
D kernel/kirctask.cpp
D kernel/kirctask.h
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/CMakeLists.txt #793010:793011
@@ -12,7 +12,7 @@
# kernel/kirccommand.cpp
kernel/kircconst.cpp
kernel/kirccontext.cpp
- kernel/kircentity.cpp
+ kernel/kircentity.cpp
kernel/kircevent.cpp
kernel/kirceventhandler.cpp
kernel/kirceventhandlerfactory.cpp
@@ -21,7 +21,6 @@
kernel/kircmessageutil.cpp
kernel/kircsocket.cpp
# kernel/kircstdmessages.cpp
- kernel/kirctask.cpp
)
kde4_add_library(kirc SHARED ${libkirc_SRCS})
@@ -32,17 +31,8 @@
install(TARGETS kirc ${INSTALL_TARGETS_DEFAULT_ARGS})
set(libkirc_client_SRCS
+ client/kircclienteventhandler.cpp
client/kircclientsocket.cpp
-# client/kirccommand.cpp
-# client/kirccommandhandler.cpp
-# client/kircclientcommandhandler.cpp
- client/kircclientcommands.cpp
-# client/kirctransfer.cpp
-# client/kirctransferhandler.cpp
-# client/kirctransferserver.cpp
-
-# client/tasks/kircclienttask.cpp
-# client/tasks/kirci18ntask.cpp
)
kde4_add_library(kirc_client SHARED ${libkirc_client_SRCS})
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/kernel/kirccontext.cpp \
#793010:793011 @@ -56,7 +56,7 @@
return entities;
}
-Entity::Ptr Context::entityFromName(const QByteArray &name) const
+Entity::Ptr Context::entityFromName(const QByteArray &name)
{
Entity::Ptr entity;
@@ -67,22 +67,15 @@
#warning Do the searching code here.
#endif
- return entity;
-}
-/*
-Entity::Ptr Context::entityFromName(const QByteArray &name, bool createIfNotFound)
-{
- Entity *entity = entityFromName(name);
-
if (!entity)
{
- entity = new Entity(name);
- add(entity);
+ entity = new Entity(this);
+ entity->setName(name);
+// add(entity);
}
return entity;
}
-*/
Entity::List Context::entitiesFromNames(const QList<QByteArray> &names)
{
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/kernel/kirccontext.h \
#793010:793011 @@ -56,12 +56,11 @@
// Entity::List entitiesByServer(...) const;
// Entity::List entitiesByType(...) const;
- Entity::Ptr entityFromName(const QByteArray &name) const;
-// Entity::Ptr entityFromName(const QByteArray &name, bool );
+ Entity::Ptr entityFromName(const QByteArray &name);
Entity::List entitiesFromNames(const QList<QByteArray> &names);
- Entity::List entitiesFromNames(const QByteArray &names, char sep);
+ Entity::List entitiesFromNames(const QByteArray &names, char sep = ',');
public:
void postEvent(KIrc::Event *event);
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/kernel/kircevent.cpp \
#793010:793011 @@ -19,11 +19,9 @@
using namespace KIrc;
-const int KIrc::CommandEvent::Command = QEvent::registerEventType();
+const QEvent::Type KIrc::CommandEvent::Type = \
(QEvent::Type)QEvent::registerEventType();
-const int KIrc::MessageEvent::MessageReveived = QEvent::registerEventType();
+const QEvent::Type KIrc::MessageEvent::Type = \
(QEvent::Type)QEvent::registerEventType();
-//const int KIrc::MessageEvent::MessageSending = QEvent::registerEventType();
+const QEvent::Type KIrc::TextEvent::Type = \
(QEvent::Type)QEvent::registerEventType();
-//const int KIrc::MessageEvent::MessageDispatch = QEvent::registerEventType();
-
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/kernel/kircevent.h \
#793010:793011 @@ -15,8 +15,8 @@
*************************************************************************
*/
-#ifndef KIRC_EVENT_H
-#define KIRC_EVENT_H
+#ifndef KIRC_EVENTS_H
+#define KIRC_EVENTS_H
#include "kircmessage.h"
@@ -27,57 +27,24 @@
class Socket;
-class KIRC_EXPORT Event
+class KIRC_EXPORT CommandEvent
: public QEvent
{
+ static const QEvent::Type Type;
public:
- enum Type
- {
- Command = 10, // Text command
-
- MessageReceived = 20, // Generic message, usually a command message
- MessageSending = 21,
-// MessageDispatch = 22, // Message as to be redispatched to other sockets.
-
-// ClientServerReply = 21, // Numeric reply message in the 001-099 range
-// CommandReply = 22, // Numeric reply message in the 200-399 range
-// ErrorReply = 23 // Numeric reply message in the 400-599 range
-
- Text
- };
-
-public:
- explicit Event(Type type)
- : QEvent(static_cast<QEvent::Type>(type))
- { }
-
- Event(const Event &o);
-};
-
-class KIRC_EXPORT CommandEvent
- : public KIrc::Event
-{
- static const int Command;
-public:
// explicit CommandEvent();
private:
};
class KIRC_EXPORT MessageEvent
- : public Event
+ : public QEvent
{
- // Generic message, usually a command message
- static const int MessageReveived;
+ static const QEvent::Type Type;
-// 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)
+ MessageEvent(const KIrc::Message &message, KIrc::Socket *socket)
+ : QEvent(Type), m_message(message), m_socket(socket)
{ }
inline const KIrc::Message &message() const { return m_message; }
@@ -89,9 +56,11 @@
};
class KIRC_EXPORT TextEvent
- : public KIrc::Event
+ : public QEvent
{
public:
+ static const QEvent::Type Type;
+/*
enum Verbosity
{
Error,
@@ -100,15 +69,25 @@
Verbose,
Debug
};
+*/
+ TextEvent(const QString &eventId, const KIrc::Entity::Ptr &from, const \
KIrc::Entity::Ptr &to, const QString &text) + : QEvent(Type), m_eventId(eventId), \
m_from(from), m_to(KIrc::Entity::List() << to), m_text(text) + { }
-
- TextEvent(const QString &text, Verbosity verbosity = Normal)
- : Event(Text), m_text(text), m_verbosity(verbosity)
+ TextEvent(const QString &eventId, const KIrc::Entity::Ptr &from, const \
KIrc::Entity::List &to, const QString &text) + : QEvent(Type), m_eventId(eventId), \
m_from(from), m_to(to), m_text(text) { }
+ QString eventId() const { return m_eventId; }
+ KIrc::Entity::Ptr from() const { return m_from; }
+ KIrc::Entity::List to() const { return m_to; }
+ QString text() const { return m_text; }
+
private:
+ QString m_eventId;
+ KIrc::Entity::Ptr m_from;
+ KIrc::Entity::List m_to;
QString m_text;
- Verbosity m_verbosity;
};
}
--- trunk/KDE/kdenetwork/kopete/protocols/irc/libkirc/kernel/kircmessage.h \
#793010:793011 @@ -20,6 +20,8 @@
#include "kircglobal.h"
+#include "kircentity.h"
+
#include <QtCore/QSharedDataPointer>
#include <QtCore/QStringList>
@@ -29,6 +31,8 @@
{
class Context;
+class EntityManager;
+
class MessagePrivate;
/*
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic