Port to new connect api

blogilo/src/backend.cpp

@@ -33,6 +33,7 @@
 #include <kblog/movabletype.h>
 #include <kblog/wordpressbuggy.h>
 #include <kblog/blogmedia.h>
+#include <kblog/blogcomment.h>
 #include "blogger.h"
 #include "blogilo_debug.h"
 #include <KLocalizedString>
@@ -71,9 +72,7 @@ Backend::Backend(int blog_id, QObject *parent)
 
     connect(d->kBlog, &KBlog::Blog::error, this, &Backend::error);
     connect(d->kBlog, &KBlog::Blog::errorPost, this, &Backend::error);
-    connect(d->kBlog, SIGNAL(errorComment(KBlog::Blog::ErrorType, const QString &, KBlog::BlogPost *,
-                                          KBlog::BlogComment *)),
-            this, SLOT(error(KBlog::Blog::ErrorType,QString)));
+    connect(d->kBlog, &KBlog::Blog::errorComment, this, &Backend::error);
 
     connect(d->kBlog, &KBlog::Blog::errorMedia, this, &Backend::error);
 }

blogilo/src/configuredialog.cpp

@@ -41,10 +41,8 @@ ConfigureDialog::ConfigureDialog(PimCommon::StorageServiceManager *storageManage
 
     BlogSettings *blogSettingsDlg = new BlogSettings;
     blogSettingsDlg->setAttribute(Qt::WA_DeleteOnClose);
-    connect(blogSettingsDlg, &BlogSettings::blogAdded,
-            this, &ConfigureDialog::blogAdded);
-    connect(blogSettingsDlg, SIGNAL(blogEdited(BilboBlog)),
-            this, SIGNAL(blogEdited(BilboBlog)));
+    connect(blogSettingsDlg, &BlogSettings::blogAdded, this, &ConfigureDialog::blogAdded);
+    connect(blogSettingsDlg, &BlogSettings::blogEdited, this, &ConfigureDialog::blogEdited);
     connect(blogSettingsDlg, &BlogSettings::blogRemoved, this, &ConfigureDialog::blogRemoved);
 
     QWidget *editorSettingsDlg = new QWidget;

blogilo/src/mainwindow.cpp

@@ -121,7 +121,7 @@ MainWindow::MainWindow()
 
     setupSystemTray();
 
-    connect(tabPosts, SIGNAL(currentChanged(int)), this, SLOT(slotActivePostChanged(int)));
+    connect(tabPosts, &PostsTabWidget::currentChanged, this, &MainWindow::slotActivePostChanged);
     connect(toolbox, &Toolbox::sigEntrySelected, this, &MainWindow::slotNewPostOpened);
     connect(toolbox, &Toolbox::sigError, this, &MainWindow::slotError);
     connect(toolbox, &Toolbox::sigBusy, this, &MainWindow::slotBusy);
@@ -237,10 +237,8 @@ void MainWindow::setupActions()
     KToggleAction *actToggleToolboxVisible = new KToggleAction(i18n("Show Toolbox"), this);
     actionCollection()->addAction(QLatin1String("toggle_toolbox"), actToggleToolboxVisible);
     actionCollection()->setDefaultShortcut(actToggleToolboxVisible, QKeySequence(Qt::CTRL + Qt::Key_T));
-    connect(actToggleToolboxVisible, SIGNAL(toggled(bool)),
-            this, SLOT(slotToggleToolboxVisible(bool)));
-    connect(toolboxDock, SIGNAL(visibilityChanged(bool)),
-            this, SLOT(slotToolboxVisibilityChanged(bool)));
+    connect(actToggleToolboxVisible, &KToggleAction::toggled, this, &MainWindow::slotToggleToolboxVisible);
+    connect(toolboxDock, &QDockWidget::visibilityChanged, this, &MainWindow::slotToolboxVisibilityChanged);
 
     blogs = new KSelectAction(this);
     actionCollection()->addAction(QLatin1String("blogs_list"), blogs);
@@ -346,10 +344,8 @@ void MainWindow::optionsPreferences()
         return;
     }
     ConfigureDialog *dialog = new ConfigureDialog(mStorageManager, this, QLatin1String("settings"), Settings::self());
-    connect(dialog, SIGNAL(blogAdded(BilboBlog)),
-            this, SLOT(slotBlogAdded(BilboBlog)));
-    connect(dialog, SIGNAL(blogEdited(BilboBlog)),
-            this, SLOT(slotBlogEdited(BilboBlog)));
+    connect(dialog, &ConfigureDialog::blogAdded, this, &MainWindow::slotBlogAdded);
+    connect(dialog, &ConfigureDialog::blogEdited, this, &MainWindow::slotBlogEdited);
     connect(dialog, &ConfigureDialog::blogRemoved, this, &MainWindow::slotBlogRemoved);
     connect(dialog, &ConfigureDialog::settingsChanged, this, &MainWindow::settingsChanged);
     connect(dialog, &ConfigureDialog::settingsChanged, this, &MainWindow::slotSettingsChanged);
