From 3ec416860139de6a9f42b0b00fd3c3fdeb90be68 Mon Sep 17 00:00:00 2001 From: coolo Date: Sun, 9 Dec 2007 18:14:06 +0000 Subject: [PATCH] one warning less git-svn-id: http://svn.opensuse.org/svn/yast/trunk/qt4@42871 e0cc52ee-31ee-0310-8b87-e83c4596d67c --- src/YQUI.h | 2 +- src/YQUI_builtins.cc | 2 +- src/YQUI_core.cc | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/YQUI.h b/src/YQUI.h index 233b299..d08ad32 100644 --- a/src/YQUI.h +++ b/src/YQUI.h @@ -530,7 +530,7 @@ protected: /** * Timer for TimeoutUserInput() / WaitForEvent(). **/ - QTimer _user_input_timer; + QTimer *_user_input_timer; /** * Timer for delayed busy cursor diff --git a/src/YQUI_builtins.cc b/src/YQUI_builtins.cc index c1f62c2..17ad995 100644 --- a/src/YQUI_builtins.cc +++ b/src/YQUI_builtins.cc @@ -171,7 +171,7 @@ void YQUI::makeScreenShot( std::string stl_filename ) y2debug( "screenshot: %s", qPrintable(fileName) ); { - YQSignalBlocker sigBlocker( &_user_input_timer ); + YQSignalBlocker sigBlocker( _user_input_timer ); fileName = askForSaveFileName( fileName, QString( "*.png" ) , _( "Save screen shot to..." ) ); } diff --git a/src/YQUI_core.cc b/src/YQUI_core.cc index 1d6b746..a03aa49 100644 --- a/src/YQUI_core.cc +++ b/src/YQUI_core.cc @@ -108,7 +108,8 @@ void YQUI::init_ui() _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 @@ void YQUI::init_ui() 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 * YQUI::userInput( unsigned long timeout_millisec ) 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 @@ YEvent * YQUI::userInput( unsigned long timeout_millisec ) _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 * YQUI::pollInput() { YEvent * event = 0; - if ( _user_input_timer.isActive() ) - _user_input_timer.stop(); + if ( _user_input_timer->isActive() ) + _user_input_timer->stop(); if ( ! pendingEvent() ) { -- 2.39.2