Commit 66cd8201 authored by Laurent Montel's avatar Laurent Montel 😁

Reorder variable. Remove SLOT when it's not necessary. Use new connect api

parent 9cd508f4
......@@ -109,6 +109,8 @@ private:
void editVcard(const QString &filename);
private:
QString mVcardFilename;
// "general" tab:
KLineEdit *mNameEdit = nullptr;
KLineEdit *mOrganizationEdit = nullptr;
......@@ -135,7 +137,6 @@ private:
QCheckBox *mTransportCheck = nullptr;
MailTransport::TransportComboBox *mTransportCombo = nullptr;
QCheckBox *mAttachMyVCard = nullptr;
QString mVcardFilename;
QPushButton *mEditVCard = nullptr;
PimCommon::AutoCorrectionLanguage *mAutoCorrectionLanguage = nullptr;
KLineEdit *mDefaultDomainEdit = nullptr;
......
......@@ -44,10 +44,8 @@ public:
Q_SIGNALS:
void vcardRemoved();
private Q_SLOTS:
void slotDeleteCurrentVCard();
private:
void slotDeleteCurrentVCard();
void deleteCurrentVcard(bool deleteOnDisk);
QString mVcardFileName;
Akonadi::AkonadiContactEditor *mContactEditor = nullptr;
......
......@@ -84,9 +84,6 @@ public:
protected Q_SLOTS:
void commitData(QWidget *editor) override;
public Q_SLOTS:
void slotCustomContextMenuRequested(const QPoint &);
Q_SIGNALS:
void contextMenu(KMail::IdentityListViewItem *, const QPoint &);
void rename(KMail::IdentityListViewItem *, const QString &);
......@@ -97,6 +94,7 @@ protected:
#endif
private:
void slotCustomContextMenuRequested(const QPoint &);
KIdentityManagement::IdentityManager *mIdentityManager = nullptr;
};
} // namespace KMail
......
......@@ -280,7 +280,7 @@ void IdentityPage::slotContextMenu(IdentityListViewItem *item, const QPoint &pos
menu->addAction(i18n("Add..."), this, &IdentityPage::slotNewIdentity);
if (item) {
menu->addAction(i18n("Modify..."), this, &IdentityPage::slotModifyIdentity);
menu->addAction(i18n("Rename"), this, SLOT(slotRenameIdentity()));
menu->addAction(i18n("Rename"), this, &IdentityPage::slotRenameIdentity);
if (mIPage.mIdentityList->topLevelItemCount() > 1) {
menu->addAction(i18n("Remove"), this, &IdentityPage::slotRemoveIdentity);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment