jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-21 14:23:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed 2nd arg from ShortcutsSettings::getShortcut

Browse source
This commit is contained in:
marco 2015-08-16 20:11:17 +02:00
parent 1ca89e0b09
commit d3d6f70496
12 changed files with 117 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/sequenceEdit/secuenceedit.cpp
View file

@ -7,9 +7,9 @@
#include <QKeyEvent>
#include <QToolTip>
SecuenceEdit::SecuenceEdit(QString name, QWidget *parent) : QWidget(parent)
SecuenceEdit::SecuenceEdit(QString _shorcutName, QWidget *parent) : QWidget(parent)
{
this->shorcutName = name;
shorcutName = _shorcutName;
currentKey = 0;
maxKeys = 4;
keys = 0;
@ -37,7 +37,7 @@ SecuenceEdit::SecuenceEdit(QString name, QWidget *parent) : QWidget(parent)
connect(defaultButton,SIGNAL(clicked()),this,SLOT(restoreDefault()));
lineEdit->installEventFilter(this);
lineEdit->setText(settingsCache->shortcuts().getShortcutString(name));
lineEdit->setText(settingsCache->shortcuts().getShortcutString(shorcutName));
}
QString SecuenceEdit::getSecuence()

2
cockatrice/src/sequenceEdit/secuenceedit.h
View file

@ -12,7 +12,7 @@ class SecuenceEdit : public QWidget
{
Q_OBJECT
public:
SecuenceEdit(QString shorcutName, QWidget *parent = 0);
SecuenceEdit(QString _shorcutName, QWidget *parent = 0);
QString getSecuence();
signals: