diff options
50 files changed, 52 insertions, 51 deletions
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index 84a09f4d2..f3337a691 100644 --- 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> diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index e99788621..e6ef74ef3 100644 --- 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> diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index e3479d3b8..9d4de3fe9 100644 --- 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> diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 0f3aa9761..25207b5b7 100644 --- 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> diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp index b850469bf..4a43dbd23 100644 --- 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) : diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index aee10b5bd..bb918d0de 100644 --- 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" diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 4d5879f4d..25507c23d 100644 --- 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 diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index eaed056e5..b8557c67f 100644 --- 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> diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp index 74f789e23..5ca56c58b 100644 --- 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> diff --git a/src/kitemviews/private/kfileitemmodeldirlister.cpp b/src/kitemviews/private/kfileitemmodeldirlister.cpp index 9dfd17d8e..d5c8bbb18 100644 --- 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) : diff --git a/src/main.cpp b/src/main.cpp index ca047bd16..91d32a08a 100644 --- 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> diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index 56e6d44b3..445b261b9 100644 --- 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> diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp index 15f1f4f5f..08723bc0c 100644 --- 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> diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 259b672d3..0ec82a424 100644 --- 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> diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index 16dbabfed..27cd3e746 100644 --- 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 { diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp index b82e50256..e667af302 100644 --- 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> diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp index 9a239b786..87fbf4c29 100644 --- 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> diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index aa7f720b4..344e176a3 100644 --- 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> diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 16686f92e..cdc1ebb1a 100644 --- 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> diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp index 8e1a9c470..b183eb8a1 100644 --- 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> diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index b8b1dbbca..94365c7de 100644 --- 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> diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp index 9cce603f5..4d1b69c83 100644 --- 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> diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 533a7f089..43d95a0c6 100644 --- 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> diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index 635a1b2c4..af5308028 100644 --- 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> diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp index ce70e2bad..9e0f5152b 100644 --- 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> diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp index 532821159..b04ab6192 100644 --- 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> diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp index 3b196e837..07a31bc49 100644 --- 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> diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp index 7ca5506fa..bd087f1ea 100644 --- 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> diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp index 78ee3856b..cb6ae6cd4 100644 --- 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> diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index 821e37a04..82b216c3c 100644 --- 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> diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp index 6265df586..e7892a246 100644 --- 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> diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp index 150ea6d6d..ff0b09318 100644 --- 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> diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp index 9f2829c1b..83d697712 100644 --- 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> diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp index 5894599a1..10e009faa 100644 --- 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> diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp index da49c7d0a..f258b53e2 100644 --- 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> diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp index 8e8cf9e73..f1cdfecb8 100644 --- 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> diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp index 278fb0933..e5427f9f3 100644 --- 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> diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp index 941b211ef..2639c8bb4 100644 --- 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> diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp index 6f442099f..2169ca955 100644 --- 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> diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index 576154f2b..20229a34b 100644 --- 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> diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp index 13998cf87..a75547609 100644 --- 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> diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 5feeaa361..4892ee7a8 100644 --- 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> diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp index 43d9f342d..dd909beb4 100644 --- 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> diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index 97a15313a..059b898e5 100644 --- 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> diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index b3df1ebd6..189849376 100644 --- 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> diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 41c3a5dca..c3d4319a2 100644 --- 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> diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp index 5bae50ef7..0dada5e55 100644 --- 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> diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index e9fda4a56..82c4c8b9d 100644 --- 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> diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index c7677de53..dca99ed11 100644 --- 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> diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp index 95c44bc84..06097977d 100644 --- 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> |