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: test-travis-01~89
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=ba3f171f93c522212aee15eb5ce23db4dca6e359

qa: Remove dead code
---

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 752eb1e9..423be8b8 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -405,7 +405,6 @@ bool BufferItem::setData(int column, const QVariant& value, int role)
     default:
         return PropertyMapItem::setData(column, value, role);
     }
-    return true;
 }
 
 void BufferItem::setBufferName(const QString& name)
diff --git a/src/qtui/settingspages/shortcutsmodel.cpp b/src/qtui/settingspages/shortcutsmodel.cpp
index 0cf3f5e2..0f815641 100644
--- a/src/qtui/settingspages/shortcutsmodel.cpp
+++ b/src/qtui/settingspages/shortcutsmodel.cpp
@@ -77,19 +77,9 @@ QModelIndex ShortcutsModel::index(int row, int column, const QModelIndex& parent
     return createIndex(row, column, _categoryItems.at(row));
 }
 
-int ShortcutsModel::columnCount(const QModelIndex& parent) const
+int ShortcutsModel::columnCount(const QModelIndex&) const
 {
     return 2;
-    if (!parent.isValid())
-        return 2;
-
-    auto* item = static_cast<Item*>(parent.internalPointer());
-    Q_ASSERT(item);
-
-    if (!item->parentItem)
-        return 2;
-
-    return 2;
 }
 
 int ShortcutsModel::rowCount(const QModelIndex& parent) const
diff --git a/src/uisupport/bufferview.cpp b/src/uisupport/bufferview.cpp
index 97117558..645634b8 100644
--- a/src/uisupport/bufferview.cpp
+++ b/src/uisupport/bufferview.cpp
@@ -575,24 +575,6 @@ void BufferView::filterTextChanged(const QString& filterString)
     on_configChanged();  // make sure collapsation is correct
 }
 
-QSize BufferView::sizeHint() const
-{
-    return TreeViewTouch::sizeHint();
-
-    if (!model())
-        return TreeViewTouch::sizeHint();
-
-    if (model()->rowCount() == 0)
-        return {120, 50};
-
-    int columnSize = 0;
-    for (int i = 0; i < model()->columnCount(); i++) {
-        if (!isColumnHidden(i))
-            columnSize += sizeHintForColumn(i);
-    }
-    return {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 a654aed3..2b8f1bc0 100644
--- a/src/uisupport/bufferview.h
+++ b/src/uisupport/bufferview.h
@@ -83,7 +83,6 @@ protected:
     void dropEvent(QDropEvent* event) override;
     void rowsInserted(const QModelIndex& parent, int start, int end) override;
     void wheelEvent(QWheelEvent*) override;
-    QSize sizeHint() const override;
     void focusInEvent(QFocusEvent* event) override { QAbstractScrollArea::focusInEvent(event); }
     void contextMenuEvent(QContextMenuEvent* event) override;