summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-09-22 13:22:52 +0200
committerMontel Laurent <[email protected]>2017-09-22 13:22:52 +0200
commitcbf87dce62e6cf4bf8e94c9b1d19b3f810d54ce7 (patch)
tree3525a77af00be169a211991e87ff0539b0857a7d
parentc37c5a55c28e3f77879462a6ff1717cf0f339c96 (diff)
Port to new connect api
-rw-r--r--src/pimcommonakonadi/acl/aclmanager.cpp12
-rw-r--r--src/pimcommonakonadi/acl/aclmanager.h5
2 files changed, 4 insertions, 13 deletions
diff --git a/src/pimcommonakonadi/acl/aclmanager.cpp b/src/pimcommonakonadi/acl/aclmanager.cpp
index fadbcc5..e84ca6d 100644
--- a/src/pimcommonakonadi/acl/aclmanager.cpp
+++ b/src/pimcommonakonadi/acl/aclmanager.cpp
@@ -176,24 +176,20 @@ public:
, mChanged(false)
{
mAddAction = new QAction(i18n("Add Entry..."), q);
- q->connect(mAddAction, SIGNAL(triggered(bool)),
- q, SLOT(addAcl()));
+ q->connect(mAddAction, &QAction::triggered, q, [this]() { addAcl(); });
mEditAction = new QAction(i18n("Edit Entry..."), q);
mEditAction->setEnabled(false);
- q->connect(mEditAction, SIGNAL(triggered(bool)),
- q, SLOT(editAcl()));
+ q->connect(mEditAction, &QAction::triggered, q, [this]() { editAcl(); });
mDeleteAction = new QAction(i18n("Remove Entry"), q);
mDeleteAction->setEnabled(false);
- q->connect(mDeleteAction, SIGNAL(triggered(bool)),
- q, SLOT(deleteAcl()));
+ q->connect(mDeleteAction, &QAction::triggered, q, [this]() { deleteAcl(); } );
mModel = new AclModel(q);
mSelectionModel = new QItemSelectionModel(mModel);
- q->connect(mSelectionModel, SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
- q, SLOT(selectionChanged()));
+ q->connect(mSelectionModel, &QItemSelectionModel::selectionChanged, q, [this]() { selectionChanged(); });
}
~Private()
diff --git a/src/pimcommonakonadi/acl/aclmanager.h b/src/pimcommonakonadi/acl/aclmanager.h
index 65e3932..7714e6c 100644
--- a/src/pimcommonakonadi/acl/aclmanager.h
+++ b/src/pimcommonakonadi/acl/aclmanager.h
@@ -111,11 +111,6 @@ private:
//@cond PRIVATE
class Private;
Private *const d;
-
- Q_PRIVATE_SLOT(d, void selectionChanged())
- Q_PRIVATE_SLOT(d, void addAcl())
- Q_PRIVATE_SLOT(d, void editAcl())
- Q_PRIVATE_SLOT(d, void deleteAcl())
//@endcond
};
}