provide consistent slots naming

--onSomethingChanged syntax is preferred for all
slots that are triggered from somethingChanged signals
--doThis syntax is preferred for generic slots that
are triggered from various different codepaths

app/settings/controllers/layoutscontroller.cpp

@@ -76,7 +76,7 @@ Layouts::Layouts(Settings::Handler::TabLayouts *parent)
     connect(m_model, &Model::Layouts::rowsInserted, this, &Layouts::dataChanged);
     connect(m_model, &Model::Layouts::rowsRemoved, this, &Layouts::dataChanged);
 
-    connect(m_model, &Model::Layouts::nameDuplicated, this, &Layouts::on_nameDuplicatedFrom);
+    connect(m_model, &Model::Layouts::nameDuplicated, this, &Layouts::onNameDuplicatedFrom);
 
     connect(m_headerView, &QObject::destroyed, this, [&]() {
         m_viewSortColumn = m_headerView->sortIndicatorSection();
@@ -680,7 +680,7 @@ bool Layouts::importLayoutsFromV1ConfigFile(QString file)
     return false;
 }
 
-void Layouts::on_sharedToInEditChanged(const QString &id, const bool &inEdit)
+void Layouts::onSharedToInEditChanged(const QString &id, const bool &inEdit)
 {
     int row = m_model->rowForId(id);
 
@@ -931,7 +931,7 @@ void Layouts::storeColumnWidths()
     }
 }
 
-void Layouts::on_nameDuplicatedFrom(const QString &provenId, const QString &trialId)
+void Layouts::onNameDuplicatedFrom(const QString &provenId, const QString &trialId)
 {
     //! duplicated layout name
     int pRow = rowForId(provenId);

app/settings/controllers/layoutscontroller.h

@@ -103,7 +103,7 @@ signals:
 
 public slots:
     //! needed for Delegate::Shared
-    void on_sharedToInEditChanged(const QString &row, const bool &inEdit);
+    void onSharedToInEditChanged(const QString &row, const bool &inEdit);
 
 private slots:
     void loadConfig();
@@ -111,7 +111,7 @@ private slots:
     void storeColumnWidths();
     void updateLastColumnWidth();
 
-    void on_nameDuplicatedFrom(const QString &provenId,  const QString &trialId);
+    void onNameDuplicatedFrom(const QString &provenId,  const QString &trialId);
 
 private:
     void initView();

app/settings/delegates/shareddelegate.cpp

@@ -92,7 +92,7 @@ QWidget *Shared::createEditor(QWidget *parent, const QStyleOptionViewItem &optio
 
     updateButtonText(button, index);
 
-    m_controller->on_sharedToInEditChanged(layoutId, true);
+    m_controller->onSharedToInEditChanged(layoutId, true);
 
     //! Ok, Apply Buttons behavior
     menu->addSeparator();
@@ -129,7 +129,7 @@ void Shared::setModelData(QWidget *editor, QAbstractItemModel *model, const QMod
     QString layoutId = index.data(Model::Layouts::IDROLE).toString();
 
     if (button->property(OKPRESSED).isNull() || !button->property(OKPRESSED).toBool()) {
-        m_controller->on_sharedToInEditChanged(layoutId, false);
+        m_controller->onSharedToInEditChanged(layoutId, false);
         return;
     }
 
@@ -142,7 +142,7 @@ void Shared::setModelData(QWidget *editor, QAbstractItemModel *model, const QMod
 
     model->setData(index, assignedLayouts, Qt::UserRole);
 
-    m_controller->on_sharedToInEditChanged(layoutId, false);
+    m_controller->onSharedToInEditChanged(layoutId, false);
 }
 
 void Shared::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const

app/settings/dialogs/detailsdialog.cpp

@@ -44,13 +44,13 @@ DetailsDialog::DetailsDialog(SettingsDialog *parent, Controller::Layouts *contro
     connect(m_handler, &Handler::DetailsHandler::dataChanged, this, &DetailsDialog::updateApplyButtonsState);
 
     connect(m_ui->buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked,
-            this, &DetailsDialog::on_ok);
+            this, &DetailsDialog::onOk);
 
     connect(m_ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked,
-            this, &DetailsDialog::on_cancel);
+            this, &DetailsDialog::onCancel);
 
     connect(m_ui->buttonBox->button(QDialogButtonBox::Reset), &QPushButton::clicked,
-            this, &DetailsDialog::on_reset);
+            this, &DetailsDialog::onReset);
 
     updateApplyButtonsState();
 }
@@ -90,20 +90,20 @@ void DetailsDialog::accept()
     qDebug() << Q_FUNC_INFO;
 }
 
-void DetailsDialog::on_ok()
+void DetailsDialog::onOk()
 {
     qDebug() << Q_FUNC_INFO;
     m_handler->save();
     close();
 }
 
