summaryrefslogtreecommitdiff
Side-by-side diff
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 @@
/**********************************************************************
-** 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
@@ -20,8 +20,10 @@
#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>
@@ -36,8 +38,8 @@ Wait::Wait( QWidget *parent ) : QWidget( parent ),
{
setFixedSize( pm.size() );
lastWaitObject = this;
- centralWait = new OWait( 0L );
- centralWait->hide();
+ m_centralWait = new OWait( 0l );
+ m_centralWait->hide();
hide();
}
@@ -56,13 +58,12 @@ void Wait::setWaiting( bool w )
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();
}
}
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 @@
/**********************************************************************
-** 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
@@ -21,15 +21,13 @@
#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:
@@ -38,9 +36,9 @@ public:
void paintEvent( QPaintEvent * );
static Wait *getWaitObject();
private:
- OWait* centralWait;
QPixmap pm;
bool waiting;
+ OWait* m_centralWait;
};