diff options
Diffstat (limited to 'src/panels/places')
| -rw-r--r-- | src/panels/places/placesitem.cpp | 2 | ||||
| -rw-r--r-- | src/panels/places/placesitem.h | 2 | ||||
| -rw-r--r-- | src/panels/places/placesitemeditdialog.cpp | 8 | ||||
| -rw-r--r-- | src/panels/places/placesitemeditdialog.h | 2 | ||||
| -rw-r--r-- | src/panels/places/placesitemlistgroupheader.h | 2 | ||||
| -rw-r--r-- | src/panels/places/placesitemmodel.cpp | 20 | ||||
| -rw-r--r-- | src/panels/places/placesitemmodel.h | 2 | ||||
| -rw-r--r-- | src/panels/places/placespanel.cpp | 18 |
8 files changed, 28 insertions, 28 deletions
diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index 93cc4d5c3..297cf95d6 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -66,7 +66,7 @@ void PlacesItem::setUrl(const QUrl &url) // watches for changes if the number of items has been changed. // The update of the icon is handled in onTrashDirListerCompleted(). m_trashDirLister = new KDirLister(); - m_trashDirLister->setAutoErrorHandlingEnabled(false, 0); + m_trashDirLister->setAutoErrorHandlingEnabled(false, nullptr); m_trashDirLister->setDelayedMimeTypes(true); QObject::connect(m_trashDirLister.data(), static_cast<void(KDirLister::*)()>(&KDirLister::completed), m_signalHandler.data(), &PlacesItemSignalHandler::onTrashDirListerCompleted); diff --git a/src/panels/places/placesitem.h b/src/panels/places/placesitem.h index 7d1ab610a..b7cd8e79f 100644 --- a/src/panels/places/placesitem.h +++ b/src/panels/places/placesitem.h @@ -48,7 +48,7 @@ public: DevicesType }; - explicit PlacesItem(const KBookmark& bookmark, PlacesItem* parent = 0); + explicit PlacesItem(const KBookmark& bookmark, PlacesItem* parent = nullptr); ~PlacesItem() override; void setUrl(const QUrl& url); diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp index ffcac4c8f..4a56ce908 100644 --- a/src/panels/places/placesitemeditdialog.cpp +++ b/src/panels/places/placesitemeditdialog.cpp @@ -44,10 +44,10 @@ PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) : m_text(), m_url(), m_allowGlobal(false), - m_urlEdit(0), - m_textEdit(0), - m_iconButton(0), - m_appLocal(0), + m_urlEdit(nullptr), + m_textEdit(nullptr), + m_iconButton(nullptr), + m_appLocal(nullptr), m_buttonBox(nullptr) { } diff --git a/src/panels/places/placesitemeditdialog.h b/src/panels/places/placesitemeditdialog.h index 5f61eede2..73104a1b6 100644 --- a/src/panels/places/placesitemeditdialog.h +++ b/src/panels/places/placesitemeditdialog.h @@ -38,7 +38,7 @@ class PlacesItemEditDialog: public QDialog Q_OBJECT public: - explicit PlacesItemEditDialog(QWidget* parent = 0); + explicit PlacesItemEditDialog(QWidget* parent = nullptr); ~PlacesItemEditDialog() override; void setIcon(const QString& icon); diff --git a/src/panels/places/placesitemlistgroupheader.h b/src/panels/places/placesitemlistgroupheader.h index f3cdaa6a6..4408aa9ef 100644 --- a/src/panels/places/placesitemlistgroupheader.h +++ b/src/panels/places/placesitemlistgroupheader.h @@ -27,7 +27,7 @@ class PlacesItemListGroupHeader : public KStandardItemListGroupHeader Q_OBJECT public: - PlacesItemListGroupHeader(QGraphicsWidget* parent = 0); + PlacesItemListGroupHeader(QGraphicsWidget* parent = nullptr); ~PlacesItemListGroupHeader() override; protected: diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index 680d513b5..371bcb892 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -73,13 +73,13 @@ PlacesItemModel::PlacesItemModel(QObject* parent) : m_hiddenItemsShown(false), m_availableDevices(), m_predicate(), - m_bookmarkManager(0), + m_bookmarkManager(nullptr), m_systemBookmarks(), m_systemBookmarksIndexes(), m_bookmarkedItems(), m_hiddenItemToRemove(-1), - m_deviceToTearDown(0), - m_updateBookmarksTimer(0), + m_deviceToTearDown(nullptr), + m_updateBookmarksTimer(nullptr), m_storageSetupInProgress() { #ifdef HAVE_BALOO @@ -250,24 +250,24 @@ QAction* PlacesItemModel::ejectAction(int index) const { const PlacesItem* item = placesItem(index); if (item && item->device().is<Solid::OpticalDisc>()) { - return new QAction(QIcon::fromTheme(QStringLiteral("media-eject")), i18nc("@item", "Eject"), 0); + return new QAction(QIcon::fromTheme(QStringLiteral("media-eject")), i18nc("@item", "Eject"), nullptr); } - return 0; + return nullptr; } QAction* PlacesItemModel::teardownAction(int index) const { const PlacesItem* item = placesItem(index); if (!item) { - return 0; + return nullptr; } Solid::Device device = item->device(); const bool providesTearDown = device.is<Solid::StorageAccess>() && device.as<Solid::StorageAccess>()->isAccessible(); if (!providesTearDown) { - return 0; + return nullptr; } Solid::StorageDrive* drive = device.as<Solid::StorageDrive>(); @@ -295,10 +295,10 @@ QAction* PlacesItemModel::teardownAction(int index) const } if (iconName.isEmpty()) { - return new QAction(text, 0); + return new QAction(text, nullptr); } - return new QAction(QIcon::fromTheme(iconName), text, 0); + return new QAction(QIcon::fromTheme(iconName), text, nullptr); } void PlacesItemModel::requestEject(int index) @@ -687,7 +687,7 @@ void PlacesItemModel::updateBookmarks() int modelIndex = 0; for (int i = m_bookmarkedItems.count() - 1; i >= 0; --i) { PlacesItem* item = m_bookmarkedItems[i]; - const bool itemIsPartOfModel = (item == 0); + const bool itemIsPartOfModel = (item == nullptr); if (itemIsPartOfModel) { item = placesItem(modelIndex); } diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h index 9c91f7b08..3b9307fe6 100644 --- a/src/panels/places/placesitemmodel.h +++ b/src/panels/places/placesitemmodel.h @@ -50,7 +50,7 @@ class PlacesItemModel: public KStandardItemModel Q_OBJECT public: - explicit PlacesItemModel(QObject* parent = 0); + explicit PlacesItemModel(QObject* parent = nullptr); ~PlacesItemModel() override; /** diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 0b76f18d3..9888290d9 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -170,10 +170,10 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos) QMenu menu(this); - QAction* emptyTrashAction = 0; - QAction* editAction = 0; - QAction* teardownAction = 0; - QAction* ejectAction = 0; + QAction* emptyTrashAction = nullptr; + QAction* editAction = nullptr; + QAction* teardownAction = nullptr; + QAction* ejectAction = nullptr; const QString label = item->text(); @@ -213,7 +213,7 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos) editAction = menu.addAction(QIcon::fromTheme("document-properties"), i18nc("@item:inmenu", "Edit...")); } - QAction* removeAction = 0; + QAction* removeAction = nullptr; if (!isDevice && !item->isSystemItem()) { removeAction = menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@item:inmenu", "Remove")); } @@ -267,7 +267,7 @@ void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos) QAction* addAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-new")), i18nc("@item:inmenu", "Add Entry...")); - QAction* showAllAction = 0; + QAction* showAllAction = nullptr; if (m_model->hiddenCount() > 0) { showAllAction = menu.addAction(i18nc("@item:inmenu", "Show All Entries")); showAllAction->setCheckable(true); @@ -388,8 +388,8 @@ void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success) delete m_itemDropEvent; m_itemDropEventIndex = -1; - m_itemDropEventMimeData = 0; - m_itemDropEvent = 0; + m_itemDropEventMimeData = nullptr; + m_itemDropEvent = nullptr; } } @@ -413,7 +413,7 @@ void PlacesPanel::slotTrashUpdated(KJob* job) emit errorMessage(job->errorString()); } // as long as KIO doesn't do this, do it ourselves - KNotification::event(QStringLiteral("Trash: emptied"), QString(), QPixmap(), 0, KNotification::DefaultEvent); + KNotification::event(QStringLiteral("Trash: emptied"), QString(), QPixmap(), nullptr, KNotification::DefaultEvent); } void PlacesPanel::slotStorageSetupDone(int index, bool success) |
