diff options
| author | Kevin Funk <[email protected]> | 2017-11-21 10:52:14 +0100 |
|---|---|---|
| committer | Kevin Funk <[email protected]> | 2017-11-21 10:53:12 +0100 |
| commit | a6db5029acc09639fd8c7c20a7676b1ac9f36539 (patch) | |
| tree | 7b44cf022857916c483b5aeb4e418e7f648486a6 /src/kitemviews/private | |
| parent | 464b13f3828e5cdd03438d0881c3a62c7cda6333 (diff) | |
Modernize: Use nullptr everywhere
Diffstat (limited to 'src/kitemviews/private')
20 files changed, 26 insertions, 26 deletions
diff --git a/src/kitemviews/private/kdirectorycontentscounter.cpp b/src/kitemviews/private/kdirectorycontentscounter.cpp index af7312ad2..90716173c 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 13726fae7..977765ab7 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 47fbb5dd5..79e134724 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 b2e31ef0f..2460a0e1f 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 d27869dff..31e6c6198 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 778625573..eeeba11b2 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 ca5f76de6..c8b670f71 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 6c6f94ffa..a388a242c 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 cc11e19da..4092ec523 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 8248fb7bb..6d0974f97 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 be1d96c74..02dedefca 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 fa7401c9e..eaef59173 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 9031c870f..25f97ee02 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 7c283fb54..a10995372 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 6bfdba4c9..17eac3b39 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 6dccde9a2..a5aca82e6 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 67ad192c6..89b345210 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 ddcb5e964..ba3a33dc9 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 d54457908..ca3942644 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 84bbfff58..2116f8405 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); |
