kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 09:50:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port away from KLocale

Browse source
This commit is contained in:
Emmanuel Pescosta 2015-02-24 12:22:16 +01:00
parent 13a4c5ed4c
commit 092ddf7702
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/kitemviews/kfileitemlistwidget.cpp
View file

@ -21,11 +21,12 @@
#include "kfileitemmodel.h" #include "kfileitemmodel.h"
#include "kitemlistview.h" #include "kitemlistview.h"
#include <KLocale> #include <KLocalizedString>
#include <KIO/MetaData> #include <KIO/MetaData>
#include <QDateTime> #include <QDateTime>
#include <KFormat> #include <KFormat>
#include <QMimeDatabase> #include <QMimeDatabase>
#include <QLocale>
KFileItemListWidgetInformant::KFileItemListWidgetInformant() : KFileItemListWidgetInformant::KFileItemListWidgetInformant() :
KStandardItemListWidgetInformant() KStandardItemListWidgetInformant()
@ -81,7 +82,7 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray& role,
} }
} else if (role == "date") { } else if (role == "date") {
const QDateTime dateTime = roleValue.toDateTime(); const QDateTime dateTime = roleValue.toDateTime();
text = KLocale::global()->formatDateTime(dateTime); text = QLocale().toString(dateTime, QLocale::ShortFormat);
} else { } else {
text = KStandardItemListWidgetInformant::roleText(role, values); text = KStandardItemListWidgetInformant::roleText(role, values);
} }

3
src/settings/kcm/kcmdolphingeneral.cpp
View file

@ -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); setButtons(KCModule::Default | KCModule::Help);
QVBoxLayout* topLayout = new QVBoxLayout(this); QVBoxLayout* topLayout = new QVBoxLayout(this);