From fd751e6441055b7b63d52f67330e47400a02f034 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 2 Nov 2016 09:55:45 +0100 Subject: [PATCH] textbox: fix compilation for generic hardware MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit error: declaration of ‘clear’ shadows a member of 'this' Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/0f5aa730338969e043feff2140cd453aaec5d466 Author: vanhofen Date: 2016-11-02 (Wed, 02 Nov 2016) Origin message was: ------------------ - textbox: fix compilation for generic hardware error: declaration of ‘clear’ shadows a member of 'this' --- src/gui/widget/textbox.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp index 10e04b023..bbddf0fb4 100644 --- a/src/gui/widget/textbox.cpp +++ b/src/gui/widget/textbox.cpp @@ -842,8 +842,8 @@ void CTextBox::clear(void) if (frameBuffer == NULL) return; - std::string clear(" "); - setText(&clear); + std::string empty(" "); + setText(&empty); } bool CTextBox::clearScreenBuffer()