-void DetailsDialog::on_cancel()
+void DetailsDialog::onCancel()
 {
     qDebug() << Q_FUNC_INFO;
     close();
 }
 
-void DetailsDialog::on_reset()
+void DetailsDialog::onReset()
 {
     qDebug() << Q_FUNC_INFO;
     m_handler->reset();

app/settings/dialogs/detailsdialog.h

@@ -65,9 +65,9 @@ protected:
     void accept() override;
 
 private slots:
-    void on_ok();
-    void on_cancel();
-    void on_reset();
+    void onOk();
+    void onCancel();
+    void onReset();
 
     void updateApplyButtonsState();
 

app/settings/dialogs/settingsdialog.cpp

@@ -90,7 +90,7 @@ SettingsDialog::SettingsDialog(QWidget *parent, Latte::Corona *corona)
     m_ui->buttonBox->button(QDialogButtonBox::Reset)->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
 
     //! SIGNALS
-    connect(m_ui->tabWidget, &QTabWidget::currentChanged, this, &SettingsDialog::on_currentTabChanged);
+    connect(m_ui->tabWidget, &QTabWidget::currentChanged, this, &SettingsDialog::onCurrentTabChanged);
 
     connect(m_tabLayoutsHandler, &Settings::Handler::TabLayouts::dataChanged, this, &SettingsDialog::updateApplyButtonsState);
 
@@ -143,13 +143,13 @@ void SettingsDialog::initFileMenu()
     m_importFullAction->setIcon(QIcon::fromTheme("document-import"));
     m_importFullAction->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_I));
     m_importFullAction->setToolTip(i18n("Import your full configuration from previous backup"));
-    connect(m_importFullAction, &QAction::triggered, this, &SettingsDialog::on_import_fullconfiguration);
+    connect(m_importFullAction, &QAction::triggered, this, &SettingsDialog::importFullConfiguration);
 
     m_exportFullAction = m_fileMenu->addAction(i18n("Export Configuration..."));
     m_exportFullAction->setIcon(QIcon::fromTheme("document-export"));
     m_exportFullAction->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_E));
     m_exportFullAction->setToolTip(i18n("Export your full configuration to create backup"));
-    connect(m_exportFullAction, &QAction::triggered, this, &SettingsDialog::on_export_fullconfiguration);
+    connect(m_exportFullAction, &QAction::triggered, this, &SettingsDialog::exportFullConfiguration);
 
     m_fileMenu->addSeparator();
 
@@ -261,7 +261,7 @@ void SettingsDialog::setCurrentPage(int page)
     m_ui->tabWidget->setCurrentIndex(page);
 }
 
-void SettingsDialog::on_import_fullconfiguration()
+void SettingsDialog::importFullConfiguration()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -314,7 +314,7 @@ void SettingsDialog::on_import_fullconfiguration()
             });
 
             connect(takeBackupBtn, &QPushButton::clicked, this, [&](bool check) {
-                on_export_fullconfiguration();
+                exportFullConfiguration();
             });
 
             msg->open();
@@ -324,7 +324,7 @@ void SettingsDialog::on_import_fullconfiguration()
     importFileDialog->open();
 }
 
-void SettingsDialog::on_export_fullconfiguration()
+void SettingsDialog::exportFullConfiguration()
 {
     //! Update ALL active original layouts before exporting,
     m_corona->layoutsManager()->synchronizer()->syncActiveLayoutsToOriginalFiles();
@@ -491,7 +491,7 @@ bool SettingsDialog::saveChanges()
     return true;
 }
 
