summaryrefslogtreecommitdiff
authorzecke <zecke>2003-08-28 14:51:14 (UTC)
committer zecke <zecke>2003-08-28 14:51:14 (UTC)
commit0fac4909554179fa212c7c9e350735e0a058879e (patch) (side-by-side diff)
treec77bcbb1e1f0fef765b21eda678b8ad7c0f74dd8
parent225fa91f6d57f211d53ec686518ca15fc5278d21 (diff)
downloadopie-0fac4909554179fa212c7c9e350735e0a058879e.zip
opie-0fac4909554179fa212c7c9e350735e0a058879e.tar.gz
opie-0fac4909554179fa212c7c9e350735e0a058879e.tar.bz2
Use owait
Harlekin you're not destroying owait...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/wait.cpp29
-rw-r--r--core/launcher/wait.h12
2 files changed, 20 insertions, 21 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,10 +1,10 @@
/**********************************************************************
-** 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.
**
@@ -17,14 +17,16 @@
** 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>
@@ -33,14 +35,14 @@ 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()
{
@@ -48,25 +50,24 @@ Wait *Wait::getWaitObject()
}
void Wait::setWaiting( bool w )
{
Config cfg ( "Launcher" );
- cfg. setGroup ( "GUI" );
+ 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();
- hide();
+ }else{
+ m_centralWait->hide();
+ hide();
}
}
void Wait::paintEvent( QPaintEvent * )
{
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,10 +1,10 @@
/**********************************************************************
-** 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.
**
@@ -18,31 +18,29 @@
**
**********************************************************************/
#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__