@@ -378,8 +374,7 @@ void MainWindow::addBlog()
     AddEditBlog *addEditBlogWindow = new AddEditBlog(-1, this);
     addEditBlogWindow->setWindowModality(Qt::ApplicationModal);
     addEditBlogWindow->setAttribute(Qt::WA_DeleteOnClose);
-    connect(addEditBlogWindow, SIGNAL(sigBlogAdded(BilboBlog)),
-            this, SLOT(slotBlogAdded(BilboBlog)));
+    connect(addEditBlogWindow, &AddEditBlog::sigBlogAdded, this, &MainWindow::slotBlogAdded);
     addEditBlogWindow->show();
 }
 
@@ -670,13 +665,10 @@ QWidget *MainWindow::createPostEntry(int blog_id, const BilboPost &post)
     temp->setCurrentPost(post);
     temp->setCurrentPostBlogId(blog_id);
 
-    connect(temp, SIGNAL(postTitleChanged(QString)),
-            this, SLOT(slotPostTitleChanged(QString)));
-    connect(temp, SIGNAL(postPublishingDone(bool,QString)),
-            this, SLOT(postManipulationDone(bool,QString)));
+    connect(temp, &PostEntry::postTitleChanged, this, &MainWindow::slotPostTitleChanged);
+    connect(temp, &PostEntry::postPublishingDone, this, &MainWindow::postManipulationDone);
     connect(this, &MainWindow::settingsChanged, temp, &PostEntry::settingsChanged);
-    connect(temp, SIGNAL(showStatusMessage(QString,bool)),
-            this, SLOT(slotShowStatusMessage(QString,bool)));
+    connect(temp, &PostEntry::showStatusMessage, this, &MainWindow::slotShowStatusMessage);
 
     connect(temp, &PostEntry::sigBusy, this, &MainWindow::slotBusy);
 

blogilo/src/toolbox.cpp

@@ -71,13 +71,11 @@ Toolbox::Toolbox(QWidget *parent)
     connect(btnEntriesUpdate, &QPushButton::clicked, this, &Toolbox::slotUpdateEntries);
     connect(btnEntriesClear, &QPushButton::clicked, this, &Toolbox::clearEntries);
 
-    connect(lstEntriesList, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
-            this, SLOT(slotEntrySelected(QListWidgetItem*)));
+    connect(lstEntriesList, &QListWidget::itemDoubleClicked, this, &Toolbox::slotEntrySelected);
     connect(btnEntriesRemove, &QPushButton::clicked, this, &Toolbox::slotRemoveSelectedEntryFromServer);
 
     connect(btnOptionsNow, &QPushButton::clicked, this, &Toolbox::setDateTimeNow);
-    connect(localEntries, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),
-            this, SLOT(slotLocalEntrySelected(QTreeWidgetItem*,int)));
+    connect(localEntries, &QTreeWidget::itemDoubleClicked, this, &Toolbox::slotLocalEntrySelected);
     connect(btnLocalRemove, &QPushButton::clicked, this, &Toolbox::slotRemoveLocalEntry);
 
     lblOptionsTrackBack->setVisible(false);
@@ -85,8 +83,7 @@ Toolbox::Toolbox(QWidget *parent)
     btnCatAdd->setVisible(false);
 
     lstEntriesList->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(lstEntriesList, SIGNAL(customContextMenuRequested(QPoint)),
-            this, SLOT(requestEntriesListContextMenu(QPoint)));
+    connect(lstEntriesList, &QListWidget::customContextMenuRequested, this, &Toolbox::requestEntriesListContextMenu);
 
     QTimer::singleShot(1000, this, SLOT(reloadLocalPosts()));
 }

calendarsupport/collectionselection.cpp

@@ -41,8 +41,7 @@ public:
 CollectionSelection::CollectionSelection(QItemSelectionModel *selectionModel, QObject *parent)
     : QObject(parent), d(new Private(selectionModel))
 {
-    connect(selectionModel, &QItemSelectionModel::selectionChanged,
-            this, &CollectionSelection::slotSelectionChanged);
+    connect(selectionModel, &QItemSelectionModel::selectionChanged, this, &CollectionSelection::slotSelectionChanged);
 }
 
 CollectionSelection::~CollectionSelection()

calendarsupport/printing/calprinter.cpp

