Use owait

Harlekin you're not destroying owait...

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,12 +1,12 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -15,34 +15,36 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "wait.h"
 
-#include <qpe/resource.h>
-#include <qpe/config.h>
+#include <qtopia/resource.h>
+#include <qtopia/config.h>
+
+#include <opie/owait.h>
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qpainter.h>
 
 
 Wait *lastWaitObject = NULL;
 
 
 Wait::Wait( QWidget *parent ) : QWidget( parent ),
 	pm( Resource::loadPixmap( "wait" ) ), waiting( FALSE )
 {
     setFixedSize( pm.size() );
     lastWaitObject = this;
-    centralWait = new OWait( 0L );
-    centralWait->hide();
+    m_centralWait = new OWait( 0l );
+    m_centralWait->hide();
     hide();
 }
 
 
 Wait *Wait::getWaitObject()
 {
     return lastWaitObject;
 }
@@ -51,23 +53,22 @@ Wait *Wait::getWaitObject()
 void Wait::setWaiting( bool w )
 {
     Config cfg ( "Launcher" );
     cfg. setGroup ( "GUI" );
 
 
     waiting = 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();
     }
 }
 
 
 void Wait::paintEvent( QPaintEvent * )
 {
     QPainter p( this );
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,12 +1,12 @@
 /**********************************************************************
-** 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.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -16,33 +16,31 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef __WAIT_H__
 #define __WAIT_H__
 
-#include <opie/owait.h>
-
-#include <qpe/resource.h>
+#include <qtopia/resource.h>
 
 #include <qwidget.h>
-#include <qlabel.h>
 #include <qpixmap.h>
 #include <qpainter.h>
 
+class OWait;
 class Wait : public QWidget
 {
 public:
     Wait( QWidget *parent );
     void setWaiting( bool w );
     void paintEvent( QPaintEvent * );
     static Wait *getWaitObject();
 private:
-    OWait* centralWait;
     QPixmap pm;
     bool waiting;
+    OWait* m_centralWait;
 };
 
 
 #endif // __WAIT_H__