[yast-commit] r42871 - in /trunk/qt4/src: YQUI.h YQUI_builtins.cc YQUI_core.cc

Author: coolo Date: Sun Dec 9 19:14:06 2007 New Revision: 42871 URL: http://svn.opensuse.org/viewcvs/yast?rev=42871&view=rev Log: one warning less Modified: trunk/qt4/src/YQUI.h trunk/qt4/src/YQUI_builtins.cc trunk/qt4/src/YQUI_core.cc Modified: trunk/qt4/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/YQUI.h?rev=42871&r1=42870&r2=42871&view=diff ============================================================================== --- trunk/qt4/src/YQUI.h (original) +++ trunk/qt4/src/YQUI.h Sun Dec 9 19:14:06 2007 @@ -530,7 +530,7 @@ /** * Timer for TimeoutUserInput() / WaitForEvent(). **/ - QTimer _user_input_timer; + QTimer *_user_input_timer; /** * Timer for delayed busy cursor Modified: trunk/qt4/src/YQUI_builtins.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/YQUI_builtins.cc?rev=42871&r1=42870&r2=42871&view=diff ============================================================================== --- trunk/qt4/src/YQUI_builtins.cc (original) +++ trunk/qt4/src/YQUI_builtins.cc Sun Dec 9 19:14:06 2007 @@ -171,7 +171,7 @@ y2debug( "screenshot: %s", qPrintable(fileName) ); { - YQSignalBlocker sigBlocker( &_user_input_timer ); + YQSignalBlocker sigBlocker( _user_input_timer ); fileName = askForSaveFileName( fileName, QString( "*.png" ) , _( "Save screen shot to..." ) ); } Modified: trunk/qt4/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt4/src/YQUI_core.cc?rev=42871&r1=42870&r2=42871&view=diff ============================================================================== --- trunk/qt4/src/YQUI_core.cc (original) +++ trunk/qt4/src/YQUI_core.cc Sun Dec 9 19:14:06 2007 @@ -108,7 +108,8 @@ _busy_cursor_timer = new QTimer( qApp ); _busy_cursor_timer->setSingleShot( true ); - _user_input_timer.setSingleShot( true ); + _user_input_timer = new QTimer( qApp ); + _user_input_timer->setSingleShot( true ); _normalPalette = qApp->palette(); @@ -201,7 +202,7 @@ qApp->setFont( yqApp()->currentFont() ); busyCursor(); - connect( & _user_input_timer, SIGNAL( timeout() ), + connect( _user_input_timer, SIGNAL( timeout() ), this, SLOT ( userInputTimeout() ) ); connect( _busy_cursor_timer, SIGNAL( timeout() ), @@ -429,13 +430,13 @@ YEvent * event = 0; YQDialog * dialog = dynamic_cast ( YDialog::currentDialog( false ) ); - if ( _user_input_timer.isActive() ) - _user_input_timer.stop(); + if ( _user_input_timer->isActive() ) + _user_input_timer->stop(); if ( dialog ) { if ( timeout_millisec > 0 ) - _user_input_timer.start( timeout_millisec ); // single shot + _user_input_timer->start( timeout_millisec ); // single shot if ( qApp->focusWidget() ) qApp->focusWidget()->setFocus(); @@ -453,8 +454,8 @@ _busy_cursor_timer->start( BUSY_CURSOR_TIMEOUT ); // single shot } - if ( _user_input_timer.isActive() ) - _user_input_timer.stop(); + if ( _user_input_timer->isActive() ) + _user_input_timer->stop(); return event; } @@ -464,8 +465,8 @@ { YEvent * event = 0; - if ( _user_input_timer.isActive() ) - _user_input_timer.stop(); + if ( _user_input_timer->isActive() ) + _user_input_timer->stop(); if ( ! pendingEvent() ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org