@@ -184,8 +184,8 @@ CalPrintDialog::CalPrintDialog(int initialPrintType, PrintPlugin::List plugins,
     mOkButton = buttonBox->button(QDialogButtonBox::Ok);
     mOkButton->setDefault(true);
     mOkButton->setShortcut(Qt::CTRL | Qt::Key_Return);
-    connect(buttonBox, SIGNAL(accepted()), this, SLOT(slotOk()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &CalPrintDialog::slotOk);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &CalPrintDialog::reject);
     mainLayout->addWidget(buttonBox);
     setModal(true);
     QWidget *page = new QWidget(this);

calendarviews/agenda/agendaview.cpp

@@ -789,14 +789,11 @@ void AgendaView::init(const QDate &start, const QDate &end)
     timeLabelsZoneLayout->addSpacing(scrollArea->frameWidth());
 
     // Scrolling
-    connect(d->mAgenda, SIGNAL(zoomView(int,QPoint,Qt::Orientation)),
-            SLOT(zoomView(int,QPoint,Qt::Orientation)));
+    connect(d->mAgenda, &Agenda::zoomView, this, &AgendaView::zoomView);
 
     // Event indicator updates
-    connect(d->mAgenda, SIGNAL(lowerYChanged(int)),
-            SLOT(updateEventIndicatorTop(int)));
-    connect(d->mAgenda, SIGNAL(upperYChanged(int)),
-            SLOT(updateEventIndicatorBottom(int)));
+    connect(d->mAgenda, &Agenda::lowerYChanged, this, &AgendaView::updateEventIndicatorTop);
+    connect(d->mAgenda, &Agenda::upperYChanged, this, &AgendaView::updateEventIndicatorBottom);
 
     if (d->mIsSideBySide) {
         d->mTimeLabelsZone->hide();
@@ -829,13 +826,9 @@ void AgendaView::init(const QDate &start, const QDate &end)
 
     /* Connect the agendas */
 
-    connect(d->mAllDayAgenda,
-            SIGNAL(newTimeSpanSignal(QPoint,QPoint)),
-            SLOT(newTimeSpanSelectedAllDay(QPoint,QPoint)));
+    connect(d->mAllDayAgenda, &Agenda::newTimeSpanSignal, this, &AgendaView::newTimeSpanSelectedAllDay);
 
-    connect(d->mAgenda,
-            SIGNAL(newTimeSpanSignal(QPoint,QPoint)),
-            SLOT(newTimeSpanSelected(QPoint,QPoint)));
+    connect(d->mAgenda, &Agenda::newTimeSpanSignal, this, &AgendaView::newTimeSpanSelected);
 
     connectAgenda(d->mAgenda, d->mAllDayAgenda);
     connectAgenda(d->mAllDayAgenda, d->mAgenda);

calendarviews/agenda/timelabels.cpp

@@ -164,12 +164,10 @@ void TimeLabels::setAgenda(Agenda *agenda)
     mAgenda = agenda;
 
     if (mAgenda) {
-        connect(mAgenda, SIGNAL(mousePosSignal(QPoint)),
-                SLOT(mousePosChanged(QPoint)));
+        connect(mAgenda, &Agenda::mousePosSignal, this, &TimeLabels::mousePosChanged);
         connect(mAgenda, &Agenda::enterAgenda, this, &TimeLabels::showMousePos);
         connect(mAgenda, &Agenda::leaveAgenda, this, &TimeLabels::hideMousePos);
-        connect(mAgenda, SIGNAL(gridSpacingYChanged(double)),
-                SLOT(setCellHeight(double)));
+        connect(mAgenda, &Agenda::gridSpacingYChanged, this, &TimeLabels::setCellHeight);
     }
 }
 

calendarviews/todo/todoviewquicksearch.cpp

@@ -59,8 +59,7 @@ TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &calend
               "Enter text here to filter the to-dos that are shown by matching summaries."));
     mSearchLine->setPlaceholderText(i18nc("@label in QuickSearchLine", "Search Summaries"));
     mSearchLine->setClearButtonEnabled(true);
-    connect(mSearchLine, SIGNAL(textChanged(QString)),
-            this, SIGNAL(searchTextChanged(QString)));
+    connect(mSearchLine, &QLineEdit::textChanged, this, &TodoViewQuickSearch::searchTextChanged);
 
     layout->addWidget(mSearchLine, 3);
 
@@ -75,8 +74,7 @@ TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &calend
     mCategoryCombo->setDefaultText(defaultText);
     mCategoryCombo->setSeparator(i18nc("@item:intext delimiter for joining category names", ","));
 
-    connect(mCategoryCombo, SIGNAL(checkedItemsChanged(QStringList)),
-            SLOT(emitFilterCategoryChanged()));
+    connect(mCategoryCombo, &KPIM::TagSelectionCombo::checkedItemsChanged, this, &TodoViewQuickSearch::emitFilterCategoryChanged);
 
     layout->addWidget(mCategoryCombo, 1);
 
@@ -104,8 +102,7 @@ TodoViewQuickSearch::TodoViewQuickSearch(const Akonadi::ETMCalendar::Ptr &calend
               "Use this combobox to filter the to-dos that are shown by "
               "a list of selected priorities."));
     mPriorityCombo->setDefaultText(i18nc("@item:inlistbox", "Select Priority"));
-    connect(mPriorityCombo, SIGNAL(checkedItemsChanged(QStringList)),
-            SLOT(emitFilterPriorityChanged()));
+    connect(mPriorityCombo, &KPIM::KCheckComboBox::checkedItemsChanged, this, &TodoViewQuickSearch::emitFilterPriorityChanged);
 
     layout->addWidget(mPriorityCombo, 1);
     fillPriorities();

calendarviews/todo/todoviewview.cpp

@@ -68,8 +68,7 @@ bool TodoViewView::eventFilter(QObject *watched, QEvent *event)
                 mColumnActions << tmp;
             }
 
-            connect(mHeaderPopup, SIGNAL(triggered(QAction*)),
-                    this, SLOT(toggleColumnHidden(QAction*)));
+            connect(mHeaderPopup, &QMenu::triggered, this, &TodoViewView::toggleColumnHidden);
         }
 
         foreach (QAction *action, mColumnActions) {

kmail/configuredialog/configureaccountpage.cpp

@@ -63,8 +63,7 @@ AccountsPage::AccountsPage(QWidget *parent)
     //
     mReceivingTab = new ReceivingTab();
     addTab(mReceivingTab, i18nc("@title:tab Tab page where the user configures accounts to receive mail", "Receiving"));
-    connect(mReceivingTab, SIGNAL(accountListChanged(QStringList)),
-            this, SIGNAL(accountListChanged(QStringList)));
+    connect(mReceivingTab, &ReceivingTab::accountListChanged, this, &AccountsPage::accountListChanged);
 
     //
     // "Sending" tab:
@@ -105,13 +104,11 @@ AccountsPageSendingTab::AccountsPageSendingTab(QWidget *parent)
     // "confirm before send" check box:
     mConfirmSendCheck = new QCheckBox(i18n("Confirm &before send"), group);
     glay->addWidget(mConfirmSendCheck, 0, 0, 1, 2);
-    connect(mConfirmSendCheck, SIGNAL(stateChanged(int)),
-            this, SLOT(slotEmitChanged()));
+    connect(mConfirmSendCheck, &QCheckBox::stateChanged, this, &AccountsPageSendingTab::slotEmitChanged);
 
     mCheckSpellingBeforeSending = new QCheckBox(i18n("Check spelling before sending"), group);
     glay->addWidget(mCheckSpellingBeforeSending, 1, 0, 1, 2);
-    connect(mCheckSpellingBeforeSending, SIGNAL(stateChanged(int)),
-            this, SLOT(slotEmitChanged()));
+    connect(mCheckSpellingBeforeSending, &QCheckBox::stateChanged, this, &AccountsPageSendingTab::slotEmitChanged);
 
     // "send on check" combo:
     mSendOnCheckCombo = new KComboBox(group);
@@ -121,8 +118,7 @@ AccountsPageSendingTab::AccountsPageSendingTab(QWidget *parent)
                                 << i18n("On Manual Mail Checks")
                                 << i18n("On All Mail Checks"));
     glay->addWidget(mSendOnCheckCombo, 2, 1);
-    connect(mSendOnCheckCombo, SIGNAL(activated(int)),
-            this, SLOT(slotEmitChanged()));
+    connect(mSendOnCheckCombo, static_cast<void (KComboBox::*)(int)>(&KComboBox::activated), this, &AccountsPageSendingTab::slotEmitChanged);
 
     // "default send method" combo:
     mSendMethodCombo = new KComboBox(group);
@@ -131,8 +127,7 @@ AccountsPageSendingTab::AccountsPageSendingTab(QWidget *parent)
                                << i18n("Send Now")
                                << i18n("Send Later"));
     glay->addWidget(mSendMethodCombo, 3, 1);
-    connect(mSendMethodCombo, SIGNAL(activated(int)),
-            this, SLOT(slotEmitChanged()));
+    connect(mSendMethodCombo, static_cast<void (KComboBox::*)(int)>(&KComboBox::activated), this, &AccountsPageSendingTab::slotEmitChanged);
 
     // labels:
     QLabel *l =  new QLabel(i18n("Send &messages in outbox folder:"), group);
@@ -195,14 +190,11 @@ AccountsPageReceivingTab::AccountsPageReceivingTab(QWidget *parent)
     mAccountsReceiving.mAccountsReceiving->setItemDelegate(configDelegate);
     connect(configDelegate, &ConfigAgentDelegate::optionsClicked, this, &AccountsPageReceivingTab::slotShowMailCheckMenu);
 
-    connect(mAccountsReceiving.mBeepNewMailCheck, &QCheckBox::stateChanged,
-            this, &ConfigModuleTab::slotEmitChanged);
+    connect(mAccountsReceiving.mBeepNewMailCheck, &QCheckBox::stateChanged, this, &ConfigModuleTab::slotEmitChanged);
 
-    connect(mAccountsReceiving.mVerboseNotificationCheck, &QCheckBox::stateChanged,
-            this, &ConfigModuleTab::slotEmitChanged);
+    connect(mAccountsReceiving.mVerboseNotificationCheck, &QCheckBox::stateChanged, this, &ConfigModuleTab::slotEmitChanged);
 
-    connect(mAccountsReceiving.mOtherNewMailActionsButton, &QAbstractButton::clicked,
-            this, &AccountsPageReceivingTab::slotEditNotifications);
+    connect(mAccountsReceiving.mOtherNewMailActionsButton, &QAbstractButton::clicked, this, &AccountsPageReceivingTab::slotEditNotifications);
     connect(mAccountsReceiving.customizeAccountOrder, &QAbstractButton::clicked, this, &AccountsPageReceivingTab::slotCustomizeAccountOrder);
 }
 
@@ -259,7 +251,7 @@ void AccountsPageReceivingTab::slotShowMailCheckMenu(const QString &ident, const
         manualMailCheck->setChecked(IncludeInManualChecks);
         manualMailCheck->setData(ident);
         menu->addAction(manualMailCheck);
-        connect(manualMailCheck, SIGNAL(toggled(bool)), this, SLOT(slotIncludeInCheckChanged(bool)));
+        connect(manualMailCheck, &QAction::toggled, this, &AccountsPageReceivingTab::slotIncludeInCheckChanged);
     }
 
     if (!MailCommon::Util::isLocalCollection(ident)) {
@@ -268,7 +260,7 @@ void AccountsPageReceivingTab::slotShowMailCheckMenu(const QString &ident, const
         switchOffline->setChecked(OfflineOnShutdown);
         switchOffline->setData(ident);
         menu->addAction(switchOffline);
-        connect(switchOffline, SIGNAL(toggled(bool)), this, SLOT(slotOfflineOnShutdownChanged(bool)));
+        connect(switchOffline, &QAction::toggled, this, &AccountsPageReceivingTab::slotOfflineOnShutdownChanged);
     }
 
     QAction *checkOnStartup = new QAction(i18n("Check mail on startup"), menu);
@@ -277,7 +269,7 @@ void AccountsPageReceivingTab::slotShowMailCheckMenu(const QString &ident, const
     checkOnStartup->setData(ident);
     menu->addAction(checkOnStartup);
 
-    connect(checkOnStartup, SIGNAL(toggled(bool)), this, SLOT(slotCheckOnStatupChanged(bool)));
+    connect(checkOnStartup, &QAction::toggled, this, &AccountsPageReceivingTab::slotCheckOnStatupChanged);
 
     menu->exec(mAccountsReceiving.mAccountsReceiving->view()->mapToGlobal(pos));
     delete menu;

mailcommon/collectionpage/collectiongeneralpage.cpp

@@ -194,8 +194,7 @@ void CollectionGeneralPage::init(const Akonadi::Collection &collection)
         gl->addWidget(mContentsComboBox, row, 0, 1, 2);
         mContentsComboBox->setCurrentIndex(contentsType);
 
-        connect(mContentsComboBox, SIGNAL(activated(int)),
-                this, SLOT(slotFolderContentsSelectionChanged(int)));
+        connect(mContentsComboBox, &ContentTypeWidget::activated, this, &CollectionGeneralPage::slotFolderContentsSelectionChanged);
 
         if (mFolderCollection->isReadOnly() || mIsResourceFolder) {
             mContentsComboBox->setEnabled(false);

mailcommon/collectionpage/contenttypewidget.cpp

@@ -50,7 +50,7 @@ ContentTypeWidget::ContentTypeWidget(QWidget *parent)
     mContentsComboBox->addItem(collectionUtil.folderContentDescription(CollectionTypeUtil::ContentsTypeFreebusy));
     mContentsComboBox->addItem(collectionUtil.folderContentDescription(CollectionTypeUtil::ContentsTypeFile));
 
-    connect(mContentsComboBox, SIGNAL(activated(int)), SIGNAL(activated(int)));
+    connect(mContentsComboBox, static_cast<void (KComboBox::*)(int)>(&KComboBox::activated), this, &ContentTypeWidget::activated);
 }
 
 ContentTypeWidget::~ContentTypeWidget()

mailcommon/collectionpage/incidencesforwidget.cpp

@@ -60,7 +60,7 @@ IncidencesForWidget::IncidencesForWidget(QWidget *parent)
 
     mIncidencesForComboBox->setObjectName(QLatin1String("contentstypecombobox"));
     mIncidencesForComboBox->setWhatsThis(whatsThisForMyOwnFolders);
-    connect(mIncidencesForComboBox, SIGNAL(currentIndexChanged(int)), SIGNAL(currentIndexChanged(int)));
+    connect(mIncidencesForComboBox, static_cast<void (KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &IncidencesForWidget::currentIndexChanged);
 }
 
 IncidencesForWidget::~IncidencesForWidget()

mailcommon/filter/kmfilterlistbox.cpp

@@ -124,8 +124,7 @@ KMFilterListBox::KMFilterListBox(const QString &title, QWidget *parent)
     mListWidget->setWhatsThis(i18n(_wt_filterlist));
     mListWidget->setDragDropMode(QAbstractItemView::InternalMove);
     mListWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    connect(mListWidget->model(),
-            SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
+    connect(mListWidget->model(), SIGNAL(rowsMoved(QModelIndex,int,int,QModelIndex,int)),
             SLOT(slotRowsMoved(QModelIndex,int,int,QModelIndex,int)));
 
     KListWidgetSearchLine *mSearchListWidget = new KListWidgetSearchLine(this, mListWidget);
@@ -218,33 +217,21 @@ KMFilterListBox::KMFilterListBox(const QString &title, QWidget *parent)
     connect(shortcut, &QShortcut::activated, this, &KMFilterListBox::slotDelete);
 
     //----------- now connect everything
-    connect(mListWidget, SIGNAL(currentRowChanged(int)),
-            this, SLOT(slotSelected(int)));
-    connect(mListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
-            this, SLOT(slotRename()));
-    connect(mListWidget, SIGNAL(itemChanged(QListWidgetItem*)),
-            this, SLOT(slotFilterEnabledChanged(QListWidgetItem*)));
-
-    connect(mListWidget, SIGNAL(itemSelectionChanged()),
-            this, SLOT(slotSelectionChanged()));
-
-    connect(mBtnUp, SIGNAL(clicked()),
-            this, SLOT(slotUp()));
-    connect(mBtnDown, SIGNAL(clicked()),
-            this, SLOT(slotDown()));
-    connect(mBtnTop, SIGNAL(clicked()),
-            this, SLOT(slotTop()));
-    connect(mBtnBottom, SIGNAL(clicked()),
-            this, SLOT(slotBottom()));
-
-    connect(mBtnNew, SIGNAL(clicked()),
-            this, SLOT(slotNew()));
-    connect(mBtnCopy, SIGNAL(clicked()),
-            this, SLOT(slotCopy()));
-    connect(mBtnDelete, SIGNAL(clicked()),
-            this, SLOT(slotDelete()));
-    connect(mBtnRename, SIGNAL(clicked()),
-            this, SLOT(slotRename()));
+    connect(mListWidget, &QListWidget::currentRowChanged, this, &KMFilterListBox::slotSelected);
+    connect(mListWidget, &QListWidget::itemDoubleClicked, this, &KMFilterListBox::slotRename);
+    connect(mListWidget, &QListWidget::itemChanged, this, &KMFilterListBox::slotFilterEnabledChanged);
+
+    connect(mListWidget, &QListWidget::itemSelectionChanged, this, &KMFilterListBox::slotSelectionChanged);
+
+    connect(mBtnUp, &QPushButton::clicked, this, &KMFilterListBox::slotUp);
+    connect(mBtnDown, &QPushButton::clicked, this, &KMFilterListBox::slotDown);
+    connect(mBtnTop, &QPushButton::clicked, this, &KMFilterListBox::slotTop);
+    connect(mBtnBottom, &QPushButton::clicked, this, &KMFilterListBox::slotBottom);
+
+    connect(mBtnNew, &QPushButton::clicked, this, &KMFilterListBox::slotNew);
+    connect(mBtnCopy, &QPushButton::clicked, this, &KMFilterListBox::slotCopy);
+    connect(mBtnDelete, &QPushButton::clicked, this, &KMFilterListBox::slotDelete);
+    connect(mBtnRename, &QPushButton::clicked, this, &KMFilterListBox::slotRename);
 
     // the dialog should call loadFilterList()
     // when all signals are connected.

pimcommon/folderdialog/checkedcollectionwidget.cpp

@@ -71,8 +71,7 @@ CheckedCollectionWidget::CheckedCollectionWidget(const QString &mimetype, QWidge
     QLineEdit *searchLine = new QLineEdit(this);
     searchLine->setPlaceholderText(i18n("Search..."));
     searchLine->setClearButtonEnabled(true);
-    connect(searchLine, &QLineEdit::textChanged,
-            this, &CheckedCollectionWidget::slotSetCollectionFilter);
+    connect(searchLine, &QLineEdit::textChanged, this, &CheckedCollectionWidget::slotSetCollectionFilter);
 
     vbox->addWidget(searchLine);
 

pimcommon/folderdialog/selectmulticollectionwidget.cpp

@@ -58,8 +58,7 @@ void SelectMultiCollectionWidget::initialize(const QString &mimetype)
     connect(mCheckedCollectionWidget, &PimCommon::CheckedCollectionWidget::collectionAdded, this, &SelectMultiCollectionWidget::slotCollectionsTreeFetched);
     connect(mCheckedCollectionWidget, &PimCommon::CheckedCollectionWidget::collectionRemoved, this, &SelectMultiCollectionWidget::slotCollectionsTreeFetched);
 
-    connect(mCheckedCollectionWidget->entityTreeModel(), &Akonadi::EntityTreeModel::collectionTreeFetched,
-            this, &SelectMultiCollectionWidget::slotCollectionsTreeFetched);
+    connect(mCheckedCollectionWidget->entityTreeModel(), &Akonadi::EntityTreeModel::collectionTreeFetched, this, &SelectMultiCollectionWidget::slotCollectionsTreeFetched);
     vbox->addWidget(mCheckedCollectionWidget);
 }
 

pimcommon/storageservice/gdrive/gdrivejob.cpp

@@ -146,8 +146,7 @@ void GDriveJob::requestTokenAccess()
         mAccount,
         mClientId,
         mClientSecret);
-    connect(authJob, SIGNAL(finished(KGAPI2::Job*)),
-            this, SLOT(slotAuthJobFinished(KGAPI2::Job*)));
+    connect(authJob, &KGAPI2::AuthJob::finished, this, &GDriveJob::slotAuthJobFinished);
 }
 
 void GDriveJob::slotAuthJobFinished(KGAPI2::Job *job)

pimcommon/util/imapresourcecapabilitiesmanager.cpp

@@ -59,7 +59,7 @@ void ImapResourceCapabilitiesManager::searchCapabilities(const QString &identifi
         QDBusPendingCall call = iface.asyncCall(QLatin1String("serverCapabilities"));
         QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
         watcher->setProperty("identifier", identifier);
-        connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(slotCapabilities(QDBusPendingCallWatcher*)));
+        connect(watcher, &QDBusPendingCallWatcher::finished, this, &ImapResourceCapabilitiesManager::slotCapabilities);
     } else {
         qDebug() << "interface not valid";
     }
