summaryrefslogtreecommitdiff
path: root/qt
authorharlekin <harlekin>2002-09-09 15:56:59 (UTC)
committer harlekin <harlekin>2002-09-09 15:56:59 (UTC)
commit735ada29bb32fd3a0a22d2ba3bb75ce2df386617 (patch) (side-by-side diff)
tree037a8341009cff3d1c08198d5fdfa1c6b7afb5cc /qt
parent59844388cf877a0abe66582822c90712979fd9c3 (diff)
downloadopie-735ada29bb32fd3a0a22d2ba3bb75ce2df386617.zip
opie-735ada29bb32fd3a0a22d2ba3bb75ce2df386617.tar.gz
opie-735ada29bb32fd3a0a22d2ba3bb75ce2df386617.tar.bz2
cleanup, they are quite old
Diffstat (limited to 'qt') (more/less context) (show whitespace changes)
-rw-r--r--qt/qte231-for-qpe131.patch.gzbin2884 -> 0 bytes
-rw-r--r--qt/qte231-for-qpe140.patch.gzbin66728 -> 0 bytes
-rw-r--r--qt/qte232-for-qpe150-dialog.patch18
-rw-r--r--qt/qte232-for-qpe150-keyboard.patch145
-rw-r--r--qt/qte232-for-qpe150-style.patch11
-rw-r--r--qt/qte232-for-qpe150-unpolish.patch23
-rw-r--r--qt/qte232-for-qpe150.patch106
7 files changed, 0 insertions, 303 deletions
diff --git a/qt/qte231-for-qpe131.patch.gz b/qt/qte231-for-qpe131.patch.gz
deleted file mode 100644
index 52fd5f0..0000000
--- a/qt/qte231-for-qpe131.patch.gz
+++ b/dev/null
Binary files differ
diff --git a/qt/qte231-for-qpe140.patch.gz b/qt/qte231-for-qpe140.patch.gz
deleted file mode 100644
index fe73648..0000000
--- a/qt/qte231-for-qpe140.patch.gz
+++ b/dev/null
Binary files differ
diff --git a/qt/qte232-for-qpe150-dialog.patch b/qt/qte232-for-qpe150-dialog.patch
deleted file mode 100644
index 93d5f04..0000000
--- a/qt/qte232-for-qpe150-dialog.patch
+++ b/dev/null
@@ -1,18 +0,0 @@
---- src/kernel/qwidget.cpp.orig Sat Jul 6 03:18:10 2002
-+++ src/kernel/qwidget.cpp Sat Jul 6 03:31:18 2002
-@@ -3198,12 +3198,14 @@
- static bool noMoreToplevels()
- {
- QWidgetList *list = qApp->topLevelWidgets();
-+ QWidget *main = qApp->mainWidget();
- QWidget *widget = list->first();
- while ( widget ) {
- if ( !widget->isHidden()
- && !widget->isDesktop()
- && !widget->isPopup()
-- && !widget->testWFlags( Qt::WStyle_Dialog) )
-+ && (!widget->testWFlags( Qt::WStyle_Dialog)
-+ || !widget->parentWidget()))
- break;
- widget = list->next();
- }
diff --git a/qt/qte232-for-qpe150-keyboard.patch b/qt/qte232-for-qpe150-keyboard.patch
deleted file mode 100644
index 597703a..0000000
--- a/qt/qte232-for-qpe150-keyboard.patch
+++ b/dev/null
@@ -1,145 +0,0 @@
---- src/kernel/qkeyboard_qws.cpp.orig Thu May 23 16:17:43 2002
-+++ src/kernel/qkeyboard_qws.cpp Sat Jun 1 23:22:48 2002
-@@ -266,7 +266,7 @@
- { Qt::Key_O, 'o' , 'O' , 'O'-64 },
- { Qt::Key_P, 'p' , 'P' , 'P'-64 },
- { Qt::Key_BraceLeft, '[' , '{' , 0xffff },
-- { Qt::Key_Escape, ']' , '}' , 0xffff },
-+ { Qt::Key_BraceRight, ']' , '}' , 0xffff },
- { Qt::Key_Return, 13 , 13 , 0xffff },
- { Qt::Key_Control, 0xffff , 0xffff , 0xffff },
- { Qt::Key_A, 'a' , 'A' , 'A'-64 }, // 30
-@@ -391,7 +391,7 @@
- bool numLock;
- #endif
- bool caps;
-- bool extended;
-+ int extended;
- int modifiers;
- int prevuni;
- int prevkey;
-@@ -521,7 +521,7 @@
- shift = false;
- alt = false;
- ctrl = false;
-- extended = false;
-+ extended = 0;
- prevuni = 0;
- prevkey = 0;
- caps = FALSE;
-@@ -558,10 +558,24 @@
- int keyCode = Qt::Key_unknown;
- bool release = false;
- int keypad = 0;
-+#if defined(QT_QWS_IPAQ)
-+ static int ipaq_return_pressed = false; // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 !
-+#endif
-+
- #if !defined(QT_QWS_CUSTOM)
-- if (code == 224) {
-+ if ((code == 224)
-+#if defined(QT_QWS_IPAQ)
-+ && !ipaq_return_pressed
-+#endif
-+ )
-+ {
- // extended
-- extended = true;
-+ extended = 1;
-+ return;
-+ }
-+ else if (code == 225) {
-+ // extended 2
-+ extended = 2;
- return;
- }
- #endif
-@@ -571,7 +585,7 @@
- code &= 0x7f;
- }
-
-- if (extended) {
-+ if (extended == 1) {
- switch (code) {
- case 72:
- keyCode = Qt::Key_Up;
-@@ -609,6 +623,32 @@
- case 53:
- keyCode = Qt::Key_Slash;
- break;
-+ case 0x1d:
-+ keyCode = Qt::Key_Control;
-+ break;
-+ case 0x2a:
-+ keyCode = Qt::Key_SysReq;
-+ break;
-+ case 0x38:
-+ keyCode = Qt::Key_Alt;
-+ break;
-+ case 0x5b:
-+ keyCode = Qt::Key_Super_L;
-+ break;
-+ case 0x5c:
-+ keyCode = Qt::Key_Super_R;
-+ break;
-+ case 0x5d:
-+ keyCode = Qt::Key_Menu;
-+ break;
-+ }
-+ } else if (extended == 2) {
-+ switch (code) {
-+ case 0x1d:
-+ return;
-+ case 0x45:
-+ keyCode = Qt::Key_Pause;
-+ break;
- }
- } else {
- #if defined(QT_QWS_CUSTOM)
-@@ -647,6 +687,7 @@
- repeatable = FALSE;
- break;
- case 0x60:
-+ ipaq_return_pressed = !release;
- keyCode = Key_Return;
- break;
- case 0x67:
-@@ -684,13 +725,19 @@
- else
- repeater->stop();
- #endif
-+
-+ /*
-+ Translate shift+Key_Tab to Key_Backtab
-+ */
-+ if (( keyCode == Key_Tab ) && shift )
-+ keyCode = Key_Backtab;
- }
-
- /*
- Keypad consists of extended keys 53 and 28,
- and non-extended keys 55 and 71 through 83.
- */
-- if ( extended ? (code == 53 || code == 28) :
-+ if ((extended == 1) ? (code == 53 || code == 28) :
- (code == 55 || ( code >= 71 && code <= 83 )) )
- keypad = Qt::Keypad;
-
-@@ -790,7 +837,7 @@
- unicode = QWSServer::keyMap()[code].shift_unicode ? QWSServer::keyMap()[code].shift_unicode : 0xffff;
- else
- unicode = QWSServer::keyMap()[code].unicode ? QWSServer::keyMap()[code].unicode : 0xffff;
-- } else {
-+ } else if (extended == 1) {
- if ( code == 53 )
- unicode = '/';
- }
-@@ -816,7 +863,7 @@
- prevkey = prevuni = 0;
- }
- }
-- extended = false;
-+ extended = 0;
- }
-
-
diff --git a/qt/qte232-for-qpe150-style.patch b/qt/qte232-for-qpe150-style.patch
deleted file mode 100644
index 8069ff4..0000000
--- a/qt/qte232-for-qpe150-style.patch
+++ b/dev/null
@@ -1,11 +0,0 @@
---- src/widgets/qcommonstyle.cpp.orig Thu Jun 20 02:41:34 2002
-+++ src/widgets/qcommonstyle.cpp Thu Jun 20 02:42:17 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/qte232-for-qpe150-unpolish.patch b/qt/qte232-for-qpe150-unpolish.patch
deleted file mode 100644
index bd10a66..0000000
--- a/qt/qte232-for-qpe150-unpolish.patch
+++ b/dev/null
@@ -1,23 +0,0 @@
---- src/kernel/qapplication.cpp.orig Sun Jul 21 21:26:30 2002
-+++ src/kernel/qapplication.cpp Sun Jul 21 21:41:32 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
diff --git a/qt/qte232-for-qpe150.patch b/qt/qte232-for-qpe150.patch
deleted file mode 100644
index c01f1f3..0000000
--- a/qt/qte232-for-qpe150.patch
+++ b/dev/null
@@ -1,106 +0,0 @@
---- src/kernel/qsoundqss_qws.cpp.orig Wed Jan 30 12:49:24 2002
-+++ src/kernel/qsoundqss_qws.cpp Wed Jan 30 12:47:41 2002
-@@ -142,6 +142,19 @@ public:
- return wavedata_remaining < 0 || !max;
- }
- private:
-+ int getOneSample()
-+ {
-+ int sample;
-+ if ( chunkdata.wBitsPerSample == 8 ) {
-+ sample = (data[out++] - 128) * 128;
-+ wavedata_remaining--;
-+ } else {
-+ sample = ((short*)data)[out/2];
-+ out += 2;
-+ wavedata_remaining -= 2;
-+ }
-+ return sample;
-+ }
- void getSample(int& l, int& r)
- {
- l = r = 0;
-@@ -152,38 +165,22 @@ private:
- if ( out >= max ) {
- max = dev->readBlock((char*)data,
- (uint)QMIN(sound_buffer_size,wavedata_remaining));
-- wavedata_remaining -= max;
- out = 0;
- if ( max <= 0 ) {
- max = 0;
- return;
- }
- }
-- if ( chunkdata.wBitsPerSample == 8 ) {
-- l = (data[out++] - 128) * 128;
-- } else {
-- l = ((short*)data)[out/2];
-- out += 2;
-- }
-+ l = getOneSample();
- if ( sound_stereo ) {
- if ( chunkdata.channels == 1 ) {
- r = l;
- } else {
-- if ( chunkdata.wBitsPerSample == 8 ) {
-- r = (data[out++] - 128) * 128;
-- } else {
-- r = ((short*)data)[out/2];
-- out += 2;
-- }
-+ r = getOneSample();
- }
- } else {
- if ( chunkdata.channels == 2 ) {
-- if ( chunkdata.wBitsPerSample == 8 ) {
-- r = (data[out++] - 128) * 128;
-- } else {
-- r = ((short*)data)[out/2];
-- out += 2;
-- }
-+ r = getOneSample();
- l = l + r;
- }
- }
-
---- src/kernel/qpixmap_qws.cpp.orig Mon Mar 11 17:00:03 2002
-+++ src/kernel/qpixmap_qws.cpp Mon Mar 11 17:01:05 2002
-@@ -585,6 +585,13 @@ QPixmap QPixmap::xForm( const QWMatrix &
- QWMatrix mat( 1, 0, 0, 1, -xmin, -ymin ); // true matrix
- mat = matrix * mat;
-
-+ // calculate new width and height
-+ QPointArray a( QRect( 0,0,ws,hs ) );
-+ a = mat.map( a );
-+ QRect r = a.boundingRect().normalize();
-+ w = r.width();
-+ h = r.height();
-+
- if ( matrix.m12() == 0.0F && matrix.m21() == 0.0F &&
- matrix.m11() >= 0.0F && matrix.m22() >= 0.0F &&
- depth() == defaultDepth() // ### stretchBlt limitation
-@@ -593,11 +600,6 @@ QPixmap QPixmap::xForm( const QWMatrix &
- if ( mat.m11() == 1.0F && mat.m22() == 1.0F )
- return *this; // identity matrix
-
-- h = qRound( mat.m22()*hs );
-- w = qRound( mat.m11()*ws );
-- h = QABS( h );
-- w = QABS( w );
--
- if(w==0 || h==0) {
- return *this;
- }
-@@ -618,12 +620,6 @@ QPixmap QPixmap::xForm( const QWMatrix &
- }
- return pm;
-
-- } else { // rotation or shearing
-- QPointArray a( QRect(0,0,ws,hs) );
-- a = mat.map( a );
-- QRect r = a.boundingRect().normalize();
-- w = r.width();
-- h = r.height();
- }
- bool invertible;
- mat = mat.invert( &invertible ); // invert matrix