kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

It is a valid use-case that m_itemView is 0.

Browse source 
BUG: 254240

svn path=/trunk/KDE/kdebase/apps/; revision=1186206
This commit is contained in:
Peter Penz 2010-10-15 11:44:43 +00:00
parent 363e5b69dd
commit a85590ad07
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/views/dolphinviewcontroller.cpp
View file

@ -128,7 +128,9 @@ QList<QAction*> DolphinViewController::versionControlActions(const KFileItemList
void DolphinViewController::handleKeyPressEvent(QKeyEvent* event)
{
Q_ASSERT(m_itemView != 0);
if (m_itemView == 0) {
return;
}
const QItemSelectionModel* selModel = m_itemView->selectionModel();
const QModelIndex currentIndex = selModel->currentIndex();
@ -194,13 +196,13 @@ void DolphinViewController::emitItemTriggered(const KFileItem& item)
KFileItem DolphinViewController::itemForIndex(const QModelIndex& index) const
{
Q_ASSERT(m_itemView != 0);
QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_itemView->model());
if (proxyModel != 0) {
KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
const QModelIndex dirIndex = proxyModel->mapToSource(index);
return dirModel->itemForIndex(dirIndex);
if (m_itemView != 0) {
QAbstractProxyModel* proxyModel = static_cast<QAbstractProxyModel*>(m_itemView->model());
if (proxyModel != 0) {
KDirModel* dirModel = static_cast<KDirModel*>(proxyModel->sourceModel());
const QModelIndex dirIndex = proxyModel->mapToSource(index);
return dirModel->itemForIndex(dirIndex);
}
}
return KFileItem();
@ -212,7 +214,7 @@ void DolphinViewController::triggerItem(const QModelIndex& index)
const KFileItem item = itemForIndex(index);
if (index.isValid() && (index.column() == KDirModel::Name)) {
emit itemTriggered(item);
} else {
} else if (m_itemView != 0) {
m_itemView->clearSelection();
emit itemEntered(KFileItem());
}