projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy New Year!
[quassel.git]
/
src
/
qtui
/
settingspages
/
keysequencewidget.cpp
diff --git
a/src/qtui/settingspages/keysequencewidget.cpp
b/src/qtui/settingspages/keysequencewidget.cpp
index
38fa2d9
..
66c6f48
100644
(file)
--- a/
src/qtui/settingspages/keysequencewidget.cpp
+++ b/
src/qtui/settingspages/keysequencewidget.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
5
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 *
@@
-29,6
+29,7
@@
#include <QDebug>
#include <QKeyEvent>
#include <QHBoxLayout>
#include <QDebug>
#include <QKeyEvent>
#include <QHBoxLayout>
+#include <QIcon>
#include <QMessageBox>
#include <QToolButton>
#include <QMessageBox>
#include <QToolButton>
@@
-39,7
+40,6
@@
#include "action.h"
#include "actioncollection.h"
#include "action.h"
#include "actioncollection.h"
-#include "iconloader.h"
#include "keysequencewidget.h"
KeySequenceButton::KeySequenceButton(KeySequenceWidget *d_, QWidget *parent)
#include "keysequencewidget.h"
KeySequenceButton::KeySequenceButton(KeySequenceWidget *d_, QWidget *parent)