[rkward/frameworks] rkward: Adjust klocale.h includes to KLocalizedString (and some side-effects)

Thomas Friedrichsmeier thomas.friedrichsmeier at ruhr-uni-bochum.de
Thu Feb 18 20:55:59 UTC 2016 

Git commit b99258bf4b2f76f51748edae2227feb805b574d1 by Thomas Friedrichsmeier.
Committed on 18/02/2016 at 20:55.
Pushed by tfry into branch 'frameworks'.

Adjust klocale.h includes to KLocalizedString (and some side-effects)

M  +1    -1    rkward/agents/rkeditobjectagent.cpp
M  +1    -1    rkward/agents/rkloadagent.cpp
M  +1    -1    rkward/agents/rkprintagent.cpp
M  +1    -1    rkward/agents/rkquitagent.cpp
M  +1    -1    rkward/agents/rksaveagent.cpp
M  +1    -1    rkward/agents/showedittextfileagent.cpp
M  +1    -1    rkward/core/CMakeLists.txt
M  +1    -1    rkward/core/renvironmentobject.cpp
M  +1    -1    rkward/core/rkmodificationtracker.cpp
M  +1    -1    rkward/core/rkpseudoobjects.cpp
M  +1    -1    rkward/core/rkrownames.cpp
M  +1    -1    rkward/core/robject.cpp
M  +1    -1    rkward/core/robjectlist.cpp
M  +1    -1    rkward/dataeditor/rkeditordataframe.cpp
M  +1    -1    rkward/dataeditor/rkvareditmodel.cpp
M  +1    -1    rkward/dataeditor/twintable.cpp
M  +1    -1    rkward/dialogs/rkerrordialog.cpp
M  +1    -1    rkward/dialogs/rkimportdialog.cpp
M  +2    -1    rkward/dialogs/rkloadlibsdialog.cpp
M  +1    -1    rkward/dialogs/rkreadlinedialog.cpp
M  +1    -1    rkward/dialogs/rkrecoverdialog.cpp
M  +1    -1    rkward/dialogs/rkselectlistdialog.cpp
M  +1    -1    rkward/dialogs/startupdialog.cpp
M  +1    -1    rkward/main.cpp
M  +1    -1    rkward/misc/editformatdialog.cpp
M  +1    -1    rkward/misc/editlabelsdialog.cpp
M  +1    -1    rkward/misc/getfilenamewidget.cpp
M  +1    -1    rkward/misc/multistringselector.cpp
M  +1    -1    rkward/misc/rkaccordiontable.cpp
M  +2    -1    rkward/misc/rkcommonfunctions.cpp
M  +1    -1    rkward/misc/rkdynamicsearchline.cpp
M  +1    -1    rkward/misc/rkfindbar.cpp
M  +1    -1    rkward/misc/rkmessagecatalog.cpp
M  +1    -1    rkward/misc/rkobjectlistview.cpp
M  +1    -1    rkward/misc/rkprogresscontrol.cpp
M  +1    -1    rkward/misc/rksaveobjectchooser.cpp
M  +1    -1    rkward/misc/rkspecialactions.cpp
M  +1    -1    rkward/misc/rkstandardactions.cpp
M  +1    -1    rkward/misc/rkxmlguipreviewarea.cpp
M  +1    -1    rkward/misc/xmlhelper.cpp
M  +1    -1    rkward/plugin/rkcheckbox.cpp
M  +1    -1    rkward/plugin/rkcomponentmap.cpp
M  +1    -1    rkward/plugin/rkcomponentmeta.cpp
M  +1    -1    rkward/plugin/rkcomponentproperties.cpp
M  +1    -1    rkward/plugin/rkdropdown.cpp
M  +1    -1    rkward/plugin/rkformula.cpp
M  +1    -1    rkward/plugin/rkinput.cpp
M  +1    -1    rkward/plugin/rkmatrixinput.cpp
M  +1    -1    rkward/plugin/rkoptionset.cpp
M  +1    -1    rkward/plugin/rkpluginbrowser.cpp
M  +1    -1    rkward/plugin/rkpluginsaveobject.cpp
M  +1    -1    rkward/plugin/rkpluginspinbox.cpp
M  +1    -1    rkward/plugin/rkpreviewbox.cpp
M  +1    -1    rkward/plugin/rkradio.cpp
M  +1    -1    rkward/plugin/rkstandardcomponent.cpp
M  +1    -1    rkward/plugin/rkstandardcomponentgui.cpp
M  +1    -1    rkward/plugin/rkvarselector.cpp
M  +1    -1    rkward/plugin/rkvarslot.cpp
M  +1    -1    rkward/rbackend/rcommandstack.cpp
M  +1    -1    rkward/rbackend/rinterface.cpp
M  +3    -1    rkward/rbackend/rkfrontendtransmitter.cpp
M  +1    -1    rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
M  +1    -1    rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
M  +1    -1    rkward/rkconsole.cpp
M  +1    -1    rkward/rkward.cpp
M  +1    -1    rkward/robjectviewer.cpp
M  +1    -1    rkward/scriptbackends/CMakeLists.txt
M  +1    -1    rkward/scriptbackends/qtscriptbackend.cpp
M  +1    -1    rkward/scriptbackends/rkcomponentscripting.cpp
M  +1    -1    rkward/scriptbackends/scriptbackend.cpp
M  +2    -1    rkward/settings/rksettings.cpp
M  +1    -1    rkward/settings/rksettingsmodulecommandeditor.cpp
M  +2    -1    rkward/settings/rksettingsmoduleconsole.cpp
M  +1    -1    rkward/settings/rksettingsmoduledebug.cpp
M  +2    -1    rkward/settings/rksettingsmodulegeneral.cpp
M  +1    -1    rkward/settings/rksettingsmodulegraphics.cpp
M  +1    -1    rkward/settings/rksettingsmoduleobjectbrowser.cpp
M  +1    -1    rkward/settings/rksettingsmoduleoutput.cpp
M  +2    -1    rkward/settings/rksettingsmoduleplugins.cpp
M  +2    -1    rkward/settings/rksettingsmoduler.cpp
M  +1    -1    rkward/settings/rksettingsmodulewatch.cpp
M  +1    -1    rkward/windows/detachedwindowcontainer.cpp
M  +1    -1    rkward/windows/rcontrolwindow.cpp
M  +1    -1    rkward/windows/rkcallstackviewer.cpp
M  +1    -1    rkward/windows/rkcommandeditorwindow.cpp
M  +1    -1    rkward/windows/rkcommandlog.cpp
M  +1    -1    rkward/windows/rkdebugconsole.cpp
M  +1    -1    rkward/windows/rkdebugmessagewindow.cpp
M  +1    -1    rkward/windows/rkfilebrowser.cpp
M  +1    -1    rkward/windows/rkhelpsearchwindow.cpp
M  +1    -1    rkward/windows/rkhtmlwindow.cpp
M  +1    -1    rkward/windows/rkmdiwindow.cpp
M  +1    -1    rkward/windows/rktoolwindowbar.cpp
M  +1    -1    rkward/windows/rktoplevelwindowgui.cpp
M  +1    -1    rkward/windows/rkwindowcatcher.cpp
M  +1    -1    rkward/windows/rkworkplace.cpp
M  +1    -1    rkward/windows/rkworkplaceview.cpp
M  +1    -1    rkward/windows/robjectbrowser.cpp

http://commits.kde.org/rkward/b99258bf4b2f76f51748edae2227feb805b574d1

diff --git a/rkward/agents/rkeditobjectagent.cpp b/rkward/agents/rkeditobjectagent.cpp
index 2f4f072..e93b83c 100644
--- a/rkward/agents/rkeditobjectagent.cpp
+++ b/rkward/agents/rkeditobjectagent.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "rkeditobjectagent.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 
 #include "../rkglobals.h"
diff --git a/rkward/agents/rkloadagent.cpp b/rkward/agents/rkloadagent.cpp
index 0cafe55..ef66143 100644
--- a/rkward/agents/rkloadagent.cpp
+++ b/rkward/agents/rkloadagent.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "rkloadagent.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 #include <kdeversion.h>
 #include <kio/filecopyjob.h>
diff --git a/rkward/agents/rkprintagent.cpp b/rkward/agents/rkprintagent.cpp
index 810f0ee..6227a82 100644
--- a/rkward/agents/rkprintagent.cpp
+++ b/rkward/agents/rkprintagent.cpp
@@ -24,7 +24,7 @@
 #include <krun.h>
 #include <kservice.h>
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KLocalizedString>
 #include <QUrl>
 
 #include "../rkward.h"
diff --git a/rkward/agents/rkquitagent.cpp b/rkward/agents/rkquitagent.cpp
index 259069d..47361fd 100644
--- a/rkward/agents/rkquitagent.cpp
+++ b/rkward/agents/rkquitagent.cpp
@@ -17,7 +17,7 @@
 
 #include "rkquitagent.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include <qtimer.h>
 
diff --git a/rkward/agents/rksaveagent.cpp b/rkward/agents/rksaveagent.cpp
index 7a71f5b..9050d58 100644
--- a/rkward/agents/rksaveagent.cpp
+++ b/rkward/agents/rksaveagent.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "rksaveagent.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 
 #include <qapplication.h>
diff --git a/rkward/agents/showedittextfileagent.cpp b/rkward/agents/showedittextfileagent.cpp
index 0272d64..ca453fd 100644
--- a/rkward/agents/showedittextfileagent.cpp
+++ b/rkward/agents/showedittextfileagent.cpp
@@ -17,7 +17,7 @@
 
 #include "showedittextfileagent.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <KMessageWidget>
 
 #include "../windows/rkcommandeditorwindow.h"
diff --git a/rkward/core/CMakeLists.txt b/rkward/core/CMakeLists.txt
index e6983e7..3a5f36c 100644
--- a/rkward/core/CMakeLists.txt
+++ b/rkward/core/CMakeLists.txt
@@ -13,5 +13,5 @@ SET(core_STAT_SRCS
    )
 
 ADD_LIBRARY(core STATIC ${core_STAT_SRCS})
-TARGET_LINK_LIBRARIES(core Qt5::Core Qt5::Widgets KF5::WidgetsAddons)
+TARGET_LINK_LIBRARIES(core Qt5::Core Qt5::Widgets KF5::WidgetsAddons KF5::I18n)
 
diff --git a/rkward/core/renvironmentobject.cpp b/rkward/core/renvironmentobject.cpp
index 2ee3937..9e6857e 100644
--- a/rkward/core/renvironmentobject.cpp
+++ b/rkward/core/renvironmentobject.cpp
@@ -18,7 +18,7 @@
 #include "renvironmentobject.h"
 
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "robjectlist.h"
 #include "rkpseudoobjects.h"
diff --git a/rkward/core/rkmodificationtracker.cpp b/rkward/core/rkmodificationtracker.cpp
index 6db6b58..b30a38e 100644
--- a/rkward/core/rkmodificationtracker.cpp
+++ b/rkward/core/rkmodificationtracker.cpp
@@ -17,7 +17,7 @@
 #include "rkmodificationtracker.h"
 
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../rkglobals.h"
 #include "../dataeditor/rkeditor.h"
diff --git a/rkward/core/rkpseudoobjects.cpp b/rkward/core/rkpseudoobjects.cpp
index 0ca3cc3..4215464 100644
--- a/rkward/core/rkpseudoobjects.cpp
+++ b/rkward/core/rkpseudoobjects.cpp
@@ -17,7 +17,7 @@
 
 #include "rkpseudoobjects.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../debug.h"
 
diff --git a/rkward/core/rkrownames.cpp b/rkward/core/rkrownames.cpp
index 8b9e118..33e22d0 100644
--- a/rkward/core/rkrownames.cpp
+++ b/rkward/core/rkrownames.cpp
@@ -19,7 +19,7 @@
 
 #include <limits.h>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "rcontainerobject.h"
 #include "../rkglobals.h"
diff --git a/rkward/core/robject.cpp b/rkward/core/robject.cpp
index 1c0ca12..b7d1173 100644
--- a/rkward/core/robject.cpp
+++ b/rkward/core/robject.cpp
@@ -19,7 +19,7 @@
 #include "robject.h"
 
 #include <qregexp.h>
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../rbackend/rinterface.h"
 #include "../rbackend/rkrbackendprotocol_shared.h"
diff --git a/rkward/core/robjectlist.cpp b/rkward/core/robjectlist.cpp
index 84d23f2..e2f10ca 100644
--- a/rkward/core/robjectlist.cpp
+++ b/rkward/core/robjectlist.cpp
@@ -24,7 +24,7 @@
 #include <qtimer.h>
 #include <qstringlist.h>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "renvironmentobject.h"
 #include "../rbackend/rinterface.h"
