[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Remove unneeded klocale.h and kglobal.h
From:       John Layt <jlayt () kde ! org>
Date:       2012-04-06 15:42:14
Message-ID: 20120406154214.AD1DCA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 75fef6c6f4ec02195ab7b7c706385a56a5ee270a by John Layt.
Committed on 18/03/2012 at 17:45.
Pushed by jlayt into branch 'frameworks'.

Remove unneeded klocale.h and kglobal.h

Replace locale.h with klocalizedstring.h where only i18n() needed

M  +0    -1    interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp
M  +1    -1    interfaces/kmediaplayer/kfileaudiopreview/mediacontrols_p.h
M  +1    -1    kde3support/kdeui/k3aboutapplication.cpp
M  +1    -1    kde3support/kdeui/k3aboutdialog.cpp
M  +1    -1    kde3support/kdeui/k3command.cpp
M  +1    -1    kde3support/kdeui/k3dockwidget.cpp
M  +0    -1    kde3support/kdeui/k3iconviewsearchline.cpp
M  +1    -1    kde3support/kdeui/k3listviewsearchline.cpp
M  +2    -1    kde3support/kdeui/k3passworddialog.cpp
M  +1    -1    kde3support/kdeui/k3spell.cpp
M  +1    -1    kde3support/kdeui/k3spelldlg.cpp
M  +1    -1    kde3support/kdeui/k3syntaxhighlighter.cpp
M  +1    -1    kde3support/kdeui/k3textedit.cpp
M  +1    -1    kde3support/kdeui/k3wizard.cpp
M  +1    -1    kde3support/kio/kfile/k3fileview.cpp
M  +1    -1    kde3support/kunittest/modrunner.cpp
M  +1    -1    kde3support/kunittest/tester.h
M  +1    -1    kde3support/tests/kaboutdialogtest.cpp
M  +1    -1    kde3support/tests/kcommandtest.cpp
M  +1    -1    kdecore/kconfig_compiler/kconfig_compiler.cpp
M  +1    -1    kdecore/kernel/kcomponentdata.cpp
M  +1    -1    kdecore/kernel/ktoolinvocation_win.cpp
M  +1    -1    kdecore/kernel/ktoolinvocation_x11.cpp
M  +1    -1    kdecore/localization/kcurrencycode.cpp
M  +1    -1    kdecore/network/klocalsocket_unix.cpp
M  +1    -1    kdecore/network/klocalsocket_win.cpp
M  +1    -1    kdecore/tests/qcoreapptest.cpp
M  +1    -1    kdecore/util/klibloader.cpp
M  +1    -1    kdeui/actions/kaction.cpp
M  +1    -1    kdeui/dialogs/kdeprintdialog.cpp
M  +1    -1    kdeui/dialogs/kshortcuteditwidget.cpp
M  +1    -1    kdeui/dialogs/kshortcutsdialog.cpp
M  +1    -1    kdeui/fonts/fonthelpers.cpp
M  +1    -1    kdeui/fonts/kfontcombobox.cpp
M  +1    -1    kdeui/notifications/ksystemtrayicon.cpp
M  +1    -1    kdeui/shortcuts/kshortcut.cpp
M  +2    -1    kdeui/shortcuts/kstandardshortcut.cpp
M  +1    -1    kdeui/sonnet/highlighter.cpp
M  +1    -1    kdeui/util/kkeyserver_x11.cpp
M  +1    -1    kdoctools/genshortcutents.cpp
M  +1    -1    khtml/ecma/debugger/breakpointsdock.cpp
M  +1    -1    khtml/ecma/debugger/callstackdock.cpp
M  +1    -1    khtml/ecma/debugger/consoledock.cpp
M  +1    -1    khtml/ecma/debugger/debugwindow.cpp
M  +1    -1    khtml/ecma/debugger/errordlg.cpp
M  +1    -1    khtml/ecma/debugger/localvariabledock.cpp
M  +1    -1    khtml/ecma/kjs_html.cpp
M  +1    -1    khtml/ecma/kjs_mozilla.cpp
M  +1    -1    khtml/ecma/kjs_proxy.cpp
M  +1    -1    khtml/ecma/kjs_window.cpp
M  +1    -1    khtml/html/html_formimpl.cpp
M  +1    -1    khtml/html/htmlparser.cpp
M  +1    -1    khtml/java/kjavaapplet.cpp
M  +1    -1    khtml/java/kjavaappletcontext.cpp
M  +1    -1    khtml/java/kjavaappletserver.cpp
M  +1    -1    khtml/java/kjavaappletviewer.cpp
M  +1    -1    khtml/java/kjavaappletwidget.cpp
M  +1    -1    khtml/khtml_ext.cpp
M  +1    -1    khtml/khtml_global.cpp
M  +1    -1    khtml/khtml_printsettings.cpp
M  +1    -1    khtml/khtml_run.cpp
M  +1    -1    khtml/khtml_settings.cpp
M  +1    -1    khtml/khtmladaptorpart.cpp
M  +1    -1    khtml/khtmlimage.cpp
M  +1    -1    khtml/kmultipart/kmultipart.cpp
M  +1    -1    khtml/rendering/media_controls.cpp
M  +1    -1    khtml/rendering/render_form.cpp
M  +1    -1    khtml/rendering/render_frames.cpp
M  +1    -1    khtml/xml/dom_docimpl.cpp
M  +1    -1    khtml/xml/xml_tokenizer.cpp
M  +1    -1    kjsembed/kjsembed/kjseglobal.h
M  +1    -1    kross/core/action.cpp
M  +1    -1    kross/core/manager.cpp
M  +2    -2    kross/modules/form.cpp
M  +1    -1    kross/modules/translation.cpp
M  +1    -1    kross/qts/values_p.h
M  +1    -1    kross/ui/view.cpp
M  +1    -1    plasma/corona.cpp
M  +1    -1    plasma/coronabase.cpp
M  +1    -1    plasma/intoJavascriptEngine/animationscriptengine.cpp
M  +1    -1    plasma/private/packages.cpp
M  +1    -1    staging/kde4support/src/kdecore/k3socketaddress.cpp
M  +1    -1    staging/kde4support/src/kdecore/netsupp.cpp

http://commits.kde.org/kdelibs/75fef6c6f4ec02195ab7b7c706385a56a5ee270a

diff --git a/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp \
b/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp index 3fcc17f..0646183 \
                100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp
+++ b/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols.cpp
@@ -23,7 +23,6 @@
 #include <phonon/mediaobject.h>
 #include <phonon/audiooutput.h>
 #include <kiconloader.h>
-#include <klocale.h>
 #include <QBoxLayout>
 #include <QToolButton>
 #include <phonon/seekslider.h>
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols_p.h \
b/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols_p.h index 8931501..c88fb46 \
                100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols_p.h
+++ b/interfaces/kmediaplayer/kfileaudiopreview/mediacontrols_p.h
@@ -23,7 +23,7 @@
 #include "mediacontrols.h"
 #include <kicon.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <phonon/volumeslider.h>
 #include <phonon/seekslider.h>
 #include <QToolButton>
diff --git a/kde3support/kdeui/k3aboutapplication.cpp \
b/kde3support/kdeui/k3aboutapplication.cpp index 29bb7a2..3948b25 100644
--- a/kde3support/kdeui/k3aboutapplication.cpp
+++ b/kde3support/kdeui/k3aboutapplication.cpp
@@ -30,7 +30,7 @@
 #include <kapplication.h>
 #include <QLabel>
 #include <kglobal.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <QStyle>
 
 K3AboutApplication::K3AboutApplication( const KAboutData *aboutData, QWidget \
                *parent, bool modal )
diff --git a/kde3support/kdeui/k3aboutdialog.cpp \
b/kde3support/kdeui/k3aboutdialog.cpp index 40207d9..e501f1b 100644
--- a/kde3support/kdeui/k3aboutdialog.cpp
+++ b/kde3support/kdeui/k3aboutdialog.cpp
@@ -40,7 +40,7 @@
 
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <ktextedit.h>
diff --git a/kde3support/kdeui/k3command.cpp b/kde3support/kdeui/k3command.cpp
index 47e83ef..4b18efd 100644
--- a/kde3support/kdeui/k3command.cpp
+++ b/kde3support/kdeui/k3command.cpp
@@ -25,7 +25,7 @@
 #include <kstandardaction.h>
 #include <kdebug.h>
 #include <kicon.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kmenu.h>
 
 #include "ktoolbarpopupaction.h"
diff --git a/kde3support/kdeui/k3dockwidget.cpp b/kde3support/kdeui/k3dockwidget.cpp
index a1717ea..356a48f 100644
--- a/kde3support/kdeui/k3dockwidget.cpp
+++ b/kde3support/kdeui/k3dockwidget.cpp
@@ -38,7 +38,7 @@
 #ifndef NO_KDE2
 #include <kconfiggroup.h>
 #include <kglobal.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <ktoolbar.h>
 #include <k3popupmenu.h>
 #include <kwindowsystem.h>
diff --git a/kde3support/kdeui/k3iconviewsearchline.cpp \
b/kde3support/kdeui/k3iconviewsearchline.cpp index b45e676..9fa3fa6 100644
--- a/kde3support/kdeui/k3iconviewsearchline.cpp
+++ b/kde3support/kdeui/k3iconviewsearchline.cpp
@@ -26,7 +26,6 @@
 #include "k3iconviewsearchline.h"
 
 #include <Qt3Support/Q3IconDrag>
-#include <klocale.h>
 #include <QtCore/QTimer>
 #include <kdebug.h>
 
diff --git a/kde3support/kdeui/k3listviewsearchline.cpp \
b/kde3support/kdeui/k3listviewsearchline.cpp index 0146a83..55b7d27 100644
--- a/kde3support/kdeui/k3listviewsearchline.cpp
+++ b/kde3support/kdeui/k3listviewsearchline.cpp
@@ -23,7 +23,7 @@
 #include <kiconloader.h>
 #include <ktoolbar.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 #include <QApplication>
 #include <QTimer>
diff --git a/kde3support/kdeui/k3passworddialog.cpp \
b/kde3support/kdeui/k3passworddialog.cpp index 817d39f..9ef8ce5 100644
--- a/kde3support/kdeui/k3passworddialog.cpp
+++ b/kde3support/kdeui/k3passworddialog.cpp
@@ -41,7 +41,8 @@
 #include <kglobal.h>
 #include <khbox.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
+#include <ksharedconfig.h>
 #include <kmessagebox.h>
 
 #include <kconfiggroup.h>
diff --git a/kde3support/kdeui/k3spell.cpp b/kde3support/kdeui/k3spell.cpp
index 6878877..d2e1d20 100644
--- a/kde3support/kdeui/k3spell.cpp
+++ b/kde3support/kdeui/k3spell.cpp
@@ -41,7 +41,7 @@
 
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include "k3sconfig.h"
 #include "k3spelldlg.h"
 #include <kprocess.h>
diff --git a/kde3support/kdeui/k3spelldlg.cpp b/kde3support/kdeui/k3spelldlg.cpp
index 74e6e04..c3339eb 100644
--- a/kde3support/kdeui/k3spelldlg.cpp
+++ b/kde3support/kdeui/k3spelldlg.cpp
@@ -25,7 +25,7 @@
 
 #include <kconfig.h>
 #include <kglobal.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kdebug.h>
 
 #include "k3sconfig.h"
diff --git a/kde3support/kdeui/k3syntaxhighlighter.cpp \
b/kde3support/kdeui/k3syntaxhighlighter.cpp index a99406f..8397808 100644
--- a/kde3support/kdeui/k3syntaxhighlighter.cpp
+++ b/kde3support/kdeui/k3syntaxhighlighter.cpp
@@ -26,7 +26,7 @@
 #include <Qt3Support/Q3SyntaxHighlighter>
 #include <QtCore/QTimer>
 
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/kde3support/kdeui/k3textedit.cpp b/kde3support/kdeui/k3textedit.cpp
index 376b5f7..ed47d58 100644
--- a/kde3support/kdeui/k3textedit.cpp
+++ b/kde3support/kdeui/k3textedit.cpp
@@ -29,7 +29,7 @@
 #include <kglobalsettings.h>
 #include <kstandardshortcut.h>
 #include <kicon.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <QKeyEvent>
 
 class K3TextEdit::K3TextEditPrivate
diff --git a/kde3support/kdeui/k3wizard.cpp b/kde3support/kdeui/k3wizard.cpp
index 9418d5c..9b444ae 100644
--- a/kde3support/kdeui/k3wizard.cpp
+++ b/kde3support/kdeui/k3wizard.cpp
@@ -24,7 +24,7 @@
 
 #include <kiconloader.h>
 #include <kicon.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kglobalsettings.h>
 #include <kguiitem.h>
 #include <kstandardguiitem.h>
diff --git a/kde3support/kio/kfile/k3fileview.cpp \
b/kde3support/kio/kfile/k3fileview.cpp index 618054c..1540daa 100644
--- a/kde3support/kio/kfile/k3fileview.cpp
+++ b/kde3support/kio/kfile/k3fileview.cpp
@@ -27,7 +27,7 @@
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kstandarddirs.h>
 
 #include <QtCore/QPointer>
diff --git a/kde3support/kunittest/modrunner.cpp \
b/kde3support/kunittest/modrunner.cpp index 4311311..34cf489 100644
--- a/kde3support/kunittest/modrunner.cpp
+++ b/kde3support/kunittest/modrunner.cpp
@@ -28,7 +28,7 @@
 #include <kcomponentdata.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 #include "runner.h"
 
diff --git a/kde3support/kunittest/tester.h b/kde3support/kunittest/tester.h
index b087175..aad8ec9 100644
--- a/kde3support/kunittest/tester.h
+++ b/kde3support/kunittest/tester.h
@@ -138,7 +138,7 @@ SampleTest - 1 test passed, 1 test failed
  * #include <kapplication.h>
  * #include <kcmdlineargs.h>
  * #include <kcmdlineargs.h>
- * #include <klocale.h>
+ * #include <klocalizedstring.h>
  * #include <kunittest/runnergui.h>
  *
  * static const char description[] = I18N_NOOP("SampleTests");
diff --git a/kde3support/tests/kaboutdialogtest.cpp \
b/kde3support/tests/kaboutdialogtest.cpp index bcd4a11..6311449 100644
--- a/kde3support/tests/kaboutdialogtest.cpp
+++ b/kde3support/tests/kaboutdialogtest.cpp
@@ -16,7 +16,7 @@
 #include <kcmdlineargs.h>
 #include <k3aboutapplication.h>
 #include <kapplication.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 int main(int argc, char** argv)
 {
diff --git a/kde3support/tests/kcommandtest.cpp b/kde3support/tests/kcommandtest.cpp
index 15de3e0..0861f69 100644
--- a/kde3support/tests/kcommandtest.cpp
+++ b/kde3support/tests/kcommandtest.cpp
@@ -6,7 +6,7 @@
 #include <kactioncollection.h>
 #include <kaction.h>
 #include <k3command.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 QTEST_KDEMAIN(KCommandTest, GUI)
 
diff --git a/kdecore/kconfig_compiler/kconfig_compiler.cpp \
b/kdecore/kconfig_compiler/kconfig_compiler.cpp index d8ae216..c6ccebb 100644
--- a/kdecore/kconfig_compiler/kconfig_compiler.cpp
+++ b/kdecore/kconfig_compiler/kconfig_compiler.cpp
@@ -1909,7 +1909,7 @@ int main( int argc, char **argv )
 
   if ( cfg.sourceIncludes.count() > 0 ) cpp << endl;
 
-  if ( cfg.setUserTexts ) cpp << "#include <klocale.h>" << endl << endl;
+  if ( cfg.setUserTexts ) cpp << "#include <klocalizedstring.h>" << endl << endl;
 
   // Header required by singleton implementation
   if ( cfg.singleton )
diff --git a/kdecore/kernel/kcomponentdata.cpp b/kdecore/kernel/kcomponentdata.cpp
index b8402e5..b708470 100644
--- a/kdecore/kernel/kcomponentdata.cpp
+++ b/kdecore/kernel/kcomponentdata.cpp
@@ -28,7 +28,7 @@
 #include "kconfig.h"
 #include "kglobal.h"
 #include "kglobal_p.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 #include "kconfiggroup.h"
 #include "kstandarddirs.h"
 #include <QtDebug>
diff --git a/kdecore/kernel/ktoolinvocation_win.cpp \
b/kdecore/kernel/ktoolinvocation_win.cpp index cbf6bea..0c3c8fa 100644
--- a/kdecore/kernel/ktoolinvocation_win.cpp
+++ b/kdecore/kernel/ktoolinvocation_win.cpp
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include "kmessage.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 
 #include <QUrl>
 #include <QProcess>
diff --git a/kdecore/kernel/ktoolinvocation_x11.cpp \
b/kdecore/kernel/ktoolinvocation_x11.cpp index 18c42f4..5cd5ea3 100644
--- a/kdecore/kernel/ktoolinvocation_x11.cpp
+++ b/kdecore/kernel/ktoolinvocation_x11.cpp
@@ -36,7 +36,7 @@
 #include "kglobal.h"
 #include "kshell.h"
 #include "kmacroexpander.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 #include "kmessage.h"
 #include "kservice.h"
 
diff --git a/kdecore/localization/kcurrencycode.cpp \
b/kdecore/localization/kcurrencycode.cpp index c406014..6bfa5fd 100644
--- a/kdecore/localization/kcurrencycode.cpp
+++ b/kdecore/localization/kcurrencycode.cpp
@@ -28,7 +28,7 @@
 #include "kconfig.h"
 #include "kconfiggroup.h"
 #include "kglobal.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
 
diff --git a/kdecore/network/klocalsocket_unix.cpp \
b/kdecore/network/klocalsocket_unix.cpp index e250a69..362cbe2 100644
--- a/kdecore/network/klocalsocket_unix.cpp
+++ b/kdecore/network/klocalsocket_unix.cpp
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "klocale.h"
+#include "klocalizedstring.h"
 
 static inline int kSocket(int af, int socketype, int proto)
 {
diff --git a/kdecore/network/klocalsocket_win.cpp \
b/kdecore/network/klocalsocket_win.cpp index 24e0b2d..7df5d6f 100644
--- a/kdecore/network/klocalsocket_win.cpp
+++ b/kdecore/network/klocalsocket_win.cpp
@@ -23,7 +23,7 @@
 
 #include "klocalsocket_p.h"
 
-#include "klocale.h"
+#include "klocalizedstring.h"
 
 void KLocalSocketPrivate::connectToPath(const QString &path, \
                KLocalSocket::LocalSocketType aType,
                                         QAbstractSocket::OpenMode openMode)
diff --git a/kdecore/tests/qcoreapptest.cpp b/kdecore/tests/qcoreapptest.cpp
index 96214ac..33c9325 100644
--- a/kdecore/tests/qcoreapptest.cpp
+++ b/kdecore/tests/qcoreapptest.cpp
@@ -21,7 +21,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QtGlobal>
 #include <kcomponentdata.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kconfiggroup.h>
 #include <kdebug.h>
 
diff --git a/kdecore/util/klibloader.cpp b/kdecore/util/klibloader.cpp
index 11f2ebc..559a9b3 100644
--- a/kdecore/util/klibloader.cpp
+++ b/kdecore/util/klibloader.cpp
@@ -29,7 +29,7 @@
 #include "kstandarddirs.h"
 #include "kcomponentdata.h"
 #include "kdebug.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 
 class KLibLoaderPrivate
 {
diff --git a/kdeui/actions/kaction.cpp b/kdeui/actions/kaction.cpp
index 7057bea..50d747e 100644
--- a/kdeui/actions/kaction.cpp
+++ b/kdeui/actions/kaction.cpp
@@ -27,7 +27,7 @@
 #include "kaction.h"
 #include "kaction_p.h"
 #include "kglobalaccel_p.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 #include "kmessagebox.h"
 #include "kauthexecutejob.h"
 
diff --git a/kdeui/dialogs/kdeprintdialog.cpp b/kdeui/dialogs/kdeprintdialog.cpp
index d82be9b..f6d9826 100644
--- a/kdeui/dialogs/kdeprintdialog.cpp
+++ b/kdeui/dialogs/kdeprintdialog.cpp
@@ -29,7 +29,7 @@
 
 #include "kdebug.h"
 #include "kdialog.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 #include "kdeversion.h"
 
 #include <fixx11h.h> // for enable-final
diff --git a/kdeui/dialogs/kshortcuteditwidget.cpp \
b/kdeui/dialogs/kshortcuteditwidget.cpp index 7444032..228a401 100644
--- a/kdeui/dialogs/kshortcuteditwidget.cpp
+++ b/kdeui/dialogs/kshortcuteditwidget.cpp
@@ -31,7 +31,7 @@
 #include <QLabel>
 
 #include "kkeysequencewidget.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 
 void TabConnectedWidget::paintEvent(QPaintEvent *e)
 {
diff --git a/kdeui/dialogs/kshortcutsdialog.cpp b/kdeui/dialogs/kshortcutsdialog.cpp
index 85cfd32..dea44db 100644
--- a/kdeui/dialogs/kshortcutsdialog.cpp
+++ b/kdeui/dialogs/kshortcutsdialog.cpp
@@ -30,7 +30,7 @@
 #include "kshortcutschemeshelper_p.h"
 
 #include "kdebug.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 
 #include <QApplication>
 #include <QDomDocument>
diff --git a/kdeui/fonts/fonthelpers.cpp b/kdeui/fonts/fonthelpers.cpp
index 5bd6b50..80296fa 100644
--- a/kdeui/fonts/fonthelpers.cpp
+++ b/kdeui/fonts/fonthelpers.cpp
@@ -22,7 +22,7 @@
 
 #include "fonthelpers_p.h"
 
-#include "klocale.h"
+#include "klocalizedstring.h"
 
 #ifdef NEVERDEFINE // never true
 // Font names up for translation, listed for extraction.
diff --git a/kdeui/fonts/kfontcombobox.cpp b/kdeui/fonts/kfontcombobox.cpp
index a4783aae..7dce8f7 100644
--- a/kdeui/fonts/kfontcombobox.cpp
+++ b/kdeui/fonts/kfontcombobox.cpp
@@ -22,7 +22,7 @@
 #include "fonthelpers_p.h"
 
 #include "kdebug.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 #include "kcolorscheme.h"
 #include "kglobalsettings.h"
 #include "kfontchooser.h"
diff --git a/kdeui/notifications/ksystemtrayicon.cpp \
b/kdeui/notifications/ksystemtrayicon.cpp index 25a2e7c..9ec8954 100644
--- a/kdeui/notifications/ksystemtrayicon.cpp
+++ b/kdeui/notifications/ksystemtrayicon.cpp
@@ -24,7 +24,7 @@
 #include "kaboutdata.h"
 #include "kaction.h"
 #include "kcomponentdata.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 #include "kmenu.h"
 #include "kmessagebox.h"
 #include "kshortcut.h"
diff --git a/kdeui/shortcuts/kshortcut.cpp b/kdeui/shortcuts/kshortcut.cpp
index e812f5b..e1ac80e 100644
--- a/kdeui/shortcuts/kshortcut.cpp
+++ b/kdeui/shortcuts/kshortcut.cpp
@@ -28,7 +28,7 @@
 
 #include "kdebug.h"
 #include "kglobal.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 
 
 class KShortcutPrivate
diff --git a/kdeui/shortcuts/kstandardshortcut.cpp \
b/kdeui/shortcuts/kstandardshortcut.cpp index 0a79853..586d887 100644
--- a/kdeui/shortcuts/kstandardshortcut.cpp
+++ b/kdeui/shortcuts/kstandardshortcut.cpp
@@ -23,7 +23,8 @@
 #include "kconfig.h"
 #include "kdebug.h"
 #include "kglobal.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
+#include "ksharedconfig.h"
 #include "kshortcut.h"
 #include <kconfiggroup.h>
 
diff --git a/kdeui/sonnet/highlighter.cpp b/kdeui/sonnet/highlighter.cpp
index 99bf34b..1ce55c5 100644
--- a/kdeui/sonnet/highlighter.cpp
+++ b/kdeui/sonnet/highlighter.cpp
@@ -29,7 +29,7 @@
 
 #include <kconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kmessagebox.h>
 
 #include <QTextEdit>
diff --git a/kdeui/util/kkeyserver_x11.cpp b/kdeui/util/kkeyserver_x11.cpp
index 5a7d6d8..80a2af4 100644
--- a/kdeui/util/kkeyserver_x11.cpp
+++ b/kdeui/util/kkeyserver_x11.cpp
@@ -23,7 +23,7 @@
 #include "kkeyserver_x11.h"
 
 #include "kdebug.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 
 #include <QX11Info>
 # define XK_MISCELLANY
diff --git a/kdoctools/genshortcutents.cpp b/kdoctools/genshortcutents.cpp
index d1f5157..4deea30 100644
--- a/kdoctools/genshortcutents.cpp
+++ b/kdoctools/genshortcutents.cpp
@@ -25,7 +25,7 @@
 #include "kaboutdata.h"
 #include "kcomponentdata.h"
 #include "kcmdlineargs.h"
-#include "klocale.h"
+#include "klocalizedstring.h"
 #include "kstandardshortcut.h"
 
 #include <QtCore/QDate>
diff --git a/khtml/ecma/debugger/breakpointsdock.cpp \
b/khtml/ecma/debugger/breakpointsdock.cpp index f12e5ad..231b0d9 100644
--- a/khtml/ecma/debugger/breakpointsdock.cpp
+++ b/khtml/ecma/debugger/breakpointsdock.cpp
@@ -21,7 +21,7 @@
 
 #include <QVBoxLayout>
 #include <QListWidget>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 namespace KJSDebugger {
 
diff --git a/khtml/ecma/debugger/callstackdock.cpp \
b/khtml/ecma/debugger/callstackdock.cpp index e30dc68..d2517d9 100644
--- a/khtml/ecma/debugger/callstackdock.cpp
+++ b/khtml/ecma/debugger/callstackdock.cpp
@@ -24,7 +24,7 @@
 #include <QHeaderView>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kurl.h>
 
 #include "debugdocument.h"
diff --git a/khtml/ecma/debugger/consoledock.cpp \
b/khtml/ecma/debugger/consoledock.cpp index ffb2abf..c4bfffd 100644
--- a/khtml/ecma/debugger/consoledock.cpp
+++ b/khtml/ecma/debugger/consoledock.cpp
@@ -33,7 +33,7 @@
 #include <QTextLayout>
 
 #include <khistorycombobox.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 namespace KJSDebugger {
 
diff --git a/khtml/ecma/debugger/debugwindow.cpp \
b/khtml/ecma/debugger/debugwindow.cpp index 4d17dae..5c1b3b4 100644
--- a/khtml/ecma/debugger/debugwindow.cpp
+++ b/khtml/ecma/debugger/debugwindow.cpp
@@ -28,7 +28,7 @@
 
 #include <ktoolbar.h>
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kdebug.h>
 #include <kicon.h>
 #include <kiconloader.h>
diff --git a/khtml/ecma/debugger/errordlg.cpp b/khtml/ecma/debugger/errordlg.cpp
index c76f82d..a27b74e 100644
--- a/khtml/ecma/debugger/errordlg.cpp
+++ b/khtml/ecma/debugger/errordlg.cpp
@@ -24,7 +24,7 @@
 #include <QBoxLayout>
 
 
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kiconloader.h>
 
 namespace KJSDebugger { 
diff --git a/khtml/ecma/debugger/localvariabledock.cpp \
b/khtml/ecma/debugger/localvariabledock.cpp index 1d6d2fc8..960e8b5 100644
--- a/khtml/ecma/debugger/localvariabledock.cpp
+++ b/khtml/ecma/debugger/localvariabledock.cpp
@@ -32,7 +32,7 @@
 #include <kjs/JSVariableObject.h>
 #include <kjs/object.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 #include "value2string.h"
 
diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp
index f8c10d5..a310a3a 100644
--- a/khtml/ecma/kjs_html.cpp
+++ b/khtml/ecma/kjs_html.cpp
@@ -61,7 +61,7 @@
 
 #include <kmessagebox.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 #include <kdebug.h>
 #include <QtCore/QList>
diff --git a/khtml/ecma/kjs_mozilla.cpp b/khtml/ecma/kjs_mozilla.cpp
index ac3ee23..153e977 100644
--- a/khtml/ecma/kjs_mozilla.cpp
+++ b/khtml/ecma/kjs_mozilla.cpp
@@ -23,7 +23,7 @@
 
 #include "kjs_binding.h"
 
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kdebug.h>
 
 #include <kjs/lookup.h>
diff --git a/khtml/ecma/kjs_proxy.cpp b/khtml/ecma/kjs_proxy.cpp
index ba599b7..f6996ad 100644
--- a/khtml/ecma/kjs_proxy.cpp
+++ b/khtml/ecma/kjs_proxy.cpp
@@ -33,7 +33,7 @@
 #include <khtml_part.h>
 #include <kprotocolmanager.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <unistd.h>
 #include <assert.h>
 #include <kjs/function.h>
diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index 386d23a..66da8dc 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -41,7 +41,7 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kcodecs.h>
 #include <kparts/browserinterface.h>
 #include <kwindowsystem.h>
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
index 0b4998d..10f335a 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -51,7 +51,7 @@
 #include <kmimetype.h>
 #include <kmessagebox.h>
 #include <krandom.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #ifndef KHTML_NO_WALLET
 #include <kwallet.h>
 #endif
diff --git a/khtml/html/htmlparser.cpp b/khtml/html/htmlparser.cpp
index 17286bc..e75f078 100644
--- a/khtml/html/htmlparser.cpp
+++ b/khtml/html/htmlparser.cpp
@@ -60,7 +60,7 @@
 #include <rendering/render_object.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 // Turn off inlining to avoid warning with newer gcc.
 #undef __inline
diff --git a/khtml/java/kjavaapplet.cpp b/khtml/java/kjavaapplet.cpp
index 1dadd0e..9e1f979 100644
--- a/khtml/java/kjavaapplet.cpp
+++ b/khtml/java/kjavaapplet.cpp
@@ -22,7 +22,7 @@
 #include "kjavaappletwidget.h"
 #include "kjavaappletcontext.h"
 
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kdebug.h>
 #include <kparts/browserextension.h>
 
diff --git a/khtml/java/kjavaappletcontext.cpp b/khtml/java/kjavaappletcontext.cpp
index 98989f3..c05c48c 100644
--- a/khtml/java/kjavaappletcontext.cpp
+++ b/khtml/java/kjavaappletcontext.cpp
@@ -23,7 +23,7 @@
 #include "kjavaappletserver.h"
 #include "kjavaprocess.h"
 #include "kjavaapplet.h"
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <QtCore/QMap>
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index 41bb79b..f3e0401 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <kconfig.h>
 #include <kconfiggroup.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kparts/browserextension.h>
 #include <kstandarddirs.h>
 
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index e01ab06..fc22329 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -36,7 +36,7 @@
 #include <kapplication.h>
 #include <kauthorized.h>
 #include <kaboutdata.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kstatusbar.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/khtml/java/kjavaappletwidget.cpp b/khtml/java/kjavaappletwidget.cpp
index 0349372..cc43a9a 100644
--- a/khtml/java/kjavaappletwidget.cpp
+++ b/khtml/java/kjavaappletwidget.cpp
@@ -24,7 +24,7 @@
 
 #include <kwindowsystem.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 #include <QLabel>
 
diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp
index 9914f98..abb1826 100644
--- a/khtml/khtml_ext.cpp
+++ b/khtml/khtml_ext.cpp
@@ -45,7 +45,7 @@
 #include <assert.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kfiledialog.h>
 #include <kjobuidelegate.h>
 #include <kio/job.h>
diff --git a/khtml/khtml_global.cpp b/khtml/khtml_global.cpp
index d60b7a6..aefd789 100644
--- a/khtml/khtml_global.cpp
+++ b/khtml/khtml_global.cpp
@@ -38,7 +38,7 @@
 #include <kcomponentdata.h>
 #include <kiconloader.h>
 #include <kaboutdata.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 #include <assert.h>
 
diff --git a/khtml/khtml_printsettings.cpp b/khtml/khtml_printsettings.cpp
index 92eef9c..0aaf318 100644
--- a/khtml/khtml_printsettings.cpp
+++ b/khtml/khtml_printsettings.cpp
@@ -20,7 +20,7 @@
 #include "khtml_printsettings.h"
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <QCheckBox>
 #include <QLayout>
 
diff --git a/khtml/khtml_run.cpp b/khtml/khtml_run.cpp
index ad19961..ce6f270 100644
--- a/khtml/khtml_run.cpp
+++ b/khtml/khtml_run.cpp
@@ -24,7 +24,7 @@
 #include "khtmlpart_p.h"
 #include <kio/job.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include "khtml_ext.h"
 #include <QImage>
 
diff --git a/khtml/khtml_settings.cpp b/khtml/khtml_settings.cpp
index c76aa1d..5f19853 100644
--- a/khtml/khtml_settings.cpp
+++ b/khtml/khtml_settings.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kmessagebox.h>
 #include <khtml_filter_p.h>
 #include <kstandarddirs.h>
diff --git a/khtml/khtmladaptorpart.cpp b/khtml/khtmladaptorpart.cpp
index 47a2c46..7869a88 100644
--- a/khtml/khtmladaptorpart.cpp
+++ b/khtml/khtmladaptorpart.cpp
@@ -21,7 +21,7 @@
 #include "khtmladaptorpart.h"
 #include <kjs/object.h>
 #include <QLabel>
-#include <klocale.h>
+#include <klocalizedstring.h>
 AdaptorView::AdaptorView(QWidget* wparent, QObject* parent,
                          const QStringList& /*args*/)
     : KParts::ReadOnlyPart(parent)
diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp
index 7b91bc3..8a5d4eb 100644
--- a/khtml/khtmlimage.cpp
+++ b/khtml/khtmlimage.cpp
@@ -33,7 +33,7 @@
 #include <kio/job.h>
 #include <kcomponentdata.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kvbox.h>
 #include <kactioncollection.h>
 
diff --git a/khtml/kmultipart/kmultipart.cpp b/khtml/kmultipart/kmultipart.cpp
index 2167f09..33effeb 100644
--- a/khtml/kmultipart/kmultipart.cpp
+++ b/khtml/kmultipart/kmultipart.cpp
@@ -22,7 +22,7 @@
 
 #include <kcomponentdata.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kjobuidelegate.h>
 #include <kio/job.h>
 #include <QtCore/QFile>
diff --git a/khtml/rendering/media_controls.cpp b/khtml/rendering/media_controls.cpp
index f119d48..e9249fd 100644
--- a/khtml/rendering/media_controls.cpp
+++ b/khtml/rendering/media_controls.cpp
@@ -35,7 +35,7 @@
 #include <ktogglefullscreenaction.h>
 #include <kshortcut.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 namespace khtml {
 
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index 6781ab4..56897f8 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -35,7 +35,7 @@
 #include <kfind.h>
 #include <kfinddialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kmessagebox.h>
 #include <kreplace.h>
 #include <kreplacedialog.h>
diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp
index fd5ad65..ec5eae2 100644
--- a/khtml/rendering/render_frames.cpp
+++ b/khtml/rendering/render_frames.cpp
@@ -37,7 +37,7 @@
 
 #include <kmessagebox.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kdebug.h>
 #include <QtCore/QTimer>
 #include <QPainter>
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index be90b2f..266995f 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -51,7 +51,7 @@
 #include <QTimerEvent>
 #include <QtCore/QList>
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 #include <rendering/counter_tree.h>
 #include <rendering/render_canvas.h>
diff --git a/khtml/xml/xml_tokenizer.cpp b/khtml/xml/xml_tokenizer.cpp
index 3a0c6bc..f65be63 100644
--- a/khtml/xml/xml_tokenizer.cpp
+++ b/khtml/xml/xml_tokenizer.cpp
@@ -34,7 +34,7 @@
 #include "khtml_part.h"
 #include <QtCore/QVariant>
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kencodingdetector.h>
 
 // SVG includes
diff --git a/kjsembed/kjsembed/kjseglobal.h b/kjsembed/kjsembed/kjseglobal.h
index 312ac47..feac770 100644
--- a/kjsembed/kjsembed/kjseglobal.h
+++ b/kjsembed/kjsembed/kjseglobal.h
@@ -83,7 +83,7 @@ namespace KJS {
  */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 #else // QT_ONLY
 
diff --git a/kross/core/action.cpp b/kross/core/action.cpp
index 07687e9..eb74316 100644
--- a/kross/core/action.cpp
+++ b/kross/core/action.cpp
@@ -27,7 +27,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kicon.h>
 #include <kmimetype.h>
 
diff --git a/kross/core/manager.cpp b/kross/core/manager.cpp
index b3ecec5..5c825dd 100644
--- a/kross/core/manager.cpp
+++ b/kross/core/manager.cpp
@@ -32,7 +32,7 @@
 #include <QtCore/QCoreApplication>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 extern "C"
 {
diff --git a/kross/modules/form.cpp b/kross/modules/form.cpp
index a632fb3..280398f 100644
--- a/kross/modules/form.cpp
+++ b/kross/modules/form.cpp
@@ -39,7 +39,7 @@
 #include <QTextBlock>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kurl.h>
 #include <kpushbutton.h>
 //#include <kurlcombobox.h>
@@ -53,7 +53,7 @@
 #include <kpluginfactory.h>
 #include <kparts/part.h>
 //#include <kio/netaccess.h>
-//#include <klocale.h>
+//#include <klocalizedstring.h>
 //#include <kmimetype.h>
 //#include <kstandarddirs.h>
 #include <kfilewidget.h>
diff --git a/kross/modules/translation.cpp b/kross/modules/translation.cpp
index debcf87..e423bf2 100644
--- a/kross/modules/translation.cpp
+++ b/kross/modules/translation.cpp
@@ -24,7 +24,7 @@
 #include <QVariantList>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <klocalizedstring.h>
 #include <kpluginloader.h>
 #include <kpluginfactory.h>
diff --git a/kross/qts/values_p.h b/kross/qts/values_p.h
index 6d9699b..bb58ded 100644
--- a/kross/qts/values_p.h
+++ b/kross/qts/values_p.h
@@ -41,7 +41,7 @@
 #include <QDebug>
 
 #include <kurl.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 using namespace Kross;
 
diff --git a/kross/ui/view.cpp b/kross/ui/view.cpp
index d25d334..82536d0 100644
--- a/kross/ui/view.cpp
+++ b/kross/ui/view.cpp
@@ -46,7 +46,7 @@
 #include <kactioncollection.h>
 #include <kcombobox.h>
 #include <kiconbutton.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
 
diff --git a/plasma/corona.cpp b/plasma/corona.cpp
index bbe694a..ba5b270 100644
--- a/plasma/corona.cpp
+++ b/plasma/corona.cpp
@@ -36,7 +36,7 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kmimetype.h>
 #include <kshortcutsdialog.h>
 #include <kwindowsystem.h>
diff --git a/plasma/coronabase.cpp b/plasma/coronabase.cpp
index 3873a42..9db9f36 100644
--- a/plasma/coronabase.cpp
+++ b/plasma/coronabase.cpp
@@ -36,7 +36,7 @@
 #include <kaction.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kmimetype.h>
 #include <kshortcutsdialog.h>
 #include <kwindowsystem.h>
diff --git a/plasma/intoJavascriptEngine/animationscriptengine.cpp \
b/plasma/intoJavascriptEngine/animationscriptengine.cpp index 6896661..35f7686 100644
--- a/plasma/intoJavascriptEngine/animationscriptengine.cpp
+++ b/plasma/intoJavascriptEngine/animationscriptengine.cpp
@@ -33,7 +33,7 @@
 #include <QTextStream>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 
 #include "animator.h"
 #include "javascriptanimation_p.h"
diff --git a/plasma/private/packages.cpp b/plasma/private/packages.cpp
index a52fcc0..beb6c3d 100644
--- a/plasma/private/packages.cpp
+++ b/plasma/private/packages.cpp
@@ -27,7 +27,7 @@
 
 #include <kconfiggroup.h>
 #include <kdesktopfile.h>
-#include <klocale.h>
+#include <klocalizedstring.h>
 #include <kmessagebox.h>
 
 #include "private/wallpaper_p.h"
diff --git a/staging/kde4support/src/kdecore/k3socketaddress.cpp \
b/staging/kde4support/src/kdecore/k3socketaddress.cpp index 9cde4b0..3314eea 100644
--- a/staging/kde4support/src/kdecore/k3socketaddress.cpp
+++ b/staging/kde4support/src/kdecore/k3socketaddress.cpp
@@ -39,7 +39,7 @@
 #include <QFile>
 #include <QObject>
 
-#include "klocale.h"
+#include "klocalizedstring.h"
 
 #ifndef Q_CC_MSVC
 #include "netsupp.h"
diff --git a/staging/kde4support/src/kdecore/netsupp.cpp \
b/staging/kde4support/src/kdecore/netsupp.cpp index 8e15b47..c056624 100644
--- a/staging/kde4support/src/kdecore/netsupp.cpp
+++ b/staging/kde4support/src/kdecore/netsupp.cpp
@@ -39,7 +39,7 @@
 
 #include <config.h>
 #include <config-network.h>
-#include "klocale.h"
+#include "klocalizedstring.h"
 
 #ifndef IN6_IS_ADDR_V4MAPPED
 #define NEED_IN6_TESTS


[prev in list] [next in list] [prev in thread] [next in thread]