summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin T. H. Sandsmark <martin.sandsmark@kde.org>2016-07-09 19:48:37 (GMT)
committerMartin T. H. Sandsmark <martin.sandsmark@kde.org>2016-07-18 21:25:49 (GMT)
commitac61e7597ac45a4301b3bd1b8f5eab124e3e5c9b (patch)
treec2902f3cb2424b99bb4e69dd54ce946d5534d196
parente6f52caa71116b4a3b9c921748e977d43312621a (diff)
Port away from deprecated Qt methods
REVIEW: 128415
-rw-r--r--CMakeLists.txt21
-rw-r--r--src/konfigurator/konfigurator.cpp2
-rw-r--r--src/manager/kwalleteditor.cpp8
-rw-r--r--src/manager/kwalletmanager.cpp2
-rw-r--r--src/manager/kwalletmanager.h2
5 files changed, 21 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7ce3bb..e33a9e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,18 +28,25 @@ ecm_setup_version(${KDE_APPLICATIONS_VERSION} VARIABLE_PREFIX KWALLETMANAGER
)
find_package(KF5 5.2.0 REQUIRED
+ Archive
+ Auth
+ Config
+ ConfigWidgets
CoreAddons
+ DBusAddons
DocTools
- Auth
- Wallet
- Service
+ I18n
+ IconThemes
+ JobWidgets
KCMUtils
KDELibs4Support
- I18n
+ KIO
+ Notifications
+ Service
+ TextWidgets
+ Wallet
+ WindowSystem
XmlGui
- Config
- ConfigWidgets
- DBusAddons
)
add_subdirectory( doc )
diff --git a/src/konfigurator/konfigurator.cpp b/src/konfigurator/konfigurator.cpp
index e4fa19f..43ff1dc 100644
--- a/src/konfigurator/konfigurator.cpp
+++ b/src/konfigurator/konfigurator.cpp
@@ -258,7 +258,7 @@ void KWalletConfig::load()
new QTreeWidgetItem(twi, QStringList() << QString() << *j << i18n("Always Deny"));
}
}
- _wcw->_accessList->header()->setResizeMode(QHeaderView::ResizeToContents);
+ _wcw->_accessList->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
emit changed(false);
}
diff --git a/src/manager/kwalleteditor.cpp b/src/manager/kwalleteditor.cpp
index ef2f570..0d29cf8 100644
--- a/src/manager/kwalleteditor.cpp
+++ b/src/manager/kwalleteditor.cpp
@@ -980,7 +980,7 @@ void KWalletEditor::importWallet()
if (hasEntry && mp == Prompt) {
KBetterThanKDialogBase *bd;
bd = new KBetterThanKDialogBase(this);
- bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?", Qt::escape(*f), Qt::escape(me.key())));
+ bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?", f->toHtmlEscaped(), me.key().toHtmlEscaped()));
mp = (MergePlan)bd->exec();
delete bd;
bool ok = false;
@@ -1011,7 +1011,7 @@ void KWalletEditor::importWallet()
if (hasEntry && mp == Prompt) {
KBetterThanKDialogBase *bd;
bd = new KBetterThanKDialogBase(this);
- bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?", Qt::escape(*f), Qt::escape(pe.key())));
+ bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?", f->toHtmlEscaped(), pe.key().toHtmlEscaped()));
mp = (MergePlan)bd->exec();
delete bd;
bool ok = false;
@@ -1046,7 +1046,7 @@ void KWalletEditor::importWallet()
if (hasEntry && mp == Prompt) {
KBetterThanKDialogBase *bd;
bd = new KBetterThanKDialogBase(this);
- bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?", Qt::escape(*f), Qt::escape(ee.key())));
+ bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?", f->toHtmlEscaped(), ee.key().toHtmlEscaped()));
mp = (MergePlan)bd->exec();
delete bd;
bool ok = false;
@@ -1129,7 +1129,7 @@ void KWalletEditor::importXML()
if (hasEntry && mp == Prompt) {
KBetterThanKDialogBase *bd;
bd = new KBetterThanKDialogBase(this);
- bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?", Qt::escape(fname), Qt::escape(ename)));
+ bd->setLabel(i18n("Folder '<b>%1</b>' already contains an entry '<b>%2</b>'. Do you wish to replace it?", fname.toHtmlEscaped(), ename.toHtmlEscaped()));
mp = (MergePlan)bd->exec();
delete bd;
bool ok = false;
diff --git a/src/manager/kwalletmanager.cpp b/src/manager/kwalletmanager.cpp
index 64a90dd..f978c02 100644
--- a/src/manager/kwalletmanager.cpp
+++ b/src/manager/kwalletmanager.cpp
@@ -50,7 +50,7 @@
#include <QFileDialog>
-KWalletManager::KWalletManager(QWidget *parent, const char *name, Qt::WFlags f)
+KWalletManager::KWalletManager(QWidget *parent, const char *name, Qt::WindowFlags f)
: KXmlGuiWindow(parent, f)
{
_kwalletdLaunch = false;
diff --git a/src/manager/kwalletmanager.h b/src/manager/kwalletmanager.h
index 9199338..87d58f4 100644
--- a/src/manager/kwalletmanager.h
+++ b/src/manager/kwalletmanager.h
@@ -36,7 +36,7 @@ class KWalletManager : public KXmlGuiWindow
Q_CLASSINFO("D-Bus Interface", "org.kde.kwallet.kwalletmanager")
public:
- explicit KWalletManager(QWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0);
+ explicit KWalletManager(QWidget *parent = 0, const char *name = 0, Qt::WindowFlags f = 0);
virtual ~KWalletManager();
void kwalletdLaunch();