summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-09-26 13:34:05 +0200
committerMontel Laurent <[email protected]>2017-09-26 13:34:05 +0200
commitce95320232c0432af463dda498503070d66f0de0 (patch)
tree7736d334f76542c9e9ec2c8c84bd146ed9439793
parentcaf4ed24d868e190d4664917fcb0a53d3162351f (diff)
Port to new connect api
-rw-r--r--agents/mailfilteragent/filterlogdialog.h6
-rw-r--r--agents/mailfilteragent/mailfilteragent.cpp4
-rw-r--r--ktnef/src/attachpropertydialog.h4
-rw-r--r--ktnef/src/ktnefview.h4
-rw-r--r--ktnef/src/messagepropertydialog.cpp2
-rw-r--r--ktnef/src/messagepropertydialog.h3
6 files changed, 9 insertions, 14 deletions
diff --git a/agents/mailfilteragent/filterlogdialog.h b/agents/mailfilteragent/filterlogdialog.h
index 3ad8a8d..403e77f 100644
--- a/agents/mailfilteragent/filterlogdialog.h
+++ b/agents/mailfilteragent/filterlogdialog.h
@@ -54,7 +54,7 @@ public:
explicit FilterLogDialog(QWidget *parent);
~FilterLogDialog();
-private Q_SLOTS:
+private:
void slotTextChanged();
void slotLogEntryAdded(const QString &logEntry);
void slotLogShrinked();
@@ -65,10 +65,10 @@ private Q_SLOTS:
void slotUser1();
void slotUser2();
-private:
+
void readConfig();
void writeConfig();
-private:
+
KPIMTextEdit::PlainTextEditorWidget *mTextEdit = nullptr;
QCheckBox *mLogActiveBox = nullptr;
QGroupBox *mLogDetailsBox = nullptr;
diff --git a/agents/mailfilteragent/mailfilteragent.cpp b/agents/mailfilteragent/mailfilteragent.cpp
index c1276d0..25a9223 100644
--- a/agents/mailfilteragent/mailfilteragent.cpp
+++ b/agents/mailfilteragent/mailfilteragent.cpp
@@ -90,8 +90,8 @@ MailFilterAgent::MailFilterAgent(const QString &id)
collectionMonitor->setMimeTypeMonitored(KMime::Message::mimeType());
connect(collectionMonitor, &Akonadi::Monitor::collectionAdded, this, &MailFilterAgent::mailCollectionAdded);
- connect(collectionMonitor, SIGNAL(collectionChanged(Akonadi::Collection)),
- this, SLOT(mailCollectionChanged(Akonadi::Collection)));
+ connect(collectionMonitor, QOverload<const Akonadi::Collection &>::of(&Akonadi::Monitor::collectionChanged),
+ this, &MailFilterAgent::mailCollectionChanged);
connect(collectionMonitor, &Akonadi::Monitor::collectionRemoved, this, &MailFilterAgent::mailCollectionRemoved);
connect(Akonadi::AgentManager::self(), &Akonadi::AgentManager::instanceRemoved, this, &MailFilterAgent::slotInstanceRemoved);
diff --git a/ktnef/src/attachpropertydialog.h b/ktnef/src/attachpropertydialog.h
index 185ae93..e92f0ec 100644
--- a/ktnef/src/attachpropertydialog.h
+++ b/ktnef/src/attachpropertydialog.h
@@ -48,13 +48,11 @@ public:
static void formatPropertySet(KTNEFPropertySet *, QTreeWidget *);
static bool saveProperty(QTreeWidget *, KTNEFPropertySet *, QWidget *);
-private Q_SLOTS:
- void slotSave();
-
protected:
Ui::AttachPropertyWidgetBase mUI;
private:
+ void slotSave();
void readConfig();
void writeConfig();
KTNEFAttach *mAttach = nullptr;
diff --git a/ktnef/src/ktnefview.h b/ktnef/src/ktnefview.h
index 1dd54ed..e808ff7 100644
--- a/ktnef/src/ktnefview.h
+++ b/ktnef/src/ktnefview.h
@@ -42,10 +42,8 @@ protected:
void resizeEvent(QResizeEvent *e) override;
void startDrag(Qt::DropActions dropAction) override;
-private Q_SLOTS:
- void adjustColumnWidth();
-
private:
+ void adjustColumnWidth();
QList<KTNEFAttach *> mAttachments;
};
diff --git a/ktnef/src/messagepropertydialog.cpp b/ktnef/src/messagepropertydialog.cpp
index 2bde131..dd74c62 100644
--- a/ktnef/src/messagepropertydialog.cpp
+++ b/ktnef/src/messagepropertydialog.cpp
@@ -39,7 +39,7 @@ MessagePropertyDialog::MessagePropertyDialog(QWidget *parent, KTNEFMessage *msg)
setWindowTitle(i18n("Message Properties"));
mListView = new QTreeWidget(this);
mainLayout->addWidget(mListView);
- QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+ QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
diff --git a/ktnef/src/messagepropertydialog.h b/ktnef/src/messagepropertydialog.h
index d4cdca9..21cd3cf 100644
--- a/ktnef/src/messagepropertydialog.h
+++ b/ktnef/src/messagepropertydialog.h
@@ -32,10 +32,9 @@ class MessagePropertyDialog : public QDialog
public:
explicit MessagePropertyDialog(QWidget *parent, KTNEFMessage *msg);
~MessagePropertyDialog();
-private Q_SLOTS:
- void slotSaveProperty();
private:
+ void slotSaveProperty();
void readConfig();
void writeConfig();
KTNEFMessage *mMessage = nullptr;