-void SettingsDialog::on_currentTabChanged(int index)
+void SettingsDialog::onCurrentTabChanged(int index)
 {
     //! Before switching into a new tab the user must confirm first if the data should be saved or not
 
@@ -568,7 +568,7 @@ void SettingsDialog::showScreensInformation()
 void SettingsDialog::dragEnterEvent(QDragEnterEvent *event)
 {
     if (currentPage() == LayoutPage){
-        m_tabLayoutsHandler->on_dragEnterEvent(event);
+        m_tabLayoutsHandler->onDragEnterEvent(event);
     } else {
         QDialog::dragEnterEvent(event);
     }
@@ -577,7 +577,7 @@ void SettingsDialog::dragEnterEvent(QDragEnterEvent *event)
 void SettingsDialog::dragLeaveEvent(QDragLeaveEvent *event)
 {
     if (currentPage() == LayoutPage){
-        m_tabLayoutsHandler->on_dragLeaveEvent(event);
+        m_tabLayoutsHandler->onDragLeaveEvent(event);
     } else {
         QDialog::dragLeaveEvent(event);
     }
@@ -586,7 +586,7 @@ void SettingsDialog::dragLeaveEvent(QDragLeaveEvent *event)
 void SettingsDialog::dragMoveEvent(QDragMoveEvent *event)
 {
     if (currentPage() == LayoutPage){
-        m_tabLayoutsHandler->on_dragMoveEvent(event);
+        m_tabLayoutsHandler->onDragMoveEvent(event);
     } else {
         QDialog::dragMoveEvent(event);
     }
@@ -595,7 +595,7 @@ void SettingsDialog::dragMoveEvent(QDragMoveEvent *event)
 void SettingsDialog::dropEvent(QDropEvent *event)
 {
     if (currentPage() == LayoutPage){
-        m_tabLayoutsHandler->on_dropEvent(event);
+        m_tabLayoutsHandler->onDropEvent(event);
     } else {
         QDialog::dropEvent(event);
     }

app/settings/dialogs/settingsdialog.h

@@ -96,8 +96,8 @@ protected:
     void reject() override;
 
 private slots:
-    void on_import_fullconfiguration();
-    void on_export_fullconfiguration();
+    void importFullConfiguration();
+    void exportFullConfiguration();
 
     void accept() override;
 
@@ -112,7 +112,7 @@ private slots:
     void loadConfig();
     void saveConfig();
 
-    void on_currentTabChanged(int index);
+    void onCurrentTabChanged(int index);
 
 private:
     void initGlobalMenu();

app/settings/handlers/detailshandler.cpp

@@ -92,9 +92,9 @@ void DetailsHandler::init()
 
     connect(m_ui->backgroundBtn, &QPushButton::pressed, this, &DetailsHandler::selectBackground);
     connect(m_ui->iconBtn, &QPushButton::pressed, this, &DetailsHandler::selectIcon);
-    connect(m_ui->iconClearBtn, &QPushButton::pressed, this, &DetailsHandler::on_clearIcon);
+    connect(m_ui->iconClearBtn, &QPushButton::pressed, this, &DetailsHandler::clearIcon);
     connect(m_ui->textColorBtn, &QPushButton::pressed, this, &DetailsHandler::selectTextColor);
-    connect(m_ui->patternClearBtn, &QPushButton::pressed, this, &DetailsHandler::on_clearPattern);
+    connect(m_ui->patternClearBtn, &QPushButton::pressed, this, &DetailsHandler::clearPattern);
 
 
     //! Options
@@ -111,10 +111,10 @@ void DetailsHandler::init()
     reload();
 
     //! connect layout combobox after the selected layout has been loaded
-    connect(m_ui->layoutsCmb, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DetailsHandler::on_currentLayoutIndexChanged);
+    connect(m_ui->layoutsCmb, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DetailsHandler::onCurrentLayoutIndexChanged);
 
     //! connect colors combobox after the selected layout has been loaded
-    connect(m_ui->colorsCmb, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DetailsHandler::on_currentColorIndexChanged);
+    connect(m_ui->colorsCmb, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &DetailsHandler::onCurrentColorIndexChanged);
 
 
     //! pattern widgets
@@ -228,24 +228,24 @@ void DetailsHandler::save()
     m_parentDialog->layoutsController()->setLayoutProperties(currentData());
 }
 
-void DetailsHandler::on_clearIcon()
+void DetailsHandler::clearIcon()
 {
     setIcon("");
 }
 
-void DetailsHandler::on_clearPattern()
+void DetailsHandler::clearPattern()
 {
     setBackground("");
     setTextColor("");
 }
 
-void DetailsHandler::on_currentColorIndexChanged(int row)
+void DetailsHandler::onCurrentColorIndexChanged(int row)
 {
     QString selectedColor = m_ui->colorsCmb->itemData(row, Model::Colors::IDROLE).toString();
     setColor(selectedColor);
 }
 
-void DetailsHandler::on_currentLayoutIndexChanged(int row)
+void DetailsHandler::onCurrentLayoutIndexChanged(int row)
 {
     bool switchtonewlayout{true};
 

app/settings/handlers/detailshandler.h

@@ -79,15 +79,14 @@ signals:
     void currentLayoutChanged();
 
 private slots:
-    void on_currentLayoutIndexChanged(int row);
-    void on_currentColorIndexChanged(int row);
-    void on_clearIcon();
-    void on_clearPattern();
+    void onCurrentLayoutIndexChanged(int row);
+    void onCurrentColorIndexChanged(int row);
 
+    void clearIcon();
+    void clearPattern();
     void selectBackground();
     void selectIcon();
     void selectTextColor();
-
     void updateWindowTitle();
 
 private:

app/settings/handlers/tablayoutshandler.cpp

@@ -102,7 +102,7 @@ void TabLayouts::initUi()
         }
     });
 
-    connect(m_ui->tabWidget, &QTabWidget::currentChanged, this, &TabLayouts::on_currentPageChanged);
+    connect(m_ui->tabWidget, &QTabWidget::currentChanged, this, &TabLayouts::onCurrentPageChanged);
 
     updatePerLayoutButtonsState();
 }
@@ -119,14 +119,14 @@ void TabLayouts::initLayoutMenu()
     m_switchLayoutAction->setIcon(QIcon::fromTheme("user-identity"));
     m_switchLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Tab));
     connectActionWithButton(m_ui->switchButton, m_switchLayoutAction);
