X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fkeysequencewidget.cpp;h=f480e7c2966922a6fa4d8014ebf816e955e31b3a;hp=eb16be467e72415d5c8bee2e63c53c5649f33526;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=f3d6f8088d8be6af9319a99fb8d2fee2837b540a

diff --git a/src/qtui/settingspages/keysequencewidget.cpp b/src/qtui/settingspages/keysequencewidget.cpp
index eb16be46..f480e7c2 100644
--- a/src/qtui/settingspages/keysequencewidget.cpp
+++ b/src/qtui/settingspages/keysequencewidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This class has been inspired by KDE's KKeySequenceWidget and uses     *
@@ -29,7 +29,6 @@
 #include <QDebug>
 #include <QKeyEvent>
 #include <QHBoxLayout>
-#include <QIcon>
 #include <QMessageBox>
 #include <QToolButton>
 
@@ -40,6 +39,7 @@
 
 #include "action.h"
 #include "actioncollection.h"
+#include "icon.h"
 #include "keysequencewidget.h"
 
 KeySequenceButton::KeySequenceButton(KeySequenceWidget *d_, QWidget *parent)
@@ -162,17 +162,14 @@ void KeySequenceButton::keyReleaseEvent(QKeyEvent *e)
 /******************************************************************************/
 
 KeySequenceWidget::KeySequenceWidget(QWidget *parent)
-    : QWidget(parent),
-    _shortcutsModel(0),
-    _isRecording(false),
-    _modifierKeys(0)
+    : QWidget(parent)
 {
-    QHBoxLayout *layout = new QHBoxLayout(this);
+    auto *layout = new QHBoxLayout(this);
     layout->setMargin(0);
 
     _keyButton = new KeySequenceButton(this, this);
     _keyButton->setFocusPolicy(Qt::StrongFocus);
-    _keyButton->setIcon(QIcon::fromTheme("configure"));
+    _keyButton->setIcon(icon::get("configure"));
     _keyButton->setToolTip(tr("Click on the button, then enter the shortcut like you would in the program.\nExample for Ctrl+a: hold the Ctrl key and press a."));
     layout->addWidget(_keyButton);
 
@@ -180,16 +177,16 @@ KeySequenceWidget::KeySequenceWidget(QWidget *parent)
     layout->addWidget(_clearButton);
 
     if (qApp->isLeftToRight())
-        _clearButton->setIcon(QIcon::fromTheme("edit-clear-locationbar-rtl", QIcon::fromTheme("edit-clear")));
+        _clearButton->setIcon(icon::get("edit-clear-locationbar-rtl"));
     else
-        _clearButton->setIcon(QIcon::fromTheme("edit-clear-locationbar-ltr", QIcon::fromTheme("edit-clear")));
+        _clearButton->setIcon(icon::get("edit-clear-locationbar-ltr"));
 
     setLayout(layout);
 
-    connect(_keyButton, SIGNAL(clicked()), SLOT(startRecording()));
-    connect(_keyButton, SIGNAL(clicked()), SIGNAL(clicked()));
-    connect(_clearButton, SIGNAL(clicked()), SLOT(clear()));
-    connect(_clearButton, SIGNAL(clicked()), SIGNAL(clicked()));
+    connect(_keyButton, &QAbstractButton::clicked, this, &KeySequenceWidget::startRecording);
+    connect(_keyButton, &QAbstractButton::clicked, this, &KeySequenceWidget::clicked);
+    connect(_clearButton, &QAbstractButton::clicked, this, &KeySequenceWidget::clear);
+    connect(_clearButton, &QAbstractButton::clicked, this, &KeySequenceWidget::clicked);
 }