author | zecke <zecke> | 2003-08-28 14:51:14 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-08-28 14:51:14 (UTC) |
commit | 0fac4909554179fa212c7c9e350735e0a058879e (patch) (unidiff) | |
tree | c77bcbb1e1f0fef765b21eda678b8ad7c0f74dd8 | |
parent | 225fa91f6d57f211d53ec686518ca15fc5278d21 (diff) | |
download | opie-0fac4909554179fa212c7c9e350735e0a058879e.zip opie-0fac4909554179fa212c7c9e350735e0a058879e.tar.gz opie-0fac4909554179fa212c7c9e350735e0a058879e.tar.bz2 |
Use owait
Harlekin you're not destroying owait...
-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 @@ | |||
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 | ** |
@@ -22,4 +22,6 @@ | |||
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 | ||
@@ -38,4 +40,4 @@ Wait::Wait( QWidget *parent ) : QWidget( parent ), | |||
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(); |
@@ -58,9 +60,8 @@ void Wait::setWaiting( bool 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(); |
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 @@ | |||
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 | ** |
@@ -23,8 +23,5 @@ | |||
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> |
@@ -32,2 +29,3 @@ | |||
32 | 29 | ||
30 | class OWait; | ||
33 | class Wait : public QWidget | 31 | class Wait : public QWidget |
@@ -40,5 +38,5 @@ public: | |||
40 | private: | 38 | private: |
41 | OWait* centralWait; | ||
42 | QPixmap pm; | 39 | QPixmap pm; |
43 | bool waiting; | 40 | bool waiting; |
41 | OWait* m_centralWait; | ||
44 | }; | 42 | }; |