b39e431fcf
KDE Applications - please review OBS-URL: https://build.opensuse.org/request/show/443343 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=38
62 lines
3.3 KiB
Diff
62 lines
3.3 KiB
Diff
Index: kgpg-16.11.60git/keysmanager.cpp
|
|
===================================================================
|
|
--- kgpg-16.11.60git.orig/keysmanager.cpp
|
|
+++ kgpg-16.11.60git/keysmanager.cpp
|
|
@@ -1067,7 +1067,7 @@ void KeysManager::slotTip()
|
|
void KeysManager::showKeyServer()
|
|
{
|
|
QPointer<KeyServer> ks = new KeyServer(this, imodel);
|
|
- connect(ks, &KeyServer::importFinished, imodel, static_cast<void(KGpgItemModel::*)(const QStringList &)>(&KGpgItemModel::refreshKeys));
|
|
+ connect(ks, SIGNAL(importFinished(QStringList)), imodel, SLOT(refreshKeys(QStringList)));
|
|
ks->exec();
|
|
|
|
delete ks;
|
|
@@ -1185,11 +1185,11 @@ void KeysManager::showOptions()
|
|
return;
|
|
|
|
QPointer<kgpgOptions> optionsDialog = new kgpgOptions(this, imodel);
|
|
- connect(optionsDialog, &kgpgOptions::settingsUpdated, this, &KeysManager::readAllOptions);
|
|
- connect(optionsDialog, &kgpgOptions::homeChanged, imodel, &KGpgItemModel::refreshAllKeys);
|
|
+ connect(optionsDialog, SIGNAL(settingsUpdated()), this, SLOT(readAllOptions()));
|
|
+ connect(optionsDialog, SIGNAL(homeChanged()), imodel, SLOT(refreshAllKeys()));
|
|
connect(optionsDialog.data(), &kgpgOptions::homeChanged, imodel, &KGpgItemModel::refreshGroups);
|
|
connect(optionsDialog.data(), &kgpgOptions::refreshTrust, imodel, &KGpgItemModel::refreshTrust);
|
|
- connect(optionsDialog, &kgpgOptions::changeFont, this, &KeysManager::fontChanged);
|
|
+ connect(optionsDialog, SIGNAL(changeFont(QFont)), this, SLOT(fontChanged(QFont)));
|
|
optionsDialog->exec();
|
|
delete optionsDialog;
|
|
|
|
@@ -1648,8 +1648,8 @@ KeysManager::showProperties(KGpgNode *n)
|
|
case ITYPE_PAIR: {
|
|
KGpgKeyNode *k = n->toKeyNode();
|
|
QPointer<KgpgKeyInfo> opts = new KgpgKeyInfo(k, imodel, this);
|
|
- connect(opts, &KgpgKeyInfo::keyNeedsRefresh, imodel, static_cast<void(KGpgItemModel::*)(KGpgKeyNode *)>(&KGpgItemModel::refreshKey));
|
|
- connect(opts->keychange, &KGpgChangeKey::keyNeedsRefresh, imodel, static_cast<void(KGpgItemModel::*)(KGpgKeyNode *)>(&KGpgItemModel::refreshKey));
|
|
+ connect(opts, SIGNAL(keyNeedsRefresh(KGpgKeyNode*)), imodel, SLOT(refreshKey(KGpgKeyNode*)));
|
|
+ connect(opts->keychange, SIGNAL(keyNeedsRefresh(KGpgKeyNode*)), imodel, SLOT(refreshKey(KGpgKeyNode*)));
|
|
opts->exec();
|
|
delete opts;
|
|
}
|
|
@@ -1691,7 +1691,7 @@ void KeysManager::keyproperties()
|
|
}
|
|
|
|
QPointer<KgpgKeyInfo> opts = new KgpgKeyInfo(kn, imodel, this);
|
|
- connect(opts, &KgpgKeyInfo::keyNeedsRefresh, imodel, static_cast<void(KGpgItemModel::*)(KGpgKeyNode *)>(&KGpgItemModel::refreshKey));
|
|
+ connect(opts, SIGNAL(keyNeedsRefresh(KGpgKeyNode*)), imodel, SLOT(refreshKey(KGpgKeyNode*)));
|
|
opts->exec();
|
|
delete opts;
|
|
}
|
|
Index: kgpg-16.11.60git/kgpgexternalactions.cpp
|
|
===================================================================
|
|
--- kgpg-16.11.60git.orig/kgpgexternalactions.cpp
|
|
+++ kgpg-16.11.60git/kgpgexternalactions.cpp
|
|
@@ -455,7 +455,7 @@ void KGpgExternalActions::startAssistant
|
|
if (m_assistant.isNull()) {
|
|
m_assistant = new KGpgFirstAssistant(m_keysmanager);
|
|
|
|
- connect(m_assistant, &KGpgFirstAssistant::accepted, this, &KGpgExternalActions::slotSaveOptionsPath);
|
|
+ connect(m_assistant, SIGNAL(accepted()), this, SLOT(slotSaveOptionsPath()));
|
|
connect(m_assistant.data(), &KGpgFirstAssistant::rejected, m_assistant.data(), &KGpgFirstAssistant::deleteLater);
|
|
connect(m_assistant->button(QDialogButtonBox::Help), &QPushButton::clicked, this, &KGpgExternalActions::help);
|
|
}
|