summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-04-06 21:06:39 +0200
committerPali Roh├ír <[email protected]>2017-12-22 09:10:29 +0100
commit314df641692b005f936f36408a39548ea3c62ac1 (patch)
treedd8763dae44909e96d30ca90a1ccc79f10343f41
parent5154ce3c0e95f3bfab6c6c8a4dca3ed0a1d79306 (diff)
Minor clean
-rw-r--r--plugins/otr/otrguiclient.cpp1
-rw-r--r--plugins/otr/otrlchatinterface.cpp2
-rw-r--r--plugins/otr/otrpreferences.cpp8
3 files changed, 5 insertions, 6 deletions
diff --git a/plugins/otr/otrguiclient.cpp b/plugins/otr/otrguiclient.cpp
index fc21df1..508a57a 100644
--- a/plugins/otr/otrguiclient.cpp
+++ b/plugins/otr/otrguiclient.cpp
@@ -82,7 +82,6 @@ OtrGUIClient::OtrGUIClient(Kopete::ChatSession *parent)
otrActionMenu->addAction(actionVerifyFingerprint);
setXMLFile(QStringLiteral("otrchatui.rc"));
-// setupGUI();
encryptionEnabled(parent, OtrlChatInterface::self()->privState(parent));
}
diff --git a/plugins/otr/otrlchatinterface.cpp b/plugins/otr/otrlchatinterface.cpp
index 05a39ea..9d002e2 100644
--- a/plugins/otr/otrlchatinterface.cpp
+++ b/plugins/otr/otrlchatinterface.cpp
@@ -58,7 +58,7 @@ extern "C" {
#include <sys/stat.h>
}
-OtrlChatInterface *OtrlChatInterface::mSelf = 0;
+OtrlChatInterface *OtrlChatInterface::mSelf = nullptr;
static OtrlUserState userstate;
static OtrlPolicy confPolicy;
//static void *updateContextList = 0;
diff --git a/plugins/otr/otrpreferences.cpp b/plugins/otr/otrpreferences.cpp
index 365cfeb..f51587e 100644
--- a/plugins/otr/otrpreferences.cpp
+++ b/plugins/otr/otrpreferences.cpp
@@ -68,12 +68,12 @@ OTRPreferences::OTRPreferences(QWidget *parent, const QVariantList &args)
otrlConfInterface = new OtrlConfInterface(widget);
- connect(preferencesDialog->btGenFingerprint, SIGNAL(clicked()), SLOT(generateFingerprint()));
+ connect(preferencesDialog->btGenFingerprint, &QAbstractButton::clicked, this, &OTRPreferences::generateFingerprint);
connect(preferencesDialog->cbKeys, SIGNAL(activated(int)), SLOT(showPrivFingerprint(int)));
- connect(preferencesDialog->btVerify, SIGNAL(clicked()), SLOT(verifyFingerprint()));
- connect(preferencesDialog->twSettings, SIGNAL(currentChanged(QWidget *)), SLOT(fillFingerprints()));
+ connect(preferencesDialog->btVerify, &QAbstractButton::clicked, this, &OTRPreferences::verifyFingerprint);
+ connect(preferencesDialog->twSettings, SIGNAL(currentChanged(int)), SLOT(fillFingerprints()));
connect(preferencesDialog->tbFingerprints, SIGNAL(currentCellChanged(int,int,int,int)), SLOT(updateButtons(int,int,int,int)));
- connect(preferencesDialog->btForget, SIGNAL(clicked()), SLOT(forgetFingerprint()));
+ connect(preferencesDialog->btForget, &QAbstractButton::clicked, this, &OTRPreferences::forgetFingerprint);
connect(OtrlChatInterface::self(), SIGNAL(goneSecure(Kopete::ChatSession *,int)), this, SLOT(fillFingerprints()));
int index = 0;