-    connect(m_switchLayoutAction, &QAction::triggered, this, &TabLayouts::on_switch_layout);
+    connect(m_switchLayoutAction, &QAction::triggered, this, &TabLayouts::switchLayout);
 
     m_pauseLayoutAction = m_layoutMenu->addAction(i18nc("pause layout", "&Pause"));
     m_pauseLayoutAction->setToolTip(i18n("Switch to selected layout"));
     m_pauseLayoutAction->setIcon(QIcon::fromTheme("media-playback-pause"));
     m_pauseLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_P));
     connectActionWithButton(m_ui->pauseButton, m_pauseLayoutAction);
-    connect(m_pauseLayoutAction, &QAction::triggered, this, &TabLayouts::on_pause_layout);
+    connect(m_pauseLayoutAction, &QAction::triggered, this, &TabLayouts::pauseLayout);
 
     m_layoutMenu->addSeparator();
 
@@ -146,14 +146,14 @@ void TabLayouts::initLayoutMenu()
     m_copyLayoutAction->setIcon(QIcon::fromTheme("edit-copy"));
     m_copyLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_C));
     connectActionWithButton(m_ui->copyButton, m_copyLayoutAction);
-    connect(m_copyLayoutAction, &QAction::triggered, this, &TabLayouts::on_copy_layout);
+    connect(m_copyLayoutAction, &QAction::triggered, this, &TabLayouts::copyLayout);
 
     m_removeLayoutAction = m_layoutMenu->addAction(i18nc("remove layout", "Remove"));
     m_removeLayoutAction->setToolTip(i18n("Remove selected layout"));
     m_removeLayoutAction->setIcon(QIcon::fromTheme("delete"));
     m_removeLayoutAction->setShortcut(QKeySequence(Qt::Key_Delete));
     connectActionWithButton(m_ui->removeButton, m_removeLayoutAction);
-    connect(m_removeLayoutAction, &QAction::triggered, this, &TabLayouts::on_remove_layout);
+    connect(m_removeLayoutAction, &QAction::triggered, this, &TabLayouts::removeLayout);
 
     m_layoutMenu->addSeparator();
 
@@ -163,7 +163,7 @@ void TabLayouts::initLayoutMenu()
     m_lockedLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
     m_lockedLayoutAction->setCheckable(true);
     connectActionWithButton(m_ui->lockedButton, m_lockedLayoutAction);
-    connect(m_lockedLayoutAction, &QAction::triggered, this, &TabLayouts::on_locked_layout);
+    connect(m_lockedLayoutAction, &QAction::triggered, this, &TabLayouts::lockLayout);
 
     m_sharedLayoutAction = m_layoutMenu->addAction(i18nc("shared layout", "Sha&red"));
     m_sharedLayoutAction->setToolTip(i18n("Share selected layout with other central layouts"));
@@ -171,14 +171,14 @@ void TabLayouts::initLayoutMenu()
     m_sharedLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
     m_sharedLayoutAction->setCheckable(true);
     connectActionWithButton(m_ui->sharedButton, m_sharedLayoutAction);
-    connect(m_sharedLayoutAction, &QAction::triggered, this, &TabLayouts::on_shared_layout);
+    connect(m_sharedLayoutAction, &QAction::triggered, this, &TabLayouts::shareLayout);
 
     m_detailsAction = m_layoutMenu->addAction(i18nc("layout details", "De&tails..."));
     m_detailsAction->setToolTip(i18n("Show selected layout details"));
     m_detailsAction->setIcon(QIcon::fromTheme("view-list-details"));
     m_detailsAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_T));
     connectActionWithButton(m_ui->detailsButton, m_detailsAction);
-    connect(m_detailsAction, &QAction::triggered, this, &TabLayouts::on_details_action);
+    connect(m_detailsAction, &QAction::triggered, this, &TabLayouts::detailsLayout);
 
     m_layoutMenu->addSeparator();
 
@@ -187,21 +187,21 @@ void TabLayouts::initLayoutMenu()
     m_importLayoutAction->setIcon(QIcon::fromTheme("document-import"));
     m_importLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_I));
     connectActionWithButton(m_ui->importButton, m_importLayoutAction);
-    connect(m_importLayoutAction, &QAction::triggered, this, &TabLayouts::on_import_layout);
+    connect(m_importLayoutAction, &QAction::triggered, this, &TabLayouts::importLayout);
 
     m_exportLayoutAction = m_layoutMenu->addAction(i18nc("export layout", "&Export..."));
     m_exportLayoutAction->setToolTip(i18n("Export selected layout at your system"));
     m_exportLayoutAction->setIcon(QIcon::fromTheme("document-export"));
     m_exportLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT  + Qt::Key_E));
     connectActionWithButton(m_ui->exportButton, m_exportLayoutAction);
