diff options
| author | Emmanuel Pescosta <[email protected]> | 2015-02-24 12:22:16 +0100 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2015-02-24 12:22:16 +0100 |
| commit | 092ddf77026569a61a031eceb81a0535ce42b8e0 (patch) | |
| tree | bb26adb77d6639d2bebb97470350ecd9d01af207 /src | |
| parent | 13a4c5ed4c727c2293f13e59671b7f585615faaf (diff) | |
Port away from KLocale
Diffstat (limited to 'src')
| -rw-r--r-- | src/kitemviews/kfileitemlistwidget.cpp | 5 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.cpp | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp index 5b5ae4d7e..7e5b4bb13 100644 --- a/src/kitemviews/kfileitemlistwidget.cpp +++ b/src/kitemviews/kfileitemlistwidget.cpp @@ -21,11 +21,12 @@ #include "kfileitemmodel.h" #include "kitemlistview.h" -#include <KLocale> +#include <KLocalizedString> #include <KIO/MetaData> #include <QDateTime> #include <KFormat> #include <QMimeDatabase> +#include <QLocale> KFileItemListWidgetInformant::KFileItemListWidgetInformant() : KStandardItemListWidgetInformant() @@ -81,7 +82,7 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role, } } else if (role == "date") { const QDateTime dateTime = roleValue.toDateTime(); - text = KLocale::global()->formatDateTime(dateTime); + text = QLocale().toString(dateTime, QLocale::ShortFormat); } else { text = KStandardItemListWidgetInformant::roleText(role, values); } diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index 64e96f127..fb3956880 100644 --- a/src/settings/kcm/kcmdolphingeneral.cpp +++ b/src/settings/kcm/kcmdolphingeneral.cpp @@ -40,9 +40,6 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget* parent, const QV { Q_UNUSED(args); - //KF5 port: remove this line and define TRANSLATION_DOMAIN in CMakeLists.txt instead -//KLocale::global()->insertCatalog("dolphin"); - setButtons(KCModule::Default | KCModule::Help); QVBoxLayout* topLayout = new QVBoxLayout(this); |
