port away from KDELibs4Support

This removes the dependency from KDELibs4Support.

Added KF5 dependecies are I18n, IconThemes and XmlGui.

REVIEW: 126490

24 files changed, 103 insertions, 97 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c232f6..9f20fc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ include(ECMInstallIcons)
 include(ECMMarkAsTest)
 include(GenerateExportHeader)
 
-find_package(KF5 REQUIRED KIO KDELibs4Support DBusAddons)
+find_package(KF5 REQUIRED KIO DBusAddons I18n IconThemes XmlGui)
 
 find_package(QApt 3.0.0 REQUIRED)
 find_package(DebconfKDE 1.0.0 REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b321bb1..8620506 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(KF5KDELibs4Support)
-
 add_subdirectory(icons)
 
 set(muon_SRCS
@@ -53,8 +51,10 @@ target_compile_definitions(muon PRIVATE -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=\"${
 
 target_link_libraries(muon DebconfKDE::Main
                            KF5::KIOWidgets
-                           KF5::KDELibs4Support
                            KF5::DBusAddons
+                           KF5::I18n
+                           KF5::IconThemes
+                           KF5::XmlGui
                            Qt5::Concurrent
                            QApt::Main)
 
diff --git a/src/DetailsTabs/ChangelogTab.cpp b/src/DetailsTabs/ChangelogTab.cpp
index 11daafd..3418a6b 100644
--- a/src/DetailsTabs/ChangelogTab.cpp
+++ b/src/DetailsTabs/ChangelogTab.cpp
@@ -21,7 +21,11 @@
 #include "ChangelogTab.h"
 
 // Qt includes
+#include <QDir>
 #include <QtCore/QTextStream>
+#include <QTemporaryFile>
+#include <QTextBrowser>
+#include <QUrl>
 
 // KDE includes
 #include <KIO/Job>
@@ -29,8 +33,6 @@
 #include <KLocalizedString>
 #include <KPixmapSequence>
 #include <KPixmapSequenceOverlayPainter>
-#include <KTemporaryFile>
-#include <KTextBrowser>
 #include <KIconLoader>
 
 // QApt includes
@@ -42,10 +44,10 @@ ChangelogTab::ChangelogTab(QWidget *parent)
 {
     m_name = i18nc("@title:tab", "Changes List");
 
-    m_changelogBrowser = new KTextBrowser(this);
+    m_changelogBrowser = new QTextBrowser(this);
 
     m_busyWidget = new KPixmapSequenceOverlayPainter(this);
-    m_busyWidget->setSequence(KPixmapSequence("process-working", KIconLoader::SizeSmallMedium));
+    m_busyWidget->setSequence(KIconLoader::global()->loadPixmapSequence("process-working", KIconLoader::SizeSmallMedium));
     m_busyWidget->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
     m_busyWidget->setWidget(m_changelogBrowser->viewport());
 
@@ -111,16 +113,14 @@ void ChangelogTab::fetchChangelog()
     m_changelogBrowser->clear();
     m_busyWidget->start();
 
-    KTemporaryFile *changelogFile = new KTemporaryFile;
+    QTemporaryFile *changelogFile = new QTemporaryFile(QDir::tempPath() + QLatin1String("/muon_XXXXXX.txt"));
     changelogFile->setAutoRemove(false);
-    changelogFile->setPrefix("muon");
-    changelogFile->setSuffix(".txt");
     changelogFile->open();
     QString filename = changelogFile->fileName();
     delete changelogFile;
 
     KIO::FileCopyJob *getJob = KIO::file_copy(m_package->changelogUrl(),
-                               filename, -1,
+                               QUrl::fromLocalFile(filename), -1,
                                KIO::Overwrite | KIO::HideProgressInfo);
     getJob->setAutoDelete(false);
     m_jobFilenames.insert(getJob, filename);
diff --git a/src/DetailsTabs/ChangelogTab.h b/src/DetailsTabs/ChangelogTab.h
index 10d40b6..d683743 100644
--- a/src/DetailsTabs/ChangelogTab.h
+++ b/src/DetailsTabs/ChangelogTab.h
@@ -26,10 +26,11 @@
 // Qt includes
 #include <QtCore/QHash>
 
+class QTextBrowser;
+
 class KJob;
 class KPixmapSequenceOverlayPainter;
 class KTemporaryFile;
-class KTextBrowser;
 
 class ChangelogTab : public DetailsTab
 {
@@ -38,7 +39,7 @@ public:
     explicit ChangelogTab(QWidget *parent = 0);
 
 private:
-    KTextBrowser *m_changelogBrowser;
+    QTextBrowser *m_changelogBrowser;
     KPixmapSequenceOverlayPainter *m_busyWidget;
     QHash<KJob *, QString> m_jobFilenames;
 
diff --git a/src/DetailsTabs/DependsTab.cpp b/src/DetailsTabs/DependsTab.cpp
index b83a643..f342277 100644
--- a/src/DetailsTabs/DependsTab.cpp
+++ b/src/DetailsTabs/DependsTab.cpp
@@ -22,11 +22,11 @@
 
 // Qt includes
 #include <QScrollBar>
+#include <QTextBrowser>
 
 // KDE includes
 #include <KComboBox>
 #include <KLocalizedString>
-#include <KTextBrowser>
 
 // QApt includes
 #include <QApt/Package>
@@ -42,7 +42,7 @@ DependsTab::DependsTab(QWidget *parent)
     m_comboBox->addItem(i18nc("@item:inlistbox", "Dependants (Reverse Dependencies)"), ReverseDependsType);
     m_comboBox->addItem(i18nc("@item:inlistbox", "Virtual Packages Provided"), VirtualDependsType);
     connect(m_comboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(populateDepends(int)));
-    m_dependsBrowser = new KTextBrowser(this);
+    m_dependsBrowser = new QTextBrowser(this);
 
     m_layout->addWidget(m_comboBox);
     m_layout->addWidget(m_dependsBrowser);
diff --git a/src/DetailsTabs/DependsTab.h b/src/DetailsTabs/DependsTab.h
index eb5432f..076749a 100644
--- a/src/DetailsTabs/DependsTab.h
+++ b/src/DetailsTabs/DependsTab.h
@@ -23,8 +23,9 @@
 
 #include "DetailsTab.h"
 
+class QTextBrowser;
+
 class KComboBox;
-class KTextBrowser;
 
 class DependsTab : public DetailsTab
 {
@@ -41,7 +42,7 @@ public:
 
 private:
     KComboBox *m_comboBox;
-    KTextBrowser *m_dependsBrowser;
+    QTextBrowser *m_dependsBrowser;
 
 public Q_SLOTS:
     void refresh();
diff --git a/src/DetailsTabs/InstalledFilesTab.cpp b/src/DetailsTabs/InstalledFilesTab.cpp
index cf110d9..b0bc486 100644
--- a/src/DetailsTabs/InstalledFilesTab.cpp
+++ b/src/DetailsTabs/InstalledFilesTab.cpp
@@ -20,8 +20,10 @@
 
 #include "InstalledFilesTab.h"
 
+// Qt includes
+#include <QTextBrowser>
+
 // KDE includes
-#include <KTextBrowser>
 #include <KLocalizedString>
 
 // QApt includes
@@ -31,7 +33,7 @@ InstalledFilesTab::InstalledFilesTab(QWidget *parent)
     : DetailsTab(parent)
 {
     m_name = i18nc("@title:tab", "Installed Files");
-    m_filesBrowser = new KTextBrowser(this);
+    m_filesBrowser = new QTextBrowser(this);
 
     m_layout->addWidget(m_filesBrowser);
 }
diff --git a/src/DetailsTabs/InstalledFilesTab.h b/src/DetailsTabs/InstalledFilesTab.h
index 8a5bfe4..424cc8f 100644
--- a/src/DetailsTabs/InstalledFilesTab.h
+++ b/src/DetailsTabs/InstalledFilesTab.h
@@ -23,7 +23,7 @@
 
 #include "DetailsTab.h"
 
-class KTextBrowser;
+class QTextBrowser;
 
 class InstalledFilesTab : public DetailsTab
 {
@@ -34,7 +34,7 @@ public:
     bool shouldShow() const;
 
 private:
-    KTextBrowser *m_filesBrowser;
+    QTextBrowser *m_filesBrowser;
 
 public Q_SLOTS:
     void setPackage(QApt::Package *package);
diff --git a/src/DetailsTabs/MainTab.cpp b/src/DetailsTabs/MainTab.cpp
index b20d7c7..db4fa52 100644
--- a/src/DetailsTabs/MainTab.cpp
+++ b/src/DetailsTabs/MainTab.cpp
@@ -22,19 +22,16 @@
 
 // Qt includes
 #include <QHBoxLayout>
+#include <QMenu>
+#include <QTextBrowser>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QToolButton>
 #include <QtWidgets/QVBoxLayout>
 
 // KDE includes
-#include <KDebug>
-#include <KDialog>
-#include <KHBox>
 #include <KLocalizedString>
-#include <KMenu>
 #include <KMessageBox>
-#include <KTextBrowser>
 
 // QApt includes
 #include <QApt/Backend>
@@ -45,18 +42,16 @@ MainTab::MainTab(QWidget *parent)
 {
     m_name = i18nc("@title:tab", "Details");
 
-    KHBox *headerBox = new KHBox(this);
-    m_packageShortDescLabel = new QLabel(headerBox);
+    m_packageShortDescLabel = new QLabel;
     m_packageShortDescLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
     QFont font;
     font.setBold(true);
     m_packageShortDescLabel->setFont(font);
 
-    QWidget *buttonBox = new QWidget(headerBox);
+    QWidget *buttonBox = new QWidget;
 
     QHBoxLayout *buttonBoxLayout = new QHBoxLayout(buttonBox);
     buttonBoxLayout->setMargin(0);
-    buttonBoxLayout->setSpacing(KDialog::spacingHint());
 
     m_buttonLabel = new QLabel(buttonBox);
     m_buttonLabel->setText(i18nc("@label", "Mark for:"));
@@ -88,7 +83,7 @@ MainTab::MainTab(QWidget *parent)
     connect(m_reinstallButton, SIGNAL(clicked()), this, SLOT(emitSetReInstall()));
     buttonBoxLayout->addWidget(m_reinstallButton);
 
-    m_purgeMenu = new KMenu(m_removeButton);
+    m_purgeMenu = new QMenu(m_removeButton);
     m_purgeAction = new QAction(this);
     m_purgeAction->setIcon(QIcon::fromTheme("edit-delete-shred"));
     m_purgeAction->setText(i18nc("@action:button", "Purge"));
@@ -108,9 +103,13 @@ MainTab::MainTab(QWidget *parent)
     connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(emitSetKeep()));
     buttonBoxLayout->addWidget(m_cancelButton);
 
-    m_descriptionBrowser = new KTextBrowser(this);
+    QHBoxLayout *headerBox = new QHBoxLayout;
+    headerBox->addWidget(m_packageShortDescLabel);
+    headerBox->addWidget(buttonBox);
 
-    m_layout->addWidget(headerBox);
+    m_descriptionBrowser = new QTextBrowser(this);
+
+    m_layout->addLayout(headerBox);
     m_layout->addWidget(m_descriptionBrowser);
 }
 
diff --git a/src/DetailsTabs/MainTab.h b/src/DetailsTabs/MainTab.h
index f9aa9a6..6ae5e7f 100644
--- a/src/DetailsTabs/MainTab.h
+++ b/src/DetailsTabs/MainTab.h
@@ -31,10 +31,10 @@
 
 class QPushButton;
 class QLabel;
+class QMenu;
+class QTextBrowser;
 class QToolButton;
 
-class KMenu;
-class KTextBrowser;
 
 class MainTab : public DetailsTab
 {
@@ -51,11 +51,11 @@ private:
     QPushButton *m_upgradeButton;
     QPushButton *m_reinstallButton;
     QAction *m_purgeAction;
-    KMenu *m_purgeMenu;
+    QMenu *m_purgeMenu;
     QPushButton *m_purgeButton;
     QPushButton *m_cancelButton;
 
-    KTextBrowser *m_descriptionBrowser;
+    QTextBrowser *m_descriptionBrowser;
 
 public Q_SLOTS:
     void refresh();
diff --git a/src/DetailsTabs/TechnicalDetailsTab.cpp b/src/DetailsTabs/TechnicalDetailsTab.cpp
index e387cb8..537009d 100644
--- a/src/DetailsTabs/TechnicalDetailsTab.cpp
+++ b/src/DetailsTabs/TechnicalDetailsTab.cpp
@@ -27,10 +27,8 @@
 #include <QScrollArea>
 
 // KDE includes
-#include <KGlobal>
-#include <KVBox>
-#include <KHBox>
 #include <KFormat>
+#include <KLocalizedString>
 
 // QApt includes
 #include <QApt/Backend>
@@ -50,9 +48,7 @@ TechnicalDetailsTab::TechnicalDetailsTab(QWidget *parent)
     scrollArea->viewport()->setAutoFillBackground(false);
     m_layout->addWidget(scrollArea);
 
-    KVBox *mainWidget = new KVBox(this);
-
-    QWidget *generalWidget = new QWidget(mainWidget);
+    QWidget *generalWidget = new QWidget;
     QGridLayout *generalGrid = new QGridLayout(generalWidget);
     generalWidget->setLayout(generalGrid);
 
@@ -106,9 +102,7 @@ TechnicalDetailsTab::TechnicalDetailsTab(QWidget *parent)
 
     generalGrid->setColumnStretch(1, 1);
 
-    KHBox *versionWidget = new KHBox(mainWidget);
-
-    m_installedVersionBox = new QGroupBox(versionWidget);
+    m_installedVersionBox = new QGroupBox;
     m_installedVersionBox->setTitle(i18nc("@title:group", "Installed Version"));
     QGridLayout *installedGridLayout = new QGridLayout(m_installedVersionBox);
     m_installedVersionBox->setLayout(installedGridLayout);
@@ -133,7 +127,7 @@ TechnicalDetailsTab::TechnicalDetailsTab(QWidget *parent)
     installedGridLayout->setColumnStretch(1, 1);
 
 
-    m_currentVersionBox = new QGroupBox(versionWidget);
+    m_currentVersionBox = new QGroupBox;
     m_currentVersionBox->setTitle(i18nc("@title:group", "Available Version"));
     QGridLayout *currentGridLayout = new QGridLayout(m_currentVersionBox);
     m_currentVersionBox->setLayout(currentGridLayout);
@@ -165,8 +159,20 @@ TechnicalDetailsTab::TechnicalDetailsTab(QWidget *parent)
 
     currentGridLayout->setColumnStretch(1, 1);
 
-    QWidget *verticalSpacer = new QWidget(mainWidget);
+    QHBoxLayout *versionLayout = new QHBoxLayout;
+    versionLayout->addWidget(m_installedVersionBox);
+    versionLayout->addWidget(m_currentVersionBox);
+
+    QWidget *verticalSpacer = new QWidget;
     verticalSpacer->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+    QVBoxLayout *mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(generalWidget);
+    mainLayout->addLayout(versionLayout);
+    mainLayout->addWidget(verticalSpacer);
+
+    QWidget *mainWidget = new QWidget;
+    mainWidget->setLayout(mainLayout);
     scrollArea->setWidget(mainWidget);
 }
 
diff --git a/src/DetailsTabs/VersionTab.cpp b/src/DetailsTabs/VersionTab.cpp
index f3a903f..629b481 100644
--- a/src/DetailsTabs/VersionTab.cpp
+++ b/src/DetailsTabs/VersionTab.cpp
@@ -28,7 +28,6 @@
 #include <QStandardItemModel>
 
 // KDE includes
-#include <KDialog>
 #include <KLocalizedString>
 
 // QApt includes
diff --git a/src/DetailsWidget.cpp b/src/DetailsWidget.cpp
index f3b95d9..257bc67 100644
--- a/src/DetailsWidget.cpp
+++ b/src/DetailsWidget.cpp
@@ -39,7 +39,7 @@
 #include "DetailsTabs/VersionTab.h"
 
 DetailsWidget::DetailsWidget(QWidget *parent)
-    : KTabWidget(parent)
+    : QTabWidget(parent)
 {
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding);
     setDocumentMode(true);
diff --git a/src/DetailsWidget.h b/src/DetailsWidget.h
index 80f7a9a..9187e2d 100644
--- a/src/DetailsWidget.h
+++ b/src/DetailsWidget.h
@@ -21,11 +21,9 @@
 #ifndef DETAILSWIDGET_H
 #define DETAILSWIDGET_H
 
-#include <KTabWidget>
-
-
 // Qt includes
 #include <QtCore/QVector>
+#include <QTabWidget>
 
 class QScrollArea;
 
@@ -37,11 +35,11 @@ namespace QApt
 
 class DetailsTab;
 
-class DetailsWidget : public KTabWidget
+class DetailsWidget : public QTabWidget
 {
     Q_OBJECT
 public:
-    explicit DetailsWidget(QWidget *parent);
+    explicit DetailsWidget(QWidget *parent = 0);
     ~DetailsWidget();
 
 private:
diff --git a/src/DownloadModel/DownloadDelegate.cpp b/src/DownloadModel/DownloadDelegate.cpp
index 4cf01ae..b3e6e36 100644
--- a/src/DownloadModel/DownloadDelegate.cpp
+++ b/src/DownloadModel/DownloadDelegate.cpp
@@ -21,10 +21,10 @@
 #include "DownloadDelegate.h"
 
 // Qt includes
+#include <QApplication>
 #include <QPainter>
 
 // KDE includes
-#include <KApplication>
 #include <KFormat>
 #include <KLocalizedString>
 
@@ -74,7 +74,7 @@ void DownloadDelegate::paint(QPainter* painter, const QStyleOptionViewItem& opti
             progressBarOption.text = text;
             progressBarOption.textVisible = true;
 
-            KApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter);
+            QApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter);
             break;
         }
     }
diff --git a/src/DownloadModel/DownloadModel.cpp b/src/DownloadModel/DownloadModel.cpp
index 0916ec7..f2903c4 100644
--- a/src/DownloadModel/DownloadModel.cpp
+++ b/src/DownloadModel/DownloadModel.cpp
@@ -20,7 +20,6 @@
 
 #include "DownloadModel.h"
 
-#include <KDebug>
 #include <KLocalizedString>
 
 DownloadModel::DownloadModel(QObject *parent)
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index de068d8..c3d6a83 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -32,12 +32,10 @@
 
 // KDE includes
 #include <KActionCollection>
-#include <KFileDialog>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KProtocolManager>
 #include <KStandardAction>
-#include <KStatusBar>
 
 // QApt includes
 #include <QApt/Backend>
@@ -69,7 +67,7 @@ MainWindow::MainWindow()
 
 MainWindow::~MainWindow()
 {
-    MuonSettings::self()->writeConfig();
+    MuonSettings::self()->save();
 }
 
 void MainWindow::initGUI()
@@ -164,7 +162,7 @@ void MainWindow::loadSplitterSizes()
 void MainWindow::saveSplitterSizes()
 {
     MuonSettings::self()->setSplitterSizes(m_mainWidget->sizes());
-    MuonSettings::self()->writeConfig();
+    MuonSettings::self()->save();
 }
 
 void MainWindow::setupActions()
diff --git a/src/ManagerWidget.cpp b/src/ManagerWidget.cpp
index 930c4af..05fef2d 100644
--- a/src/ManagerWidget.cpp
+++ b/src/ManagerWidget.cpp
@@ -27,8 +27,6 @@
 #include <QSplitter>
 
 // KDE includes
-#include <KDebug>
-#include <KHBox>
 #include <KLocalizedString>
 
 // QApt includes
diff --git a/src/PackageModel/PackageView.h b/src/PackageModel/PackageView.h
index 89e4db3..f1ecd34 100644
--- a/src/PackageModel/PackageView.h
+++ b/src/PackageModel/PackageView.h
@@ -27,7 +27,7 @@ class PackageView : public QTreeView
 {
     Q_OBJECT
 public:
-    explicit PackageView(QWidget *parent);
+    explicit PackageView(QWidget *parent = 0);
 
 protected Q_SLOTS:
     void currentChanged(const QModelIndex &current, const QModelIndex &previous);
diff --git a/src/PackageModel/PackageWidget.cpp b/src/PackageModel/PackageWidget.cpp
index bf10d14..1d0c377 100644
--- a/src/PackageModel/PackageWidget.cpp
+++ b/src/PackageModel/PackageWidget.cpp
@@ -28,18 +28,17 @@
 #include <QtWidgets/QHeaderView>
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QLabel>
+#include <QLineEdit>
+#include <QMenu>
 #include <QSplitter>
+#include <QVBoxLayout>
 
 // KDE includes
 #include <KComboBox>
-#include <KHBox>
-#include <KLineEdit>
 #include <KLocalizedString>
-#include <KMenu>
 #include <KMessageBox>
 #include <KPixmapSequence>
 #include <KPixmapSequenceOverlayPainter>
-#include <KVBox>
 #include <KIconLoader>
 
 // QApt includes
@@ -70,7 +69,7 @@ QApt::PackageList sortPackages(QApt::PackageList list)
 }
 
 PackageWidget::PackageWidget(QWidget *parent)
-        : KVBox(parent)
+        : QWidget(parent)
         , m_backend(0)
         , m_headerLabel(0)
         , m_searchEdit(0)
@@ -85,10 +84,13 @@ PackageWidget::PackageWidget(QWidget *parent)
     m_proxyModel = new PackageProxyModel(this);
     m_proxyModel->setSourceModel(m_model);
 
-    KVBox *topVBox = new KVBox;
+    QVBoxLayout *topVBox = new QVBoxLayout;
+    topVBox->setContentsMargins(0, 0, 0, 0);
+    topVBox->setSpacing(0);
 
-    m_headerLabel = new QLabel(topVBox);
+    m_headerLabel = new QLabel;
     m_headerLabel->setTextFormat(Qt::RichText);
+    topVBox->addWidget(m_headerLabel);
 
     m_searchTimer = new QTimer(this);
     m_searchTimer->setInterval(300);
@@ -97,20 +99,20 @@ PackageWidget::PackageWidget(QWidget *parent)
 
     setupActions();
 
-    m_searchEdit = new KLineEdit(topVBox);
+    m_searchEdit = new QLineEdit;
     m_searchEdit->setEnabled(false);
-    m_searchEdit->setClickMessage(i18nc("@label Line edit click message", "Search"));
-    m_searchEdit->setClearButtonShown(true);
+    m_searchEdit->setPlaceholderText(i18nc("@label Line edit click message", "Search"));
+    m_searchEdit->setClearButtonEnabled(true);
     m_searchEdit->hide(); // Off by default, use showSearchEdit() to show
+    topVBox->addWidget(m_searchEdit);
 
-    m_packageView = new PackageView(topVBox);
+    m_packageView = new PackageView;
     m_packageView->setModel(m_proxyModel);
     m_packageView->setItemDelegate(delegate);
-    m_packageView->header()->setResizeMode(0, QHeaderView::Stretch);
+    m_packageView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
+    topVBox->addWidget(m_packageView);
 
-    KVBox *bottomVBox = new KVBox(this);
-
-    m_detailsWidget = new DetailsWidget(bottomVBox);
+    m_detailsWidget = new DetailsWidget;
     connect(m_detailsWidget, SIGNAL(setInstall(QApt::Package*)),
             this, SLOT(setInstall(QApt::Package*)));
     connect(m_detailsWidget, SIGNAL(setRemove(QApt::Package*)),
@@ -143,10 +145,17 @@ PackageWidget::PackageWidget(QWidget *parent)
             this, SLOT(sectionClicked(int)));
     connect(m_searchEdit, SIGNAL(textChanged(QString)), m_searchTimer, SLOT(start()));
 
-    QSplitter *splitter = new QSplitter(this);
+    QWidget* topWidget = new QWidget;
+    topWidget->setLayout(topVBox);
+
+    QSplitter *splitter = new QSplitter;
     splitter->setOrientation(Qt::Vertical);
-    splitter->addWidget(topVBox);
-    splitter->addWidget(bottomVBox);
+    splitter->addWidget(topWidget);
+    splitter->addWidget(m_detailsWidget);
+
+    setLayout(new QVBoxLayout);
+    layout()->setContentsMargins(0, 0, 0, 0);
+    layout()->addWidget(splitter);
 }
 
 void PackageWidget::setupActions()
@@ -248,7 +257,7 @@ void PackageWidget::reload()
     QFuture<QList<QApt::Package*> > future = QtConcurrent::run(sortPackages, packageList);
     m_watcher->setFuture(future);
     m_proxyModel->setSourceModel(m_model);
-    m_packageView->header()->setResizeMode(0, QHeaderView::Stretch);
+    m_packageView->header()->setSectionResizeMode(0, QHeaderView::Stretch);
 }
 
 void PackageWidget::packageActivated(const QModelIndex &index)
@@ -263,7 +272,7 @@ void PackageWidget::packageActivated(const QModelIndex &index)
 
 void PackageWidget::contextMenuRequested(const QPoint &pos)
 {
-    KMenu menu;
+    QMenu menu;
 
     menu.addAction(m_installAction);
     menu.addAction(m_removeAction);
diff --git a/src/PackageModel/PackageWidget.h b/src/PackageModel/PackageWidget.h
index 7e6503b..02abcfc 100644
--- a/src/PackageModel/PackageWidget.h
+++ b/src/PackageModel/PackageWidget.h
@@ -24,17 +24,15 @@
 // Qt includes
 #include <QModelIndex>
 #include <QFutureWatcher>
-
-// KDE includes
-#include <KVBox>
+#include <QWidget>
 
 #include <QApt/Package>
 
 class QLabel;
+class QLineEdit;
 class QTimer;
 class QVBoxLayout;
 
-class KLineEdit;
 class KPixmapSequenceOverlayPainter;
 
 class DetailsWidget;
@@ -47,7 +45,7 @@ namespace QApt
     class Backend;
 }
 
-class PackageWidget : public KVBox
+class PackageWidget : public QWidget
 {
     Q_OBJECT
 public:
@@ -82,7 +80,7 @@ private:
     QFutureWatcher<QList<QApt::Package*> >* m_watcher;
     QWidget *m_headerWidget;
     QLabel *m_headerLabel;
-    KLineEdit *m_searchEdit;
+    QLineEdit *m_searchEdit;
     QTimer *m_searchTimer;
 
     QAction *m_installAction;
diff --git a/src/StatusWidget.cpp b/src/StatusWidget.cpp
index 17e11c1..ecd17ea 100644
--- a/src/StatusWidget.cpp
+++ b/src/StatusWidget.cpp
@@ -28,8 +28,8 @@
 #include <QtWidgets/QProgressBar>
 
 // KDE includes
-#include <KGlobal>
 #include <KFormat>
+#include <KLocalizedString>
 
 // QApt includes
 #include <QApt/Backend>
diff --git a/src/TransactionWidget.cpp b/src/TransactionWidget.cpp
index fd25646..3f15888 100644
--- a/src/TransactionWidget.cpp
+++ b/src/TransactionWidget.cpp
@@ -75,7 +75,7 @@ TransactionWidget::TransactionWidget(QWidget *parent)
     m_downloadView->setEditTriggers(QAbstractItemView::NoEditTriggers);
 
     m_downloadView->header()->setStretchLastSection(false);
-    m_downloadView->header()->setResizeMode(1, QHeaderView::Stretch);
+    m_downloadView->header()->setSectionResizeMode(1, QHeaderView::Stretch);
     m_downloadView->hide();
 
     QString uuid = QUuid::createUuid().toString();
diff --git a/src/config/GeneralSettingsPage.cpp b/src/config/GeneralSettingsPage.cpp
index 42d9f21..a5cff02 100644
--- a/src/config/GeneralSettingsPage.cpp
+++ b/src/config/GeneralSettingsPage.cpp
@@ -26,7 +26,6 @@
 #include <QSpinBox>
 #include <QFormLayout>
 
-#include <KDialog>
 #include <KLocalizedString>
 
 #include <QApt/Config>
@@ -47,7 +46,6 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent, QApt::Config *aptConfi
 {
     QFormLayout *layout = new QFormLayout(this);
     layout->setMargin(0);
-    layout->setSpacing(KDialog::spacingHint());
     setLayout(layout);
 
     m_askChangesCheckBox->setText(i18n("Ask to confirm changes that affect other packages"));
@@ -130,7 +128,7 @@ void GeneralSettingsPage::applySettings()
     settings->setAskChanges(m_askChangesCheckBox->isChecked());
     settings->setShowMultiArchDupes(m_multiArchDupesBox->isChecked());
     settings->setUndoStackSize(m_undoStackSpinbox->value());
-    settings->writeConfig();
+    settings->save();
 
     // Only write if changed. Unnecessary password dialogs ftl
     if (m_aptConfig->readEntry("APT::Install-Recommends", true) != m_recommendsCheckBox->isChecked()) {