-    connect(m_exportLayoutAction, &QAction::triggered, this, &TabLayouts::on_export_layout);
+    connect(m_exportLayoutAction, &QAction::triggered, this, &TabLayouts::exportLayout);
 
     m_downloadLayoutAction = m_layoutMenu->addAction(i18nc("download layout", "&Download..."));
     m_downloadLayoutAction->setToolTip(i18n("Download community layouts from KDE Store"));
     m_downloadLayoutAction->setIcon(QIcon::fromTheme("get-hot-new-stuff"));
     m_downloadLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_D));
     connectActionWithButton(m_ui->downloadButton, m_downloadLayoutAction);
-    connect(m_downloadLayoutAction, &QAction::triggered, this, &TabLayouts::on_download_layout);
+    connect(m_downloadLayoutAction, &QAction::triggered, this, &TabLayouts::downloadLayout);
 }
 
 void TabLayouts::initLayoutTemplatesSubMenu()
@@ -271,7 +271,7 @@ void TabLayouts::save()
     m_layoutsController->save();
 }
 
-void TabLayouts::on_switch_layout()
+void TabLayouts::switchLayout()
 {
     if (!isCurrentTab() || !m_switchLayoutAction->isEnabled()) {
         return;
@@ -318,7 +318,7 @@ void TabLayouts::on_switch_layout()
     updatePerLayoutButtonsState();
 }
 
-void TabLayouts::on_pause_layout()
+void TabLayouts::pauseLayout()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -421,7 +421,7 @@ void TabLayouts::newLayout(const QString &templateName)
     }
 }
 
-void TabLayouts::on_copy_layout()
+void TabLayouts::copyLayout()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -432,7 +432,7 @@ void TabLayouts::on_copy_layout()
     m_layoutsController->copySelectedLayout();
 }
 
-void TabLayouts::on_download_layout()
+void TabLayouts::downloadLayout()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -462,7 +462,7 @@ void TabLayouts::on_download_layout()
     m_parentDialog->setDownloadWindowSize(dialog.size());
 }
 
-void TabLayouts::on_remove_layout()
+void TabLayouts::removeLayout()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -493,7 +493,7 @@ void TabLayouts::on_remove_layout()
     m_layoutsController->removeSelected();
 }
 
-void TabLayouts::on_locked_layout()
+void TabLayouts::lockLayout()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -506,7 +506,7 @@ void TabLayouts::on_locked_layout()
     updatePerLayoutButtonsState();
 }
 
-void TabLayouts::on_shared_layout()
+void TabLayouts::shareLayout()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -519,7 +519,7 @@ void TabLayouts::on_shared_layout()
     updatePerLayoutButtonsState();
 }
 
-void TabLayouts::on_import_layout()
+void TabLayouts::importLayout()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -562,7 +562,7 @@ void TabLayouts::on_import_layout()
     importFileDialog->open();
 }
 
-void TabLayouts::on_export_layout()
+void TabLayouts::exportLayout()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -674,7 +674,7 @@ void TabLayouts::on_export_layout()
     exportFileDialog->selectFile(selectedLayout.name);
 }
 
-void TabLayouts::on_details_action()
+void TabLayouts::detailsLayout()
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -695,7 +695,7 @@ void TabLayouts::on_details_action()
     detailsDlg->deleteLater();
 }
 
-void TabLayouts::on_layoutFilesDropped(const QStringList &paths)
+void TabLayouts::onLayoutFilesDropped(const QStringList &paths)
 {
     QStringList layoutNames;
 
@@ -715,7 +715,7 @@ void TabLayouts::on_layoutFilesDropped(const QStringList &paths)
     }
 }
 
-void TabLayouts::on_rawLayoutDropped(const QString &rawLayout)
+void TabLayouts::onRawLayoutDropped(const QString &rawLayout)
 {
     Latte::Data::Layout importedlayout = m_layoutsController->addLayoutByText(rawLayout);
     showInlineMessage(i18nc("settings:layout imported successfully","Layout <b>%0</b> imported successfully...").arg(importedlayout.name),
@@ -737,7 +737,7 @@ bool TabLayouts::isHoveringLayoutsTable(const QPoint &pos)
 }
 
 
-void TabLayouts::on_currentPageChanged(int page)
+void TabLayouts::onCurrentPageChanged(int page)
 {
     Dialog::ConfigurationPage cPage= static_cast<Dialog::ConfigurationPage>(page);
 
@@ -751,7 +751,7 @@ void TabLayouts::on_currentPageChanged(int page)
     }
 }
 
