Commit 3922389a authored by Alexander Lohnau's avatar Alexander Lohnau 💬

Exclude some SIGNAL/SLOT connects from clang-format

Otherwise the signatures would not be normalized after the formatting.
parent 92556637
......@@ -135,7 +135,9 @@ void KeyboardDaemon::registerShortcut()
QAction* toggleLayoutAction = actionCollection->getToggleAction();
connect(toggleLayoutAction, &QAction::triggered, this, &KeyboardDaemon::switchToNextLayout);
actionCollection->loadLayoutShortcuts(keyboardConfig.layouts, rules);
// clang-format off
connect(actionCollection, SIGNAL(actionTriggered(QAction*)), this, SLOT(setLayout(QAction*)));
// clang-format on
}
}
......@@ -143,7 +145,9 @@ void KeyboardDaemon::unregisterShortcut()
{
// register KDE keyboard shortcut for switching layouts
if( actionCollection != nullptr ) {
// clang-format off
disconnect(actionCollection, SIGNAL(actionTriggered(QAction*)), this, SLOT(setLayout(QAction*)));
// clang-format on
disconnect(actionCollection->getToggleAction(), &QAction::triggered, this, &KeyboardDaemon::switchToNextLayout);
delete actionCollection;
......
......@@ -210,6 +210,7 @@ void ShortcutsModel::addSourceModel(QAbstractItemModel *sourceModel)
{
Q_ASSERT(sourceModel);
Q_ASSERT(!d->m_models.contains(sourceModel));
// clang-format off
connect(sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), this, SLOT(slotDataChanged(QModelIndex,QModelIndex,QVector<int>)));
connect(sourceModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(slotRowsInserted(QModelIndex,int,int)));
connect(sourceModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(slotRowsRemoved(QModelIndex,int,int)));
......@@ -227,6 +228,7 @@ void ShortcutsModel::addSourceModel(QAbstractItemModel *sourceModel)
this, SLOT(slotSourceLayoutChanged(QList<QPersistentModelIndex>,QAbstractItemModel::LayoutChangeHint)));
connect(sourceModel, SIGNAL(modelAboutToBeReset()), this, SLOT(slotModelAboutToBeReset()));
connect(sourceModel, SIGNAL(modelReset()), this, SLOT(slotModelReset()));
// clang-format on
const int newRows = sourceModel->rowCount();
if (newRows > 0) {
......
......@@ -215,8 +215,9 @@ TouchpadConfigXlib::TouchpadConfigXlib(TouchpadConfigContainer *parent, Touchpad
m_kdedTab->setEnabled(false);
QDBusPendingCallWatcher *watch;
watch = new QDBusPendingCallWatcher(m_daemon->workingTouchpadFound(), this);
connect(watch, SIGNAL(finished(QDBusPendingCallWatcher*)),
SLOT(gotReplyFromDaemon(QDBusPendingCallWatcher*)));
// clang-format off
connect(watch, SIGNAL(finished(QDBusPendingCallWatcher*)), SLOT(gotReplyFromDaemon(QDBusPendingCallWatcher*)));
// clang-format on
// Testing area
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment