summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/wait.cpp23
-rw-r--r--core/launcher/wait.h12
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,7 +1,7 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
@@ -20,8 +20,10 @@
20 20
21#include "wait.h" 21#include "wait.h"
22 22
23#include <qpe/resource.h> 23#include <qtopia/resource.h>
24#include <qpe/config.h> 24#include <qtopia/config.h>
25
26#include <opie/owait.h>
25 27
26#include <qwidget.h> 28#include <qwidget.h>
27#include <qpixmap.h> 29#include <qpixmap.h>
@@ -36,8 +38,8 @@ Wait::Wait( QWidget *parent ) : QWidget( parent ),
36{ 38{
37 setFixedSize( pm.size() ); 39 setFixedSize( pm.size() );
38 lastWaitObject = this; 40 lastWaitObject = this;
39 centralWait = new OWait( 0L ); 41 m_centralWait = new OWait( 0l );
40 centralWait->hide(); 42 m_centralWait->hide();
41 hide(); 43 hide();
42} 44}
43 45
@@ -56,13 +58,12 @@ void Wait::setWaiting( bool w )
56 58
57 waiting = w; 59 waiting = w;
58 if ( w ) { 60 if ( w ) {
59 if ( cfg. readBoolEntry ( "BigBusy" ) ) { 61 if ( cfg. readBoolEntry( "BigBusy" ) )
60 centralWait->show(); 62 m_centralWait->show();
61 } else { 63 else
62 show(); 64 show();
63 }
64 } else { 65 } else {
65 centralWait->hide(); 66 m_centralWait->hide();
66 hide(); 67 hide();
67 } 68 }
68} 69}
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,7 +1,7 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
@@ -21,15 +21,13 @@
21#ifndef __WAIT_H__ 21#ifndef __WAIT_H__
22#define __WAIT_H__ 22#define __WAIT_H__
23 23
24#include <opie/owait.h> 24#include <qtopia/resource.h>
25
26#include <qpe/resource.h>
27 25
28#include <qwidget.h> 26#include <qwidget.h>
29#include <qlabel.h>
30#include <qpixmap.h> 27#include <qpixmap.h>
31#include <qpainter.h> 28#include <qpainter.h>
32 29
30class OWait;
33class Wait : public QWidget 31class Wait : public QWidget
34{ 32{
35public: 33public:
@@ -38,9 +36,9 @@ public:
38 void paintEvent( QPaintEvent * ); 36 void paintEvent( QPaintEvent * );
39 static Wait *getWaitObject(); 37 static Wait *getWaitObject();
40private: 38private:
41 OWait* centralWait;
42 QPixmap pm; 39 QPixmap pm;
43 bool waiting; 40 bool waiting;
41 OWait* m_centralWait;
44}; 42};
45 43
46 44