aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-11-04 08:57:44 +0100
committerMontel Laurent <[email protected]>2017-11-04 08:58:02 +0100
commita95acae3f2eb1e7ecf0dc1c8126cd26d01b60ba2 (patch)
tree0f73093a0b7401165d3394d4e55f8b1fcc185196
parent63c29e34ab82876e71802670d4e215e7abb01aa6 (diff)
Port to new connect api
-rw-r--r--src/core/models/itemmodel.cpp8
-rw-r--r--src/core/models/tagmodel_p.cpp2
-rw-r--r--src/core/servermanager.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/models/itemmodel.cpp b/src/core/models/itemmodel.cpp
index 598d5c3..9a4deb4 100644
--- a/src/core/models/itemmodel.cpp
+++ b/src/core/models/itemmodel.cpp
@@ -68,14 +68,14 @@ public:
monitor->setObjectName(QStringLiteral("ItemModelMonitor"));
monitor->ignoreSession(session);
- mParent->connect(monitor, SIGNAL(itemChanged(Akonadi::Item,QSet<QByteArray>)),
- mParent, SLOT(itemChanged(Akonadi::Item,QSet<QByteArray>)));
+ mParent->connect(monitor, &Monitor::itemChanged,
+ mParent, [this](const Akonadi::Item &item, const QSet<QByteArray> &set) { itemChanged(item, set); });
mParent->connect(monitor, SIGNAL(itemMoved(Akonadi::Item,Akonadi::Collection,Akonadi::Collection)),
mParent, SLOT(itemMoved(Akonadi::Item,Akonadi::Collection,Akonadi::Collection)));
mParent->connect(monitor, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)),
mParent, SLOT(itemAdded(Akonadi::Item)));
- mParent->connect(monitor, SIGNAL(itemRemoved(Akonadi::Item)),
- mParent, SLOT(itemRemoved(Akonadi::Item)));
+ mParent->connect(monitor, &Monitor::itemRemoved,
+ mParent, [this](const Akonadi::Item &item) { itemRemoved(item); });
mParent->connect(monitor, SIGNAL(itemLinked(Akonadi::Item,Akonadi::Collection)),
mParent, SLOT(itemAdded(Akonadi::Item)));
mParent->connect(monitor, SIGNAL(itemUnlinked(Akonadi::Item,Akonadi::Collection)),
diff --git a/src/core/models/tagmodel_p.cpp b/src/core/models/tagmodel_p.cpp
index cb240ed..ac3fcca 100644
--- a/src/core/models/tagmodel_p.cpp
+++ b/src/core/models/tagmodel_p.cpp
@@ -58,7 +58,7 @@ void TagModelPrivate::init(Monitor *monitor)
q, SLOT(monitoredTagRemoved(Akonadi::Tag)));
// Delay starting the job to allow unit-tests to set up fake stuff
- QTimer::singleShot(0, q, SLOT(fillModel()));
+ QTimer::singleShot(0, q, [this] { fillModel(); });
}
void TagModelPrivate::fillModel()
diff --git a/src/core/servermanager.cpp b/src/core/servermanager.cpp
index a9f2801..795fa58 100644
--- a/src/core/servermanager.cpp
+++ b/src/core/servermanager.cpp
@@ -59,7 +59,7 @@ public:
mState = instance->state();
mSafetyTimer->setSingleShot(true);
mSafetyTimer->setInterval(30000);
- QObject::connect(mSafetyTimer.data(), SIGNAL(timeout()), instance, SLOT(timeout()));
+ QObject::connect(mSafetyTimer.data(), &QTimer::timeout, instance, [this]() { timeout();});
if (mState == ServerManager::Running && Internal::clientType() == Internal::User && !ServerManager::hasInstanceIdentifier()) {
mFirstRunner = new Firstrun(instance);
}