┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/views/folderexpander.cpp
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2011-02-09 19:21:58 +0100
committerPeter Penz <[email protected]>2011-02-09 19:24:27 +0100
commitd3496b12310d9fec0e52e537c341e87fcaa2f8b5 (patch)
tree590f58beeca31163e5b17950540601d8a5dec20e /src/views/folderexpander.cpp
parentceba0f6f6a07babac230d1f136d16d34629b4cf3 (diff)
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.
Diffstat (limited to 'src/views/folderexpander.cpp')
-rw-r--r--src/views/folderexpander.cpp11
1 files changed, 4 insertions, 7 deletions
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<KDirModel*>(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<QTreeView*>(m_view);
- if ((treeView != 0) && treeView->itemsExpandable()) {
+ if (treeView && treeView->itemsExpandable()) {
// Toggle expanded state of this directory.
treeView->setExpanded(proxyIndexToExpand, !treeView->isExpanded(proxyIndexToExpand));
}