From d3496b12310d9fec0e52e537c341e87fcaa2f8b5 Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Wed, 9 Feb 2011 19:21:58 +0100 Subject: Coding style update for pointer comparison Most developers seem to prefer if (ptr) ... if (!ptr) ... in comparison to if (ptr != 0) ... if (ptr == 0) ... Adjusted the Dolphin-code to use the "most-prefered style" to make contributors happy. --- src/views/folderexpander.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/views/folderexpander.cpp') diff --git a/src/views/folderexpander.cpp b/src/views/folderexpander.cpp index 4e22fdb0a..a9f5971c2 100644 --- a/src/views/folderexpander.cpp +++ b/src/views/folderexpander.cpp @@ -39,14 +39,11 @@ FolderExpander::FolderExpander(QAbstractItemView *view, QSortFilterProxyModel *p m_autoExpandTriggerTimer(0), m_autoExpandPos() { - if (m_view == 0) { - return; - } - if (m_proxyModel == 0) { + if (!m_view || !m_proxyModel) { return; } KDirModel *m_dirModel = qobject_cast(m_proxyModel->sourceModel()); - if (m_dirModel == 0) { + if (!m_dirModel) { return; } @@ -100,7 +97,7 @@ void FolderExpander::autoExpandTimeout() QModelIndex proxyIndexToExpand = m_view->indexAt(m_autoExpandPos); QModelIndex indexToExpand = m_proxyModel->mapToSource(proxyIndexToExpand); KDirModel* m_dirModel = qobject_cast< KDirModel* >(m_proxyModel->sourceModel()); - Q_ASSERT(m_dirModel != 0); + Q_ASSERT(m_dirModel); KFileItem itemToExpand = m_dirModel->itemForIndex(indexToExpand); if (itemToExpand.isNull() || itemToExpand == m_dirModel->itemForIndex(QModelIndex())) { @@ -111,7 +108,7 @@ void FolderExpander::autoExpandTimeout() if (itemToExpand.isDir()) { QTreeView* treeView = qobject_cast(m_view); - if ((treeView != 0) && treeView->itemsExpandable()) { + if (treeView && treeView->itemsExpandable()) { // Toggle expanded state of this directory. treeView->setExpanded(proxyIndexToExpand, !treeView->isExpanded(proxyIndexToExpand)); } -- cgit v1.3