fixing empty nickselector bug

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

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 0c66767..d7c1e65 100644 (file)
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -28,7 +28,7 @@
 
 InputWidget::InputWidget(QWidget *parent)
   : AbstractItemView(parent),
 
 InputWidget::InputWidget(QWidget *parent)
   : AbstractItemView(parent),

-    validBuffer(false)
+    _networkId(0)

 {
   ui.setupUi(this);
   connect(ui.inputEdit, SIGNAL(sendText(QString)), this, SLOT(sendText(QString)));
 {
   ui.setupUi(this);
   connect(ui.inputEdit, SIGNAL(sendText(QString)), this, SLOT(sendText(QString)));


@@ -44,19 +44,9 @@ InputWidget::~InputWidget() {
 }
 
 void InputWidget::currentChanged(const QModelIndex &current, const QModelIndex &previous) {
 }
 
 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;
 
     return;
 

-  currentBufferInfo  = current.data(NetworkModel::BufferInfoRole).value<BufferInfo>();

   setNetwork(Client::networkModel()->networkByIndex(current));
   updateNickSelector();
   ui.inputEdit->setEnabled(current.data(NetworkModel::ItemActiveRole).value<bool>());
   setNetwork(Client::networkModel()->networkByIndex(current));
   updateNickSelector();
   ui.inputEdit->setEnabled(current.data(NetworkModel::ItemActiveRole).value<bool>());


@@ -72,12 +62,13 @@ void InputWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot
 
 
 const Network *InputWidget::currentNetwork() const {
 
 
 const Network *InputWidget::currentNetwork() const {

-  if(!validBuffer)
-    return 0;
-

   return Client::network(_networkId);
 }
 
   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;
 void InputWidget::setNetwork(const Network *network) {
   if(!network || _networkId == network->networkId())
     return;


@@ -150,11 +141,11 @@ void InputWidget::changeNick(const QString &newNick) const {
   const Network *net = currentNetwork();
   if(!net || net->isMyNick(newNick))
     return;
   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) {
 }
 
 void InputWidget::sendText(QString text) {

-  emit userInput(currentBufferInfo, text);
+  emit userInput(currentBufferInfo(), text);

 }
 
 
 }