author | harlekin <harlekin> | 2002-09-09 15:56:59 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-09 15:56:59 (UTC) |
commit | 735ada29bb32fd3a0a22d2ba3bb75ce2df386617 (patch) (unidiff) | |
tree | 037a8341009cff3d1c08198d5fdfa1c6b7afb5cc /qt | |
parent | 59844388cf877a0abe66582822c90712979fd9c3 (diff) | |
download | opie-735ada29bb32fd3a0a22d2ba3bb75ce2df386617.zip opie-735ada29bb32fd3a0a22d2ba3bb75ce2df386617.tar.gz opie-735ada29bb32fd3a0a22d2ba3bb75ce2df386617.tar.bz2 |
cleanup, they are quite old
-rw-r--r-- | qt/qte231-for-qpe131.patch.gz | bin | 2884 -> 0 bytes | |||
-rw-r--r-- | qt/qte231-for-qpe140.patch.gz | bin | 66728 -> 0 bytes | |||
-rw-r--r-- | qt/qte232-for-qpe150-dialog.patch | 18 | ||||
-rw-r--r-- | qt/qte232-for-qpe150-keyboard.patch | 145 | ||||
-rw-r--r-- | qt/qte232-for-qpe150-style.patch | 11 | ||||
-rw-r--r-- | qt/qte232-for-qpe150-unpolish.patch | 23 | ||||
-rw-r--r-- | qt/qte232-for-qpe150.patch | 106 |
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 @@ | |||
1 | --- src/kernel/qwidget.cpp.origSat Jul 6 03:18:10 2002 | ||
2 | +++ src/kernel/qwidget.cppSat Jul 6 03:31:18 2002 | ||
3 | @@ -3198,12 +3198,14 @@ | ||
4 | static bool noMoreToplevels() | ||
5 | { | ||
6 | QWidgetList *list = qApp->topLevelWidgets(); | ||
7 | + QWidget *main = qApp->mainWidget(); | ||
8 | QWidget *widget = list->first(); | ||
9 | while ( widget ) { | ||
10 | if ( !widget->isHidden() | ||
11 | && !widget->isDesktop() | ||
12 | && !widget->isPopup() | ||
13 | - && !widget->testWFlags( Qt::WStyle_Dialog) ) | ||
14 | + && (!widget->testWFlags( Qt::WStyle_Dialog) | ||
15 | + || !widget->parentWidget())) | ||
16 | break; | ||
17 | widget = list->next(); | ||
18 | } | ||
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 @@ | |||
1 | --- src/kernel/qkeyboard_qws.cpp.origThu May 23 16:17:43 2002 | ||
2 | +++ src/kernel/qkeyboard_qws.cppSat Jun 1 23:22:48 2002 | ||
3 | @@ -266,7 +266,7 @@ | ||
4 | { Qt::Key_O, 'o' , 'O' , 'O'-64 }, | ||
5 | { Qt::Key_P, 'p' , 'P' , 'P'-64 }, | ||
6 | { Qt::Key_BraceLeft, '[' , '{' , 0xffff }, | ||
7 | - { Qt::Key_Escape, ']' , '}' , 0xffff }, | ||
8 | + { Qt::Key_BraceRight, ']' , '}' , 0xffff }, | ||
9 | { Qt::Key_Return, 13 , 13 , 0xffff }, | ||
10 | { Qt::Key_Control, 0xffff , 0xffff , 0xffff }, | ||
11 | { Qt::Key_A, 'a' , 'A' , 'A'-64 }, // 30 | ||
12 | @@ -391,7 +391,7 @@ | ||
13 | bool numLock; | ||
14 | #endif | ||
15 | bool caps; | ||
16 | - bool extended; | ||
17 | + int extended; | ||
18 | int modifiers; | ||
19 | int prevuni; | ||
20 | int prevkey; | ||
21 | @@ -521,7 +521,7 @@ | ||
22 | shift = false; | ||
23 | alt = false; | ||
24 | ctrl = false; | ||
25 | - extended = false; | ||
26 | + extended = 0; | ||
27 | prevuni = 0; | ||
28 | prevkey = 0; | ||
29 | caps = FALSE; | ||
30 | @@ -558,10 +558,24 @@ | ||
31 | int keyCode = Qt::Key_unknown; | ||
32 | bool release = false; | ||
33 | int keypad = 0; | ||
34 | +#if defined(QT_QWS_IPAQ) | ||
35 | + static int ipaq_return_pressed = false; // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 ! | ||
36 | +#endif | ||
37 | + | ||
38 | #if !defined(QT_QWS_CUSTOM) | ||
39 | - if (code == 224) { | ||
40 | + if ((code == 224) | ||
41 | +#if defined(QT_QWS_IPAQ) | ||
42 | + && !ipaq_return_pressed | ||
43 | +#endif | ||
44 | + ) | ||
45 | + { | ||
46 | // extended | ||
47 | -extended = true; | ||
48 | +extended = 1; | ||
49 | +return; | ||
50 | + } | ||
51 | + else if (code == 225) { | ||
52 | + // extended 2 | ||
53 | + extended = 2; | ||
54 | return; | ||
55 | } | ||
56 | #endif | ||
57 | @@ -571,7 +585,7 @@ | ||
58 | code &= 0x7f; | ||
59 | } | ||
60 | |||
61 | - if (extended) { | ||
62 | + if (extended == 1) { | ||
63 | switch (code) { | ||
64 | case 72: | ||
65 | keyCode = Qt::Key_Up; | ||
66 | @@ -609,6 +623,32 @@ | ||
67 | case 53: | ||
68 | keyCode = Qt::Key_Slash; | ||
69 | break; | ||
70 | +case 0x1d: | ||
71 | + keyCode = Qt::Key_Control; | ||
72 | + break; | ||
73 | +case 0x2a: | ||
74 | + keyCode = Qt::Key_SysReq; | ||
75 | + break; | ||
76 | +case 0x38: | ||
77 | + keyCode = Qt::Key_Alt; | ||
78 | + break; | ||
79 | +case 0x5b: | ||
80 | + keyCode = Qt::Key_Super_L; | ||
81 | + break; | ||
82 | +case 0x5c: | ||
83 | + keyCode = Qt::Key_Super_R; | ||
84 | + break; | ||
85 | +case 0x5d: | ||
86 | + keyCode = Qt::Key_Menu; | ||
87 | + break; | ||
88 | +} | ||
89 | + } else if (extended == 2) { | ||
90 | +switch (code) { | ||
91 | +case 0x1d: | ||
92 | + return; | ||
93 | +case 0x45: | ||
94 | + keyCode = Qt::Key_Pause; | ||
95 | + break; | ||
96 | } | ||
97 | } else { | ||
98 | #if defined(QT_QWS_CUSTOM) | ||
99 | @@ -647,6 +687,7 @@ | ||
100 | repeatable = FALSE; | ||
101 | break; | ||
102 | case 0x60: | ||
103 | + ipaq_return_pressed = !release; | ||
104 | keyCode = Key_Return; | ||
105 | break; | ||
106 | case 0x67: | ||
107 | @@ -684,13 +725,19 @@ | ||
108 | else | ||
109 | repeater->stop(); | ||
110 | #endif | ||
111 | + | ||
112 | +/* | ||
113 | + Translate shift+Key_Tab to Key_Backtab | ||
114 | +*/ | ||
115 | +if (( keyCode == Key_Tab ) && shift ) | ||
116 | + keyCode = Key_Backtab; | ||
117 | } | ||
118 | |||
119 | /* | ||
120 | Keypad consists of extended keys 53 and 28, | ||
121 | and non-extended keys 55 and 71 through 83. | ||
122 | */ | ||
123 | - if ( extended ? (code == 53 || code == 28) : | ||
124 | + if ((extended == 1) ? (code == 53 || code == 28) : | ||
125 | (code == 55 || ( code >= 71 && code <= 83 )) ) | ||
126 | keypad = Qt::Keypad; | ||
127 | |||
128 | @@ -790,7 +837,7 @@ | ||
129 | unicode = QWSServer::keyMap()[code].shift_unicode ? QWSServer::keyMap()[code].shift_unicode : 0xffff; | ||
130 | else | ||
131 | unicode = QWSServer::keyMap()[code].unicode ? QWSServer::keyMap()[code].unicode : 0xffff; | ||
132 | - } else { | ||
133 | + } else if (extended == 1) { | ||
134 | if ( code == 53 ) | ||
135 | unicode = '/'; | ||
136 | } | ||
137 | @@ -816,7 +863,7 @@ | ||
138 | prevkey = prevuni = 0; | ||
139 | } | ||
140 | } | ||
141 | - extended = false; | ||
142 | + extended = 0; | ||
143 | } | ||
144 | |||
145 | |||
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 @@ | |||
1 | --- src/widgets/qcommonstyle.cpp.origThu Jun 20 02:41:34 2002 | ||
2 | +++ src/widgets/qcommonstyle.cppThu Jun 20 02:42:17 2002 | ||
3 | @@ -562,7 +562,7 @@ | ||
4 | bool enabled, bool active ) | ||
5 | { | ||
6 | #ifndef QT_NO_MENUBAR | ||
7 | -#ifndef QT_NO_STYLE_SGI | ||
8 | +#if 1 // #ifndef QT_NO_STYLE_SGI | ||
9 | if (draw_menu_bar_impl != 0) { | ||
10 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; | ||
11 | (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 @@ | |||
1 | --- src/kernel/qapplication.cpp.origSun Jul 21 21:26:30 2002 | ||
2 | +++ src/kernel/qapplication.cppSun Jul 21 21:41:32 2002 | ||
3 | @@ -930,10 +930,10 @@ | ||
4 | void QApplication::setStyle( QStyle *style ) | ||
5 | { | ||
6 | QStyle* old = app_style; | ||
7 | - app_style = style; | ||
8 | |||
9 | if ( startingUp() ) { | ||
10 | delete old; | ||
11 | +app_style = style; | ||
12 | return; | ||
13 | } | ||
14 | |||
15 | @@ -954,6 +954,8 @@ | ||
16 | old->unPolish( qApp ); | ||
17 | } | ||
18 | |||
19 | + app_style = style; | ||
20 | + | ||
21 | // take care of possible palette requirements of certain gui | ||
22 | // styles. Do it before polishing the application since the style | ||
23 | // 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 @@ | |||
1 | --- src/kernel/qsoundqss_qws.cpp.origWed Jan 30 12:49:24 2002 | ||
2 | +++ src/kernel/qsoundqss_qws.cppWed Jan 30 12:47:41 2002 | ||
3 | @@ -142,6 +142,19 @@ public: | ||
4 | return wavedata_remaining < 0 || !max; | ||
5 | } | ||
6 | private: | ||
7 | + int getOneSample() | ||
8 | + { | ||
9 | +int sample; | ||
10 | +if ( chunkdata.wBitsPerSample == 8 ) { | ||
11 | + sample = (data[out++] - 128) * 128; | ||
12 | + wavedata_remaining--; | ||
13 | +} else { | ||
14 | + sample = ((short*)data)[out/2]; | ||
15 | + out += 2; | ||
16 | + wavedata_remaining -= 2; | ||
17 | +} | ||
18 | +return sample; | ||
19 | + } | ||
20 | void getSample(int& l, int& r) | ||
21 | { | ||
22 | l = r = 0; | ||
23 | @@ -152,38 +165,22 @@ private: | ||
24 | if ( out >= max ) { | ||
25 | max = dev->readBlock((char*)data, | ||
26 | (uint)QMIN(sound_buffer_size,wavedata_remaining)); | ||
27 | - wavedata_remaining -= max; | ||
28 | out = 0; | ||
29 | if ( max <= 0 ) { | ||
30 | max = 0; | ||
31 | return; | ||
32 | } | ||
33 | } | ||
34 | - if ( chunkdata.wBitsPerSample == 8 ) { | ||
35 | - l = (data[out++] - 128) * 128; | ||
36 | - } else { | ||
37 | - l = ((short*)data)[out/2]; | ||
38 | - out += 2; | ||
39 | - } | ||
40 | + l = getOneSample(); | ||
41 | if ( sound_stereo ) { | ||
42 | if ( chunkdata.channels == 1 ) { | ||
43 | r = l; | ||
44 | } else { | ||
45 | - if ( chunkdata.wBitsPerSample == 8 ) { | ||
46 | - r = (data[out++] - 128) * 128; | ||
47 | - } else { | ||
48 | - r = ((short*)data)[out/2]; | ||
49 | - out += 2; | ||
50 | - } | ||
51 | + r = getOneSample(); | ||
52 | } | ||
53 | } else { | ||
54 | if ( chunkdata.channels == 2 ) { | ||
55 | - if ( chunkdata.wBitsPerSample == 8 ) { | ||
56 | - r = (data[out++] - 128) * 128; | ||
57 | - } else { | ||
58 | - r = ((short*)data)[out/2]; | ||
59 | - out += 2; | ||
60 | - } | ||
61 | + r = getOneSample(); | ||
62 | l = l + r; | ||
63 | } | ||
64 | } | ||
65 | |||
66 | --- src/kernel/qpixmap_qws.cpp.origMon Mar 11 17:00:03 2002 | ||
67 | +++ src/kernel/qpixmap_qws.cppMon Mar 11 17:01:05 2002 | ||
68 | @@ -585,6 +585,13 @@ QPixmap QPixmap::xForm( const QWMatrix & | ||
69 | QWMatrix mat( 1, 0, 0, 1, -xmin, -ymin );// true matrix | ||
70 | mat = matrix * mat; | ||
71 | |||
72 | + // calculate new width and height | ||
73 | + QPointArray a( QRect( 0,0,ws,hs ) ); | ||
74 | + a = mat.map( a ); | ||
75 | + QRect r = a.boundingRect().normalize(); | ||
76 | + w = r.width(); | ||
77 | + h = r.height(); | ||
78 | + | ||
79 | if ( matrix.m12() == 0.0F && matrix.m21() == 0.0F && | ||
80 | matrix.m11() >= 0.0F && matrix.m22() >= 0.0F && | ||
81 | depth() == defaultDepth() // ### stretchBlt limitation | ||
82 | @@ -593,11 +600,6 @@ QPixmap QPixmap::xForm( const QWMatrix & | ||
83 | if ( mat.m11() == 1.0F && mat.m22() == 1.0F ) | ||
84 | return *this; // identity matrix | ||
85 | |||
86 | -h = qRound( mat.m22()*hs ); | ||
87 | -w = qRound( mat.m11()*ws ); | ||
88 | -h = QABS( h ); | ||
89 | -w = QABS( w ); | ||
90 | - | ||
91 | if(w==0 || h==0) { | ||
92 | return *this; | ||
93 | } | ||
94 | @@ -618,12 +620,6 @@ QPixmap QPixmap::xForm( const QWMatrix & | ||
95 | } | ||
96 | return pm; | ||
97 | |||
98 | - } else { // rotation or shearing | ||
99 | -QPointArray a( QRect(0,0,ws,hs) ); | ||
100 | -a = mat.map( a ); | ||
101 | -QRect r = a.boundingRect().normalize(); | ||
102 | -w = r.width(); | ||
103 | -h = r.height(); | ||
104 | } | ||
105 | bool invertible; | ||
106 | mat = mat.invert( &invertible ); // invert matrix | ||