┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/kitemviews/private
diff options
context:
space:
mode:
authorAhmad Samir <[email protected]>2021-07-16 00:29:07 +0200
committerAhmad Samir <[email protected]>2021-07-19 09:57:58 +0000
commit0b81b4baf9c7eebbdcf45745077d5a009635b9c8 (patch)
tree9212698795bcb073aaca747af53c6634e632d6b3 /src/kitemviews/private
parent7908aff3b5ebe4484d391c1fc4797e9dae2300b2 (diff)
Use KDirLister directly now that it emits a jobError() signal
Since KIO 5.82, KCoreDirLister (the base class of KDirLister) emits a jobError() signal when the ListJob used internally emits an error. Drop KFileItemModelDirLister class, now redundant. This also bump the KF version to 5.82.
Diffstat (limited to 'src/kitemviews/private')
-rw-r--r--src/kitemviews/private/kfileitemmodeldirlister.cpp40
-rw-r--r--src/kitemviews/private/kfileitemmodeldirlister.h43
2 files changed, 0 insertions, 83 deletions
diff --git a/src/kitemviews/private/kfileitemmodeldirlister.cpp b/src/kitemviews/private/kfileitemmodeldirlister.cpp
deleted file mode 100644
index eb860a2b9..000000000
--- a/src/kitemviews/private/kfileitemmodeldirlister.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2006-2012 Peter Penz <[email protected]>
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-#include "kfileitemmodeldirlister.h"
-
-#include <KLocalizedString>
-#include <KIO/Job>
-#include <kio_version.h>
-
-KFileItemModelDirLister::KFileItemModelDirLister(QObject* parent) :
- KDirLister(parent)
-{
-#if KIO_VERSION < QT_VERSION_CHECK(5, 82, 0)
- setAutoErrorHandlingEnabled(false, nullptr);
-#else
- setAutoErrorHandlingEnabled(false);
-#endif
-}
-
-KFileItemModelDirLister::~KFileItemModelDirLister()
-{
-}
-
-void KFileItemModelDirLister::handleError(KIO::Job* job)
-{
- if (job->error() == KIO::ERR_IS_FILE) {
- Q_EMIT urlIsFileError(url());
- } else {
- const QString errorString = job->errorString();
- if (errorString.isEmpty()) {
- Q_EMIT errorMessage(i18nc("@info:status", "Unknown error."));
- } else {
- Q_EMIT errorMessage(errorString);
- }
- }
-}
-
diff --git a/src/kitemviews/private/kfileitemmodeldirlister.h b/src/kitemviews/private/kfileitemmodeldirlister.h
deleted file mode 100644
index 563695975..000000000
--- a/src/kitemviews/private/kfileitemmodeldirlister.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2006-2012 Peter Penz <[email protected]>
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-#ifndef KFILEITEMMODELDIRLISTER_H
-#define KFILEITEMMODELDIRLISTER_H
-
-#include "dolphin_export.h"
-
-#include <KDirLister>
-
-#include <QUrl>
-
-/**
- * @brief Extends the class KDirLister by emitting a signal when an
- * error occurred instead of showing an error dialog.
- * KDirLister::autoErrorHandlingEnabled() is set to false.
- */
-class DOLPHIN_EXPORT KFileItemModelDirLister : public KDirLister
-{
- Q_OBJECT
-
-public:
- explicit KFileItemModelDirLister(QObject* parent = nullptr);
- ~KFileItemModelDirLister() override;
-
-Q_SIGNALS:
- /** Is emitted whenever an error has occurred. */
- void errorMessage(const QString& msg);
-
- /**
- * Is emitted when the URL of the directory lister represents a file.
- * In this case no signal errorMessage() will be emitted.
- */
- void urlIsFileError(const QUrl& url);
-
-protected:
- void handleError(KIO::Job* job) override;
-};
-
-#endif