Code cleanup. Distclean advised

diff --git a/src/client/client.cpp b/src/client/client.cpp
index e79ae46..b3e55c7 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -130,24 +130,24 @@ QList<Buffer *> Client::buffers() {
 
 
 // FIXME remove
 
 
 // FIXME remove

-Buffer *Client::buffer(BufferId bufferUid) {
-  if(instance()->_buffers.contains(bufferUid))
-    return instance()->_buffers[bufferUid];
+Buffer *Client::buffer(BufferId bufferId) {
+  if(instance()->_buffers.contains(bufferId))
+    return instance()->_buffers[bufferId];

   else
     return 0;
 }
 
 // FIXME remove
   else
     return 0;
 }
 
 // FIXME remove

-Buffer *Client::buffer(BufferInfo id) {
-  Buffer *buff = buffer(id.uid());
+Buffer *Client::buffer(BufferInfo bufferInfo) {
+  Buffer *buff = buffer(bufferInfo.bufferId());

 
   if(!buff) {
     Client *client = Client::instance();
 
   if(!buff) {
     Client *client = Client::instance();

-    buff = new Buffer(id, client);
+    buff = new Buffer(bufferInfo, client);

     connect(buff, SIGNAL(destroyed()),
            client, SLOT(bufferDestroyed()));
     connect(buff, SIGNAL(destroyed()),
            client, SLOT(bufferDestroyed()));

-    client->_buffers[id.uid()] = buff;
-    emit client->bufferUpdated(id);
+    client->_buffers[bufferInfo.bufferId()] = buff;
+    emit client->bufferUpdated(bufferInfo);

   }
   Q_ASSERT(buff);
   return buff;
   }
   Q_ASSERT(buff);
   return buff;


@@ -364,14 +364,14 @@ void Client::networkDestroyed() {
 }
 
 void Client::recvMessage(const Message &msg) {
 }
 
 void Client::recvMessage(const Message &msg) {

-  Buffer *b = buffer(msg.buffer());
+  Buffer *b = buffer(msg.bufferInfo());

   b->appendMsg(msg);
   networkModel()->updateBufferActivity(msg);
 
   if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) {
     // FIXME: fetch networkName();
   b->appendMsg(msg);
   networkModel()->updateBufferActivity(msg);
 
   if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) {
     // FIXME: fetch networkName();

-    QString sender = ":" + msg.buffer().buffer() + ":" + msg.sender();
-    Message mmsg = Message(msg.timestamp(), msg.buffer(), msg.type(), msg.text(), sender, msg.flags());
+    QString sender = ":" + msg.bufferInfo().bufferName() + ":" + msg.sender();
+    Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags());

     monitorBuffer()->appendMsg(mmsg);
   }
 
     monitorBuffer()->appendMsg(mmsg);
   }
 

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 076e704..1676e33 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -40,9 +40,9 @@ BufferItem::BufferItem(BufferInfo bufferInfo, AbstractTreeItem *parent)
     _activity(NoActivity)
 {
   // determine BufferType
     _activity(NoActivity)
 {
   // determine BufferType

-  if(bufferInfo.buffer().isEmpty())
+  if(bufferInfo.bufferName().isEmpty())

     _type = StatusType;
     _type = StatusType;

-  else if(isChannelName(bufferInfo.buffer()))
+  else if(isChannelName(bufferInfo.bufferName()))

     _type = ChannelType;
   else
     _type = QueryType;
     _type = ChannelType;
   else
     _type = QueryType;


@@ -59,7 +59,7 @@ const BufferInfo &BufferItem::bufferInfo() const {
 }
 
 quint64 BufferItem::id() const {
 }
 
 quint64 BufferItem::id() const {

-  return bufferInfo().uid().toInt();
+  return bufferInfo().bufferId().toInt();

 }
 
 bool BufferItem::isStatusBuffer() const {
 }
 
 bool BufferItem::isStatusBuffer() const {


@@ -96,7 +96,7 @@ QVariant BufferItem::data(int column, int role) const {
   case NetworkModel::ItemTypeRole:
     return NetworkModel::BufferItemType;
   case NetworkModel::BufferIdRole:
   case NetworkModel::ItemTypeRole:
     return NetworkModel::BufferItemType;
   case NetworkModel::BufferIdRole:

-    return qVariantFromValue(bufferInfo().uid());
+    return qVariantFromValue(bufferInfo().bufferId());

   case NetworkModel::NetworkIdRole:
     return qVariantFromValue(bufferInfo().networkId());
   case NetworkModel::BufferInfoRole:
   case NetworkModel::NetworkIdRole:
     return qVariantFromValue(bufferInfo().networkId());
   case NetworkModel::BufferInfoRole:


@@ -163,7 +163,7 @@ QString BufferItem::bufferName() const {
   if(bufferType() == StatusType)
     return tr("Status Buffer");
   else
   if(bufferType() == StatusType)
     return tr("Status Buffer");
   else

-    return bufferInfo().buffer();
+    return bufferInfo().bufferName();

 }
 
 QString BufferItem::topic() const {
 }
 
 QString BufferItem::topic() const {


@@ -578,7 +578,7 @@ QModelIndex NetworkModel::bufferIndex(BufferId bufferId) {
 }
 
 BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {
 }
 
 BufferItem *NetworkModel::existsBufferItem(const BufferInfo &bufferInfo) {

-  QModelIndex bufferIdx = bufferIndex(bufferInfo.uid());
+  QModelIndex bufferIdx = bufferIndex(bufferInfo.bufferId());

   if(bufferIdx.isValid())
     return static_cast<BufferItem *>(bufferIdx.internalPointer());
   else
   if(bufferIdx.isValid())
     return static_cast<BufferItem *>(bufferIdx.internalPointer());
   else


@@ -708,6 +708,6 @@ void NetworkModel::updateBufferActivity(const Message &msg) {
   if(msg.flags() & Message::Highlight)
     level |= BufferItem::Highlight;
   
   if(msg.flags() & Message::Highlight)
     level |= BufferItem::Highlight;
   

-  bufferItem(msg.buffer())->updateActivity(level);
+  bufferItem(msg.bufferInfo())->updateActivity(level);

 }
 
 }
 

diff --git a/src/common/bufferinfo.cpp b/src/common/bufferinfo.cpp
index 8d45a47..a63d703 100644 (file)
--- a/src/common/bufferinfo.cpp
+++ b/src/common/bufferinfo.cpp
@@ -28,22 +28,22 @@
 #include "util.h"
 
 BufferInfo::BufferInfo()
 #include "util.h"
 
 BufferInfo::BufferInfo()

-  : _id(0),
+  : _bufferId(0),

     _netid(0),
     _netid(0),

-    _gid(0),
+    _groupId(0),

     _bufferName(QString())
 {
 }
 
 BufferInfo::BufferInfo(BufferId id,  NetworkId networkid, uint gid, QString buf)
     _bufferName(QString())
 {
 }
 
 BufferInfo::BufferInfo(BufferId id,  NetworkId networkid, uint gid, QString buf)

-  : _id(id),
+  : _bufferId(id),

     _netid(networkid),
     _netid(networkid),

-    _gid(gid),
+    _groupId(gid),

     _bufferName(buf)
 {
 }
 
     _bufferName(buf)
 {
 }
 

-QString BufferInfo::buffer() const {
+QString BufferInfo::bufferName() const {

   if(isChannelName(_bufferName))
     return _bufferName;
   else
   if(isChannelName(_bufferName))
     return _bufferName;
   else


@@ -51,23 +51,23 @@ QString BufferInfo::buffer() const {
 }
 
 QDebug operator<<(QDebug dbg, const BufferInfo &b) {
 }
 
 QDebug operator<<(QDebug dbg, const BufferInfo &b) {

-  dbg.nospace() << "(bufId: " << b.uid() << ", netId: " << b.networkId() << ", groupId: " << b.groupId() << ", buf: " << b.buffer() << ")";
+  dbg.nospace() << "(bufId: " << b.bufferId() << ", netId: " << b.networkId() << ", groupId: " << b.groupId() << ", buf: " << b.bufferName() << ")";

   return dbg.space();
 }
 
 QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo) {
   return dbg.space();
 }
 
 QDataStream &operator<<(QDataStream &out, const BufferInfo &bufferInfo) {

-  out << bufferInfo._id << bufferInfo._netid << bufferInfo._gid << bufferInfo._bufferName.toUtf8();
+  out << bufferInfo._bufferId << bufferInfo._netid << bufferInfo._groupId << bufferInfo._bufferName.toUtf8();

   return out;
 }
 
 QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo) {
   QByteArray buffername;
   return out;
 }
 
 QDataStream &operator>>(QDataStream &in, BufferInfo &bufferInfo) {
   QByteArray buffername;

-  in >> bufferInfo._id >> bufferInfo._netid >> bufferInfo._gid >> buffername;
+  in >> bufferInfo._bufferId >> bufferInfo._netid >> bufferInfo._groupId >> buffername;

   bufferInfo._bufferName = QString::fromUtf8(buffername);
   return in;
 }
 
 uint qHash(const BufferInfo &bufferid) {
   bufferInfo._bufferName = QString::fromUtf8(buffername);
   return in;
 }
 
 uint qHash(const BufferInfo &bufferid) {

-  return qHash(bufferid._id.toInt());
+  return qHash(bufferid._bufferId.toInt());

 }
 
 }
 

diff --git a/src/common/bufferinfo.h b/src/common/bufferinfo.h
index f0b9203..6a5a779 100644 (file)
--- a/src/common/bufferinfo.h
+++ b/src/common/bufferinfo.h
@@ -31,19 +31,19 @@ public:
   BufferInfo();
   BufferInfo(BufferId id, NetworkId networkid, uint gid = 0, QString buf = QString());
   
   BufferInfo();
   BufferInfo(BufferId id, NetworkId networkid, uint gid = 0, QString buf = QString());
   

-  inline BufferId uid() const { return _id; }
+  inline BufferId bufferId() const { return _bufferId; }

   inline NetworkId networkId() const { return _netid; }
   inline NetworkId networkId() const { return _netid; }

-  inline uint groupId() const { return _gid; }
-  QString buffer() const;
+  inline uint groupId() const { return _groupId; }
+  QString bufferName() const;

   
   

-  void setGroupId(uint gid) { _gid = gid; }
+  void setGroupId(uint gid) { _groupId = gid; }

   
   

-  inline bool operator==(const BufferInfo &other) const { return _id == other._id; }
+  inline bool operator==(const BufferInfo &other) const { return _bufferId == other._bufferId; }

 
 private:
 
 private:

-  BufferId _id;
+  BufferId _bufferId;

   NetworkId _netid;
   NetworkId _netid;

-  uint _gid;
+  uint _groupId;

   QString _bufferName;
   
   friend uint qHash(const BufferInfo &);
   QString _bufferName;
   
   friend uint qHash(const BufferInfo &);

diff --git a/src/common/message.cpp b/src/common/message.cpp
index d49e6cb..e09457a 100644 (file)
--- a/src/common/message.cpp
+++ b/src/common/message.cpp
@@ -24,46 +24,24 @@
 
 #include <QDataStream>
 
 
 #include <QDataStream>
 

-Message::Message(BufferInfo __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
-  : _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
-  _timestamp = QDateTime::currentDateTime().toUTC();
-}
-
-Message::Message(QDateTime __ts, BufferInfo __buffer, Type __type, QString __text, QString __sender, quint8 __flags)
-  : _timestamp(__ts), _buffer(__buffer), _text(__text), _sender(__sender), _type(__type), _flags(__flags) {
-
-}
-
-MsgId Message::msgId() const {
-  return _msgId;
-}
-
-void Message::setMsgId(MsgId _id) {
-  _msgId = _id;
-}
-
-BufferInfo Message::buffer() const {
-  return _buffer;
-}
-
-QString Message::text() const {
-  return _text;
-}
-
-QString Message::sender() const {
-  return _sender;
-}
-
-Message::Type Message::type() const {
-   return _type;
-}
-
-quint8 Message::flags() const {
-   return _flags;
-}
-
-QDateTime Message::timestamp() const {
-  return _timestamp;
+Message::Message(BufferInfo bufferInfo, Type type, QString text, QString sender, quint8 flags)
+  : _timestamp(QDateTime::currentDateTime().toUTC()),
+    _bufferInfo(bufferInfo),
+    _text(text),
+    _sender(sender),
+    _type(type),
+    _flags(flags)
+{
+}
+
+Message::Message(QDateTime ts,BufferInfo bufferInfo, Type type, QString text, QString sender, quint8 flags)
+  : _timestamp(ts),
+    _bufferInfo(bufferInfo),
+    _text(text),
+    _sender(sender),
+    _type(type),
+    _flags(flags)
+{

 }
 
 QString Message::mircToInternal(QString mirc) {
 }
 
 QString Message::mircToInternal(QString mirc) {


@@ -110,12 +88,14 @@ QString Message::mircToInternal(QString mirc) {
 }
 
 void Message::format() {
 }
 
 void Message::format() {

-  if(!_formattedText.isNull()) return; // already done
+  if(!_formattedText.isNull())
+    return; // already done
+  

   QString user = userFromMask(sender());
   QString host = hostFromMask(sender());
   QString nick = nickFromMask(sender());
   QString txt = mircToInternal(text());
   QString user = userFromMask(sender());
   QString host = hostFromMask(sender());
   QString nick = nickFromMask(sender());
   QString txt = mircToInternal(text());

-  QString bufferName = buffer().buffer();
+  QString bufferName = bufferInfo().bufferName();

 
   _formattedTimestamp = tr("%DT[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss"));
 
 
   _formattedTimestamp = tr("%DT[%1]").arg(timestamp().toLocalTime().toString("hh:mm:ss"));
 


@@ -193,7 +173,7 @@ QString Message::formattedToHtml(const QString &f) {
 
 QDataStream &operator<<(QDataStream &out, const Message &msg) {
   out << (quint32)msg.timestamp().toTime_t() << (quint8)msg.type() << (quint8)msg.flags()
 
 QDataStream &operator<<(QDataStream &out, const Message &msg) {
   out << (quint32)msg.timestamp().toTime_t() << (quint8)msg.type() << (quint8)msg.flags()

-      << msg.buffer() << msg.sender().toUtf8() << msg.text().toUtf8();
+      << msg.bufferInfo() << msg.sender().toUtf8() << msg.text().toUtf8();

   return out;
 }
 
   return out;
 }
 


@@ -205,7 +185,7 @@ QDataStream &operator>>(QDataStream &in, Message &msg) {
   in >> ts >> t >> f >> buf >> s >> m;
   msg._type = (Message::Type)t;
   msg._flags = (quint8)f;
   in >> ts >> t >> f >> buf >> s >> m;
   msg._type = (Message::Type)t;
   msg._flags = (quint8)f;

-  msg._buffer = buf;
+  msg._bufferInfo = buf;

   msg._timestamp = QDateTime::fromTime_t(ts);
   msg._sender = QString::fromUtf8(s);
   msg._text = QString::fromUtf8(m);
   msg._timestamp = QDateTime::fromTime_t(ts);
   msg._sender = QString::fromUtf8(s);
   msg._text = QString::fromUtf8(m);

diff --git a/src/common/message.h b/src/common/message.h
index e7e9f59..1411f3b 100644 (file)
--- a/src/common/message.h
+++ b/src/common/message.h
@@ -30,48 +30,48 @@
 class Message {
   Q_DECLARE_TR_FUNCTIONS(Message);
 
 class Message {
   Q_DECLARE_TR_FUNCTIONS(Message);
 

-  public:
-    /** The different types a message can have for display */
-    enum Type { Plain, Notice, Action, Nick, Mode, Join, Part, Quit, Kick, Kill, Server, Info, Error };
-    enum Flags { None = 0, Self = 1, PrivMsg = 2, Highlight = 4 };
+public:
+  /** The different types a message can have for display */
+  enum Type { Plain, Notice, Action, Nick, Mode, Join, Part, Quit, Kick, Kill, Server, Info, Error };
+  enum Flags { None = 0, Self = 1, PrivMsg = 2, Highlight = 4 };

 
 

-    Message(BufferInfo buffer = BufferInfo(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);
+  Message(BufferInfo bufferInfo = BufferInfo(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);

 
 

-    Message(QDateTime ts, BufferInfo buffer = BufferInfo(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);
+  Message(QDateTime ts, BufferInfo buffer = BufferInfo(), Type type = Plain, QString text = "", QString sender = "", quint8 flags = None);

 
 

-    MsgId msgId() const;
-    void setMsgId(MsgId id);
+  inline MsgId msgId() const { return _msgId; }
+  inline void setMsgId(MsgId id) { _msgId = id; }

 
 

-    BufferInfo buffer() const;
-    QString text() const;
-    QString sender() const;
-    Type type() const;
-    quint8 flags() const;
-    QDateTime timestamp() const;
+  inline BufferInfo bufferInfo() const { return _bufferInfo; }
+  inline QString text() const { return _text; }
+  inline QString sender() const { return _sender; }
+  inline Type type() const { return _type; }
+  inline quint8 flags() const { return _flags; }
+  inline QDateTime timestamp() const { return _timestamp; }

 
 

-    QString formattedTimestamp();
-    QString formattedSender();
-    QString formattedText();
+  QString formattedTimestamp();
+  QString formattedSender();
+  QString formattedText();

 
 

-    //static QString formattedToHtml(const QString &);
+  //static QString formattedToHtml(const QString &);

 
 

-    void format();
+  void format();

 
 

-  private:
-    QDateTime _timestamp;
-    MsgId _msgId;
-    BufferInfo _buffer;
-    QString _text;
-    QString _sender;
-    Type _type;
-    quint8 _flags;
+private:
+  QDateTime _timestamp;
+  MsgId _msgId;
+  BufferInfo _bufferInfo;
+  QString _text;
+  QString _sender;
+  Type _type;
+  quint8 _flags;

 
 

-    QString _formattedTimestamp, _formattedSender, _formattedText; // cache
+  QString _formattedTimestamp, _formattedSender, _formattedText; // cache

 
 

-    /** Convert mIRC control codes to our own */
-    QString mircToInternal(QString);
+  /** Convert mIRC control codes to our own */
+  QString mircToInternal(QString);

 
 

-    friend QDataStream &operator>>(QDataStream &in, Message &msg);
+  friend QDataStream &operator>>(QDataStream &in, Message &msg);

 };
 
 QDataStream &operator<<(QDataStream &out, const Message &msg);
 };
 
 QDataStream &operator<<(QDataStream &out, const Message &msg);

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 02cc668..e974c21 100644 (file)
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -281,7 +281,7 @@ void CoreSession::networkDisconnected(NetworkId networkid) {
 void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
   NetworkConnection *conn = networkConnection(bufinfo.networkId());
   if(conn) {
 void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
   NetworkConnection *conn = networkConnection(bufinfo.networkId());
   if(conn) {

-    conn->userInput(bufinfo.buffer(), msg);
+    conn->userInput(bufinfo.bufferName(), msg);

   } else {
     qWarning() << "Trying to send to unconnected network!";
   }
   } else {
     qWarning() << "Trying to send to unconnected network!";
   }

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 7bfbb1a..49476e9 100644 (file)
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -228,7 +228,7 @@ QList<BufferInfo> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
 MsgId SqliteStorage::logMessage(Message msg) {
   QSqlQuery *logMessageQuery = cachedQuery("insert_message");
   logMessageQuery->bindValue(":time", msg.timestamp().toTime_t());
 MsgId SqliteStorage::logMessage(Message msg) {
   QSqlQuery *logMessageQuery = cachedQuery("insert_message");
   logMessageQuery->bindValue(":time", msg.timestamp().toTime_t());

-  logMessageQuery->bindValue(":bufferid", msg.buffer().uid().toInt());
+  logMessageQuery->bindValue(":bufferid", msg.bufferInfo().bufferId().toInt());

   logMessageQuery->bindValue(":type", msg.type());
   logMessageQuery->bindValue(":flags", msg.flags());
   logMessageQuery->bindValue(":sender", msg.sender());
   logMessageQuery->bindValue(":type", msg.type());
   logMessageQuery->bindValue(":flags", msg.flags());
   logMessageQuery->bindValue(":sender", msg.sender());


@@ -252,7 +252,7 @@ MsgId SqliteStorage::logMessage(Message msg) {
 
   QSqlQuery *getLastMessageIdQuery = cachedQuery("select_lastMessage");
   getLastMessageIdQuery->bindValue(":time", msg.timestamp().toTime_t());
 
   QSqlQuery *getLastMessageIdQuery = cachedQuery("select_lastMessage");
   getLastMessageIdQuery->bindValue(":time", msg.timestamp().toTime_t());

-  getLastMessageIdQuery->bindValue(":bufferid", msg.buffer().uid().toInt());
+  getLastMessageIdQuery->bindValue(":bufferid", msg.bufferInfo().bufferId().toInt());

   getLastMessageIdQuery->bindValue(":type", msg.type());
   getLastMessageIdQuery->bindValue(":sender", msg.sender());
   getLastMessageIdQuery->exec();
   getLastMessageIdQuery->bindValue(":type", msg.type());
   getLastMessageIdQuery->bindValue(":sender", msg.sender());
   getLastMessageIdQuery->exec();


@@ -260,7 +260,7 @@ MsgId SqliteStorage::logMessage(Message msg) {
   if(getLastMessageIdQuery->first()) {
     return getLastMessageIdQuery->value(0).toInt();
   } else { // somethin went wrong... :(
   if(getLastMessageIdQuery->first()) {
     return getLastMessageIdQuery->value(0).toInt();
   } else { // somethin went wrong... :(

-    qDebug() << getLastMessageIdQuery->lastQuery() << "time/bufferid/type/sender:" << msg.timestamp().toTime_t() << msg.buffer().uid() << msg.type() << msg.sender();
+    qDebug() << getLastMessageIdQuery->lastQuery() << "time/bufferid/type/sender:" << msg.timestamp().toTime_t() << msg.bufferInfo().bufferId() << msg.type() << msg.sender();

     Q_ASSERT(false);
     return 0;
   }
     Q_ASSERT(false);
     return 0;
   }


@@ -270,7 +270,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, int lastmsgs, int o
   QList<Message> messagelist;
   // we have to determine the real offset first
   QSqlQuery *offsetQuery = cachedQuery("select_messagesOffset");
   QList<Message> messagelist;
   // we have to determine the real offset first
   QSqlQuery *offsetQuery = cachedQuery("select_messagesOffset");

-  offsetQuery->bindValue(":bufferid", buffer.uid().toInt());
+  offsetQuery->bindValue(":bufferid", buffer.bufferId().toInt());

   offsetQuery->bindValue(":messageid", offset);
   offsetQuery->exec();
   offsetQuery->first();
   offsetQuery->bindValue(":messageid", offset);
   offsetQuery->exec();
   offsetQuery->first();


@@ -278,7 +278,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, int lastmsgs, int o
 
   // now let's select the messages
   QSqlQuery *msgQuery = cachedQuery("select_messages");
 
   // now let's select the messages
   QSqlQuery *msgQuery = cachedQuery("select_messages");

-  msgQuery->bindValue(":bufferid", buffer.uid().toInt());
+  msgQuery->bindValue(":bufferid", buffer.bufferId().toInt());

   msgQuery->bindValue(":limit", lastmsgs);
   msgQuery->bindValue(":offset", offset);
   msgQuery->exec();
   msgQuery->bindValue(":limit", lastmsgs);
   msgQuery->bindValue(":offset", offset);
   msgQuery->exec();


@@ -303,7 +303,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, QDateTime since, in
   QList<Message> messagelist;
   // we have to determine the real offset first
   QSqlQuery *offsetQuery = cachedQuery("select_messagesSinceOffset");
   QList<Message> messagelist;
   // we have to determine the real offset first
   QSqlQuery *offsetQuery = cachedQuery("select_messagesSinceOffset");

-  offsetQuery->bindValue(":bufferid", buffer.uid().toInt());
+  offsetQuery->bindValue(":bufferid", buffer.bufferId().toInt());

   offsetQuery->bindValue(":since", since.toTime_t());
   offsetQuery->exec();
   offsetQuery->first();
   offsetQuery->bindValue(":since", since.toTime_t());
   offsetQuery->exec();
   offsetQuery->first();


@@ -311,7 +311,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, QDateTime since, in
 
   // now let's select the messages
   QSqlQuery *msgQuery = cachedQuery("select_messagesSince");
 
   // now let's select the messages
   QSqlQuery *msgQuery = cachedQuery("select_messagesSince");

-  msgQuery->bindValue(":bufferid", buffer.uid().toInt());
+  msgQuery->bindValue(":bufferid", buffer.bufferId().toInt());

   msgQuery->bindValue(":since", since.toTime_t());
   msgQuery->bindValue(":offset", offset);
   msgQuery->exec();
   msgQuery->bindValue(":since", since.toTime_t());
   msgQuery->bindValue(":offset", offset);
   msgQuery->exec();


@@ -336,7 +336,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, QDateTime since, in
 QList<Message> SqliteStorage::requestMsgRange(BufferInfo buffer, int first, int last) {
   QList<Message> messagelist;
   QSqlQuery *rangeQuery = cachedQuery("select_messageRange");
 QList<Message> SqliteStorage::requestMsgRange(BufferInfo buffer, int first, int last) {
   QList<Message> messagelist;
   QSqlQuery *rangeQuery = cachedQuery("select_messageRange");

-  rangeQuery->bindValue(":bufferid", buffer.uid().toInt());
+  rangeQuery->bindValue(":bufferid", buffer.bufferId().toInt());

   rangeQuery->bindValue(":firstmsg", first);
   rangeQuery->bindValue(":lastmsg", last);
   rangeQuery->exec();
   rangeQuery->bindValue(":firstmsg", first);
   rangeQuery->bindValue(":lastmsg", last);
   rangeQuery->exec();

diff --git a/src/core/userinputhandler.cpp b/src/core/userinputhandler.cpp
index 232c8cd..ee65f5f 100644 (file)
--- a/src/core/userinputhandler.cpp
+++ b/src/core/userinputhandler.cpp
@@ -53,6 +53,7 @@ void UserInputHandler::handleUserInput(QString bufname, QString msg) {
 // ====================
 
 void UserInputHandler::handleAway(QString bufname, QString msg) {
 // ====================
 
 void UserInputHandler::handleAway(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   emit putCmd("AWAY", QStringList(msg));
 }
 
   emit putCmd("AWAY", QStringList(msg));
 }
 


@@ -67,6 +68,7 @@ void UserInputHandler::handleBan(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleCtcp(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleCtcp(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   QString nick = msg.section(' ', 0, 0);
   QString ctcpTag = msg.section(' ', 1, 1).toUpper();
   if (ctcpTag.isEmpty()) return;
   QString nick = msg.section(' ', 0, 0);
   QString ctcpTag = msg.section(' ', 1, 1).toUpper();
   if (ctcpTag.isEmpty()) return;


@@ -105,6 +107,7 @@ void UserInputHandler::handleInvite(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleJ(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleJ(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   QStringList params = msg.split(" ");
   if(params.size() > 0 && !params[0].startsWith("#")) {
     params[0] = QString("#%1").arg(params[0]);
   QStringList params = msg.split(" ");
   if(params.size() > 0 && !params[0].startsWith("#")) {
     params[0] = QString("#%1").arg(params[0]);


@@ -113,6 +116,7 @@ void UserInputHandler::handleJ(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleJoin(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleJoin(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   emit putCmd("JOIN", msg.split(" "));
 }
 
   emit putCmd("JOIN", msg.split(" "));
 }
 


@@ -123,6 +127,7 @@ void UserInputHandler::handleKick(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleList(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleList(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   emit putCmd("LIST", msg.split(' ', QString::SkipEmptyParts));
 }
 
   emit putCmd("LIST", msg.split(' ', QString::SkipEmptyParts));
 }
 


@@ -134,11 +139,13 @@ void UserInputHandler::handleMe(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleMode(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleMode(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   emit putCmd("MODE", msg.split(' ', QString::SkipEmptyParts));
 }
 
 // TODO: show privmsgs
 void UserInputHandler::handleMsg(QString bufname, QString msg) {
   emit putCmd("MODE", msg.split(' ', QString::SkipEmptyParts));
 }
 
 // TODO: show privmsgs
 void UserInputHandler::handleMsg(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   QString nick = msg.section(" ", 0, 0);
   msg = msg.section(" ", 1);
   if(nick.isEmpty() || msg.isEmpty()) return;
   QString nick = msg.section(" ", 0, 0);
   msg = msg.section(" ", 1);
   if(nick.isEmpty() || msg.isEmpty()) return;


@@ -148,6 +155,7 @@ void UserInputHandler::handleMsg(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleNick(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleNick(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   QString nick = msg.section(' ', 0, 0);
   emit putCmd("NICK", QStringList(nick));
 }
   QString nick = msg.section(' ', 0, 0);
   emit putCmd("NICK", QStringList(nick));
 }


@@ -178,10 +186,12 @@ void UserInputHandler::handleQuery(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleQuit(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleQuit(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   emit putCmd("QUIT", QStringList(msg));
 }
 
 void UserInputHandler::handleQuote(QString bufname, QString msg) {
   emit putCmd("QUIT", QStringList(msg));
 }
 
 void UserInputHandler::handleQuote(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   emit putRawLine(msg);
 }
 
   emit putRawLine(msg);
 }
 


@@ -213,18 +223,22 @@ void UserInputHandler::handleVoice(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleWho(QString bufname, QString msg) {
 }
 
 void UserInputHandler::handleWho(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   emit putCmd("WHO", msg.split(' '));
 }
 
 void UserInputHandler::handleWhois(QString bufname, QString msg) {
   emit putCmd("WHO", msg.split(' '));
 }
 
 void UserInputHandler::handleWhois(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   emit putCmd("WHOIS", msg.split(' '));
 }
 
 void UserInputHandler::handleWhowas(QString bufname, QString msg) {
   emit putCmd("WHOIS", msg.split(' '));
 }
 
 void UserInputHandler::handleWhowas(QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   emit putCmd("WHOWAS", msg.split(' '));
 }
 
 void UserInputHandler::defaultHandler(QString cmd, QString bufname, QString msg) {
   emit putCmd("WHOWAS", msg.split(' '));
 }
 
 void UserInputHandler::defaultHandler(QString cmd, QString bufname, QString msg) {

+  Q_UNUSED(bufname)

   emit displayMsg(Message::Error, "", QString("Error: %1 %2").arg(cmd).arg(msg));
 }
 
   emit displayMsg(Message::Error, "", QString("Error: %1 %2").arg(cmd).arg(msg));
 }
 

diff --git a/src/qtui/chatline-old.cpp b/src/qtui/chatline-old.cpp
index 0a0d0db..33b4d9a 100644 (file)
--- a/src/qtui/chatline-old.cpp
+++ b/src/qtui/chatline-old.cpp
@@ -138,7 +138,7 @@ MsgId ChatLine::msgId() const {
 }
 
 BufferInfo ChatLine::bufferInfo() const {
 }
 
 BufferInfo ChatLine::bufferInfo() const {

-  return msg.buffer();
+  return msg.bufferInfo();

 }
 
 QDateTime ChatLine::timestamp() const {
 }
 
 QDateTime ChatLine::timestamp() const {

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 3b9f657..665d02c 100644 (file)
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -90,8 +90,7 @@ void BufferView::joinChannel(const QModelIndex &index) {
 
   BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
   
 
   BufferInfo bufferInfo = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
   

-  Client::instance()->userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.buffer()));
-  // Client::fakeInput(index.data(NetworkModel::BufferIdRole).value<BufferId>(), QString("/JOIN %1").arg(index.sibling(index.row(), 0).data().toString()));
+  Client::userInput(bufferInfo, QString("/JOIN %1").arg(bufferInfo.bufferName()));

 }
 
 void BufferView::keyPressEvent(QKeyEvent *event) {
 }
 
 void BufferView::keyPressEvent(QKeyEvent *event) {

diff --git a/version.inc b/version.inc
index 8c69ffd..9876fc6 100644 (file)
--- a/version.inc
+++ b/version.inc
@@ -4,11 +4,11 @@
 { using namespace Global;
 
   quasselVersion = "0.2.0-pre";
 { using namespace Global;
 
   quasselVersion = "0.2.0-pre";

-  quasselDate = "2008-02-02";
-  quasselBuild = 444;
+  quasselDate = "2008-02-03";
+  quasselBuild = 445;

 
   //! Minimum client build number the core needs
 
   //! Minimum client build number the core needs

-  clientBuildNeeded = 435;
+  clientBuildNeeded = 437;

   clientVersionNeeded = quasselVersion;
 
   //! Minimum core build number the client needs
   clientVersionNeeded = quasselVersion;
 
   //! Minimum core build number the client needs