diff --git a/rkward/dataeditor/rkeditordataframe.cpp b/rkward/dataeditor/rkeditordataframe.cpp
index 9c0ce41..d900f61 100644
--- a/rkward/dataeditor/rkeditordataframe.cpp
+++ b/rkward/dataeditor/rkeditordataframe.cpp
@@ -17,7 +17,7 @@
 #include "rkeditordataframe.h"
 
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../rbackend/rinterface.h"
 #include "../rkglobals.h"
diff --git a/rkward/dataeditor/rkvareditmodel.cpp b/rkward/dataeditor/rkvareditmodel.cpp
index fefd156..a9acfbe 100644
--- a/rkward/dataeditor/rkvareditmodel.cpp
+++ b/rkward/dataeditor/rkvareditmodel.cpp
@@ -17,7 +17,7 @@
 
 #include "rkvareditmodel.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include <QColor>
 #include <QTimer>
diff --git a/rkward/dataeditor/twintable.cpp b/rkward/dataeditor/twintable.cpp
index 48d4298..50f7cbb 100644
--- a/rkward/dataeditor/twintable.cpp
+++ b/rkward/dataeditor/twintable.cpp
@@ -17,7 +17,7 @@
 
 #include "twintable.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <QAction>
 #include <kactioncollection.h>
 #include <kxmlguifactory.h>
diff --git a/rkward/dialogs/rkerrordialog.cpp b/rkward/dialogs/rkerrordialog.cpp
index 35e93d6..7c1a5d4 100644
--- a/rkward/dialogs/rkerrordialog.cpp
+++ b/rkward/dialogs/rkerrordialog.cpp
@@ -17,7 +17,7 @@
 
 #include "rkerrordialog.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 #include <ktoolinvocation.h>
 
diff --git a/rkward/dialogs/rkimportdialog.cpp b/rkward/dialogs/rkimportdialog.cpp
index f690a7b..67be4d0 100644
--- a/rkward/dialogs/rkimportdialog.cpp
+++ b/rkward/dialogs/rkimportdialog.cpp
@@ -18,7 +18,7 @@
 #include "rkimportdialog.h"
 
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include <qcombobox.h>
 #include <qlabel.h>
diff --git a/rkward/dialogs/rkloadlibsdialog.cpp b/rkward/dialogs/rkloadlibsdialog.cpp
index bfe571f..cb495b6 100644
--- a/rkward/dialogs/rkloadlibsdialog.cpp
+++ b/rkward/dialogs/rkloadlibsdialog.cpp
@@ -30,8 +30,9 @@
 #include <QSortFilterProxyModel>
 #include <QApplication>
 #include <QLineEdit>
+#include <QStandardPaths>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 #include <kuser.h>
 
diff --git a/rkward/dialogs/rkreadlinedialog.cpp b/rkward/dialogs/rkreadlinedialog.cpp
index 44e0fa1..b8ab55b 100644
--- a/rkward/dialogs/rkreadlinedialog.cpp
+++ b/rkward/dialogs/rkreadlinedialog.cpp
@@ -27,7 +27,7 @@
 #include <QVBoxLayout>
 #include <QFontDatabase>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kglobalsettings.h>
 
 #include "../rbackend/rcommand.h"
diff --git a/rkward/dialogs/rkrecoverdialog.cpp b/rkward/dialogs/rkrecoverdialog.cpp
index 1d4e716..65de324 100644
--- a/rkward/dialogs/rkrecoverdialog.cpp
+++ b/rkward/dialogs/rkrecoverdialog.cpp
@@ -18,7 +18,7 @@
 #include "rkrecoverdialog.h"
 
 #include <krun.h>
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 
 #include <QDir>
diff --git a/rkward/dialogs/rkselectlistdialog.cpp b/rkward/dialogs/rkselectlistdialog.cpp
index f83d7f5..1a20f66 100644
--- a/rkward/dialogs/rkselectlistdialog.cpp
+++ b/rkward/dialogs/rkselectlistdialog.cpp
@@ -23,7 +23,7 @@
 #include <QPushButton>
 #include <QScrollBar>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../misc/rkdialogbuttonbox.h"
 
diff --git a/rkward/dialogs/startupdialog.cpp b/rkward/dialogs/startupdialog.cpp
index 7fa0a1a..8a87ef4 100644
--- a/rkward/dialogs/startupdialog.cpp
+++ b/rkward/dialogs/startupdialog.cpp
@@ -28,7 +28,7 @@
 #include <QVBoxLayout>
 #include <QFileInfo>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <krecentfilesaction.h>
 #include <KConfigGroup>
 #include <QPushButton>
diff --git a/rkward/main.cpp b/rkward/main.cpp
index a091b9b..5fbc4d6 100644
--- a/rkward/main.cpp
+++ b/rkward/main.cpp
@@ -52,7 +52,7 @@
 
 
 #include <kaboutdata.h>
-#include <klocale.h>
+#include <KLocalizedString>
 #include <KUrlAuthorized>
 
 #include <qstring.h>
diff --git a/rkward/misc/editformatdialog.cpp b/rkward/misc/editformatdialog.cpp
index c3643ec..40e05ad 100644
--- a/rkward/misc/editformatdialog.cpp
+++ b/rkward/misc/editformatdialog.cpp
@@ -26,7 +26,7 @@
 #include <QDialogButtonBox>
 #include <QPushButton>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../core/rkvariable.h"
 #include "../rkglobals.h"
diff --git a/rkward/misc/editlabelsdialog.cpp b/rkward/misc/editlabelsdialog.cpp
index e10ca9e..6924e8a 100644
--- a/rkward/misc/editlabelsdialog.cpp
+++ b/rkward/misc/editlabelsdialog.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "editlabelsdialog.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kactioncollection.h>
 
 #include <qlabel.h>
diff --git a/rkward/misc/getfilenamewidget.cpp b/rkward/misc/getfilenamewidget.cpp
index c68f9f9..3eff3de 100644
--- a/rkward/misc/getfilenamewidget.cpp
+++ b/rkward/misc/getfilenamewidget.cpp
@@ -20,7 +20,7 @@
 #include <QVBoxLayout>
 #include <QFileDialog>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kurlrequester.h>
 #include <KLineEdit>
 
