Prevent Quassel from crashing upon core dis- and reconnect and make the NickListWidgets

[quassel.git] / src / qtui / bufferwidget.h

diff --git a/src/qtui/bufferwidget.h b/src/qtui/bufferwidget.h
index c3c7aa3..b988484 100644 (file)
--- a/src/qtui/bufferwidget.h
+++ b/src/qtui/bufferwidget.h
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by The Quassel Team                             *
+ *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
  *   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        *
@@ -23,18 +23,17 @@
 
 #include "ui_bufferwidget.h"
 
-#include "global.h"
+#include "chatview.h"
+#include "types.h"
 
 class Buffer;
-struct BufferState;
+class ChatView;
 class ChatWidget;
 class LayoutThread;
 
-//!\brief Displays the contents of a Buffer.
-/** A BufferWidget usually includes a topic line, a nicklist, the chat itself, and an input line.
- * For server buffers or queries, there is of course no nicklist.
- * The contents of the chat is rendered by a ChatWidget.
- */
+//! Displays the contents of a Buffer.
+/**
+*/
 class BufferWidget : public QWidget {
   Q_OBJECT
 
@@ -48,23 +47,25 @@ public:
 signals:
   void userInput(QString msg);
   void aboutToClose();
-    
+
 public slots:
   void setBuffer(Buffer *);
   void saveState();
-                 
+
 private slots:
   void enterPressed();
   void setActive(bool act = true);
-  
-  
+  void bufferDestroyed(QObject *);
+
+
 private:
   Ui::BufferWidget ui;
-  QHash<uint, ChatWidget*> _chatWidgets;
+  //QHash<BufferId, ChatView*> _chatViews;
+  QHash<Buffer *, ChatWidget *> _chatWidgets;
   bool active;
-  
-  QString networkName;
-  QString bufferName;
+
+  QString _networkName;
+  QString _bufferName;
 };