summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Volkov <[email protected]>2019-01-16 20:08:50 +0300
committerAlexander Volkov <[email protected]>2019-01-17 14:33:56 +0300
commitdeebad73af227cb78cace7ca26ed50c0fa491213 (patch)
tree913e07be53378e18c00882097374d86c817d4fe0
parent9f96cce2cb8b2f327d3f952628e7926e79909cdd (diff)
[Mouse KCM] Port away from KDELibs4Supportv5.14.90
Reviewers: broulik Reviewed By: broulik Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D18300
-rw-r--r--kcms/mouse/CMakeLists.txt1
-rw-r--r--kcms/mouse/kcm/xlib/xlib_config.cpp11
2 files changed, 5 insertions, 7 deletions
diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt
index 2ede39a..296298c 100644
--- a/kcms/mouse/CMakeLists.txt
+++ b/kcms/mouse/CMakeLists.txt
@@ -75,7 +75,6 @@ target_link_libraries(kcm_mouse
KF5::I18n
KF5::KIOCore
KF5::KIOWidgets
- KF5::KDELibs4Support
KF5::Declarative
Qt5::DBus
diff --git a/kcms/mouse/kcm/xlib/xlib_config.cpp b/kcms/mouse/kcm/xlib/xlib_config.cpp
index 7bab802..a3b5913 100644
--- a/kcms/mouse/kcm/xlib/xlib_config.cpp
+++ b/kcms/mouse/kcm/xlib/xlib_config.cpp
@@ -30,13 +30,11 @@
#include "../../../migrationlib/kdelibs4config.h"
-#include <kglobalsettings.h>
#include <config-workspace.h>
#include <ktoolinvocation.h>
#include <klocalizedstring.h>
//#include <kconfig.h>
-#include <kstandarddirs.h>
#include <kaboutdata.h>
#include <KPluginFactory>
#include <KPluginLoader>
@@ -47,6 +45,7 @@
#include <QSpinBox>
#include <QWhatsThis>
#include <QTabWidget>
+#include <QStandardPaths>
#include <KConfig>
#include <KConfigGroup>
@@ -151,11 +150,11 @@ void XlibConfig::setHandedness(Handed val)
leftHanded->setChecked(false);
if (val == Handed::Right) {
rightHanded->setChecked(true);
- mousePix->setPixmap(KStandardDirs::locate("data", "kcmmouse/pics/mouse_rh.png"));
+ mousePix->setPixmap(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kcmmouse/pics/mouse_rh.png"));
}
else {
leftHanded->setChecked(true);
- mousePix->setPixmap(KStandardDirs::locate("data", "kcmmouse/pics/mouse_lh.png"));
+ mousePix->setPixmap(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kcmmouse/pics/mouse_lh.png"));
}
m_backend->settings()->handedNeedsApply = true;
}
@@ -292,9 +291,9 @@ void XlibConfig::defaults()
void XlibConfig::slotHandedChanged(int val)
{
if (val == static_cast<int>(Handed::Right))
- mousePix->setPixmap(KStandardDirs::locate("data", "kcmmouse/pics/mouse_rh.png"));
+ mousePix->setPixmap(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kcmmouse/pics/mouse_rh.png"));
else
- mousePix->setPixmap(KStandardDirs::locate("data", "kcmmouse/pics/mouse_lh.png"));
+ mousePix->setPixmap(QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kcmmouse/pics/mouse_lh.png"));
m_backend->settings()->handedNeedsApply = true;
}