-void TabLayouts::on_dragEnterEvent(QDragEnterEvent *event)
+void TabLayouts::onDragEnterEvent(QDragEnterEvent *event)
 {
     if (!isHoveringLayoutsTable(event->pos())) {
         return;
@@ -761,12 +761,12 @@ void TabLayouts::on_dragEnterEvent(QDragEnterEvent *event)
     m_ui->layoutsView->dragEntered(event);
 }
 
-void TabLayouts::on_dragLeaveEvent(QDragLeaveEvent *event)
+void TabLayouts::onDragLeaveEvent(QDragLeaveEvent *event)
 {
     m_ui->layoutsView->dragLeft();
 }
 
-void TabLayouts::on_dragMoveEvent(QDragMoveEvent *event)
+void TabLayouts::onDragMoveEvent(QDragMoveEvent *event)
 {
     if (!isHoveringLayoutsTable(event->pos())) {
         event->ignore();
@@ -777,7 +777,7 @@ void TabLayouts::on_dragMoveEvent(QDragMoveEvent *event)
     event->acceptProposedAction();
 }
 
-void TabLayouts::on_dropEvent(QDropEvent *event)
+void TabLayouts::onDropEvent(QDropEvent *event)
 {
     if (!isHoveringLayoutsTable(event->pos())) {
         event->ignore();
@@ -799,15 +799,15 @@ void TabLayouts::on_dropEvent(QDropEvent *event)
         }
 
         if (paths.count() > 0) {
-            on_layoutFilesDropped(paths);
+            onLayoutFilesDropped(paths);
         }
 
         m_ui->layoutsView->dragLeft();
     } else if (event->mimeData()->hasText()){
         if(!event->mimeData()->text().isEmpty()){
-            on_rawLayoutDropped(event->mimeData()->text());
+            onRawLayoutDropped(event->mimeData()->text());
         } else if(!event->mimeData()->data("text/plain").isEmpty()) {
-            on_rawLayoutDropped(event->mimeData()->data("text/plain"));
+            onRawLayoutDropped(event->mimeData()->data("text/plain"));
         } else {
             qDebug() << "Data from drag could not be retrieved!";
         }

app/settings/handlers/tablayoutshandler.h

@@ -78,10 +78,10 @@ public:
     Ui::SettingsDialog *ui() const;
 
 public slots:
-    void on_dragEnterEvent(QDragEnterEvent *event);
-    void on_dragLeaveEvent(QDragLeaveEvent *event);
-    void on_dragMoveEvent(QDragMoveEvent *event);
-    void on_dropEvent(QDropEvent *event);
+    void onDragEnterEvent(QDragEnterEvent *event);
+    void onDragLeaveEvent(QDragLeaveEvent *event);
+    void onDragMoveEvent(QDragMoveEvent *event);
+    void onDropEvent(QDropEvent *event);
 
 private slots:
     void initUi();
@@ -90,20 +90,20 @@ private slots:
     void loadConfig();
     void saveConfig();
 
-    void on_copy_layout();
-    void on_download_layout();
-    void on_pause_layout();
-    void on_switch_layout();
-    void on_import_layout();
-    void on_export_layout();
-    void on_locked_layout();
-    void on_remove_layout();
-    void on_shared_layout();
-    void on_details_action();
-
-    void on_currentPageChanged(int page);
-    void on_layoutFilesDropped(const QStringList &paths);
-    void on_rawLayoutDropped(const QString &rawLayout);
+    void copyLayout();
+    void downloadLayout();
+    void pauseLayout();
+    void switchLayout();
+    void importLayout();
+    void exportLayout();
+    void lockLayout();
+    void removeLayout();
+    void shareLayout();
+    void detailsLayout();
+
+    void onCurrentPageChanged(int page);
+    void onLayoutFilesDropped(const QStringList &paths);
+    void onRawLayoutDropped(const QString &rawLayout);
     void updatePerLayoutButtonsState();
 
     void newLayout(const QString &templateName);

app/settings/models/layoutsmodel.cpp

@@ -1105,13 +1105,13 @@ void Layouts::initActivities()
         KActivities::Info info(id);
 
         if (info.state() != KActivities::Info::Invalid) {
-            on_activityAdded(id);
+            onActivityAdded(id);
         }
     }
 
-    connect(m_corona->activitiesConsumer(), &KActivities::Consumer::activityAdded, this, &Layouts::on_activityAdded);
-    connect(m_corona->activitiesConsumer(), &KActivities::Consumer::activityRemoved, this, &Layouts::on_activityRemoved);
-    connect(m_corona->activitiesConsumer(), &KActivities::Consumer::runningActivitiesChanged, this, &Layouts::on_runningActivitiesChanged);
+    connect(m_corona->activitiesConsumer(), &KActivities::Consumer::activityAdded, this, &Layouts::onActivityAdded);
+    connect(m_corona->activitiesConsumer(), &KActivities::Consumer::activityRemoved, this, &Layouts::onActivityRemoved);
+    connect(m_corona->activitiesConsumer(), &KActivities::Consumer::runningActivitiesChanged, this, &Layouts::onRunningActivitiesChanged);
 
     activitiesStatesChanged();
 }
@@ -1128,7 +1128,7 @@ void Layouts::activitiesStatesChanged()
     emit dataChanged(index(0, ACTIVITYCOLUMN), index(rowCount()-1, ACTIVITYCOLUMN), roles);
 }
 
