Fix includes

2024-08-21 09:20:13 +00:00 · 2014-10-18 14:42:41 +02:00 · 2014-10-18 14:42:41 +02:00 · 31a0c4fbd5
parent 3d6c254846
commit 31a0c4fbd5
50 changed files with 52 additions and 51 deletions
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@ -47,7 +47,7 @@
 #include <KNewFileMenu>
 #include <konq_operations.h>
 #include <KService>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KPropertiesDialog>
 #include <KStandardAction>
 #include <KToolBar>
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@ -63,7 +63,7 @@
 #include <KIO/NetAccess>
 #include <KIO/JobUiDelegate>
 #include <KInputDialog>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KProtocolManager>
 #include <QMenu>
 #include <KMenuBar>
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@ -29,7 +29,7 @@
 #include <KDebug>
 #include <KGlobalSettings>
 #include <KIconLoader>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KMessageBox>
 #include <KPluginFactory>
 #include <KRun>
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@ -32,7 +32,7 @@
 #include <KFileItemDelegate>
 #include <KFileItemActions>
 #include <KFilePlacesModel>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KIconEffect>
 #include <KIO/NetAccess>
 #include <KIO/PreviewJob>
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@ -26,7 +26,7 @@
 #include <QHBoxLayout>

 #include <QIcon>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KLineEdit>

 FilterBar::FilterBar(QWidget* parent) :
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@ -22,7 +22,7 @@
 #include "kfileitemmodelrolesupdater.h"
 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"
-#include <KLocale>
+#include <KLocalizedString>
 #include <KStringHandler>
 #include "private/kpixmapmodifier.h"

--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@ -22,7 +22,7 @@
 #include "kfileitemmodel.h"

 #include <KGlobalSettings>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KStringHandler>
 #include <KDebug>
 #include <kstringhandler_deprecated.h> //TODO: port to QCollator
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@ -25,7 +25,7 @@
 #include <QIcon>
 #include <KIconEffect>
 #include <KIconLoader>
-#include <KLocale>
+#include <KLocalizedString>
 #include <kratingpainter.h>
 #include <KStringHandler>
 #include <KDebug>
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@ -22,7 +22,7 @@

 #include <KDebug>
 #include <KGlobal>
-#include <KLocale>
+#include <KLocalizedString>

 #include <Baloo/File>
 #include <KFileMetaData/PropertyInfo>
--- a/src/kitemviews/private/kfileitemmodeldirlister.cpp
+++ b/src/kitemviews/private/kfileitemmodeldirlister.cpp
@ -18,7 +18,7 @@
 ***************************************************************************/

 #include "kfileitemmodeldirlister.h"
-#include <KLocale>
+#include <KLocalizedString>
 #include <KIO/JobClasses>

 KFileItemModelDirLister::KFileItemModelDirLister(QObject* parent) :
--- a/src/main.cpp
+++ b/src/main.cpp
@ -24,7 +24,7 @@

 #include <k4aboutdata.h>
 #include <KCmdLineArgs>
-#include <KLocale>
+#include <KLocalizedString>
 #include <kmainwindow.h>
 #include <kdemacros.h>
 #include <kdeversion.h>
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@ -33,7 +33,7 @@
 #include <kurlmimedata.h>
 #include <KFileItemListProperties>
 #include <konq_operations.h>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KIO/Paste>
 #include <KIO/FileUndoManager>
 #include <KPropertiesDialog>
--- a/src/panels/information/filemetadataconfigurationdialog.cpp
+++ b/src/panels/information/filemetadataconfigurationdialog.cpp
@ -24,8 +24,8 @@
 #else
 #include <Baloo/FileMetaDataConfigWidget>
 #endif
-
-#include <KLocale>
+#include <KSharedConfig>
+#include <KLocalizedString>
 #include <QLabel>
 #include <QVBoxLayout>

