Port away from KLocale

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 5b5ae4d7ed7076f51a5c53b865720d1062c2f243..7e5b4bb132c6feb4e26c87688cce91a542f9de4a 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -21,11 +21,12 @@
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 

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

 #include <KIO/MetaData>
 #include <QDateTime>
 #include <KFormat>
 #include <QMimeDatabase>
 #include <KIO/MetaData>
 #include <QDateTime>
 #include <KFormat>
 #include <QMimeDatabase>

+#include <QLocale>

 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
     KStandardItemListWidgetInformant()
 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
     KStandardItemListWidgetInformant()


@@ -81,7 +82,7 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
         }
     } else if (role == "date") {
         const QDateTime dateTime = roleValue.toDateTime();
         }
     } 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);
     }
     } else {
         text = KStandardItemListWidgetInformant::roleText(role, values);
     }

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 64e96f127fbe4b330d0d0f4401ce5ba616f539dc..fb3956880a273c8586aa6fa7f151f018ea2a5b72 100644 (file)
--- 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);
 
 {
     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);
     setButtons(KCModule::Default | KCModule::Help);
 
     QVBoxLayout* topLayout = new QVBoxLayout(this);