diff --git a/rkward/misc/multistringselector.cpp b/rkward/misc/multistringselector.cpp
index 2ab39f4..890da7e 100644
--- a/rkward/misc/multistringselector.cpp
+++ b/rkward/misc/multistringselector.cpp
@@ -24,7 +24,7 @@
 #include <QVBoxLayout>
 #include <QStringListModel>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "rkstandardicons.h"
 #include "../debug.h"
diff --git a/rkward/misc/rkaccordiontable.cpp b/rkward/misc/rkaccordiontable.cpp
index 5bae437..ba6887b 100644
--- a/rkward/misc/rkaccordiontable.cpp
+++ b/rkward/misc/rkaccordiontable.cpp
@@ -25,7 +25,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "rkcommonfunctions.h"
 #include "rkstandardicons.h"
diff --git a/rkward/misc/rkcommonfunctions.cpp b/rkward/misc/rkcommonfunctions.cpp
index cc24cc6..9382c5a 100644
--- a/rkward/misc/rkcommonfunctions.cpp
+++ b/rkward/misc/rkcommonfunctions.cpp
@@ -20,8 +20,9 @@
 #include <qdom.h>
 #include <qregexp.h>
 #include <QDir>
+#include <QStandardPaths>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kxmlguiclient.h>
 
 #include "../settings/rksettingsmodulegeneral.h"
diff --git a/rkward/misc/rkdynamicsearchline.cpp b/rkward/misc/rkdynamicsearchline.cpp
index 63028e1..57a0d5d 100644
--- a/rkward/misc/rkdynamicsearchline.cpp
+++ b/rkward/misc/rkdynamicsearchline.cpp
@@ -17,7 +17,7 @@
 
 #include "rkdynamicsearchline.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include <QSortFilterProxyModel>
 #include <QAction>
diff --git a/rkward/misc/rkfindbar.cpp b/rkward/misc/rkfindbar.cpp
index e716c21..190bd87 100644
--- a/rkward/misc/rkfindbar.cpp
+++ b/rkward/misc/rkfindbar.cpp
@@ -23,7 +23,7 @@
 #include <QLineEdit>
 
 #include <khistorycombobox.h>
-#include <klocale.h>
+#include <KLocalizedString>
 #include <QIcon>
 
 #include "rkcommonfunctions.h"
diff --git a/rkward/misc/rkmessagecatalog.cpp b/rkward/misc/rkmessagecatalog.cpp
index 664113d..db737d3 100644
--- a/rkward/misc/rkmessagecatalog.cpp
+++ b/rkward/misc/rkmessagecatalog.cpp
@@ -20,7 +20,7 @@
 #include <libintl.h>
 #include <QFile>
 #include <QLocale>
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../debug.h"
 
diff --git a/rkward/misc/rkobjectlistview.cpp b/rkward/misc/rkobjectlistview.cpp
index e9269b6..523141e 100644
--- a/rkward/misc/rkobjectlistview.cpp
+++ b/rkward/misc/rkobjectlistview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "rkobjectlistview.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include <QContextMenuEvent>
 #include <QMenu>
diff --git a/rkward/misc/rkprogresscontrol.cpp b/rkward/misc/rkprogresscontrol.cpp
index c49d967..aa837d1 100644
--- a/rkward/misc/rkprogresscontrol.cpp
+++ b/rkward/misc/rkprogresscontrol.cpp
@@ -25,7 +25,7 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../rkglobals.h"
 #include "../rbackend/rinterface.h"
diff --git a/rkward/misc/rksaveobjectchooser.cpp b/rkward/misc/rksaveobjectchooser.cpp
index f5e52e1..9bb3982 100644
--- a/rkward/misc/rksaveobjectchooser.cpp
+++ b/rkward/misc/rksaveobjectchooser.cpp
@@ -26,7 +26,7 @@
 #include <QDialog>
 #include <QDialogButtonBox>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../core/robjectlist.h"
 #include "../core/renvironmentobject.h"
diff --git a/rkward/misc/rkspecialactions.cpp b/rkward/misc/rkspecialactions.cpp
index 6bb2adc..ca4790a 100644
--- a/rkward/misc/rkspecialactions.cpp
+++ b/rkward/misc/rkspecialactions.cpp
@@ -17,7 +17,7 @@
 
 #include "rkspecialactions.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../debug.h"
 
diff --git a/rkward/misc/rkstandardactions.cpp b/rkward/misc/rkstandardactions.cpp
index 879f105..8811bda 100644
--- a/rkward/misc/rkstandardactions.cpp
+++ b/rkward/misc/rkstandardactions.cpp
@@ -17,7 +17,7 @@
 
 #include "rkstandardactions.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kactioncollection.h>
 #include <QAction>
 
diff --git a/rkward/misc/rkxmlguipreviewarea.cpp b/rkward/misc/rkxmlguipreviewarea.cpp
index b997bc7..43aa635 100644
--- a/rkward/misc/rkxmlguipreviewarea.cpp
+++ b/rkward/misc/rkxmlguipreviewarea.cpp
@@ -26,7 +26,7 @@
 
 #include <kxmlguifactory.h>
 #include <ktoolbar.h>
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../windows/rkmdiwindow.h"
 #include "rkstandardicons.h"
diff --git a/rkward/misc/xmlhelper.cpp b/rkward/misc/xmlhelper.cpp
index 8bff253..44d6ea7 100644
--- a/rkward/misc/xmlhelper.cpp
+++ b/rkward/misc/xmlhelper.cpp
@@ -17,7 +17,7 @@
 
 #include "xmlhelper.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include <qstringlist.h>
 #include <qfile.h>
diff --git a/rkward/plugin/rkcheckbox.cpp b/rkward/plugin/rkcheckbox.cpp
index 5fcef9a..a32dd5f 100644
--- a/rkward/plugin/rkcheckbox.cpp
+++ b/rkward/plugin/rkcheckbox.cpp
@@ -18,7 +18,7 @@
 
 #include <qcheckbox.h>
 #include <QVBoxLayout>
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../rkglobals.h"
 #include "../misc/xmlhelper.h"
diff --git a/rkward/plugin/rkcomponentmap.cpp b/rkward/plugin/rkcomponentmap.cpp
index f046e82..df6a07a 100644
--- a/rkward/plugin/rkcomponentmap.cpp
+++ b/rkward/plugin/rkcomponentmap.cpp
@@ -24,7 +24,7 @@
 #include <QSet>
 #include <QGuiApplication>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kactioncollection.h>
 #include <kmessagebox.h>
 