@@ -87,8 +87,8 @@ void ImapResourceCapabilitiesManager::init()
             searchCapabilities(identifier);
         }
     }
-    connect(Akonadi::AgentManager::self(), SIGNAL(instanceAdded(Akonadi::AgentInstance)), SLOT(slotInstanceAdded(Akonadi::AgentInstance)));
-    connect(Akonadi::AgentManager::self(), SIGNAL(instanceRemoved(Akonadi::AgentInstance)), SLOT(slotInstanceRemoved(Akonadi::AgentInstance)));
+    connect(Akonadi::AgentManager::self(), &Akonadi::AgentManager::instanceAdded, this, &ImapResourceCapabilitiesManager::slotInstanceAdded);
+    connect(Akonadi::AgentManager::self(), &Akonadi::AgentManager::instanceRemoved, this, &ImapResourceCapabilitiesManager::slotInstanceRemoved);
 }
 
 bool ImapResourceCapabilitiesManager::hasAnnotationSupport(const QString &identifier) const

sieveeditor/sieveeditormainwidget.cpp

@@ -44,9 +44,9 @@ SieveEditorMainWidget::SieveEditorMainWidget(QWidget *parent)
     addWidget(mTabWidget);
     mScriptManagerWidget = new SieveEditorScriptManagerWidget;
     connect(mScriptManagerWidget, &SieveEditorScriptManagerWidget::createScriptPage, this, &SieveEditorMainWidget::slotCreateScriptPage);
