diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index d4cf196b7c..af3878e1fc 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -66,14 +66,14 @@ DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent, m_mainWindow(parent), m_fileInfo(fileInfo), m_baseUrl(baseUrl), - m_baseFileItem(0), + m_baseFileItem(nullptr), m_selectedItems(), m_selectedItemsProperties(nullptr), m_context(NoContext), m_copyToMenu(parent), m_customActions(), m_command(None), - m_removeAction(0) + m_removeAction(nullptr) { // The context menu either accesses the URLs of the selected items // or the items itself. To increase the performance both lists are cached. @@ -337,7 +337,7 @@ void DolphinContextMenu::openViewportContextMenu() addAction(m_mainWindow->actionCollection()->action(QStringLiteral("new_tab"))); // Insert 'Add to Places' entry if exactly one item is selected - QAction* addToPlacesAction = 0; + QAction* addToPlacesAction = nullptr; if (!placeExists(m_mainWindow->activeViewContainer()->url())) { addToPlacesAction = addAction(QIcon::fromTheme(QStringLiteral("bookmark-new")), i18nc("@action:inmenu Add current folder to places", "Add to Places")); @@ -408,7 +408,7 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties& if (showDeleteAction && showMoveToTrashAction) { delete m_removeAction; - m_removeAction = 0; + m_removeAction = nullptr; addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash))); addAction(m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); } else if (showDeleteAction && !showMoveToTrashAction) { @@ -445,7 +445,7 @@ bool DolphinContextMenu::placeExists(const QUrl& url) const QAction* DolphinContextMenu::createPasteAction() { - QAction* action = 0; + QAction* action = nullptr; const bool isDir = !m_fileInfo.isNull() && m_fileInfo.isDir(); if (isDir && (m_selectedItems.count() == 1)) { const QMimeData *mimeData = QApplication::clipboard()->mimeData(); diff --git a/src/dolphindockwidget.h b/src/dolphindockwidget.h index 8a15a04022..c4fcbf753b 100644 --- a/src/dolphindockwidget.h +++ b/src/dolphindockwidget.h @@ -30,8 +30,8 @@ class DolphinDockWidget : public QDockWidget Q_OBJECT public: - explicit DolphinDockWidget(const QString& title, QWidget* parent = 0, Qt::WindowFlags flags = 0); - explicit DolphinDockWidget(QWidget* parent = 0, Qt::WindowFlags flags = 0); + explicit DolphinDockWidget(const QString& title, QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr); + explicit DolphinDockWidget(QWidget* parent = nullptr, Qt::WindowFlags flags = nullptr); ~DolphinDockWidget() override; /** diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index c35de766cc..de43bab4c2 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -90,20 +90,20 @@ namespace { } DolphinMainWindow::DolphinMainWindow() : - KXmlGuiWindow(0), - m_newFileMenu(0), - m_tabWidget(0), - m_activeViewContainer(0), - m_actionHandler(0), - m_remoteEncoding(0), + KXmlGuiWindow(nullptr), + m_newFileMenu(nullptr), + m_tabWidget(nullptr), + m_activeViewContainer(nullptr), + m_actionHandler(nullptr), + m_remoteEncoding(nullptr), m_settingsDialog(), - m_controlButton(0), - m_updateToolBarTimer(0), - m_lastHandleUrlStatJob(0), + m_controlButton(nullptr), + m_updateToolBarTimer(nullptr), + m_lastHandleUrlStatJob(nullptr), #ifndef Q_OS_WIN - m_terminalPanel(0), + m_terminalPanel(nullptr), #endif - m_placesPanel(0), + m_placesPanel(nullptr), m_tearDownFromPlacesRequested(false) { Q_INIT_RESOURCE(dolphin); @@ -751,7 +751,7 @@ void DolphinMainWindow::editSettings() void DolphinMainWindow::handleUrl(const QUrl& url) { delete m_lastHandleUrlStatJob; - m_lastHandleUrlStatJob = 0; + m_lastHandleUrlStatJob = nullptr; if (url.isLocalFile() && QFileInfo(url.toLocalFile()).isDir()) { activeViewContainer()->setUrl(url); @@ -771,7 +771,7 @@ void DolphinMainWindow::handleUrl(const QUrl& url) void DolphinMainWindow::slotHandleUrlStatFinished(KJob* job) { - m_lastHandleUrlStatJob = 0; + m_lastHandleUrlStatJob = nullptr; const KIO::UDSEntry entry = static_cast(job)->statResult(); const QUrl url = static_cast(job)->url(); if (entry.isDir()) { @@ -912,7 +912,7 @@ void DolphinMainWindow::updateToolBar() void DolphinMainWindow::slotControlButtonDeleted() { - m_controlButton = 0; + m_controlButton = nullptr; m_updateToolBarTimer->start(); } @@ -1174,7 +1174,7 @@ void DolphinMainWindow::setupActions() } // setup 'Settings' menu - KToggleAction* showMenuBar = KStandardAction::showMenubar(0, 0, actionCollection()); + KToggleAction* showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection()); connect(showMenuBar, &KToggleAction::triggered, // Fixes #286822 this, &DolphinMainWindow::toggleShowMenuBar, Qt::QueuedConnection); KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); @@ -1436,10 +1436,10 @@ void DolphinMainWindow::createControlButton() void DolphinMainWindow::deleteControlButton() { delete m_controlButton; - m_controlButton = 0; + m_controlButton = nullptr; delete m_updateToolBarTimer; - m_updateToolBarTimer = 0; + m_updateToolBarTimer = nullptr; } bool DolphinMainWindow::addActionToMenu(QAction* action, QMenu* menu) diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index b3b47304e1..c8bc8b647d 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -60,8 +60,8 @@ K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin();) DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args) : KParts::ReadOnlyPart(parent) - ,m_openTerminalAction(0) - ,m_removeAction(0) + ,m_openTerminalAction(nullptr) + ,m_removeAction(nullptr) { Q_UNUSED(args) setComponentData(*createAboutData(), false); @@ -316,7 +316,7 @@ bool DolphinPart::openUrl(const QUrl &url) QString prettyUrl = visibleUrl.toDisplayString(QUrl::PreferLocalFile); emit setWindowCaption(prettyUrl); emit m_extension->setLocationBarUrl(prettyUrl); - emit started(0); // get the wheel to spin + emit started(nullptr); // get the wheel to spin m_view->setNameFilter(m_nameFilter); m_view->setUrl(url); updatePasteAction(); @@ -431,7 +431,7 @@ void DolphinPart::slotOpenContextMenu(const QPoint& pos, if (showDeleteAction && showMoveToTrashAction) { delete m_removeAction; - m_removeAction = 0; + m_removeAction = nullptr; editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::MoveToTrash))); editActions.append(actionCollection()->action(KStandardAction::name(KStandardAction::DeleteFile))); } else if (showDeleteAction && !showMoveToTrashAction) { diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp index c155632c67..f425df2180 100644 --- a/src/dolphinrecenttabsmenu.cpp +++ b/src/dolphinrecenttabsmenu.cpp @@ -86,7 +86,7 @@ void DolphinRecentTabsMenu::handleAction(QAction* action) const QByteArray state = action->data().toByteArray(); removeAction(action); delete action; - action = 0; + action = nullptr; emit restoreClosedTab(state); emit closedTabsCountChanged(menu()->actions().size() - 2); } diff --git a/src/dolphintabpage.h b/src/dolphintabpage.h index b8772602d1..ba4c144d91 100644 --- a/src/dolphintabpage.h +++ b/src/dolphintabpage.h @@ -33,7 +33,7 @@ class DolphinTabPage : public QWidget Q_OBJECT public: - explicit DolphinTabPage(const QUrl& primaryUrl, const QUrl& secondaryUrl = QUrl(), QWidget* parent = 0); + explicit DolphinTabPage(const QUrl& primaryUrl, const QUrl& secondaryUrl = QUrl(), QWidget* parent = nullptr); /** * @return True if primary view is the active view in this tab. diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index e92ec6022f..36959a871e 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -52,14 +52,14 @@ DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) : QWidget(parent), - m_topLayout(0), - m_urlNavigator(0), - m_searchBox(0), - m_messageWidget(0), - m_view(0), - m_filterBar(0), - m_statusBar(0), - m_statusBarTimer(0), + m_topLayout(nullptr), + m_urlNavigator(nullptr), + m_searchBox(nullptr), + m_messageWidget(nullptr), + m_view(nullptr), + m_filterBar(nullptr), + m_statusBar(nullptr), + m_statusBarTimer(nullptr), m_statusBarTimestamp(), m_autoGrabFocus(true) #ifdef KActivities_FOUND diff --git a/src/filterbar/filterbar.h b/src/filterbar/filterbar.h index da4a0fcc17..0c7dcb6cd0 100644 --- a/src/filterbar/filterbar.h +++ b/src/filterbar/filterbar.h @@ -37,7 +37,7 @@ class FilterBar : public QWidget Q_OBJECT public: - explicit FilterBar(QWidget* parent = 0); + explicit FilterBar(QWidget* parent = nullptr); ~FilterBar() override; /** Called by view container to hide this **/ diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index c17d543676..41f8aeade0 100644 --- a/src/kitemviews/kfileitemlistview.cpp +++ b/src/kitemviews/kfileitemlistview.cpp @@ -49,9 +49,9 @@ namespace { KFileItemListView::KFileItemListView(QGraphicsWidget* parent) : KStandardItemListView(parent), - m_modelRolesUpdater(0), - m_updateVisibleIndexRangeTimer(0), - m_updateIconSizeTimer(0) + m_modelRolesUpdater(nullptr), + m_updateVisibleIndexRangeTimer(nullptr), + m_updateIconSizeTimer(nullptr) { setAcceptDrops(true); @@ -229,7 +229,7 @@ void KFileItemListView::onModelChanged(KItemModelBase* current, KItemModelBase* KStandardItemListView::onModelChanged(current, previous); delete m_modelRolesUpdater; - m_modelRolesUpdater = 0; + m_modelRolesUpdater = nullptr; if (current) { m_modelRolesUpdater = new KFileItemModelRolesUpdater(static_cast(current), this); diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h index c1c260e93c..95ad9ba686 100644 --- a/src/kitemviews/kfileitemlistview.h +++ b/src/kitemviews/kfileitemlistview.h @@ -41,7 +41,7 @@ class DOLPHIN_EXPORT KFileItemListView : public KStandardItemListView Q_OBJECT public: - KFileItemListView(QGraphicsWidget* parent = 0); + KFileItemListView(QGraphicsWidget* parent = nullptr); ~KFileItemListView() override; void setPreviewsShown(bool show); diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 8f89b89df6..08520c9f62 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -42,7 +42,7 @@ KFileItemModel::KFileItemModel(QObject* parent) : KItemModelBase("text", parent), - m_dirLister(0), + m_dirLister(nullptr), m_sortDirsFirst(true), m_sortRole(NameRole), m_sortingProgressPercent(-1), @@ -52,8 +52,8 @@ KFileItemModel::KFileItemModel(QObject* parent) : m_filter(), m_filteredItems(), m_requestRole(), - m_maximumUpdateIntervalTimer(0), - m_resortAllItemsTimer(0), + m_maximumUpdateIntervalTimer(nullptr), + m_resortAllItemsTimer(nullptr), m_pendingItemsToInsert(), m_groups(), m_expandedDirs(), @@ -251,7 +251,7 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const QList urls; QList mostLocalUrls; bool canUseMostLocalUrls = true; - const ItemData* lastAddedItem = 0; + const ItemData* lastAddedItem = nullptr; for (int index : indexes) { const ItemData* itemData = m_itemData.at(index); @@ -2295,16 +2295,16 @@ const KFileItemModel::RoleInfoMap* KFileItemModel::rolesInfoMap(int& count) { static const RoleInfoMap rolesInfoMap[] = { // | role | roleType | role translation | group translation | requires Baloo | requires indexer - { 0, NoRole, 0, 0, 0, 0, false, false }, - { "text", NameRole, I18N_NOOP2_NOSTRIP("@label", "Name"), 0, 0, false, false }, - { "size", SizeRole, I18N_NOOP2_NOSTRIP("@label", "Size"), 0, 0, false, false }, - { "modificationtime", ModificationTimeRole, I18N_NOOP2_NOSTRIP("@label", "Modified"), 0, 0, false, false }, - { "creationtime", CreationTimeRole, I18N_NOOP2_NOSTRIP("@label", "Created"), 0, 0, false, false }, - { "accesstime", AccessTimeRole, I18N_NOOP2_NOSTRIP("@label", "Accessed"), 0, 0, false, false }, - { "type", TypeRole, I18N_NOOP2_NOSTRIP("@label", "Type"), 0, 0, false, false }, - { "rating", RatingRole, I18N_NOOP2_NOSTRIP("@label", "Rating"), 0, 0, true, false }, - { "tags", TagsRole, I18N_NOOP2_NOSTRIP("@label", "Tags"), 0, 0, true, false }, - { "comment", CommentRole, I18N_NOOP2_NOSTRIP("@label", "Comment"), 0, 0, true, false }, + { nullptr, NoRole, nullptr, nullptr, nullptr, nullptr, false, false }, + { "text", NameRole, I18N_NOOP2_NOSTRIP("@label", "Name"), nullptr, nullptr, false, false }, + { "size", SizeRole, I18N_NOOP2_NOSTRIP("@label", "Size"), nullptr, nullptr, false, false }, + { "modificationtime", ModificationTimeRole, I18N_NOOP2_NOSTRIP("@label", "Modified"), nullptr, nullptr, false, false }, + { "creationtime", CreationTimeRole, I18N_NOOP2_NOSTRIP("@label", "Created"), nullptr, nullptr, false, false }, + { "accesstime", AccessTimeRole, I18N_NOOP2_NOSTRIP("@label", "Accessed"), nullptr, nullptr, false, false }, + { "type", TypeRole, I18N_NOOP2_NOSTRIP("@label", "Type"), nullptr, nullptr, false, false }, + { "rating", RatingRole, I18N_NOOP2_NOSTRIP("@label", "Rating"), nullptr, nullptr, true, false }, + { "tags", TagsRole, I18N_NOOP2_NOSTRIP("@label", "Tags"), nullptr, nullptr, true, false }, + { "comment", CommentRole, I18N_NOOP2_NOSTRIP("@label", "Comment"), nullptr, nullptr, true, false }, { "title", TitleRole, I18N_NOOP2_NOSTRIP("@label", "Title"), I18N_NOOP2_NOSTRIP("@label", "Document"), true, true }, { "wordCount", WordCountRole, I18N_NOOP2_NOSTRIP("@label", "Word Count"), I18N_NOOP2_NOSTRIP("@label", "Document"), true, true }, { "lineCount", LineCountRole, I18N_NOOP2_NOSTRIP("@label", "Line Count"), I18N_NOOP2_NOSTRIP("@label", "Document"), true, true }, diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index 3cd119dc89..8d721aa56c 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -50,7 +50,7 @@ class DOLPHIN_EXPORT KFileItemModel : public KItemModelBase Q_OBJECT public: - explicit KFileItemModel(QObject* parent = 0); + explicit KFileItemModel(QObject* parent = nullptr); ~KFileItemModel() override; /** diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index 11d01b2cf3..a08f1ae150 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -88,12 +88,12 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QO m_pendingIndexes(), m_pendingPreviewItems(), m_previewJob(), - m_recentlyChangedItemsTimer(0), + m_recentlyChangedItemsTimer(nullptr), m_recentlyChangedItems(), m_changedItems(), - m_directoryContentsCounter(0) + m_directoryContentsCounter(nullptr) #ifdef HAVE_BALOO - , m_balooFileMonitor(0) + , m_balooFileMonitor(nullptr) #endif { Q_ASSERT(model); @@ -296,7 +296,7 @@ void KFileItemModelRolesUpdater::setRoles(const QSet& roles) this, &KFileItemModelRolesUpdater::applyChangedBalooRoles); } else if (!hasBalooRole && m_balooFileMonitor) { delete m_balooFileMonitor; - m_balooFileMonitor = 0; + m_balooFileMonitor = nullptr; } #endif @@ -594,7 +594,7 @@ void KFileItemModelRolesUpdater::slotPreviewFailed(const KFileItem& item) void KFileItemModelRolesUpdater::slotPreviewJobFinished() { - m_previewJob = 0; + m_previewJob = nullptr; if (m_state != PreviewJobRunning) { return; @@ -1138,7 +1138,7 @@ void KFileItemModelRolesUpdater::killPreviewJob() disconnect(m_previewJob, &KIO::PreviewJob::finished, this, &KFileItemModelRolesUpdater::slotPreviewJobFinished); m_previewJob->kill(); - m_previewJob = 0; + m_previewJob = nullptr; m_pendingPreviewItems.clear(); } } diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h index 15d46d79e6..d971a7c171 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.h +++ b/src/kitemviews/kfileitemmodelrolesupdater.h @@ -94,7 +94,7 @@ class DOLPHIN_EXPORT KFileItemModelRolesUpdater : public QObject Q_OBJECT public: - explicit KFileItemModelRolesUpdater(KFileItemModel* model, QObject* parent = 0); + explicit KFileItemModelRolesUpdater(KFileItemModel* model, QObject* parent = nullptr); ~KFileItemModelRolesUpdater() override; void setIconSize(const QSize& size); diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp index 8bab6cfad2..8e64ee4933 100644 --- a/src/kitemviews/kitemlistcontainer.cpp +++ b/src/kitemviews/kitemlistcontainer.cpp @@ -70,8 +70,8 @@ void KItemListContainerViewport::wheelEvent(QWheelEvent* event) KItemListContainer::KItemListContainer(KItemListController* controller, QWidget* parent) : QAbstractScrollArea(parent), m_controller(controller), - m_horizontalSmoothScroller(0), - m_verticalSmoothScroller(0) + m_horizontalSmoothScroller(nullptr), + m_verticalSmoothScroller(nullptr) { Q_ASSERT(controller); controller->setParent(this); @@ -83,10 +83,10 @@ KItemListContainer::KItemListContainer(KItemListController* controller, QWidget* m_verticalSmoothScroller = new KItemListSmoothScroller(verticalScrollBar(), this); if (controller->model()) { - slotModelChanged(controller->model(), 0); + slotModelChanged(controller->model(), nullptr); } if (controller->view()) { - slotViewChanged(controller->view(), 0); + slotViewChanged(controller->view(), nullptr); } connect(controller, &KItemListController::modelChanged, @@ -100,7 +100,7 @@ KItemListContainer::~KItemListContainer() // Don't rely on the QObject-order to delete the controller, otherwise // the QGraphicsScene might get deleted before the view. delete m_controller; - m_controller = 0; + m_controller = nullptr; } KItemListController* KItemListContainer::controller() const @@ -216,8 +216,8 @@ void KItemListContainer::slotViewChanged(KItemListView* current, KItemListView* disconnect(previous, &KItemListView::maximumItemOffsetChanged, this, &KItemListContainer::updateItemOffsetScrollBar); disconnect(previous, &KItemListView::scrollTo, this, &KItemListContainer::scrollTo); - m_horizontalSmoothScroller->setTargetObject(0); - m_verticalSmoothScroller->setTargetObject(0); + m_horizontalSmoothScroller->setTargetObject(nullptr); + m_verticalSmoothScroller->setTargetObject(nullptr); } if (current) { scene->addItem(current); @@ -257,8 +257,8 @@ void KItemListContainer::updateScrollOffsetScrollBar() return; } - KItemListSmoothScroller* smoothScroller = 0; - QScrollBar* scrollOffsetScrollBar = 0; + KItemListSmoothScroller* smoothScroller = nullptr; + QScrollBar* scrollOffsetScrollBar = nullptr; int singleStep = 0; int pageStep = 0; int maximum = 0; @@ -308,8 +308,8 @@ void KItemListContainer::updateItemOffsetScrollBar() return; } - KItemListSmoothScroller* smoothScroller = 0; - QScrollBar* itemOffsetScrollBar = 0; + KItemListSmoothScroller* smoothScroller = nullptr; + QScrollBar* itemOffsetScrollBar = nullptr; int singleStep = 0; int pageStep = 0; if (view->scrollOrientation() == Qt::Vertical) { diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h index dc7b19e202..c5ef855634 100644 --- a/src/kitemviews/kitemlistcontainer.h +++ b/src/kitemviews/kitemlistcontainer.h @@ -50,7 +50,7 @@ public: * (the parent will be set to the KItemListContainer). * @param parent Optional parent widget. */ - explicit KItemListContainer(KItemListController* controller, QWidget* parent = 0); + explicit KItemListContainer(KItemListController* controller, QWidget* parent = nullptr); ~KItemListContainer() override; KItemListController* controller() const; diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index 008b6c4c6c..61f520641c 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -49,13 +49,13 @@ KItemListController::KItemListController(KItemModelBase* model, KItemListView* v m_selectionBehavior(NoSelection), m_autoActivationBehavior(ActivationAndExpansion), m_mouseDoubleClickAction(ActivateItemOnly), - m_model(0), - m_view(0), + m_model(nullptr), + m_view(nullptr), m_selectionManager(new KItemListSelectionManager(this)), m_keyboardManager(new KItemListKeyboardSearchManager(this)), m_pressedIndex(-1), m_pressedMousePos(), - m_autoActivationTimer(0), + m_autoActivationTimer(nullptr), m_oldSelection(), m_keyboardAnchorIndex(-1), m_keyboardAnchorPos(0) @@ -76,10 +76,10 @@ KItemListController::KItemListController(KItemModelBase* model, KItemListView* v KItemListController::~KItemListController() { - setView(0); + setView(nullptr); Q_ASSERT(!m_view); - setModel(0); + setModel(nullptr); Q_ASSERT(!m_model); } @@ -1216,7 +1216,7 @@ KItemListWidget* KItemListController::hoveredWidget() const } } - return 0; + return nullptr; } KItemListWidget* KItemListController::widgetForPos(const QPointF& pos) const @@ -1233,7 +1233,7 @@ KItemListWidget* KItemListController::widgetForPos(const QPointF& pos) const } } - return 0; + return nullptr; } void KItemListController::updateKeyboardAnchor() diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h index ff0171a026..7c48fb18c1 100644 --- a/src/kitemviews/kitemlistcontroller.h +++ b/src/kitemviews/kitemlistcontroller.h @@ -88,7 +88,7 @@ public: * @param view View of the controller. The ownership is passed to the controller. * @param parent Optional parent object. */ - KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent = 0); + KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent = nullptr); ~KItemListController() override; void setModel(KItemModelBase* model); diff --git a/src/kitemviews/kitemlistgroupheader.cpp b/src/kitemviews/kitemlistgroupheader.cpp index f8576b08cf..fb92989894 100644 --- a/src/kitemviews/kitemlistgroupheader.cpp +++ b/src/kitemviews/kitemlistgroupheader.cpp @@ -29,7 +29,7 @@ #include KItemListGroupHeader::KItemListGroupHeader(QGraphicsWidget* parent) : - QGraphicsWidget(parent, 0), + QGraphicsWidget(parent, nullptr), m_dirtyCache(true), m_role(), m_data(), diff --git a/src/kitemviews/kitemlistgroupheader.h b/src/kitemviews/kitemlistgroupheader.h index f720076df1..6a8bd76e86 100644 --- a/src/kitemviews/kitemlistgroupheader.h +++ b/src/kitemviews/kitemlistgroupheader.h @@ -42,7 +42,7 @@ class DOLPHIN_EXPORT KItemListGroupHeader : public QGraphicsWidget Q_OBJECT public: - KItemListGroupHeader(QGraphicsWidget* parent = 0); + KItemListGroupHeader(QGraphicsWidget* parent = nullptr); ~KItemListGroupHeader() override; void setRole(const QByteArray& role); @@ -65,7 +65,7 @@ public: void setItemIndex(int index); int itemIndex() const; - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; protected: virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) = 0; diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp index 46ffe7c139..5d7b08eeb0 100644 --- a/src/kitemviews/kitemlistselectionmanager.cpp +++ b/src/kitemviews/kitemlistselectionmanager.cpp @@ -31,7 +31,7 @@ KItemListSelectionManager::KItemListSelectionManager(QObject* parent) : m_anchorItem(-1), m_selectedItems(), m_isAnchoredSelectionActive(false), - m_model(0) + m_model(nullptr) { } diff --git a/src/kitemviews/kitemlistselectionmanager.h b/src/kitemviews/kitemlistselectionmanager.h index d8faac4cd4..54c2cc0629 100644 --- a/src/kitemviews/kitemlistselectionmanager.h +++ b/src/kitemviews/kitemlistselectionmanager.h @@ -51,7 +51,7 @@ public: Toggle }; - KItemListSelectionManager(QObject* parent = 0); + KItemListSelectionManager(QObject* parent = nullptr); ~KItemListSelectionManager() override; void setCurrentItem(int current); diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index d268097979..71091033c9 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -67,7 +67,7 @@ QAccessibleInterface* accessibleInterfaceFactory(const QString& key, QObject* ob return new KItemListViewAccessible(view); } - return 0; + return nullptr; } #endif @@ -80,30 +80,30 @@ KItemListView::KItemListView(QGraphicsWidget* parent) : m_activeTransactions(0), m_endTransactionAnimationHint(Animation), m_itemSize(), - m_controller(0), - m_model(0), + m_controller(nullptr), + m_model(nullptr), m_visibleRoles(), - m_widgetCreator(0), - m_groupHeaderCreator(0), + m_widgetCreator(nullptr), + m_groupHeaderCreator(nullptr), m_styleOption(), m_visibleItems(), m_visibleGroups(), m_visibleCells(), - m_sizeHintResolver(0), - m_layouter(0), - m_animation(0), - m_layoutTimer(0), + m_sizeHintResolver(nullptr), + m_layouter(nullptr), + m_animation(nullptr), + m_layoutTimer(nullptr), m_oldScrollOffset(0), m_oldMaximumScrollOffset(0), m_oldItemOffset(0), m_oldMaximumItemOffset(0), m_skipAutoScrollForRubberBand(false), - m_rubberBand(0), + m_rubberBand(nullptr), m_mousePos(), m_autoScrollIncrement(0), - m_autoScrollTimer(0), - m_header(0), - m_headerWidget(0), + m_autoScrollTimer(nullptr), + m_header(nullptr), + m_headerWidget(nullptr), m_dropIndicator() { setAcceptHoverEvents(true); @@ -141,13 +141,13 @@ KItemListView::~KItemListView() // widgetCreator(). So it is mandatory to delete the group headers // first. delete m_groupHeaderCreator; - m_groupHeaderCreator = 0; + m_groupHeaderCreator = nullptr; delete m_widgetCreator; - m_widgetCreator = 0; + m_widgetCreator = nullptr; delete m_sizeHintResolver; - m_sizeHintResolver = 0; + m_sizeHintResolver = nullptr; } void KItemListView::setScrollOffset(qreal offset) @@ -270,13 +270,13 @@ void KItemListView::setAutoScroll(bool enabled) m_autoScrollTimer->start(InitialAutoScrollDelay); } else if (!enabled && m_autoScrollTimer) { delete m_autoScrollTimer; - m_autoScrollTimer = 0; + m_autoScrollTimer = nullptr; } } bool KItemListView::autoScroll() const { - return m_autoScrollTimer != 0; + return m_autoScrollTimer != nullptr; } void KItemListView::setEnabledSelectionToggles(bool enabled) @@ -629,7 +629,7 @@ QPixmap KItemListView::createDragPixmap(const KItemSet& indexes) const KItemListWidget* item = m_visibleItems.value(indexes.first()); QGraphicsView* graphicsView = scene()->views()[0]; if (item && graphicsView) { - pixmap = item->createDragPixmap(0, graphicsView); + pixmap = item->createDragPixmap(nullptr, graphicsView); } } else { // TODO: Not implemented yet. Probably extend the interface @@ -834,12 +834,12 @@ Qt::Orientation KItemListView::scrollOrientation() const KItemListWidgetCreatorBase* KItemListView::defaultWidgetCreator() const { - return 0; + return nullptr; } KItemListGroupHeaderCreatorBase* KItemListView::defaultGroupHeaderCreator() const { - return 0; + return nullptr; } void KItemListView::initializeItemListWidget(KItemListWidget* item) @@ -2090,7 +2090,7 @@ void KItemListView::recycleGroupHeaderForWidget(KItemListWidget* widget) { KItemListGroupHeader* header = m_visibleGroups.value(widget); if (header) { - header->setParentItem(0); + header->setParentItem(nullptr); groupHeaderCreator()->recycle(header); m_visibleGroups.remove(widget); disconnect(widget, &KItemListWidget::geometryChanged, this, &KItemListView::slotGeometryOfGroupHeaderParentChanged); @@ -2551,7 +2551,7 @@ void KItemListView::updateSiblingsInformation(int firstIndex, int lastIndex) const int parents = m_model->expandedParentsCount(lastIndex + 1); for (int i = lastIndex; i >= firstIndex; --i) { if (m_model->expandedParentsCount(i) != parents) { - widget = 0; + widget = nullptr; break; } } @@ -2714,7 +2714,7 @@ void KItemListCreatorBase::pushRecycleableWidget(QGraphicsWidget* widget) QGraphicsWidget* KItemListCreatorBase::popRecycleableWidget() { if (m_recycleableWidgets.isEmpty()) { - return 0; + return nullptr; } QGraphicsWidget* widget = m_recycleableWidgets.takeLast(); @@ -2728,7 +2728,7 @@ KItemListWidgetCreatorBase::~KItemListWidgetCreatorBase() void KItemListWidgetCreatorBase::recycle(KItemListWidget* widget) { - widget->setParentItem(0); + widget->setParentItem(nullptr); widget->setOpacity(1.0); pushRecycleableWidget(widget); } diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h index 3415d52ec1..e3793e10ef 100644 --- a/src/kitemviews/kitemlistview.h +++ b/src/kitemviews/kitemlistview.h @@ -67,7 +67,7 @@ class DOLPHIN_EXPORT KItemListView : public QGraphicsWidget Q_PROPERTY(qreal itemOffset READ itemOffset WRITE setItemOffset) public: - KItemListView(QGraphicsWidget* parent = 0); + KItemListView(QGraphicsWidget* parent = nullptr); ~KItemListView() override; /** @@ -285,7 +285,7 @@ public: */ void editRole(int index, const QByteArray& role); - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; signals: void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp index 6f06e243e3..c593dad82c 100644 --- a/src/kitemviews/kitemlistviewaccessible.cpp +++ b/src/kitemviews/kitemlistviewaccessible.cpp @@ -60,7 +60,7 @@ void* KItemListViewAccessible::interface_cast(QAccessible::InterfaceType type) if (type == QAccessible::TableInterface) { return static_cast(this); } - return Q_NULLPTR; + return nullptr; } void KItemListViewAccessible::modelReset() @@ -70,7 +70,7 @@ void KItemListViewAccessible::modelReset() QAccessibleInterface* KItemListViewAccessible::cell(int index) const { if (index < 0 || index >= view()->model()->count()) { - return 0; + return nullptr; } if (m_cells.size() <= index) { @@ -93,7 +93,7 @@ QAccessibleInterface* KItemListViewAccessible::cellAt(int row, int column) const QAccessibleInterface* KItemListViewAccessible::caption() const { - return 0; + return nullptr; } QString KItemListViewAccessible::columnDescription(int) const @@ -168,7 +168,7 @@ QList KItemListViewAccessible::selectedRows() const QAccessibleInterface* KItemListViewAccessible::summary() const { - return 0; + return nullptr; } bool KItemListViewAccessible::isColumnSelected(int) const @@ -225,7 +225,7 @@ QAccessibleInterface* KItemListViewAccessible::childAt(int x, int y) const QAccessibleInterface* KItemListViewAccessible::parent() const { // FIXME: return KItemListContainerAccessible here - return Q_NULLPTR; + return nullptr; } int KItemListViewAccessible::childCount() const @@ -265,7 +265,7 @@ QAccessibleInterface* KItemListViewAccessible::child(int index) const if (index >= 0 && index < childCount()) { return cell(index); } - return Q_NULLPTR; + return nullptr; } // Table Cell @@ -282,7 +282,7 @@ void* KItemListAccessibleCell::interface_cast(QAccessible::InterfaceType type) if (type == QAccessible::TableCellInterface) { return static_cast(this); } - return Q_NULLPTR; + return nullptr; } int KItemListAccessibleCell::columnExtent() const @@ -398,7 +398,7 @@ void KItemListAccessibleCell::setText(QAccessible::Text, const QString&) QAccessibleInterface* KItemListAccessibleCell::child(int) const { - return Q_NULLPTR; + return nullptr; } bool KItemListAccessibleCell::isValid() const @@ -408,7 +408,7 @@ bool KItemListAccessibleCell::isValid() const QAccessibleInterface* KItemListAccessibleCell::childAt(int, int) const { - return Q_NULLPTR; + return nullptr; } int KItemListAccessibleCell::childCount() const @@ -434,7 +434,7 @@ int KItemListAccessibleCell::index() const QObject* KItemListAccessibleCell::object() const { - return 0; + return nullptr; } // Container Interface @@ -465,7 +465,7 @@ QAccessibleInterface* KItemListContainerAccessible::child(int index) const if (index == 0) { return QAccessible::queryAccessibleInterface(container()->controller()->view()); } - return Q_NULLPTR; + return nullptr; } const KItemListContainer* KItemListContainerAccessible::container() const diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp index 65fc911bd9..579d8b7a2c 100644 --- a/src/kitemviews/kitemlistwidget.cpp +++ b/src/kitemviews/kitemlistwidget.cpp @@ -42,7 +42,7 @@ KItemListWidgetInformant::~KItemListWidgetInformant() } KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) : - QGraphicsWidget(parent, 0), + QGraphicsWidget(parent, nullptr), m_informant(informant), m_index(-1), m_selected(false), @@ -56,9 +56,9 @@ KItemListWidget::KItemListWidget(KItemListWidgetInformant* informant, QGraphicsI m_styleOption(), m_siblingsInfo(), m_hoverOpacity(0), - m_hoverCache(0), - m_hoverAnimation(0), - m_selectionToggle(0), + m_hoverCache(nullptr), + m_hoverAnimation(nullptr), + m_selectionToggle(nullptr), m_editedRole() { } @@ -72,7 +72,7 @@ void KItemListWidget::setIndex(int index) { if (m_index != index) { delete m_selectionToggle; - m_selectionToggle = 0; + m_selectionToggle = nullptr; if (m_hoverAnimation) { m_hoverAnimation->stop(); @@ -474,7 +474,7 @@ void KItemListWidget::slotHoverAnimationFinished() { if (!m_hovered && m_selectionToggle) { m_selectionToggle->deleteLater(); - m_selectionToggle = 0; + m_selectionToggle = nullptr; } } @@ -502,7 +502,7 @@ void KItemListWidget::setHoverOpacity(qreal opacity) if (m_hoverOpacity <= 0.0) { delete m_hoverCache; - m_hoverCache = 0; + m_hoverCache = nullptr; } update(); @@ -511,7 +511,7 @@ void KItemListWidget::setHoverOpacity(qreal opacity) void KItemListWidget::clearHoverCache() { delete m_hoverCache; - m_hoverCache = 0; + m_hoverCache = nullptr; } void KItemListWidget::drawItemStyleOption(QPainter* painter, QWidget* widget, QStyle::State styleState) diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h index 1480c1acb8..06fea0e391 100644 --- a/src/kitemviews/kitemlistwidget.h +++ b/src/kitemviews/kitemlistwidget.h @@ -82,7 +82,7 @@ public: * to show the data of the custom model provided by KItemListWidget::data(). * @reimp */ - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; void setVisibleRoles(const QList& roles); QList visibleRoles() const; @@ -186,7 +186,7 @@ public: * @return Pixmap that is used when dragging an item. Per default the current state of the * widget is returned as pixmap. */ - virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0); + virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr); signals: void roleEditingCanceled(int index, const QByteArray& role, const QVariant& value); diff --git a/src/kitemviews/kitemmodelbase.cpp b/src/kitemviews/kitemmodelbase.cpp index d73468336b..983b469608 100644 --- a/src/kitemviews/kitemmodelbase.cpp +++ b/src/kitemviews/kitemmodelbase.cpp @@ -126,7 +126,7 @@ int KItemModelBase::expandedParentsCount(int index) const QMimeData* KItemModelBase::createMimeData(const KItemSet& indexes) const { Q_UNUSED(indexes); - return 0; + return nullptr; } int KItemModelBase::indexForKeyboardSearch(const QString& text, int startFromIndex) const diff --git a/src/kitemviews/kitemmodelbase.h b/src/kitemviews/kitemmodelbase.h index d604f423f4..0aa6d187f4 100644 --- a/src/kitemviews/kitemmodelbase.h +++ b/src/kitemviews/kitemmodelbase.h @@ -55,8 +55,8 @@ class DOLPHIN_EXPORT KItemModelBase : public QObject Q_OBJECT public: - KItemModelBase(QObject* parent = 0); - explicit KItemModelBase(const QByteArray& sortRole, QObject* parent = 0); + KItemModelBase(QObject* parent = nullptr); + explicit KItemModelBase(const QByteArray& sortRole, QObject* parent = nullptr); ~KItemModelBase() override; /** @return The number of items. */ diff --git a/src/kitemviews/kstandarditem.cpp b/src/kitemviews/kstandarditem.cpp index f3fd258f93..d4d1fa2f91 100644 --- a/src/kitemviews/kstandarditem.cpp +++ b/src/kitemviews/kstandarditem.cpp @@ -25,7 +25,7 @@ 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); diff --git a/src/kitemviews/kstandarditem.h b/src/kitemviews/kstandarditem.h index 5bb2bb36f7..fec197c06f 100644 --- a/src/kitemviews/kstandarditem.h +++ b/src/kitemviews/kstandarditem.h @@ -40,9 +40,9 @@ class DOLPHIN_EXPORT KStandardItem { public: - explicit KStandardItem(KStandardItem* parent = 0); - explicit KStandardItem(const QString& text, KStandardItem* parent = 0); - KStandardItem(const QString& icon, const QString& text, KStandardItem* parent = 0); + explicit KStandardItem(KStandardItem* parent = nullptr); + explicit KStandardItem(const QString& text, KStandardItem* parent = nullptr); + KStandardItem(const QString& icon, const QString& text, KStandardItem* parent = nullptr); KStandardItem(const KStandardItem& item); virtual ~KStandardItem(); diff --git a/src/kitemviews/kstandarditemlistgroupheader.h b/src/kitemviews/kstandarditemlistgroupheader.h index 1d9989cdf6..36ab777221 100644 --- a/src/kitemviews/kstandarditemlistgroupheader.h +++ b/src/kitemviews/kstandarditemlistgroupheader.h @@ -32,10 +32,10 @@ class DOLPHIN_EXPORT KStandardItemListGroupHeader : public KItemListGroupHeader Q_OBJECT public: - KStandardItemListGroupHeader(QGraphicsWidget* parent = 0); + KStandardItemListGroupHeader(QGraphicsWidget* parent = nullptr); ~KStandardItemListGroupHeader() override; - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; protected: void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) override; diff --git a/src/kitemviews/kstandarditemlistview.h b/src/kitemviews/kstandarditemlistview.h index d22a51b34b..6321a1d2e6 100644 --- a/src/kitemviews/kstandarditemlistview.h +++ b/src/kitemviews/kstandarditemlistview.h @@ -52,7 +52,7 @@ public: DetailsLayout }; - KStandardItemListView(QGraphicsWidget* parent = 0); + KStandardItemListView(QGraphicsWidget* parent = nullptr); ~KStandardItemListView() override; void setItemLayout(ItemLayout layout); diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 7d94a59f51..d9e175987a 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -273,8 +273,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor m_additionalInfoTextColor(), m_overlay(), m_rating(), - m_roleEditor(0), - m_oldRoleEditor(0) + m_roleEditor(nullptr), + m_oldRoleEditor(nullptr) { } @@ -770,7 +770,7 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const } m_oldRoleEditor = m_roleEditor; m_roleEditor->hide(); - m_roleEditor = 0; + m_roleEditor = nullptr; } return; } @@ -1452,7 +1452,7 @@ void KStandardItemListWidget::closeRoleEditor() } m_oldRoleEditor = m_roleEditor; m_roleEditor->hide(); - m_roleEditor = 0; + m_roleEditor = nullptr; } QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size, QIcon::Mode mode) diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h index bd4b529231..b13c303bc1 100644 --- a/src/kitemviews/kstandarditemlistwidget.h +++ b/src/kitemviews/kstandarditemlistwidget.h @@ -104,7 +104,7 @@ public: void setSupportsItemExpanding(bool supportsItemExpanding); bool supportsItemExpanding() const; - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; QRectF iconRect() const override; QRectF textRect() const override; @@ -112,7 +112,7 @@ public: QRectF selectionRect() const override; QRectF expansionToggleRect() const override; QRectF selectionToggleRect() const override; - QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; + QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; static KItemListWidgetInformant* createInformant(); diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp index 25288e50f1..0779614c3e 100644 --- a/src/kitemviews/kstandarditemmodel.cpp +++ b/src/kitemviews/kstandarditemmodel.cpp @@ -89,7 +89,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 +114,7 @@ void KStandardItemModel::removeItem(int index) onItemRemoved(index, item); delete item; - item = 0; + item = nullptr; emit itemsRemoved(KItemRangeList() << KItemRange(index, 1)); @@ -134,7 +134,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]; } @@ -178,7 +178,7 @@ bool KStandardItemModel::setData(int index, const QHash& v QMimeData* KStandardItemModel::createMimeData(const KItemSet& indexes) const { Q_UNUSED(indexes); - return 0; + return nullptr; } int KStandardItemModel::indexForKeyboardSearch(const QString& text, int startFromIndex) const diff --git a/src/kitemviews/kstandarditemmodel.h b/src/kitemviews/kstandarditemmodel.h index 6e63daa81a..288b5b84f7 100644 --- a/src/kitemviews/kstandarditemmodel.h +++ b/src/kitemviews/kstandarditemmodel.h @@ -40,7 +40,7 @@ class DOLPHIN_EXPORT KStandardItemModel : public KItemModelBase Q_OBJECT public: - explicit KStandardItemModel(QObject* parent = 0); + explicit KStandardItemModel(QObject* parent = nullptr); ~KStandardItemModel() override; /** diff --git a/src/kitemviews/private/kdirectorycontentscounter.cpp b/src/kitemviews/private/kdirectorycontentscounter.cpp index af7312ad27..90716173c5 100644 --- a/src/kitemviews/private/kdirectorycontentscounter.cpp +++ b/src/kitemviews/private/kdirectorycontentscounter.cpp @@ -30,9 +30,9 @@ KDirectoryContentsCounter::KDirectoryContentsCounter(KFileItemModel* model, QObj QObject(parent), m_model(model), m_queue(), - m_worker(0), + m_worker(nullptr), m_workerIsBusy(false), - m_dirWatcher(0), + m_dirWatcher(nullptr), m_watchedDirs() { connect(m_model, &KFileItemModel::itemsRemoved, @@ -70,7 +70,7 @@ KDirectoryContentsCounter::~KDirectoryContentsCounter() m_workerThread->quit(); m_workerThread->wait(); delete m_workerThread; - m_workerThread = 0; + m_workerThread = nullptr; // The worker thread has finished running now, so it's safe to delete // m_worker. deleteLater() would not work at all because the event loop @@ -180,5 +180,5 @@ void KDirectoryContentsCounter::startWorker(const QString& path) } } -QThread* KDirectoryContentsCounter::m_workerThread = 0; +QThread* KDirectoryContentsCounter::m_workerThread = nullptr; int KDirectoryContentsCounter::m_workersCount = 0; diff --git a/src/kitemviews/private/kdirectorycontentscounter.h b/src/kitemviews/private/kdirectorycontentscounter.h index 13726fae7a..977765ab72 100644 --- a/src/kitemviews/private/kdirectorycontentscounter.h +++ b/src/kitemviews/private/kdirectorycontentscounter.h @@ -35,7 +35,7 @@ class KDirectoryContentsCounter : public QObject Q_OBJECT public: - explicit KDirectoryContentsCounter(KFileItemModel* model, QObject* parent = 0); + explicit KDirectoryContentsCounter(KFileItemModel* model, QObject* parent = nullptr); ~KDirectoryContentsCounter() override; /** diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.cpp b/src/kitemviews/private/kdirectorycontentscounterworker.cpp index 47fbb5dd51..79e134724b 100644 --- a/src/kitemviews/private/kdirectorycontentscounterworker.cpp +++ b/src/kitemviews/private/kdirectorycontentscounterworker.cpp @@ -59,7 +59,7 @@ int KDirectoryContentsCounterWorker::subItemsCount(const QString& path, Options DIR* dir = ::opendir(QFile::encodeName(path)); if (dir) { // krazy:exclude=syscalls count = 0; - struct dirent *dirEntry = 0; + struct dirent *dirEntry = nullptr; while ((dirEntry = ::readdir(dir))) { if (dirEntry->d_name[0] == '.') { if (dirEntry->d_name[1] == '\0' || !countHiddenFiles) { diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.h b/src/kitemviews/private/kdirectorycontentscounterworker.h index b2e31ef0f8..2460a0e1ff 100644 --- a/src/kitemviews/private/kdirectorycontentscounterworker.h +++ b/src/kitemviews/private/kdirectorycontentscounterworker.h @@ -37,7 +37,7 @@ public: }; Q_DECLARE_FLAGS(Options, Option) - explicit KDirectoryContentsCounterWorker(QObject* parent = 0); + explicit KDirectoryContentsCounterWorker(QObject* parent = nullptr); /** * Counts the items inside the directory \a path using the options diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp index d27869dffd..31e6c61986 100644 --- a/src/kitemviews/private/kfileitemclipboard.cpp +++ b/src/kitemviews/private/kfileitemclipboard.cpp @@ -74,7 +74,7 @@ void KFileItemClipboard::updateCutItems() } KFileItemClipboard::KFileItemClipboard() : - QObject(0), + QObject(nullptr), m_cutItems() { updateCutItems(); diff --git a/src/kitemviews/private/kfileitemmodeldirlister.cpp b/src/kitemviews/private/kfileitemmodeldirlister.cpp index 778625573a..eeeba11b26 100644 --- a/src/kitemviews/private/kfileitemmodeldirlister.cpp +++ b/src/kitemviews/private/kfileitemmodeldirlister.cpp @@ -24,7 +24,7 @@ KFileItemModelDirLister::KFileItemModelDirLister(QObject* parent) : KDirLister(parent) { - setAutoErrorHandlingEnabled(false, 0); + setAutoErrorHandlingEnabled(false, nullptr); } KFileItemModelDirLister::~KFileItemModelDirLister() diff --git a/src/kitemviews/private/kfileitemmodeldirlister.h b/src/kitemviews/private/kfileitemmodeldirlister.h index ca5f76de6a..c8b670f713 100644 --- a/src/kitemviews/private/kfileitemmodeldirlister.h +++ b/src/kitemviews/private/kfileitemmodeldirlister.h @@ -34,7 +34,7 @@ class DOLPHIN_EXPORT KFileItemModelDirLister : public KDirLister Q_OBJECT public: - KFileItemModelDirLister(QObject* parent = 0); + KFileItemModelDirLister(QObject* parent = nullptr); ~KFileItemModelDirLister() override; signals: diff --git a/src/kitemviews/private/kfileitemmodelfilter.cpp b/src/kitemviews/private/kfileitemmodelfilter.cpp index 6c6f94ffab..a388a242c8 100644 --- a/src/kitemviews/private/kfileitemmodelfilter.cpp +++ b/src/kitemviews/private/kfileitemmodelfilter.cpp @@ -26,7 +26,7 @@ KFileItemModelFilter::KFileItemModelFilter() : m_useRegExp(false), - m_regExp(0), + m_regExp(nullptr), m_lowerCasePattern(), m_pattern() { @@ -35,7 +35,7 @@ KFileItemModelFilter::KFileItemModelFilter() : KFileItemModelFilter::~KFileItemModelFilter() { delete m_regExp; - m_regExp = 0; + m_regExp = nullptr; } void KFileItemModelFilter::setPattern(const QString& filter) diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp index cc11e19da3..4092ec523e 100644 --- a/src/kitemviews/private/kitemlistheaderwidget.cpp +++ b/src/kitemviews/private/kitemlistheaderwidget.cpp @@ -30,7 +30,7 @@ KItemListHeaderWidget::KItemListHeaderWidget(QGraphicsWidget* parent) : QGraphicsWidget(parent), m_automaticColumnResizing(true), - m_model(0), + m_model(nullptr), m_offset(0), m_columns(), m_columnWidths(), diff --git a/src/kitemviews/private/kitemlistheaderwidget.h b/src/kitemviews/private/kitemlistheaderwidget.h index 8248fb7bb0..6d0974f979 100644 --- a/src/kitemviews/private/kitemlistheaderwidget.h +++ b/src/kitemviews/private/kitemlistheaderwidget.h @@ -38,7 +38,7 @@ class DOLPHIN_EXPORT KItemListHeaderWidget : public QGraphicsWidget Q_OBJECT public: - KItemListHeaderWidget(QGraphicsWidget* parent = 0); + KItemListHeaderWidget(QGraphicsWidget* parent = nullptr); ~KItemListHeaderWidget() override; void setModel(KItemModelBase* model); @@ -64,7 +64,7 @@ public: qreal minimumColumnWidth() const; - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; signals: /** @@ -121,7 +121,7 @@ private: const QByteArray& role, const QRectF& rect, int orderIndex, - QWidget* widget = 0) const; + QWidget* widget = nullptr) const; void updatePressedRoleIndex(const QPointF& pos); void updateHoveredRoleIndex(const QPointF& pos); diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h index be1d96c74d..02dedefca0 100644 --- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h +++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h @@ -41,7 +41,7 @@ class DOLPHIN_EXPORT KItemListKeyboardSearchManager : public QObject public: - KItemListKeyboardSearchManager(QObject* parent = 0); + KItemListKeyboardSearchManager(QObject* parent = nullptr); ~KItemListKeyboardSearchManager() override; /** diff --git a/src/kitemviews/private/kitemlistrubberband.h b/src/kitemviews/private/kitemlistrubberband.h index fa7401c9ee..eaef591733 100644 --- a/src/kitemviews/private/kitemlistrubberband.h +++ b/src/kitemviews/private/kitemlistrubberband.h @@ -32,7 +32,7 @@ class DOLPHIN_EXPORT KItemListRubberBand : public QObject Q_OBJECT public: - explicit KItemListRubberBand(QObject* parent = 0); + explicit KItemListRubberBand(QObject* parent = nullptr); ~KItemListRubberBand() override; void setStartPosition(const QPointF& pos); diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp index 9031c870f8..25f97ee020 100644 --- a/src/kitemviews/private/kitemlistselectiontoggle.cpp +++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp @@ -24,7 +24,7 @@ KItemListSelectionToggle::KItemListSelectionToggle(QGraphicsItem* parent) : - QGraphicsWidget(parent, 0), + QGraphicsWidget(parent, nullptr), m_checked(false), m_hovered(false) { diff --git a/src/kitemviews/private/kitemlistselectiontoggle.h b/src/kitemviews/private/kitemlistselectiontoggle.h index 7c283fb54d..a10995372e 100644 --- a/src/kitemviews/private/kitemlistselectiontoggle.h +++ b/src/kitemviews/private/kitemlistselectiontoggle.h @@ -42,7 +42,7 @@ public: void setHovered(bool hovered); - void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = nullptr) override; protected: void resizeEvent(QGraphicsSceneResizeEvent* event) override; diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp index 6bfdba4c9a..17eac3b39a 100644 --- a/src/kitemviews/private/kitemlistsmoothscroller.cpp +++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp @@ -32,7 +32,7 @@ KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar* scrollBar, m_scrollBarPressed(false), m_smoothScrolling(true), m_scrollBar(scrollBar), - m_animation(0) + m_animation(nullptr) { m_animation = new QPropertyAnimation(this); const int duration = m_scrollBar->style()->styleHint(QStyle::SH_Widget_Animate, nullptr, m_scrollBar) ? 100 : 1; diff --git a/src/kitemviews/private/kitemlistsmoothscroller.h b/src/kitemviews/private/kitemlistsmoothscroller.h index 6dccde9a20..a5aca82e62 100644 --- a/src/kitemviews/private/kitemlistsmoothscroller.h +++ b/src/kitemviews/private/kitemlistsmoothscroller.h @@ -39,7 +39,7 @@ class DOLPHIN_EXPORT KItemListSmoothScroller : public QObject public: explicit KItemListSmoothScroller(QScrollBar* scrollBar, - QObject* parent = 0); + QObject* parent = nullptr); ~KItemListSmoothScroller() override; void setScrollBar(QScrollBar* scrollBar); diff --git a/src/kitemviews/private/kitemlistviewanimation.cpp b/src/kitemviews/private/kitemlistviewanimation.cpp index 67ad192c6e..89b3452108 100644 --- a/src/kitemviews/private/kitemlistviewanimation.cpp +++ b/src/kitemviews/private/kitemlistviewanimation.cpp @@ -116,7 +116,7 @@ void KItemListViewAnimation::start(QGraphicsWidget* widget, AnimationType type, { stop(widget, type); - QPropertyAnimation* propertyAnim = 0; + QPropertyAnimation* propertyAnim = nullptr; const int animationDuration = widget->style()->styleHint(QStyle::SH_Widget_Animate) ? 200 : 1; switch (type) { diff --git a/src/kitemviews/private/kitemlistviewanimation.h b/src/kitemviews/private/kitemlistviewanimation.h index ddcb5e964e..ba3a33dc92 100644 --- a/src/kitemviews/private/kitemlistviewanimation.h +++ b/src/kitemviews/private/kitemlistviewanimation.h @@ -48,7 +48,7 @@ public: ResizeAnimation }; - KItemListViewAnimation(QObject* parent = 0); + KItemListViewAnimation(QObject* parent = nullptr); ~KItemListViewAnimation() override; void setScrollOrientation(Qt::Orientation orientation); diff --git a/src/kitemviews/private/kitemlistviewlayouter.cpp b/src/kitemviews/private/kitemlistviewlayouter.cpp index d544579085..ca39426446 100644 --- a/src/kitemviews/private/kitemlistviewlayouter.cpp +++ b/src/kitemviews/private/kitemlistviewlayouter.cpp @@ -35,7 +35,7 @@ KItemListViewLayouter::KItemListViewLayouter(KItemListSizeHintResolver* sizeHint m_itemSize(128, 128), m_itemMargin(), m_headerHeight(0), - m_model(0), + m_model(nullptr), m_sizeHintResolver(sizeHintResolver), m_scrollOffset(0), m_maximumScrollOffset(0), diff --git a/src/kitemviews/private/kitemlistviewlayouter.h b/src/kitemviews/private/kitemlistviewlayouter.h index 84bbfff585..2116f8405c 100644 --- a/src/kitemviews/private/kitemlistviewlayouter.h +++ b/src/kitemviews/private/kitemlistviewlayouter.h @@ -50,7 +50,7 @@ class DOLPHIN_EXPORT KItemListViewLayouter : public QObject Q_OBJECT public: - KItemListViewLayouter(KItemListSizeHintResolver* sizeHintResolver, QObject* parent = 0); + KItemListViewLayouter(KItemListSizeHintResolver* sizeHintResolver, QObject* parent = nullptr); ~KItemListViewLayouter() override; void setScrollOrientation(Qt::Orientation orientation); diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h index f471d545fa..8ca9ef6feb 100644 --- a/src/panels/information/filemetadataconfigurationdialog.h +++ b/src/panels/information/filemetadataconfigurationdialog.h @@ -43,7 +43,7 @@ class FileMetaDataConfigurationDialog : public QDialog Q_OBJECT public: - explicit FileMetaDataConfigurationDialog(QWidget* parent = 0); + explicit FileMetaDataConfigurationDialog(QWidget* parent = nullptr); ~FileMetaDataConfigurationDialog() override; /** diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp index 850d94d922..ac987c9b44 100644 --- a/src/panels/information/informationpanel.cpp +++ b/src/panels/information/informationpanel.cpp @@ -198,7 +198,7 @@ void InformationPanel::showItemInfo() void InformationPanel::slotFolderStatFinished(KJob* job) { - m_folderStatJob = 0; + m_folderStatJob = nullptr; const KIO::UDSEntry entry = static_cast(job)->statResult(); m_content->showItem(KFileItem(entry, m_shownUrl)); } @@ -296,7 +296,7 @@ void InformationPanel::slotLeftDirectory(const QString& directory) void InformationPanel::cancelRequest() { delete m_folderStatJob; - m_folderStatJob = 0; + m_folderStatJob = nullptr; m_infoTimer->stop(); m_resetUrlTimer->stop(); diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index fa4868e52b..c1f5473806 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -65,14 +65,14 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) : QWidget(parent), m_item(), - m_previewJob(0), - m_outdatedPreviewTimer(0), - m_preview(0), - m_phononWidget(0), - m_nameLabel(0), - m_metaDataWidget(0), - m_metaDataArea(0), - m_placesItemModel(0) + m_previewJob(nullptr), + m_outdatedPreviewTimer(nullptr), + m_preview(nullptr), + m_phononWidget(nullptr), + m_nameLabel(nullptr), + m_metaDataWidget(nullptr), + m_metaDataArea(nullptr), + m_placesItemModel(nullptr) { parent->installEventFilter(this); diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h index 925e89a2b4..8b143af1d6 100644 --- a/src/panels/information/informationpanelcontent.h +++ b/src/panels/information/informationpanelcontent.h @@ -57,7 +57,7 @@ class InformationPanelContent : public QWidget Q_OBJECT public: - explicit InformationPanelContent(QWidget* parent = 0); + explicit InformationPanelContent(QWidget* parent = nullptr); ~InformationPanelContent() override; /** diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h index 9402391447..947f0cdac2 100644 --- a/src/panels/information/phononwidget.h +++ b/src/panels/information/phononwidget.h @@ -43,7 +43,7 @@ class PhononWidget : public QWidget { Q_OBJECT public: - PhononWidget(QWidget *parent = 0); + PhononWidget(QWidget *parent = nullptr); void setUrl(const QUrl &url); QUrl url() const; diff --git a/src/panels/panel.h b/src/panels/panel.h index f706c3b827..84d73e74c0 100644 --- a/src/panels/panel.h +++ b/src/panels/panel.h @@ -35,7 +35,7 @@ class Panel : public QWidget Q_OBJECT public: - explicit Panel(QWidget* parent = 0); + explicit Panel(QWidget* parent = nullptr); ~Panel() override; /** Returns the current set URL of the active Dolphin view. */ diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index 93cc4d5c3d..297cf95d6a 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(&KDirLister::completed), m_signalHandler.data(), &PlacesItemSignalHandler::onTrashDirListerCompleted); diff --git a/src/panels/places/placesitem.h b/src/panels/places/placesitem.h index 7d1ab610a9..b7cd8e79f5 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 ffcac4c8f7..4a56ce9085 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 5f61eede26..73104a1b6c 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 f3cdaa6a6b..4408aa9ef8 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 680d513b5c..371bcb892b 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()) { - 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() && device.as()->isAccessible(); if (!providesTearDown) { - return 0; + return nullptr; } Solid::StorageDrive* drive = device.as(); @@ -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 9c91f7b082..3b9307fe6d 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 0b76f18d3b..9888290d9f 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) diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp index b7d3605aa5..c205374cdc 100644 --- a/src/panels/terminal/terminalpanel.cpp +++ b/src/panels/terminal/terminalpanel.cpp @@ -38,11 +38,11 @@ TerminalPanel::TerminalPanel(QWidget* parent) : Panel(parent), m_clearTerminal(true), - m_mostLocalUrlJob(0), - m_layout(0), - m_terminal(0), - m_terminalWidget(0), - m_konsolePart(0), + m_mostLocalUrlJob(nullptr), + m_layout(nullptr), + m_terminal(nullptr), + m_terminalWidget(nullptr), + m_konsolePart(nullptr), m_konsolePartCurrentDirectory(), m_sendCdToTerminalHistory() { @@ -69,7 +69,7 @@ QString TerminalPanel::currentWorkingDirectory() void TerminalPanel::terminalExited() { - m_terminal = 0; + m_terminal = nullptr; emit hideTerminalPanel(); } @@ -117,12 +117,12 @@ void TerminalPanel::showEvent(QShowEvent* event) if (!m_terminal) { m_clearTerminal = true; - KPluginFactory* factory = 0; + KPluginFactory* factory = nullptr; KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("konsolepart")); if (service) { factory = KPluginLoader(service->library()).factory(); } - m_konsolePart = factory ? (factory->create(this)) : 0; + m_konsolePart = factory ? (factory->create(this)) : nullptr; if (m_konsolePart) { connect(m_konsolePart, &KParts::ReadOnlyPart::destroyed, this, &TerminalPanel::terminalExited); m_terminalWidget = m_konsolePart->widget(); @@ -144,7 +144,7 @@ void TerminalPanel::showEvent(QShowEvent* event) void TerminalPanel::changeDir(const QUrl& url) { delete m_mostLocalUrlJob; - m_mostLocalUrlJob = 0; + m_mostLocalUrlJob = nullptr; if (url.isLocalFile()) { sendCdToTerminal(url.toLocalFile()); @@ -198,7 +198,7 @@ void TerminalPanel::slotMostLocalUrlResult(KJob* job) sendCdToTerminal(url.toLocalFile()); } - m_mostLocalUrlJob = 0; + m_mostLocalUrlJob = nullptr; } void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir) diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index 3456920089..60678eb45b 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -53,20 +53,20 @@ DolphinSearchBox::DolphinSearchBox(QWidget* parent) : QWidget(parent), m_startedSearching(false), m_active(true), - m_topLayout(0), - m_searchLabel(0), - m_searchInput(0), - m_saveSearchAction(0), - m_optionsScrollArea(0), - m_fileNameButton(0), - m_contentButton(0), - m_separator(0), - m_fromHereButton(0), - m_everywhereButton(0), - m_facetsToggleButton(0), - m_facetsWidget(0), + m_topLayout(nullptr), + m_searchLabel(nullptr), + m_searchInput(nullptr), + m_saveSearchAction(nullptr), + m_optionsScrollArea(nullptr), + m_fileNameButton(nullptr), + m_contentButton(nullptr), + m_separator(nullptr), + m_fromHereButton(nullptr), + m_everywhereButton(nullptr), + m_facetsToggleButton(nullptr), + m_facetsWidget(nullptr), m_searchPath(), - m_startSearchTimer(0) + m_startSearchTimer(nullptr) { } diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h index 781c592e16..c138cfe7f3 100644 --- a/src/search/dolphinsearchbox.h +++ b/src/search/dolphinsearchbox.h @@ -46,7 +46,7 @@ class DolphinSearchBox : public QWidget { Q_OBJECT public: - explicit DolphinSearchBox(QWidget* parent = 0); + explicit DolphinSearchBox(QWidget* parent = nullptr); ~DolphinSearchBox() override; /** diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp index 4589b5d447..3eacd522ff 100644 --- a/src/settings/additionalinfodialog.cpp +++ b/src/settings/additionalinfodialog.cpp @@ -41,7 +41,7 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent, const QList& visibleRoles) : QDialog(parent), m_visibleRoles(visibleRoles), - m_listWidget(0) + m_listWidget(nullptr) { setWindowTitle(i18nc("@title:window", "Additional Information")); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp index 5919667599..59f8c8eee6 100644 --- a/src/settings/applyviewpropsjob.cpp +++ b/src/settings/applyviewpropsjob.cpp @@ -26,7 +26,7 @@ ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir, const ViewProperties& viewProps) : KIO::Job(), - m_viewProps(0), + m_viewProps(nullptr), m_progress(0), m_dir(dir) { @@ -46,7 +46,7 @@ ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir, ApplyViewPropsJob::~ApplyViewPropsJob() { delete m_viewProps; // the properties are written by the destructor - m_viewProps = 0; + m_viewProps = nullptr; } void ApplyViewPropsJob::slotEntries(KIO::Job*, const KIO::UDSEntryList& list) diff --git a/src/settings/dolphinsettingsdialog.h b/src/settings/dolphinsettingsdialog.h index ca35b0aad3..4c8768fde5 100644 --- a/src/settings/dolphinsettingsdialog.h +++ b/src/settings/dolphinsettingsdialog.h @@ -36,7 +36,7 @@ class DolphinSettingsDialog : public KPageDialog Q_OBJECT public: - explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = 0); + explicit DolphinSettingsDialog(const QUrl& url, QWidget* parent = nullptr); ~DolphinSettingsDialog() override; signals: diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index 2419dc0f43..90dd0ad37a 100644 --- a/src/settings/general/confirmationssettingspage.cpp +++ b/src/settings/general/confirmationssettingspage.cpp @@ -35,9 +35,9 @@ namespace { ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) : SettingsPageBase(parent), - m_confirmMoveToTrash(0), - m_confirmDelete(0), - m_confirmClosingMultipleTabs(0) + m_confirmMoveToTrash(nullptr), + m_confirmDelete(nullptr), + m_confirmClosingMultipleTabs(nullptr) { QVBoxLayout* topLayout = new QVBoxLayout(this); diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp index d8f61ef90b..f9a2c67d0b 100644 --- a/src/settings/general/generalsettingspage.cpp +++ b/src/settings/general/generalsettingspage.cpp @@ -65,7 +65,7 @@ GeneralSettingsPage::GeneralSettingsPage(const QUrl& url, QWidget* parent) : m_pages.append(confirmationsPage); m_pages.append(statusBarPage); - topLayout->addWidget(tabWidget, 0, 0); + topLayout->addWidget(tabWidget, 0, nullptr); } GeneralSettingsPage::~GeneralSettingsPage() diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp index b88977af51..e579a572d0 100644 --- a/src/settings/general/previewssettingspage.cpp +++ b/src/settings/general/previewssettingspage.cpp @@ -52,9 +52,9 @@ namespace { PreviewsSettingsPage::PreviewsSettingsPage(QWidget* parent) : SettingsPageBase(parent), m_initialized(false), - m_listView(0), + m_listView(nullptr), m_enabledPreviewPlugins(), - m_remoteFileSizeBox(0) + m_remoteFileSizeBox(nullptr) { QVBoxLayout* topLayout = new QVBoxLayout(this); diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index f5ac4cd556..3aedf50750 100644 --- a/src/settings/kcm/kcmdolphingeneral.cpp +++ b/src/settings/kcm/kcmdolphingeneral.cpp @@ -65,7 +65,7 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV m_pages.append(previewsPage); m_pages.append(confirmationsPage); - topLayout->addWidget(tabWidget, 0, 0); + topLayout->addWidget(tabWidget, 0, nullptr); } DolphinGeneralConfigModule::~DolphinGeneralConfigModule() diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp index 9ec6ca166a..54cf7ed3c0 100644 --- a/src/settings/kcm/kcmdolphinnavigation.cpp +++ b/src/settings/kcm/kcmdolphinnavigation.cpp @@ -30,7 +30,7 @@ K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin(&DolphinNavigationConfigModule::changed)); - topLayout->addWidget(m_navigation, 0, 0); + topLayout->addWidget(m_navigation, 0, nullptr); } DolphinNavigationConfigModule::~DolphinNavigationConfigModule() diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp index 39136724ed..5d011c6273 100644 --- a/src/settings/kcm/kcmdolphinservices.cpp +++ b/src/settings/kcm/kcmdolphinservices.cpp @@ -30,7 +30,7 @@ K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin(&DolphinServicesConfigModule::changed)); - topLayout->addWidget(m_services, 0, 0); + topLayout->addWidget(m_services, 0, nullptr); } DolphinServicesConfigModule::~DolphinServicesConfigModule() diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp index 710ebc70b6..af9b49026b 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.cpp +++ b/src/settings/kcm/kcmdolphinviewmodes.cpp @@ -66,7 +66,7 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget* parent, cons m_tabs.append(compactTab); m_tabs.append(detailsTab); - topLayout->addWidget(tabWidget, 0, 0); + topLayout->addWidget(tabWidget, 0, nullptr); } DolphinViewModesConfigModule::~DolphinViewModesConfigModule() diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp index e37a35d8eb..82015480a8 100644 --- a/src/settings/navigation/navigationsettingspage.cpp +++ b/src/settings/navigation/navigationsettingspage.cpp @@ -28,8 +28,8 @@ NavigationSettingsPage::NavigationSettingsPage(QWidget* parent) : SettingsPageBase(parent), - m_openArchivesAsFolder(0), - m_autoExpandFolders(0) + m_openArchivesAsFolder(nullptr), + m_autoExpandFolders(nullptr) { QVBoxLayout* topLayout = new QVBoxLayout(this); QWidget* vBox = new QWidget(this); diff --git a/src/settings/serviceitemdelegate.h b/src/settings/serviceitemdelegate.h index 27fb15c203..7b0d216db7 100644 --- a/src/settings/serviceitemdelegate.h +++ b/src/settings/serviceitemdelegate.h @@ -33,7 +33,7 @@ class ServiceItemDelegate : public KWidgetItemDelegate Q_OBJECT public: - explicit ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent = 0); + explicit ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent = nullptr); ~ServiceItemDelegate() override; QSize sizeHint(const QStyleOptionViewItem &option, diff --git a/src/settings/servicemodel.h b/src/settings/servicemodel.h index 47fe54d6a5..a08844b822 100644 --- a/src/settings/servicemodel.h +++ b/src/settings/servicemodel.h @@ -44,7 +44,7 @@ public: ConfigurableRole }; - explicit ServiceModel(QObject* parent = 0); + explicit ServiceModel(QObject* parent = nullptr); ~ServiceModel() override; bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) override; diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp index 2b9b8f46fb..a0d9effc8d 100644 --- a/src/settings/services/servicessettingspage.cpp +++ b/src/settings/services/servicessettingspage.cpp @@ -58,9 +58,9 @@ namespace ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) : SettingsPageBase(parent), m_initialized(false), - m_serviceModel(0), - m_sortModel(0), - m_listView(0), + m_serviceModel(nullptr), + m_sortModel(nullptr), + m_listView(nullptr), m_enabledVcsPlugins() { QVBoxLayout* topLayout = new QVBoxLayout(this); diff --git a/src/settings/settingspagebase.h b/src/settings/settingspagebase.h index 5e50a8df0c..2bc1dfaaa8 100644 --- a/src/settings/settingspagebase.h +++ b/src/settings/settingspagebase.h @@ -31,7 +31,7 @@ class SettingsPageBase : public QWidget Q_OBJECT public: - explicit SettingsPageBase(QWidget* parent = 0); + explicit SettingsPageBase(QWidget* parent = nullptr); ~SettingsPageBase() override; /** diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp index b9c5d97cf8..c185fc55dc 100644 --- a/src/settings/viewmodes/dolphinfontrequester.cpp +++ b/src/settings/viewmodes/dolphinfontrequester.cpp @@ -29,8 +29,8 @@ DolphinFontRequester::DolphinFontRequester(QWidget* parent) : QWidget(parent), - m_modeCombo(0), - m_chooseFontButton(0), + m_modeCombo(nullptr), + m_chooseFontButton(nullptr), m_mode(SystemFont), m_customFont() { diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp index 3ed57715a5..ab87201e29 100644 --- a/src/settings/viewmodes/viewsettingspage.cpp +++ b/src/settings/viewmodes/viewsettingspage.cpp @@ -56,7 +56,7 @@ ViewSettingsPage::ViewSettingsPage(QWidget* parent) : m_tabs.append(compactTab); m_tabs.append(detailsTab); - topLayout->addWidget(tabWidget, 0, 0); + topLayout->addWidget(tabWidget, 0, nullptr); } ViewSettingsPage::~ViewSettingsPage() diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index a673769ade..bfa3aa16ef 100644 --- a/src/settings/viewmodes/viewsettingstab.cpp +++ b/src/settings/viewmodes/viewsettingstab.cpp @@ -40,12 +40,12 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) : QWidget(parent), m_mode(mode), - m_defaultSizeSlider(0), - m_previewSizeSlider(0), - m_fontRequester(0), - m_widthBox(0), - m_maxLinesBox(0), - m_expandableFolders(0) + m_defaultSizeSlider(nullptr), + m_previewSizeSlider(nullptr), + m_fontRequester(nullptr), + m_widthBox(nullptr), + m_maxLinesBox(nullptr), + m_expandableFolders(nullptr) { QVBoxLayout* topLayout = new QVBoxLayout(this); @@ -202,7 +202,7 @@ void ViewSettingsTab::applySettings() void ViewSettingsTab::restoreDefaultSettings() { - KConfigSkeleton* settings = 0; + KConfigSkeleton* settings = nullptr; switch (m_mode) { case IconsMode: settings = IconsModeSettings::self(); break; case CompactMode: settings = CompactModeSettings::self(); break; diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h index 4f4071c1a4..8b1ffc428d 100644 --- a/src/settings/viewmodes/viewsettingstab.h +++ b/src/settings/viewmodes/viewsettingstab.h @@ -43,7 +43,7 @@ public: DetailsMode }; - explicit ViewSettingsTab(Mode mode, QWidget* parent = 0); + explicit ViewSettingsTab(Mode mode, QWidget* parent = nullptr); ~ViewSettingsTab() override; void applySettings(); diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index c317ed052e..980ab0bba4 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -52,19 +52,19 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : QDialog(dolphinView), m_isDirty(false), m_dolphinView(dolphinView), - m_viewProps(0), - m_viewMode(0), - m_sortOrder(0), - m_sorting(0), - m_sortFoldersFirst(0), - m_previewsShown(0), - m_showInGroups(0), - m_showHiddenFiles(0), - m_additionalInfo(0), - m_applyToCurrentFolder(0), - m_applyToSubFolders(0), - m_applyToAllFolders(0), - m_useAsDefault(0) + m_viewProps(nullptr), + m_viewMode(nullptr), + m_sortOrder(nullptr), + m_sorting(nullptr), + m_sortFoldersFirst(nullptr), + m_previewsShown(nullptr), + m_showInGroups(nullptr), + m_showHiddenFiles(nullptr), + m_additionalInfo(nullptr), + m_applyToCurrentFolder(nullptr), + m_applyToSubFolders(nullptr), + m_applyToAllFolders(nullptr), + m_useAsDefault(nullptr) { Q_ASSERT(dolphinView); const bool useGlobalViewProps = GeneralSettings::globalViewProps(); @@ -217,7 +217,7 @@ ViewPropertiesDialog::~ViewPropertiesDialog() { m_isDirty = false; delete m_viewProps; - m_viewProps = 0; + m_viewProps = nullptr; KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "ViewPropertiesDialog"); KWindowConfig::saveWindowSize(windowHandle(), dialogConfig); diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp index 56fee80279..1878c81372 100644 --- a/src/settings/viewpropsprogressinfo.cpp +++ b/src/settings/viewpropsprogressinfo.cpp @@ -39,12 +39,12 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent, const ViewProperties& viewProps) : QDialog(parent), m_dir(dir), - m_viewProps(0), - m_label(0), - m_progressBar(0), - m_dirSizeJob(0), - m_applyViewPropsJob(0), - m_timer(0) + m_viewProps(nullptr), + m_label(nullptr), + m_progressBar(nullptr), + m_dirSizeJob(nullptr), + m_applyViewPropsJob(nullptr), + m_timer(nullptr) { const QSize minSize = minimumSize(); setMinimumSize(QSize(320, minSize.height())); @@ -96,13 +96,13 @@ ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent, ViewPropsProgressInfo::~ViewPropsProgressInfo() { delete m_viewProps; - m_viewProps = 0; + m_viewProps = nullptr; } void ViewPropsProgressInfo::closeEvent(QCloseEvent* event) { m_timer->stop(); - m_applyViewPropsJob = 0; + m_applyViewPropsJob = nullptr; QDialog::closeEvent(event); } @@ -110,12 +110,12 @@ void ViewPropsProgressInfo::reject() { if (m_dirSizeJob) { m_dirSizeJob->kill(); - m_dirSizeJob = 0; + m_dirSizeJob = nullptr; } if (m_applyViewPropsJob) { m_applyViewPropsJob->kill(); - m_applyViewPropsJob = 0; + m_applyViewPropsJob = nullptr; } QDialog::reject(); @@ -144,7 +144,7 @@ void ViewPropsProgressInfo::applyViewProperties() m_label->setText(i18nc("@info:progress", "Folders: %1", subdirs)); m_progressBar->setMaximum(subdirs); - m_dirSizeJob = 0; + m_dirSizeJob = nullptr; m_applyViewPropsJob = new ApplyViewPropsJob(m_dir, *m_viewProps); connect(m_applyViewPropsJob, &ApplyViewPropsJob::result, diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 31d4ab81a5..9fc559eb75 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -49,14 +49,14 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : QWidget(parent), m_text(), m_defaultText(), - m_label(0), - m_spaceInfo(0), - m_zoomSlider(0), - m_progressBar(0), - m_stopButton(0), + m_label(nullptr), + m_spaceInfo(nullptr), + m_zoomSlider(nullptr), + m_progressBar(nullptr), + m_stopButton(nullptr), m_progress(100), - m_showProgressBarTimer(0), - m_resetToDefaultTextTimer(0), + m_showProgressBarTimer(nullptr), + m_resetToDefaultTextTimer(nullptr), m_textTimestamp() { // Initialize text label diff --git a/src/statusbar/mountpointobserver.h b/src/statusbar/mountpointobserver.h index 939e848667..ea24c4eea6 100644 --- a/src/statusbar/mountpointobserver.h +++ b/src/statusbar/mountpointobserver.h @@ -53,7 +53,7 @@ class MountPointObserver : public QObject { Q_OBJECT - explicit MountPointObserver(const QUrl& url, QObject* parent = 0); + explicit MountPointObserver(const QUrl& url, QObject* parent = nullptr); ~MountPointObserver() override {} public: diff --git a/src/statusbar/mountpointobservercache.cpp b/src/statusbar/mountpointobservercache.cpp index 48796ac5a0..bcdc0b61cd 100644 --- a/src/statusbar/mountpointobservercache.cpp +++ b/src/statusbar/mountpointobservercache.cpp @@ -36,7 +36,7 @@ Q_GLOBAL_STATIC(MountPointObserverCacheSingleton, s_MountPointObserverCache) MountPointObserverCache::MountPointObserverCache() : m_observerForMountPoint(), m_mountPointForObserver(), - m_updateTimer(0) + m_updateTimer(nullptr) { m_updateTimer = new QTimer(this); } diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoobserver.cpp index 0fb018727c..8f45c18f84 100644 --- a/src/statusbar/spaceinfoobserver.cpp +++ b/src/statusbar/spaceinfoobserver.cpp @@ -25,7 +25,7 @@ SpaceInfoObserver::SpaceInfoObserver(const QUrl& url, QObject* parent) : QObject(parent), - m_mountPointObserver(0), + m_mountPointObserver(nullptr), m_dataSize(0), m_dataAvailable(0) { @@ -39,7 +39,7 @@ SpaceInfoObserver::~SpaceInfoObserver() { if (m_mountPointObserver) { m_mountPointObserver->deref(); - m_mountPointObserver = 0; + m_mountPointObserver = nullptr; } } @@ -60,7 +60,7 @@ void SpaceInfoObserver::setUrl(const QUrl& url) if (m_mountPointObserver) { disconnect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged); m_mountPointObserver->deref(); - m_mountPointObserver = 0; + m_mountPointObserver = nullptr; } m_mountPointObserver = newObserver; diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h index 3f203b47ff..144d11fa7f 100644 --- a/src/statusbar/spaceinfoobserver.h +++ b/src/statusbar/spaceinfoobserver.h @@ -32,7 +32,7 @@ class SpaceInfoObserver : public QObject Q_OBJECT public: - explicit SpaceInfoObserver(const QUrl& url, QObject* parent = 0); + explicit SpaceInfoObserver(const QUrl& url, QObject* parent = nullptr); ~SpaceInfoObserver() override; quint64 size() const; diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp index f364fcf5bc..6b6a6d6108 100644 --- a/src/statusbar/statusbarspaceinfo.cpp +++ b/src/statusbar/statusbarspaceinfo.cpp @@ -31,7 +31,7 @@ StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) : KCapacityBar(KCapacityBar::DrawTextInline, parent), - m_observer(0) + m_observer(nullptr) { setCursor(Qt::PointingHandCursor); } diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h index e89966a597..87e9f776b4 100644 --- a/src/statusbar/statusbarspaceinfo.h +++ b/src/statusbar/statusbarspaceinfo.h @@ -40,7 +40,7 @@ class StatusBarSpaceInfo : public KCapacityBar Q_OBJECT public: - explicit StatusBarSpaceInfo(QWidget* parent = 0); + explicit StatusBarSpaceInfo(QWidget* parent = nullptr); ~StatusBarSpaceInfo() override; void setUrl(const QUrl& url); diff --git a/src/tests/kfileitemlistviewtest.cpp b/src/tests/kfileitemlistviewtest.cpp index cac4f7a587..196018045c 100644 --- a/src/tests/kfileitemlistviewtest.cpp +++ b/src/tests/kfileitemlistviewtest.cpp @@ -52,7 +52,7 @@ void KFileItemListViewTest::init() m_model->m_dirLister->setAutoUpdate(false); m_listView = new KFileItemListView(); - m_listView->onModelChanged(m_model, 0); + m_listView->onModelChanged(m_model, nullptr); m_graphicsView = new QGraphicsView(); m_graphicsView->show(); @@ -62,16 +62,16 @@ void KFileItemListViewTest::init() void KFileItemListViewTest::cleanup() { delete m_graphicsView; - m_graphicsView = 0; + m_graphicsView = nullptr; delete m_listView; - m_listView = 0; + m_listView = nullptr; delete m_model; - m_model = 0; + m_model = nullptr; delete m_testDir; - m_testDir = 0; + m_testDir = nullptr; } /** diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp index b8e089530d..471818d98e 100644 --- a/src/tests/kfileitemmodeltest.cpp +++ b/src/tests/kfileitemmodeltest.cpp @@ -126,10 +126,10 @@ void KFileItemModelTest::init() void KFileItemModelTest::cleanup() { delete m_model; - m_model = 0; + m_model = nullptr; delete m_testDir; - m_testDir = 0; + m_testDir = nullptr; } void KFileItemModelTest::testDefaultRoles() diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp index 10bdb8b242..926a781675 100644 --- a/src/tests/kitemlistcontrollertest.cpp +++ b/src/tests/kitemlistcontrollertest.cpp @@ -149,10 +149,10 @@ void KItemListControllerTest::initTestCase() void KItemListControllerTest::cleanupTestCase() { delete m_container; - m_container = 0; + m_container = nullptr; delete m_testDir; - m_testDir = 0; + m_testDir = nullptr; } /** Before each test, the current item, selection, and item size are reset to the defaults. */ diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp index 245f23d64e..daa03ae204 100644 --- a/src/tests/kitemlistselectionmanagertest.cpp +++ b/src/tests/kitemlistselectionmanagertest.cpp @@ -99,10 +99,10 @@ void KItemListSelectionManagerTest::init() void KItemListSelectionManagerTest::cleanup() { delete m_selectionManager; - m_selectionManager = 0; + m_selectionManager = nullptr; delete m_model; - m_model = 0; + m_model = nullptr; } void KItemListSelectionManagerTest::testConstructor() diff --git a/src/tests/kstandarditemmodeltest.cpp b/src/tests/kstandarditemmodeltest.cpp index 889748f35c..daa8f1e56c 100644 --- a/src/tests/kstandarditemmodeltest.cpp +++ b/src/tests/kstandarditemmodeltest.cpp @@ -51,7 +51,7 @@ void KStandardItemModelTest::init() void KStandardItemModelTest::cleanup() { delete m_model; - m_model = 0; + m_model = nullptr; } void KStandardItemModelTest::testNewItems() diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp index 114afdc33c..5193bb35a2 100644 --- a/src/tests/viewpropertiestest.cpp +++ b/src/tests/viewpropertiestest.cpp @@ -56,7 +56,7 @@ void ViewPropertiesTest::init() void ViewPropertiesTest::cleanup() { delete m_testDir; - m_testDir = 0; + m_testDir = nullptr; GeneralSettings::self()->setGlobalViewProps(m_globalViewProps); GeneralSettings::self()->save(); diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h index 7b3f1f8d0a..ff14fbe7c4 100644 --- a/src/views/dolphinitemlistview.h +++ b/src/views/dolphinitemlistview.h @@ -39,7 +39,7 @@ class DOLPHIN_EXPORT DolphinItemListView : public KFileItemListView Q_OBJECT public: - explicit DolphinItemListView(QGraphicsWidget* parent = 0); + explicit DolphinItemListView(QGraphicsWidget* parent = nullptr); ~DolphinItemListView() override; void setZoomLevel(int level); diff --git a/src/views/dolphinnewfilemenuobserver.cpp b/src/views/dolphinnewfilemenuobserver.cpp index 275e1c4fb0..6379adb314 100644 --- a/src/views/dolphinnewfilemenuobserver.cpp +++ b/src/views/dolphinnewfilemenuobserver.cpp @@ -54,7 +54,7 @@ void DolphinNewFileMenuObserver::detach(const DolphinNewFileMenu* menu) } DolphinNewFileMenuObserver::DolphinNewFileMenuObserver() : - QObject(0) + QObject(nullptr) { } diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index cd802eec1c..10382c57d7 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -87,19 +87,19 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) : m_viewPropertiesContext(), m_mode(DolphinView::IconsView), m_visibleRoles(), - m_topLayout(0), - m_model(0), - m_view(0), - m_container(0), - m_toolTipManager(0), - m_selectionChangedTimer(0), + m_topLayout(nullptr), + m_model(nullptr), + m_view(nullptr), + m_container(nullptr), + m_toolTipManager(nullptr), + m_selectionChangedTimer(nullptr), m_currentItemUrl(), m_scrollToCurrentItem(false), m_restoredContentsPosition(), m_selectedUrls(), m_clearSelectionBeforeSelectingNewItems(false), m_markFirstNewlySelectedItemAsCurrent(false), - m_versionControlObserver(0), + m_versionControlObserver(nullptr), m_twoClicksRenamingTimer(nullptr) { m_topLayout = new QVBoxLayout(this); @@ -912,7 +912,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) #endif QString groupName; - QMenu* groupMenu = 0; + QMenu* groupMenu = nullptr; // Add all roles to the menu that can be shown or hidden by the user const QList rolesInfo = KFileItemModel::rolesInformation(); @@ -923,7 +923,7 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos) } const QString text = m_model->roleDescription(info.role); - QAction* action = 0; + QAction* action = nullptr; if (info.group.isEmpty()) { action = menu->addAction(text); } else { @@ -1094,11 +1094,11 @@ void DolphinView::dropUrls(const QUrl &destUrl, QDropEvent *dropEvent, QWidget * void DolphinView::slotModelChanged(KItemModelBase* current, KItemModelBase* previous) { - if (previous != 0) { + if (previous != nullptr) { Q_ASSERT(qobject_cast(previous)); KFileItemModel* fileItemModel = static_cast(previous); disconnect(fileItemModel, &KFileItemModel::directoryLoadingCompleted, this, &DolphinView::slotDirectoryLoadingCompleted); - m_versionControlObserver->setModel(0); + m_versionControlObserver->setModel(nullptr); } if (current) { diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 10aae11ce6..9debd51731 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -49,7 +49,7 @@ DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) : QObject(parent), m_actionCollection(collection), - m_currentView(0), + m_currentView(nullptr), m_sortByActions(), m_visibleRoles() { @@ -62,7 +62,7 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view) Q_ASSERT(view); if (m_currentView) { - disconnect(m_currentView, 0, this, 0); + disconnect(m_currentView, nullptr, this, nullptr); } m_currentView = view; @@ -233,8 +233,8 @@ QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QSt } QString groupName; - KActionMenu* groupMenu = 0; - QActionGroup* groupMenuGroup = 0; + KActionMenu* groupMenu = nullptr; + QActionGroup* groupMenuGroup = nullptr; bool indexingEnabled = false; #ifdef HAVE_BALOO @@ -249,7 +249,7 @@ QActionGroup* DolphinViewActionHandler::createFileItemRolesActionGroup(const QSt continue; } - KToggleAction* action = 0; + KToggleAction* action = nullptr; const QString name = groupPrefix + info.role; if (info.group.isEmpty()) { action = m_actionCollection->add(name); @@ -590,7 +590,7 @@ void DolphinViewActionHandler::slotAdjustViewProperties() void DolphinViewActionHandler::slotProperties() { - KPropertiesDialog* dialog = 0; + KPropertiesDialog* dialog = nullptr; const KFileItemList list = m_currentView->selectedItems(); if (list.isEmpty()) { const QUrl url = m_currentView->url(); diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp index 831a9d43e0..e944227df9 100644 --- a/src/views/draganddrophelper.cpp +++ b/src/views/draganddrophelper.cpp @@ -60,6 +60,6 @@ KIO::DropJob* DragAndDropHelper::dropUrls(const QUrl& destUrl, QDropEvent* event return job; } - return 0; + return nullptr; } diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index 6309bfbdfe..79421a5efa 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -39,10 +39,10 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) : QDialog(parent), m_renameOneItem(false), m_newName(), - m_lineEdit(0), + m_lineEdit(nullptr), m_items(items), m_allExtensionsDifferent(true), - m_spinBox(0) + m_spinBox(nullptr) { const QSize minSize = minimumSize(); setMinimumSize(QSize(320, minSize.height())); @@ -72,7 +72,7 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) : QVBoxLayout* topLayout = new QVBoxLayout(page); - QLabel* editLabel = 0; + QLabel* editLabel = nullptr; if (m_renameOneItem) { m_newName = items.first().name(); editLabel = new QLabel(xi18nc("@label:textbox", "Rename the item %1 to:", m_newName), diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp index 52eeb3b710..cabfc06176 100644 --- a/src/views/tooltips/dolphinfilemetadatawidget.cpp +++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp @@ -41,9 +41,9 @@ DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) : QWidget(parent), - m_preview(0), - m_name(0), - m_fileMetaDataWidget(0) + m_preview(nullptr), + m_name(nullptr), + m_fileMetaDataWidget(nullptr) { // Create widget for file preview m_preview = new QLabel(this); diff --git a/src/views/tooltips/dolphinfilemetadatawidget.h b/src/views/tooltips/dolphinfilemetadatawidget.h index 0b9add581e..6dcc5237c1 100644 --- a/src/views/tooltips/dolphinfilemetadatawidget.h +++ b/src/views/tooltips/dolphinfilemetadatawidget.h @@ -45,7 +45,7 @@ class DolphinFileMetaDataWidget : public QWidget Q_OBJECT public: - DolphinFileMetaDataWidget(QWidget* parent = 0); + DolphinFileMetaDataWidget(QWidget* parent = nullptr); ~DolphinFileMetaDataWidget() override; void setPreview(const QPixmap& pixmap); diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp index 9375172eb4..3d3598ff5f 100644 --- a/src/views/tooltips/tooltipmanager.cpp +++ b/src/views/tooltips/tooltipmanager.cpp @@ -35,10 +35,10 @@ ToolTipManager::ToolTipManager(QWidget* parent) : QObject(parent), - m_showToolTipTimer(0), - m_contentRetrievalTimer(0), - m_transientParent(0), - m_fileMetaDataWidget(0), + m_showToolTipTimer(nullptr), + m_contentRetrievalTimer(nullptr), + m_transientParent(nullptr), + m_fileMetaDataWidget(nullptr), m_toolTipRequested(false), m_metaDataRequested(false), m_appliedWaitCursor(false), diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h index b9b1f0b5b5..a3be381f3f 100644 --- a/src/views/versioncontrol/kversioncontrolplugin.h +++ b/src/views/versioncontrol/kversioncontrolplugin.h @@ -144,7 +144,7 @@ public: MissingVersion }; - KVersionControlPlugin(QObject* parent = 0); + KVersionControlPlugin(QObject* parent = nullptr); ~KVersionControlPlugin() override; /** diff --git a/src/views/versioncontrol/updateitemstatesthread.cpp b/src/views/versioncontrol/updateitemstatesthread.cpp index e4413fabfb..574402dcde 100644 --- a/src/views/versioncontrol/updateitemstatesthread.cpp +++ b/src/views/versioncontrol/updateitemstatesthread.cpp @@ -25,7 +25,7 @@ UpdateItemStatesThread::UpdateItemStatesThread(KVersionControlPlugin* plugin, const QMap >& itemStates) : QThread(), - m_globalPluginMutex(0), + m_globalPluginMutex(nullptr), m_plugin(plugin), m_itemStates(itemStates) { diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index c794408825..44dffac45d 100644 --- a/src/views/versioncontrol/versioncontrolobserver.cpp +++ b/src/views/versioncontrol/versioncontrolobserver.cpp @@ -37,10 +37,10 @@ VersionControlObserver::VersionControlObserver(QObject* parent) : m_pendingItemStatesUpdate(false), m_versionedDirectory(false), m_silentUpdate(false), - m_model(0), - m_dirVerificationTimer(0), - m_plugin(0), - m_updateItemStatesThread(0) + m_model(nullptr), + m_dirVerificationTimer(nullptr), + m_plugin(nullptr), + m_updateItemStatesThread(nullptr) { // The verification timer specifies the timeout until the shown directory // is checked whether it is versioned. Per default it is assumed that users @@ -58,7 +58,7 @@ VersionControlObserver::~VersionControlObserver() { if (m_plugin) { m_plugin->disconnect(this); - m_plugin = 0; + m_plugin = nullptr; } } @@ -163,7 +163,7 @@ void VersionControlObserver::verifyDirectory() void VersionControlObserver::slotThreadFinished() { UpdateItemStatesThread* thread = m_updateItemStatesThread; - m_updateItemStatesThread = 0; // The thread deletes itself automatically (see updateItemStates()) + m_updateItemStatesThread = nullptr; // The thread deletes itself automatically (see updateItemStates()) if (!m_plugin || !thread) { return; @@ -266,7 +266,7 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director if (!pluginsAvailable) { // A searching for plugins has already been done, but no // plugins are installed - return 0; + return nullptr; } if (plugins.isEmpty()) { @@ -285,13 +285,13 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director } if (plugins.isEmpty()) { pluginsAvailable = false; - return 0; + return nullptr; } } // We use the number of upUrl() calls to find the best matching plugin // for the given directory. The smaller value, the better it is (0 is best). - KVersionControlPlugin* bestPlugin = 0; + KVersionControlPlugin* bestPlugin = nullptr; int bestScore = INT_MAX; // Verify whether the current directory contains revision information diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h index 0b702f5f1e..2c2fe2940c 100644 --- a/src/views/versioncontrol/versioncontrolobserver.h +++ b/src/views/versioncontrol/versioncontrolobserver.h @@ -50,7 +50,7 @@ class DOLPHIN_EXPORT VersionControlObserver : public QObject Q_OBJECT public: - explicit VersionControlObserver(QObject* parent = 0); + explicit VersionControlObserver(QObject* parent = nullptr); ~VersionControlObserver() override; void setModel(KFileItemModel* model); diff --git a/src/views/viewmodecontroller.h b/src/views/viewmodecontroller.h index 015fdec857..6fa43c38b1 100644 --- a/src/views/viewmodecontroller.h +++ b/src/views/viewmodecontroller.h @@ -38,7 +38,7 @@ class DOLPHIN_EXPORT ViewModeController : public QObject Q_OBJECT public: - explicit ViewModeController(QObject* parent = 0); + explicit ViewModeController(QObject* parent = nullptr); ~ViewModeController() override; /** diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp index ca52be8907..e2be188198 100644 --- a/src/views/viewproperties.cpp +++ b/src/views/viewproperties.cpp @@ -50,7 +50,7 @@ namespace { ViewProperties::ViewProperties(const QUrl& url) : m_changedProps(false), m_autoSave(true), - m_node(0) + m_node(nullptr) { GeneralSettings* settings = GeneralSettings::self(); const bool useGlobalViewProps = settings->globalViewProps() || url.isEmpty(); @@ -140,7 +140,7 @@ ViewProperties::~ViewProperties() } delete m_node; - m_node = 0; + m_node = nullptr; } void ViewProperties::setViewMode(DolphinView::Mode mode)