X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/cad78cdfcf1f3b76acaadc7e9394df3ef466d770..e0f7fe87bdc2e32778cd6ce997b59b883cb245b8:/src/kitemviews/kstandarditemmodel.cpp diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp index 959d62cb8..a4d42b571 100644 --- a/src/kitemviews/kstandarditemmodel.cpp +++ b/src/kitemviews/kstandarditemmodel.cpp @@ -19,7 +19,6 @@ #include "kstandarditemmodel.h" -#include #include "kstandarditem.h" KStandardItemModel::KStandardItemModel(QObject* parent) : @@ -89,7 +88,7 @@ void KStandardItemModel::changeItem(int index, KStandardItem* item) m_indexesForItems.remove(oldItem); delete oldItem; - oldItem = 0; + oldItem = nullptr; m_items[index] = item; m_indexesForItems.insert(item, index); @@ -114,7 +113,7 @@ void KStandardItemModel::removeItem(int index) onItemRemoved(index, item); delete item; - item = 0; + item = nullptr; emit itemsRemoved(KItemRangeList() << KItemRange(index, 1)); @@ -134,7 +133,7 @@ void KStandardItemModel::clear() KStandardItem* KStandardItemModel::item(int index) const { if (index < 0 || index >= m_items.count()) { - return 0; + return nullptr; } return m_items[index]; } @@ -175,10 +174,10 @@ bool KStandardItemModel::setData(int index, const QHash& v return true; } -QMimeData* KStandardItemModel::createMimeData(const QSet& indexes) const +QMimeData* KStandardItemModel::createMimeData(const KItemSet& indexes) const { Q_UNUSED(indexes); - return 0; + return nullptr; } int KStandardItemModel::indexForKeyboardSearch(const QString& text, int startFromIndex) const @@ -237,5 +236,3 @@ void KStandardItemModel::onItemRemoved(int index, KStandardItem* removedItem) Q_UNUSED(removedItem); } - -#include "kstandarditemmodel.moc"