From f3e117c216aaaf7c684326270e96876a608862ef Mon Sep 17 00:00:00 2001
From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Sun, 16 Mar 2008 15:25:02 +0000
Subject: [PATCH] fixed renaming issue for queries

---
 src/client/networkmodel.cpp |  2 +-
 src/qtui/inputwidget.cpp    | 20 +++++++-------------
 src/qtui/inputwidget.h      |  3 ++-
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 75dd515a..6b1a785f 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -160,7 +160,7 @@ void BufferItem::setBufferName(const QString &name) {
   _bufferName = name;
   // as long as we need those bufferInfos, we have to update that one aswell.
   // pretty ugly though :/
-  _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), _bufferInfo.bufferName());
+  _bufferInfo = BufferInfo(_bufferInfo.bufferId(), _bufferInfo.networkId(), _bufferInfo.type(), _bufferInfo.groupId(), name);
   emit dataChanged(0);
 }
 
diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 0c667678..d2321821 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -44,19 +44,9 @@ InputWidget::~InputWidget() {
 }
 
 void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
-  Q_UNUSED(previous);
-
-  validBuffer = current.isValid();
-
-  if(!validBuffer)
-    return;
-  
-  QVariant variant;
-  variant = current.data(NetworkModel::BufferInfoRole);
-  if(!variant.isValid())
+  if(current.data(NetworkModel::BufferInfoRole) == previous.data(NetworkModel::BufferInfoRole))
     return;
 
-  currentBufferInfo  = current.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
   setNetwork(Client::networkModel()->networkByIndex(current));
   updateNickSelector();
   ui.inputEdit->setEnabled(current.data(NetworkModel::ItemActiveRole).value<bool>());
@@ -78,6 +68,10 @@ const Network *InputWidget::currentNetwork() const {
   return Client::network(_networkId);
 }
 
+BufferInfo InputWidget::currentBufferInfo() const {
+  return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+};
+
 void InputWidget::setNetwork(const Network *network) {
   if(!network || _networkId == network->networkId())
     return;
@@ -150,11 +144,11 @@ void InputWidget::changeNick(const QString &newNick) const {
   const Network *net = currentNetwork();
   if(!net || net->isMyNick(newNick))
     return;
-  emit userInput(currentBufferInfo, QString("/nick %1").arg(newNick));
+  emit userInput(currentBufferInfo(), QString("/nick %1").arg(newNick));
 }
 
 void InputWidget::sendText(QString text) {
-  emit userInput(currentBufferInfo, text);
+  emit userInput(currentBufferInfo(), text);
 }
 
 
diff --git a/src/qtui/inputwidget.h b/src/qtui/inputwidget.h
index 371d4292..dbf783e4 100644
--- a/src/qtui/inputwidget.h
+++ b/src/qtui/inputwidget.h
@@ -50,6 +50,8 @@ private slots:
   void setIdentity(const IdentityId &identityId);
   void updateNickSelector() const;
 
+  BufferInfo currentBufferInfo() const;
+
 signals:
   void userInput(BufferInfo, QString msg) const;
 
@@ -57,7 +59,6 @@ private:
   Ui::InputWidget ui;
 
   bool validBuffer;
-  BufferInfo currentBufferInfo;
   
   NetworkId _networkId;
   IdentityId _identityId;
-- 
2.20.1