X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=d2321821da29f77e5d91334e6394dbdb666be250;hp=d6f0aad6faf84ce8848d39563e9b32892f16b46a;hb=f3e117c216aaaf7c684326270e96876a608862ef;hpb=f66bc9ecb5ebde376da256035db425d7dc0c74d0

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index d6f0aad6..d2321821 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -27,10 +27,8 @@
 
 
 InputWidget::InputWidget(QWidget *parent)
-  : QWidget(parent),
-    validBuffer(false),
-    _bufferModel(0),
-    _selectionModel(0)
+  : AbstractItemView(parent),
+    validBuffer(false)
 {
   ui.setupUi(this);
   connect(ui.inputEdit, SIGNAL(sendText(QString)), this, SLOT(sendText(QString)));
@@ -45,38 +43,10 @@ InputWidget::InputWidget(QWidget *parent)
 InputWidget::~InputWidget() {
 }
 
-void InputWidget::setModel(BufferModel *bufferModel) {
-  if(_bufferModel) {
-    disconnect(_bufferModel, 0, this, 0);
-  }
-  _bufferModel = bufferModel;
-  connect(bufferModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
-	  this, SLOT(dataChanged(QModelIndex, QModelIndex)));
-}
-
-void InputWidget::setSelectionModel(QItemSelectionModel *selectionModel) {
-  if(_selectionModel) {
-    disconnect(_selectionModel, 0, this, 0);
-  }
-  _selectionModel = selectionModel;
-  connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-	  this, SLOT(currentChanged(QModelIndex, QModelIndex)));
-}
-
 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>());
@@ -84,7 +54,7 @@ void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &
 
 void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) {
   QItemSelectionRange changedArea(topLeft, bottomRight);
-  QModelIndex currentIndex = Client::bufferModel()->currentIndex();
+  QModelIndex currentIndex = selectionModel()->currentIndex();
   if(changedArea.contains(currentIndex)) {
     ui.inputEdit->setEnabled(currentIndex.data(NetworkModel::ItemActiveRole).value<bool>());
   }
@@ -98,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;
@@ -170,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);
 }