fix ambiguous variable name forward
This commit is contained in:
parent
f5f3ee3155
commit
e0b26bfb45
@ -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",
|
||||||
|
@ -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 );
|
||||||
|
Loading…
Reference in New Issue
Block a user