-    connect(mScriptManagerWidget, SIGNAL(updateButtons(bool,bool,bool,bool)), SIGNAL(updateButtons(bool,bool,bool,bool)));
+    connect(mScriptManagerWidget, &SieveEditorScriptManagerWidget::updateButtons, this, &SieveEditorMainWidget::updateButtons);
     connect(mScriptManagerWidget, &SieveEditorScriptManagerWidget::scriptDeleted, this, &SieveEditorMainWidget::slotScriptDeleted);
-    connect(mScriptManagerWidget, SIGNAL(serverSieveFound(bool)), this, SIGNAL(serverSieveFound(bool)));
+    connect(mScriptManagerWidget, &SieveEditorScriptManagerWidget::serverSieveFound, this, &SieveEditorMainWidget::serverSieveFound);
     connect(this, &SieveEditorMainWidget::updateScriptList, mScriptManagerWidget, &SieveEditorScriptManagerWidget::slotRefreshList);
     addWidget(mScriptManagerWidget);
     setChildrenCollapsible(false);
@@ -93,9 +93,9 @@ void SieveEditorMainWidget::slotCreateScriptPage(const QUrl &url, const QStringL
         mTabWidget->setCurrentWidget(page);
     } else {
         SieveEditorPageWidget *editor = new SieveEditorPageWidget;
-        connect(editor, SIGNAL(refreshList()), this, SIGNAL(updateScriptList()));
+        connect(editor, &SieveEditorPageWidget::refreshList, this, &SieveEditorMainWidget::updateScriptList);
         connect(editor, &SieveEditorPageWidget::scriptModified, this, &SieveEditorMainWidget::slotScriptModified);
-        connect(editor, SIGNAL(modeEditorChanged(KSieveUi::SieveEditorWidget::EditorMode)), SIGNAL(modeEditorChanged(KSieveUi::SieveEditorWidget::EditorMode)));
+        connect(editor, &SieveEditorPageWidget::modeEditorChanged, this, &SieveEditorMainWidget::modeEditorChanged);
         editor->setIsNewScript(isNewScript);
         editor->loadScript(url, capabilities);
         mTabWidget->addTab(editor, url.fileName());

sieveeditor/sieveeditorpagewidget.cpp

@@ -53,7 +53,7 @@ void SieveEditorPageWidget::slotCheckSyntaxClicked()
 {
     KManageSieve::SieveJob *job = KManageSieve::SieveJob::put(mCurrentURL, mSieveEditorWidget->script(), mWasActive, mWasActive);
     job->setInteractive(false);
-    connect(job, SIGNAL(errorMessage(KManageSieve::SieveJob*,bool,QString)), this, SLOT(slotPutResultDebug(KManageSieve::SieveJob*,bool,QString)));
+    connect(job, &KManageSieve::SieveJob::errorMessage, this, &SieveEditorPageWidget::slotPutResultDebug);
 }
 
 void SieveEditorPageWidget::slotPutResultDebug(KManageSieve::SieveJob *, bool success , const QString &errorMsg)
@@ -83,7 +83,7 @@ void SieveEditorPageWidget::loadScript(const QUrl &url, const QStringList &capab
     mCurrentURL = url;
     mSieveEditorWidget->setSieveCapabilities(capabilities);
     KManageSieve::SieveJob *job = KManageSieve::SieveJob::get(url);
-    connect(job, SIGNAL(result(KManageSieve::SieveJob*,bool,QString,bool)), this, SLOT(slotGetResult(KManageSieve::SieveJob*,bool,QString,bool)));
+    connect(job, &KManageSieve::SieveJob::result, this, &SieveEditorPageWidget::slotGetResult);
 }
 
 QUrl SieveEditorPageWidget::currentUrl() const
@@ -107,7 +107,7 @@ void SieveEditorPageWidget::saveScript(bool showInformation, bool forceSave)
     if (mSieveEditorWidget->isModified() || forceSave) {
         KManageSieve::SieveJob *job = KManageSieve::SieveJob::put(mCurrentURL, mSieveEditorWidget->script(), mWasActive, mWasActive);
         job->setProperty("showuploadinformation", showInformation);
-        connect(job, SIGNAL(result(KManageSieve::SieveJob*,bool,QString,bool)), this, SLOT(slotPutResult(KManageSieve::SieveJob*,bool)));
+        connect(job, &KManageSieve::SieveJob::result, this, &SieveEditorPageWidget::slotPutResult);
     }
 }
 

