author | ar <ar> | 2004-07-23 20:11:03 (UTC) |
---|---|---|
committer | ar <ar> | 2004-07-23 20:11:03 (UTC) |
commit | a807ba26df5f4fe7c50f6e0e1420d4b0d7c3add8 (patch) (unidiff) | |
tree | 36b7b7ab471b5dc43cb6b92f725d99541baff108 /qt | |
parent | f9499e14b777050f0bdb3821ca8421dd4c7231fd (diff) | |
download | opie-a807ba26df5f4fe7c50f6e0e1420d4b0d7c3add8.zip opie-a807ba26df5f4fe7c50f6e0e1420d4b0d7c3add8.tar.gz opie-a807ba26df5f4fe7c50f6e0e1420d4b0d7c3add8.tar.bz2 |
- make patch patcheable :)
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-all.patch | 7 | ||||
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-iconviewspeed.patch | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch index e3351a3..6f94211 100644 --- a/qt/qt-2.3.7.patch/qte237-all.patch +++ b/qt/qt-2.3.7.patch/qte237-all.patch | |||
@@ -319,39 +319,32 @@ diff -ur qt-2.3.7-old/include/qstring.h qt-2.3.7/include/qstring.h | |||
319 | +#ifdef Q_NO_PACKED_REFERENCE | 319 | +#ifdef Q_NO_PACKED_REFERENCE |
320 | + uchar& cell() { return *(&cl); } | 320 | + uchar& cell() { return *(&cl); } |
321 | + uchar& row() { return *(&rw); } | 321 | + uchar& row() { return *(&rw); } |
322 | +#else | 322 | +#else |
323 | uchar& cell() { return cl; } | 323 | uchar& cell() { return cl; } |
324 | - uchar& row() { return rw; } | 324 | - uchar& row() { return rw; } |
325 | + uchar& row() { return rw; } | 325 | + uchar& row() { return rw; } |
326 | +#endif | 326 | +#endif |
327 | + | 327 | + |
328 | + | 328 | + |
329 | uchar cell() const { return cl; } | 329 | uchar cell() const { return cl; } |
330 | uchar row() const { return rw; } | 330 | uchar row() const { return rw; } |
331 | 331 | ||
332 | diff -ur qt-2.3.7-old/src/iconview/qiconview.cpp qt-2.3.7/src/iconview/qiconview.cpp | 332 | diff -ur qt-2.3.7-old/src/iconview/qiconview.cpp qt-2.3.7/src/iconview/qiconview.cpp |
333 | --- qt-2.3.7-old/src/iconview/qiconview.cpp2004-07-23 15:22:56.000000000 +0200 | 333 | --- qt-2.3.7-old/src/iconview/qiconview.cpp2004-07-23 15:22:56.000000000 +0200 |
334 | +++ qt-2.3.7/src/iconview/qiconview.cpp2004-07-23 15:45:34.000000000 +0200 | 334 | +++ qt-2.3.7/src/iconview/qiconview.cpp2004-07-23 15:45:34.000000000 +0200 |
335 | @@ -1,5 +1,5 @@ | ||
336 | /**************************************************************************** | ||
337 | -** $Id$ | ||
338 | +** $Id$ | ||
339 | ** | ||
340 | ** Implementation of QIconView widget class | ||
341 | ** | ||
342 | @@ -220,6 +220,7 @@ | 335 | @@ -220,6 +220,7 @@ |
343 | QIconView::SelectionMode selectionMode; | 336 | QIconView::SelectionMode selectionMode; |
344 | QIconViewItem *currentItem, *tmpCurrentItem, *highlightedItem, *startDragItem, *pressedItem, *selectAnchor; | 337 | QIconViewItem *currentItem, *tmpCurrentItem, *highlightedItem, *startDragItem, *pressedItem, *selectAnchor; |
345 | QRect *rubber; | 338 | QRect *rubber; |
346 | + QPixmap *backBuffer; | 339 | + QPixmap *backBuffer; |
347 | QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer, | 340 | QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer, |
348 | *fullRedrawTimer; | 341 | *fullRedrawTimer; |
349 | int rastX, rastY, spacing; | 342 | int rastX, rastY, spacing; |
350 | @@ -2263,6 +2264,7 @@ | 343 | @@ -2263,6 +2264,7 @@ |
351 | d->currentItem = 0; | 344 | d->currentItem = 0; |
352 | d->highlightedItem = 0; | 345 | d->highlightedItem = 0; |
353 | d->rubber = 0; | 346 | d->rubber = 0; |
354 | + d->backBuffer = 0; | 347 | + d->backBuffer = 0; |
355 | d->scrollTimer = 0; | 348 | d->scrollTimer = 0; |
356 | d->startDragItem = 0; | 349 | d->startDragItem = 0; |
357 | d->tmpCurrentItem = 0; | 350 | d->tmpCurrentItem = 0; |
diff --git a/qt/qt-2.3.7.patch/qte237-iconviewspeed.patch b/qt/qt-2.3.7.patch/qte237-iconviewspeed.patch index 63e45ec..81064e1 100644 --- a/qt/qt-2.3.7.patch/qte237-iconviewspeed.patch +++ b/qt/qt-2.3.7.patch/qte237-iconviewspeed.patch | |||
@@ -1,37 +1,30 @@ | |||
1 | Speed up patches backported from | 1 | Speed up patches backported from |
2 | 2 | ||
3 | http://robotics.dei.unipd.it/~koral/KDE/kflicker.html | 3 | http://robotics.dei.unipd.it/~koral/KDE/kflicker.html |
4 | 4 | ||
5 | and | 5 | and |
6 | 6 | ||
7 | http://lists.kde.org/?l=kde-optimize&m=105382164111363&w=2 (complete thread) | 7 | http://lists.kde.org/?l=kde-optimize&m=105382164111363&w=2 (complete thread) |
8 | 8 | ||
9 | 9 | ||
10 | 10 | ||
11 | 11 | ||
12 | diff -u qt-2.3.7_old/src/iconview/qiconview.cpp qt-2.3.7/src/iconview/qiconview.cpp | 12 | diff -u qt-2.3.7_old/src/iconview/qiconview.cpp qt-2.3.7/src/iconview/qiconview.cpp |
13 | --- qt-2.3.7_old/src/iconview/qiconview.cpp2004-06-13 22:29:56.000000000 +0200 | 13 | --- qt-2.3.7_old/src/iconview/qiconview.cpp2004-06-13 22:29:56.000000000 +0200 |
14 | +++ qt-2.3.7/src/iconview/qiconview.cpp2004-06-13 22:33:32.000000000 +0200 | 14 | +++ qt-2.3.7/src/iconview/qiconview.cpp2004-06-13 22:33:32.000000000 +0200 |
15 | @@ -1,5 +1,5 @@ | ||
16 | /**************************************************************************** | ||
17 | -** $Id$ | ||
18 | +** $Id$ | ||
19 | ** | ||
20 | ** Implementation of QIconView widget class | ||
21 | ** | ||
22 | @@ -220,6 +220,7 @@ | 15 | @@ -220,6 +220,7 @@ |
23 | QIconView::SelectionMode selectionMode; | 16 | QIconView::SelectionMode selectionMode; |
24 | QIconViewItem *currentItem, *tmpCurrentItem, *highlightedItem, *startDragItem, *pressedItem, *selectAnchor; | 17 | QIconViewItem *currentItem, *tmpCurrentItem, *highlightedItem, *startDragItem, *pressedItem, *selectAnchor; |
25 | QRect *rubber; | 18 | QRect *rubber; |
26 | + QPixmap *backBuffer; | 19 | + QPixmap *backBuffer; |
27 | QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer, | 20 | QTimer *scrollTimer, *adjustTimer, *updateTimer, *inputTimer, |
28 | *fullRedrawTimer; | 21 | *fullRedrawTimer; |
29 | int rastX, rastY, spacing; | 22 | int rastX, rastY, spacing; |
30 | @@ -2263,6 +2264,7 @@ | 23 | @@ -2263,6 +2264,7 @@ |
31 | d->currentItem = 0; | 24 | d->currentItem = 0; |
32 | d->highlightedItem = 0; | 25 | d->highlightedItem = 0; |
33 | d->rubber = 0; | 26 | d->rubber = 0; |
34 | + d->backBuffer = 0; | 27 | + d->backBuffer = 0; |
35 | d->scrollTimer = 0; | 28 | d->scrollTimer = 0; |
36 | d->startDragItem = 0; | 29 | d->startDragItem = 0; |
37 | d->tmpCurrentItem = 0; | 30 | d->tmpCurrentItem = 0; |