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

[quassel.git] / src / qtui / chatwidget.cpp

diff --git a/src/qtui/chatwidget.cpp b/src/qtui/chatwidget.cpp
index 5a3ab40..b0a06e3 100644 (file)
--- a/src/qtui/chatwidget.cpp
+++ b/src/qtui/chatwidget.cpp
@@ -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        *
@@ -19,9 +19,9 @@
  ***************************************************************************/
 
 #include "util.h"
-#include "style.h"
 #include "chatwidget.h"
-#include "chatline.h"
+#include "chatline-old.h"
+#include "qtui.h"
 
 
 ChatWidget::ChatWidget(QWidget *parent) : QAbstractScrollArea(parent) {
@@ -233,10 +233,10 @@ void ChatWidget::setContents(QList<ChatLine *> list) {
 
 //!\brief Computes the different x position vars for given tsWidth and senderWidth.
 void ChatWidget::computePositions() {
-  senderX = tsWidth + Style::sepTsSender();
-  textX = senderX + senderWidth + Style::sepSenderText();
-  tsGrabPos = tsWidth + (int)Style::sepTsSender()/2;
-  senderGrabPos = senderX + senderWidth + (int)Style::sepSenderText()/2;
+  senderX = tsWidth + QtUi::style()->sepTsSender();
+  textX = senderX + senderWidth + QtUi::style()->sepSenderText();
+  tsGrabPos = tsWidth + (int)QtUi::style()->sepTsSender()/2;
+  senderGrabPos = senderX + senderWidth + (int)QtUi::style()->sepSenderText()/2;
   textWidth = viewport()->size().width() - textX;
 }
 
@@ -460,15 +460,15 @@ void ChatWidget::handleMouseMoveEvent(const QPoint &_pos) {
       break;
   }
   // Pass 2: Some mouse modes need work after being set...
-  if(mouseMode == DragTsSep && x < size().width() - Style::sepSenderText() - senderWidth - 10) {
+  if(mouseMode == DragTsSep && x < size().width() - QtUi::style()->sepSenderText() - senderWidth - 10) {
     // Drag first column separator
-    int foo = Style::sepTsSender()/2;
+    int foo = QtUi::style()->sepTsSender()/2;
     tsWidth = qMax(x, foo) - foo;
     computePositions();
     layout();
   } else if(mouseMode == DragTextSep && x < size().width() - 10) {
     // Drag second column separator
-    int foo = tsWidth + Style::sepTsSender() + Style::sepSenderText()/2;
+    int foo = tsWidth + QtUi::style()->sepTsSender() + QtUi::style()->sepSenderText()/2;
     senderWidth = qMax(x, foo) - foo;
     computePositions();
     layout();
@@ -534,8 +534,8 @@ QString ChatWidget::selectionToString() {
   if(selectionMode == LinesSelected) {
     QString result;
     for(int l = selectionStart; l <= selectionEnd; l++) {
-      result += QString("[%1] %2 %3\n").arg(lines[l]->timeStamp().toLocalTime().toString("hh:mm:ss"))
-          .arg(lines[l]->sender()).arg(lines[l]->text());
+      result += QString("[%1] %2 %3\n").arg(lines[l]->timestamp().toLocalTime().toString("hh:mm:ss"))
+  .        arg(lines[l]->sender()).arg(lines[l]->text());
     }
     return result;
   }