From e1b6d538b7c4cc279f9218614e23adb5d8a81fe5 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Mon, 4 Aug 2008 22:53:38 +0200 Subject: [PATCH] Post-merge cleanups, remove the old message handling --- src/client/buffer.cpp | 39 ----------------------- src/client/buffer.h | 13 -------- src/client/client.cpp | 28 ---------------- src/client/client.h | 12 +------ src/qtui/chatview.cpp | 37 --------------------- src/qtui/chatview.h | 10 ------ src/uisupport/abstractbuffercontainer.cpp | 33 +------------------ src/uisupport/abstractbuffercontainer.h | 6 ---- 8 files changed, 2 insertions(+), 176 deletions(-) diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp index 241e2e68..df786396 100644 --- a/src/client/buffer.cpp +++ b/src/client/buffer.cpp @@ -42,55 +42,17 @@ BufferInfo Buffer::bufferInfo() const { return _bufferInfo; } -const QList &Buffer::contents() const { - return layoutedMsgs; -} - -void Buffer::appendMsg(const Message &msg) { - updateActivityLevel(msg); - AbstractUiMsg *m = Client::layoutMsg(msg); - layoutedMsgs.append(m); - emit msgAppended(m); -} - -void Buffer::prependMsg(const Message &msg) { - // check for duplicate first - if(!layoutedMsgs.isEmpty() && msg.msgId() >= layoutedMsgs.first()->msgId()) { - return; - } - updateActivityLevel(msg); - layoutQueue.append(msg); -} - -bool Buffer::layoutMsg() { - if(layoutQueue.isEmpty()) - return false; - - AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst()); - layoutedMsgs.prepend(m); - emit msgPrepended(m); - - return !layoutQueue.isEmpty(); -} - void Buffer::setVisible(bool visible) { _isVisible = visible; setActivityLevel(NoActivity); - //if(layoutedMsgs.isEmpty()) - // return; - //setLastSeenMsg(layoutedMsgs.last()->msgId()); if(_lastRcvdMsg.msgId() > 0) setLastSeenMsg(_lastRcvdMsg.msgId()); - //qDebug() << "setting last seen" << _lastRcvdMsg.msgId(); } void Buffer::setLastSeenMsg(const MsgId &msgId) { - // qDebug() << "want to set lastSeen:" << bufferInfo() << seen << lastSeen(); const MsgId oldLastSeen = lastSeenMsg(); if(!oldLastSeen.isValid() || (msgId.isValid() && msgId > oldLastSeen)) { - //qDebug() << "setting:" << bufferInfo().bufferName() << seen; _lastSeenMsg = msgId; Client::setBufferLastSeenMsg(bufferInfo().bufferId(), msgId); - //qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen(); setActivityLevel(NoActivity); } } @@ -99,7 +61,6 @@ void Buffer::setActivityLevel(ActivityLevel level) { _activityLevel = level; if(bufferInfo().bufferId() > 0) { Client::networkModel()->setBufferActivity(bufferInfo(), level); - //qDebug() << "setting level:" << bufferInfo() << lastSeen() << level; } } diff --git a/src/client/buffer.h b/src/client/buffer.h index 17e9b23c..72a30f11 100644 --- a/src/client/buffer.h +++ b/src/client/buffer.h @@ -32,7 +32,6 @@ struct BufferState; #include "message.h" #include "bufferinfo.h" -/// Encapsulates the contents of a single channel, query or server status context. /** */ class Buffer : public QObject { @@ -50,20 +49,11 @@ public: Buffer(BufferInfo, QObject *parent = 0); BufferInfo bufferInfo() const; - const QList &contents() const; inline bool isVisible() const { return _isVisible; } inline MsgId lastSeenMsg() const { return _lastSeenMsg; } inline ActivityLevel activityLevel() const { return _activityLevel; } -signals: - void msgAppended(AbstractUiMsg *); - void msgPrepended(AbstractUiMsg *); - void layoutQueueEmpty(); - public slots: - void appendMsg(const Message &); - void prependMsg(const Message &); - bool layoutMsg(); void setVisible(bool visible); void setLastSeenMsg(const MsgId &msgId); void setActivityLevel(ActivityLevel level); @@ -76,9 +66,6 @@ private: Message _lastRcvdMsg; ActivityLevel _activityLevel; - QLinkedList layoutQueue; - QList layoutedMsgs; - }; Q_DECLARE_OPERATORS_FOR_FLAGS(Buffer::ActivityLevel) diff --git a/src/client/client.cpp b/src/client/client.cpp index eeb25d58..f9665c6c 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -126,11 +126,6 @@ void Client::init() { connect(this, SIGNAL(connected()), mainUi, SLOT(connectedToCore())); connect(this, SIGNAL(disconnected()), mainUi, SLOT(disconnectedFromCore())); - layoutTimer = new QTimer(this); - layoutTimer->setInterval(0); - layoutTimer->setSingleShot(false); - connect(layoutTimer, SIGNAL(timeout()), this, SLOT(layoutMsg())); - } /*** public static methods ***/ @@ -390,8 +385,6 @@ void Client::disconnectFromCore() { } Q_ASSERT(_identities.isEmpty()); - layoutQueue.clear(); - layoutTimer->stop(); } void Client::setCoreConfiguration(const QVariantMap &settings) { @@ -460,26 +453,6 @@ void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) { //qDebug() << "processed" << msgs.count() << "backlog lines in" << start.msecsTo(QTime::currentTime()); } -void Client::layoutMsg() { - if(layoutQueue.isEmpty()) { - layoutTimer->stop(); - return; - } - - Buffer *buffer = layoutQueue.takeFirst(); - if(buffer->layoutMsg()) { - layoutQueue.append(buffer); // Buffer has more messages in its queue --> Round Robin - return; - } - - if(layoutQueue.isEmpty()) - layoutTimer->stop(); -} - -AbstractUiMsg *Client::layoutMsg(const Message &msg) { - return instance()->mainUi->layoutMsg(msg); -} - // TODO optimize checkForHighlight void Client::checkForHighlight(Message &msg) { if(!((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self))) @@ -549,7 +522,6 @@ void Client::bufferRemoved(BufferId bufferId) { Buffer *buff = 0; if(_buffers.contains(bufferId)) { buff = _buffers.take(bufferId); - layoutQueue.removeAll(buff); disconnect(buff, 0, this, 0); } diff --git a/src/client/client.h b/src/client/client.h index ad5740c1..7c427844 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -48,8 +48,6 @@ class IrcChannel; class SignalProxy; struct NetworkInfo; -class QTimer; - class Client : public QObject { Q_OBJECT @@ -100,10 +98,8 @@ public: static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; } static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; } static inline BufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; } - - static AccountId currentCoreAccount(); - static AbstractUiMsg *layoutMsg(const Message &); + static AccountId currentCoreAccount(); static bool isConnected(); static bool isSynced(); @@ -123,7 +119,6 @@ signals: void backlogReceived(Buffer *, QList); void requestBacklog(BufferInfo, QVariant, QVariant); void requestNetworkStates(); - void messageReceived(const Message &msg); void showConfigWizard(const QVariantMap &coredata); @@ -181,8 +176,6 @@ private slots: void updateBufferInfo(BufferInfo); void updateLastSeenMsg(BufferId id, const MsgId &msgId); - void layoutMsg(); - void bufferDestroyed(); void networkDestroyed(); void coreIdentityCreated(const Identity &); @@ -232,9 +225,6 @@ private: Buffer *_monitorBuffer; - QTimer *layoutTimer; - QLinkedList layoutQueue; - static AccountId _currentCoreAccount; friend class ClientSyncer; diff --git a/src/qtui/chatview.cpp b/src/qtui/chatview.cpp index 98346ca4..be2cbc62 100644 --- a/src/qtui/chatview.cpp +++ b/src/qtui/chatview.cpp @@ -75,40 +75,3 @@ void ChatView::sceneHeightChanged(qreal h) { void ChatView::clear() { } - -void ChatView::prependMsg(AbstractUiMsg *msg) { - //ChatLine *line = dynamic_cast(msg); - //Q_ASSERT(line); - //prependChatLine(line); -} - -void ChatView::prependChatLine(ChatLine *line) { - //qDebug() << "prepending"; -} - -void ChatView::prependChatLines(QList clist) { - -} - -void ChatView::appendMsg(AbstractUiMsg *msg) { - //ChatLine *line = dynamic_cast(msg); - //Q_ASSERT(line); - //appendChatLine(line); -} - -void ChatView::appendChatLine(ChatLine *line) { - //qDebug() << "appending"; -} - - -void ChatView::appendChatLines(QList list) { - //foreach(ChatLine *line, list) { - - //} -} - -void ChatView::setContents(const QList &list) { - //qDebug() << "setting" << list.count(); - //appendChatLines(list); -} - diff --git a/src/qtui/chatview.h b/src/qtui/chatview.h index be26a119..7d84e6ad 100644 --- a/src/qtui/chatview.h +++ b/src/qtui/chatview.h @@ -45,16 +45,6 @@ class ChatView : public QGraphicsView, public AbstractChatView { void clear(); - void prependMsg(AbstractUiMsg *); - void appendMsg(AbstractUiMsg *); - - void prependChatLine(ChatLine *); - void appendChatLine(ChatLine *); - void prependChatLines(QList); - void appendChatLines(QList); - - void setContents(const QList &); - protected: virtual void resizeEvent(QResizeEvent *event); diff --git a/src/uisupport/abstractbuffercontainer.cpp b/src/uisupport/abstractbuffercontainer.cpp index f3ffbf84..a12b0315 100644 --- a/src/uisupport/abstractbuffercontainer.cpp +++ b/src/uisupport/abstractbuffercontainer.cpp @@ -84,7 +84,7 @@ void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId) { Buffer *buf; if(!bufferId.isValid() || !(buf = Client::buffer(bufferId))) { - if(bufferId.isValid()) + if(bufferId.isValid()) qWarning() << "AbstractBufferContainer::setBuffer(BufferId): Can't show unknown Buffer:" << bufferId; _currentBuffer = 0; showChatView(0); @@ -94,9 +94,6 @@ void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId) { chatView = _chatViews[bufferId]; } else { chatView = createChatView(bufferId); - chatView->setContents(buf->contents()); - connect(buf, SIGNAL(msgAppended(AbstractUiMsg *)), this, SLOT(appendMsg(AbstractUiMsg *))); - connect(buf, SIGNAL(msgPrepended(AbstractUiMsg *)), this, SLOT(prependMsg(AbstractUiMsg *))); _chatViews[bufferId] = chatView; } _currentBuffer = bufferId; @@ -104,31 +101,3 @@ void AbstractBufferContainer::setCurrentBuffer(BufferId bufferId) { buf->setVisible(true); setFocus(); } - -void AbstractBufferContainer::appendMsg(AbstractUiMsg *msg) { - Buffer *buf = qobject_cast(sender()); - if(!buf) { - qWarning() << "AbstractBufferContainer::appendMsg(): Invalid slot caller!"; - return; - } - BufferId id = buf->bufferInfo().bufferId(); - if(!_chatViews.contains(id)) { - qWarning() << "AbstractBufferContainer::appendMsg(): Received message for unknown buffer!"; - return; - } - _chatViews[id]->appendMsg(msg); -} - -void AbstractBufferContainer::prependMsg(AbstractUiMsg *msg) { - Buffer *buf = qobject_cast(sender()); - if(!buf) { - qWarning() << "AbstractBufferContainer:prependMsg(): Invalid slot caller!"; - return; - } - BufferId id = buf->bufferInfo().bufferId(); - if(!_chatViews.contains(id)) { - qWarning() << "AbstractBufferContainer::prependMsg(): Received message for unknown buffer!"; - return; - } - _chatViews[id]->prependMsg(msg); -} diff --git a/src/uisupport/abstractbuffercontainer.h b/src/uisupport/abstractbuffercontainer.h index cb0e5026..bf8a34c7 100644 --- a/src/uisupport/abstractbuffercontainer.h +++ b/src/uisupport/abstractbuffercontainer.h @@ -63,8 +63,6 @@ class AbstractBufferContainer : public AbstractItemView { virtual void showChatView(BufferId) = 0; private slots: - void appendMsg(AbstractUiMsg *); - void prependMsg(AbstractUiMsg *); void removeBuffer(BufferId bufferId); void setCurrentBuffer(BufferId bufferId); @@ -77,10 +75,6 @@ class AbstractChatView { public: virtual ~AbstractChatView() {}; - virtual void appendMsg(AbstractUiMsg *msg) = 0; - virtual void prependMsg(AbstractUiMsg *msg) = 0; - virtual void setContents(const QList &contents) = 0; - //virtual BufferId bufferId() const = 0; }; -- 2.20.1