--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@ -28,7 +28,7 @@
 #include <KIconEffect>
 #include <KIconLoader>
 #include <QIcon>
-#include <KLocale>
+#include <KLocalizedString>
 #include <QMenu>
 #include <kseparator.h>
 #include <KStringHandler>
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@ -35,7 +35,7 @@
 #include <QIcon>
 #include <KIconLoader>
 #include <KUrl>
-#include <KLocale>
+#include <KLocalizedString>

 class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@ -26,7 +26,7 @@
 #include <KDebug>
 #include <KDirLister>
 #include <QIcon>
-#include <KLocale>
+#include <KLocalizedString>
 #include "placesitemsignalhandler.h"
 #include <QDateTime>
 #include <Solid/Block>
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@ -31,7 +31,7 @@
 #include <KGlobal>
 #include <KIconButton>
 #include <KLineEdit>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KMimeType>
 #include <KUrlRequester>
 #include <QCheckBox>
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@ -32,7 +32,7 @@
 #include <KDebug>
 #include <QIcon>
 #include <kprotocolinfo.h>
-#include <KLocale>
+#include <KLocalizedString>
 #include <QStandardPaths>
 #include <KUser>
 #include <KGlobal>
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@ -32,7 +32,7 @@
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KIconLoader>
 #include <kitemviews/kitemlistcontainer.h>
 #include <kitemviews/kitemlistcontroller.h>
--- a/src/search/dolphinfacetswidget.cpp
+++ b/src/search/dolphinfacetswidget.cpp
@ -19,7 +19,7 @@

 #include "dolphinfacetswidget.h"

-#include <KLocale>
+#include <KLocalizedString>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QDate>
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@ -24,7 +24,7 @@

 #include <QIcon>
 #include <KLineEdit>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KSeparator>
 #include <KGlobalSettings>

--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@ -21,7 +21,8 @@

 #include <config-baloo.h>

-#include <KLocale>
+#include <KSharedConfig>
+#include <KLocalizedString>
 #include "kitemviews/kfileitemmodel.h"
 #include <QCheckBox>
 #include <QLabel>
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@ -30,7 +30,7 @@
 #include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"

-#include <KLocale>
+#include <KLocalizedString>
 #include <KMessageBox>
 #include <QIcon>

--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@ -24,7 +24,7 @@

 #include <KComboBox>
 #include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>

 #include <QCheckBox>
 #include <QGroupBox>
--- a/src/settings/general/configurepreviewplugindialog.cpp
+++ b/src/settings/general/configurepreviewplugindialog.cpp
@ -20,7 +20,7 @@
 #include "configurepreviewplugindialog.h"

 #include <KLibrary>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KIO/NetAccess>
 #include <kio/thumbcreator.h>

--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@ -22,7 +22,7 @@
 #include <dolphin_generalsettings.h>

 #include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>

 #include <QCheckBox>
 #include <QLabel>
--- a/src/settings/general/generalsettingspage.cpp
+++ b/src/settings/general/generalsettingspage.cpp
@ -27,7 +27,7 @@
 #include "statusbarsettingspage.h"

 #include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KIconLoader>
 #include <KTabWidget>

--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@ -25,7 +25,7 @@
 #include <KConfigGroup>
 #include <KDialog>
 #include <KGlobal>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KNumInput>
 #include <KServiceTypeTrader>
 #include <KService>
--- a/src/settings/general/statusbarsettingspage.cpp
+++ b/src/settings/general/statusbarsettingspage.cpp
@ -22,7 +22,7 @@
 #include <dolphin_generalsettings.h>

 #include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>

 #include <QCheckBox>
 #include <QVBoxLayout>
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@ -21,7 +21,7 @@

 #include <KTabWidget>
 #include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <KGlobal>
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@ -21,7 +21,7 @@

 #include <KTabWidget>
 #include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <KGlobal>
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@ -21,7 +21,7 @@

 #include <KTabWidget>
 #include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <KGlobal>
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@ -21,7 +21,7 @@

 #include <KTabWidget>
 #include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <QIcon>
--- a/src/settings/navigation/navigationsettingspage.cpp
+++ b/src/settings/navigation/navigationsettingspage.cpp
@ -23,7 +23,7 @@

 #include <KDialog>
 #include <KGlobalSettings>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KVBox>

 #include <QCheckBox>
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@ -27,7 +27,7 @@
 #include <KDesktopFile>
 #include <kdesktopfileactions.h>
 #include <QIcon>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KMessageBox>
 #include <KNS3/Button>
 #include <KService>
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@ -26,7 +26,7 @@

 #include <KDialog>
 #include <KFileDialog>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KLineEdit>
 #include <KMessageBox>
 #include <KVBox>
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@ -21,7 +21,7 @@

 #include <KFontDialog>
 #include <KGlobalSettings>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KComboBox>

 #include <QEvent>
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@ -26,7 +26,7 @@
 #include <QVBoxLayout>

 #include <KDialog>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KIconLoader>
 #include <KTabWidget>

--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@ -25,7 +25,7 @@
 #include "dolphin_iconsmodesettings.h"

 #include <KComboBox>
-#include <KLocale>
+#include <KLocalizedString>

 #include <QCheckBox>
 #include <QGroupBox>
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@ -30,7 +30,7 @@
 #include <config-baloo.h>

 #include <KComponentData>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KIconLoader>
 #include <KIO/NetAccess>
 #include <KMessageBox>
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@ -26,7 +26,7 @@
 #include <QTimer>
 #include <QBoxLayout>

-#include <KLocale>
+#include <KLocalizedString>
 #include <KIO/JobClasses>

 #include <views/viewproperties.h>
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@ -23,7 +23,7 @@

 #include <KIconLoader>
 #include <QIcon>
-#include <KLocale>
+#include <KLocalizedString>
 #include <QMenu>
 #include <KVBox>

--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@ -22,7 +22,7 @@

 #include "spaceinfoobserver.h"

-#include <KLocale>
+#include <KLocalizedString>
 #include <KIO/Job>

 #include <QKeyEvent>
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@ -30,7 +30,7 @@
 #include <KActionMenu>
 #include <KActionCollection>
 #include <QIcon>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KGlobal>
 #include <KMimeType>
 #include <KConfig>
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@ -43,7 +43,7 @@
 #include <KIconEffect>
 #include <KFileItem>
 #include <KFileItemListProperties>
-#include <KLocale>
+#include <KLocalizedString>
 #include <kitemviews/kfileitemmodel.h>
 #include <kitemviews/kfileitemlistview.h>
 #include <kitemviews/kitemlistcontainer.h>
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@ -32,7 +32,7 @@
 #include <KActionCollection>
 #include <KActionMenu>
 #include <kitemviews/kfileitemmodel.h>
-#include <KLocale>
+#include <KLocalizedString>
 #include <QMenu>
 #include <KNewFileMenu>
 #include <KSelectAction>
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@ -21,7 +21,7 @@
 #include "draganddrophelper.h"

 #include <KFileItem>
-#include <KLocale>
+#include <KLocalizedString>
 #include <konq_operations.h>
 #include <KUrl>
 #include <QApplication>
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@ -20,7 +20,7 @@
 #include "renamedialog.h"

 #include <KLineEdit>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KJobWidgets>
 #include <KJobUiDelegate>
 #include <KIO/CopyJob>
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@ -21,7 +21,7 @@

 #include "dolphin_versioncontrolsettings.h"

-#include <KLocale>
+#include <KLocalizedString>
 #include <KService>
 #include <KDebug>
 #include <KServiceTypeTrader>
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@ -24,7 +24,7 @@
 #include "dolphin_generalsettings.h"

 #include <KComponentData>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KUrl>
 #include <KDebug>
 #include <KGlobal>