-void Layouts::on_activityAdded(const QString &id)
+void Layouts::onActivityAdded(const QString &id)
 {
     m_activitiesInfo[id] = new KActivities::Info(id, this);
 
@@ -1141,15 +1141,15 @@ void Layouts::on_activityAdded(const QString &id)
     m_activitiesMap[id] = activity;
 
     connect(m_activitiesInfo[id], &KActivities::Info::nameChanged, [this, id]() {
-        on_activityChanged(id);
+        onActivityChanged(id);
     });
 
     connect(m_activitiesInfo[id], &KActivities::Info::iconChanged, [this, id]() {
-        on_activityChanged(id);
+        onActivityChanged(id);
     });
 }
 
-void Layouts::on_activityRemoved(const QString &id)
+void Layouts::onActivityRemoved(const QString &id)
 {
     if (m_activitiesMap.contains(id)) {
         m_activitiesMap.remove(id);
@@ -1163,7 +1163,7 @@ void Layouts::on_activityRemoved(const QString &id)
     activitiesStatesChanged();
 }
 
-void Layouts::on_activityChanged(const QString &id)
+void Layouts::onActivityChanged(const QString &id)
 {
     if (m_activitiesMap.contains(id) && m_activitiesInfo.contains(id)) {
         m_activitiesMap[id].name = m_activitiesInfo[id]->name();
@@ -1174,7 +1174,7 @@ void Layouts::on_activityChanged(const QString &id)
     }
 }
 
-void Layouts::on_runningActivitiesChanged(const QStringList &runningIds)
+void Layouts::onRunningActivitiesChanged(const QStringList &runningIds)
 {
     Latte::Data::ActivitiesMap::iterator i;
 

app/settings/models/layoutsmodel.h

@@ -147,10 +147,10 @@ private slots:
     void updateActiveStates();
 
     void activitiesStatesChanged();
-    void on_activityAdded(const QString &id);
-    void on_activityRemoved(const QString &id);
-    void on_activityChanged(const QString &id);
-    void on_runningActivitiesChanged(const QStringList &runningIds);
+    void onActivityAdded(const QString &id);
+    void onActivityRemoved(const QString &id);
+    void onActivityChanged(const QString &id);
+    void onRunningActivitiesChanged(const QStringList &runningIds);
 
 private:
     void initActivities();

app/view/containmentinterface.cpp

@@ -58,7 +58,7 @@ ContainmentInterface::ContainmentInterface(Latte::View *parent)
     connect(m_view, &View::containmentChanged
             , this, [&]() {
         if (m_view->containment()) {
-            connect(m_view->containment(), &Plasma::Containment::appletAdded, this, &ContainmentInterface::on_appletAdded);
+            connect(m_view->containment(), &Plasma::Containment::appletAdded, this, &ContainmentInterface::onAppletAdded);
 
             m_appletsExpandedConnectionsTimer.start();
         }
@@ -503,7 +503,7 @@ QAbstractListModel *ContainmentInterface::plasmaTasksModel() const
     return m_plasmaTasksModel;
 }
 
-void ContainmentInterface::on_appletExpandedChanged()
+void ContainmentInterface::onAppletExpandedChanged()
 {
     PlasmaQuick::AppletQuickItem *appletItem = static_cast<PlasmaQuick::AppletQuickItem *>(QObject::sender());
 
@@ -571,11 +571,11 @@ void ContainmentInterface::updateAppletsTracking()
     }
 
     for (const auto applet : m_view->containment()->applets()) {
-        on_appletAdded(applet);
+        onAppletAdded(applet);
     }
 }
 
-void ContainmentInterface::on_appletAdded(Plasma::Applet *applet)
+void ContainmentInterface::onAppletAdded(Plasma::Applet *applet)
 {
     if (!m_view->containment() || !applet) {
         return;
@@ -587,7 +587,7 @@ void ContainmentInterface::on_appletAdded(Plasma::Applet *applet)
         PlasmaQuick::AppletQuickItem *contAi = applet->property("_plasma_graphicObject").value<PlasmaQuick::AppletQuickItem *>();
 
         if (contAi && !m_appletsExpandedConnections.contains(contAi)) {
-            m_appletsExpandedConnections[contAi] = connect(contAi, &PlasmaQuick::AppletQuickItem::expandedChanged, this, &ContainmentInterface::on_appletExpandedChanged);
+            m_appletsExpandedConnections[contAi] = connect(contAi, &PlasmaQuick::AppletQuickItem::expandedChanged, this, &ContainmentInterface::onAppletExpandedChanged);
 
             connect(contAi, &QObject::destroyed, this, [&, contAi](){
                 m_appletsExpandedConnections.remove(contAi);
@@ -599,7 +599,7 @@ void ContainmentInterface::on_appletAdded(Plasma::Applet *applet)
             PlasmaQuick::AppletQuickItem *ai = internalApplet->property("_plasma_graphicObject").value<PlasmaQuick::AppletQuickItem *>();
 
             if (ai && !m_appletsExpandedConnections.contains(ai) ){
-                m_appletsExpandedConnections[ai] = connect(ai, &PlasmaQuick::AppletQuickItem::expandedChanged, this, &ContainmentInterface::on_appletExpandedChanged);
+                m_appletsExpandedConnections[ai] = connect(ai, &PlasmaQuick::AppletQuickItem::expandedChanged, this, &ContainmentInterface::onAppletExpandedChanged);
 
                 connect(ai, &QObject::destroyed, this, [&, ai](){
                     m_appletsExpandedConnections.remove(ai);
@@ -624,7 +624,7 @@ void ContainmentInterface::on_appletAdded(Plasma::Applet *applet)
             //! populate plasma tasks applet
             m_plasmaTasksModel->addTask(ai);
         } else if (!m_appletsExpandedConnections.contains(ai)) {
-            m_appletsExpandedConnections[ai] = connect(ai, &PlasmaQuick::AppletQuickItem::expandedChanged, this, &ContainmentInterface::on_appletExpandedChanged);
+            m_appletsExpandedConnections[ai] = connect(ai, &PlasmaQuick::AppletQuickItem::expandedChanged, this, &ContainmentInterface::onAppletExpandedChanged);
 
             connect(ai, &QObject::destroyed, this, [&, ai](){
                 m_appletsExpandedConnections.remove(ai);

app/view/containmentinterface.h

@@ -109,8 +109,8 @@ private slots:
     void identifyMethods();
 
     void updateAppletsTracking();
-    void on_appletAdded(Plasma::Applet *applet);
-    void on_appletExpandedChanged();
+    void onAppletAdded(Plasma::Applet *applet);
+    void onAppletExpandedChanged();
     void onLatteTasksCountChanged();
     void onPlasmaTasksCountChanged();
 

app/view/visibilitymanager.cpp

@@ -67,7 +67,7 @@ VisibilityManager::VisibilityManager(PlasmaQuick::ContainmentView *view)
     m_corona = qobject_cast<Latte::Corona *>(view->corona());
     m_wm = m_corona->wm();
 
-    connect(this, &VisibilityManager::hidingIsBlockedChanged, this, &VisibilityManager::on_hidingIsBlockedChanged);
+    connect(this, &VisibilityManager::hidingIsBlockedChanged, this, &VisibilityManager::onHidingIsBlockedChanged);
 
     connect(this, &VisibilityManager::slideOutFinished, this, &VisibilityManager::updateHiddenState);
     connect(this, &VisibilityManager::slideInFinished, this, &VisibilityManager::updateHiddenState);
@@ -98,7 +98,7 @@ VisibilityManager::VisibilityManager(PlasmaQuick::ContainmentView *view)
         });
 
         //! Frame Extents
-        connect(m_latteView, &Latte::View::headThicknessGapChanged, this, &VisibilityManager::on_publishFrameExtents);
+        connect(m_latteView, &Latte::View::headThicknessGapChanged, this, &VisibilityManager::onHeadThicknessChanged);
         connect(m_latteView, &Latte::View::locationChanged, this, [&]() {
             if (!m_latteView->behaveAsPlasmaPanel()) {
                 //! Resend frame extents because their geometry has changed
@@ -522,7 +522,7 @@ void VisibilityManager::removeBlockHidingEvent(const QString &type)
     }
 }
 
-void VisibilityManager::on_hidingIsBlockedChanged()
+void VisibilityManager::onHidingIsBlockedChanged()
 {
     if (hidingIsBlocked()) {
         m_timerHide.stop();
@@ -532,7 +532,7 @@ void VisibilityManager::on_hidingIsBlockedChanged()
     }
 }
 
-void VisibilityManager::on_publishFrameExtents()
+void VisibilityManager::onHeadThicknessChanged()
 {
     if (!m_timerPublishFrameExtents.isActive()) {
         m_timerPublishFrameExtents.start();

app/view/visibilitymanager.h

@@ -150,9 +150,9 @@ private slots:
 
     void setIsBelowLayer(bool below);
 
-    void on_hidingIsBlockedChanged();
+    void onHeadThicknessChanged();
+    void onHidingIsBlockedChanged();
 
-    void on_publishFrameExtents(); //! delayed
     void publishFrameExtents(bool forceUpdate = false); //! direct
 
     //! Floating Gap Helper window creation/removal