X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fbuffermodel.cpp;h=594dc83db7c8616bacb53c1f30f32de12c6d915d;hb=aa49f1a8d52fb95920c7b686ea2c7ae5c1532d87;hp=c487e0fb8bdd2b05003be26a1558ade0e66b5750;hpb=789f681013cdb7749c8b3347937de813bb51d3d0;p=quassel.git

diff --git a/src/client/buffermodel.cpp b/src/client/buffermodel.cpp
index c487e0fb..594dc83d 100644
--- a/src/client/buffermodel.cpp
+++ b/src/client/buffermodel.cpp
@@ -23,6 +23,8 @@
 #include "networkmodel.h"
 #include "mappedselectionmodel.h"
 #include "buffer.h"
+#include "global.h"
+
 #include <QAbstractItemView>
 
 BufferModel::BufferModel(NetworkModel *parent)
@@ -30,7 +32,7 @@ BufferModel::BufferModel(NetworkModel *parent)
     _selectionModelSynchronizer(this)
 {
   setSourceModel(parent);
-  if(QCoreApplication::instance()->arguments().contains("--debugbufferswitches")) {
+  if(Global::parser.isSet("debugbufferswitches")) {
     connect(_selectionModelSynchronizer.selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
 	    this, SLOT(debug_currentChanged(const QModelIndex &, const QModelIndex &)));
   }
@@ -59,13 +61,9 @@ void BufferModel::synchronizeView(QAbstractItemView *view) {
   view->setSelectionModel(mappedSelectionModel);
 }
 
-QModelIndex BufferModel::currentIndex() {
-  return standardSelectionModel()->currentIndex();
-}
-
 void BufferModel::setCurrentIndex(const QModelIndex &newCurrent) {
-  _selectionModelSynchronizer.selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-  _selectionModelSynchronizer.selectionModel()->select(newCurrent, QItemSelectionModel::Current);
+  _selectionModelSynchronizer.selectionModel()->setCurrentIndex(newCurrent, QItemSelectionModel::Current);
+  _selectionModelSynchronizer.selectionModel()->select(newCurrent, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
 }
 
 void BufferModel::debug_currentChanged(QModelIndex current, QModelIndex previous) {