[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepimlibs] /: Port to nesw connect api
From: Montel Laurent <montel () kde ! org>
Date: 2014-09-30 21:13:46
Message-ID: E1XZ4jy-0007k4-Pi () scm ! kde ! org
[Download RAW message or body]
Git commit e6ea105b671696748682b6d927f10e7eefffd1b2 by Montel Laurent.
Committed on 30/09/2014 at 21:13.
Pushed by mlaurent into branch 'master'.
Port to nesw connect api
M +3 -6 akonadi-calendar/src/calendarbase.cpp
M +1 -2 akonadi-calendar/src/history.cpp
M +6 -12 akonadi-calendar/src/history_p.cpp
M +5 -10 akonadi-calendar/src/itiphandlerhelper_p.cpp
M +1 -2 akonadi-calendar/src/mailscheduler_p.cpp
M +1 -2 akonadi-contact/src/contactgroupeditordialog.cpp
M +1 -2 akonadi-contact/src/contactgrouplineedit.cpp
M +3 -6 akonadi-contact/src/editor/emaileditwidget.cpp
M +1 -2 akonadi-contact/src/editor/im/imeditordialog.cpp
M +2 -4 akonadi-contact/src/editor/kdatepickerpopup.cpp
M +1 -2 akonadi/src/core/asyncselectionhandler.cpp
M +2 -4 akonadi/src/core/jobs/collectionattributessynchronizationjob.cpp
M +2 -4 akonadi/src/core/jobs/kjobprivatebase.cpp
M +1 -2 akonadi/src/core/jobs/specialcollectionshelperjobs.cpp
M +1 -2 akonadi/src/core/models/statisticsproxymodel.cpp
M +2 -4 akonadi/src/widgets/collectionrequester.cpp
M +1 -2 akonadi/src/widgets/collectionview.cpp
M +2 -4 akonadi/src/widgets/entitylistview.cpp
M +2 -4 akonadi/src/widgets/entitytreeview.cpp
M +1 -2 akonadi/src/widgets/erroroverlay.cpp
M +3 -6 akonadi/src/widgets/itemview.cpp
M +1 -2 akonadi/src/widgets/renamefavoritedialog.cpp
M +9 -16 kidentitymanagement/src/signatureconfigurator.cpp
M +1 -2 kpimtextedit/src/textedit.cpp
M +2 -4 syndication/src/syndication/dataretriever.cpp
http://commits.kde.org/kdepimlibs/e6ea105b671696748682b6d927f10e7eefffd1b2
diff --git a/akonadi-calendar/src/calendarbase.cpp \
b/akonadi-calendar/src/calendarbase.cpp index e20d40d..2bc36c3 100644
--- a/akonadi-calendar/src/calendarbase.cpp
+++ b/akonadi-calendar/src/calendarbase.cpp
@@ -54,16 +54,13 @@ CalendarBasePrivate::CalendarBasePrivate(CalendarBase *qq)
, mLastCreationCancelled(false)
, q(qq)
{
- connect(mIncidenceChanger,
- SIGNAL(createFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)),
+ connect(mIncidenceChanger, \
SIGNAL(createFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)),
SLOT(slotCreateFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)));
- connect(mIncidenceChanger,
- SIGNAL(deleteFinished(int,QVector<Akonadi::Item::Id>,Akonadi::IncidenceChanger::ResultCode,QString)),
+ connect(mIncidenceChanger, \
SIGNAL(deleteFinished(int,QVector<Akonadi::Item::Id>,Akonadi::IncidenceChanger::ResultCode,QString)),
SLOT(slotDeleteFinished(int,QVector<Akonadi::Item::Id>,Akonadi::IncidenceChanger::ResultCode,QString)));
- connect(mIncidenceChanger,
- SIGNAL(modifyFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)),
+ connect(mIncidenceChanger, \
SIGNAL(modifyFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)),
SLOT(slotModifyFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)));
mIncidenceChanger->setDestinationPolicy(IncidenceChanger::DestinationPolicyAsk);
diff --git a/akonadi-calendar/src/history.cpp b/akonadi-calendar/src/history.cpp
index 6983630..26decf8 100644
--- a/akonadi-calendar/src/history.cpp
+++ b/akonadi-calendar/src/history.cpp
@@ -200,8 +200,7 @@ void History::Private::doIt(OperationType type)
Q_ASSERT(!stack().isEmpty());
mEntryInProgress = stack().pop();
- connect(mEntryInProgress.data(), \
SIGNAL(finished(Akonadi::IncidenceChanger::ResultCode,QString)),
- SLOT(handleFinished(Akonadi::IncidenceChanger::ResultCode,QString)),
+ connect(mEntryInProgress.data(), \
SIGNAL(finished(Akonadi::IncidenceChanger::ResultCode,QString)), \
SLOT(handleFinished(Akonadi::IncidenceChanger::ResultCode,QString)), \
Qt::UniqueConnection); mEntryInProgress->doIt(type);
}
diff --git a/akonadi-calendar/src/history_p.cpp b/akonadi-calendar/src/history_p.cpp
index 85d4264..61a4853 100644
--- a/akonadi-calendar/src/history_p.cpp
+++ b/akonadi-calendar/src/history_p.cpp
@@ -99,10 +99,8 @@ CreationEntry::CreationEntry(const Akonadi::Item &item, const \
QString &descripti
mDescription = i18nc("%1 is event, todo or journal", "%1 creation",
\
KCalUtils::Stringify::incidenceType(incidence->type())); }
- connect(mChanger, \
SIGNAL(createFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)),
- SLOT(onCreateFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)));
- connect(mChanger, \
SIGNAL(deleteFinished(int,QVector<Akonadi::Item::Id>,Akonadi::IncidenceChanger::ResultCode,QString)),
- SLOT(onDeleteFinished(int,QVector<Akonadi::Item::Id>,Akonadi::IncidenceChanger::ResultCode,QString)));
+ connect(mChanger, &IncidenceChanger::createFinished, this, \
&CreationEntry::onCreateFinished); + connect(mChanger, \
&IncidenceChanger::deleteFinished, this, &CreationEntry::onDeleteFinished); }
bool CreationEntry::undo()
@@ -174,10 +172,8 @@ DeletionEntry::DeletionEntry(const Akonadi::Item::List &items, \
const QString &de
mDescription = i18nc("%1 is event, todo or journal", "%1 deletion",
\
KCalUtils::Stringify::incidenceType(incidence->type())); }
- connect(mChanger, \
SIGNAL(createFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)),
- SLOT(onCreateFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)));
- connect(mChanger, \
SIGNAL(deleteFinished(int,QVector<Akonadi::Item::Id>,Akonadi::IncidenceChanger::ResultCode,QString)),
- SLOT(onDeleteFinished(int,QVector<Akonadi::Item::Id>,Akonadi::IncidenceChanger::ResultCode,QString)));
+ connect(mChanger, &IncidenceChanger::createFinished, this, \
&DeletionEntry::onCreateFinished); + connect(mChanger, \
&IncidenceChanger::deleteFinished, this, &DeletionEntry::onDeleteFinished); }
bool DeletionEntry::undo()
@@ -266,8 +262,7 @@ ModificationEntry::ModificationEntry(const Akonadi::Item &item,
\
KCalUtils::Stringify::incidenceType(incidence->type())); }
- connect(mChanger, \
SIGNAL(modifyFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)),
- SLOT(onModifyFinished(int,Akonadi::Item,Akonadi::IncidenceChanger::ResultCode,QString)));
+ connect(mChanger, &IncidenceChanger::modifyFinished, this, \
&ModificationEntry::onModifyFinished); }
bool ModificationEntry::undo()
@@ -323,8 +318,7 @@ void MultiEntry::addEntry(const Entry::Ptr &entry)
{
Q_ASSERT(mOperationInProgress == TypeNone);
mEntries.append(entry);
- connect(entry.data(), \
SIGNAL(finished(Akonadi::IncidenceChanger::ResultCode,QString)),
- SLOT(onEntryFinished(Akonadi::IncidenceChanger::ResultCode,QString)),
+ connect(entry.data(), \
SIGNAL(finished(Akonadi::IncidenceChanger::ResultCode,QString)), \
SLOT(onEntryFinished(Akonadi::IncidenceChanger::ResultCode,QString)), \
Qt::UniqueConnection); }
diff --git a/akonadi-calendar/src/itiphandlerhelper_p.cpp \
b/akonadi-calendar/src/itiphandlerhelper_p.cpp index 7bfc03f..ffa6965 100644
--- a/akonadi-calendar/src/itiphandlerhelper_p.cpp
+++ b/akonadi-calendar/src/itiphandlerhelper_p.cpp
@@ -195,8 +195,7 @@ ITIPHandlerHelper::ITIPHandlerHelper(ITIPHandlerComponentFactory \
*factory, QWidg , m_scheduler(new MailScheduler(m_factory, this))
, m_status(StatusNone)
{
- connect(m_scheduler, \
SIGNAL(transactionFinished(Akonadi::Scheduler::Result,QString)),
- SLOT(onSchedulerFinished(Akonadi::Scheduler::Result,QString)));
+ connect(m_scheduler, &MailScheduler::transactionFinished, this, \
&ITIPHandlerHelper::onSchedulerFinished); }
ITIPHandlerHelper::~ITIPHandlerHelper()
@@ -248,8 +247,7 @@ void \
ITIPHandlerHelper::sendIncidenceCreatedMessage(KCalCore::iTIPMethod method, }
ITIPHandlerDialogDelegate *askDelegator = \
m_factory->createITIPHanderDialogDelegate(incidence, method, \
mParent);
- connect(askDelegator, \
SIGNAL(dialogClosed(int,KCalCore::iTIPMethod,KCalCore::Incidence::Ptr)),
- SLOT(slotIncidenceCreatedDialogClosed(int,KCalCore::iTIPMethod,KCalCore::Incidence::Ptr)));
+ connect(askDelegator, &ITIPHandlerDialogDelegate::dialogClosed, this, \
&ITIPHandlerHelper::slotIncidenceCreatedDialogClosed);
askDelegator->openDialogIncidenceCreated(ITIPHandlerDialogDelegate::Attendees, \
question, mDefaultAction); }
@@ -296,8 +294,7 @@ void \
ITIPHandlerHelper::sendIncidenceModifiedMessage(KCalCore::iTIPMethod method {
ITIPHandlerDialogDelegate *askDelegator = \
m_factory->createITIPHanderDialogDelegate(incidence, method, mParent);
- connect(askDelegator, \
SIGNAL(dialogClosed(int,KCalCore::iTIPMethod,KCalCore::Incidence::Ptr)),
- SLOT(slotIncidenceModifiedDialogClosed(int,KCalCore::iTIPMethod,KCalCore::Incidence::Ptr)));
+ connect(askDelegator, &ITIPHandlerDialogDelegate::dialogClosed, this, \
&ITIPHandlerHelper::slotIncidenceModifiedDialogClosed);
// For a modified incidence, either we are the organizer or someone else.
if (weAreOrganizerOf(incidence)) {
if (weNeedToSendMailFor(incidence)) {
@@ -360,8 +357,7 @@ void \
ITIPHandlerHelper::sendIncidenceDeletedMessage(KCalCore::iTIPMethod method,
ITIPHandlerDialogDelegate *askDelegator = \
m_factory->createITIPHanderDialogDelegate(incidence, method, mParent);
- connect(askDelegator, \
SIGNAL(dialogClosed(int,KCalCore::iTIPMethod,KCalCore::Incidence::Ptr)),
- SLOT(slotIncidenceDeletedDialogClosed(int,KCalCore::iTIPMethod,KCalCore::Incidence::Ptr)));
+ connect(askDelegator, &ITIPHandlerDialogDelegate::dialogClosed, this, \
&ITIPHandlerHelper::slotIncidenceDeletedDialogClosed);
// For a modified incidence, either we are the organizer or someone else.
if (weAreOrganizerOf(incidence)) {
@@ -481,8 +477,7 @@ void \
ITIPHandlerHelper::onSchedulerFinished(Akonadi::Scheduler::Result result,
ITIPHandlerDialogDelegate *askDelegator = \
m_factory->createITIPHanderDialogDelegate(KCalCore::Incidence::Ptr(), \
KCalCore::iTIPNoMethod, mParent);
- connect(askDelegator, \
SIGNAL(dialogClosed(int,KCalCore::iTIPMethod,KCalCore::Incidence::Ptr)),
- \
SLOT(slotSchedulerFinishDialog(int,KCalCore::iTIPMethod,KCalCore::Incidence::Ptr))); \
+ connect(askDelegator, &ITIPHandlerDialogDelegate::dialogClosed, this, \
&ITIPHandlerHelper::slotSchedulerFinishDialog);
askDelegator->openDialogSchedulerFinished(question, \
ITIPHandlerDialogDelegate::ActionAsk,
KGuiItem(i18nc("@action:button \
dialog positive answer to abort question","Abort Update"))); return;
diff --git a/akonadi-calendar/src/mailscheduler_p.cpp \
b/akonadi-calendar/src/mailscheduler_p.cpp index fc22b7e..86ba795 100644
--- a/akonadi-calendar/src/mailscheduler_p.cpp
+++ b/akonadi-calendar/src/mailscheduler_p.cpp
@@ -50,8 +50,7 @@ MailScheduler::MailScheduler(ITIPHandlerComponentFactory *factory, \
QObject *pare d->m_identityManager = new IdentityManager(/*ro=*/true, this);
d->m_mailer = new MailClient(factory, parent);
- connect(d->m_mailer, SIGNAL(finished(Akonadi::MailClient::Result,QString)),
- SLOT(onMailerFinished(Akonadi::MailClient::Result,QString)));
+ connect(d->m_mailer, &MailClient::finished, this, \
&MailScheduler::onMailerFinished); }
MailScheduler::~MailScheduler()
diff --git a/akonadi-contact/src/contactgroupeditordialog.cpp \
b/akonadi-contact/src/contactgroupeditordialog.cpp index 41bc24a..f2be67b 100644
--- a/akonadi-contact/src/contactgroupeditordialog.cpp
+++ b/akonadi-contact/src/contactgroupeditordialog.cpp
@@ -120,8 +120,7 @@ ContactGroupEditorDialog::ContactGroupEditorDialog( Mode mode, \
QWidget *parent ) layout->addWidget( d->mEditor, 1, 0, 1, 2 );
layout->setColumnStretch( 1, 1 );
- connect( d->mEditor, SIGNAL(contactGroupStored(Akonadi::Item)),
- this, SIGNAL(contactGroupStored(Akonadi::Item)) );
+ connect(d->mEditor, &ContactGroupEditor::contactGroupStored, this, \
&ContactGroupEditorDialog::contactGroupStored); connect( \
d->mEditor->d->mGui.groupName, SIGNAL(textChanged(QString)), this, \
SLOT(slotGroupNameChanged(QString)) );
diff --git a/akonadi-contact/src/contactgrouplineedit.cpp \
b/akonadi-contact/src/contactgrouplineedit.cpp index 73f1399..9a47784 100644
--- a/akonadi-contact/src/contactgrouplineedit.cpp
+++ b/akonadi-contact/src/contactgrouplineedit.cpp
@@ -45,8 +45,7 @@ void ContactGroupLineEdit::setCompletionModel( QAbstractItemModel \
*model ) {
mCompleter = new QCompleter( model, this );
mCompleter->setCompletionColumn( \
Akonadi::ContactCompletionModel::NameAndEmailColumn );
- connect( mCompleter, SIGNAL(activated(QModelIndex)),
- this, SLOT(autoCompleted(QModelIndex)) );
+ connect(mCompleter, static_cast<void (QCompleter::*)(const QModelIndex \
&)>(&QCompleter::activated), this, &ContactGroupLineEdit::autoCompleted);
setCompleter( mCompleter );
}
diff --git a/akonadi-contact/src/editor/emaileditwidget.cpp \
b/akonadi-contact/src/editor/emaileditwidget.cpp index db31ea5..47a455c 100644
--- a/akonadi-contact/src/editor/emaileditwidget.cpp
+++ b/akonadi-contact/src/editor/emaileditwidget.cpp
@@ -107,8 +107,7 @@ EmailEditWidget::EmailEditWidget(QWidget *parent)
mEmailEdit = new QLineEdit;
new EmailAddressExtracter(mEmailEdit);
- connect(mEmailEdit, SIGNAL(textChanged(QString)),
- SLOT(textChanged(QString)));
+ connect(mEmailEdit, &QLineEdit::textChanged, this, \
&EmailEditWidget::textChanged); layout->addWidget(mEmailEdit);
mEditButton = new QToolButton;
@@ -203,10 +202,8 @@ EmailEditDialog::EmailEditDialog(const QStringList &list, \
QWidget *parent)
// Make sure there is room for the scrollbar
mEmailListBox->setMinimumHeight(mEmailListBox->sizeHint().height() + 30);
- connect(mEmailListBox, \
SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
- SLOT(selectionChanged()));
- connect(mEmailListBox, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
- SLOT(edit()));
+ connect(mEmailListBox, &QListWidget::currentItemChanged, this, \
&EmailEditDialog::selectionChanged); + connect(mEmailListBox, \
&QListWidget::itemDoubleClicked, this, &EmailEditDialog::edit); \
topLayout->addWidget(mEmailListBox, 0, 0, 5, 2);
mAddButton = new QPushButton(i18n("Add..."), page);
diff --git a/akonadi-contact/src/editor/im/imeditordialog.cpp \
b/akonadi-contact/src/editor/im/imeditordialog.cpp index 1a5dcaf..23f5775 100644
--- a/akonadi-contact/src/editor/im/imeditordialog.cpp
+++ b/akonadi-contact/src/editor/im/imeditordialog.cpp
@@ -75,8 +75,7 @@ IMEditorDialog::IMEditorDialog(QWidget *parent)
connect(mView->selectionModel(), \
SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(slotUpdateButtons()));
- connect(mView, SIGNAL(doubleClicked(QModelIndex)),
- this, SLOT(slotEdit()));
+ connect(mView, &QTreeView::doubleClicked, this, &IMEditorDialog::slotEdit);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel); QPushButton *okButton = \
buttonBox->button(QDialogButtonBox::Ok); okButton->setDefault(true);
diff --git a/akonadi-contact/src/editor/kdatepickerpopup.cpp \
b/akonadi-contact/src/editor/kdatepickerpopup.cpp index 43a80e6..0b89592 100644
--- a/akonadi-contact/src/editor/kdatepickerpopup.cpp
+++ b/akonadi-contact/src/editor/kdatepickerpopup.cpp
@@ -66,10 +66,8 @@ KDatePickerPopup::KDatePickerPopup(Items items, const QDate &date, \
QWidget *pare mDatePicker = new KDatePicker(this);
mDatePicker->setCloseButton(false);
- connect(mDatePicker, SIGNAL(dateEntered(QDate)),
- SLOT(slotDateChanged(QDate)));
- connect(mDatePicker, SIGNAL(dateSelected(QDate)),
- SLOT(slotDateChanged(QDate)));
+ connect(mDatePicker, &KDatePicker::dateEntered, this, \
&KDatePickerPopup::slotDateChanged); + connect(mDatePicker, \
&KDatePicker::dateSelected, this, &KDatePickerPopup::slotDateChanged);
mDatePicker->setDate(date);
diff --git a/akonadi/src/core/asyncselectionhandler.cpp \
b/akonadi/src/core/asyncselectionhandler.cpp index 00bc441..f3e7fbc 100644
--- a/akonadi/src/core/asyncselectionhandler.cpp
+++ b/akonadi/src/core/asyncselectionhandler.cpp
@@ -28,8 +28,7 @@ AsyncSelectionHandler::AsyncSelectionHandler(QAbstractItemModel \
*model, QObject {
Q_ASSERT(mModel);
- connect(mModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
- this, SLOT(rowsInserted(QModelIndex,int,int)));
+ connect(mModel, &QAbstractItemModel::rowsInserted, this, \
&AsyncSelectionHandler::rowsInserted); }
AsyncSelectionHandler::~AsyncSelectionHandler()
diff --git a/akonadi/src/core/jobs/collectionattributessynchronizationjob.cpp \
b/akonadi/src/core/jobs/collectionattributessynchronizationjob.cpp index \
7c2907c..fdcb0f7 100644
--- a/akonadi/src/core/jobs/collectionattributessynchronizationjob.cpp
+++ b/akonadi/src/core/jobs/collectionattributessynchronizationjob.cpp
@@ -102,8 +102,7 @@ void CollectionAttributesSynchronizationJobPrivate::doStart()
QString::fromLatin1("/"),
\
QString::fromLatin1("org.freedesktop.Akonadi.Resource"),
DBusConnectionPool::threadConnection(), this);
- connect(interface, SIGNAL(attributesSynchronized(qlonglong)),
- q, SLOT(slotSynchronized(qlonglong)));
+ connect(interface, SIGNAL(attributesSynchronized(qlonglong)), q, \
SLOT(slotSynchronized(qlonglong)));
if (interface->isValid()) {
const QDBusMessage reply = \
interface->call(QString::fromUtf8("synchronizeCollectionAttributes"), \
collection.id()); @@ -124,8 +123,7 @@ void \
CollectionAttributesSynchronizationJobPrivate::doStart() void \
CollectionAttributesSynchronizationJobPrivate::slotSynchronized(qlonglong id) {
if (id == collection.id()) {
- q->disconnect(interface, SIGNAL(attributesSynchronized(qlonglong)),
- q, SLOT(slotSynchronized(qlonglong)));
+ q->disconnect(interface, SIGNAL(attributesSynchronized(qlonglong)), q, \
SLOT(slotSynchronized(qlonglong))); safetyTimer->stop();
q->emitResult();
}
diff --git a/akonadi/src/core/jobs/kjobprivatebase.cpp \
b/akonadi/src/core/jobs/kjobprivatebase.cpp index 846422f..7fa8102 100644
--- a/akonadi/src/core/jobs/kjobprivatebase.cpp
+++ b/akonadi/src/core/jobs/kjobprivatebase.cpp
@@ -30,8 +30,7 @@ void KJobPrivateBase::start()
return;
}
- connect(ServerManager::self(), \
SIGNAL(stateChanged(Akonadi::ServerManager::State)),
- this, SLOT(serverStateChanged(Akonadi::ServerManager::State)));
+ connect(ServerManager::self(), &ServerManager::stateChanged, this, \
&KJobPrivateBase::serverStateChanged);
if (serverState == ServerManager::NotRunning) {
ServerManager::start();
@@ -41,8 +40,7 @@ void KJobPrivateBase::start()
void KJobPrivateBase::serverStateChanged(Akonadi::ServerManager::State state)
{
if (state == ServerManager::Running) {
- disconnect(ServerManager::self(), \
SIGNAL(stateChanged(Akonadi::ServerManager::State)),
- this, SLOT(serverStateChanged(Akonadi::ServerManager::State)));
+ disconnect(ServerManager::self(), &ServerManager::stateChanged, this, \
&KJobPrivateBase::serverStateChanged); doStart();
}
}
diff --git a/akonadi/src/core/jobs/specialcollectionshelperjobs.cpp \
b/akonadi/src/core/jobs/specialcollectionshelperjobs.cpp index eea2a8c..a76b968 \
100644
--- a/akonadi/src/core/jobs/specialcollectionshelperjobs.cpp
+++ b/akonadi/src/core/jobs/specialcollectionshelperjobs.cpp
@@ -586,8 +586,7 @@ void GetLockJob::Private::doStart()
QDBusServiceWatcher *watcher = new QDBusServiceWatcher(dbusServiceName(), \
DBusConnectionPool::threadConnection(),
\
QDBusServiceWatcher::WatchForOwnerChange, q); //qDebug() << "Waiting for lock.";
- connect(watcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
- q, SLOT(serviceOwnerChanged(QString,QString,QString)));
+ connect(watcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)), q, \
SLOT(serviceOwnerChanged(QString,QString,QString)));
mSafetyTimer = new QTimer(q);
mSafetyTimer->setSingleShot(true);
diff --git a/akonadi/src/core/models/statisticsproxymodel.cpp \
b/akonadi/src/core/models/statisticsproxymodel.cpp index 5e0018a..1f0d3a9 100644
--- a/akonadi/src/core/models/statisticsproxymodel.cpp
+++ b/akonadi/src/core/models/statisticsproxymodel.cpp
@@ -213,8 +213,7 @@ void StatisticsProxyModel::Private::proxyDataChanged(const \
QModelIndex& topLeft, int parentColumnCount = mParent->columnCount( parent );
QModelIndex extraTopLeft = mParent->index( topLeft.row(), parentColumnCount \
- 1 - 3, parent );
QModelIndex extraBottomRight = mParent->index( bottomRight.row(), \
parentColumnCount -1, parent );
- mParent->disconnect( mParent, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
- mParent, \
SLOT(proxyDataChanged(QModelIndex,QModelIndex)) ); + mParent->disconnect( \
mParent, SIGNAL(dataChanged(QModelIndex,QModelIndex)), mParent, \
SLOT(proxyDataChanged(QModelIndex,QModelIndex)) ); emit mParent->dataChanged( \
extraTopLeft, extraBottomRight );
// We get this signal when the statistics of a row changes.
diff --git a/akonadi/src/widgets/collectionrequester.cpp \
b/akonadi/src/widgets/collectionrequester.cpp index 01b9e57..c69dcc4 100644
--- a/akonadi/src/widgets/collectionrequester.cpp
+++ b/akonadi/src/widgets/collectionrequester.cpp
@@ -70,8 +70,7 @@ void CollectionRequester::Private::fetchCollection(const Collection \
&collection)
CollectionFetchJob *job = new CollectionFetchJob(collection, \
Akonadi::CollectionFetchJob::Base, q); job->setProperty("OriginalCollectionId", \
collection.id()); job->fetchScope().setAncestorRetrieval(CollectionFetchScope::All);
- connect(job, SIGNAL(finished(KJob*)),
- q, SLOT(_k_collectionReceived(KJob*)));
+ connect(job, SIGNAL(finished(KJob*)), q, SLOT(_k_collectionReceived(KJob*)));
}
void CollectionRequester::Private::_k_collectionReceived(KJob *job)
@@ -88,8 +87,7 @@ void CollectionRequester::Private::_k_collectionReceived(KJob *job)
CollectionFetchJob *namesFetch = new CollectionFetchJob(chain, \
CollectionFetchJob::Base, q);
namesFetch->setProperty("OriginalCollectionId", \
job->property("OriginalCollectionId"));
namesFetch->fetchScope().setAncestorRetrieval(CollectionFetchScope::Parent);
- connect(namesFetch, SIGNAL(finished(KJob*)),
- q, SLOT(_k_collectionsNamesReceived(KJob*)));
+ connect(namesFetch, SIGNAL(finished(KJob*)), q, \
SLOT(_k_collectionsNamesReceived(KJob*))); } else {
_k_collectionsNamesReceived(job);
}
diff --git a/akonadi/src/widgets/collectionview.cpp \
b/akonadi/src/widgets/collectionview.cpp index 86c638e..e0261f5 100644
--- a/akonadi/src/widgets/collectionview.cpp
+++ b/akonadi/src/widgets/collectionview.cpp
@@ -82,8 +82,7 @@ void CollectionView::Private::init()
dragExpandTimer.setSingleShot(true);
mParent->connect(&dragExpandTimer, SIGNAL(timeout()), SLOT(dragExpand()));
- mParent->connect(mParent, SIGNAL(clicked(QModelIndex)),
- mParent, SLOT(itemClicked(QModelIndex)));
+ mParent->connect(mParent, SIGNAL(clicked(QModelIndex)), mParent, \
SLOT(itemClicked(QModelIndex)));
Control::widgetNeedsAkonadi(mParent);
}
diff --git a/akonadi/src/widgets/entitylistview.cpp \
b/akonadi/src/widgets/entitylistview.cpp index 5222fd8..68f0894 100644
--- a/akonadi/src/widgets/entitylistview.cpp
+++ b/akonadi/src/widgets/entitylistview.cpp
@@ -75,10 +75,8 @@ void EntityListView::Private::init()
mParent->setDragDropMode(DragDrop);
mParent->setDragEnabled(true);
#endif
- mParent->connect(mParent, SIGNAL(clicked(QModelIndex)),
- mParent, SLOT(itemClicked(QModelIndex)));
- mParent->connect(mParent, SIGNAL(doubleClicked(QModelIndex)),
- mParent, SLOT(itemDoubleClicked(QModelIndex)));
+ mParent->connect(mParent, SIGNAL(clicked(QModelIndex)), mParent, \
SLOT(itemClicked(QModelIndex))); + mParent->connect(mParent, \
SIGNAL(doubleClicked(QModelIndex)), mParent, SLOT(itemDoubleClicked(QModelIndex)));
DelegateAnimator *animator = new DelegateAnimator(mParent);
ProgressSpinnerDelegate *customDelegate = new ProgressSpinnerDelegate(animator, \
mParent);
diff --git a/akonadi/src/widgets/entitytreeview.cpp \
b/akonadi/src/widgets/entitytreeview.cpp index 8022b79..4fbd7e0 100644
--- a/akonadi/src/widgets/entitytreeview.cpp
+++ b/akonadi/src/widgets/entitytreeview.cpp
@@ -99,10 +99,8 @@ void EntityTreeView::Private::init()
mParent->setDragEnabled(true);
#endif
- mParent->connect(mParent, SIGNAL(clicked(QModelIndex)),
- mParent, SLOT(itemClicked(QModelIndex)));
- mParent->connect(mParent, SIGNAL(doubleClicked(QModelIndex)),
- mParent, SLOT(itemDoubleClicked(QModelIndex)));
+ mParent->connect(mParent, SIGNAL(clicked(QModelIndex)), mParent, \
SLOT(itemClicked(QModelIndex))); + mParent->connect(mParent, \
SIGNAL(doubleClicked(QModelIndex)), mParent, SLOT(itemDoubleClicked(QModelIndex)));
Control::widgetNeedsAkonadi(mParent);
}
diff --git a/akonadi/src/widgets/erroroverlay.cpp \
b/akonadi/src/widgets/erroroverlay.cpp index d973720..0d0c1c0 100644
--- a/akonadi/src/widgets/erroroverlay.cpp
+++ b/akonadi/src/widgets/erroroverlay.cpp
@@ -113,8 +113,7 @@ ErrorOverlay::ErrorOverlay(QWidget *baseWidget, QWidget *parent)
mOverlayActive = (state == ServerManager::Running);
serverStateChanged(state);
- connect(ServerManager::self(), \
SIGNAL(stateChanged(Akonadi::ServerManager::State)),
- SLOT(serverStateChanged(Akonadi::ServerManager::State)));
+ connect(ServerManager::self(), &ServerManager::stateChanged, this, \
&ErrorOverlay::serverStateChanged);
QPalette p = palette();
p.setColor(backgroundRole(), QColor(0, 0, 0, 128));
diff --git a/akonadi/src/widgets/itemview.cpp b/akonadi/src/widgets/itemview.cpp
index 7b72df3..5ac7668 100644
--- a/akonadi/src/widgets/itemview.cpp
+++ b/akonadi/src/widgets/itemview.cpp
@@ -64,12 +64,9 @@ void ItemView::Private::init()
mParent->header()->setClickable(true);
mParent->header()->setStretchLastSection(true);
- mParent->connect(mParent, SIGNAL(activated(QModelIndex)),
- mParent, SLOT(itemActivated(QModelIndex)));
- mParent->connect(mParent, SIGNAL(clicked(QModelIndex)),
- mParent, SLOT(itemClicked(QModelIndex)));
- mParent->connect(mParent, SIGNAL(doubleClicked(QModelIndex)),
- mParent, SLOT(itemDoubleClicked(QModelIndex)));
+ mParent->connect(mParent, SIGNAL(activated(QModelIndex)), mParent, \
SLOT(itemActivated(QModelIndex))); + mParent->connect(mParent, \
SIGNAL(clicked(QModelIndex)), mParent, SLOT(itemClicked(QModelIndex))); + \
mParent->connect(mParent, SIGNAL(doubleClicked(QModelIndex)), mParent, \
SLOT(itemDoubleClicked(QModelIndex)));
Control::widgetNeedsAkonadi(mParent);
}
diff --git a/akonadi/src/widgets/renamefavoritedialog.cpp \
b/akonadi/src/widgets/renamefavoritedialog.cpp index 27bc0cf..bf01506 100644
--- a/akonadi/src/widgets/renamefavoritedialog.cpp
+++ b/akonadi/src/widgets/renamefavoritedialog.cpp
@@ -53,8 +53,7 @@ RenameFavoriteDialog::RenameFavoriteDialog(const QString &caption, \
const QString
layout->addStretch();
- connect(m_lineEdit, SIGNAL(textChanged(QString)),
- SLOT(slotEditTextChanged(QString)));
+ connect(m_lineEdit, &QLineEdit::textChanged, this, \
&RenameFavoriteDialog::slotEditTextChanged);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | \
QDialogButtonBox::Cancel); mOkButton = buttonBox->button(QDialogButtonBox::Ok);
diff --git a/kidentitymanagement/src/signatureconfigurator.cpp \
b/kidentitymanagement/src/signatureconfigurator.cpp index bc039e2..d73695d 100644
--- a/kidentitymanagement/src/signatureconfigurator.cpp
+++ b/kidentitymanagement/src/signatureconfigurator.cpp
@@ -148,22 +148,18 @@ void SignatureConfigurator::Private::init()
QStackedWidget *widgetStack = new QStackedWidget(q);
widgetStack->setEnabled(false); // since !mEnableCheck->isChecked()
vlay->addWidget(widgetStack, 1);
- q->connect(mSourceCombo, SIGNAL(currentIndexChanged(int)),
- widgetStack, SLOT(setCurrentIndex(int)));
- q->connect(mSourceCombo, SIGNAL(highlighted(int)),
- widgetStack, SLOT(setCurrentIndex(int)));
+ q->connect(mSourceCombo, static_cast<void \
(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), widgetStack, \
&QStackedWidget::setCurrentIndex); + q->connect(mSourceCombo, static_cast<void \
(KComboBox::*)(int)>(&KComboBox::highlighted), widgetStack, \
&QStackedWidget::setCurrentIndex); // connects for the enabling of the widgets \
depending on // signatureEnabled:
- q->connect(mEnableCheck, SIGNAL(toggled(bool)),
- mSourceCombo, SLOT(setEnabled(bool)));
- q->connect(mEnableCheck, SIGNAL(toggled(bool)),
- widgetStack, SLOT(setEnabled(bool)));
- q->connect(mEnableCheck, SIGNAL(toggled(bool)),
- label, SLOT(setEnabled(bool)));
+ q->connect(mEnableCheck, &QCheckBox::toggled, mSourceCombo, \
&KComboBox::setEnabled); + q->connect(mEnableCheck, &QCheckBox::toggled, \
widgetStack, &QStackedWidget::setEnabled); + q->connect(mEnableCheck, \
&QCheckBox::toggled, label, &QLabel::setEnabled); // The focus might be still in the \
widget that is disabled q->connect(mEnableCheck, SIGNAL(clicked()),
mEnableCheck, SLOT(setFocus()));
+
int pageno = 0;
// page 0: input field for direct entering:
page = new QWidget(widgetStack);
@@ -234,8 +230,7 @@ void SignatureConfigurator::Private::init()
hlay = new QHBoxLayout(); // inherits spacing
page_vlay->addLayout(hlay);
mHtmlCheck = new QCheckBox(i18n("&Use HTML"), page);
- q->connect(mHtmlCheck, SIGNAL(clicked()),
- q, SLOT(slotSetHtml()));
+ q->connect(mHtmlCheck, &QCheckBox::clicked, q, \
&SignatureConfigurator::slotSetHtml); hlay->addWidget(mHtmlCheck);
inlinedHtml = true;
@@ -259,12 +254,10 @@ void SignatureConfigurator::Private::init()
hlay->addWidget(label);
hlay->addWidget(mFileRequester, 1);
mFileRequester->button()->setAutoDefault(false);
- q->connect(mFileRequester, SIGNAL(textChanged(QString)),
- q, SLOT(slotEnableEditButton(QString)));
+ q->connect(mFileRequester, &KUrlRequester::textChanged, q, \
&SignatureConfigurator::slotEnableEditButton); mEditButton = new \
QPushButton(i18n("Edit &File"), page);
mEditButton->setWhatsThis(i18n("Opens the specified file in a text editor."));
- q->connect(mEditButton, SIGNAL(clicked()),
- q, SLOT(slotEdit()));
+ q->connect(mEditButton, &QPushButton::clicked, q, \
&SignatureConfigurator::slotEdit); mEditButton->setAutoDefault(false);
mEditButton->setEnabled(false); // initially nothing to edit
hlay->addWidget(mEditButton);
diff --git a/kpimtextedit/src/textedit.cpp b/kpimtextedit/src/textedit.cpp
index 0461878..c127f35 100644
--- a/kpimtextedit/src/textedit.cpp
+++ b/kpimtextedit/src/textedit.cpp
@@ -215,8 +215,7 @@ bool TextEdit::eventFilter(QObject *o, QEvent *e)
void TextEditPrivate::init()
{
- q->connect(q, SIGNAL(textModeChanged(KRichTextEdit::Mode)),
- q, SLOT(_k_slotTextModeChanged(KRichTextEdit::Mode)));
+ q->connect(q, SIGNAL(textModeChanged(KRichTextEdit::Mode)), q, \
SLOT(_k_slotTextModeChanged(KRichTextEdit::Mode)));
// We tell the KRichTextWidget to enable spell checking, because only then it \
will
// call createHighlighter() which will create our own highlighter which also
diff --git a/syndication/src/syndication/dataretriever.cpp \
b/syndication/src/syndication/dataretriever.cpp index 42feb31..18ebb6e 100644
--- a/syndication/src/syndication/dataretriever.cpp
+++ b/syndication/src/syndication/dataretriever.cpp
@@ -94,11 +94,9 @@ void FileRetriever::retrieveData(const QUrl &url)
QTimer::singleShot(1000 * 90, this, SLOT(slotTimeout()));
- connect(d->job, SIGNAL(data(KIO::Job*,QByteArray)),
- SLOT(slotData(KIO::Job*,QByteArray)));
+ connect(d->job, &KIO::TransferJob::data, this, &FileRetriever::slotData);
connect(d->job, &KIO::TransferJob::result, this, &FileRetriever::slotResult);
- connect(d->job, SIGNAL(permanentRedirection(KIO::Job*,QUrl,QUrl)),
- SLOT(slotPermanentRedirection(KIO::Job*,QUrl,QUrl)));
+ connect(d->job, &KIO::TransferJob::permanentRedirection, this, \
&FileRetriever::slotPermanentRedirection); }
void FileRetriever::slotTimeout()
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic