From e0b26bfb455046dbad0387c272934da344a12e85 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Wed, 1 May 2019 17:55:37 -0400 Subject: [PATCH] fix ambiguous variable name forward --- src/forward.xpm | 2 +- src/helpwindow.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/forward.xpm b/src/forward.xpm index 12ee236..5c227dc 100644 --- a/src/forward.xpm +++ b/src/forward.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char *forward[] = { +static const char *forward_icon[] = { /* columns rows colors chars-per-pixel */ "16 16 5 1", " c black", diff --git a/src/helpwindow.cpp b/src/helpwindow.cpp index 5e07cbe..a6dc813 100644 --- a/src/helpwindow.cpp +++ b/src/helpwindow.cpp @@ -58,7 +58,7 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par Q3StyleSheetItem* style; - + // Modify the application-wide default style sheet to handle // some extra HTML gracefully. // @@ -110,7 +110,7 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par backwardId = go->insertItem( QPixmap(back), "&Backward", browser, SLOT( backward() ), Qt::ALT | Qt::Key_Left ); - forwardId = go->insertItem( QPixmap(forward), + forwardId = go->insertItem( QPixmap(forward_icon), "&Forward", browser, SLOT( forward() ), Qt::ALT | Qt::Key_Right ); go->insertItem( QPixmap(home), "&Home", browser, SLOT( home() ) ); @@ -152,7 +152,7 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par button = new QToolButton( QPixmap(back), "Backward", "", browser, SLOT(backward()), toolbar ); connect( browser, SIGNAL( backwardAvailable(bool) ), button, SLOT( setEnabled(bool) ) ); button->setEnabled( FALSE ); - button = new QToolButton( QPixmap(forward), "Forward", "", browser, SLOT(forward()), toolbar ); + button = new QToolButton( QPixmap(forward_icon), "Forward", "", browser, SLOT(forward()), toolbar ); connect( browser, SIGNAL( forwardAvailable(bool) ), button, SLOT( setEnabled(bool) ) ); button->setEnabled( FALSE ); button = new QToolButton( QPixmap(home), "Home", "", browser, SLOT(home()), toolbar ); @@ -365,7 +365,7 @@ void HelpWindow::hideEvent( QHideEvent * ) //********************************************* void HelpWindow::showEvent( QShowEvent * ) { - + if(window_list && window_list->isVisible())window_list->draw(); }