diff --git a/privacyfunctions.cpp b/privacyfunctions.cpp
index 42f2b92..68c87b1 100644
--- a/privacyfunctions.cpp
+++ b/privacyfunctions.cpp
@@ -1,237 +1,239 @@
 /**
  * kprivacymanager.cpp
  *
  * Copyright (c) 2003 Ralf Hoelzer <ralf@well.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU Lesser General Public License as published
  *  by the Free Software Foundation; either version 2.1 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 #include "privacyfunctions.h"
 
 #include <KBookmarkManager>
 #include <KConfig>
 #include <KConfigGroup>
 #include <KRecentDocument>
 #include <KToolInvocation>
 
+#include <QDBusConnectionInterface>
+#include <QDBusInterface>
+#include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QLatin1String>
 #include <QProcess>
 #include <QRegularExpression>
 #include <QStandardPaths>
 #include <QStringList>
-#include <QtDBus>
 
 #include "config-sweeper.h"
 
 bool ClearThumbnailsAction::action()
 {
    // http://freedesktop.org/Standards/Home
    // http://triq.net/~jens/thumbnail-spec/index.html
 
    QDir thumbnailDir( QDir::homePath() + QLatin1String( "/.thumbnails/normal" ));
    thumbnailDir.setFilter( QDir::Files );
    const QStringList entries = thumbnailDir.entryList();
    for( QStringList::const_iterator it = entries.begin() ; it != entries.end() ; ++it) {
       if(!thumbnailDir.remove(*it)) {
          errMsg = i18n("A thumbnail could not be removed.");
          return false;
       }
    }
 
    thumbnailDir.setPath(QDir::homePath() + QLatin1String( "/.thumbnails/large" ));
    const QStringList entries2 = thumbnailDir.entryList();
    for( QStringList::const_iterator it = entries2.begin() ; it != entries2.end() ; ++it) {
       if(!thumbnailDir.remove(*it)) {
          errMsg = i18n("A thumbnail could not be removed.");
          return false;
       }
    }
 
    thumbnailDir.setPath(QDir::homePath() + QLatin1String( "/.thumbnails/fail" ));
    const QStringList entries3 = thumbnailDir.entryList();
    for( QStringList::const_iterator it = entries3.begin() ; it != entries3.end() ; ++it) {
       if(!thumbnailDir.remove(*it)) {
          errMsg = i18n("A thumbnail could not be removed.");
          return false;
       }
    }
 
    return true;
 }
 
 bool ClearRunCommandHistoryAction::action()
 {
     KConfig cfg(QStringLiteral("krunnerrc"));
     KConfigGroup configGroup = cfg.group("General");
     configGroup.writeEntry("history", QStringList());
     configGroup.sync();
     return true;
 }
 
 bool ClearAllCookiesAction::action()
 {
     QDBusInterface cookiejar(QStringLiteral("org.kde.kcookiejar5"),
         QStringLiteral("/modules/kcookiejar" ),
         QStringLiteral("org.kde.KCookieServer"),
         QDBusConnection::sessionBus());
     QDBusReply<void> reply = cookiejar.call(QStringLiteral("deleteAllCookies"));
     return reply.isValid();
 }
 
 bool ClearAllCookiesPoliciesAction::action()
 {
     // load the config file and section
     KConfig cfg(QStringLiteral("kcookiejarrc"));
     KConfigGroup group = cfg.group("Cookie Policy");
 
     qDebug() << "removing all saved cookie policies" ;
     group.deleteEntry("CookieDomainAdvice");
     cfg.sync();
 
     // inform the cookie jar we pillaged it
     QDBusInterface kcookiejar(QStringLiteral("org.kde.kcookiejar5" ),
         QStringLiteral("/modules/kcookiejar" ),
         QStringLiteral( "org.kde.KCookieServer" ));
     QDBusReply<void> reply = kcookiejar.call(QStringLiteral("reloadPolicy"));
 
    return reply.isValid();
 }
 
 bool ClearSavedClipboardContentsAction::action()
 {
    if(!QDBusConnection::sessionBus().interface()->isServiceRegistered(QStringLiteral("org.kde.klipper"))) {
       KConfig *c = new KConfig(QStringLiteral("klipperrc"), KConfig::NoGlobals);
       KConfigGroup group(c, "General");
       group.deleteEntry("ClipboardData");
       c->sync();
 
       delete c;
       return true;
    }
    QDBusInterface klipper(QStringLiteral("org.kde.klipper"), QStringLiteral("/klipper"), QStringLiteral("org.kde.klipper.klipper"));
    QDBusReply<void> reply = klipper.call(QStringLiteral("clearClipboardHistory"));
    return reply.isValid();
 }
 
 bool ClearFormCompletionAction::action()
 {
    bool status;
 
    // try to delete the file, if it exists
    QFile completionFile(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/khtml/formcompletions" ));
    (completionFile.exists() ? status = completionFile.remove() : status = true);
 
    if (!status) {
       errMsg = i18n("The file exists but could not be removed.");
    }
 
    return status;
 }
 
 bool ClearWebCacheAction::action()
 {
    QStringList lst;
    lst << QStringLiteral("--clear-all");
    return QProcess::startDetached(QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF5 "/kio_http_cache_cleaner"), lst);
 }
 
 bool ClearRecentDocumentsAction::action()
 {
    KRecentDocument::clear();
    return KRecentDocument::recentDocuments().isEmpty();
 }
 
 bool ClearWebHistoryAction::action()
 {
    // Clear the history from the memory of the running konquerors
    QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KonqHistoryManager"), QStringLiteral("org.kde.Konqueror.HistoryManager"), QStringLiteral("notifyClear"));
    (void) QDBusConnection::sessionBus().send(message);
 
    // Delete the file
    const QString file = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/konqueror/konq_history");
    QFile::remove(file);
 
    const QDBusMessage message2 = QDBusMessage::createSignal(QStringLiteral("/KonqUndoManager"), QStringLiteral("org.kde.Konqueror.UndoManager"), QStringLiteral("notifyRemove"));
    (void) QDBusConnection::sessionBus().send(message2);
 
    // Delete the file
    const QString file2 = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/konqueror/closeditems_saved");
    QFile::remove(file2);
    return true;
 }
 
 bool ClearFaviconsAction::action()
 {
    QDir favIconDir(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) + QLatin1Char('/') + QLatin1String( "favicons/" ));
    QStringList saveTheseFavicons;
    KBookmarkManager* konqiBookmarkMgr;
 
    const QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)
       + QLatin1String("/konqueror/bookmarks.xml");
    QDir().mkpath(path);
    konqiBookmarkMgr =
       KBookmarkManager::managerForFile(path, QStringLiteral("konqueror"));
    qDebug() << "saving the favicons that are in konqueror bookmarks" ;
    qDebug() << "opened konqueror bookmarks at " << konqiBookmarkMgr->path() ;
 
    // get the entire slew of bookmarks
    KBookmarkGroup konqiBookmarks = konqiBookmarkMgr->root();
 
    // walk through the bookmarks, if they have a favicon we should keep it
    KBookmark bookmark = konqiBookmarks.first();
 
    while (!bookmark.isNull()) {
       if ((bookmark.icon()).startsWith(QLatin1String("favicons/"))) {
          // pick out the name, throw .png on the end, and store the filename
          QRegularExpression regex(QStringLiteral("favicons/(.*)"));
          QRegularExpressionMatch match = regex.match(bookmark.icon());
          qDebug() << "will save " << (match.captured(1)) ;
          saveTheseFavicons << (match.captured(1));
       }
       bookmark = konqiBookmarks.next(bookmark);
    }
 
    favIconDir.setFilter( QDir::Files );
 
    const QStringList entries = favIconDir.entryList();
 
    // erase all files in favicon directory...
    for( QStringList::const_iterator it = entries.begin() ; it != entries.end() ; ++it) {
       // ...if we're not supposed to save them, of course
       if (!saveTheseFavicons.contains(*it)) {
          qDebug() << "removing " << *it ;
          if(!favIconDir.remove(*it)) {
             errMsg = i18n("A favicon could not be removed.");
             return false;
          }
       }
    }
 
    return true;
 }
 
 bool ClearRecentApplicationAction::action()
 {
     QDBusMessage message =
         QDBusMessage::createSignal(QLatin1String( "/kickoff/RecentAppDoc" ), QLatin1String( "org.kde.plasma" ), QLatin1String( "clearRecentDocumentsAndApplications" ));
     QDBusConnection::sessionBus().send(message);
 
     return true;
 }
 
 
 // kate: tab-width 3; indent-mode cstyle; replace-tabs true;
diff --git a/sweeper.cpp b/sweeper.cpp
index 5e44e0e..e247eeb 100644
--- a/sweeper.cpp
+++ b/sweeper.cpp
@@ -1,172 +1,172 @@
 /**
   * Copyright (c) 2003-2005 Ralf Hoelzer <ralf@well.com>
   *
   *  This program is free software; you can redistribute it and/or modify
   *  it under the terms of the GNU Lesser General Public License as published
   *  by the Free Software Foundation; either version 2.1 of the License, or
   *  (at your option) any later version.
   *
   *  This program is distributed in the hope that it will be useful,
   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
   *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   *  GNU Lesser General Public License for more details.
   *
   *  You should have received a copy of the GNU Lesser General Public License
   *  along with this program; if not, write to the Free Software
   *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   */
 
 #include "sweeper.h"
 
 #include "privacyaction.h"
 #include "privacyfunctions.h"
 #include "sweeperadaptor.h"
 
 #include <KActionCollection>
 #include <KConfig>
 #include <KMessageBox>
 #include <KSharedConfig>
 #include <KStandardAction>
