Commit a95acae3 authored by Laurent Montel's avatar Laurent Montel 😁

Port to new connect api

parent 63c29e34
......@@ -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)),
......
......@@ -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()
......
......@@ -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);
}
......
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