Merge remote-tracking branch 'origin/Applications/17.12'

[dolphin.git] / src / kitemviews / kstandarditem.cpp

diff --git a/src/kitemviews/kstandarditem.cpp b/src/kitemviews/kstandarditem.cpp
index 6cb5b049b45b4095bc6e28e9e7469abceaaa2830..d4d1fa2f91efd3da9cbd9eb9ac4f543356c21bfc 100644 (file)
--- a/src/kitemviews/kstandarditem.cpp
+++ b/src/kitemviews/kstandarditem.cpp
@@ -18,14 +18,14 @@
  ***************************************************************************/
 
 #include "kstandarditem.h"
-
-#include <KDebug>
+#include <QSet>
+#include <QByteArray>
 #include "kstandarditemmodel.h"
 
 KStandardItem::KStandardItem(KStandardItem* parent) :
     m_parent(parent),
     m_children(),
-    m_model(0),
+    m_model(nullptr),
     m_data()
 {
 }
@@ -33,7 +33,7 @@ KStandardItem::KStandardItem(KStandardItem* parent) :
 KStandardItem::KStandardItem(const QString& text, KStandardItem* parent) :
     m_parent(parent),
     m_children(),
-    m_model(0),
+    m_model(nullptr),
     m_data()
 {
     setText(text);
@@ -42,7 +42,7 @@ KStandardItem::KStandardItem(const QString& text, KStandardItem* parent) :
 KStandardItem::KStandardItem(const QString& icon, const QString& text, KStandardItem* parent) :
     m_parent(parent),
     m_children(),
-    m_model(0),
+    m_model(nullptr),
     m_data()
 {
     setIcon(icon);