diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt --- a/autotests/CMakeLists.txt +++ b/autotests/CMakeLists.txt @@ -14,7 +14,6 @@ # add_definitions( -DKDESRCDIR=${CMAKE_CURRENT_SOURCE_DIR} ) if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) - set(PLASMA_NO_KIO TRUE) set(PLASMA_NO_PACKAGEKIT TRUE) set(PLASMA_NO_PACKAGE_EXTRADATA TRUE) endif() diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -8,7 +8,6 @@ set(CMAKE_AUTOMOC_RELAXED_MODE ON) if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) - set(PLASMA_NO_KIO TRUE) set(PLASMA_NO_PACKAGEKIT TRUE) set(PLASMA_NO_PACKAGE_EXTRADATA TRUE) endif() diff --git a/src/plasma/config-plasma.h.cmake b/src/plasma/config-plasma.h.cmake --- a/src/plasma/config-plasma.h.cmake +++ b/src/plasma/config-plasma.h.cmake @@ -1,5 +1,4 @@ #cmakedefine01 PLASMA_NO_KDEWEBKIT -#cmakedefine01 PLASMA_NO_KIO #cmakedefine01 PLASMA_NO_KUTILS #cmakedefine01 HAVE_X11 #cmakedefine01 HAVE_GLX diff --git a/src/plasma/containment.cpp b/src/plasma/containment.cpp --- a/src/plasma/containment.cpp +++ b/src/plasma/containment.cpp @@ -40,12 +40,6 @@ #include #include -#if !PLASMA_NO_KIO -#include "kio/jobclasses.h" // for KIO::JobFlags -#include "kio/job.h" -#include "kio/scheduler.h" -#endif - #include "containmentactions.h" #include "corona.h" #include "pluginloader.h" diff --git a/src/plasma/pluginloader.cpp b/src/plasma/pluginloader.cpp --- a/src/plasma/pluginloader.cpp +++ b/src/plasma/pluginloader.cpp @@ -31,10 +31,6 @@ #include "config-plasma.h" -#if !PLASMA_NO_KIO -#include -#endif - #include "applet.h" #include "containment.h" #include "containmentactions.h" diff --git a/src/plasma/private/associatedapplicationmanager.cpp b/src/plasma/private/associatedapplicationmanager.cpp --- a/src/plasma/private/associatedapplicationmanager.cpp +++ b/src/plasma/private/associatedapplicationmanager.cpp @@ -34,12 +34,7 @@ #include #include -#if !PLASMA_NO_KIO -#include -#else -#include -#include -#endif +#include #include "plasma/applet.h" @@ -197,29 +192,13 @@ void AssociatedApplicationManager::run(Plasma::Applet *applet) { if (d->applicationNames.contains(applet)) { -#if !PLASMA_NO_KIO bool success = KRun::run(d->applicationNames.value(applet), d->urlLists.value(applet), nullptr); if (!success) { qCWarning(LOG_PLASMA) << "couldn't run" << d->applicationNames.value(applet) << d->urlLists.value(applet); } -#else - QString execCommand = d->applicationNames.value(applet); - - // Clean-up the %u and friends from the exec command (KRun expect them, not QProcess) - execCommand = execCommand.replace(QRegExp("%[a-z]"), QString()); - execCommand = execCommand.trimmed(); - - QStringList parameters = d->urlLists.value(applet).toStringList(); - QProcess::startDetached(execCommand, parameters); -#endif - } else if (d->urlLists.contains(applet)) { -#if !PLASMA_NO_KIO KRun *krun = new KRun(d->urlLists.value(applet).first(), nullptr); krun->setAutoDelete(true); -#else - QDesktopServices::openUrl(d->urlLists.value(applet).first()); -#endif } } diff --git a/src/scriptengines/qml/CMakeLists.txt b/src/scriptengines/qml/CMakeLists.txt --- a/src/scriptengines/qml/CMakeLists.txt +++ b/src/scriptengines/qml/CMakeLists.txt @@ -3,7 +3,6 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) set(PLASMA_NO_KDEWEBKIT TRUE) set(PLASMA_NO_SOLID TRUE) - set(PLASMA_NO_KIO TRUE) endif() #DECLARATIVE APPLET diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp --- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp +++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp @@ -38,12 +38,9 @@ #include #include -#ifndef PLASMA_NO_KIO -#include "kio/jobclasses.h" // for KIO::JobFlags -#include "kio/job.h" -#include "kio/scheduler.h" #include -#endif +#include +#include #include #include @@ -469,8 +466,6 @@ // to create widgets out of the matching URLs, if any const QList urls = KUrlMimeData::urlsFromMimeData(mimeData); foreach (const QUrl &url, urls) { - -#ifndef PLASMA_NO_KIO QMimeDatabase db; const QMimeType &mime = db.mimeTypeForUrl(url); QString mimeName = mime.name(); @@ -499,7 +494,6 @@ m_dropMenus[job] = choices; } -#endif } } else { @@ -576,27 +570,22 @@ void ContainmentInterface::clearDataForMimeJob(KIO::Job *job) { -#ifndef PLASMA_NO_KIO QObject::disconnect(job, nullptr, this, nullptr); m_dropPoints.remove(job); QMenu *choices = m_dropMenus.take(job); m_dropJobs.remove(job); job->kill(); -#endif // PLASMA_NO_KIO } void ContainmentInterface::dropJobResult(KJob *job) { -#ifndef PLASMA_NO_KIO if (job->error()) { qDebug() << "ERROR" << job->error() << ' ' << job->errorString(); } -#endif // PLASMA_NO_KIO } void ContainmentInterface::mimeTypeRetrieved(KIO::Job *job, const QString &mimetype) { -#ifndef PLASMA_NO_KIO qDebug() << "Mimetype Job returns." << mimetype; KIO::TransferJob *tjob = dynamic_cast(job); @@ -818,7 +807,6 @@ clearDataForMimeJob(tjob); } -#endif // PLASMA_NO_KIO } void ContainmentInterface::appletAddedForward(Plasma::Applet *applet)