summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTeo Mrnjavac <[email protected]>2014-03-11 13:18:07 +0100
committerTeo Mrnjavac <[email protected]>2014-03-11 13:18:07 +0100
commitdf2e49e1687e8a7d92692f8daf5d2495dfd9a98f (patch)
tree0c34538d62ee98765cbaa7a09e590b44a8841ace
parenta7cdf4d60f85d00a7615877ee9a4ac013d030235 (diff)
First rough KF5 port of KWalletManager
-rw-r--r--CMakeLists.txt12
-rw-r--r--src/konfigurator/CMakeLists.txt4
-rw-r--r--src/konfigurator/konfigurator.cpp49
-rw-r--r--src/konfigurator/konfigurator.h2
-rw-r--r--src/konfigurator/savehelper.cpp11
-rw-r--r--src/manager/CMakeLists.txt11
-rw-r--r--src/manager/allyourbase.cpp33
-rw-r--r--src/manager/allyourbase.h2
-rw-r--r--src/manager/kwalleteditor.cpp36
-rw-r--r--src/manager/kwalleteditor.h5
-rw-r--r--src/manager/kwalletmanager.cpp3
-rw-r--r--src/manager/kwalletmanagerwidget.cpp2
-rw-r--r--src/manager/kwalletmanagerwidget.h2
-rw-r--r--src/manager/kwmapeditor.cpp1
-rw-r--r--src/manager/kwmapeditor.h3
-rw-r--r--src/manager/main.cpp9
-rw-r--r--src/manager/walletcontrolwidget.cpp1
17 files changed, 104 insertions, 82 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 254e27c..1d82f58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,6 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui Widgets DBus)
set(KF5_VERSION "4.96.0")
include(KDEInstallDirs)
-include(KDEFrameworkCompilerSettings)
include(KDECMakeSettings)
include(FeatureSummary)
include(GenerateExportHeader)
@@ -25,12 +24,11 @@ if(NOT kdelibs_SOURCE_DIR)
DocTools
Auth
Wallet
-# WidgetsAddons
-# Service
-# Config
-# WindowSystem
-# I18n
-# KDE4Support #KUniqueApplication in ksecretsserviced
+ KCMUtils
+ KDE4Support
+ I18n
+ XmlGui
+ ConfigWidgets
)
endif()
diff --git a/src/konfigurator/CMakeLists.txt b/src/konfigurator/CMakeLists.txt
index 73bdab8..4d8b0a9 100644
--- a/src/konfigurator/CMakeLists.txt
+++ b/src/konfigurator/CMakeLists.txt
@@ -9,7 +9,10 @@ add_library(kcm_kwallet MODULE ${kcm_kwallet_PART_SRCS})
target_link_libraries(kcm_kwallet
Qt5::Core
+ KF5::Auth
KF5::CoreAddons
+ KF5::KCMUtils
+ KF5::KDE4Support
)
install(TARGETS kcm_kwallet DESTINATION ${PLUGIN_INSTALL_DIR})
@@ -20,6 +23,7 @@ set(kcm_kwallet_helper_SRCS savehelper.cpp)
add_executable(kcm_kwallet_helper ${kcm_kwallet_helper_SRCS})
target_link_libraries(kcm_kwallet_helper
Qt5::Core
+ KF5::Auth
KF5::CoreAddons
)
diff --git a/src/konfigurator/konfigurator.cpp b/src/konfigurator/konfigurator.cpp
index 954fe70..3093c05 100644
--- a/src/konfigurator/konfigurator.cpp
+++ b/src/konfigurator/konfigurator.cpp
@@ -19,19 +19,24 @@
#include "konfigurator.h"
#include <QtDBus/QtDBus>
-#include <kaboutdata.h>
-#include <kapplication.h>
#include <ksharedconfig.h>
-#include <kdialog.h>
#include <kpluginfactory.h>
#include <kpluginloader.h>
#include <kinputdialog.h>
-#include <kmenu.h>
#include <kwallet.h>
#include <kauthaction.h>
+#include <kauthactionreply.h>
+#include <kauthexecutejob.h>
+
+//KDE4Support
+#include <kdialog.h>
+#include <kglobal.h>
+#include <k4aboutdata.h>
#include <kdebug.h>
#include <QCheckBox>
+#include <QDialog>
+#include <QMenu>
#include <QPushButton>
#include <QVBoxLayout>
#include <ktoolinvocation.h>
@@ -41,20 +46,17 @@
#define KWALLETMANAGERINTERFACE "org.kde.KWallet"
K_PLUGIN_FACTORY(KWalletFactory, registerPlugin<KWalletConfig>();)
-K_EXPORT_PLUGIN(KWalletFactory("kcmkwallet"))
-
KWalletConfig::KWalletConfig(QWidget *parent, const QVariantList& args)
-: KCModule(KWalletFactory::componentData(), parent, args),
+ : KCModule(parent, args),
_cfg(KSharedConfig::openConfig(QLatin1String( "kwalletrc" ), KConfig::NoGlobals)) {
- KAboutData *about =
- new KAboutData(I18N_NOOP("kcmkwallet"), 0,
+ K4AboutData *about =
+ new K4AboutData(I18N_NOOP("kcmkwallet"), 0,
ki18n("KDE Wallet Control Module"),
- 0, KLocalizedString(), KAboutData::License_GPL,
+ 0, KLocalizedString(), K4AboutData::License_GPL,
ki18n("(c) 2003 George Staikos"));
about->addAuthor(ki18n("George Staikos"), KLocalizedString(), "[email protected]");
- setAboutData( about );
setNeedsAuthorization(true);
@@ -260,23 +262,18 @@ void KWalletConfig::load() {
void KWalletConfig::save() {
QVariantMap args;
- KAuth::Action *action = authAction();
- if (0 == action) {
+ KAuth::Action action = authAction();
+ if (!action.isValid()) {
kDebug() << "There's no authAction, not saving settings";
return;
}
- action->setArguments(args);
+ action.setArguments(args);
- KAuth::ActionReply reply = action->execute();
+ KAuth::ExecuteJob* j = action.execute();
- if (reply.failed()) {
- if (reply.type() == KAuth::ActionReply::KAuthError){
- kDebug() << "Save action was not authorized!";
- KMessageBox::error(this, i18n("Sorry, the system security policy didn't allow you to save the changes."), i18n("KDE Wallet Control Module"));
- } else {
- KMessageBox::error(this, reply.errorDescription(), i18n("KDE Wallet Control Module"));
- kDebug() << "Save action failed. Not saving the settings.";
- }
+ if (j->error()) {
+ kDebug() << j->errorText();
+ KMessageBox::error(this, j->errorString(), i18n("KDE Wallet Control Module"));
load();
return;
}
@@ -369,11 +366,11 @@ QString KWalletConfig::quickHelp() const {
void KWalletConfig::customContextMenuRequested(const QPoint& pos) {
QTreeWidgetItem *item = _wcw->_accessList->itemAt(pos);
if (item && item->parent()) {
- KMenu *m = new KMenu(this);
- m->addTitle(item->parent()->text(0));
+ QMenu *m = new QMenu(this);
+ m->setTitle(item->parent()->text(0));
m->addAction( i18n("&Delete" ), this, SLOT(deleteEntry()), Qt::Key_Delete);
m->exec(_wcw->_accessList->mapToGlobal(pos));
- delete m;
+ delete m;
}
}
diff --git a/src/konfigurator/konfigurator.h b/src/konfigurator/konfigurator.h
index 22477cf..3a5a62c 100644
--- a/src/konfigurator/konfigurator.h
+++ b/src/konfigurator/konfigurator.h
@@ -44,7 +44,7 @@ class KWalletConfig : public KCModule {
QString quickHelp() const;
- public slots:
+ public slots:
void configChanged();
void launchManager();
void newLocalWallet();
diff --git a/src/konfigurator/savehelper.cpp b/src/konfigurator/savehelper.cpp
index aa3fcdb..1c35ef7 100644
--- a/src/konfigurator/savehelper.cpp
+++ b/src/konfigurator/savehelper.cpp
@@ -19,7 +19,10 @@
#include "savehelper.h"
-#include <kdebug.h>
+#include <kauthhelpersupport.h>
+
+#include <QDebug>
+
#include <unistd.h>
#if defined(Q_CC_MSVC)
@@ -30,9 +33,9 @@
ActionReply SaveHelper::save(QVariantMap args)
{
__uid_t uid = getuid();
- kDebug() << "executing uid=" << uid;
+ qDebug() << "executing uid=" << uid;
- return ActionReply::SuccessReply;
+ return ActionReply::SuccessReply();
}
-KDE4_AUTH_HELPER_MAIN("org.kde.kcontrol.kcmkwallet", SaveHelper)
+KAUTH_HELPER_MAIN("org.kde.kcontrol.kcmkwallet", SaveHelper)
diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt
index d899d82..d655791 100644
--- a/src/manager/CMakeLists.txt
+++ b/src/manager/CMakeLists.txt
@@ -39,7 +39,16 @@ qt5_wrap_ui(kwalletmanager_SRCS
add_executable(kwalletmanager ${kwalletmanager_SRCS})
-target_link_libraries(kwalletmanager ${KDE4_KIO_LIBS})
+target_link_libraries(kwalletmanager
+ Qt5::Core
+ KF5::CoreAddons
+ KF5::KDE4Support
+ KF5::I18n
+ KF5::XmlGui #KActionCollection
+ KF5::ConfigWidgets
+ KF5::ItemViews
+ KF5::Wallet
+)
install(TARGETS kwalletmanager ${INSTALL_TARGETS_DEFAULT_ARGS} )
install(FILES kwalletmanager.rc
diff --git a/src/manager/allyourbase.cpp b/src/manager/allyourbase.cpp
index fc9332c..5e8b8fd 100644
--- a/src/manager/allyourbase.cpp
+++ b/src/manager/allyourbase.cpp
@@ -32,6 +32,7 @@
#include <QFile>
#include <QApplication>
+#include <QDrag>
//Added by qt3to4:
#include <QPixmap>
#include <QDropEvent>
@@ -115,9 +116,9 @@ QTreeWidgetItem* KWalletFolderItem::getItem(const QString& key) {
return 0;
}
-bool KWalletFolderItem::acceptDrop(const QMimeSource *mime) const {
- return mime->provides("application/x-kwallet-entry") ||
- mime->provides("text/uri-list");
+bool KWalletFolderItem::acceptDrop(const QMimeData *mime) const {
+ return mime->hasFormat("application/x-kwallet-entry") ||
+ mime->hasFormat("text/uri-list");
}
QString KWalletFolderItem::name() const {
@@ -265,8 +266,8 @@ static bool decodeFolder(KWallet::Wallet *_wallet, QDataStream& ds) {
}
void KWalletItem::processDropEvent(QDropEvent *e) {
- if (e->provides("application/x-kwallet-folder") ||
- e->provides("text/uri-list")) {
+ if (e->mimeData()->hasFormat("application/x-kwallet-folder") ||
+ e->mimeData()->hasFormat("text/uri-list")) {
// FIXME: don't allow the drop if the wallet name is the same
KWallet::Wallet *_wallet = KWallet::Wallet::openWallet(text(), listWidget()->topLevelWidget()->winId());
if (!_wallet) {
@@ -278,8 +279,8 @@ void KWalletItem::processDropEvent(QDropEvent *e) {
QDataStream *ds = 0L;
- if (e->provides("application/x-kwallet-folder")) {
- QByteArray edata = e->encodedData("application/x-kwallet-folder");
+ if (e->mimeData()->hasFormat("application/x-kwallet-folder")) {
+ QByteArray edata = e->mimeData()->data("application/x-kwallet-folder");
if (!edata.isEmpty()) {
ds = new QDataStream(&edata, QIODevice::ReadOnly);
}
@@ -376,7 +377,7 @@ void KWalletEntryList::itemDropped(QDropEvent *e, QTreeWidgetItem *item) {
sel = el->currentItem();
}
- if (e->provides("application/x-kwallet-entry")) {
+ if (e->mimeData()->hasFormat("application/x-kwallet-entry")) {
//do nothing if we are in the same folder
if (sel && sel->parent()->parent() ==
KWalletEntryList::getItemFolder(item)) {
@@ -384,26 +385,26 @@ void KWalletEntryList::itemDropped(QDropEvent *e, QTreeWidgetItem *item) {
return;
}
isEntry = true;
- QByteArray data = e->encodedData("application/x-kwallet-entry");
+ QByteArray data = e->mimeData()->data("application/x-kwallet-entry");
if (data.isEmpty()) {
e->ignore();
return;
}
ds = new QDataStream(&data, QIODevice::ReadOnly);
- } else if (e->provides("application/x-kwallet-folder")) {
+ } else if (e->mimeData()->hasFormat("application/x-kwallet-folder")) {
//do nothing if we are in the same wallet
if (this == el) {
e->ignore();
return;
}
isEntry = false;
- QByteArray data = e->encodedData("application/x-kwallet-folder");
+ QByteArray data = e->mimeData()->data("application/x-kwallet-folder");
if (data.isEmpty()) {
e->ignore();
return;
}
ds = new QDataStream(&data, QIODevice::ReadOnly);
- } else if (e->provides("text/uri-list")) {
+ } else if (e->mimeData()->hasFormat("text/uri-list")) {
const QList<QUrl> urls = e->mimeData()->urls();
if (urls.isEmpty()) {
e->ignore();
@@ -585,14 +586,14 @@ void KWalletEntryList::dragMoveEvent(QDragMoveEvent *e) {
QTreeWidgetItem *i = itemAt(e->pos());
e->ignore();
if (i) {
- if (e->provides("application/x-kwallet-entry") ||
- e->provides("text/uri-list")) {
+ if (e->mimeData()->hasFormat("application/x-kwallet-entry") ||
+ e->mimeData()->hasFormat("text/uri-list")) {
e->accept();
}
}
- if ((e->provides("application/x-kwallet-folder") &&
+ if ((e->mimeData()->hasFormat("application/x-kwallet-folder") &&
e->source() != viewport()) ||
- e->provides("text/uri-list")) {
+ e->mimeData()->hasFormat("text/uri-list")) {
e->accept();
}
}
diff --git a/src/manager/allyourbase.h b/src/manager/allyourbase.h
index ae8b3c7..f1c6325 100644
--- a/src/manager/allyourbase.h
+++ b/src/manager/allyourbase.h
@@ -79,7 +79,7 @@ class KWalletFolderItem : public QTreeWidgetItem {
KWalletFolderItem(KWallet::Wallet *w, QTreeWidget* parent, const QString& name, int entries);
virtual ~KWalletFolderItem();
- virtual bool acceptDrop(const QMimeSource *mime) const;
+ virtual bool acceptDrop(const QMimeData *mime) const;
QString name() const;
void refresh();
diff --git a/src/manager/kwalleteditor.cpp b/src/manager/kwalleteditor.cpp
index 6f07b7d..1932196 100644
--- a/src/manager/kwalleteditor.cpp
+++ b/src/manager/kwalleteditor.cpp
@@ -27,6 +27,7 @@
#include <QDomElement>
#include <QDomNode>
#include <QDomDocument>
+#include <QFileDialog>
#include <QXmlStreamWriter>
#include <kaction.h>
#include <kdebug.h>
@@ -68,10 +69,10 @@ QAction *KWalletEditor::_exportAction =0;
QAction *KWalletEditor::_saveAsAction =0;
QAction *KWalletEditor::_mergeAction =0;
QAction *KWalletEditor::_importAction =0;
-KAction *KWalletEditor::_newEntryAction =0;
-KAction *KWalletEditor::_renameEntryAction =0;
-KAction *KWalletEditor::_deleteEntryAction =0;
-KAction *KWalletEditor::_copyPassAction =0;
+QAction *KWalletEditor::_newEntryAction =0;
+QAction *KWalletEditor::_renameEntryAction =0;
+QAction *KWalletEditor::_deleteEntryAction =0;
+QAction *KWalletEditor::_copyPassAction =0;
QAction *KWalletEditor::_alwaysShowContentsAction =0;
QAction *KWalletEditor::_alwaysHideContentsAction =0;
@@ -944,14 +945,15 @@ void KWalletEditor::showHideMapEditorValue(bool show) {
enum MergePlan { Prompt = 0, Always = 1, Never = 2, Yes = 3, No = 4 };
void KWalletEditor::importWallet() {
- KUrl url = KFileDialog::getOpenUrl(KUrl(), QLatin1String( "*.kwl" ), this);
+ QUrl url = QFileDialog::getOpenFileUrl(this, QString(), QUrl(), QLatin1String( "*.kwl" ));
+
if (url.isEmpty()) {
return;
}
QString tmpFile;
if (!KIO::NetAccess::download(url, tmpFile, this)) {
- KMessageBox::sorry(this, i18n("Unable to access wallet '<b>%1</b>'.", url.prettyUrl()));
+ KMessageBox::sorry(this, i18n("Unable to access wallet '<b>%1</b>'.", url.toDisplayString()));
return;
}
@@ -1079,27 +1081,28 @@ void KWalletEditor::importWallet() {
void KWalletEditor::importXML() {
- KUrl url = KFileDialog::getOpenUrl( KUrl(), QLatin1String( "*.xml" ), this);
- if (url.isEmpty()) {
+ QUrl url = QFileDialog::getOpenFileUrl( this, QString(), QUrl(), QLatin1String( "*.xml" ));
+
+ if (url.isEmpty()) {
return;
}
QString tmpFile;
if (!KIO::NetAccess::download(url, tmpFile, this)) {
- KMessageBox::sorry(this, i18n("Unable to access XML file '<b>%1</b>'.", url.prettyUrl()));
+ KMessageBox::sorry(this, i18n("Unable to access XML file '<b>%1</b>'.", url.toDisplayString()));
return;
}
QFile qf(tmpFile);
if (!qf.open(QIODevice::ReadOnly)) {
- KMessageBox::sorry(this, i18n("Error opening XML file '<b>%1</b>' for input.", url.prettyUrl()));
+ KMessageBox::sorry(this, i18n("Error opening XML file '<b>%1</b>' for input.", url.toDisplayString()));
KIO::NetAccess::removeTempFile(tmpFile);
return;
}
QDomDocument doc(tmpFile);
if (!doc.setContent(&qf)) {
- KMessageBox::sorry(this, i18n("Error reading XML file '<b>%1</b>' for input.", url.prettyUrl()));
+ KMessageBox::sorry(this, i18n("Error reading XML file '<b>%1</b>' for input.", url.toDisplayString()));
KIO::NetAccess::removeTempFile(tmpFile);
return;
}
@@ -1251,10 +1254,10 @@ void KWalletEditor::exportXML() {
xml.writeEndDocument();
tf.flush();
- KUrl url = KFileDialog::getSaveUrl(KUrl(), QLatin1String( "*.xml" ), this);
+ QUrl url = QFileDialog::getSaveFileUrl( this, QString(), QUrl(), QLatin1String( "*.xml" ));
if (!url.isEmpty()) {
- KIO::NetAccess::dircopy(KUrl::fromPath(tf.fileName()), url, this);
+ KIO::NetAccess::dircopy(QUrl::fromLocalFile(tf.fileName()), url, this);
}
}
@@ -1265,14 +1268,15 @@ void KWalletEditor::setNewWallet(bool x) {
void KWalletEditor::saveAs() {
- KUrl url = KFileDialog::getSaveUrl(KUrl(), QLatin1String( "*.kwl" ), this);
- if (!url.isEmpty()) {
+ QUrl url = QFileDialog::getSaveFileUrl( this, QString(), QUrl(), QLatin1String( "*.kwl" ));
+
+ if (!url.isEmpty()) {
// Sync() kwalletd
if (_nonLocal) {
KIO::NetAccess::dircopy(_walletName, url, this);
} else {
QString path = KGlobal::dirs()->saveLocation("kwallet") + QLatin1Char( '/' ) + _walletName + QLatin1String( ".kwl" );
- KIO::NetAccess::dircopy(KUrl::fromPath(path), url, this);
+ KIO::NetAccess::dircopy(QUrl::fromLocalFile(path), url, this);
}
}
}
diff --git a/src/manager/kwalleteditor.h b/src/manager/kwalleteditor.h
index f3d08f3..2d05c5f 100644
--- a/src/manager/kwalleteditor.h
+++ b/src/manager/kwalleteditor.h
@@ -35,7 +35,6 @@ class QTreeWidgetItem;
class QCheckBox;
class KWalletEntryList;
class KWMapEditor;
-class KAction;
class KTreeWidgetSearchLine;
@@ -112,8 +111,8 @@ protected:
static RegisterCreateActionsMethod _registerCreateActionMethod;
static QAction *_newFolderAction, *_deleteFolderAction;
static QAction *_exportAction, *_saveAsAction, *_mergeAction, *_importAction;
- static KAction *_newEntryAction, *_renameEntryAction, *_deleteEntryAction;
- static KAction *_copyPassAction;
+ static QAction *_newEntryAction, *_renameEntryAction, *_deleteEntryAction;
+ static QAction *_copyPassAction;
QLabel*_details;
QString _currentFolder;
QMap<QString,QString> _currentMap; // save memory by storing
diff --git a/src/manager/kwalletmanager.cpp b/src/manager/kwalletmanager.cpp
index 276a755..af85f03 100644
--- a/src/manager/kwalletmanager.cpp
+++ b/src/manager/kwalletmanager.cpp
@@ -49,6 +49,9 @@
#include <kactioncollection.h>
#include <kconfiggroup.h>
+// KF5::KDE4Support
+#include <kglobal.h>
+
KWalletManager::KWalletManager(QWidget *parent, const char *name, Qt::WFlags f)
: KXmlGuiWindow(parent, f)
{
diff --git a/src/manager/kwalletmanagerwidget.cpp b/src/manager/kwalletmanagerwidget.cpp
index c855c91..afbfd52 100644
--- a/src/manager/kwalletmanagerwidget.cpp
+++ b/src/manager/kwalletmanagerwidget.cpp
@@ -124,7 +124,7 @@ const QString& KWalletManagerWidget::activeWalletName() const
void KWalletManagerWidget::dragEnterEvent(QDragEnterEvent* e)
{
- if (e->provides("application/x-kwallet-wallet")) {
+ if (e->mimeData()->hasFormat("application/x-kwallet-wallet")) {
e->accept();
} else {
e->ignore();
diff --git a/src/manager/kwalletmanagerwidget.h b/src/manager/kwalletmanagerwidget.h
index df1e4fa..7979301 100644
--- a/src/manager/kwalletmanagerwidget.h
+++ b/src/manager/kwalletmanagerwidget.h
@@ -25,6 +25,8 @@
class KUrl;
class QDropEvent;
class KWalletManagerWidgetItem;
+class QDragEnterEvent;
+class QDragMoveEvent;
class KWalletManagerWidget : public KPageWidget {
Q_OBJECT
diff --git a/src/manager/kwmapeditor.cpp b/src/manager/kwmapeditor.cpp
index 5bbe1dc..8031ce4 100644
--- a/src/manager/kwmapeditor.cpp
+++ b/src/manager/kwmapeditor.cpp
@@ -21,6 +21,7 @@
#include <kaction.h>
#include <kactioncollection.h>
#include <kdebug.h>
+#include <kicon.h>
#include <klocale.h>
#include <kmenu.h>
#include <kstandardaction.h>
diff --git a/src/manager/kwmapeditor.h b/src/manager/kwmapeditor.h
index b33d8ed..d685604 100644
--- a/src/manager/kwmapeditor.h
+++ b/src/manager/kwmapeditor.h
@@ -24,7 +24,6 @@
#include <QTableWidget>
-class KAction;
class KActionCollection;
class KWMapEditor : public QTableWidget {
@@ -52,7 +51,7 @@ class KWMapEditor : public QTableWidget {
QMap<QString,QString>& _map;
int _contextRow;
KActionCollection *_ac;
- KAction *_copyAct;
+ QAction *_copyAct;
};
#endif
diff --git a/src/manager/main.cpp b/src/manager/main.cpp
index eebd29a..9933d52 100644
--- a/src/manager/main.cpp
+++ b/src/manager/main.cpp
@@ -17,7 +17,9 @@
Boston, MA 02110-1301, USA.
*/
-#include <kaboutdata.h>
+#include "kwalletmanager.h"
+
+#include <k4aboutdata.h>
#include <kcmdlineargs.h>
#include <kdebug.h>
#include <kglobal.h>
@@ -29,7 +31,6 @@
#include <QFile>
#include <QFileInfo>
-#include "kwalletmanager.h"
class MyApp : public KUniqueApplication {
@@ -41,9 +42,9 @@ class MyApp : public KUniqueApplication {
};
int main(int argc, char **argv) {
- KAboutData about("kwalletmanager", 0, ki18n("KDE Wallet Manager"), "2.0",
+ K4AboutData about("kwalletmanager", 0, ki18n("KDE Wallet Manager"), "2.0",
ki18n("KDE Wallet Management Tool"),
- KAboutData::License_GPL,
+ K4AboutData::License_GPL,
ki18n("(c) 2003,2004 George Staikos"), KLocalizedString(),
"http://utils.kde.org/projects/kwalletmanager");
diff --git a/src/manager/walletcontrolwidget.cpp b/src/manager/walletcontrolwidget.cpp
index 948cc60..bd53d3a 100644
--- a/src/manager/walletcontrolwidget.cpp
+++ b/src/manager/walletcontrolwidget.cpp
@@ -31,6 +31,7 @@
#include <kmenu.h>
#include <KTabWidget>
#include <kdebug.h>
+#include <klocale.h>
WalletControlWidget::WalletControlWidget(QWidget* parent, const QString& walletName):
QWidget(parent),