Remove reuse of variable-name.

customwidgets.cpp: In member function ‘virtual void Gui::AccelLineEdit::keyPressEvent(QKeyEvent*)’:
customwidgets.cpp:287:38: error: no match for ‘operator+’ (operand types are ‘Qt::Modifier’ and ‘QKeySequence’)
             QKeySequence key(Qt::CTRL+key);
                              ~~~~~~~~^~~~
In file included from /usr/include/x86_64-linux-gnu/qt5/QtGui/QtGui:38:0,
                 from customwidgets.cpp:24:

g++ (Ubuntu 7.3.0-27ubuntu1~18.04) 7.3.0
This commit is contained in:
Stian Skjelstad
2018-12-10 08:31:29 +01:00
committed by Yorik van Havre
parent 958e25f29b
commit 1f2dc3a366

View File

@@ -284,50 +284,50 @@ void AccelLineEdit::keyPressEvent ( QKeyEvent * e)
{
case Qt::ControlModifier:
{
QKeySequence key(Qt::CTRL+key);
txt += key.toString(QKeySequence::NativeText);
QKeySequence keyseq(Qt::CTRL+key);
txt += keyseq.toString(QKeySequence::NativeText);
setText(txt);
} break;
case Qt::AltModifier:
{
QKeySequence key(Qt::ALT+key);
txt += key.toString(QKeySequence::NativeText);
QKeySequence keyseq(Qt::ALT+key);
txt += keyseq.toString(QKeySequence::NativeText);
setText(txt);
} break;
case Qt::ShiftModifier:
{
QKeySequence key(Qt::SHIFT+key);
txt += key.toString(QKeySequence::NativeText);
QKeySequence keyseq(Qt::SHIFT+key);
txt += keyseq.toString(QKeySequence::NativeText);
setText(txt);
} break;
case Qt::ControlModifier+Qt::AltModifier:
{
QKeySequence key(Qt::CTRL+Qt::ALT+key);
txt += key.toString(QKeySequence::NativeText);
QKeySequence keyseq(Qt::CTRL+Qt::ALT+key);
txt += keyseq.toString(QKeySequence::NativeText);
setText(txt);
} break;
case Qt::ControlModifier+Qt::ShiftModifier:
{
QKeySequence key(Qt::CTRL+Qt::SHIFT+key);
txt += key.toString(QKeySequence::NativeText);
QKeySequence keyseq(Qt::CTRL+Qt::SHIFT+key);
txt += keyseq.toString(QKeySequence::NativeText);
setText(txt);
} break;
case Qt::ShiftModifier+Qt::AltModifier:
{
QKeySequence key(Qt::SHIFT+Qt::ALT+key);
txt += key.toString(QKeySequence::NativeText);
QKeySequence keyseq(Qt::SHIFT+Qt::ALT+key);
txt += keyseq.toString(QKeySequence::NativeText);
setText(txt);
} break;
case Qt::ControlModifier+Qt::AltModifier+Qt::ShiftModifier:
{
QKeySequence key(Qt::CTRL+Qt::ALT+Qt::SHIFT+key);
txt += key.toString(QKeySequence::NativeText);
QKeySequence keyseq(Qt::CTRL+Qt::ALT+Qt::SHIFT+key);
txt += keyseq.toString(QKeySequence::NativeText);
setText(txt);
} break;
default:
{
QKeySequence key(key);
txt += key.toString(QKeySequence::NativeText);
QKeySequence keyseq(key);
txt += keyseq.toString(QKeySequence::NativeText);
setText(txt);
} break;
}