projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
e352887
..
72d87d6
100644
(file)
--- a/
src/qtui/settingspages/shortcutsmodel.cpp
+++ b/
src/qtui/settingspages/shortcutsmodel.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-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;
{
return 2;
- if (!parent.isValid())
- return 2;
-
- Item *item = static_cast<Item *>(parent.internalPointer());
- Q_ASSERT(item);
-
- if (!item->parentItem)
- return 2;
-
- return 2;
}
}