From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 18 Nov 2018 19:51:01 +0000 (+0100)
Subject: qa: Remove dead code
X-Git-Tag: 0.13.1~21
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=98cf856e5cccb789b4b89fbfb42e882129b80334

qa: Remove dead code

(cherry picked from commit ba3f171f93c522212aee15eb5ce23db4dca6e359)
---

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 0907deea..018ea365 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -436,7 +436,6 @@ bool BufferItem::setData(int column, const QVariant &value, int role)
     default:
         return PropertyMapItem::setData(column, value, role);
     }
-    return true;
 }
 
 
diff --git a/src/qtui/settingspages/shortcutsmodel.cpp b/src/qtui/settingspages/shortcutsmodel.cpp
index 66bd1a6a..55860af5 100644
--- a/src/qtui/settingspages/shortcutsmodel.cpp
+++ b/src/qtui/settingspages/shortcutsmodel.cpp
@@ -81,19 +81,9 @@ QModelIndex ShortcutsModel::index(int row, int column, const QModelIndex &parent
 }
 
 
-int ShortcutsModel::columnCount(const QModelIndex &parent) const
+int ShortcutsModel::columnCount(const QModelIndex &) const
 {
     return 2;
-    if (!parent.isValid())
-        return 2;
-
-    Item *item = static_cast<Item *>(parent.internalPointer());
-    Q_ASSERT(item);
-
-    if (!item->parentItem)
-        return 2;
-
-    return 2;
 }
 
 
diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 9bf7a524..27357b7d 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -594,6 +594,7 @@ void BufferView::hideCurrentBuffer()
     config()->requestRemoveBuffer(bufferId);
 }
 
+
 void BufferView::filterTextChanged(const QString& filterString)
 {
     BufferViewFilter *filter = qobject_cast<BufferViewFilter *>(model());
@@ -605,25 +606,6 @@ void BufferView::filterTextChanged(const QString& filterString)
 }
 
 
-QSize BufferView::sizeHint() const
-{
-    return TreeViewTouch::sizeHint();
-
-    if (!model())
-        return TreeViewTouch::sizeHint();
-
-    if (model()->rowCount() == 0)
-        return QSize(120, 50);
-
-    int columnSize = 0;
-    for (int i = 0; i < model()->columnCount(); i++) {
-        if (!isColumnHidden(i))
-            columnSize += sizeHintForColumn(i);
-    }
-    return QSize(columnSize, 50);
-}
-
-
 void BufferView::changeHighlight(BufferView::Direction direction)
 {
     // If for some weird reason we get a new delegate
diff --git a/src/uisupport/bufferview.h b/src/uisupport/bufferview.h
index 2a32eb2c..72e79f7b 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -81,7 +81,6 @@ protected:
     virtual void dropEvent(QDropEvent *event);
     virtual void rowsInserted(const QModelIndex &parent, int start, int end);
     virtual void wheelEvent(QWheelEvent *);
-    virtual QSize sizeHint() const;
     virtual void focusInEvent(QFocusEvent *event) { QAbstractScrollArea::focusInEvent(event); }
     virtual void contextMenuEvent(QContextMenuEvent *event);