-#include <QtDBus/QtDBus>
+#include <QDBusConnection>
 
 Sweeper::Sweeper(bool automatic)
    : KXmlGuiWindow(0)
    , m_privacyConfGroup(KSharedConfig::openConfig(QStringLiteral("kprivacyrc"), KConfig::NoGlobals), "Cleaning")
    , m_automatic(automatic)
 {
    QWidget *mainWidget = new QWidget(this);
    ui.setupUi(mainWidget);
    setCentralWidget(mainWidget);
 
    QTreeWidget *sw = ui.privacyListView;
 
    KStandardAction::quit(this, &Sweeper::close, actionCollection());
 
    createGUI(QStringLiteral("sweeperui.rc"));
 
    setAutoSaveSettings();
 
    generalCLI     = new QTreeWidgetItem(QStringList() << i18nc("General system content", "General"));
    sw->addTopLevelItem(generalCLI);
    webbrowsingCLI = new QTreeWidgetItem(QStringList() << i18nc("Web browsing content", "Web Browsing"));
    sw->addTopLevelItem(webbrowsingCLI);
 
    generalCLI->setExpanded(true);
    webbrowsingCLI->setExpanded(true);
 
    this->InitActions();
 
 
    connect(ui.cleanupButton, &QPushButton::clicked, this, &Sweeper::cleanup);
    connect(ui.selectAllButton, &QPushButton::clicked, this, &Sweeper::selectAll);
    connect(ui.selectNoneButton, &QPushButton::clicked, this, &Sweeper::selectNone);
 
    new KsweeperAdaptor(this);
    QDBusConnection::sessionBus().registerObject(QStringLiteral("/ksweeper"), this);
 
    load();
 
    if(automatic) {
       cleanup();
       close();
    }
 }
 
 
 Sweeper::~Sweeper()
 {
    save();
 }
 
 
 void Sweeper::load()
 {
    QLinkedList<PrivacyAction*>::iterator itr;
 
    for (itr = checklist.begin(); itr != checklist.end(); ++itr) {
       (*itr)->setCheckState(0, m_privacyConfGroup.readEntry((*itr)->configKey(), true) ? Qt::Checked : Qt::Unchecked);
    }
 }
 
 void Sweeper::save()
 {
    QLinkedList<PrivacyAction*>::iterator itr;
 
    for (itr = checklist.begin(); itr != checklist.end(); ++itr) {
       m_privacyConfGroup.writeEntry((*itr)->configKey(), (*itr)->checkState(0) == Qt::Checked);
    }
 
    m_privacyConfGroup.sync();
 }
 
 void Sweeper::selectAll()
 {
    QLinkedList<PrivacyAction*>::iterator itr;
 
    for (itr = checklist.begin(); itr != checklist.end(); ++itr) {
       (*itr)->setCheckState(0, Qt::Checked);
    }
 
 }
 
 void Sweeper::selectNone()
 {
    QLinkedList<PrivacyAction*>::iterator itr;
 
    for (itr = checklist.begin(); itr != checklist.end(); ++itr) {
       (*itr)->setCheckState(0, Qt::Unchecked);
    }
 
 }
 
 
 void Sweeper::cleanup()
 {
    if (!m_automatic) {
       if (KMessageBox::warningContinueCancel(this, i18n("You are deleting data that is potentially valuable to you. Are you sure?")) != KMessageBox::Continue) {
          return;
       }
    }
 
    ui.statusTextEdit->clear();
    ui.statusTextEdit->setText(i18n("Starting cleanup..."));
 
    QLinkedList<PrivacyAction*>::iterator itr;
 
    for (itr = checklist.begin(); itr != checklist.end(); ++itr) {
       if((*itr)->checkState(0) == Qt::Checked) {
          QString statusText = i18n("Clearing %1...", (*itr)->text(0));
          ui.statusTextEdit->append(statusText);
 
          // actions return whether they were successful
          if(!(*itr)->action()) {
             QString errorText =  i18n("Clearing of %1 failed: %2", (*itr)->text(0), (*itr)->getErrMsg());
             ui.statusTextEdit->append(errorText);
          }
       }
    }
 
    ui.statusTextEdit->append(i18n("Clean up finished."));
 }
 
 void Sweeper::InitActions() {
     // store all entries in a list for easy access later on
    checklist.append(new ClearSavedClipboardContentsAction(generalCLI));
    checklist.append(new ClearRecentDocumentsAction(generalCLI));
    checklist.append(new ClearRunCommandHistoryAction(generalCLI));
 #ifdef Q_WS_X11
    checklist.append( new ClearRecentApplicationAction( generalCLI ) );
 #endif
    checklist.append(new ClearThumbnailsAction(generalCLI));
 
    checklist.append(new ClearAllCookiesAction(webbrowsingCLI));
    checklist.append(new ClearFaviconsAction(webbrowsingCLI));
    checklist.append(new ClearWebHistoryAction(webbrowsingCLI));
    checklist.append(new ClearWebCacheAction(webbrowsingCLI));
    checklist.append(new ClearFormCompletionAction(webbrowsingCLI));
    checklist.append(new ClearAllCookiesPoliciesAction(webbrowsingCLI));
 
    ui.privacyListView->resizeColumnToContents(0);
 }
 
 // kate: tab-width 3; indent-mode cstyle; replace-tabs true;