s/KLocale/KLocalizedString/g

Many headers included KLocale to use i18n and co. But those methods are
defined in KLocalizedString and not in KLocale.

With KF5 klocale.h does no longer include KLocalizedString causing lots
of compile errors.

activation.cpp

@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kxerrorhandler.h>
 #include <kstartupinfo.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 #include "notifications.h"
 #include "atoms.h"

clients/b2/b2client.cpp

@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTextStream>
 #include <kicontheme.h>
 #include <kiconeffect.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kconfig.h>
 #include <QBitmap>
 #include <QLabel>

clients/b2/config/config.cpp

@@ -31,6 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QGridLayout>
 #include <QSpacerItem>
 #include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kvbox.h>
 
 

clients/laptop/laptopclient.cpp

@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QBitmap>
 #include <QPainter>
 #include <kglobal.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 namespace Laptop {
 

clients/oxygen/config/oxygenanimationconfigwidget.cpp

@@ -32,7 +32,7 @@
 #include <QButtonGroup>
 #include <QtGui/QHoverEvent>
 #include <QTextStream>
-#include <KLocale>
+#include <KDE/KLocalizedString>
 
 namespace Oxygen
 {

clients/oxygen/config/oxygenconfigwidget.cpp

@@ -31,7 +31,7 @@
 #include <QLabel>
 #include <QLayout>
 #include <QGroupBox>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KTabWidget>
 
 namespace Oxygen

clients/oxygen/config/oxygendetectwidget.cpp

@@ -35,7 +35,6 @@
 #include <QLayout>
 #include <QGroupBox>
 #include <QtGui/QMouseEvent>
-#include <KLocale>
 
 #include <QtGui/QX11Info>
 #include <X11/Xlib.h>

clients/oxygen/config/oxygenexceptionlistwidget.cpp

@@ -28,7 +28,7 @@
 #include "oxygenexceptiondialog.h"
 
 #include <QPointer>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KMessageBox>
 
 //__________________________________________________________

clients/oxygen/config/oxygenexceptionmodel.cpp

@@ -24,7 +24,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "oxygenexceptionmodel.h"
-#include <KLocale>
+#include <KLocalizedString>
 namespace Oxygen
 {
 

clients/oxygen/oxygenclient.cpp

@@ -34,7 +34,7 @@
 #include <cassert>
 #include <cmath>
 
-#include <KLocale>
+#include <KLocalizedString>
 #include <KColorUtils>
 #include <KDebug>
 #include <KStyle>

composite.cpp

@@ -49,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDBusConnection>
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 #include <xcb/composite.h>
 #include <xcb/damage.h>

compositingprefs.cpp

@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kconfiggroup.h>
 #include <kdebug.h>
 #include <kxerrorhandler.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdeversion.h>
 #include <ksharedconfig.h>
 #include <kstandarddirs.h>

effects/coverswitch/coverswitch.cpp

@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QFont>
 #include <QMatrix4x4>
 #include <QMouseEvent>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kapplication.h>
 #include <kcolorscheme.h>
 #include <kglobal.h>

effects/cube/cube.cpp

@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kwinconfig.h>
 #include <kdebug.h>
 

effects/desktopgrid/desktopgrid.cpp

@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <netwm_def.h>
 #include <QEvent>
 #include <QMouseEvent>

effects/diminactive/diminactive_config.cpp

@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <kaction.h>

effects/flipswitch/flipswitch.cpp

@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kdebug.h>
 #include <KAction>
 #include <KActionCollection>
-#include <KLocale>
+#include <KDE/KLocalizedString>
 
 #include <kwinglutils.h>
 

effects/invert/invert.cpp

@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwinglplatform.h>
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <KStandardDirs>
 

effects/invert/invert_config.cpp

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <KActionCollection>
 #include <kaction.h>

effects/lookingglass/lookingglass.cpp

@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <KDE/KGlobal>
 #include <KDE/KStandardDirs>

effects/lookingglass/lookingglass_config.cpp

@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <KActionCollection>

effects/magnifier/magnifier_config.cpp

@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <KActionCollection>

effects/mousemark/mousemark.cpp

@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 #include <math.h>
 

effects/mousemark/mousemark_config.cpp

@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <KActionCollection>
 #include <kaction.h>

effects/presentwindows/presentwindows.cpp

@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "presentwindowsconfig.h"
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 

effects/showfps/showfps_config.cpp

@@ -27,7 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 
 namespace KWin

effects/thumbnailaside/thumbnailaside.cpp

@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kactioncollection.h>
 #include <kaction.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 namespace KWin
 {

effects/thumbnailaside/thumbnailaside_config.cpp

@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 #include <KActionCollection>

effects/trackmouse/trackmouse.cpp

@@ -36,7 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <KDE/KLocale>
+#include <KDE/KLocalizedString>
 
 #include <math.h>
 

effects/trackmouse/trackmouse_config.cpp

@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kaction.h>
 #include <KActionCollection>

effects/translucency/translucency_config.cpp

@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kconfiggroup.h>
 

effects/windowgeometry/windowgeometry.cpp

@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KActionCollection>
 #include <kaction.h>
 #include <KDE/KLocale>
+#include <KDE/KLocalizedString>
 
 using namespace KWin;
 

effects/windowgeometry/windowgeometry_config.cpp

@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kwineffects.h>
 #include <KActionCollection>
 #include <kaction.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kconfiggroup.h>
 
 namespace KWin

effects/wobblywindows/wobblywindows_config.cpp

@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kaction.h>
 #include <kconfiggroup.h>

effects/zoom/zoom.cpp

@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kactioncollection.h>
 #include <kstandardaction.h>
 #include <KDE/KConfigGroup>
-#include <KDE/KLocale>
+#include <KDE/KLocalizedString>
 #include <KDE/KDebug>
 
 #include <kwinglutils.h>

effects/zoom/zoom_config.cpp

@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kwineffects.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <KActionCollection>
 #include <kaction.h>

kcmkwin/kwincompositing/ktimerdialog.cpp

@@ -31,7 +31,7 @@
 #include <kwindowsystem.h>
 #include <kiconloader.h>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kvbox.h>
 

kcmkwin/kwindecoration/buttons.cpp

@@ -40,7 +40,7 @@
 #include <QMimeData>
 #include <QScrollBar>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kglobalsettings.h>
 
 #ifdef KWIN_BUILD_KAPPMENU

kcmkwin/kwindecoration/buttonsconfigdialog.cpp

@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QVBoxLayout>
 
-#include <KLocale>
+#include <KDE/KLocalizedString>
 #include <kdecoration.h>
 
 namespace KWin

kcmkwin/kwindecoration/decorationmodel.cpp

@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KDesktopFile>
 #include <KGlobalSettings>
 #include <KIcon>
-#include <KLocale>
+#include <KDE/KLocalizedString>
 #include <KServiceTypeTrader>
 #include <KStandardDirs>
 #include <KPluginInfo>

kcmkwin/kwindecoration/kwindecoration.cpp

@@ -47,7 +47,7 @@
 // KDE
 #include <KAboutData>
 #include <KDialog>
-#include <KLocale>
+#include <KDE/KLocalizedString>
 #include <KMessageBox>
 #include <KNS3/DownloadDialog>
 #include <KDE/KStandardDirs>

kcmkwin/kwindecoration/preview.cpp

@@ -20,7 +20,7 @@
 #include "preview.h"
 
 #include <kapplication.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kconfig.h>
 #include <kglobal.h>
 #include <QLabel>

kcmkwin/kwindesktop/desktopnameswidget.cpp

@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QLabel>
 #include <QGridLayout>
 
-#include <KLocale>
+#include <KDE/KLocalizedString>
 #include <KLineEdit>
 
 namespace KWin

kcmkwin/kwinoptions/main.cpp

@@ -27,7 +27,7 @@
 
 #include <kapplication.h>
 #include <kglobal.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kconfig.h>
 #include <kaboutdata.h>
 #include <kdialog.h>

kcmkwin/kwinoptions/mouse.h

@@ -26,7 +26,7 @@ class KConfig;
 
 #include <kcmodule.h>
 #include <KComboBox>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 #include "ui_actions.h"
 #include "ui_mouse.h"

kcmkwin/kwinoptions/windows.cpp

@@ -34,7 +34,7 @@
 #include <QtDBus/QtDBus>
 
 #include <KButtonGroup>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <knuminput.h>
 #include <kdialog.h>
 

kcmkwin/kwinrules/detectwidget.cpp

@@ -20,7 +20,7 @@
 #include "detectwidget.h"
 
 #include <kapplication.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kdebug.h>
 #include <kwindowsystem.h>
 #include <QLabel>

kcmkwin/kwinrules/kcm.cpp

@@ -22,7 +22,7 @@
 #include <QLayout>
 //Added by qt3to4:
 #include <QVBoxLayout>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <QtDBus/QtDBus>

kcmkwin/kwinrules/main.cpp

@@ -19,7 +19,7 @@
 #include <kcmdlineargs.h>
 #include <kapplication.h>
 #include <kconfig.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kwindowsystem.h>
 #include <QtDBus/QtDBus>
 #include <X11/Xlib.h>

kcmkwin/kwinrules/ruleswidget.cpp

@@ -25,7 +25,7 @@
 #include <kpushbutton.h>
 #include <QLabel>
 #include <kwindowsystem.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <QRegExp>
 #include <KActivities/Consumer>
 

kcmkwin/kwinrules/yesnobox.h

@@ -23,7 +23,7 @@
 #include <QHBoxLayout>
 #include <QRadioButton>
 
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 class YesNoBox : public QWidget {
     Q_OBJECT

killer/killer.cpp

@@ -25,7 +25,7 @@ DEALINGS IN THE SOFTWARE.
 #include <kcmdlineargs.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kauth.h>
 #include <kdebug.h>
 #include <unistd.h>

libkdecorations/kcommondecoration.cpp

@@ -37,7 +37,7 @@
 
 #include <kapplication.h>
 #include "kdecorationfactory.h"
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 
 #include "kcommondecoration.moc"
 

libkdecorations/kdecoration_plugins_p.cpp

@@ -31,6 +31,7 @@ DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <klibrary.h>
 #include <kconfiggroup.h>
+#include <KDE/KLocalizedString>
 #include <assert.h>
 
 #include <QDir>

plugins.cpp

@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config-kwin.h"
 
 #include <kglobal.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <stdlib.h>
 #include <QPixmap>
 

scene_opengl.cpp

@@ -62,7 +62,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QVector4D>
 #include <QMatrix4x4>
 
-#include <KLocale>
+#include <KDE/KLocalizedString>
 #include <KProcess>
 
 namespace KWin

tabbox/clientmodel.cpp

@@ -27,8 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // TODO: remove with Qt 5, only for HTML escaping the caption
 #include <QTextDocument>
 #include <QTextStream>
-// KDE
-#include <KLocale>
 // other
 #include <math.h>
 

tabbox/tabbox.cpp

@@ -44,7 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <KConfigGroup>
 #include <KDE/KAction>
 #include <KDebug>
-#include <KLocale>
+#include <KLocalizedString>
 #include <kkeyserver.h>
 // X11
 #include <fixx11h.h>

useractions.cpp

@@ -59,7 +59,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <KDE/KLocalizedString>
 #include <kconfig.h>
 #include <kglobalaccel.h>
 #include <kapplication.h>

utils.cpp

@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <kxerrorhandler.h>
 #include <X11/Xatom.h>
+#include <KDE/KLocalizedString>
 
 #ifndef KCMRULES
 #include <QLabel>
@@ -36,7 +37,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <assert.h>
 #include <kdebug.h>
 #include <kglobalaccel.h>
-#include <klocale.h>
 #include <kshortcut.h>
 #include <kkeyserver.h>
 #include <KPushButton>

workspace.cpp

@@ -28,7 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <fixx11h.h>
 #include <kconfig.h>
 #include <kglobal.h>
-#include <klocale.h>
 #include <QDesktopWidget>
 #include <QRegExp>
 #include <QPainter>