Commit 513af1aa authored by Laurent Montel's avatar Laurent Montel 😁

Porting++

parent 85e33a83
......@@ -201,8 +201,8 @@ MailDispatcherAgent::MailDispatcherAgent(const QString &id)
KDBusConnectionPool::threadConnection().registerService(service);
d->queue = new OutboxQueue(this);
connect(d->queue, SIGNAL(newItems()),
this, SLOT(dispatch()));
connect(d->queue, &OutboxQueue::newItems,
this, [this]() { d->dispatch(); });
connect(d->queue, SIGNAL(itemReady(Akonadi::Item)),
this, SLOT(itemFetched(Akonadi::Item)));
connect(d->queue, SIGNAL(error(QString)),
......@@ -234,7 +234,7 @@ void MailDispatcherAgent::doSetOnline(bool online)
if (online) {
qCDebug(MAILDISPATCHER_LOG) << "Online. Dispatching messages.";
Q_EMIT status(AgentBase::Idle, i18n("Online, sending messages in queue."));
QTimer::singleShot(0, this, SLOT(dispatch()));
QTimer::singleShot(0, this, [this]() { d->dispatch(); });
} else {
qCDebug(MAILDISPATCHER_LOG) << "Offline.";
Q_EMIT status(AgentBase::Idle, i18n("Offline, message sending suspended."));
......
......@@ -64,7 +64,6 @@ private:
Private *const d;
Q_PRIVATE_SLOT(d, void abort())
Q_PRIVATE_SLOT(d, void dispatch())
Q_PRIVATE_SLOT(d, void itemFetched(const Akonadi::Item &))
Q_PRIVATE_SLOT(d, void queueError(const QString &))
Q_PRIVATE_SLOT(d, void sendPercent(KJob *, unsigned long))
......
......@@ -55,8 +55,6 @@ void GoogleAccountManager::initManager()
m_wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(),
0, KWallet::Wallet::Synchronous);
slotWalletOpened(m_wallet != nullptr);
// connect( m_wallet, SIGNAL(walletOpened(bool)),
// this, SLOT(slotWalletOpened(bool)) );
if (m_wallet) {
connect(m_wallet.data(), &KWallet::Wallet::folderUpdated, this, &GoogleAccountManager::slotFolderUpdated);
connect(m_wallet.data(), &KWallet::Wallet::walletClosed, this, &GoogleAccountManager::slotWalletClosed);
......
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