┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/panels
diff options
context:
space:
mode:
authorKevin Funk <[email protected]>2017-11-21 10:52:14 +0100
committerKevin Funk <[email protected]>2017-11-21 10:53:12 +0100
commita6db5029acc09639fd8c7c20a7676b1ac9f36539 (patch)
tree7b44cf022857916c483b5aeb4e418e7f648486a6 /src/panels
parent464b13f3828e5cdd03438d0881c3a62c7cda6333 (diff)
Modernize: Use nullptr everywhere
Diffstat (limited to 'src/panels')
-rw-r--r--src/panels/information/filemetadataconfigurationdialog.h2
-rw-r--r--src/panels/information/informationpanel.cpp4
-rw-r--r--src/panels/information/informationpanelcontent.cpp16
-rw-r--r--src/panels/information/informationpanelcontent.h2
-rw-r--r--src/panels/information/phononwidget.h2
-rw-r--r--src/panels/panel.h2
-rw-r--r--src/panels/places/placesitem.cpp2
-rw-r--r--src/panels/places/placesitem.h2
-rw-r--r--src/panels/places/placesitemeditdialog.cpp8
-rw-r--r--src/panels/places/placesitemeditdialog.h2
-rw-r--r--src/panels/places/placesitemlistgroupheader.h2
-rw-r--r--src/panels/places/placesitemmodel.cpp20
-rw-r--r--src/panels/places/placesitemmodel.h2
-rw-r--r--src/panels/places/placespanel.cpp18
-rw-r--r--src/panels/terminal/terminalpanel.cpp20
15 files changed, 52 insertions, 52 deletions
diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h
index f471d545f..8ca9ef6fe 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 850d94d92..ac987c9b4 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<KIO::StatJob*>(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 fa4868e52..c1f547380 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 925e89a2b..8b143af1d 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 940239144..947f0cdac 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 f706c3b82..84d73e74c 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 93cc4d5c3..297cf95d6 100644
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -66,7 +66,7 @@ void PlacesItem::setUrl(const QUrl &url)
// watches for changes if the number of items has been changed.
// The update of the icon is handled in onTrashDirListerCompleted().
m_trashDirLister = new KDirLister();
- m_trashDirLister->setAutoErrorHandlingEnabled(false, 0);
+ m_trashDirLister->setAutoErrorHandlingEnabled(false, nullptr);
m_trashDirLister->setDelayedMimeTypes(true);
QObject::connect(m_trashDirLister.data(), static_cast<void(KDirLister::*)()>(&KDirLister::completed),
m_signalHandler.data(), &PlacesItemSignalHandler::onTrashDirListerCompleted);
diff --git a/src/panels/places/placesitem.h b/src/panels/places/placesitem.h
index 7d1ab610a..b7cd8e79f 100644
--- a/src/panels/places/placesitem.h
+++ b/src/panels/places/placesitem.h
@@ -48,7 +48,7 @@ public:
DevicesType
};
- explicit PlacesItem(const KBookmark& bookmark, PlacesItem* parent = 0);
+ explicit PlacesItem(const KBookmark& bookmark, PlacesItem* parent = nullptr);
~PlacesItem() override;
void setUrl(const QUrl& url);
diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index ffcac4c8f..4a56ce908 100644
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -44,10 +44,10 @@ PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) :
m_text(),
m_url(),
m_allowGlobal(false),
- m_urlEdit(0),
- m_textEdit(0),
- m_iconButton(0),
- m_appLocal(0),
+ m_urlEdit(nullptr),
+ m_textEdit(nullptr),
+ m_iconButton(nullptr),
+ m_appLocal(nullptr),
m_buttonBox(nullptr)
{
}
diff --git a/src/panels/places/placesitemeditdialog.h b/src/panels/places/placesitemeditdialog.h
index 5f61eede2..73104a1b6 100644
--- a/src/panels/places/placesitemeditdialog.h
+++ b/src/panels/places/placesitemeditdialog.h
@@ -38,7 +38,7 @@ class PlacesItemEditDialog: public QDialog
Q_OBJECT
public:
- explicit PlacesItemEditDialog(QWidget* parent = 0);
+ explicit PlacesItemEditDialog(QWidget* parent = nullptr);
~PlacesItemEditDialog() override;
void setIcon(const QString& icon);
diff --git a/src/panels/places/placesitemlistgroupheader.h b/src/panels/places/placesitemlistgroupheader.h
index f3cdaa6a6..4408aa9ef 100644
--- a/src/panels/places/placesitemlistgroupheader.h
+++ b/src/panels/places/placesitemlistgroupheader.h
@@ -27,7 +27,7 @@ class PlacesItemListGroupHeader : public KStandardItemListGroupHeader
Q_OBJECT
public:
- PlacesItemListGroupHeader(QGraphicsWidget* parent = 0);
+ PlacesItemListGroupHeader(QGraphicsWidget* parent = nullptr);
~PlacesItemListGroupHeader() override;
protected:
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 680d513b5..371bcb892 100644
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -73,13 +73,13 @@ PlacesItemModel::PlacesItemModel(QObject* parent) :
m_hiddenItemsShown(false),
m_availableDevices(),
m_predicate(),
- m_bookmarkManager(0),
+ m_bookmarkManager(nullptr),
m_systemBookmarks(),
m_systemBookmarksIndexes(),
m_bookmarkedItems(),
m_hiddenItemToRemove(-1),
- m_deviceToTearDown(0),
- m_updateBookmarksTimer(0),
+ m_deviceToTearDown(nullptr),
+ m_updateBookmarksTimer(nullptr),
m_storageSetupInProgress()
{
#ifdef HAVE_BALOO
@@ -250,24 +250,24 @@ QAction* PlacesItemModel::ejectAction(int index) const
{
const PlacesItem* item = placesItem(index);
if (item && item->device().is<Solid::OpticalDisc>()) {
- return new QAction(QIcon::fromTheme(QStringLiteral("media-eject")), i18nc("@item", "Eject"), 0);
+ return new QAction(QIcon::fromTheme(QStringLiteral("media-eject")), i18nc("@item", "Eject"), nullptr);
}
- return 0;
+ return nullptr;
}
QAction* PlacesItemModel::teardownAction(int index) const
{
const PlacesItem* item = placesItem(index);
if (!item) {
- return 0;
+ return nullptr;
}
Solid::Device device = item->device();
const bool providesTearDown = device.is<Solid::StorageAccess>() &&
device.as<Solid::StorageAccess>()->isAccessible();
if (!providesTearDown) {
- return 0;
+ return nullptr;
}
Solid::StorageDrive* drive = device.as<Solid::StorageDrive>();
@@ -295,10 +295,10 @@ QAction* PlacesItemModel::teardownAction(int index) const
}
if (iconName.isEmpty()) {
- return new QAction(text, 0);
+ return new QAction(text, nullptr);
}
- return new QAction(QIcon::fromTheme(iconName), text, 0);
+ return new QAction(QIcon::fromTheme(iconName), text, nullptr);
}
void PlacesItemModel::requestEject(int index)
@@ -687,7 +687,7 @@ void PlacesItemModel::updateBookmarks()
int modelIndex = 0;
for (int i = m_bookmarkedItems.count() - 1; i >= 0; --i) {
PlacesItem* item = m_bookmarkedItems[i];
- const bool itemIsPartOfModel = (item == 0);
+ const bool itemIsPartOfModel = (item == nullptr);
if (itemIsPartOfModel) {
item = placesItem(modelIndex);
}
diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h
index 9c91f7b08..3b9307fe6 100644
--- a/src/panels/places/placesitemmodel.h
+++ b/src/panels/places/placesitemmodel.h
@@ -50,7 +50,7 @@ class PlacesItemModel: public KStandardItemModel
Q_OBJECT
public:
- explicit PlacesItemModel(QObject* parent = 0);
+ explicit PlacesItemModel(QObject* parent = nullptr);
~PlacesItemModel() override;
/**
diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index 0b76f18d3..9888290d9 100644
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -170,10 +170,10 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
QMenu menu(this);
- QAction* emptyTrashAction = 0;
- QAction* editAction = 0;
- QAction* teardownAction = 0;
- QAction* ejectAction = 0;
+ QAction* emptyTrashAction = nullptr;
+ QAction* editAction = nullptr;
+ QAction* teardownAction = nullptr;
+ QAction* ejectAction = nullptr;
const QString label = item->text();
@@ -213,7 +213,7 @@ void PlacesPanel::slotItemContextMenuRequested(int index, const QPointF& pos)
editAction = menu.addAction(QIcon::fromTheme("document-properties"), i18nc("@item:inmenu", "Edit..."));
}
- QAction* removeAction = 0;
+ QAction* removeAction = nullptr;
if (!isDevice && !item->isSystemItem()) {
removeAction = menu.addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), i18nc("@item:inmenu", "Remove"));
}
@@ -267,7 +267,7 @@ void PlacesPanel::slotViewContextMenuRequested(const QPointF& pos)
QAction* addAction = menu.addAction(QIcon::fromTheme(QStringLiteral("document-new")), i18nc("@item:inmenu", "Add Entry..."));
- QAction* showAllAction = 0;
+ QAction* showAllAction = nullptr;
if (m_model->hiddenCount() > 0) {
showAllAction = menu.addAction(i18nc("@item:inmenu", "Show All Entries"));
showAllAction->setCheckable(true);
@@ -388,8 +388,8 @@ void PlacesPanel::slotItemDropEventStorageSetupDone(int index, bool success)
delete m_itemDropEvent;
m_itemDropEventIndex = -1;
- m_itemDropEventMimeData = 0;
- m_itemDropEvent = 0;
+ m_itemDropEventMimeData = nullptr;
+ m_itemDropEvent = nullptr;
}
}
@@ -413,7 +413,7 @@ void PlacesPanel::slotTrashUpdated(KJob* job)
emit errorMessage(job->errorString());
}
// as long as KIO doesn't do this, do it ourselves
- KNotification::event(QStringLiteral("Trash: emptied"), QString(), QPixmap(), 0, KNotification::DefaultEvent);
+ KNotification::event(QStringLiteral("Trash: emptied"), QString(), QPixmap(), nullptr, KNotification::DefaultEvent);
}
void PlacesPanel::slotStorageSetupDone(int index, bool success)
diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index b7d3605aa..c205374cd 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<KParts::ReadOnlyPart>(this)) : 0;
+ m_konsolePart = factory ? (factory->create<KParts::ReadOnlyPart>(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)