Fixing dubious crash at core connect (courtesy of EgS finding and Sput testing the...

[quassel.git] / src / client / buffer.cpp

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index 7afc15b..10f395c 100644 (file)
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -17,96 +17,28 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+#include <QDebug>
+
 #include "buffer.h"
 
 #include "client.h"
 #include "util.h"
 
 
-Buffer::Buffer(BufferId bufid) {
-  id = bufid;
-  _networkName = bufid.network();
-  _bufferName = bufid.buffer();
-
-  if(_bufferName.isEmpty()) type = ServerBuffer;
-  else if(isChannelName(_bufferName)) type = ChannelBuffer;
-  else type = QueryBuffer;
-
-  active = false;
-/*
-  QSettings s;
-  s.beginGroup(QString("GUI/BufferStates/%1/%2").arg(netname).arg(bufname));
-  state->splitterState = s.value("Splitter").toByteArray();
-  s.endGroup();
-  */
-  emit bufferUpdated(this);
-}
-
-Buffer::~Buffer() {
-  //qDebug() << "destroying buffer";
-  //delete widget;
-  /*
-  QSettings s;
-  s.beginGroup(QString("GUI/BufferStates/%1/%2").arg(networkName).arg(bufferName));
-  s.setValue("Splitter", state->splitterState);
-  s.endGroup();
-*/
-  //delete state;
-  emit bufferDestroyed(this);
-}
-
-Buffer::Type Buffer::bufferType() const {
-   return type;
+Buffer::Buffer(BufferInfo bufferid, QObject *parent)
+  : QObject(parent),
+    _bufferInfo(bufferid)
+{
 }
 
-bool Buffer::isActive() const {
-   return active;
-}
-
-QString Buffer::networkName() const {
-   return _networkName;
-}
-
-QString Buffer::bufferName() const {
-   return _bufferName;
-}
-
-QString Buffer::displayName() const {
-  if(bufferType() == ServerBuffer)
-    return tr("Status Buffer");
-  else
-    return bufferName();
-}
-
-BufferId Buffer::bufferId() const {
-   return id;
+BufferInfo Buffer::bufferInfo() const {
+  // still needed to process user input... *sigh*
+  // ... and for the gui *sigh* to request the backlogs *sigh*
+  return _bufferInfo;
 }
 
 QList<AbstractUiMsg *> Buffer::contents() const {
-   return layoutedMsgs;
-}
-
-VarMap Buffer::nickList() const {
-   return nicks;
-}
-
-QString Buffer::topic() const {
-   return _topic;
-}
-
-QString Buffer::ownNick() const {
-   return _ownNick;
-}
-
-bool Buffer::isStatusBuffer() const {
-   return bufferType() == ServerBuffer;
-}
-
-void Buffer::setActive(bool a) {
-  if(a != active) {
-    active = a;
-    emit bufferUpdated(this);
-  }
+  return layoutedMsgs;
 }
 
 void Buffer::appendMsg(const Message &msg) {
@@ -130,39 +62,6 @@ bool Buffer::layoutMsg() {
 
 void Buffer::processUserInput(QString msg) {
   // TODO User Input processing (plugins) -> well, this goes through MainWin into Core for processing... so...
-  emit userInput(id, msg);
-}
-
-void Buffer::setTopic(QString t) {
-  _topic = t;
-  emit topicSet(t);
-  emit bufferUpdated(this);
+  emit userInput(_bufferInfo, msg);
 }
 
-void Buffer::addNick(QString nick, VarMap props) {
-  if(nick == ownNick()) setActive(true);
-  nicks[nick] = props;
-  emit nickListChanged(nicks);
-}
-
-void Buffer::updateNick(QString nick, VarMap props) {
-  nicks[nick] = props;
-  emit nickListChanged(nicks);
-}
-
-void Buffer::renameNick(QString oldnick, QString newnick) {
-  QVariant v = nicks.take(oldnick);
-  nicks[newnick] = v;
-  emit nickListChanged(nicks);
-}
-
-void Buffer::removeNick(QString nick) {
-  if(nick == ownNick()) setActive(false);
-  nicks.remove(nick);
-  emit nickListChanged(nicks);
-}
-
-void Buffer::setOwnNick(QString nick) {
-  _ownNick = nick;
-  emit ownNickSet(nick);
-}