summaryrefslogtreecommitdiff
path: root/qt
authormickeyl <mickeyl>2003-12-09 19:32:42 (UTC)
committer mickeyl <mickeyl>2003-12-09 19:32:42 (UTC)
commita22a4b5cbec7a12ae247c3e5edf8c51eb121ba49 (patch) (side-by-side diff)
tree303b54ca648c8a82cc018212fd7297981e92be74 /qt
parent04d6caa37743a1957b9ffa061a58a71a3909ea3d (diff)
downloadopie-a22a4b5cbec7a12ae247c3e5edf8c51eb121ba49.zip
opie-a22a4b5cbec7a12ae247c3e5edf8c51eb121ba49.tar.gz
opie-a22a4b5cbec7a12ae247c3e5edf8c51eb121ba49.tar.bz2
delete patches with bogus names
Diffstat (limited to 'qt') (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qte234-for-opie091-gfxraster.patch11
-rw-r--r--qt/qte234-for-opie091-listview.patch15
-rw-r--r--qt/qte234-for-opie091-override.patch178
-rw-r--r--qt/qte234-for-opie091-qtoolbutton.patch29
-rw-r--r--qt/qte234-for-opie091-setpalette.patch23
-rw-r--r--qt/qte234-for-opie091-sigsegv.patch29
-rw-r--r--qt/qte234-for-opie091-simpad.patch367
-rw-r--r--qt/qte234-for-opie091-style.patch11
-rw-r--r--qt/qte234-for-opie091-unpolish.patch23
9 files changed, 0 insertions, 686 deletions
diff --git a/qt/qte234-for-opie091-gfxraster.patch b/qt/qte234-for-opie091-gfxraster.patch
deleted file mode 100644
index cb940ce..0000000
--- a/qt/qte234-for-opie091-gfxraster.patch
+++ b/dev/null
@@ -1,11 +0,0 @@
---- src/kernel/qgfxraster_qws.cpp.orig 2002-12-08 05:02:49.000000000 +0100
-+++ src/kernel/qgfxraster_qws.cpp 2002-12-08 05:04:09.000000000 +0100
-@@ -4058,7 +4058,7 @@
- setAlphaType(IgnoreAlpha);
- if ( w <= 0 || h <= 0 ) return;
- GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1))
--#ifdef QWS_EXPERIMENTAL_FASTPATH
-+#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !!
- // ### fix for 8bpp
- // This seems to be reliable now, at least for 16bpp
-
diff --git a/qt/qte234-for-opie091-listview.patch b/qt/qte234-for-opie091-listview.patch
deleted file mode 100644
index f3c541b..0000000
--- a/qt/qte234-for-opie091-listview.patch
+++ b/dev/null
@@ -1,15 +0,0 @@
---- src/widgets/qlistview.cpp.orig 2002-11-23 23:31:19.000000000 +0100
-+++ src/widgets/qlistview.cpp 2002-11-24 00:08:51.000000000 +0100
-@@ -4968,9 +4968,9 @@
- l = l->childItem ? l->childItem : l->siblingItem;
-
- if ( l && l->height() )
-- s.setHeight( s.height() + 10 * l->height() );
-- else
-- s.setHeight( s.height() + 140 );
-+ s.setHeight( s.height() + 4 /*10*/ * l->height() );
-+ else // ^v much too big for handhelds
-+ s.setHeight( s.height() + 30 /*140*/ );
-
- if ( s.width() > s.height() * 3 )
- s.setHeight( s.width() / 3 );
diff --git a/qt/qte234-for-opie091-override.patch b/qt/qte234-for-opie091-override.patch
deleted file mode 100644
index ebec3f3..0000000
--- a/qt/qte234-for-opie091-override.patch
+++ b/dev/null
@@ -1,178 +0,0 @@
---- ./src/kernel/qapplication.cpp.orig2 2002-12-07 17:38:53.000000000 +0100
-+++ ./src/kernel/qapplication.cpp 2002-12-07 18:21:21.000000000 +0100
-@@ -35,6 +35,8 @@
- **
- **********************************************************************/
-
-+#define QT_WEAK_SYMBOL __attribute__(( weak ))
-+
- #include "qobjectlist.h"
- #include "qobjectdict.h"
- #include "qapplication.h"
-@@ -933,6 +935,11 @@
- #ifndef QT_NO_STYLE
- void QApplication::setStyle( QStyle *style )
- {
-+ setStyle_NonWeak ( style );
-+}
-+
-+void QApplication::setStyle_NonWeak( QStyle *style )
-+{
- QStyle* old = app_style;
-
- if ( startingUp() ) {
-@@ -1186,7 +1193,13 @@
- \sa QWidget::setPalette(), palette(), QStyle::polish()
- */
-
--void QApplication::setPalette( const QPalette &palette, bool informWidgets,
-+void QApplication::setPalette ( const QPalette &palette, bool informWidgets,
-+ const char* className )
-+{
-+ setPalette_NonWeak ( palette, informWidgets, className );
-+}
-+
-+void QApplication::setPalette_NonWeak ( const QPalette &palette, bool informWidgets,
- const char* className )
- {
- QPalette pal = palette;
-@@ -1288,6 +1301,12 @@
- void QApplication::setFont( const QFont &font, bool informWidgets,
- const char* className )
- {
-+ setFont_NonWeak ( font, informWidgets, className );
-+}
-+
-+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets,
-+ const char* className )
-+{
- bool all = FALSE;
- if ( !className ) {
- if ( !app_font ) {
---- ./src/kernel/qapplication_qws.cpp.orig2 2002-12-07 17:41:46.000000000 +0100
-+++ ./src/kernel/qapplication_qws.cpp 2002-12-07 17:42:26.000000000 +0100
-@@ -2641,6 +2641,11 @@
- */
- void QApplication::qwsSetDecoration( QWSDecoration *d )
- {
-+ qwsSetDecoration_NonWeak ( d );
-+}
-+
-+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d )
-+{
- if ( d ) {
- delete qws_decoration;
- qws_decoration = d;
---- ./src/kernel/qapplication.h.orig2 2002-12-07 17:42:38.000000000 +0100
-+++ ./src/kernel/qapplication.h 2002-12-07 18:22:38.000000000 +0100
-@@ -61,6 +61,10 @@
- class QSemaphore;
- #endif
-
-+#if !defined( QT_WEAK_SYMBOL )
-+#define QT_WEAK_SYMBOL
-+#endif
-+
- // REMOVE IN 3.0 (just here for moc source compatibility)
- #define QNonBaseApplication QApplication
-
-@@ -85,7 +89,10 @@
-
- #ifndef QT_NO_STYLE
- static QStyle &style();
-- static void setStyle( QStyle* );
-+ static void setStyle( QStyle* ) QT_WEAK_SYMBOL;
-+private:
-+ static void setStyle_NonWeak( QStyle* );
-+public:
- #endif
- #if 1 /* OBSOLETE */
- enum ColorMode { NormalColors, CustomColors };
-@@ -106,11 +113,19 @@
- #ifndef QT_NO_PALETTE
- static QPalette palette( const QWidget* = 0 );
- static void setPalette( const QPalette &, bool informWidgets=FALSE,
-+ const char* className = 0 ) QT_WEAK_SYMBOL;
-+private:
-+ static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE,
- const char* className = 0 );
-+public:
- #endif
- static QFont font( const QWidget* = 0 );
- static void setFont( const QFont &, bool informWidgets=FALSE,
-+ const char* className = 0 ) QT_WEAK_SYMBOL;
-+private:
-+ static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE,
- const char* className = 0 );
-+public:
- static QFontMetrics fontMetrics();
-
- QWidget *mainWidget() const;
-@@ -207,7 +222,10 @@
- void qwsSetCustomColors( QRgb *colortable, int start, int numColors );
- #ifndef QT_NO_QWS_MANAGER
- static QWSDecoration &qwsDecoration();
-- static void qwsSetDecoration( QWSDecoration *);
-+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL;
-+private:
-+ static void qwsSetDecoration_NonWeak( QWSDecoration *);
-+public:
- #endif
- #endif
-
---- ./src/kernel/qfontdatabase.h.orig2 2002-12-07 17:46:20.000000000 +0100
-+++ ./src/kernel/qfontdatabase.h 2002-12-07 18:23:22.000000000 +0100
-@@ -59,6 +59,10 @@
- class QDiskFont;
- #endif
-
-+#if !defined( QT_WEAK_SYMBOL )
-+#define QT_WEAK_SYMBOL
-+#endif
-+
- class QFontDatabasePrivate;
-
- class Q_EXPORT QFontDatabase
-@@ -67,9 +71,16 @@
- QFontDatabase();
-
- QStringList families( bool onlyForLocale = TRUE ) const;
-+
-+
- QValueList<int> pointSizes( const QString &family,
- const QString &style = QString::null,
-- const QString &charSet = QString::null );
-+ const QString &charSet = QString::null ) QT_WEAK_SYMBOL;
-+private:
-+ QValueList<int> pointSizes_NonWeak( const QString &family,
-+ const QString &style,
-+ const QString &charSet );
-+public:
- QStringList styles( const QString &family,
- const QString &charSet = QString::null ) const;
- QStringList charSets( const QString &familyName,
---- ./src/kernel/qfontdatabase.cpp.orig2 2002-12-07 17:46:24.000000000 +0100
-+++ ./src/kernel/qfontdatabase.cpp 2002-12-07 18:22:53.000000000 +0100
-@@ -35,6 +35,8 @@
- **
- **********************************************************************/
-
-+#define QT_WEAK_SYMBOL __attribute__(( weak ))
-+
- #include "qfontdatabase.h"
-
- #ifndef QT_NO_FONTDATABASE
-@@ -2424,6 +2426,13 @@
- const QString &style,
- const QString &charSet )
- {
-+ return pointSizes_NonWeak ( family, style, charSet );
-+}
-+
-+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family,
-+ const QString &style,
-+ const QString &charSet )
-+{
- QString cs( charSet );
- if ( charSet.isEmpty() ) {
- QStringList lst = charSets( family );
diff --git a/qt/qte234-for-opie091-qtoolbutton.patch b/qt/qte234-for-opie091-qtoolbutton.patch
deleted file mode 100644
index 2e5c13a..0000000
--- a/qt/qte234-for-opie091-qtoolbutton.patch
+++ b/dev/null
@@ -1,29 +0,0 @@
---- src/widgets/qtoolbutton.orig 2003-04-19 18:59:13.000000000 +0200
-+++ src/widgets/qtoolbutton.cpp 2003-04-19 19:00:56.000000000 +0200
-@@ -230,7 +230,7 @@
- else
- QToolTip::add( this, textLabel );
- }
--#endif
-+#endif
- }
-
-
-@@ -324,12 +324,12 @@
- QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal);
- w = pm.width();
- h = pm.height();
-- if ( w < 32 )
-- w = 32;
-- if ( h < 32 )
-- h = 32;
-+ if ( w < 24 )
-+ w = 24;
-+ if ( h < 24 )
-+ h = 24;
- } else {
-- w = h = 16;
-+ w = h = 14;
- QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
- w = pm.width();
- h = pm.height();
diff --git a/qt/qte234-for-opie091-setpalette.patch b/qt/qte234-for-opie091-setpalette.patch
deleted file mode 100644
index 2aee4e5..0000000
--- a/qt/qte234-for-opie091-setpalette.patch
+++ b/dev/null
@@ -1,23 +0,0 @@
---- src/kernel/qapplication.cpp.orig Sat Sep 21 05:01:47 2002
-+++ src/kernel/qapplication.cpp Sat Sep 21 05:24:42 2002
-@@ -1187,8 +1187,19 @@
- {
- QPalette pal = palette;
- #ifndef QT_NO_STYLE
-- if ( !startingUp() )
-+ if ( !startingUp() ) {
- qApp->style().polish( pal ); // NB: non-const reference
-+ if ( className ) {
-+ // if we just polished a class specific palette (this normally
-+ // only called by qt_fix_tooltips - see below), we better re-
-+ // polish the global palette. Some styles like liquid can get
-+ // confused, because they can not detect if the polished palette
-+ // is the global one or only a class specific one.
-+ // (liquid uses this palette to calculate blending pixmaps)
-+ QPalette p = qApp-> palette ( );
-+ qApp->style().polish ( p );
-+ }
-+ }
- #endif
- bool all = FALSE;
- if ( !className ) {
diff --git a/qt/qte234-for-opie091-sigsegv.patch b/qt/qte234-for-opie091-sigsegv.patch
deleted file mode 100644
index 085de91..0000000
--- a/qt/qte234-for-opie091-sigsegv.patch
+++ b/dev/null
@@ -1,29 +0,0 @@
---- ./src/kernel/qwindowsystem_qws.cpp~sigsegv 2003-03-18 18:29:00.000000000 -0600
-+++ ./src/kernel/qwindowsystem_qws.cpp 2003-03-18 19:09:08.000000000 -0600
-@@ -843,6 +843,18 @@
- {
- }
-
-+static void catchSegvSignal( int )
-+{
-+#ifndef QT_NO_QWS_KEYBOARD
-+ if ( qwsServer )
-+ qwsServer->closeKeyboard();
-+#endif
-+ QWSServer::closedown();
-+ fprintf(stderr, "Segmentation fault.\n");
-+ exit(1);
-+}
-+
-+
- /*!
- \class QWSServer qwindowsystem_qws.h
- \brief Server-specific functionality in Qt/Embedded
-@@ -912,6 +924,7 @@
- }
-
- signal(SIGPIPE, ignoreSignal); //we get it when we read
-+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
- #endif
- focusw = 0;
- mouseGrabber = 0;
diff --git a/qt/qte234-for-opie091-simpad.patch b/qt/qte234-for-opie091-simpad.patch
deleted file mode 100644
index 74a8d83..0000000
--- a/qt/qte234-for-opie091-simpad.patch
+++ b/dev/null
@@ -1,367 +0,0 @@
---- qt-2.3.5/src/kernel/qkeyboard_qws.cpp~qte234-for-opie091-simpad 2003-06-13 16:59:33.000000000 +0200
-+++ qt-2.3.5/src/kernel/qkeyboard_qws.cpp 2003-06-13 16:59:33.000000000 +0200
-@@ -37,6 +37,7 @@
- #include <qapplication.h>
- #include <qsocketnotifier.h>
- #include <qnamespace.h>
-+#include <qdatetime.h>
- #include <qtimer.h>
-
- #include <stdlib.h>
-@@ -131,6 +132,59 @@
-
- #endif // QNX6
-
-+/*
-+ * SIMpad switches handler
-+ * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
-+ */
-+
-+//TODO: guard this against inclusion with #ifdef QT_QWS_SIMPAD
-+
-+#include <linux/switches.h>
-+#define SIMPAD_SWITCHES_DEVICE "/dev/misc/switches"
-+
-+// switches from left top to right down over the SIMpad surface
-+
-+#define SIMPAD_SWITCH_POWER 0x02
-+#define SIMPAD_SWITCH_UPPER 0x10
-+#define SIMPAD_SWITCH_UP 0x20
-+#define SIMPAD_SWITCH_DOWN 0x40
-+#define SIMPAD_SWITCH_LEFT 0x80
-+#define SIMPAD_SWITCH_RIGHT 0x100
-+#define SIMPAD_SWITCH_LOWER 0x8
-+
-+class QWSsimpadButtonsHandler : public QWSKeyboardHandler
-+{
-+ Q_OBJECT
-+
-+ public:
-+ QWSsimpadButtonsHandler();
-+ virtual ~QWSsimpadButtonsHandler();
-+
-+ bool isOpen() { return fd > 0; }
-+
-+ private slots:
-+ void readSwitchesData();
-+ void autoRepeat();
-+
-+ private:
-+ switches_mask_t switches;
-+
-+ int fd;
-+ int repeatdelay;
-+ int repeatperiod;
-+
-+ int lastCode; // last native code
-+ int lastPress; // last press/release state
-+
-+ int k; // last emitted Qt key code
-+ int shiftKeyPressed; // true if one of the SHIFT keys has been pressed and not yet released
-+ bool shiftUsed; // true if SHIFT has been used
-+
-+ QTime eventTimer; // tracks time between raw events
-+ QTimer* repeater;
-+ QSocketNotifier *notifier;
-+};
-+
- #ifdef QT_QWS_SL5XXX
- static const QWSServer::KeyMap keyM[] = {
- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 00
-@@ -1444,7 +1498,11 @@
- } else {
- type = spec;
- }
--
-+ if ( type == "SIMpad" )
-+ {
-+ qDebug( "QWSKeyboardHandler: using SIMpad keyboard handler..." );
-+ handler = new QWSsimpadButtonsHandler();
-+ }
- if ( type == "Buttons" ) {
- #if defined(QT_QWS_YOPY)
- handler = new QWSyopyButtonsHandler();
-@@ -1473,6 +1531,217 @@
- return keyM;
- }
-
--#endif // QT_NO_QWS_KEYBOARD
-
-+/*
-+ * SIMpad switches handler
-+ * (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
-+ */
-
-+
-+QWSsimpadButtonsHandler::QWSsimpadButtonsHandler()
-+ :QWSKeyboardHandler(), fd( -1 ),
-+ repeatdelay( 700 ), repeatperiod( 80 ),
-+ lastCode( 0 ), lastPress( 0 ),
-+ k( -1 ), shiftKeyPressed( 0 ), shiftUsed( false )
-+{
-+ qDebug( "SimpadButtonsHandler() - V4.1" );
-+ fd = ::open( SIMPAD_SWITCHES_DEVICE, O_RDWR | O_NDELAY, 0 );
-+ if ( fd < 0 )
-+ {
-+ qWarning( "SimpadButtonsHandler(): can't open %s", SIMPAD_SWITCHES_DEVICE );
-+ return;
-+ }
-+
-+ notifier = new QSocketNotifier( fd, QSocketNotifier::Read, this );
-+ connect( notifier, SIGNAL( activated(int) ),this, SLOT( readSwitchesData() ) );
-+
-+ repeater = new QTimer(this);
-+ connect(repeater, SIGNAL(timeout()), this, SLOT(autoRepeat()));
-+
-+}
-+
-+
-+QWSsimpadButtonsHandler::~QWSsimpadButtonsHandler()
-+{
-+ qDebug( "~SimpadButtonsHandler()" );
-+ if ( fd > 0 )
-+ {
-+ ::close( fd );
-+ fd = -1;
-+ }
-+}
-+
-+
-+void QWSsimpadButtonsHandler::readSwitchesData()
-+{
-+ qDebug( "SimpadButtonsHandler() - detected switches action" );
-+
-+ if ( ::read( fd, &switches, sizeof switches ) < 0 )
-+ {
-+ qWarning( "SimpadButtonsHandler() - switches read error!" );
-+ return;
-+ }
-+
-+ qDebug( "SimpadButtonsHandler() - Shift: %0x [used: %0x] + Event = %0x | %0x",
-+ shiftKeyPressed, shiftUsed, switches.events[0], switches.states[0] );
-+
-+ bool press = switches.states[0]; // == switches.event[0];
-+ int code = switches.events[0];
-+
-+ //=========================================================================
-+
-+ /**
-+ * Work around a bug in the kernel keyboard driver emitting
-+ * bogus events when pressing multiple switches at once
-+ **/
-+
-+ if ( lastCode == 0 )
-+ {
-+ // first press ever
-+ eventTimer.start();
-+ lastPress = press;
-+ lastCode = code;
-+ }
-+ else
-+ {
-+ int interval = eventTimer.restart();
-+ qDebug( "event interval = %d", interval );
-+ if ( code == lastCode && interval < 10 )
-+ {
-+ qDebug( "event interval too small - ignoring bogus event" );
-+ qDebug( "did I say i hate buggy kernel drivers? :-D" );
-+ return;
-+ }
-+
-+ lastPress = press;
-+ lastCode = code;
-+ }
-+
-+ /**
-+ * Actually it may also be a hardware problem, but I really don't like
-+ * to review kernel code for further inquiry. So just being lazy and
-+ * do the workaround in user space :-D
-+ **/
-+
-+ //=====================================================================
-+
-+ if ( shiftKeyPressed )
-+ {
-+ // a shift key obviously is being held
-+ qDebug( "while shift key is being held..." );
-+
-+ if ( code != shiftKeyPressed )
-+ {
-+ // another key is being touched - that means shift mode for us!
-+ qDebug( " another key is being touched -> shift use now = true" );
-+
-+ shiftUsed = true;
-+
-+ if ( shiftKeyPressed == SIMPAD_SWITCH_LOWER ) // SHIFT 1
-+ {
-+ qDebug( " shift mode 1" );
-+ switch(code)
-+ {
-+ case SIMPAD_SWITCH_UP: k = Qt::Key_F9; break; // Shift1-Up = Calendar
-+ case SIMPAD_SWITCH_DOWN: k = Qt::Key_F10; break; // Shift1-Down = Contacts
-+ case SIMPAD_SWITCH_LEFT: k = Qt::Key_F13; break; // Shift1-Left = Mail
-+ case SIMPAD_SWITCH_RIGHT: k = Qt::Key_F11; break; // Shift1-Up = Menu
-+ case SIMPAD_SWITCH_UPPER: k = Qt::Key_F12; break; // Shift1-Upper = Home
-+ default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event for Shift 1 !" ); break;
-+ }
-+ }
-+ else if ( shiftKeyPressed == SIMPAD_SWITCH_UPPER ) // SHIFT 2
-+ {
-+ qDebug( " shift mode 2" );
-+ switch(code)
-+ {
-+ case SIMPAD_SWITCH_UP: k = Qt::Key_F5; break; // Shift2-Up = F5
-+ case SIMPAD_SWITCH_DOWN: k = Qt::Key_F6; break; // Shift2-Down = F6
-+ case SIMPAD_SWITCH_LEFT: k = Qt::Key_F7; break; // Shift2-Left = F7
-+ case SIMPAD_SWITCH_RIGHT: k = Qt::Key_F8; break; // Shift2-Up = F8
-+ case SIMPAD_SWITCH_LOWER: k = Qt::Key_F9; break; // Shift2-Lower = F9
-+ default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event for Shift 2!" ); break;
-+ }
-+ }
-+ }
-+ else
-+ {
-+ qDebug( " shift key has been released. checking if being used..." );
-+ shiftKeyPressed = 0;
-+
-+ if ( !shiftUsed )
-+ {
-+ qDebug( " ... has _not_ being used -> really emit the key" );
-+ k = ( code == SIMPAD_SWITCH_UPPER ? Qt::Key_Escape : Qt::Key_Return );
-+ qDebug( "Emitting key = %d (pressed)", k );
-+ processKeyEvent( 0, k, 0, true, true );
-+ qDebug( "Emitting key = %d (released)", k );
-+ processKeyEvent( 0, k, 0, false, true );
-+ return;
-+ }
-+ else
-+ {
-+ qDebug( " ... has being used -> doing nothing" );
-+ return;
-+ }
-+ }
-+ }
-+ else
-+ {
-+ qDebug( "standard mode - no shift yet..." );
-+
-+ switch(code)
-+ {
-+ case SIMPAD_SWITCH_UP: k = Qt::Key_Up; break;
-+ case SIMPAD_SWITCH_DOWN: k = Qt::Key_Down; break;
-+ case SIMPAD_SWITCH_LEFT: k = Qt::Key_Left; break;
-+ case SIMPAD_SWITCH_RIGHT: k = Qt::Key_Right; break;
-+
-+ case SIMPAD_SWITCH_UPPER: k=-1; shiftKeyPressed = press? code:0; shiftUsed = false; qDebug( "shiftkey pressed now = %d", shiftKeyPressed ); return;
-+ case SIMPAD_SWITCH_LOWER: k=-1; shiftKeyPressed = press? code:0; shiftUsed = false; qDebug( "shiftkey pressed now = %d", shiftKeyPressed ); return;
-+
-+ default: k=-1; qWarning( "SimpadButtonsHandler() - unhandled event!" ); break;
-+ }
-+ }
-+
-+ if ( k == -1 )
-+ {
-+ qDebug( "no key to emit - returning." );
-+ return;
-+ }
-+
-+ bool repeatable = ( k == Qt::Key_Up || k == Qt::Key_Down ||
-+ k == Qt::Key_Right || k == Qt::Key_Left );
-+
-+ qDebug( "key to emit = %d [%s] [repeat=%s]", k,
-+ press ? "press" : "release",
-+ repeatable ? "true":"false" );
-+
-+ if ( qt_screen->isTransformed() && k >= Qt::Key_Left && k <= Qt::Key_Down )
-+ {
-+ qDebug( "SimpadButtonsHandler() - We are transformed! Correcting..." );
-+ int oldK = k;
-+ k = xform_dirkey( k );
-+ qDebug( "SimpadButtonsHandler() - Old Key: %d - New Key %d", oldK, k );
-+ }
-+
-+ if ( repeatable && press )
-+ repeater->start( repeatdelay, true );
-+ else
-+ repeater->stop();
-+
-+ qwsServer->processKeyEvent( 0, k, 0, press, false );
-+}
-+
-+
-+void QWSsimpadButtonsHandler::autoRepeat()
-+{
-+ qDebug( "Emitting key = %d (released)", k );
-+ processKeyEvent( 0, k, 0, false, true );
-+ qDebug( "Emitting key = %d (pressed)", k );
-+ processKeyEvent( 0, k, 0, true, true );
-+ repeater->start(repeatperiod);
-+}
-+
-+
-+#endif // QT_NO_QWS_KEYBOARD
---- qt-2.3.5/src/kernel/qwsmouse_qws.cpp~qte234-for-opie091-simpad 2003-04-02 03:26:52.000000000 +0200
-+++ qt-2.3.5/src/kernel/qwsmouse_qws.cpp 2003-06-13 16:59:33.000000000 +0200
-@@ -47,6 +47,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/ioctl.h>
-+#include <sys/time.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -67,6 +68,7 @@
- unsigned short x;
- unsigned short y;
- unsigned short pad;
-+ struct timeval stamp;
- } TS_EVENT;
- #elif defined(QT_QWS_SL5XXX)
- #define QT_QWS_SL5XXX_RAW
-@@ -1238,29 +1240,11 @@
- : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0),
- numSamples(0), skipCount(0)
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
--#if defined(QT_QWS_IPAQ)
--# ifdef QT_QWS_IPAQ_RAW
-- if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) {
--# else
-- if ((mouseFD = open( "/dev/h3600_ts", O_RDONLY | O_NDELAY)) < 0) {
--# endif
-- qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno));
-+#ifdef QT_QWS_SIMPAD
-+ if ((mouseFD = open( "/dev/touchscreen/ucb1x00", O_RDONLY | O_NONBLOCK )) < 0) {
-+ qWarning( "Cannot open /dev/touchscreen/ucb1x00 (%s)", strerror(errno));
- return;
- }
--#elif defined(QT_QWS_SL5XXX)
--//# ifdef QT_QWS_SL5XXX_TSRAW
--# if 0
-- if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) {
-- qWarning( "Cannot open /dev/tsraw (%s)", strerror(errno));
-- return;
-- }
--# else
-- if ((mouseFD = open( "/dev/ts", O_RDONLY | O_NDELAY)) < 0) {
-- qWarning( "Cannot open /dev/ts (%s)", strerror(errno));
-- return;
-- }
--# endif
- #endif
-
- QSocketNotifier *mouseNotifier;
-@@ -1269,12 +1253,11 @@
- connect(mouseNotifier, SIGNAL(activated(int)),this, SLOT(readMouseData()));
- waspressed=FALSE;
- mouseIdx = 0;
--#endif
- }
-
- QTPanelHandlerPrivate::~QTPanelHandlerPrivate()
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SIMPAD)
- if (mouseFD >= 0)
- close(mouseFD);
- #endif
diff --git a/qt/qte234-for-opie091-style.patch b/qt/qte234-for-opie091-style.patch
deleted file mode 100644
index 1944da8..0000000
--- a/qt/qte234-for-opie091-style.patch
+++ b/dev/null
@@ -1,11 +0,0 @@
---- src.orig/widgets/qcommonstyle.cpp Mon Mar 18 02:11:26 2002
-+++ src/widgets/qcommonstyle.cpp Fri Aug 30 04:28:27 2002
-@@ -562,7 +562,7 @@
- bool enabled, bool active )
- {
- #ifndef QT_NO_MENUBAR
--#ifndef QT_NO_STYLE_SGI
-+#if 1 // #ifndef QT_NO_STYLE_SGI
- if (draw_menu_bar_impl != 0) {
- QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
- (this->*impl)(p, x, y, w, h, mi, g, enabled, active);
diff --git a/qt/qte234-for-opie091-unpolish.patch b/qt/qte234-for-opie091-unpolish.patch
deleted file mode 100644
index ba9e9b3..0000000
--- a/qt/qte234-for-opie091-unpolish.patch
+++ b/dev/null
@@ -1,23 +0,0 @@
---- src.orig/kernel/qapplication.cpp Mon Mar 18 02:11:25 2002
-+++ src/kernel/qapplication.cpp Fri Aug 30 04:28:34 2002
-@@ -930,10 +930,10 @@
- void QApplication::setStyle( QStyle *style )
- {
- QStyle* old = app_style;
-- app_style = style;
-
- if ( startingUp() ) {
- delete old;
-+ app_style = style;
- return;
- }
-
-@@ -954,6 +954,8 @@
- old->unPolish( qApp );
- }
-
-+ app_style = style;
-+
- // take care of possible palette requirements of certain gui
- // styles. Do it before polishing the application since the style
- // might call QApplication::setStyle() itself