From 016b1a6b6c88dc9d1493199be4e42e85bed6633c Mon Sep 17 00:00:00 2001
From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Tue, 18 Mar 2008 20:37:43 +0000
Subject: [PATCH] general performance boost (probably only noticable on
 bufferswitches to/from large channels though)

---
 src/uisupport/nickview.cpp | 42 +++++++++++++++++++++-----------------
 src/uisupport/nickview.h   |  6 +++---
 version.inc                |  2 +-
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/uisupport/nickview.cpp b/src/uisupport/nickview.cpp
index 46913186..a8de3bc3 100644
--- a/src/uisupport/nickview.cpp
+++ b/src/uisupport/nickview.cpp
@@ -29,10 +29,15 @@
 #include "types.h"
 #include "client.h"
 
+struct LazySizeHint {
+  LazySizeHint() : size(QSize()), needsUpdate(true) {};
+  QSize size;
+  bool needsUpdate;
+};
 
 NickView::NickView(QWidget *parent)
   : QTreeView(parent),
-    _sizeHint(QTreeView::sizeHint())
+    _sizeHint(new LazySizeHint())
 {
   setIndentation(10);
   setAnimated(true);
@@ -49,6 +54,8 @@ NickView::NickView(QWidget *parent)
 }
 
 NickView::~NickView() {
+  delete _sizeHint;
+  _sizeHint = 0;
 }
 
 void NickView::init() {
@@ -59,7 +66,7 @@ void NickView::init() {
     setColumnHidden(i, true);
 
   expandAll();
-  updateSizeHint();
+  _sizeHint->needsUpdate = true;
 }
 
 void NickView::setModel(QAbstractItemModel *model) {
@@ -71,17 +78,17 @@ void NickView::rowsInserted(const QModelIndex &parent, int start, int end) {
   QTreeView::rowsInserted(parent, start, end);
   if(model()->data(parent, NetworkModel::ItemTypeRole) == NetworkModel::UserCategoryItemType && !isExpanded(parent))
     expand(parent);
-  updateSizeHint();
+  _sizeHint->needsUpdate = true;
 }
 
 void NickView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
   QTreeView::rowsAboutToBeRemoved(parent, start, end);
-  updateSizeHint();
+  _sizeHint->needsUpdate = true;
 }
 
 void NickView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
   QTreeView::dataChanged(topLeft, bottomRight);
-  updateSizeHint();
+  _sizeHint->needsUpdate = true;
 }
 
 QString NickView::nickFromModelIndex(const QModelIndex & index) {
@@ -175,19 +182,16 @@ void NickView::executeCommand(const BufferInfo & bufferInfo, const QString & com
   Client::instance()->userInput(bufferInfo, command);
 }
 
-void NickView::updateSizeHint() {
-  if(!model())
-    return;
-
-  int columnSize = 0;
-  for(int i = 0; i < model()->columnCount(); i++) {
-    if(!isColumnHidden(i))
-      columnSize += sizeHintForColumn(i);
-  }
-
-  _sizeHint = QSize(columnSize, 50);
-}
-
 QSize NickView::sizeHint() const {
-  return _sizeHint;
+  Q_CHECK_PTR(_sizeHint);
+  if(_sizeHint->needsUpdate && model()) {;
+    int columnSize = 0;
+    for(int i = 0; i < model()->columnCount(); i++) {
+      if(!isColumnHidden(i))
+	columnSize += sizeHintForColumn(i);
+    }
+    _sizeHint->size = QSize(columnSize, 50);
+    _sizeHint->needsUpdate = false;
+  }
+  return _sizeHint->size;
 }
diff --git a/src/uisupport/nickview.h b/src/uisupport/nickview.h
index cb263c44..807a4d43 100644
--- a/src/uisupport/nickview.h
+++ b/src/uisupport/nickview.h
@@ -29,6 +29,7 @@
 
 
 class NickModel;
+class LazySizeHint;
 class FilteredNickModel;
 class QSortFilterProxyModel;
 
@@ -52,9 +53,8 @@ public slots:
   void startQuery(const QModelIndex & modelIndex);
   
 private:
-  QSize _sizeHint;
-  
-  void updateSizeHint();
+  LazySizeHint *_sizeHint;
+
   BufferInfo bufferInfoFromModelIndex(const QModelIndex & index);
   QString nickFromModelIndex(const QModelIndex & index);
   void executeCommand(const BufferInfo & bufferInfo, const QString & command);
diff --git a/version.inc b/version.inc
index fda46767..a20f51f6 100644
--- a/version.inc
+++ b/version.inc
@@ -5,7 +5,7 @@
 
   quasselVersion = "0.2.0-alpha4-pre";
   quasselDate = "2008-03-18";
-  quasselBuild = 646;
+  quasselBuild = 647;
 
   //! Minimum client build number the core needs
   clientBuildNeeded = 642;
-- 
2.20.1