sieveeditor/sieveeditorscriptmanagerwidget.cpp

@@ -33,8 +33,8 @@ SieveEditorScriptManagerWidget::SieveEditorScriptManagerWidget(QWidget *parent)
     connect(mTreeView, &SieveEditorManageSieveWidget::newScript, this, &SieveEditorScriptManagerWidget::slotNewScript);
     connect(mTreeView, &SieveEditorManageSieveWidget::editScript, this, &SieveEditorScriptManagerWidget::slotEditScript);
     connect(mTreeView, &SieveEditorManageSieveWidget::updateButtons, this, &SieveEditorScriptManagerWidget::slotUpdateButtons);
-    connect(mTreeView, SIGNAL(scriptDeleted(QUrl)), this, SIGNAL(scriptDeleted(QUrl)));
-    connect(mTreeView, SIGNAL(serverSieveFound(bool)), this, SIGNAL(serverSieveFound(bool)));
+    connect(mTreeView, &SieveEditorManageSieveWidget::scriptDeleted, this, &SieveEditorScriptManagerWidget::scriptDeleted);
+    connect(mTreeView, &SieveEditorManageSieveWidget::serverSieveFound, this, &SieveEditorScriptManagerWidget::serverSieveFound);
     hbox->addWidget(mTreeView);
 }