X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fuisupport%2Fbufferview.cpp;h=969107cd46cef38d4e7437e868b8a595d1885684;hb=1a45f16a9734820fba42fe1db3f38dd1eee49df6;hp=5ac201b9ef9dc23f1dc8fd9bab7670553086fcf7;hpb=5c4459d5df51a99bc6ee2e7389e3a7aec3f81091;p=quassel.git

diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 5ac201b9..969107cd 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -75,9 +75,7 @@ void BufferView::init()
 
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
-    // breaks with Qt 4.8
-    if (QString("4.8.0") > qVersion()) // FIXME breaks with Qt versions >= 4.10!
-        setAnimated(true);
+    setAnimated(true);
 
     // FIXME This is to workaround bug #663
     setUniformRowHeights(true);
@@ -394,15 +392,9 @@ void BufferView::setExpandedState(const QModelIndex &networkIdx)
     storeExpandedState(networkIdx); // this call is needed to keep track of the isActive state
 }
 
-#if QT_VERSION < 0x050000
-void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
-{
-    TreeViewTouch::dataChanged(topLeft, bottomRight);
-#else
 void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles)
 {
     TreeViewTouch::dataChanged(topLeft, bottomRight, roles);
-#endif
 
     // determine how many items have been changed and if any of them is a networkitem
     // which just swichted from active to inactive or vice versa
@@ -594,7 +586,7 @@ void BufferView::hideCurrentBuffer()
     config()->requestRemoveBuffer(bufferId);
 }
 
-void BufferView::filterTextChanged(QString filterString)
+void BufferView::filterTextChanged(const QString& filterString)
 {
     BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
     if (!filter) {
@@ -624,15 +616,15 @@ QSize BufferView::sizeHint() const
 }
 
 
-void BufferView::changeHighlight(const BufferView::Direction direction)
+void BufferView::changeHighlight(BufferView::Direction direction)
 {
     // If for some weird reason we get a new delegate
-    BufferViewDelegate *delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(m_currentHighlight));
+    BufferViewDelegate *delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(_currentHighlight));
     if (delegate) {
         delegate->currentHighlight = QModelIndex();
     }
 
-    QModelIndex newIndex = m_currentHighlight;
+    QModelIndex newIndex = _currentHighlight;
     if (!newIndex.isValid()) {
         newIndex = model()->index(0, 0);
     }
@@ -647,20 +639,20 @@ void BufferView::changeHighlight(const BufferView::Direction direction)
         return;
     }
 
-    m_currentHighlight = newIndex;
+    _currentHighlight = newIndex;
 
-    delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(m_currentHighlight));
+    delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(_currentHighlight));
     if (delegate) {
-        delegate->currentHighlight = m_currentHighlight;
+        delegate->currentHighlight = _currentHighlight;
     }
     viewport()->update();
 }
 
 void BufferView::selectHighlighted()
 {
-    if (m_currentHighlight.isValid()) {
-        selectionModel()->setCurrentIndex(m_currentHighlight, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-        selectionModel()->select(m_currentHighlight, QItemSelectionModel::ClearAndSelect);
+    if (_currentHighlight.isValid()) {
+        selectionModel()->setCurrentIndex(_currentHighlight, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+        selectionModel()->select(_currentHighlight, QItemSelectionModel::ClearAndSelect);
     } else {
         selectFirstBuffer();
     }
@@ -671,16 +663,16 @@ void BufferView::selectHighlighted()
 void BufferView::clearHighlight()
 {
     // If for some weird reason we get a new delegate
-    BufferViewDelegate *delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(m_currentHighlight));
+    BufferViewDelegate *delegate = qobject_cast<BufferViewDelegate*>(itemDelegate(_currentHighlight));
     if (delegate) {
         delegate->currentHighlight = QModelIndex();
     }
-    m_currentHighlight = QModelIndex();
+    _currentHighlight = QModelIndex();
     viewport()->update();
 }
 
 // ****************************************
-//  BufferViewDelgate
+//  BufferViewDelegate
 // ****************************************
 class ColorsChangedEvent : public QEvent
 {
@@ -716,11 +708,7 @@ bool BufferViewDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, c
     if (!value.isValid())
         return QStyledItemDelegate::editorEvent(event, model, option, index);
 
-#if QT_VERSION < 0x050000
-    QStyleOptionViewItemV4 viewOpt(option);
-#else
     QStyleOptionViewItem viewOpt(option);
-#endif
     initStyleOption(&viewOpt, index);
 
     QRect checkRect = viewOpt.widget->style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &viewOpt, viewOpt.widget);