| -rw-r--r-- | core/launcher/wait.cpp | 23 | ||||
| -rw-r--r-- | core/launcher/wait.h | 12 |
2 files changed, 17 insertions, 18 deletions
diff --git a/core/launcher/wait.cpp b/core/launcher/wait.cpp index d202d26..ab53a07 100644 --- a/core/launcher/wait.cpp +++ b/core/launcher/wait.cpp @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** @@ -22,4 +22,6 @@ -#include <qpe/resource.h> -#include <qpe/config.h> +#include <qtopia/resource.h> +#include <qtopia/config.h> + +#include <opie/owait.h> @@ -38,4 +40,4 @@ Wait::Wait( QWidget *parent ) : QWidget( parent ), lastWaitObject = this; - centralWait = new OWait( 0L ); - centralWait->hide(); + m_centralWait = new OWait( 0l ); + m_centralWait->hide(); hide(); @@ -58,9 +60,8 @@ void Wait::setWaiting( bool w ) if ( w ) { - if ( cfg. readBoolEntry ( "BigBusy" ) ) { - centralWait->show(); - } else { + if ( cfg. readBoolEntry( "BigBusy" ) ) + m_centralWait->show(); + else show(); - } } else { - centralWait->hide(); + m_centralWait->hide(); hide(); diff --git a/core/launcher/wait.h b/core/launcher/wait.h index d7c29bd..e7294d2 100644 --- a/core/launcher/wait.h +++ b/core/launcher/wait.h @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** This file is part of the Qtopia Environment. ** @@ -23,8 +23,5 @@ -#include <opie/owait.h> - -#include <qpe/resource.h> +#include <qtopia/resource.h> #include <qwidget.h> -#include <qlabel.h> #include <qpixmap.h> @@ -32,2 +29,3 @@ +class OWait; class Wait : public QWidget @@ -40,5 +38,5 @@ public: private: - OWait* centralWait; QPixmap pm; bool waiting; + OWait* m_centralWait; }; |