summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrius Štikonas <andrius@stikonas.eu>2016-06-07 13:00:48 (GMT)
committerAndrius Štikonas <andrius@stikonas.eu>2016-06-07 13:00:48 (GMT)
commit7889cdc8664e3d39fea7e779ad4b57d03f39f40a (patch)
treea1d1805df9ac329baf7387ad8c2982cd5e16e71e
parent4a75c3beb64112446c76f5c79bb6b0b9e241aeb4 (diff)
Port away from KLocale.
-rw-r--r--caff.cpp2
-rw-r--r--core/KGpgGroupNode.cpp3
-rw-r--r--core/KGpgKeyNode.cpp2
-rw-r--r--core/KGpgNode.cpp2
-rw-r--r--core/KGpgRefNode.cpp2
-rw-r--r--core/KGpgSignNode.cpp2
-rw-r--r--core/KGpgSignableNode.cpp2
-rw-r--r--core/KGpgSubkeyNode.cpp2
-rw-r--r--core/KGpgUatNode.cpp2
-rw-r--r--detailedconsole.cpp2
-rw-r--r--editor/kgpgeditor.cpp2
-rw-r--r--editor/kgpgmd5widget.cpp2
-rw-r--r--editor/kgpgtextedit.cpp2
-rw-r--r--foldercompressjob.cpp2
-rw-r--r--keyinfodialog.cpp8
-rw-r--r--keyservers.cpp2
-rw-r--r--keysmanager.cpp5
-rw-r--r--keytreeview.cpp2
-rw-r--r--kgpgfirstassistant.cpp6
-rw-r--r--kgpginterface.cpp2
-rw-r--r--kgpgkeygenerate.cpp9
-rw-r--r--kgpgoptions.cpp4
-rw-r--r--main.cpp2
-rw-r--r--model/gpgservermodel.cpp2
-rw-r--r--model/groupeditproxymodel.cpp2
-rw-r--r--model/keylistproxymodel.cpp2
-rw-r--r--model/kgpgitemmodel.cpp9
-rw-r--r--model/kgpgsearchresultmodel.cpp2
-rw-r--r--model/selectkeyproxymodel.cpp7
-rw-r--r--selectexpirydate.cpp4
-rw-r--r--selectpublickeydialog.cpp11
-rw-r--r--selectsecretkey.cpp11
-rw-r--r--transactions/kgpgaddphoto.cpp2
-rw-r--r--transactions/kgpgchangepass.cpp2
-rw-r--r--transactions/kgpgdecrypt.cpp2
-rw-r--r--transactions/kgpggeneratekey.cpp2
-rw-r--r--transactions/kgpggeneraterevoke.cpp2
-rw-r--r--transactions/kgpgimport.cpp2
-rw-r--r--transactions/kgpgkeyservertransaction.cpp2
-rw-r--r--transactions/kgpgtransaction.cpp2
-rw-r--r--transactions/kgpgtransactionjob.cpp2
-rw-r--r--transactions/kgpgverify.cpp9
42 files changed, 75 insertions, 71 deletions
diff --git a/caff.cpp b/caff.cpp
index a3fb15c..047989d 100644
--- a/caff.cpp
+++ b/caff.cpp
@@ -26,7 +26,7 @@
#include "gpgproc.h"
#include <KDebug>
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
#include <QDesktopServices>
diff --git a/core/KGpgGroupNode.cpp b/core/KGpgGroupNode.cpp
index ad1548a..82e0f20 100644
--- a/core/KGpgGroupNode.cpp
+++ b/core/KGpgGroupNode.cpp
@@ -23,7 +23,8 @@
#include "kgpgsettings.h"
#include <KDebug>
-#include <KLocale>
+#include <KLocalizedString>
+
#include <QFile>
#include <QStringList>
#include <QTextStream>
diff --git a/core/KGpgKeyNode.cpp b/core/KGpgKeyNode.cpp
index d604fb7..ef0ec51 100644
--- a/core/KGpgKeyNode.cpp
+++ b/core/KGpgKeyNode.cpp
@@ -28,7 +28,7 @@
#include "kgpgsettings.h"
#include "model/kgpgitemmodel.h"
-#include <KLocale>
+#include <KLocalizedString>
KGpgKeyNode::KGpgKeyNode(KGpgRootNode *parent, const KgpgCore::KgpgKey &k)
: KGpgSignableNode(parent),
diff --git a/core/KGpgNode.cpp b/core/KGpgNode.cpp
index d3d3d84..5c9605e 100644
--- a/core/KGpgNode.cpp
+++ b/core/KGpgNode.cpp
@@ -27,7 +27,7 @@
#include "KGpgUidNode.h"
#include "model/kgpgitemmodel.h"
-#include <KLocale>
+#include <KLocalizedString>
KGpgNode::KGpgNode(KGpgExpandableNode *parent)
: QObject(), m_parent(parent)
diff --git a/core/KGpgRefNode.cpp b/core/KGpgRefNode.cpp
index 70e7337..bee794d 100644
--- a/core/KGpgRefNode.cpp
+++ b/core/KGpgRefNode.cpp
@@ -18,7 +18,7 @@
*/
#include "KGpgRefNode.h"
-#include <KLocale>
+#include <KLocalizedString>
#include "KGpgExpandableNode.h"
#include "KGpgRootNode.h"
diff --git a/core/KGpgSignNode.cpp b/core/KGpgSignNode.cpp
index 8d27d93..a8e3087 100644
--- a/core/KGpgSignNode.cpp
+++ b/core/KGpgSignNode.cpp
@@ -20,7 +20,7 @@
#include "KGpgSignableNode.h"
-#include <KLocale>
+#include <KLocalizedString>
class KGpgSignNodePrivate {
public:
diff --git a/core/KGpgSignableNode.cpp b/core/KGpgSignableNode.cpp
index 4b53247..1e83ea7 100644
--- a/core/KGpgSignableNode.cpp
+++ b/core/KGpgSignableNode.cpp
@@ -18,7 +18,7 @@
*/
#include "KGpgSignableNode.h"
-#include <KLocale>
+#include <KLocalizedString>
KGpgSignableNode::KGpgSignableNode(KGpgExpandableNode *parent)
: KGpgExpandableNode(parent)
diff --git a/core/KGpgSubkeyNode.cpp b/core/KGpgSubkeyNode.cpp
index c262a56..fc43bf6 100644
--- a/core/KGpgSubkeyNode.cpp
+++ b/core/KGpgSubkeyNode.cpp
@@ -18,7 +18,7 @@
*/
#include "KGpgSubkeyNode.h"
-#include <KLocale>
+#include <KLocalizedString>
#include "convert.h"
#include "KGpgKeyNode.h"
diff --git a/core/KGpgUatNode.cpp b/core/KGpgUatNode.cpp
index 291a1e8..c1fd852 100644
--- a/core/KGpgUatNode.cpp
+++ b/core/KGpgUatNode.cpp
@@ -21,7 +21,7 @@
#include "gpgproc.h"
#include "KGpgKeyNode.h"
-#include <KLocale>
+#include <KLocalizedString>
#include <QDateTime>
#include <QDir>
diff --git a/detailedconsole.cpp b/detailedconsole.cpp
index 12c2c48..7fd3f26 100644
--- a/detailedconsole.cpp
+++ b/detailedconsole.cpp
@@ -17,7 +17,7 @@
#include "detailedconsole.h"
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
#include <KConfigGroup>
#include <QDialogButtonBox>
diff --git a/editor/kgpgeditor.cpp b/editor/kgpgeditor.cpp
index 50be428..ad614e4 100644
--- a/editor/kgpgeditor.cpp
+++ b/editor/kgpgeditor.cpp
@@ -35,7 +35,7 @@
#include <KFileDialog>
#include <KFindDialog>
#include <KGlobal>
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
#include <KRecentFilesAction>
#include <KSharedConfig>
diff --git a/editor/kgpgmd5widget.cpp b/editor/kgpgmd5widget.cpp
index 5495336..781c7e5 100644
--- a/editor/kgpgmd5widget.cpp
+++ b/editor/kgpgmd5widget.cpp
@@ -18,7 +18,7 @@
#include <KApplication>
#include <KMessageBox>
-#include <KLocale>
+#include <KLocalizedString>
#include <KLed>
#include <KConfigGroup>
#include <QDialogButtonBox>
diff --git a/editor/kgpgtextedit.cpp b/editor/kgpgtextedit.cpp
index 8351f40..f5e2f36 100644
--- a/editor/kgpgtextedit.cpp
+++ b/editor/kgpgtextedit.cpp
@@ -27,7 +27,7 @@
#include "transactions/kgpgsigntext.h"
#include "transactions/kgpgverify.h"
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
#include <KUrlMimeData>
diff --git a/foldercompressjob.cpp b/foldercompressjob.cpp
index 77e521c..d501cb5 100644
--- a/foldercompressjob.cpp
+++ b/foldercompressjob.cpp
@@ -14,7 +14,7 @@
#include "foldercompressjob.h"
#include <KArchive>
-#include <KLocale>
+#include <KLocalizedString>
#include <KTar>
#include <KZip>
diff --git a/keyinfodialog.cpp b/keyinfodialog.cpp
index d862efa..2d90c46 100644
--- a/keyinfodialog.cpp
+++ b/keyinfodialog.cpp
@@ -27,8 +27,7 @@
#include "transactions/kgpgchangepass.h"
#include <KConfigGroup>
-#include <KGlobal>
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
#include <KToolInvocation>
@@ -38,6 +37,7 @@
#include <QFormLayout>
#include <QHBoxLayout>
#include <QImage>
+#include <QLocale>
#include <QPixmap>
#include <QPushButton>
#include <QVBoxLayout>
@@ -211,11 +211,11 @@ void KgpgKeyInfo::displayKey()
m_id->setText(m_node->getId().right(16));
m_algorithm->setText(Convert::toString(key->algorithm()) + QLatin1String( " / " ) + Convert::toString(key->encryptionAlgorithm()));
m_algorithm->setWhatsThis(i18n("<qt>The left part is the algorithm used by the <b>signature</b> key. The right part is the algorithm used by the <b>encryption</b> key.</qt>"));
- m_creation->setText(KGlobal::locale()->formatDate(m_node->getCreation().date(), KLocale::ShortDate));
+ m_creation->setText(QLocale().toString(m_node->getCreation().date(), QLocale::ShortFormat));
if (m_node->getExpiration().isNull())
m_expiration->setText(i18nc("Unlimited key lifetime", "Unlimited"));
else
- m_expiration->setText(KGlobal::locale()->formatDate(m_node->getExpiration().date(), KLocale::ShortDate));
+ m_expiration->setText(QLocale().toString(m_node->getExpiration().date(), QLocale::ShortFormat));
m_trust->setText(trust);
m_trust->setColor(trustcolor);
m_length->setText(m_node->getSize());
diff --git a/keyservers.cpp b/keyservers.cpp
index 0975947..03a3128 100644
--- a/keyservers.cpp
+++ b/keyservers.cpp
@@ -26,7 +26,7 @@
#include "transactions/kgpgkeyserversearchtransaction.h"
#include "transactions/kgpgsendkeys.h"
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
#include <QCursor>
diff --git a/keysmanager.cpp b/keysmanager.cpp
index 22e57c4..34965b5 100644
--- a/keysmanager.cpp
+++ b/keysmanager.cpp
@@ -61,8 +61,7 @@
#include <akonadi/contact/contactsearchjob.h>
#include <KActionCollection>
#include <KDebug>
-#include <KGlobal>
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
#include <KMimeTypeTrader>
#include <KProcess>
@@ -78,7 +77,6 @@
#include <KStatusNotifierItem>
#include <KToggleAction>
#include <KToolInvocation>
-#include <QUrl>
#include <QApplication>
#include <QClipboard>
@@ -99,6 +97,7 @@
#include <QPrintDialog>
#include <QPrinter>
#include <QProcess>
+#include <QUrl>
#include <QWidget>
#include <QWidgetAction>
#include <kcontacts/addresseelist.h>
diff --git a/keytreeview.cpp b/keytreeview.cpp
index 2a9d3d2..c9ac276 100644
--- a/keytreeview.cpp
+++ b/keytreeview.cpp
@@ -25,7 +25,7 @@
#include "transactions/kgpgimport.h"
#include <KConfigGroup>
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
#include <KUrlMimeData>
diff --git a/kgpgfirstassistant.cpp b/kgpgfirstassistant.cpp
index 1078999..4d32fe6 100644
--- a/kgpgfirstassistant.cpp
+++ b/kgpgfirstassistant.cpp
@@ -24,9 +24,8 @@
#include "core/kgpgkey.h"
#include <KComboBox>
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
-#include <QUrl>
#include <KUrlRequester>
#include <QCheckBox>
@@ -34,9 +33,10 @@
#include <QHBoxLayout>
#include <QLabel>
#include <QSpacerItem>
+#include <QStandardPaths>
#include <QTextStream>
#include <QWidget>
-#include <QStandardPaths>
+#include <QUrl>
using namespace KgpgCore;
diff --git a/kgpginterface.cpp b/kgpginterface.cpp
index ca29e50..4c46a90 100644
--- a/kgpginterface.cpp
+++ b/kgpginterface.cpp
@@ -23,7 +23,7 @@
#include "core/KGpgUidNode.h"
#include <gpgme.h>
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
#include <KProcess>
#include <QFile>
diff --git a/kgpgkeygenerate.cpp b/kgpgkeygenerate.cpp
index 1132203..1cb2d1e 100644
--- a/kgpgkeygenerate.cpp
+++ b/kgpgkeygenerate.cpp
@@ -20,17 +20,18 @@
#include "kgpgsettings.h"
#include <KComboBox>
+#include <KConfigGroup>
#include <KHBox>
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
+
#include <QIntValidator>
+#include <QDialogButtonBox>
+#include <QPushButton>
#include <QStringList>
#include <QVBoxLayout>
#include <QWhatsThis>
#include <QWidget>
-#include <KConfigGroup>
-#include <QDialogButtonBox>
-#include <QPushButton>
using namespace KgpgCore;
diff --git a/kgpgoptions.cpp b/kgpgoptions.cpp
index cfd0dcd..5b32d52 100644
--- a/kgpgoptions.cpp
+++ b/kgpgoptions.cpp
@@ -23,10 +23,11 @@
#include "model/kgpgitemmodel.h"
#include <KConfig>
+#include <KConfigGroup>
#include <KDebug>
#include <KDesktopFile>
#include <KFontChooser>
-#include <KLocale>
+#include <KLocalizedString>
#include <KMessageBox>
#include <KProcess>
#include <QUrl>
@@ -38,7 +39,6 @@
#include <QTextStream>
#include <QVBoxLayout>
#include <QStandardPaths>
-#include <KConfigGroup>
using namespace KgpgCore;
diff --git a/main.cpp b/main.cpp
index 55ee016..6f3cd60 100644
--- a/main.cpp
+++ b/main.cpp
@@ -17,7 +17,7 @@
#include <K4AboutData>
#include <KCmdLineArgs>
-#include <KLocale>
+#include <KLocalizedString>
#include <KUniqueApplication>
static const char description[] =
diff --git a/model/gpgservermodel.cpp b/model/gpgservermodel.cpp
index b041256..3a136f3 100644
--- a/model/gpgservermodel.cpp
+++ b/model/gpgservermodel.cpp
@@ -19,7 +19,7 @@
#include "gpgservermodel.h"
-#include <KLocale>
+#include <KLocalizedString>
#include <QStringList>
GpgServerModel::GpgServerModel(QObject *parent)
diff --git a/model/groupeditproxymodel.cpp b/model/groupeditproxymodel.cpp
index ddf76dc..cd0614c 100644
--- a/model/groupeditproxymodel.cpp
+++ b/model/groupeditproxymodel.cpp
@@ -21,7 +21,7 @@
#include "kgpgitemmodel.h"
#include "core/kgpgkey.h"
-#include <KLocale>
+#include <KLocalizedString>
#include <QIcon>
using namespace KgpgCore;
diff --git a/model/keylistproxymodel.cpp b/model/keylistproxymodel.cpp
index 0207228..117dc3e 100644
--- a/model/keylistproxymodel.cpp
+++ b/model/keylistproxymodel.cpp
@@ -24,7 +24,7 @@
#include "core/kgpgkey.h"
#include "core/images.h"
-#include <KLocale>
+#include <KLocalizedString>
#include <QDate>
using namespace KgpgCore;
diff --git a/model/kgpgitemmodel.cpp b/model/kgpgitemmodel.cpp
index 26fe1da..3d531ec 100644
--- a/model/kgpgitemmodel.cpp
+++ b/model/kgpgitemmodel.cpp
@@ -23,8 +23,9 @@
#include "core/images.h"
#include "model/kgpgitemnode.h"
-#include <KGlobal>
-#include <KLocale>
+#include <KLocalizedString>
+
+#include <QLocale>
#include <QMetaObject>
KGpgItemModel::KGpgItemModel(QObject *parent)
@@ -179,7 +180,7 @@ KGpgItemModel::data(const QModelIndex &index, int role) const
}
case KEYCOLUMN_EXPIR:
if (role == Qt::DisplayRole)
- return KGlobal::locale()->formatDate(node->getExpiration().date(), KLocale::ShortDate);
+ return QLocale().toString(node->getExpiration().date(), QLocale::ShortFormat);
break;
case KEYCOLUMN_SIZE:
switch (role) {
@@ -201,7 +202,7 @@ KGpgItemModel::data(const QModelIndex &index, int role) const
break;
case KEYCOLUMN_CREAT:
if (role == Qt::DisplayRole)
- return KGlobal::locale()->formatDate(node->getCreation().date(), KLocale::ShortDate);
+ return QLocale().toString(node->getCreation().date(), QLocale::ShortFormat);
break;
case KEYCOLUMN_ID:
switch (role) {
diff --git a/model/kgpgsearchresultmodel.cpp b/model/kgpgsearchresultmodel.cpp
index 6c8231b..2d82df8 100644
--- a/model/kgpgsearchresultmodel.cpp
+++ b/model/kgpgsearchresultmodel.cpp
@@ -15,7 +15,7 @@
#include <KDateTime>
#include <KDebug>
-#include <KLocale>
+#include <KLocalizedString>
#include <QScopedPointer>
#include <QString>
diff --git a/model/selectkeyproxymodel.cpp b/model/selectkeyproxymodel.cpp
index a137387..90aab0b 100644
--- a/model/selectkeyproxymodel.cpp
+++ b/model/selectkeyproxymodel.cpp
@@ -21,8 +21,9 @@
#include "kgpgitemmodel.h"
#include "core/kgpgkey.h"
-#include <KGlobal>
-#include <KLocale>
+#include <QLocale>
+
+#include <KLocalizedString>
using namespace KgpgCore;
@@ -229,7 +230,7 @@ SelectSecretKeyProxyModel::data(const QModelIndex &index, int role) const
case 1:
return nd->getEmail();
case 2:
- return KGlobal::locale()->formatDate(nd->getExpiration().date(), KLocale::ShortDate);
+ return QLocale().toString(nd->getExpiration().date(), QLocale::ShortFormat);
case 3:
return nd->getId().right(8);
}
diff --git a/selectexpirydate.cpp b/selectexpirydate.cpp
index 7105803..e59f5a6 100644
--- a/selectexpirydate.cpp
+++ b/selectexpirydate.cpp
@@ -18,9 +18,9 @@
#include <QCheckBox>
#include <QVBoxLayout>
-#include <KDatePicker>
-#include <KLocale>
#include <KConfigGroup>
+#include <KDatePicker>
+#include <KLocalizedString>
#include <QDialogButtonBox>
#include <QPushButton>
diff --git a/selectpublickeydialog.cpp b/selectpublickeydialog.cpp
index 513b8cd..d3827bf 100644
--- a/selectpublickeydialog.cpp
+++ b/selectpublickeydialog.cpp
@@ -23,19 +23,18 @@
#include <QAction>
#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QHBoxLayout>
#include <QLabel>
#include <QLineEdit>
+#include <QPushButton>
#include <QTableView>
#include <QVBoxLayout>
#include <KActionCollection>
-#include <QHBoxLayout>
-#include <KIconLoader>
-#include <KLocale>
-#include <QVBoxLayout>
#include <KConfigGroup>
-#include <QDialogButtonBox>
-#include <QPushButton>
+#include <KIconLoader>
+#include <KLocalizedString>
using namespace KgpgCore;
diff --git a/selectsecretkey.cpp b/selectsecretkey.cpp
index 0effe58..6f0afca 100644
--- a/selectsecretkey.cpp
+++ b/selectsecretkey.cpp
@@ -16,14 +16,15 @@
#include "model/selectkeyproxymodel.h"
#include <KComboBox>
-#include <KLocale>
-#include <QVBoxLayout>
-#include <QCheckBox>
-#include <QLabel>
-#include <QTableView>
#include <KConfigGroup>
+#include <KLocalizedString>
+
+#include <QCheckBox>
#include <QDialogButtonBox>
+#include <QLabel>
#include <QPushButton>
+#include <QTableView>
+#include <QVBoxLayout>
using namespace KgpgCore;
diff --git a/transactions/kgpgaddphoto.cpp b/transactions/kgpgaddphoto.cpp
index 60ea9ae..aa7f4f5 100644
--- a/transactions/kgpgaddphoto.cpp
+++ b/transactions/kgpgaddphoto.cpp
@@ -13,8 +13,8 @@
#include "kgpgaddphoto.h"
+#include <KLocalizedString>
#include <KMessageBox>
-#include <KLocale>
KGpgAddPhoto::KGpgAddPhoto(QObject *parent, const QString &keyid, const QString &imagepath)
: KGpgEditKeyTransaction(parent, keyid, QLatin1String( "addphoto" ), false)
diff --git a/transactions/kgpgchangepass.cpp b/transactions/kgpgchangepass.cpp
index 9b91a66..d8144b0 100644
--- a/transactions/kgpgchangepass.cpp
+++ b/transactions/kgpgchangepass.cpp
@@ -13,7 +13,7 @@
#include "kgpgchangepass.h"
-#include <KLocale>
+#include <KLocalizedString>
KGpgChangePass::KGpgChangePass(QObject *parent, const QString &keyid)
: KGpgTransaction(parent),
diff --git a/transactions/kgpgdecrypt.cpp b/transactions/kgpgdecrypt.cpp
index c3c5020..7ebffa2 100644
--- a/transactions/kgpgdecrypt.cpp
+++ b/transactions/kgpgdecrypt.cpp
@@ -16,7 +16,7 @@
#include "gpgproc.h"
#include "kgpgsettings.h"
-#include <KLocale>
+#include <KLocalizedString>
KGpgDecrypt::KGpgDecrypt(QObject *parent, const QString &text)
: KGpgTextOrFileTransaction(parent, text),
diff --git a/transactions/kgpggeneratekey.cpp b/transactions/kgpggeneratekey.cpp
index d0eec59..1dc2052 100644
--- a/transactions/kgpggeneratekey.cpp
+++ b/transactions/kgpggeneratekey.cpp
@@ -15,8 +15,8 @@
#include "gpgproc.h"
-#include <KLocale>
#include <KEmailAddress>
+#include <KLocalizedString>
#include <QApplication>
KGpgGenerateKey::KGpgGenerateKey(QObject *parent, const QString &name, const QString &email, const QString &comment,
diff --git a/transactions/kgpggeneraterevoke.cpp b/transactions/kgpggeneraterevoke.cpp
index 464c647..2725979 100644
--- a/transactions/kgpggeneraterevoke.cpp
+++ b/transactions/kgpggeneraterevoke.cpp
@@ -14,7 +14,7 @@
#include "kgpggeneraterevoke.h"
#include <KDebug>
-#include <KLocale>
+#include <KLocalizedString>
#include <QFile>
KGpgGenerateRevoke::KGpgGenerateRevoke(QObject *parent, const QString &keyID, const QUrl &revokeUrl, const int reason, const QString &description)
diff --git a/transactions/kgpgimport.cpp b/transactions/kgpgimport.cpp
index da92f41..0e22d46 100644
--- a/transactions/kgpgimport.cpp
+++ b/transactions/kgpgimport.cpp
@@ -17,7 +17,7 @@
#include "core/KGpgKeyNode.h"
#include <KDebug>
-#include <KLocale>
+#include <KLocalizedString>
KGpgImport::KGpgImport(QObject *parent, const QString &text)
: KGpgTextOrFileTransaction(parent, text, true)
diff --git a/transactions/kgpgkeyservertransaction.cpp b/transactions/kgpgkeyservertransaction.cpp
index 11258a3..0723f84 100644
--- a/transactions/kgpgkeyservertransaction.cpp
+++ b/transactions/kgpgkeyservertransaction.cpp
@@ -15,7 +15,7 @@
#include "gpgproc.h"
-#include <KLocale>
+#include <KLocalizedString>
#include <QLabel>
#include <QProgressDialog>
diff --git a/transactions/kgpgtransaction.cpp b/transactions/kgpgtransaction.cpp
index 49be46e..b34db94 100644
--- a/transactions/kgpgtransaction.cpp
+++ b/transactions/kgpgtransaction.cpp
@@ -28,7 +28,7 @@
#include <KDebug>
#include <KIO/RenameDialog>
#include <KNewPasswordDialog>
-#include <KLocale>
+#include <KLocalizedString>
#include <KPasswordDialog>
KGpgTransaction::KGpgTransaction(QObject *parent, const bool allowChaining)
diff --git a/transactions/kgpgtransactionjob.cpp b/transactions/kgpgtransactionjob.cpp
index eb73653..9ca2dec 100644
--- a/transactions/kgpgtransactionjob.cpp
+++ b/transactions/kgpgtransactionjob.cpp
@@ -15,7 +15,7 @@
#include "kgpgtransaction.h"
-#include <KLocale>
+#include <KLocalizedString>
KGpgTransactionJob::KGpgTransactionJob(KGpgTransaction *transaction)
: KJob(transaction->parent()),
diff --git a/transactions/kgpgverify.cpp b/transactions/kgpgverify.cpp
index 2f5bfa8..6fa4758 100644
--- a/transactions/kgpgverify.cpp
+++ b/transactions/kgpgverify.cpp
@@ -17,8 +17,9 @@
#include "core/KGpgKeyNode.h"
#include "model/kgpgitemmodel.h"
-#include <KGlobal>
-#include <KLocale>
+#include <QLocale>
+
+#include <KLocalizedString>
KGpgVerify::KGpgVerify(QObject *parent, const QString &text)
: KGpgTextOrFileTransaction(parent, text),
@@ -94,8 +95,8 @@ sigTimeMessage(const QString &sigtime)
return i18nc("first argument is formatted date, second argument is formatted time",
"The signature was created at %1 %2",
- KGlobal::locale()->formatDate(stamp.date(), KLocale::LongDate),
- KGlobal::locale()->formatTime(stamp.time(), KLocale::LongDate)) +
+ QLocale().toString(stamp.date(), QLocale::ShortFormat),
+ QLocale().toString(stamp.time(), QLocale::ShortFormat)) +
QLatin1String("<br/>");
}