cromer/qt-agistudio
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

fix ambiguous variable name forward

Browse Source
This commit is contained in:
Chris Cromer 2019-05-01 17:55:37 -04:00
parent f5f3ee3155
commit e0b26bfb45
Signed by: cromer
GPG Key ID: 39CC813FF3C8708A
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forward.xpm
View File

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
static const char *forward[] = { static const char *forward_icon[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 16 5 1", "16 16 5 1",
" c black", " c black",

8
src/helpwindow.cpp
View File

@ -58,7 +58,7 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par
Q3StyleSheetItem* style; Q3StyleSheetItem* style;
// Modify the application-wide default style sheet to handle // Modify the application-wide default style sheet to handle
// some extra HTML gracefully. // some extra HTML gracefully.
// //
@ -110,7 +110,7 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par
backwardId = go->insertItem( QPixmap(back), backwardId = go->insertItem( QPixmap(back),
"&Backward", browser, SLOT( backward() ), "&Backward", browser, SLOT( backward() ),
Qt::ALT | Qt::Key_Left ); Qt::ALT | Qt::Key_Left );
forwardId = go->insertItem( QPixmap(forward), forwardId = go->insertItem( QPixmap(forward_icon),
"&Forward", browser, SLOT( forward() ), "&Forward", browser, SLOT( forward() ),
Qt::ALT | Qt::Key_Right ); Qt::ALT | Qt::Key_Right );
go->insertItem( QPixmap(home), "&Home", browser, SLOT( home() ) ); 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 ); button = new QToolButton( QPixmap(back), "Backward", "", browser, SLOT(backward()), toolbar );
connect( browser, SIGNAL( backwardAvailable(bool) ), button, SLOT( setEnabled(bool) ) ); connect( browser, SIGNAL( backwardAvailable(bool) ), button, SLOT( setEnabled(bool) ) );
button->setEnabled( FALSE ); 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) ) ); connect( browser, SIGNAL( forwardAvailable(bool) ), button, SLOT( setEnabled(bool) ) );
button->setEnabled( FALSE ); button->setEnabled( FALSE );
button = new QToolButton( QPixmap(home), "Home", "", browser, SLOT(home()), toolbar ); button = new QToolButton( QPixmap(home), "Home", "", browser, SLOT(home()), toolbar );
@ -365,7 +365,7 @@ void HelpWindow::hideEvent( QHideEvent * )
//********************************************* //*********************************************
void HelpWindow::showEvent( QShowEvent * ) void HelpWindow::showEvent( QShowEvent * )
{ {
if(window_list && window_list->isVisible())window_list->draw(); if(window_list && window_list->isVisible())window_list->draw();
} }