Coding style update for pointer comparison

[dolphin.git] / src / views / dolphincolumnview.cpp

diff --git a/src/views/dolphincolumnview.cpp b/src/views/dolphincolumnview.cpp
index 41d281bac1aa5a7cc30bed6d41e5ff007fe7d8d2..fec0879ea39e58d27c2be079602494c81fa1cc1a 100644 (file)
--- a/src/views/dolphincolumnview.cpp
+++ b/src/views/dolphincolumnview.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2009 by Peter Penz <peter.penz@gmx.at>             *
+ *   Copyright (C) 2007-2009 by Peter Penz <peter.penz19@gmail.com>        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -36,14 +36,14 @@
 #include "viewmodecontroller.h"
 #include "zoomlevelinfo.h"
 
-#include <kcolorscheme.h>
-#include <kdirlister.h>
-#include <kfileitem.h>
-#include <kio/previewjob.h>
-#include <kicon.h>
-#include <kiconeffect.h>
-#include <kjob.h>
-#include <klocale.h>
+#include <KColorScheme>
+#include <KDirLister>
+#include <KFileItem>
+#include <KIO/PreviewJob>
+#include <KIcon>
+#include <KIconEffect>
+#include <KJob>
+#include <KLocale>
 #include <konqmimedata.h>
 
 #include <QApplication>
@@ -90,7 +90,7 @@ DolphinColumnView::DolphinColumnView(QWidget* parent,
     m_resizeWidget->installEventFilter(this);
 
     const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-    Q_ASSERT(settings != 0);
+    Q_ASSERT(settings);
 
     if (settings->useSystemFont()) {
         m_font = KGlobalSettings::generalFont();
@@ -241,7 +241,7 @@ void DolphinColumnView::setSelectionModel(QItemSelectionModel* model)
     // If a change of the selection is done although the view is not active
     // (e. g. by the selection markers), the column must be activated. This
     // is done by listening to the current selectionChanged() signal.
-    if (selectionModel() != 0) {
+    if (selectionModel()) {
         disconnect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
                    this, SLOT(requestActivation()));
     }
@@ -300,7 +300,7 @@ void DolphinColumnView::dropEvent(QDropEvent* event)
     m_container->m_dolphinViewController->setItemView(this);
     const QModelIndex dolphinModelIndex = m_proxyModel->mapToSource(index);
     const KFileItem item = m_dolphinModel->itemForIndex(dolphinModelIndex);
-    m_container->m_dolphinViewController->indicateDroppedUrls(item, url(), event);
+    m_container->m_dolphinViewController->indicateDroppedUrls(item, event);
     DolphinTreeView::dropEvent(event);
 }
 
@@ -507,7 +507,7 @@ void DolphinColumnView::requestActivation()
 void DolphinColumnView::updateFont()
 {
     const ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-    Q_ASSERT(settings != 0);
+    Q_ASSERT(settings);
 
     if (settings->useSystemFont()) {
         m_font = KGlobalSettings::generalFont();