From 1f2dc3a366e432ca8d30262aaa7157b371a6ec56 Mon Sep 17 00:00:00 2001 From: Stian Skjelstad Date: Mon, 10 Dec 2018 08:31:29 +0100 Subject: [PATCH] Remove reuse of variable-name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/Tools/plugins/widget/customwidgets.cpp | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Tools/plugins/widget/customwidgets.cpp b/src/Tools/plugins/widget/customwidgets.cpp index ded75d7aac..78145f9e80 100644 --- a/src/Tools/plugins/widget/customwidgets.cpp +++ b/src/Tools/plugins/widget/customwidgets.cpp @@ -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; }