projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src: Yearly copyright bump
[quassel.git]
/
src
/
qtui
/
settingspages
/
keysequencewidget.h
diff --git
a/src/qtui/settingspages/keysequencewidget.h
b/src/qtui/settingspages/keysequencewidget.h
index
c1aafd4
..
2f031d2
100644
(file)
--- a/
src/qtui/settingspages/keysequencewidget.h
+++ b/
src/qtui/settingspages/keysequencewidget.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
8
by the Quassel Project *
+ * Copyright (C) 2005-201
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This class has been inspired by KDE's KKeySequenceWidget and uses *
* devel@quassel-irc.org *
* *
* This class has been inspired by KDE's KKeySequenceWidget and uses *
@@
-44,12
+44,12
@@
class KeySequenceWidget : public QWidget
{
Q_OBJECT
public:
{
Q_OBJECT
public:
- KeySequenceWidget(QWidget
*
parent = nullptr);
+ KeySequenceWidget(QWidget
*
parent = nullptr);
- void setModel(ShortcutsModel
*
model);
+ void setModel(ShortcutsModel
*
model);
public slots:
public slots:
- void setKeySequence(const QKeySequence
&
seq);
+ void setKeySequence(const QKeySequence
&
seq);
signals:
/**
signals:
/**
@@
-58,7
+58,7
@@
signals:
* \param conflicting The index of an action that needs to have its shortcut removed. The user has already been
* asked to agree (if he declines, this signal won't be emitted at all).
*/
* \param conflicting The index of an action that needs to have its shortcut removed. The user has already been
* asked to agree (if he declines, this signal won't be emitted at all).
*/
- void keySequenceChanged(const QKeySequence
&seq, const QModelIndex &
conflicting = QModelIndex());
+ void keySequenceChanged(const QKeySequence
& seq, const QModelIndex&
conflicting = QModelIndex());
void clicked();
void clicked();
@@
-74,37
+74,35
@@
private:
bool isOkWhenModifierless(int keyQt) const;
bool isShiftAsModifierAllowed(int keyQt) const;
bool isOkWhenModifierless(int keyQt) const;
bool isShiftAsModifierAllowed(int keyQt) const;
- bool isKeySequenceAvailable(const QKeySequence
&
seq);
+ bool isKeySequenceAvailable(const QKeySequence
&
seq);
- ShortcutsModel
*
_shortcutsModel{nullptr};
+ ShortcutsModel
*
_shortcutsModel{nullptr};
bool _isRecording{false};
QKeySequence _keySequence, _oldKeySequence;
uint _modifierKeys{0};
QModelIndex _conflictingIndex;
bool _isRecording{false};
QKeySequence _keySequence, _oldKeySequence;
uint _modifierKeys{0};
QModelIndex _conflictingIndex;
- KeySequenceButton
*
_keyButton;
- QToolButton
*
_clearButton;
+ KeySequenceButton
*
_keyButton;
+ QToolButton
*
_clearButton;
friend class KeySequenceButton;
};
friend class KeySequenceButton;
};
-
/*****************************************************************************/
class KeySequenceButton : public QPushButton
{
Q_OBJECT
public:
/*****************************************************************************/
class KeySequenceButton : public QPushButton
{
Q_OBJECT
public:
- explicit KeySequenceButton(KeySequenceWidget
*d, QWidget *
parent = nullptr);
+ explicit KeySequenceButton(KeySequenceWidget
* d, QWidget*
parent = nullptr);
protected:
protected:
- bool event(QEvent
*
event) override;
- void keyPressEvent(QKeyEvent
*
event) override;
- void keyReleaseEvent(QKeyEvent
*
event) override;
+ bool event(QEvent
*
event) override;
+ void keyPressEvent(QKeyEvent
*
event) override;
+ void keyReleaseEvent(QKeyEvent
*
event) override;
private:
private:
- KeySequenceWidget
*
d;
+ KeySequenceWidget
*
d;
};
};
-
-#endif // KEYSEQUENCEWIDGET_H
+#endif // KEYSEQUENCEWIDGET_H