summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Steinhauser <linux@bernd-steinhauser.de>2016-04-24 22:42:28 (GMT)
committerAlbert Astals Cid <aacid@kde.org>2016-04-24 22:42:28 (GMT)
commiteaa16c4e88d67bcf14fc112b45f4fd45045320bc (patch)
treed4272a1b2d13d888cfb1fe4a59fc42249b8f9ece
parentac661522c6b85d9309437676b3be2f1bf7aebe00 (diff)
Use KLocalizedString instead of klocale.h
he use of klocale.h seems to be the last occurrence of kdelibs4support. Thus use KLocalizedString and don't link to KF5::KDELibs4Support. The only reason why it cannot be fully cleaned from that yet is that it requires FindAlsa.cmake which is part of kdelibs4support. REVIEW: 127732
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/kcompactdisc_p.cpp3
-rw-r--r--src/phonon_interface.cpp2
-rw-r--r--src/wmlib_interface.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f07cd05..8976698 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -67,7 +67,6 @@ set_target_properties(KF5CompactDisc PROPERTIES
target_link_libraries(KF5CompactDisc
Qt5::DBus
KF5::CoreAddons
- KF5::KDELibs4Support
KF5::Solid
KF5::I18n
Phonon::phonon4qt5
diff --git a/src/kcompactdisc_p.cpp b/src/kcompactdisc_p.cpp
index a39e769..4bf2af8 100644
--- a/src/kcompactdisc_p.cpp
+++ b/src/kcompactdisc_p.cpp
@@ -24,7 +24,8 @@
#include "phonon_interface.h"
#include <QtGlobal>
-#include <klocale.h>
+
+#include <KLocalizedString>
Q_LOGGING_CATEGORY(CD_PLAYLIST, "cd.playlist")
diff --git a/src/phonon_interface.cpp b/src/phonon_interface.cpp
index 45f21db..5fe9526 100644
--- a/src/phonon_interface.cpp
+++ b/src/phonon_interface.cpp
@@ -25,7 +25,7 @@
#include <QtGlobal>
-#include <klocale.h>
+#include <KLocalizedString>
#include <phonon/Global>
#include <phonon/MediaObject>
diff --git a/src/wmlib_interface.cpp b/src/wmlib_interface.cpp
index b26c514..60a3ae8 100644
--- a/src/wmlib_interface.cpp
+++ b/src/wmlib_interface.cpp
@@ -22,7 +22,7 @@
#include <QtGlobal>
-#include <klocale.h>
+#include <KLocalizedString>
extern "C"
{