summaryrefslogtreecommitdiff
authorzecke <zecke>2004-08-25 21:27:14 (UTC)
committer zecke <zecke>2004-08-25 21:27:14 (UTC)
commit656d233aa88a92b461abaa618e52db11c1f9d625 (patch) (side-by-side diff)
tree93309884e5b5765a1750074125c437a067d5421f
parent834a1cfd0367f7c2ed6e250666624104c450d542 (diff)
downloadopie-656d233aa88a92b461abaa618e52db11c1f9d625.zip
opie-656d233aa88a92b461abaa618e52db11c1f9d625.tar.gz
opie-656d233aa88a92b461abaa618e52db11c1f9d625.tar.bz2
Do not make the files depend on external defines. This confuses
the 'moc' as it doesn't have a preprocessor in Qt2 and Qt3
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/backend/rohfeedback.cpp2
-rw-r--r--library/backend/rohfeedback.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/library/backend/rohfeedback.cpp b/library/backend/rohfeedback.cpp
index 9a19aac..fa2a636 100644
--- a/library/backend/rohfeedback.cpp
+++ b/library/backend/rohfeedback.cpp
@@ -1,44 +1,43 @@
/**********************************************************************
** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
**
** 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.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
-#ifdef OPIE_WITHROHFEEDBACK
#include <rohfeedback.h>
#include <stdio.h>
#include <qpeapplication.h>
#include <qevent.h>
#include <resource.h>
#include <qpixmap.h>
#include <qbitmap.h>
#define SPEED 600
#define DELAY 500
namespace Opie {
namespace Internal {
/*
RightOnHold feedback
*/
QPixmap * RoHFeedback::Imgs[NOOFICONS] = { 0, 0, 0, 0, 0 };
QBitmap * RoHFeedback::Masks[NOOFICONS];
int RoHFeedback::IconWidth;
int RoHFeedback::IconHeight;
@@ -120,25 +119,24 @@ void RoHFeedback::iconShow( void ) {
Timer.start( SPEED/NOOFICONS );
break;
case FeedbackStopped:
// stopped
IconNr = FeedbackTimerStart;
hide();
Timer.stop();
break;
case FeedbackShow: // first
show();
// FT
default :
// show
setPixmap( *(Imgs[IconNr]) );
setMask( *(Masks[IconNr]) );
IconNr = (IconNr+1)%NOOFICONS; // rotate
break;
}
}
}
}
-#endif
diff --git a/library/backend/rohfeedback.h b/library/backend/rohfeedback.h
index 774ee85..2961d0e 100644
--- a/library/backend/rohfeedback.h
+++ b/library/backend/rohfeedback.h
@@ -1,47 +1,46 @@
/**********************************************************************
** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
**
** 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.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef ROHFEEDBACK_H
#define ROHFEEDBACK_H
-#ifdef OPIE_WITHROHFEEDBACK
/*
RightOnHold feedback show
*/
#define NOOFICONS 5
#include <qlabel.h>
#include <qtimer.h>
class QEvent;
class QPixmap;
class QBitmap;
class QMouseEvent;
namespace Opie {
namespace Internal {
class RoHFeedback : public QLabel {
Q_OBJECT
@@ -60,25 +59,24 @@ public :
void stop( void );
int delay( void );
public slots :
void iconShow( void );
protected :
bool event( QEvent * E );
QTimer Timer;
int IconNr;
QWidget * Receiver;
static int IconWidth;
static int IconHeight;
static QPixmap * Imgs[NOOFICONS];
static QBitmap * Masks[NOOFICONS];
};
}
}
#endif
-#endif