diff --git a/rkward/plugin/rkcomponentmeta.cpp b/rkward/plugin/rkcomponentmeta.cpp
index 1568c88..1c99eac 100644
--- a/rkward/plugin/rkcomponentmeta.cpp
+++ b/rkward/plugin/rkcomponentmeta.cpp
@@ -21,7 +21,7 @@
 #include "../misc/rkmessagecatalog.h"
 #include "../rbackend/rksessionvars.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../debug.h"
 
diff --git a/rkward/plugin/rkcomponentproperties.cpp b/rkward/plugin/rkcomponentproperties.cpp
index f6ee27b..4aa3699 100644
--- a/rkward/plugin/rkcomponentproperties.cpp
+++ b/rkward/plugin/rkcomponentproperties.cpp
@@ -95,7 +95,7 @@ the specialized properties (e.g. RKComponentPropertyInt::intValue () always retu
 
 #include "../misc/rkcommonfunctions.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../debug.h"
 
diff --git a/rkward/plugin/rkdropdown.cpp b/rkward/plugin/rkdropdown.cpp
index ea5074d..3b0dee0 100644
--- a/rkward/plugin/rkdropdown.cpp
+++ b/rkward/plugin/rkdropdown.cpp
@@ -23,7 +23,7 @@
 #include <qcombobox.h>
 #include <QListWidget>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../rkglobals.h"
 #include "../misc/xmlhelper.h"
diff --git a/rkward/plugin/rkformula.cpp b/rkward/plugin/rkformula.cpp
index 80266f0..e8e7832 100644
--- a/rkward/plugin/rkformula.cpp
+++ b/rkward/plugin/rkformula.cpp
@@ -26,7 +26,7 @@
 #include <qdom.h>
 #include <QTreeWidget>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "rkcomponent.h"
 #include "../core/rcontainerobject.h"
diff --git a/rkward/plugin/rkinput.cpp b/rkward/plugin/rkinput.cpp
index 50c1d28..fdbab36 100644
--- a/rkward/plugin/rkinput.cpp
+++ b/rkward/plugin/rkinput.cpp
@@ -23,7 +23,7 @@
 #include <QVBoxLayout>
 #include <QEvent>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../misc/xmlhelper.h"
 #include "../rkglobals.h"
diff --git a/rkward/plugin/rkmatrixinput.cpp b/rkward/plugin/rkmatrixinput.cpp
index c842968..5d3bf5e 100644
--- a/rkward/plugin/rkmatrixinput.cpp
+++ b/rkward/plugin/rkmatrixinput.cpp
@@ -24,7 +24,7 @@
 #include "../misc/rktableview.h"
 #include "../dataeditor/rktextmatrix.h"
 #include "kstandardaction.h"
-#include "klocale.h"
+#include "KLocalizedString"
 
 #include "../misc/xmlhelper.h"
 
diff --git a/rkward/plugin/rkoptionset.cpp b/rkward/plugin/rkoptionset.cpp
index 4a6d84b..9348e21 100644
--- a/rkward/plugin/rkoptionset.cpp
+++ b/rkward/plugin/rkoptionset.cpp
@@ -25,7 +25,7 @@
 #include <QLabel>
 #include <QMimeData>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "rkstandardcomponent.h"
 #include "../misc/rkcommonfunctions.h"
diff --git a/rkward/plugin/rkpluginbrowser.cpp b/rkward/plugin/rkpluginbrowser.cpp
index 8c4e438..8511f34 100644
--- a/rkward/plugin/rkpluginbrowser.cpp
+++ b/rkward/plugin/rkpluginbrowser.cpp
@@ -21,7 +21,7 @@
 #include <QUrl>
 #include <QDir>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../misc/xmlhelper.h"
 #include "../misc/getfilenamewidget.h"
diff --git a/rkward/plugin/rkpluginsaveobject.cpp b/rkward/plugin/rkpluginsaveobject.cpp
index 0085212..ecc1394 100644
--- a/rkward/plugin/rkpluginsaveobject.cpp
+++ b/rkward/plugin/rkpluginsaveobject.cpp
@@ -20,7 +20,7 @@
 #include <QVBoxLayout>
 #include <QGroupBox>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../misc/xmlhelper.h"
 #include "../misc/rksaveobjectchooser.h"
diff --git a/rkward/plugin/rkpluginspinbox.cpp b/rkward/plugin/rkpluginspinbox.cpp
index cc79d8c..942c354 100644
--- a/rkward/plugin/rkpluginspinbox.cpp
+++ b/rkward/plugin/rkpluginspinbox.cpp
@@ -19,7 +19,7 @@
 #include <qlayout.h>
 #include <qlabel.h>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../misc/rkspinbox.h"
 #include "../misc/xmlhelper.h"
diff --git a/rkward/plugin/rkpreviewbox.cpp b/rkward/plugin/rkpreviewbox.cpp
index eb40364..fdad7b6 100644
--- a/rkward/plugin/rkpreviewbox.cpp
+++ b/rkward/plugin/rkpreviewbox.cpp
@@ -22,7 +22,7 @@
 #include <qtimer.h>
 #include <QTextDocument>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../rkglobals.h"
 #include "../rbackend/rinterface.h"
diff --git a/rkward/plugin/rkradio.cpp b/rkward/plugin/rkradio.cpp
index fa3927d..ff8bcaf 100644
--- a/rkward/plugin/rkradio.cpp
+++ b/rkward/plugin/rkradio.cpp
@@ -24,7 +24,7 @@
 #include <qradiobutton.h>
 #include <QVBoxLayout>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../rkglobals.h"
 #include "../misc/xmlhelper.h"
diff --git a/rkward/plugin/rkstandardcomponent.cpp b/rkward/plugin/rkstandardcomponent.cpp
index 446af76..992e509 100644
--- a/rkward/plugin/rkstandardcomponent.cpp
+++ b/rkward/plugin/rkstandardcomponent.cpp
@@ -25,7 +25,7 @@
 #include <QVBoxLayout>
 #include <QGroupBox>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 
 #include "rkstandardcomponentgui.h"
diff --git a/rkward/plugin/rkstandardcomponentgui.cpp b/rkward/plugin/rkstandardcomponentgui.cpp
index a130e7e..7a90c3e 100644
--- a/rkward/plugin/rkstandardcomponentgui.cpp
+++ b/rkward/plugin/rkstandardcomponentgui.cpp
@@ -17,7 +17,7 @@
 
 #include "rkstandardcomponentgui.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kactioncollection.h>
 
 #include <qtimer.h>
diff --git a/rkward/plugin/rkvarselector.cpp b/rkward/plugin/rkvarselector.cpp
index 6a7a84f..cd1a023 100644
--- a/rkward/plugin/rkvarselector.cpp
+++ b/rkward/plugin/rkvarselector.cpp
@@ -24,7 +24,7 @@
 #include <QMenu>
 #include <QToolButton>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../misc/xmlhelper.h"
 #include "../rkglobals.h"
diff --git a/rkward/plugin/rkvarslot.cpp b/rkward/plugin/rkvarslot.cpp
index 35f4c2e..bc250b2 100644
--- a/rkward/plugin/rkvarslot.cpp
+++ b/rkward/plugin/rkvarslot.cpp
@@ -27,7 +27,7 @@
 #include <QVBoxLayout>
 #include <QIcon>
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "rkvarselector.h"
 #include "../core/robject.h"
diff --git a/rkward/rbackend/rcommandstack.cpp b/rkward/rbackend/rcommandstack.cpp
index 9d72481..4a7e505 100644
--- a/rkward/rbackend/rcommandstack.cpp
+++ b/rkward/rbackend/rcommandstack.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "rcommandstack.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include <QTimer>
 #include <QTime>
diff --git a/rkward/rbackend/rinterface.cpp b/rkward/rbackend/rinterface.cpp
index 7058fc9..4526a25 100644
--- a/rkward/rbackend/rinterface.cpp
+++ b/rkward/rbackend/rinterface.cpp
@@ -53,7 +53,7 @@
 #include "../debug.h"
 
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include <qdir.h>
 #include <qvalidator.h>
diff --git a/rkward/rbackend/rkfrontendtransmitter.cpp b/rkward/rbackend/rkfrontendtransmitter.cpp
index 4e3f7c4..00393e6 100644
--- a/rkward/rbackend/rkfrontendtransmitter.cpp
+++ b/rkward/rbackend/rkfrontendtransmitter.cpp
@@ -23,13 +23,15 @@
 #include "../settings/rksettingsmodulegeneral.h"
 #include "../rkglobals.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <krandom.h>
+
 #include <QCoreApplication>
 #include <QProcess>
 #include <QLocalServer>
 #include <QLocalSocket>
 #include <QDir>
+#include <QStandardPaths>
 
 #include "../version.h"
 #include "../debug.h"
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
index 656df30..5503de6 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice.cpp
@@ -24,7 +24,7 @@
 #include <QMouseEvent>
 #include <QDialog>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <sys/stat.h>
 
 #include "rkgraphicsdevice_protocol_shared.h"
diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
index 775f05e..dfdfc49 100644
--- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_frontendtransmitter.cpp
@@ -22,7 +22,7 @@
 #include <QIODevice>
 #include <krandom.h>
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KLocalizedString>
 
 // for screen resolution
 #include <QApplication>
diff --git a/rkward/rkconsole.cpp b/rkward/rkconsole.cpp
index f438208..3f98f00 100644
--- a/rkward/rkconsole.cpp
+++ b/rkward/rkconsole.cpp
@@ -36,7 +36,7 @@
 #include <QFileDialog>
 #include <QApplication>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kactioncollection.h>
 #include <kconfig.h>
 #include <kmessagebox.h>
diff --git a/rkward/rkward.cpp b/rkward/rkward.cpp
index a60fd57..8ad3d18 100644
--- a/rkward/rkward.cpp
+++ b/rkward/rkward.cpp
@@ -28,7 +28,7 @@
 // include files for KDE
 #include <kmessagebox.h>
 #include <kencodingfiledialog.h>
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <kstandardaction.h>
 #include <kmultitabbar.h>
diff --git a/rkward/robjectviewer.cpp b/rkward/robjectviewer.cpp
index 32380a3..ad56452 100644
--- a/rkward/robjectviewer.cpp
+++ b/rkward/robjectviewer.cpp
@@ -24,7 +24,7 @@
 #include <QHBoxLayout>
 #include <QTabWidget>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kglobalsettings.h>
 #include <QFontDatabase>
 
diff --git a/rkward/scriptbackends/CMakeLists.txt b/rkward/scriptbackends/CMakeLists.txt
index 3ce6672..4720c0e 100644
--- a/rkward/scriptbackends/CMakeLists.txt
+++ b/rkward/scriptbackends/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(scriptbackends_STAT_SRCS
    )
 
 ADD_LIBRARY(scriptbackends STATIC ${scriptbackends_STAT_SRCS})
-TARGET_LINK_LIBRARIES(scriptbackends Qt5::Script Qt5::Widgets Qt5::Xml KF5::WidgetsAddons)
+TARGET_LINK_LIBRARIES(scriptbackends Qt5::Script Qt5::Widgets Qt5::Xml KF5::WidgetsAddons KF5::I18n)
 
 ########### install files ###############
 
diff --git a/rkward/scriptbackends/qtscriptbackend.cpp b/rkward/scriptbackends/qtscriptbackend.cpp
index 67f6992..5119b76 100644
--- a/rkward/scriptbackends/qtscriptbackend.cpp
+++ b/rkward/scriptbackends/qtscriptbackend.cpp
@@ -19,7 +19,7 @@
 #include <QTimer>
 #include <QDir>
 
-#include "klocale.h"
+#include "KLocalizedString"
 #include "kmessagebox.h"
 
 #include "../misc/rkcommonfunctions.h"
diff --git a/rkward/scriptbackends/rkcomponentscripting.cpp b/rkward/scriptbackends/rkcomponentscripting.cpp
index 09997a6..ae1bf9a 100644
--- a/rkward/scriptbackends/rkcomponentscripting.cpp
+++ b/rkward/scriptbackends/rkcomponentscripting.cpp
@@ -17,7 +17,7 @@
 
 #include "rkcomponentscripting.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kdeversion.h>
 #include <kmessagebox.h>
 #include <QDir>
diff --git a/rkward/scriptbackends/scriptbackend.cpp b/rkward/scriptbackends/scriptbackend.cpp
index 744dfbf..6d8eb66 100644
--- a/rkward/scriptbackends/scriptbackend.cpp
+++ b/rkward/scriptbackends/scriptbackend.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "scriptbackend.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../plugin/rkcomponentproperties.h"
 
diff --git a/rkward/settings/rksettings.cpp b/rkward/settings/rksettings.cpp
index c40d588..3357972 100644
--- a/rkward/settings/rksettings.cpp
+++ b/rkward/settings/rksettings.cpp
@@ -18,7 +18,8 @@
 
 #include <QPushButton>
 
-#include <klocale.h>
+#include <KLocalizedString>
+#include <KSharedConfig>
 
 #include "../windows/rkworkplace.h"
 
diff --git a/rkward/settings/rksettingsmodulecommandeditor.cpp b/rkward/settings/rksettingsmodulecommandeditor.cpp
index e67679f..c624843 100644
--- a/rkward/settings/rksettingsmodulecommandeditor.cpp
+++ b/rkward/settings/rksettingsmodulecommandeditor.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "rksettingsmodulecommandeditor.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
diff --git a/rkward/settings/rksettingsmoduleconsole.cpp b/rkward/settings/rksettingsmoduleconsole.cpp
index 6744f2a..5abd846 100644
--- a/rkward/settings/rksettingsmoduleconsole.cpp
+++ b/rkward/settings/rksettingsmoduleconsole.cpp
@@ -16,8 +16,9 @@
  ***************************************************************************/
 #include "rksettingsmoduleconsole.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kconfiggroup.h>
+#include <KSharedConfig>
 
 #include <qlayout.h>
 #include <qcheckbox.h>
diff --git a/rkward/settings/rksettingsmoduledebug.cpp b/rkward/settings/rksettingsmoduledebug.cpp
index 28e2a48..09095ae 100644
--- a/rkward/settings/rksettingsmoduledebug.cpp
+++ b/rkward/settings/rksettingsmoduledebug.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "rksettingsmoduledebug.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
diff --git a/rkward/settings/rksettingsmodulegeneral.cpp b/rkward/settings/rksettingsmodulegeneral.cpp
index 1ec650c..5775972 100644
--- a/rkward/settings/rksettingsmodulegeneral.cpp
+++ b/rkward/settings/rksettingsmodulegeneral.cpp
@@ -16,7 +16,8 @@
  ***************************************************************************/
 #include "rksettingsmodulegeneral.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
+#include <KSharedConfig>
 #include <KConfigGroup>
 
 #include <qlayout.h>
diff --git a/rkward/settings/rksettingsmodulegraphics.cpp b/rkward/settings/rksettingsmodulegraphics.cpp
index cc204d4..91248a9 100644
--- a/rkward/settings/rksettingsmodulegraphics.cpp
+++ b/rkward/settings/rksettingsmodulegraphics.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "rksettingsmodulegraphics.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
diff --git a/rkward/settings/rksettingsmoduleobjectbrowser.cpp b/rkward/settings/rksettingsmoduleobjectbrowser.cpp
index e37d718..cc98d9a 100644
--- a/rkward/settings/rksettingsmoduleobjectbrowser.cpp
+++ b/rkward/settings/rksettingsmoduleobjectbrowser.cpp
@@ -17,7 +17,7 @@
 
 #include "rksettingsmoduleobjectbrowser.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
diff --git a/rkward/settings/rksettingsmoduleoutput.cpp b/rkward/settings/rksettingsmoduleoutput.cpp
index 0939972..d468775 100644
--- a/rkward/settings/rksettingsmoduleoutput.cpp
+++ b/rkward/settings/rksettingsmoduleoutput.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "rksettingsmoduleoutput.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
diff --git a/rkward/settings/rksettingsmoduleplugins.cpp b/rkward/settings/rksettingsmoduleplugins.cpp
index b3cdcb3..d9297f1 100644
--- a/rkward/settings/rksettingsmoduleplugins.cpp
+++ b/rkward/settings/rksettingsmoduleplugins.cpp
@@ -16,9 +16,10 @@
  ***************************************************************************/
 #include "rksettingsmoduleplugins.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 #include <kdeversion.h>
+#include <KSharedConfig>
 #include <KConfigGroup>
 
 #include <qlayout.h>
diff --git a/rkward/settings/rksettingsmoduler.cpp b/rkward/settings/rksettingsmoduler.cpp
index 5e03eba..cb81949 100644
--- a/rkward/settings/rksettingsmoduler.cpp
+++ b/rkward/settings/rksettingsmoduler.cpp
@@ -16,7 +16,8 @@
  ***************************************************************************/
 #include "rksettingsmoduler.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
+#include <KSharedConfig>
 #include <KConfigGroup>
 
 #include <qlabel.h>
diff --git a/rkward/settings/rksettingsmodulewatch.cpp b/rkward/settings/rksettingsmodulewatch.cpp
index 6900e04..af0e43e 100644
--- a/rkward/settings/rksettingsmodulewatch.cpp
+++ b/rkward/settings/rksettingsmodulewatch.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "rksettingsmodulewatch.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
diff --git a/rkward/windows/detachedwindowcontainer.cpp b/rkward/windows/detachedwindowcontainer.cpp
index 32f8f07..5be9d65 100644
--- a/rkward/windows/detachedwindowcontainer.cpp
+++ b/rkward/windows/detachedwindowcontainer.cpp
@@ -17,7 +17,7 @@
 
 #include "detachedwindowcontainer.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kactioncollection.h>
 #include <ktoolbar.h>
 #include <kxmlguifactory.h>
diff --git a/rkward/windows/rcontrolwindow.cpp b/rkward/windows/rcontrolwindow.cpp
index 0304d00..b3b89cf 100644
--- a/rkward/windows/rcontrolwindow.cpp
+++ b/rkward/windows/rcontrolwindow.cpp
@@ -22,7 +22,7 @@
 #include <QVBoxLayout>
 #include <QHeaderView>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 
 #include "../settings/rksettings.h"
diff --git a/rkward/windows/rkcallstackviewer.cpp b/rkward/windows/rkcallstackviewer.cpp
index 56bdb6c..bfe7209 100644
--- a/rkward/windows/rkcallstackviewer.cpp
+++ b/rkward/windows/rkcallstackviewer.cpp
@@ -17,7 +17,7 @@
 
 #include "rkcallstackviewer.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include <QHBoxLayout>
 #include <QVBoxLayout>
diff --git a/rkward/windows/rkcommandeditorwindow.cpp b/rkward/windows/rkcommandeditorwindow.cpp
index 552b22e..60baa4b 100644
--- a/rkward/windows/rkcommandeditorwindow.cpp
+++ b/rkward/windows/rkcommandeditorwindow.cpp
@@ -37,7 +37,7 @@
 #include <QTemporaryFile>
 #include <QDir>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 #include <kstandardaction.h>
 #include <kactioncollection.h>
diff --git a/rkward/windows/rkcommandlog.cpp b/rkward/windows/rkcommandlog.cpp
index 6765176..f58e241 100644
--- a/rkward/windows/rkcommandlog.cpp
+++ b/rkward/windows/rkcommandlog.cpp
@@ -32,7 +32,7 @@
 #include <QContextMenuEvent>
 #include <QFontDatabase>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kactioncollection.h>
 #include <kglobalsettings.h>
 
diff --git a/rkward/windows/rkdebugconsole.cpp b/rkward/windows/rkdebugconsole.cpp
index 027b705..1e1a154 100644
--- a/rkward/windows/rkdebugconsole.cpp
+++ b/rkward/windows/rkdebugconsole.cpp
@@ -23,7 +23,7 @@
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 #include <khistorycombobox.h>
 
diff --git a/rkward/windows/rkdebugmessagewindow.cpp b/rkward/windows/rkdebugmessagewindow.cpp
index 7d80bf1..5a47d1d 100644
--- a/rkward/windows/rkdebugmessagewindow.cpp
+++ b/rkward/windows/rkdebugmessagewindow.cpp
@@ -23,7 +23,7 @@
 #include <QTextEdit>
 
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KLocalizedString>
 
 #include "../misc/rkdummypart.h"
 
diff --git a/rkward/windows/rkfilebrowser.cpp b/rkward/windows/rkfilebrowser.cpp
index fd4c205..a852ad2 100644
--- a/rkward/windows/rkfilebrowser.cpp
+++ b/rkward/windows/rkfilebrowser.cpp
@@ -28,7 +28,7 @@
 #include <KSharedConfig>
 #include <kfileitemactions.h>
 #include <kfileitemlistproperties.h>
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kio/copyjob.h>
 
 #include <qdir.h>
diff --git a/rkward/windows/rkhelpsearchwindow.cpp b/rkward/windows/rkhelpsearchwindow.cpp
index 4487dde..9a52575 100644
--- a/rkward/windows/rkhelpsearchwindow.cpp
+++ b/rkward/windows/rkhelpsearchwindow.cpp
@@ -17,7 +17,7 @@
 
 #include "rkhelpsearchwindow.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <QUrl>
 #include <kmessagebox.h>
 
diff --git a/rkward/windows/rkhtmlwindow.cpp b/rkward/windows/rkhtmlwindow.cpp
index 6c7e8d2..98afd16 100644
--- a/rkward/windows/rkhtmlwindow.cpp
+++ b/rkward/windows/rkhtmlwindow.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 #include "rkhtmlwindow.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 #include <kparts/plugin.h>
 #include <kactioncollection.h>
diff --git a/rkward/windows/rkmdiwindow.cpp b/rkward/windows/rkmdiwindow.cpp
index 70b27e7..94d8e48 100644
--- a/rkward/windows/rkmdiwindow.cpp
+++ b/rkward/windows/rkmdiwindow.cpp
@@ -27,7 +27,7 @@
 #include <kparts/partactivateevent.h>
 #include <kxmlguifactory.h>
 #include <kactioncollection.h>
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kpassivepopup.h>
 
 #include "rkworkplace.h"
diff --git a/rkward/windows/rktoolwindowbar.cpp b/rkward/windows/rktoolwindowbar.cpp
index ceb5a7c..cc90327 100644
--- a/rkward/windows/rktoolwindowbar.cpp
+++ b/rkward/windows/rktoolwindowbar.cpp
@@ -20,7 +20,7 @@
 #include "rktoolwindowbar.h"
 
 #include <QMenu>
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kparts/partmanager.h>
 #include <kselectaction.h>
 
diff --git a/rkward/windows/rktoplevelwindowgui.cpp b/rkward/windows/rktoplevelwindowgui.cpp
index b389209..7b9f1a5 100644
--- a/rkward/windows/rktoplevelwindowgui.cpp
+++ b/rkward/windows/rktoplevelwindowgui.cpp
@@ -17,7 +17,7 @@
 
 #include "rktoplevelwindowgui.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 #include <KAboutData>
 #include <kaboutapplicationdialog.h>
diff --git a/rkward/windows/rkwindowcatcher.cpp b/rkward/windows/rkwindowcatcher.cpp
index e6ff3d3..d8c7384 100644
--- a/rkward/windows/rkwindowcatcher.cpp
+++ b/rkward/windows/rkwindowcatcher.cpp
@@ -28,7 +28,7 @@
 #include <QWindow>
 
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KLocalizedString>
 #include <KWindowSystem>
 #include <KWindowInfo>
 
diff --git a/rkward/windows/rkworkplace.cpp b/rkward/windows/rkworkplace.cpp
index 7d38e75..929adaf 100644
--- a/rkward/windows/rkworkplace.cpp
+++ b/rkward/windows/rkworkplace.cpp
@@ -19,7 +19,7 @@
 
 #include <kparts/partmanager.h>
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kglobalsettings.h>
 #include <kactioncollection.h>
 #include <krun.h>
diff --git a/rkward/windows/rkworkplaceview.cpp b/rkward/windows/rkworkplaceview.cpp
index 0f93a7b..de4ef26 100644
--- a/rkward/windows/rkworkplaceview.cpp
+++ b/rkward/windows/rkworkplaceview.cpp
@@ -17,7 +17,7 @@
 
 #include "rkworkplaceview.h"
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kactioncollection.h>
 #include <kdeversion.h>
 #include <kacceleratormanager.h>
diff --git a/rkward/windows/robjectbrowser.cpp b/rkward/windows/robjectbrowser.cpp
index c05e90c..773b917 100644
--- a/rkward/windows/robjectbrowser.cpp
+++ b/rkward/windows/robjectbrowser.cpp
@@ -23,7 +23,7 @@
 #include <QMenu>
 #include <QInputDialog>
 
-#include <klocale.h>
+#include <KLocalizedString>
 #include <kmessagebox.h>
 
 #include "../rkward.h"

More information about the rkward-tracker mailing list