src: Yearly copyright bump

[quassel.git] / src / qtui / settingspages / shortcutsmodel.cpp

diff --git a/src/qtui/settingspages/shortcutsmodel.cpp b/src/qtui/settingspages/shortcutsmodel.cpp
index 8a42f2c..72d87d6 100644 (file)
--- a/src/qtui/settingspages/shortcutsmodel.cpp
+++ b/src/qtui/settingspages/shortcutsmodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010 by the Quassel Project                             *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "shortcutsmodel.h"
@@ -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;
 }