summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-all.patch104
-rw-r--r--qt/qt-2.3.7.patch/qte237-gcc34.patch186
2 files changed, 226 insertions, 64 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch
index 6f94211..ea03446 100644
--- a/qt/qt-2.3.7.patch/qte237-all.patch
+++ b/qt/qt-2.3.7.patch/qte237-all.patch
@@ -580,768 +580,872 @@ diff -ur qt-2.3.7-old/src/kernel/qapplication.h qt-2.3.7/src/kernel/qapplication
580 580
581 QWidget *mainWidget() const; 581 QWidget *mainWidget() const;
582@@ -207,7 +222,10 @@ 582@@ -207,7 +222,10 @@
583 void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); 583 void qwsSetCustomColors( QRgb *colortable, int start, int numColors );
584 #ifndef QT_NO_QWS_MANAGER 584 #ifndef QT_NO_QWS_MANAGER
585 static QWSDecoration &qwsDecoration(); 585 static QWSDecoration &qwsDecoration();
586- static void qwsSetDecoration( QWSDecoration *); 586- static void qwsSetDecoration( QWSDecoration *);
587+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; 587+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL;
588+private: 588+private:
589+ static void qwsSetDecoration_NonWeak( QWSDecoration *); 589+ static void qwsSetDecoration_NonWeak( QWSDecoration *);
590+public: 590+public:
591 #endif 591 #endif
592 #endif 592 #endif
593 593
594diff -ur qt-2.3.7-old/src/kernel/qapplication_qws.cpp qt-2.3.7/src/kernel/qapplication_qws.cpp 594diff -ur qt-2.3.7-old/src/kernel/qapplication_qws.cpp qt-2.3.7/src/kernel/qapplication_qws.cpp
595 --- qt-2.3.7-old/src/kernel/qapplication_qws.cpp2004-07-23 15:22:56.000000000 +0200 595 --- qt-2.3.7-old/src/kernel/qapplication_qws.cpp2004-07-23 15:22:56.000000000 +0200
596 +++ qt-2.3.7/src/kernel/qapplication_qws.cpp2004-07-23 15:25:42.000000000 +0200 596 +++ qt-2.3.7/src/kernel/qapplication_qws.cpp2004-07-23 15:25:42.000000000 +0200
597@@ -2804,6 +2804,11 @@ 597@@ -2804,6 +2804,11 @@
598 */ 598 */
599 void QApplication::qwsSetDecoration( QWSDecoration *d ) 599 void QApplication::qwsSetDecoration( QWSDecoration *d )
600 { 600 {
601 +qwsSetDecoration_NonWeak ( d ); 601 +qwsSetDecoration_NonWeak ( d );
602+} 602+}
603+ 603+
604+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) 604+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d )
605+{ 605+{
606 if ( d ) { 606 if ( d ) {
607 delete qws_decoration; 607 delete qws_decoration;
608 qws_decoration = d; 608 qws_decoration = d;
609diff -ur qt-2.3.7-old/src/kernel/qfontdatabase.cpp qt-2.3.7/src/kernel/qfontdatabase.cpp 609diff -ur qt-2.3.7-old/src/kernel/qfontdatabase.cpp qt-2.3.7/src/kernel/qfontdatabase.cpp
610 --- qt-2.3.7-old/src/kernel/qfontdatabase.cpp2004-07-23 15:22:56.000000000 +0200 610 --- qt-2.3.7-old/src/kernel/qfontdatabase.cpp2004-07-23 15:22:56.000000000 +0200
611 +++ qt-2.3.7/src/kernel/qfontdatabase.cpp2004-07-23 15:25:42.000000000 +0200 611 +++ qt-2.3.7/src/kernel/qfontdatabase.cpp2004-07-23 15:25:42.000000000 +0200
612@@ -35,6 +35,8 @@ 612@@ -35,6 +35,8 @@
613 ** 613 **
614 **********************************************************************/ 614 **********************************************************************/
615 615
616+#define QT_WEAK_SYMBOL __attribute__(( weak )) 616+#define QT_WEAK_SYMBOL __attribute__(( weak ))
617+ 617+
618 #include "qfontdatabase.h" 618 #include "qfontdatabase.h"
619 619
620 #ifndef QT_NO_FONTDATABASE 620 #ifndef QT_NO_FONTDATABASE
621@@ -2424,6 +2426,13 @@ 621@@ -2424,6 +2426,13 @@
622 const QString &style, 622 const QString &style,
623 const QString &charSet ) 623 const QString &charSet )
624 { 624 {
625 +return pointSizes_NonWeak ( family, style, charSet ); 625 +return pointSizes_NonWeak ( family, style, charSet );
626+} 626+}
627+ 627+
628+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, 628+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family,
629+ const QString &style, 629+ const QString &style,
630+ const QString &charSet ) 630+ const QString &charSet )
631+{ 631+{
632 QString cs( charSet ); 632 QString cs( charSet );
633 if ( charSet.isEmpty() ) { 633 if ( charSet.isEmpty() ) {
634 QStringList lst = charSets( family ); 634 QStringList lst = charSets( family );
635diff -ur qt-2.3.7-old/src/kernel/qfontdatabase.h qt-2.3.7/src/kernel/qfontdatabase.h 635diff -ur qt-2.3.7-old/src/kernel/qfontdatabase.h qt-2.3.7/src/kernel/qfontdatabase.h
636 --- qt-2.3.7-old/src/kernel/qfontdatabase.h2004-07-23 15:22:56.000000000 +0200 636 --- qt-2.3.7-old/src/kernel/qfontdatabase.h2004-07-23 15:22:56.000000000 +0200
637 +++ qt-2.3.7/src/kernel/qfontdatabase.h2004-07-23 15:25:42.000000000 +0200 637 +++ qt-2.3.7/src/kernel/qfontdatabase.h2004-07-23 15:25:42.000000000 +0200
638@@ -59,6 +59,10 @@ 638@@ -59,6 +59,10 @@
639 class QDiskFont; 639 class QDiskFont;
640 #endif 640 #endif
641 641
642+#if !defined( QT_WEAK_SYMBOL ) 642+#if !defined( QT_WEAK_SYMBOL )
643+#define QT_WEAK_SYMBOL 643+#define QT_WEAK_SYMBOL
644+#endif 644+#endif
645+ 645+
646 class QFontDatabasePrivate; 646 class QFontDatabasePrivate;
647 647
648 class Q_EXPORT QFontDatabase 648 class Q_EXPORT QFontDatabase
649@@ -67,9 +71,16 @@ 649@@ -67,9 +71,16 @@
650 QFontDatabase(); 650 QFontDatabase();
651 651
652 QStringList families( bool onlyForLocale = TRUE ) const; 652 QStringList families( bool onlyForLocale = TRUE ) const;
653+ 653+
654+ 654+
655 QValueList<int> pointSizes( const QString &family, 655 QValueList<int> pointSizes( const QString &family,
656 const QString &style = QString::null, 656 const QString &style = QString::null,
657 - const QString &charSet = QString::null ); 657 - const QString &charSet = QString::null );
658 + const QString &charSet = QString::null ) QT_WEAK_SYMBOL; 658 + const QString &charSet = QString::null ) QT_WEAK_SYMBOL;
659+private: 659+private:
660+ QValueList<int> pointSizes_NonWeak( const QString &family, 660+ QValueList<int> pointSizes_NonWeak( const QString &family,
661 + const QString &style, 661 + const QString &style,
662 + const QString &charSet ); 662 + const QString &charSet );
663+public: 663+public:
664 QStringList styles( const QString &family, 664 QStringList styles( const QString &family,
665 const QString &charSet = QString::null ) const; 665 const QString &charSet = QString::null ) const;
666 QStringList charSets( const QString &familyName, 666 QStringList charSets( const QString &familyName,
667diff -ur qt-2.3.7-old/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp 667diff -ur qt-2.3.7-old/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp
668 --- qt-2.3.7-old/src/kernel/qgfxtransformed_qws.cpp2004-07-23 15:22:56.000000000 +0200 668 --- qt-2.3.7-old/src/kernel/qgfxtransformed_qws.cpp2004-07-23 15:22:56.000000000 +0200
669 +++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp2004-07-23 15:42:01.000000000 +0200 669 +++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp2004-07-23 15:42:01.000000000 +0200
670@@ -671,11 +671,11 @@ 670@@ -671,11 +671,11 @@
671 inline int tx( int x, int y ) { 671 inline int tx( int x, int y ) {
672 switch ( qt_trans_screen->transformation() ) { 672 switch ( qt_trans_screen->transformation() ) {
673 case QTransformedScreen::Rot90: 673 case QTransformedScreen::Rot90:
674 - return y - xoffs + yoffs; 674 - return y - xoffs + yoffs;
675 + return y - this->xoffs + this->yoffs; 675 + return y - this->xoffs + this->yoffs;
676 case QTransformedScreen::Rot180: 676 case QTransformedScreen::Rot180:
677 - return (width - x - 1) - xoffs - xoffs; 677 - return (width - x - 1) - xoffs - xoffs;
678 + return (this->width - x - 1) - this->xoffs - this->xoffs; 678 + return (this->width - x - 1) - this->xoffs - this->xoffs;
679 case QTransformedScreen::Rot270: 679 case QTransformedScreen::Rot270:
680 - return (height - y - 1) - xoffs - yoffs; 680 - return (height - y - 1) - xoffs - yoffs;
681 + return (this->height - y - 1) - this->xoffs - this->yoffs; 681 + return (this->height - y - 1) - this->xoffs - this->yoffs;
682 default: 682 default:
683 return x; 683 return x;
684 } 684 }
685@@ -683,11 +683,11 @@ 685@@ -683,11 +683,11 @@
686 inline int ty( int x, int y ) { 686 inline int ty( int x, int y ) {
687 switch ( qt_trans_screen->transformation() ) { 687 switch ( qt_trans_screen->transformation() ) {
688 case QTransformedScreen::Rot90: 688 case QTransformedScreen::Rot90:
689 - return (width - x - 1) - yoffs - xoffs; 689 - return (width - x - 1) - yoffs - xoffs;
690 + return (this->width - x - 1) - this->yoffs - this->xoffs; 690 + return (this->width - x - 1) - this->yoffs - this->xoffs;
691 case QTransformedScreen::Rot180: 691 case QTransformedScreen::Rot180:
692 - return (height - y - 1) - yoffs - yoffs; 692 - return (height - y - 1) - yoffs - yoffs;
693 + return (this->height - y - 1) - this->yoffs - this->yoffs; 693 + return (this->height - y - 1) - this->yoffs - this->yoffs;
694 case QTransformedScreen::Rot270: 694 case QTransformedScreen::Rot270:
695 - return x - yoffs + xoffs; 695 - return x - yoffs + xoffs;
696 + return x - this->yoffs + this->xoffs; 696 + return x - this->yoffs + this->xoffs;
697 default: 697 default:
698 return y; 698 return y;
699 } 699 }
700@@ -715,23 +715,23 @@ 700@@ -715,23 +715,23 @@
701 template <const int depth, const int type> 701 template <const int depth, const int type>
702 void QGfxTransformedRaster<depth,type>::setSourceWidgetOffset(int x, int y) 702 void QGfxTransformedRaster<depth,type>::setSourceWidgetOffset(int x, int y)
703 { 703 {
704- if ( srcbits == buffer ) { 704- if ( srcbits == buffer ) {
705+ if ( this->srcbits == this->buffer ) { 705+ if ( this->srcbits == this->buffer ) {
706 switch ( qt_trans_screen->transformation() ) { 706 switch ( qt_trans_screen->transformation() ) {
707 case QTransformedScreen::Rot90: 707 case QTransformedScreen::Rot90:
708 - srcwidgetoffs = QPoint( y, width - x - srcwidth ); 708 - srcwidgetoffs = QPoint( y, width - x - srcwidth );
709 + this->srcwidgetoffs = QPoint( y, this->width - x - this->srcwidth ); 709 + this->srcwidgetoffs = QPoint( y, this->width - x - this->srcwidth );
710 break; 710 break;
711 case QTransformedScreen::Rot180: 711 case QTransformedScreen::Rot180:
712 - srcwidgetoffs = QPoint( width - x - srcwidth, height - y - srcheight ); 712 - srcwidgetoffs = QPoint( width - x - srcwidth, height - y - srcheight );
713 + this->srcwidgetoffs = QPoint( this->width - x - this->srcwidth, this->height - y - this->srcheight ); 713 + this->srcwidgetoffs = QPoint( this->width - x - this->srcwidth, this->height - y - this->srcheight );
714 break; 714 break;
715 case QTransformedScreen::Rot270: 715 case QTransformedScreen::Rot270:
716 - srcwidgetoffs = QPoint( height - y - srcheight, x ); 716 - srcwidgetoffs = QPoint( height - y - srcheight, x );
717 + this->srcwidgetoffs = QPoint( this->height - y - this->srcheight, x ); 717 + this->srcwidgetoffs = QPoint( this->height - y - this->srcheight, x );
718 break; 718 break;
719 default: 719 default:
720 - srcwidgetoffs = QPoint( x, y ); 720 - srcwidgetoffs = QPoint( x, y );
721 + this->srcwidgetoffs = QPoint( x, y ); 721 + this->srcwidgetoffs = QPoint( x, y );
722 break; 722 break;
723 } 723 }
724 } else 724 } else
725 -srcwidgetoffs = QPoint( x, y ); 725 -srcwidgetoffs = QPoint( x, y );
726 +this->srcwidgetoffs = QPoint( x, y ); 726 +this->srcwidgetoffs = QPoint( x, y );
727 } 727 }
728 728
729 template <const int depth, const int type> 729 template <const int depth, const int type>
730@@ -739,8 +739,8 @@ 730@@ -739,8 +739,8 @@
731 { 731 {
732 QT_TRANS_GFX_BASE<depth,type>::setSource(i); 732 QT_TRANS_GFX_BASE<depth,type>::setSource(i);
733 QSize s = qt_screen->mapToDevice( QSize(i->width(), i->height()) ); 733 QSize s = qt_screen->mapToDevice( QSize(i->width(), i->height()) );
734- srcwidth = s.width(); 734- srcwidth = s.width();
735- srcheight = s.height(); 735- srcheight = s.height();
736+ this->srcwidth = s.width(); 736+ this->srcwidth = s.width();
737+ this->srcheight = s.height(); 737+ this->srcheight = s.height();
738 } 738 }
739 739
740 template <const int depth, const int type> 740 template <const int depth, const int type>
741@@ -782,7 +782,7 @@ 741@@ -782,7 +782,7 @@
742 if ( w == 0 || h == 0 ) 742 if ( w == 0 || h == 0 )
743 return; 743 return;
744 QRect r( x, y, w, h ); 744 QRect r( x, y, w, h );
745- if ( cbrush.style() == SolidPattern ) { 745- if ( cbrush.style() == SolidPattern ) {
746+ if ( this->cbrush.style() == Qt::SolidPattern ) { 746+ if ( this->cbrush.style() == Qt::SolidPattern ) {
747 r.setCoords( tx(x,y), ty(x,y), tx(x+w-1,y+h-1), ty(x+w-1,y+h-1) ); 747 r.setCoords( tx(x,y), ty(x,y), tx(x+w-1,y+h-1), ty(x+w-1,y+h-1) );
748 r = r.normalize(); 748 r = r.normalize();
749 } 749 }
750@@ -797,7 +797,7 @@ 750@@ -797,7 +797,7 @@
751 // solution. The brush offset logic is complicated enough, so we don't 751 // solution. The brush offset logic is complicated enough, so we don't
752 // fastpath patternedbrush. 752 // fastpath patternedbrush.
753 753
754- if ( inDraw || cpen.style()==NoPen || patternedbrush ) { 754- if ( inDraw || cpen.style()==NoPen || patternedbrush ) {
755+ if ( inDraw || this->cpen.style()==Qt::NoPen || this->patternedbrush ) { 755+ if ( inDraw || this->cpen.style()==Qt::NoPen || this->patternedbrush ) {
756 //slowpath 756 //slowpath
757 QT_TRANS_GFX_BASE<depth,type>::drawPolygon( a, w, idx, num ); 757 QT_TRANS_GFX_BASE<depth,type>::drawPolygon( a, w, idx, num );
758 } else { 758 } else {
759@@ -819,29 +819,29 @@ 759@@ -819,29 +819,29 @@
760 template <const int depth, const int type> 760 template <const int depth, const int type>
761 void QGfxTransformedRaster<depth,type>::processSpans( int n, QPoint* point, int* width ) 761 void QGfxTransformedRaster<depth,type>::processSpans( int n, QPoint* point, int* width )
762 { 762 {
763- if ( inDraw || patternedbrush && srcwidth != 0 && srcheight != 0 ) { 763- if ( inDraw || patternedbrush && srcwidth != 0 && srcheight != 0 ) {
764+ if ( inDraw || this->patternedbrush && this->srcwidth != 0 && this->srcheight != 0 ) { 764+ if ( inDraw || this->patternedbrush && this->srcwidth != 0 && this->srcheight != 0 ) {
765 //in the patternedbrush case, we let blt do the transformation 765 //in the patternedbrush case, we let blt do the transformation
766 // so we leave inDraw false. 766 // so we leave inDraw false.
767 - QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); 767 - QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width );
768 +QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); 768 +QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width );
769 } else { 769 } else {
770 inDraw = TRUE; 770 inDraw = TRUE;
771 while (n--) { 771 while (n--) {
772 if ( *width > 0 ) { 772 if ( *width > 0 ) {
773 - int x=tx(point->x(),point->y())+xoffs; 773 - int x=tx(point->x(),point->y())+xoffs;
774 - int y=ty(point->x(),point->y())+yoffs; 774 - int y=ty(point->x(),point->y())+yoffs;
775 + int x=tx(point->x(),point->y())+this->xoffs; 775 + int x=tx(point->x(),point->y())+this->xoffs;
776 + int y=ty(point->x(),point->y())+this->yoffs; 776 + int y=ty(point->x(),point->y())+this->yoffs;
777 777
778 switch( qt_trans_screen->transformation() ) { 778 switch( qt_trans_screen->transformation() ) {
779 case QTransformedScreen::Rot90: 779 case QTransformedScreen::Rot90:
780 - vline( x, y-(*width-1), y ); 780 - vline( x, y-(*width-1), y );
781 + this->vline( x, y-(*width-1), y ); 781 + this->vline( x, y-(*width-1), y );
782 break; 782 break;
783 case QTransformedScreen::Rot180: 783 case QTransformedScreen::Rot180:
784 - hline( x - (*width-1), x, y ); 784 - hline( x - (*width-1), x, y );
785 + this->hline( x - (*width-1), x, y ); 785 + this->hline( x - (*width-1), x, y );
786 break; 786 break;
787 case QTransformedScreen::Rot270: 787 case QTransformedScreen::Rot270:
788 - vline( x, y, y+*width-1 ); 788 - vline( x, y, y+*width-1 );
789 + this->vline( x, y, y+*width-1 ); 789 + this->vline( x, y, y+*width-1 );
790 break; 790 break;
791 default: 791 default:
792 - hline( x, x+*width-1, y ); 792 - hline( x, x+*width-1, y );
793 + this->hline( x, x+*width-1, y ); 793 + this->hline( x, x+*width-1, y );
794 break; 794 break;
795 } 795 }
796 } 796 }
797@@ -896,14 +896,14 @@ 797@@ -896,14 +896,14 @@
798 switch ( qt_trans_screen->transformation() ) { 798 switch ( qt_trans_screen->transformation() ) {
799 case QTransformedScreen::Rot90: 799 case QTransformedScreen::Rot90:
800 rsx = sy; 800 rsx = sy;
801 - rsy = srcwidth - sx - w; 801 - rsy = srcwidth - sx - w;
802 + rsy = this->srcwidth - sx - w; 802 + rsy = this->srcwidth - sx - w;
803 break; 803 break;
804 case QTransformedScreen::Rot180: 804 case QTransformedScreen::Rot180:
805 - rsx = srcwidth - sx - w; 805 - rsx = srcwidth - sx - w;
806 - rsy = srcheight - sy - h; 806 - rsy = srcheight - sy - h;
807 + rsx = this->srcwidth - sx - w; 807 + rsx = this->srcwidth - sx - w;
808 + rsy = this->srcheight - sy - h; 808 + rsy = this->srcheight - sy - h;
809 break; 809 break;
810 case QTransformedScreen::Rot270: 810 case QTransformedScreen::Rot270:
811 - rsx = srcheight - sy - h; 811 - rsx = srcheight - sy - h;
812 + rsx = this->srcheight - sy - h; 812 + rsx = this->srcheight - sy - h;
813 rsy = sx; 813 rsy = sx;
814 break; 814 break;
815 default: 815 default:
816@@ -941,39 +941,39 @@ 816@@ -941,39 +941,39 @@
817 r.setCoords( tx(rx,ry), ty(rx,ry), tx(rx+w-1,ry+h-1), ty(rx+w-1,ry+h-1) ); 817 r.setCoords( tx(rx,ry), ty(rx,ry), tx(rx+w-1,ry+h-1), ty(rx+w-1,ry+h-1) );
818 r = r.normalize(); 818 r = r.normalize();
819 819
820- QPoint oldBrushOffs = brushoffs; 820- QPoint oldBrushOffs = brushoffs;
821+ QPoint oldBrushOffs = this->brushoffs; 821+ QPoint oldBrushOffs = this->brushoffs;
822 int brx, bry; 822 int brx, bry;
823 switch ( qt_trans_screen->transformation() ) { 823 switch ( qt_trans_screen->transformation() ) {
824 case QTransformedScreen::Rot90: 824 case QTransformedScreen::Rot90:
825 - brx = brushoffs.y(); 825 - brx = brushoffs.y();
826 - bry = srcwidth - brushoffs.x() - w; 826 - bry = srcwidth - brushoffs.x() - w;
827 + brx = this->brushoffs.y(); 827 + brx = this->brushoffs.y();
828 + bry = this->srcwidth - this->brushoffs.x() - w; 828 + bry = this->srcwidth - this->brushoffs.x() - w;
829 break; 829 break;
830 case QTransformedScreen::Rot180: 830 case QTransformedScreen::Rot180:
831 - brx = srcwidth - brushoffs.x() - w; 831 - brx = srcwidth - brushoffs.x() - w;
832 - bry = srcheight - brushoffs.y() - h; 832 - bry = srcheight - brushoffs.y() - h;
833 + brx = this->srcwidth - this->brushoffs.x() - w; 833 + brx = this->srcwidth - this->brushoffs.x() - w;
834 + bry = this->srcheight - this->brushoffs.y() - h; 834 + bry = this->srcheight - this->brushoffs.y() - h;
835 break; 835 break;
836 case QTransformedScreen::Rot270: 836 case QTransformedScreen::Rot270:
837 - brx = srcheight - brushoffs.y() - h; 837 - brx = srcheight - brushoffs.y() - h;
838 - bry = brushoffs.x(); 838 - bry = brushoffs.x();
839 + brx = this->srcheight - this->brushoffs.y() - h; 839 + brx = this->srcheight - this->brushoffs.y() - h;
840 + bry = this->brushoffs.x(); 840 + bry = this->brushoffs.x();
841 break; 841 break;
842 default: 842 default:
843 - brx = brushoffs.x(); 843 - brx = brushoffs.x();
844 - bry = brushoffs.y(); 844 - bry = brushoffs.y();
845 + brx = this->brushoffs.x(); 845 + brx = this->brushoffs.x();
846 + bry = this->brushoffs.y(); 846 + bry = this->brushoffs.y();
847 break; 847 break;
848 } 848 }
849- brushoffs = QPoint( brx, bry ); 849- brushoffs = QPoint( brx, bry );
850+ this->brushoffs = QPoint( brx, bry ); 850+ this->brushoffs = QPoint( brx, bry );
851 851
852- int oldsw = srcwidth; 852- int oldsw = srcwidth;
853- int oldsh = srcheight; 853- int oldsh = srcheight;
854- QSize s = qt_screen->mapToDevice( QSize(srcwidth,srcheight) ); 854- QSize s = qt_screen->mapToDevice( QSize(srcwidth,srcheight) );
855- srcwidth = s.width(); 855- srcwidth = s.width();
856- srcheight = s.height(); 856- srcheight = s.height();
857+ int oldsw = this->srcwidth; 857+ int oldsw = this->srcwidth;
858+ int oldsh = this->srcheight; 858+ int oldsh = this->srcheight;
859+ QSize s = qt_screen->mapToDevice( QSize(this->srcwidth,this->srcheight) ); 859+ QSize s = qt_screen->mapToDevice( QSize(this->srcwidth,this->srcheight) );
860+ this->srcwidth = s.width(); 860+ this->srcwidth = s.width();
861+ this->srcheight = s.height(); 861+ this->srcheight = s.height();
862 862
863 QT_TRANS_GFX_BASE<depth,type>::tiledBlt( r.x(), r.y(), r.width(), r.height() ); 863 QT_TRANS_GFX_BASE<depth,type>::tiledBlt( r.x(), r.y(), r.width(), r.height() );
864 864
865- srcwidth = oldsw; 865- srcwidth = oldsw;
866- srcheight = oldsh; 866- srcheight = oldsh;
867- brushoffs = oldBrushOffs; 867- brushoffs = oldBrushOffs;
868+ this->srcwidth = oldsw; 868+ this->srcwidth = oldsw;
869+ this->srcheight = oldsh; 869+ this->srcheight = oldsh;
870+ this->brushoffs = oldBrushOffs; 870+ this->brushoffs = oldBrushOffs;
871 inDraw = FALSE; 871 inDraw = FALSE;
872 } 872 }
873 873
874diff -ur qt-2.3.7-old/src/kernel/qgfxvfb_qws.cpp qt-2.3.7/src/kernel/qgfxvfb_qws.cpp 874diff -ur qt-2.3.7-old/src/kernel/qgfxvfb_qws.cpp qt-2.3.7/src/kernel/qgfxvfb_qws.cpp
875 --- qt-2.3.7-old/src/kernel/qgfxvfb_qws.cpp2004-07-23 15:22:56.000000000 +0200 875 --- qt-2.3.7-old/src/kernel/qgfxvfb_qws.cpp2004-07-23 15:22:56.000000000 +0200
876 +++ qt-2.3.7/src/kernel/qgfxvfb_qws.cpp2004-07-23 15:42:01.000000000 +0200 876 +++ qt-2.3.7/src/kernel/qgfxvfb_qws.cpp2004-07-23 15:42:01.000000000 +0200
877@@ -31,7 +31,6 @@ 877@@ -31,7 +31,6 @@
878 **********************************************************************/ 878 **********************************************************************/
879 879
880 #include "qgfxraster_qws.h" 880 #include "qgfxraster_qws.h"
881- 881-
882 #ifndef QT_NO_QWS_VFB 882 #ifndef QT_NO_QWS_VFB
883 883
884 #include <sys/ipc.h> 884 #include <sys/ipc.h>
885@@ -140,8 +139,8 @@ 885@@ -140,8 +139,8 @@
886 void QGfxVFb<depth,type>::drawPoint( int x, int y ) 886 void QGfxVFb<depth,type>::drawPoint( int x, int y )
887 { 887 {
888 QWSDisplay::grab( TRUE ); 888 QWSDisplay::grab( TRUE );
889- if ( is_screen_gfx ) 889- if ( is_screen_gfx )
890 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) ); 890 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) );
891+ if ( this->is_screen_gfx ) 891+ if ( this->is_screen_gfx )
892 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) ); 892 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) );
893 QGfxRaster<depth,type>::drawPoint( x, y ); 893 QGfxRaster<depth,type>::drawPoint( x, y );
894 QWSDisplay::ungrab(); 894 QWSDisplay::ungrab();
895 } 895 }
896@@ -150,8 +149,8 @@ 896@@ -150,8 +149,8 @@
897 void QGfxVFb<depth,type>::drawPoints( const QPointArray &pa,int x,int y ) 897 void QGfxVFb<depth,type>::drawPoints( const QPointArray &pa,int x,int y )
898 { 898 {
899 QWSDisplay::grab( TRUE ); 899 QWSDisplay::grab( TRUE );
900- if ( is_screen_gfx ) 900- if ( is_screen_gfx )
901 -qvfb_screen->setDirty( clipbounds ); 901 -qvfb_screen->setDirty( clipbounds );
902+ if ( this->is_screen_gfx ) 902+ if ( this->is_screen_gfx )
903 +qvfb_screen->setDirty( this->clipbounds ); 903 +qvfb_screen->setDirty( this->clipbounds );
904 QGfxRaster<depth,type>::drawPoints( pa, x, y ); 904 QGfxRaster<depth,type>::drawPoints( pa, x, y );
905 QWSDisplay::ungrab(); 905 QWSDisplay::ungrab();
906 } 906 }
907@@ -160,9 +159,9 @@ 907@@ -160,9 +159,9 @@
908 void QGfxVFb<depth,type>::drawLine( int x1,int y1,int x2,int y2 ) 908 void QGfxVFb<depth,type>::drawLine( int x1,int y1,int x2,int y2 )
909 { 909 {
910 QWSDisplay::grab( TRUE ); 910 QWSDisplay::grab( TRUE );
911- if ( is_screen_gfx ) { 911- if ( is_screen_gfx ) {
912+ if ( this->is_screen_gfx ) { 912+ if ( this->is_screen_gfx ) {
913 QRect r; 913 QRect r;
914 -r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs ); 914 -r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs );
915 +r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs ); 915 +r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs );
916 qvfb_screen->setDirty( r.normalize() ); 916 qvfb_screen->setDirty( r.normalize() );
917 } 917 }
918 QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); 918 QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 );
919@@ -173,8 +172,8 @@ 919@@ -173,8 +172,8 @@
920 void QGfxVFb<depth,type>::fillRect( int x,int y,int w,int h ) 920 void QGfxVFb<depth,type>::fillRect( int x,int y,int w,int h )
921 { 921 {
922 QWSDisplay::grab( TRUE ); 922 QWSDisplay::grab( TRUE );
923- if ( is_screen_gfx ) 923- if ( is_screen_gfx )
924 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); 924 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) );
925+ if ( this->is_screen_gfx ) 925+ if ( this->is_screen_gfx )
926 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); 926 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) );
927 QGfxRaster<depth,type>::fillRect( x, y, w, h ); 927 QGfxRaster<depth,type>::fillRect( x, y, w, h );
928 QWSDisplay::ungrab(); 928 QWSDisplay::ungrab();
929 } 929 }
930@@ -183,8 +182,8 @@ 930@@ -183,8 +182,8 @@
931 void QGfxVFb<depth,type>::drawPolyline( const QPointArray &pa,int x,int y ) 931 void QGfxVFb<depth,type>::drawPolyline( const QPointArray &pa,int x,int y )
932 { 932 {
933 QWSDisplay::grab( TRUE ); 933 QWSDisplay::grab( TRUE );
934- if ( is_screen_gfx ) 934- if ( is_screen_gfx )
935 -qvfb_screen->setDirty( clipbounds ); 935 -qvfb_screen->setDirty( clipbounds );
936+ if ( this->is_screen_gfx ) 936+ if ( this->is_screen_gfx )
937 +qvfb_screen->setDirty( this->clipbounds ); 937 +qvfb_screen->setDirty( this->clipbounds );
938 QGfxRaster<depth,type>::drawPolyline( pa, x, y ); 938 QGfxRaster<depth,type>::drawPolyline( pa, x, y );
939 QWSDisplay::ungrab(); 939 QWSDisplay::ungrab();
940 } 940 }
941@@ -193,8 +192,8 @@ 941@@ -193,8 +192,8 @@
942 void QGfxVFb<depth,type>::drawPolygon( const QPointArray &pa,bool w,int x,int y ) 942 void QGfxVFb<depth,type>::drawPolygon( const QPointArray &pa,bool w,int x,int y )
943 { 943 {
944 QWSDisplay::grab( TRUE ); 944 QWSDisplay::grab( TRUE );
945- if ( is_screen_gfx ) 945- if ( is_screen_gfx )
946 -qvfb_screen->setDirty( clipbounds ); 946 -qvfb_screen->setDirty( clipbounds );
947+ if ( this->is_screen_gfx ) 947+ if ( this->is_screen_gfx )
948 +qvfb_screen->setDirty( this->clipbounds ); 948 +qvfb_screen->setDirty( this->clipbounds );
949 QGfxRaster<depth,type>::drawPolygon( pa, w, x, y ); 949 QGfxRaster<depth,type>::drawPolygon( pa, w, x, y );
950 QWSDisplay::ungrab(); 950 QWSDisplay::ungrab();
951 } 951 }
952@@ -203,8 +202,8 @@ 952@@ -203,8 +202,8 @@
953 void QGfxVFb<depth,type>::blt( int x,int y,int w,int h, int sx, int sy ) 953 void QGfxVFb<depth,type>::blt( int x,int y,int w,int h, int sx, int sy )
954 { 954 {
955 QWSDisplay::grab( TRUE ); 955 QWSDisplay::grab( TRUE );
956- if ( is_screen_gfx ) 956- if ( is_screen_gfx )
957 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); 957 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) );
958+ if ( this->is_screen_gfx ) 958+ if ( this->is_screen_gfx )
959 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); 959 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) );
960 QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy ); 960 QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy );
961 QWSDisplay::ungrab(); 961 QWSDisplay::ungrab();
962 } 962 }
963@@ -215,8 +214,8 @@ 963@@ -215,8 +214,8 @@
964 QWSDisplay::grab( TRUE ); 964 QWSDisplay::grab( TRUE );
965 int dy = sy - y; 965 int dy = sy - y;
966 int dx = sx - x; 966 int dx = sx - x;
967- if ( is_screen_gfx ) 967- if ( is_screen_gfx )
968 -qvfb_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs, 968 -qvfb_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs,
969+ if ( this->is_screen_gfx ) 969+ if ( this->is_screen_gfx )
970 +qvfb_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs, 970 +qvfb_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs,
971 w+abs(dx), h+abs(dy)) ); 971 w+abs(dx), h+abs(dy)) );
972 QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy ); 972 QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy );
973 QWSDisplay::ungrab(); 973 QWSDisplay::ungrab();
974@@ -227,8 +226,8 @@ 974@@ -227,8 +226,8 @@
975 void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy ) 975 void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy )
976 { 976 {
977 QWSDisplay::grab( TRUE ); 977 QWSDisplay::grab( TRUE );
978- if ( is_screen_gfx ) 978- if ( is_screen_gfx )
979 -qvfb_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) ); 979 -qvfb_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) );
980+ if ( this->is_screen_gfx ) 980+ if ( this->is_screen_gfx )
981 +qvfb_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) ); 981 +qvfb_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) );
982 QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy ); 982 QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
983 QWSDisplay::ungrab(); 983 QWSDisplay::ungrab();
984 } 984 }
985@@ -238,8 +237,8 @@ 985@@ -238,8 +237,8 @@
986 void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h ) 986 void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h )
987 { 987 {
988 QWSDisplay::grab( TRUE ); 988 QWSDisplay::grab( TRUE );
989- if ( is_screen_gfx ) 989- if ( is_screen_gfx )
990 -qvfb_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) ); 990 -qvfb_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) );
991+ if ( this->is_screen_gfx ) 991+ if ( this->is_screen_gfx )
992 +qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) ); 992 +qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) );
993 QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); 993 QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
994 QWSDisplay::ungrab(); 994 QWSDisplay::ungrab();
995 } 995 }
996diff -ur qt-2.3.7-old/src/kernel/qkeyboard_qws.cpp qt-2.3.7/src/kernel/qkeyboard_qws.cpp 996diff -ur qt-2.3.7-old/src/kernel/qkeyboard_qws.cpp qt-2.3.7/src/kernel/qkeyboard_qws.cpp
997 --- qt-2.3.7-old/src/kernel/qkeyboard_qws.cpp2004-07-23 15:22:56.000000000 +0200 997 --- qt-2.3.7-old/src/kernel/qkeyboard_qws.cpp2004-07-23 15:22:56.000000000 +0200
998 +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2004-07-23 15:33:46.000000000 +0200 998 +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2004-07-23 15:33:46.000000000 +0200
999@@ -238,7 +238,7 @@ 999@@ -238,7 +238,7 @@
1000 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63 1000 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 63
1001 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64 1001 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 64
1002 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65 1002 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 65
1003 - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66 1003 - { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 66
1004+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 1004+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66
1005 { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 1005 { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67
1006 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68 1006 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 68
1007 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69 1007 { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69
1008diff -ur qt-2.3.7-old/src/kernel/qwindowsystem_qws.cpp qt-2.3.7/src/kernel/qwindowsystem_qws.cpp 1008diff -ur qt-2.3.7-old/src/kernel/qwindowsystem_qws.cpp qt-2.3.7/src/kernel/qwindowsystem_qws.cpp
1009 --- qt-2.3.7-old/src/kernel/qwindowsystem_qws.cpp2004-07-23 15:22:56.000000000 +0200 1009 --- qt-2.3.7-old/src/kernel/qwindowsystem_qws.cpp2004-07-23 15:22:56.000000000 +0200
1010 +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp2004-07-23 15:33:47.000000000 +0200 1010 +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp2004-07-23 15:33:47.000000000 +0200
1011@@ -844,6 +844,18 @@ 1011@@ -844,6 +844,18 @@
1012 { 1012 {
1013 } 1013 }
1014 1014
1015+static void catchSegvSignal( int ) 1015+static void catchSegvSignal( int )
1016+{ 1016+{
1017+#ifndef QT_NO_QWS_KEYBOARD 1017+#ifndef QT_NO_QWS_KEYBOARD
1018+ if ( qwsServer ) 1018+ if ( qwsServer )
1019 +qwsServer->closeKeyboard(); 1019 +qwsServer->closeKeyboard();
1020+#endif 1020+#endif
1021+ QWSServer::closedown(); 1021+ QWSServer::closedown();
1022+ fprintf(stderr, "Segmentation fault.\n"); 1022+ fprintf(stderr, "Segmentation fault.\n");
1023+ exit(1); 1023+ exit(1);
1024+} 1024+}
1025+ 1025+
1026+ 1026+
1027 /*! 1027 /*!
1028 \class QWSServer qwindowsystem_qws.h 1028 \class QWSServer qwindowsystem_qws.h
1029 \brief Server-specific functionality in Qt/Embedded 1029 \brief Server-specific functionality in Qt/Embedded
1030@@ -936,6 +948,7 @@ 1030@@ -936,6 +948,7 @@
1031 } 1031 }
1032 1032
1033 signal(SIGPIPE, ignoreSignal); //we get it when we read 1033 signal(SIGPIPE, ignoreSignal); //we get it when we read
1034+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash 1034+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
1035 #endif 1035 #endif
1036 focusw = 0; 1036 focusw = 0;
1037 mouseGrabber = 0; 1037 mouseGrabber = 0;
1038diff -ur qt-2.3.7-old/src/tools/qcstring.h qt-2.3.7/src/tools/qcstring.h 1038diff -ur qt-2.3.7-old/src/tools/qcstring.h qt-2.3.7/src/tools/qcstring.h
1039 --- qt-2.3.7-old/src/tools/qcstring.h2004-07-23 15:22:56.000000000 +0200 1039 --- qt-2.3.7-old/src/tools/qcstring.h2004-07-23 15:22:56.000000000 +0200
1040 +++ qt-2.3.7/src/tools/qcstring.h2004-07-23 15:42:01.000000000 +0200 1040 +++ qt-2.3.7/src/tools/qcstring.h2004-07-23 15:42:01.000000000 +0200
1041@@ -119,7 +119,7 @@ 1041@@ -119,7 +119,7 @@
1042 // We want to keep source compatibility for 2.x 1042 // We want to keep source compatibility for 2.x
1043 // ### TODO for 4.0: completely remove these and the cstr* functions 1043 // ### TODO for 4.0: completely remove these and the cstr* functions
1044 1044
1045-#if !defined(QT_GENUINE_STR) 1045-#if !defined(QT_GENUINE_STR)
1046+#if 0 1046+#if 0
1047 1047
1048 #undefstrlen 1048 #undefstrlen
1049 #define strlen qstrlen 1049 #define strlen qstrlen
1050diff -ur qt-2.3.7-old/src/tools/qglobal.h qt-2.3.7/src/tools/qglobal.h 1050diff -ur qt-2.3.7-old/src/tools/qglobal.h qt-2.3.7/src/tools/qglobal.h
1051 --- qt-2.3.7-old/src/tools/qglobal.h2004-07-23 15:22:56.000000000 +0200 1051 --- qt-2.3.7-old/src/tools/qglobal.h2004-07-23 15:22:56.000000000 +0200
1052 +++ qt-2.3.7/src/tools/qglobal.h2004-07-23 15:42:01.000000000 +0200 1052 +++ qt-2.3.7/src/tools/qglobal.h2004-07-23 15:42:01.000000000 +0200
1053@@ -207,8 +207,16 @@ 1053@@ -207,8 +207,16 @@
1054 #if __GNUC__ == 2 && __GNUC_MINOR__ == 96 1054 #if __GNUC__ == 2 && __GNUC_MINOR__ == 96
1055 #define Q_FP_CCAST_BROKEN 1055 #define Q_FP_CCAST_BROKEN
1056 #endif 1056 #endif
1057+/* ARM gcc pads structs to 32 bits, even when they contain a single 1057+/* ARM gcc pads structs to 32 bits, even when they contain a single
1058+ char, or short. We tell gcc to pack QChars to 16 bits, to avoid 1058+ char, or short. We tell gcc to pack QChars to 16 bits, to avoid
1059+ QString bloat. However, gcc 3.4 doesn't allow us to create references to 1059+ QString bloat. However, gcc 3.4 doesn't allow us to create references to
1060+ members of a packed struct. (Pointers are OK, because then you 1060+ members of a packed struct. (Pointers are OK, because then you
1061+ supposedly know what you are doing.) */ 1061+ supposedly know what you are doing.) */
1062 #if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) 1062 #if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
1063 #define Q_PACKED __attribute__ ((packed)) 1063 #define Q_PACKED __attribute__ ((packed))
1064+# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 1064+# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
1065+# define Q_NO_PACKED_REFERENCE 1065+# define Q_NO_PACKED_REFERENCE
1066+# endif 1066+# endif
1067 #endif 1067 #endif
1068 #elif defined(__xlC__) 1068 #elif defined(__xlC__)
1069 #define _CC_XLC_ 1069 #define _CC_XLC_
1070diff -ur qt-2.3.7-old/src/tools/qmodules.h qt-2.3.7/src/tools/qmodules.h 1070diff -ur qt-2.3.7-old/src/tools/qmodules.h qt-2.3.7/src/tools/qmodules.h
1071 --- qt-2.3.7-old/src/tools/qmodules.h2004-07-23 15:22:56.000000000 +0200 1071 --- qt-2.3.7-old/src/tools/qmodules.h2004-07-23 15:22:56.000000000 +0200
1072 +++ qt-2.3.7/src/tools/qmodules.h2004-07-23 16:03:09.000000000 +0200 1072 +++ qt-2.3.7/src/tools/qmodules.h2004-07-23 16:03:09.000000000 +0200
1073@@ -1,14 +1,11 @@ 1073@@ -1,14 +1,11 @@
1074-#ifndef QT_H 1074-#ifndef QT_H
1075-#endif // QT_H 1075-#endif // QT_H
1076- 1076-
1077+// These modules are licensed to you 1077+// These modules are licensed to you
1078 #define QT_MODULE_TOOLS 1078 #define QT_MODULE_TOOLS
1079 #define QT_MODULE_KERNEL 1079 #define QT_MODULE_KERNEL
1080 #define QT_MODULE_WIDGETS 1080 #define QT_MODULE_WIDGETS
1081 #define QT_MODULE_DIALOGS 1081 #define QT_MODULE_DIALOGS
1082- 1082-
1083 #define QT_MODULE_ICONVIEW 1083 #define QT_MODULE_ICONVIEW
1084 #define QT_MODULE_WORKSPACE 1084 #define QT_MODULE_WORKSPACE
1085-#define QT_MODULE_TABLE 1085-#define QT_MODULE_TABLE
1086+#define QT_MODULE_NETWORK 1086+#define QT_MODULE_NETWORK
1087 #define QT_MODULE_CANVAS 1087 #define QT_MODULE_CANVAS
1088+#define QT_MODULE_TABLE 1088+#define QT_MODULE_TABLE
1089 #define QT_MODULE_XML 1089 #define QT_MODULE_XML
1090-#define QT_MODULE_NETWORK 1090-#define QT_MODULE_NETWORK
1091diff -ur qt-2.3.7-old/src/tools/qsortedlist.h qt-2.3.7/src/tools/qsortedlist.h 1091diff -ur qt-2.3.7-old/src/tools/qsortedlist.h qt-2.3.7/src/tools/qsortedlist.h
1092 --- qt-2.3.7-old/src/tools/qsortedlist.h2004-07-23 15:22:56.000000000 +0200 1092 --- qt-2.3.7-old/src/tools/qsortedlist.h2004-07-23 15:22:56.000000000 +0200
1093 +++ qt-2.3.7/src/tools/qsortedlist.h2004-07-23 15:42:01.000000000 +0200 1093 +++ qt-2.3.7/src/tools/qsortedlist.h2004-07-23 15:42:01.000000000 +0200
1094@@ -48,7 +48,7 @@ 1094@@ -48,7 +48,7 @@
1095 public: 1095 public:
1096 QSortedList() {} 1096 QSortedList() {}
1097 QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} 1097 QSortedList( const QSortedList<type> &l ) : QList<type>(l) {}
1098- ~QSortedList() { clear(); } 1098- ~QSortedList() { clear(); }
1099+ ~QSortedList() { this->clear(); } 1099+ ~QSortedList() { this->clear(); }
1100 QSortedList<type> &operator=(const QSortedList<type> &l) 1100 QSortedList<type> &operator=(const QSortedList<type> &l)
1101 { return (QSortedList<type>&)QList<type>::operator=(l); } 1101 { return (QSortedList<type>&)QList<type>::operator=(l); }
1102 1102
1103diff -ur qt-2.3.7-old/src/tools/qstring.cpp qt-2.3.7/src/tools/qstring.cpp 1103diff -ur qt-2.3.7-old/src/tools/qstring.cpp qt-2.3.7/src/tools/qstring.cpp
1104 --- qt-2.3.7-old/src/tools/qstring.cpp2004-07-23 15:22:56.000000000 +0200 1104 --- qt-2.3.7-old/src/tools/qstring.cpp2004-07-23 15:22:56.000000000 +0200
1105 +++ qt-2.3.7/src/tools/qstring.cpp2004-07-23 15:44:25.000000000 +0200 1105 +++ qt-2.3.7/src/tools/qstring.cpp2004-07-23 15:44:25.000000000 +0200
1106@@ -14469,7 +14469,11 @@ 1106@@ -14469,7 +14469,11 @@
1107 return qt_winQString2MB( *this ); 1107 return qt_winQString2MB( *this );
1108 #endif 1108 #endif
1109 #ifdef _WS_QWS_ 1109 #ifdef _WS_QWS_
1110- return utf8(); // ##### if there is ANY 8 bit format supported? 1110- return utf8(); // ##### if there is ANY 8 bit format supported?
1111+ QTextCodec* codec = QTextCodec::codecForLocale(); 1111+ QTextCodec* codec = QTextCodec::codecForLocale();
1112+ return codec 1112+ return codec
1113 + ? codec->fromUnicode(*this) 1113 + ? codec->fromUnicode(*this)
1114 + : utf8(); 1114 + : utf8();
1115+ //return latin1(); // ##### if there is ANY 8 bit format supported? 1115+ //return latin1(); // ##### if there is ANY 8 bit format supported?
1116 #endif 1116 #endif
1117 #endif 1117 #endif
1118 } 1118 }
1119@@ -14515,7 +14519,12 @@ 1119@@ -14515,7 +14519,12 @@
1120 return qt_winMB2QString( local8Bit ); 1120 return qt_winMB2QString( local8Bit );
1121 #endif 1121 #endif
1122 #ifdef _WS_QWS_ 1122 #ifdef _WS_QWS_
1123- return fromUtf8(local8Bit,len); 1123- return fromUtf8(local8Bit,len);
1124+ QTextCodec* codec = QTextCodec::codecForLocale(); 1124+ QTextCodec* codec = QTextCodec::codecForLocale();
1125+ if( len < 0) len = qstrlen(local8Bit); 1125+ if( len < 0) len = qstrlen(local8Bit);
1126+ return codec 1126+ return codec
1127 + ? codec->toUnicode(local8Bit, len) 1127 + ? codec->toUnicode(local8Bit, len)
1128 + : QString::fromUtf8(local8Bit,len); 1128 + : QString::fromUtf8(local8Bit,len);
1129+// return fromLatin1(local8Bit,len); 1129+// return fromLatin1(local8Bit,len);
1130 #endif 1130 #endif
1131 #endif // QT_NO_TEXTCODEC 1131 #endif // QT_NO_TEXTCODEC
1132 } 1132 }
1133diff -ur qt-2.3.7-old/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h 1133diff -ur qt-2.3.7-old/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h
1134 --- qt-2.3.7-old/src/tools/qstring.h2004-07-23 15:22:56.000000000 +0200 1134 --- qt-2.3.7-old/src/tools/qstring.h2004-07-23 15:22:56.000000000 +0200
1135 +++ qt-2.3.7/src/tools/qstring.h2004-07-23 15:42:01.000000000 +0200 1135 +++ qt-2.3.7/src/tools/qstring.h2004-07-23 15:42:01.000000000 +0200
1136@@ -163,8 +163,16 @@ 1136@@ -163,8 +163,16 @@
1137 bool isLetterOrNumber() const; 1137 bool isLetterOrNumber() const;
1138 bool isDigit() const; 1138 bool isDigit() const;
1139 1139
1140+ 1140+
1141+#ifdef Q_NO_PACKED_REFERENCE 1141+#ifdef Q_NO_PACKED_REFERENCE
1142+ uchar& cell() { return *(&cl); } 1142+ uchar& cell() { return *(&cl); }
1143+ uchar& row() { return *(&rw); } 1143+ uchar& row() { return *(&rw); }
1144+#else 1144+#else
1145 uchar& cell() { return cl; } 1145 uchar& cell() { return cl; }
1146- uchar& row() { return rw; } 1146- uchar& row() { return rw; }
1147+ uchar& row() { return rw; } 1147+ uchar& row() { return rw; }
1148+#endif 1148+#endif
1149+ 1149+
1150+ 1150+
1151 uchar cell() const { return cl; } 1151 uchar cell() const { return cl; }
1152 uchar row() const { return rw; } 1152 uchar row() const { return rw; }
1153 1153
1154diff -ur qt-2.3.7-old/src/widgets/qcommonstyle.cpp qt-2.3.7/src/widgets/qcommonstyle.cpp 1154diff -ur qt-2.3.7-old/src/widgets/qcommonstyle.cpp qt-2.3.7/src/widgets/qcommonstyle.cpp
1155 --- qt-2.3.7-old/src/widgets/qcommonstyle.cpp2004-07-23 15:22:56.000000000 +0200 1155 --- qt-2.3.7-old/src/widgets/qcommonstyle.cpp2004-07-23 15:22:56.000000000 +0200
1156 +++ qt-2.3.7/src/widgets/qcommonstyle.cpp2004-07-23 15:38:13.000000000 +0200 1156 +++ qt-2.3.7/src/widgets/qcommonstyle.cpp2004-07-23 15:38:13.000000000 +0200
1157@@ -566,7 +566,7 @@ 1157@@ -566,7 +566,7 @@
1158 bool enabled, bool active ) 1158 bool enabled, bool active )
1159 { 1159 {
1160 #ifndef QT_NO_MENUBAR 1160 #ifndef QT_NO_MENUBAR
1161-#ifndef QT_NO_STYLE_SGI 1161-#ifndef QT_NO_STYLE_SGI
1162+#if 1 // #ifndef QT_NO_STYLE_SGI 1162+#if 1 // #ifndef QT_NO_STYLE_SGI
1163 if (draw_menu_bar_impl != 0) { 1163 if (draw_menu_bar_impl != 0) {
1164 QDrawMenuBarItemImpl impl = draw_menu_bar_impl; 1164 QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
1165 (this->*impl)(p, x, y, w, h, mi, g, enabled, active); 1165 (this->*impl)(p, x, y, w, h, mi, g, enabled, active);
1166diff -ur qt-2.3.7-old/src/widgets/qlistview.cpp qt-2.3.7/src/widgets/qlistview.cpp 1166diff -ur qt-2.3.7-old/src/widgets/qlistview.cpp qt-2.3.7/src/widgets/qlistview.cpp
1167 --- qt-2.3.7-old/src/widgets/qlistview.cpp2004-07-23 15:22:56.000000000 +0200 1167 --- qt-2.3.7-old/src/widgets/qlistview.cpp2004-07-23 15:22:56.000000000 +0200
1168 +++ qt-2.3.7/src/widgets/qlistview.cpp2004-07-23 15:38:13.000000000 +0200 1168 +++ qt-2.3.7/src/widgets/qlistview.cpp2004-07-23 15:38:13.000000000 +0200
1169@@ -4968,9 +4968,9 @@ 1169@@ -4968,9 +4968,9 @@
1170 l = l->childItem ? l->childItem : l->siblingItem; 1170 l = l->childItem ? l->childItem : l->siblingItem;
1171 1171
1172 if ( l && l->height() ) 1172 if ( l && l->height() )
1173 -s.setHeight( s.height() + 10 * l->height() ); 1173 -s.setHeight( s.height() + 10 * l->height() );
1174- else 1174- else
1175 -s.setHeight( s.height() + 140 ); 1175 -s.setHeight( s.height() + 140 );
1176 +s.setHeight( s.height() + 4 /*10*/ * l->height() ); 1176 +s.setHeight( s.height() + 4 /*10*/ * l->height() );
1177+ else // ^v much too big for handhelds 1177+ else // ^v much too big for handhelds
1178 +s.setHeight( s.height() + 30 /*140*/ ); 1178 +s.setHeight( s.height() + 30 /*140*/ );
1179 1179
1180 if ( s.width() > s.height() * 3 ) 1180 if ( s.width() > s.height() * 3 )
1181 s.setHeight( s.width() / 3 ); 1181 s.setHeight( s.width() / 3 );
1182diff -ur qt-2.3.7-old/src/widgets/qscrollview.cpp qt-2.3.7/src/widgets/qscrollview.cpp 1182diff -ur qt-2.3.7-old/src/widgets/qscrollview.cpp qt-2.3.7/src/widgets/qscrollview.cpp
1183 --- qt-2.3.7-old/src/widgets/qscrollview.cpp2004-07-23 19:25:18.000000000 +0200 1183 --- qt-2.3.7-old/src/widgets/qscrollview.cpp2004-07-23 19:25:18.000000000 +0200
1184 +++ qt-2.3.7/src/widgets/qscrollview.cpp2004-07-23 19:23:10.000000000 +0200 1184 +++ qt-2.3.7/src/widgets/qscrollview.cpp2004-07-23 19:23:10.000000000 +0200
1185@@ -526,15 +526,16 @@ 1185@@ -526,15 +526,16 @@
1186 this, SLOT( doDragAutoScroll() ) ); 1186 this, SLOT( doDragAutoScroll() ) );
1187 #endif 1187 #endif
1188 1188
1189- connect( &d->hbar, SIGNAL( valueChanged( int ) ), 1189- connect( &d->hbar, SIGNAL( valueChanged( int ) ),
1190 -this, SLOT( hslide( int ) ) ); 1190 -this, SLOT( hslide( int ) ) );
1191- connect( &d->vbar, SIGNAL( valueChanged( int ) ), 1191- connect( &d->vbar, SIGNAL( valueChanged( int ) ),
1192 -this, SLOT( vslide( int ) ) ); 1192 -this, SLOT( vslide( int ) ) );
1193+ connect( &d->hbar, SIGNAL( valueChanged(int) ), 1193+ connect( &d->hbar, SIGNAL( valueChanged(int) ),
1194 +this, SLOT( hslide(int) ) ); 1194 +this, SLOT( hslide(int) ) );
1195+ connect( &d->vbar, SIGNAL( valueChanged(int) ), 1195+ connect( &d->vbar, SIGNAL( valueChanged(int) ),
1196 +this, SLOT( vslide(int) ) ); 1196 +this, SLOT( vslide(int) ) );
1197 d->viewport.installEventFilter( this ); 1197 d->viewport.installEventFilter( this );
1198 1198
1199 setFrameStyle( QFrame::StyledPanel | QFrame::Sunken ); 1199 setFrameStyle( QFrame::StyledPanel | QFrame::Sunken );
1200 setLineWidth( style().defaultFrameWidth() ); 1200 setLineWidth( style().defaultFrameWidth() );
1201 setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) ); 1201 setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
1202+ 1202+
1203 } 1203 }
1204 1204
1205 1205
1206@@ -683,6 +684,11 @@ 1206@@ -683,6 +684,11 @@
1207 h-tmarg-bmarg - (showh ? hsbExt : 0) ); 1207 h-tmarg-bmarg - (showh ? hsbExt : 0) );
1208 } 1208 }
1209 1209
1210+/* 1210+/*
1211+ The surrounding environment (or application, if there is no 1211+ The surrounding environment (or application, if there is no
1212+ environment, may set this. Requires Qt >= 2.3.8. 1212+ environment, may set this. Requires Qt >= 2.3.8.
1213+*/ 1213+*/
1214+bool qt_left_hand_scrollbars = FALSE; 1214+bool qt_left_hand_scrollbars = FALSE;
1215 1215
1216 /*! 1216 /*!
1217 Updates scrollbars - all possibilities considered. You should never 1217 Updates scrollbars - all possibilities considered. You should never
1218@@ -786,45 +792,50 @@ 1218@@ -786,45 +792,50 @@
1219 1219
1220 // Position the scrollbars, viewport, and corner widget. 1220 // Position the scrollbars, viewport, and corner widget.
1221 int bottom; 1221 int bottom;
1222+ int xoffset = ( qt_left_hand_scrollbars && ( showv || cornerWidget() ) ) ? vsbExt : 0; 1222+ int xoffset = ( qt_left_hand_scrollbars && ( showv || cornerWidget() ) ) ? vsbExt : 0;
1223+ int xpos = qt_left_hand_scrollbars ? 0 : w-vsbExt; 1223+ int xpos = qt_left_hand_scrollbars ? 0 : w-vsbExt;
1224+ xpos = (style() == WindowsStyle) && qt_left_hand_scrollbars ? xpos + fw : xpos - fw; 1224+ xpos = (style() == WindowsStyle) && qt_left_hand_scrollbars ? xpos + fw : xpos - fw;
1225+ int ypos = tmarg; 1225+ int ypos = tmarg;
1226+ ypos = (style() == WindowsStyle) ? ypos +fw : 0; 1226+ ypos = (style() == WindowsStyle) ? ypos +fw : 0;
1227 if ( showh ) { 1227 if ( showh ) {
1228 int right = ( showv || cornerWidget() ) ? w-vsbExt : w; 1228 int right = ( showv || cornerWidget() ) ? w-vsbExt : w;
1229 if ( style() == WindowsStyle ) 1229 if ( style() == WindowsStyle )
1230- setHBarGeometry(d->hbar, fw, h-hsbExt-fw, 1230- setHBarGeometry(d->hbar, fw, h-hsbExt-fw,
1231+ setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw, 1231+ setHBarGeometry(d->hbar, fw + xoffset , h-hsbExt-fw,
1232 right-fw-fw, hsbExt ); 1232 right-fw-fw, hsbExt );
1233 else 1233 else
1234- setHBarGeometry(d->hbar, 0, h-hsbExt, right, 1234- setHBarGeometry(d->hbar, 0, h-hsbExt, right,
1235+ setHBarGeometry(d->hbar, 0+ xoffset, h-hsbExt, right, 1235+ setHBarGeometry(d->hbar, 0+ xoffset, h-hsbExt, right,
1236 hsbExt ); 1236 hsbExt );
1237 bottom=h-hsbExt; 1237 bottom=h-hsbExt;
1238 } else { 1238 } else {
1239 bottom=h; 1239 bottom=h;
1240 } 1240 }
1241 if ( showv ) { 1241 if ( showv ) {
1242 -clipper()->setGeometry( lmarg, tmarg, 1242 -clipper()->setGeometry( lmarg, tmarg,
1243 +clipper()->setGeometry( lmarg + xoffset, tmarg, 1243 +clipper()->setGeometry( lmarg + xoffset, tmarg,
1244 w-vsbExt-lmarg-rmarg, 1244 w-vsbExt-lmarg-rmarg,
1245 bottom-tmarg-bmarg ); 1245 bottom-tmarg-bmarg );
1246 d->viewportResized( w-vsbExt-lmarg-rmarg, bottom-tmarg-bmarg ); 1246 d->viewportResized( w-vsbExt-lmarg-rmarg, bottom-tmarg-bmarg );
1247 if ( style() == WindowsStyle ) 1247 if ( style() == WindowsStyle )
1248 - changeFrameRect(QRect(0, 0, w, h) ); 1248 - changeFrameRect(QRect(0, 0, w, h) );
1249 + changeFrameRect(QRect(xoffset, 0, w, h) ); 1249 + changeFrameRect(QRect(xoffset, 0, w, h) );
1250 else 1250 else
1251 - changeFrameRect(QRect(0, 0, w-vsbExt, bottom)); 1251 - changeFrameRect(QRect(0, 0, w-vsbExt, bottom));
1252 + changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom)); 1252 + changeFrameRect(QRect(xoffset, 0, w-vsbExt, bottom));
1253 if (cornerWidget()) { 1253 if (cornerWidget()) {
1254 if ( style() == WindowsStyle ) 1254 if ( style() == WindowsStyle )
1255- setVBarGeometry( d->vbar, w-vsbExt-fw, 1255- setVBarGeometry( d->vbar, w-vsbExt-fw,
1256- fw, vsbExt, 1256- fw, vsbExt,
1257- h-hsbExt-fw-fw ); 1257- h-hsbExt-fw-fw );
1258+ setVBarGeometry( d->vbar, xpos, 1258+ setVBarGeometry( d->vbar, xpos,
1259+ ypos, vsbExt, 1259+ ypos, vsbExt,
1260+ bottom-fw-ypos ); 1260+ bottom-fw-ypos );
1261 else 1261 else
1262- setVBarGeometry( d->vbar, w-vsbExt, 0, 1262- setVBarGeometry( d->vbar, w-vsbExt, 0,
1263+ setVBarGeometry( d->vbar, xpos, ypos, 1263+ setVBarGeometry( d->vbar, xpos, ypos,
1264 vsbExt, 1264 vsbExt,
1265- h-hsbExt ); 1265- h-hsbExt );
1266+ bottom-ypos ); 1266+ bottom-ypos );
1267 } 1267 }
1268 else { 1268 else {
1269 if ( style() == WindowsStyle ) 1269 if ( style() == WindowsStyle )
1270- setVBarGeometry( d->vbar, w-vsbExt-fw, 1270- setVBarGeometry( d->vbar, w-vsbExt-fw,
1271- fw, vsbExt, 1271- fw, vsbExt,
1272- bottom-fw-fw ); 1272- bottom-fw-fw );
1273+ setVBarGeometry( d->vbar, xpos, 1273+ setVBarGeometry( d->vbar, xpos,
1274+ ypos, vsbExt, 1274+ ypos, vsbExt,
1275+ bottom-fw-ypos ); 1275+ bottom-fw-ypos );
1276 else 1276 else
1277- setVBarGeometry( d->vbar, w-vsbExt, 0, 1277- setVBarGeometry( d->vbar, w-vsbExt, 0,
1278- vsbExt, bottom ); 1278- vsbExt, bottom );
1279+ setVBarGeometry( d->vbar, xpos, ypos, 1279+ setVBarGeometry( d->vbar, xpos, ypos,
1280+ vsbExt, bottom-ypos ); 1280+ vsbExt, bottom-ypos );
1281 } 1281 }
1282 } else { 1282 } else {
1283 if ( style() == WindowsStyle ) 1283 if ( style() == WindowsStyle )
1284@@ -837,12 +848,12 @@ 1284@@ -837,12 +848,12 @@
1285 } 1285 }
1286 if ( d->corner ) { 1286 if ( d->corner ) {
1287 if ( style() == WindowsStyle ) 1287 if ( style() == WindowsStyle )
1288- d->corner->setGeometry( w-vsbExt-fw, 1288- d->corner->setGeometry( w-vsbExt-fw,
1289+ d->corner->setGeometry( xpos, 1289+ d->corner->setGeometry( xpos,
1290 h-hsbExt-fw, 1290 h-hsbExt-fw,
1291 vsbExt, 1291 vsbExt,
1292 hsbExt ); 1292 hsbExt );
1293 else 1293 else
1294- d->corner->setGeometry( w-vsbExt, 1294- d->corner->setGeometry( w-vsbExt,
1295+ d->corner->setGeometry( xpos, 1295+ d->corner->setGeometry( xpos,
1296 h-hsbExt, 1296 h-hsbExt,
1297 vsbExt, 1297 vsbExt,
1298 hsbExt ); 1298 hsbExt );
1299@@ -1266,6 +1277,9 @@ 1299@@ -1266,6 +1277,9 @@
1300 case QEvent::LayoutHint: 1300 case QEvent::LayoutHint:
1301 d->autoResizeHint(this); 1301 d->autoResizeHint(this);
1302 break; 1302 break;
1303 +case QEvent::WindowActivate: 1303 +case QEvent::WindowActivate:
1304 +case QEvent::WindowDeactivate: 1304 +case QEvent::WindowDeactivate:
1305 + return TRUE; 1305 + return TRUE;
1306 default: 1306 default:
1307 break; 1307 break;
1308 } 1308 }
1309@@ -1675,7 +1689,7 @@ 1309@@ -1675,7 +1689,7 @@
1310 } 1310 }
1311 1311
1312 /*! 1312 /*!
1313- Scrolls the content by \a x to the left and \a y upwards. 1313- Scrolls the content by \a x to the left and \a y upwards.
1314+ Scrolls the content by \a dx to the left and \a dy upwards. 1314+ Scrolls the content by \a dx to the left and \a dy upwards.
1315 */ 1315 */
1316 void QScrollView::scrollBy( int dx, int dy ) 1316 void QScrollView::scrollBy( int dx, int dy )
1317 { 1317 {
1318diff -ur qt-2.3.7-old/src/widgets/qtoolbutton.cpp qt-2.3.7/src/widgets/qtoolbutton.cpp 1318diff -ur qt-2.3.7-old/src/widgets/qtoolbutton.cpp qt-2.3.7/src/widgets/qtoolbutton.cpp
1319 --- qt-2.3.7-old/src/widgets/qtoolbutton.cpp2004-07-23 15:22:56.000000000 +0200 1319 --- qt-2.3.7-old/src/widgets/qtoolbutton.cpp2004-07-23 15:22:56.000000000 +0200
1320 +++ qt-2.3.7/src/widgets/qtoolbutton.cpp2004-07-23 15:38:13.000000000 +0200 1320 +++ qt-2.3.7/src/widgets/qtoolbutton.cpp2004-07-23 15:38:13.000000000 +0200
1321@@ -230,7 +230,7 @@ 1321@@ -230,7 +230,7 @@
1322 else 1322 else
1323 QToolTip::add( this, textLabel ); 1323 QToolTip::add( this, textLabel );
1324 } 1324 }
1325 -#endif 1325 -#endif
1326+#endif 1326+#endif
1327 } 1327 }
1328 1328
1329 1329
1330@@ -324,12 +324,12 @@ 1330@@ -324,12 +324,12 @@
1331 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); 1331 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal);
1332 w = pm.width(); 1332 w = pm.width();
1333 h = pm.height(); 1333 h = pm.height();
1334 -if ( w < 32 ) 1334 -if ( w < 32 )
1335 - w = 32; 1335 - w = 32;
1336 -if ( h < 32 ) 1336 -if ( h < 32 )
1337 - h = 32; 1337 - h = 32;
1338 +if ( w < 24 ) 1338 +if ( w < 24 )
1339 + w = 24; 1339 + w = 24;
1340 +if ( h < 24 ) 1340 +if ( h < 24 )
1341 + h = 24; 1341 + h = 24;
1342 } else { 1342 } else {
1343 -w = h = 16; 1343 -w = h = 16;
1344 +w = h = 14; 1344 +w = h = 14;
1345 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); 1345 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
1346 w = pm.width(); 1346 w = pm.width();
1347 h = pm.height(); 1347 h = pm.height();
1348diff -ur qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp qt-2.3.7/src/kernel/qgfxvnc_qws.cpp
1349 --- qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp2004-09-10 21:08:04.000000000 +0200
1350 +++ qt-2.3.7/src/kernel/qgfxvnc_qws.cpp2004-09-10 21:10:54.000000000 +0200
1351@@ -971,7 +971,7 @@
1352 void QGfxVNC<depth,type>::drawPoint( int x, int y )
1353 {
1354 QWSDisplay::grab( TRUE );
1355- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) & clipbounds );
1356+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) & this->clipbounds );
1357 QGfxRaster<depth,type>::drawPoint( x, y );
1358 QWSDisplay::ungrab();
1359 }
1360@@ -981,8 +981,8 @@
1361 {
1362 QWSDisplay::grab( TRUE );
1363 QRect r = pa.boundingRect();
1364- r.moveBy( xoffs, yoffs );
1365- qvnc_screen->setDirty( r & clipbounds );
1366+ r.moveBy( this->xoffs, this->yoffs );
1367+ qvnc_screen->setDirty( r & this->clipbounds );
1368 QGfxRaster<depth,type>::drawPoints( pa, x, y );
1369 QWSDisplay::ungrab();
1370 }
1371@@ -992,9 +992,9 @@
1372 {
1373 QWSDisplay::grab( TRUE );
1374 QRect r;
1375- r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs );
1376+ r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs );
1377 r = r.normalize();
1378- qvnc_screen->setDirty( r & clipbounds );
1379+ qvnc_screen->setDirty( r & this->clipbounds );
1380 QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 );
1381 QWSDisplay::ungrab();
1382 }
1383@@ -1003,7 +1003,7 @@
1384 void QGfxVNC<depth,type>::fillRect( int x,int y,int w,int h )
1385 {
1386 QWSDisplay::grab( TRUE );
1387- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds );
1388+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds );
1389 QGfxRaster<depth,type>::fillRect( x, y, w, h );
1390 QWSDisplay::ungrab();
1391 }
1392@@ -1013,8 +1013,8 @@
1393 {
1394 QWSDisplay::grab( TRUE );
1395 QRect r = pa.boundingRect();
1396- r.moveBy( xoffs, yoffs );
1397- qvnc_screen->setDirty( r & clipbounds );
1398+ r.moveBy( this->xoffs, this->yoffs );
1399+ qvnc_screen->setDirty( r & this->clipbounds );
1400 QGfxRaster<depth,type>::drawPolyline( pa, x, y );
1401 QWSDisplay::ungrab();
1402 }
1403@@ -1024,8 +1024,8 @@
1404 {
1405 QWSDisplay::grab( TRUE );
1406 QRect r = pa.boundingRect();
1407- r.moveBy( xoffs, yoffs );
1408- qvnc_screen->setDirty( r & clipbounds );
1409+ r.moveBy( this->xoffs, this->yoffs );
1410+ qvnc_screen->setDirty( r & this->clipbounds );
1411 QGfxRaster<depth,type>::drawPolygon( pa, w, x, y );
1412 QWSDisplay::ungrab();
1413 }
1414@@ -1034,7 +1034,7 @@
1415 void QGfxVNC<depth,type>::blt( int x,int y,int w,int h, int sx, int sy )
1416 {
1417 QWSDisplay::grab( TRUE );
1418- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds );
1419+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds );
1420 QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy );
1421 QWSDisplay::ungrab();
1422 }
1423@@ -1045,8 +1045,8 @@
1424 QWSDisplay::grab( TRUE );
1425 int dy = sy - y;
1426 int dx = sx - x;
1427- qvnc_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs,
1428 - w+abs(dx), h+abs(dy)) & clipbounds );
1429+ qvnc_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs,
1430 + w+abs(dx), h+abs(dy)) & this->clipbounds );
1431 QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy );
1432 QWSDisplay::ungrab();
1433 }
1434@@ -1056,7 +1056,7 @@
1435 void QGfxVNC<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy )
1436 {
1437 QWSDisplay::grab( TRUE );
1438- qvnc_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) & clipbounds );
1439+ qvnc_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
1440 QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
1441 QWSDisplay::ungrab();
1442 }
1443@@ -1066,7 +1066,7 @@
1444 void QGfxVNC<depth,type>::tiledBlt( int x,int y,int w,int h )
1445 {
1446 QWSDisplay::grab( TRUE );
1447- qvnc_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) & clipbounds );
1448+ qvnc_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
1449 QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
1450 QWSDisplay::ungrab();
1451 }
diff --git a/qt/qt-2.3.7.patch/qte237-gcc34.patch b/qt/qt-2.3.7.patch/qte237-gcc34.patch
index 856028d..9a0f28c 100644
--- a/qt/qt-2.3.7.patch/qte237-gcc34.patch
+++ b/qt/qt-2.3.7.patch/qte237-gcc34.patch
@@ -1,440 +1,498 @@
1diff -ur qt-2.3.7_clean/include/qcstring.h qt-2.3.7/include/qcstring.h 1diff -ur qt-2.3.7_old/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp
2 --- qt-2.3.7_clean/include/qcstring.h2004-06-04 02:17:53.000000000 +0200 2 --- qt-2.3.7_old/src/kernel/qgfxtransformed_qws.cpp2004-09-10 21:08:04.000000000 +0200
3 +++ qt-2.3.7/include/qcstring.h2004-06-04 02:24:25.000000000 +0200 3 +++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp2004-09-10 21:08:42.000000000 +0200
4@@ -119,7 +119,7 @@
5 // We want to keep source compatibility for 2.x
6 // ### TODO for 4.0: completely remove these and the cstr* functions
7
8-#if !defined(QT_GENUINE_STR)
9+#if 0
10
11 #undefstrlen
12 #define strlen qstrlen
13diff -ur qt-2.3.7_clean/include/qglobal.h qt-2.3.7/include/qglobal.h
14 --- qt-2.3.7_clean/include/qglobal.h2004-06-04 02:17:53.000000000 +0200
15 +++ qt-2.3.7/include/qglobal.h2004-06-04 02:29:41.000000000 +0200
16@@ -207,8 +207,16 @@
17 #if __GNUC__ == 2 && __GNUC_MINOR__ == 96
18 #define Q_FP_CCAST_BROKEN
19 #endif
20+/* ARM gcc pads structs to 32 bits, even when they contain a single
21+ char, or short. We tell gcc to pack QChars to 16 bits, to avoid
22+ QString bloat. However, gcc 3.4 doesn't allow us to create references to
23+ members of a packed struct. (Pointers are OK, because then you
24+ supposedly know what you are doing.) */
25 #if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
26 #define Q_PACKED __attribute__ ((packed))
27+# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
28+# define Q_NO_PACKED_REFERENCE
29+# endif
30 #endif
31 #elif defined(__xlC__)
32 #define _CC_XLC_
33diff -ur qt-2.3.7_clean/include/qsortedlist.h qt-2.3.7/include/qsortedlist.h
34 --- qt-2.3.7_clean/include/qsortedlist.h2004-06-04 02:17:53.000000000 +0200
35 +++ qt-2.3.7/include/qsortedlist.h2004-06-04 02:24:25.000000000 +0200
36@@ -48,7 +48,7 @@
37 public:
38 QSortedList() {}
39 QSortedList( const QSortedList<type> &l ) : QList<type>(l) {}
40- ~QSortedList() { clear(); }
41+ ~QSortedList() { this->clear(); }
42 QSortedList<type> &operator=(const QSortedList<type> &l)
43 { return (QSortedList<type>&)QList<type>::operator=(l); }
44
45diff -ur qt-2.3.7_clean/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp
46 --- qt-2.3.7_clean/src/kernel/qgfxtransformed_qws.cpp2004-06-04 02:17:53.000000000 +0200
47 +++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp2004-06-04 02:24:25.000000000 +0200
48@@ -671,11 +671,11 @@ 4@@ -671,11 +671,11 @@
49 inline int tx( int x, int y ) { 5 inline int tx( int x, int y ) {
50 switch ( qt_trans_screen->transformation() ) { 6 switch ( qt_trans_screen->transformation() ) {
51 case QTransformedScreen::Rot90: 7 case QTransformedScreen::Rot90:
52 - return y - xoffs + yoffs; 8 - return y - xoffs + yoffs;
53 + return y - this->xoffs + this->yoffs; 9 + return y - this->xoffs + this->yoffs;
54 case QTransformedScreen::Rot180: 10 case QTransformedScreen::Rot180:
55 - return (width - x - 1) - xoffs - xoffs; 11 - return (width - x - 1) - xoffs - xoffs;
56 + return (this->width - x - 1) - this->xoffs - this->xoffs; 12 + return (this->width - x - 1) - this->xoffs - this->xoffs;
57 case QTransformedScreen::Rot270: 13 case QTransformedScreen::Rot270:
58 - return (height - y - 1) - xoffs - yoffs; 14 - return (height - y - 1) - xoffs - yoffs;
59 + return (this->height - y - 1) - this->xoffs - this->yoffs; 15 + return (this->height - y - 1) - this->xoffs - this->yoffs;
60 default: 16 default:
61 return x; 17 return x;
62 } 18 }
63@@ -683,11 +683,11 @@ 19@@ -683,11 +683,11 @@
64 inline int ty( int x, int y ) { 20 inline int ty( int x, int y ) {
65 switch ( qt_trans_screen->transformation() ) { 21 switch ( qt_trans_screen->transformation() ) {
66 case QTransformedScreen::Rot90: 22 case QTransformedScreen::Rot90:
67 - return (width - x - 1) - yoffs - xoffs; 23 - return (width - x - 1) - yoffs - xoffs;
68 + return (this->width - x - 1) - this->yoffs - this->xoffs; 24 + return (this->width - x - 1) - this->yoffs - this->xoffs;
69 case QTransformedScreen::Rot180: 25 case QTransformedScreen::Rot180:
70 - return (height - y - 1) - yoffs - yoffs; 26 - return (height - y - 1) - yoffs - yoffs;
71 + return (this->height - y - 1) - this->yoffs - this->yoffs; 27 + return (this->height - y - 1) - this->yoffs - this->yoffs;
72 case QTransformedScreen::Rot270: 28 case QTransformedScreen::Rot270:
73 - return x - yoffs + xoffs; 29 - return x - yoffs + xoffs;
74 + return x - this->yoffs + this->xoffs; 30 + return x - this->yoffs + this->xoffs;
75 default: 31 default:
76 return y; 32 return y;
77 } 33 }
78@@ -715,23 +715,23 @@ 34@@ -715,23 +715,23 @@
79 template <const int depth, const int type> 35 template <const int depth, const int type>
80 void QGfxTransformedRaster<depth,type>::setSourceWidgetOffset(int x, int y) 36 void QGfxTransformedRaster<depth,type>::setSourceWidgetOffset(int x, int y)
81 { 37 {
82- if ( srcbits == buffer ) { 38- if ( srcbits == buffer ) {
83+ if ( this->srcbits == this->buffer ) { 39+ if ( this->srcbits == this->buffer ) {
84 switch ( qt_trans_screen->transformation() ) { 40 switch ( qt_trans_screen->transformation() ) {
85 case QTransformedScreen::Rot90: 41 case QTransformedScreen::Rot90:
86 - srcwidgetoffs = QPoint( y, width - x - srcwidth ); 42 - srcwidgetoffs = QPoint( y, width - x - srcwidth );
87 + this->srcwidgetoffs = QPoint( y, this->width - x - this->srcwidth ); 43 + this->srcwidgetoffs = QPoint( y, this->width - x - this->srcwidth );
88 break; 44 break;
89 case QTransformedScreen::Rot180: 45 case QTransformedScreen::Rot180:
90 - srcwidgetoffs = QPoint( width - x - srcwidth, height - y - srcheight ); 46 - srcwidgetoffs = QPoint( width - x - srcwidth, height - y - srcheight );
91 + this->srcwidgetoffs = QPoint( this->width - x - this->srcwidth, this->height - y - this->srcheight ); 47 + this->srcwidgetoffs = QPoint( this->width - x - this->srcwidth, this->height - y - this->srcheight );
92 break; 48 break;
93 case QTransformedScreen::Rot270: 49 case QTransformedScreen::Rot270:
94 - srcwidgetoffs = QPoint( height - y - srcheight, x ); 50 - srcwidgetoffs = QPoint( height - y - srcheight, x );
95 + this->srcwidgetoffs = QPoint( this->height - y - this->srcheight, x ); 51 + this->srcwidgetoffs = QPoint( this->height - y - this->srcheight, x );
96 break; 52 break;
97 default: 53 default:
98 - srcwidgetoffs = QPoint( x, y ); 54 - srcwidgetoffs = QPoint( x, y );
99 + this->srcwidgetoffs = QPoint( x, y ); 55 + this->srcwidgetoffs = QPoint( x, y );
100 break; 56 break;
101 } 57 }
102 } else 58 } else
103 -srcwidgetoffs = QPoint( x, y ); 59 -srcwidgetoffs = QPoint( x, y );
104 +this->srcwidgetoffs = QPoint( x, y ); 60 +this->srcwidgetoffs = QPoint( x, y );
105 } 61 }
106 62
107 template <const int depth, const int type> 63 template <const int depth, const int type>
108@@ -739,8 +739,8 @@ 64@@ -739,8 +739,8 @@
109 { 65 {
110 QT_TRANS_GFX_BASE<depth,type>::setSource(i); 66 QT_TRANS_GFX_BASE<depth,type>::setSource(i);
111 QSize s = qt_screen->mapToDevice( QSize(i->width(), i->height()) ); 67 QSize s = qt_screen->mapToDevice( QSize(i->width(), i->height()) );
112- srcwidth = s.width(); 68- srcwidth = s.width();
113- srcheight = s.height(); 69- srcheight = s.height();
114+ this->srcwidth = s.width(); 70+ this->srcwidth = s.width();
115+ this->srcheight = s.height(); 71+ this->srcheight = s.height();
116 } 72 }
117 73
118 template <const int depth, const int type> 74 template <const int depth, const int type>
119@@ -782,7 +782,7 @@ 75@@ -782,7 +782,7 @@
120 if ( w == 0 || h == 0 ) 76 if ( w == 0 || h == 0 )
121 return; 77 return;
122 QRect r( x, y, w, h ); 78 QRect r( x, y, w, h );
123- if ( cbrush.style() == SolidPattern ) { 79- if ( cbrush.style() == SolidPattern ) {
124+ if ( this->cbrush.style() == Qt::SolidPattern ) { 80+ if ( this->cbrush.style() == Qt::SolidPattern ) {
125 r.setCoords( tx(x,y), ty(x,y), tx(x+w-1,y+h-1), ty(x+w-1,y+h-1) ); 81 r.setCoords( tx(x,y), ty(x,y), tx(x+w-1,y+h-1), ty(x+w-1,y+h-1) );
126 r = r.normalize(); 82 r = r.normalize();
127 } 83 }
128@@ -797,7 +797,7 @@ 84@@ -797,7 +797,7 @@
129 // solution. The brush offset logic is complicated enough, so we don't 85 // solution. The brush offset logic is complicated enough, so we don't
130 // fastpath patternedbrush. 86 // fastpath patternedbrush.
131 87
132- if ( inDraw || cpen.style()==NoPen || patternedbrush ) { 88- if ( inDraw || cpen.style()==NoPen || patternedbrush ) {
133+ if ( inDraw || this->cpen.style()==Qt::NoPen || this->patternedbrush ) { 89+ if ( inDraw || this->cpen.style()==Qt::NoPen || this->patternedbrush ) {
134 //slowpath 90 //slowpath
135 QT_TRANS_GFX_BASE<depth,type>::drawPolygon( a, w, idx, num ); 91 QT_TRANS_GFX_BASE<depth,type>::drawPolygon( a, w, idx, num );
136 } else { 92 } else {
137@@ -819,29 +819,29 @@ 93@@ -819,29 +819,29 @@
138 template <const int depth, const int type> 94 template <const int depth, const int type>
139 void QGfxTransformedRaster<depth,type>::processSpans( int n, QPoint* point, int* width ) 95 void QGfxTransformedRaster<depth,type>::processSpans( int n, QPoint* point, int* width )
140 { 96 {
141- if ( inDraw || patternedbrush && srcwidth != 0 && srcheight != 0 ) { 97- if ( inDraw || patternedbrush && srcwidth != 0 && srcheight != 0 ) {
142+ if ( inDraw || this->patternedbrush && this->srcwidth != 0 && this->srcheight != 0 ) { 98+ if ( inDraw || this->patternedbrush && this->srcwidth != 0 && this->srcheight != 0 ) {
143 //in the patternedbrush case, we let blt do the transformation 99 //in the patternedbrush case, we let blt do the transformation
144 // so we leave inDraw false. 100 // so we leave inDraw false.
145 - QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); 101 - QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width );
146 +QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width ); 102 +QT_TRANS_GFX_BASE<depth,type>::processSpans( n, point, width );
147 } else { 103 } else {
148 inDraw = TRUE; 104 inDraw = TRUE;
149 while (n--) { 105 while (n--) {
150 if ( *width > 0 ) { 106 if ( *width > 0 ) {
151 - int x=tx(point->x(),point->y())+xoffs; 107 - int x=tx(point->x(),point->y())+xoffs;
152 - int y=ty(point->x(),point->y())+yoffs; 108 - int y=ty(point->x(),point->y())+yoffs;
153 + int x=tx(point->x(),point->y())+this->xoffs; 109 + int x=tx(point->x(),point->y())+this->xoffs;
154 + int y=ty(point->x(),point->y())+this->yoffs; 110 + int y=ty(point->x(),point->y())+this->yoffs;
155 111
156 switch( qt_trans_screen->transformation() ) { 112 switch( qt_trans_screen->transformation() ) {
157 case QTransformedScreen::Rot90: 113 case QTransformedScreen::Rot90:
158 - vline( x, y-(*width-1), y ); 114 - vline( x, y-(*width-1), y );
159 + this->vline( x, y-(*width-1), y ); 115 + this->vline( x, y-(*width-1), y );
160 break; 116 break;
161 case QTransformedScreen::Rot180: 117 case QTransformedScreen::Rot180:
162 - hline( x - (*width-1), x, y ); 118 - hline( x - (*width-1), x, y );
163 + this->hline( x - (*width-1), x, y ); 119 + this->hline( x - (*width-1), x, y );
164 break; 120 break;
165 case QTransformedScreen::Rot270: 121 case QTransformedScreen::Rot270:
166 - vline( x, y, y+*width-1 ); 122 - vline( x, y, y+*width-1 );
167 + this->vline( x, y, y+*width-1 ); 123 + this->vline( x, y, y+*width-1 );
168 break; 124 break;
169 default: 125 default:
170 - hline( x, x+*width-1, y ); 126 - hline( x, x+*width-1, y );
171 + this->hline( x, x+*width-1, y ); 127 + this->hline( x, x+*width-1, y );
172 break; 128 break;
173 } 129 }
174 } 130 }
175@@ -896,14 +896,14 @@ 131@@ -896,14 +896,14 @@
176 switch ( qt_trans_screen->transformation() ) { 132 switch ( qt_trans_screen->transformation() ) {
177 case QTransformedScreen::Rot90: 133 case QTransformedScreen::Rot90:
178 rsx = sy; 134 rsx = sy;
179 - rsy = srcwidth - sx - w; 135 - rsy = srcwidth - sx - w;
180 + rsy = this->srcwidth - sx - w; 136 + rsy = this->srcwidth - sx - w;
181 break; 137 break;
182 case QTransformedScreen::Rot180: 138 case QTransformedScreen::Rot180:
183 - rsx = srcwidth - sx - w; 139 - rsx = srcwidth - sx - w;
184 - rsy = srcheight - sy - h; 140 - rsy = srcheight - sy - h;
185 + rsx = this->srcwidth - sx - w; 141 + rsx = this->srcwidth - sx - w;
186 + rsy = this->srcheight - sy - h; 142 + rsy = this->srcheight - sy - h;
187 break; 143 break;
188 case QTransformedScreen::Rot270: 144 case QTransformedScreen::Rot270:
189 - rsx = srcheight - sy - h; 145 - rsx = srcheight - sy - h;
190 + rsx = this->srcheight - sy - h; 146 + rsx = this->srcheight - sy - h;
191 rsy = sx; 147 rsy = sx;
192 break; 148 break;
193 default: 149 default:
194@@ -941,39 +941,39 @@ 150@@ -941,39 +941,39 @@
195 r.setCoords( tx(rx,ry), ty(rx,ry), tx(rx+w-1,ry+h-1), ty(rx+w-1,ry+h-1) ); 151 r.setCoords( tx(rx,ry), ty(rx,ry), tx(rx+w-1,ry+h-1), ty(rx+w-1,ry+h-1) );
196 r = r.normalize(); 152 r = r.normalize();
197 153
198- QPoint oldBrushOffs = brushoffs; 154- QPoint oldBrushOffs = brushoffs;
199+ QPoint oldBrushOffs = this->brushoffs; 155+ QPoint oldBrushOffs = this->brushoffs;
200 int brx, bry; 156 int brx, bry;
201 switch ( qt_trans_screen->transformation() ) { 157 switch ( qt_trans_screen->transformation() ) {
202 case QTransformedScreen::Rot90: 158 case QTransformedScreen::Rot90:
203 - brx = brushoffs.y(); 159 - brx = brushoffs.y();
204 - bry = srcwidth - brushoffs.x() - w; 160 - bry = srcwidth - brushoffs.x() - w;
205 + brx = this->brushoffs.y(); 161 + brx = this->brushoffs.y();
206 + bry = this->srcwidth - this->brushoffs.x() - w; 162 + bry = this->srcwidth - this->brushoffs.x() - w;
207 break; 163 break;
208 case QTransformedScreen::Rot180: 164 case QTransformedScreen::Rot180:
209 - brx = srcwidth - brushoffs.x() - w; 165 - brx = srcwidth - brushoffs.x() - w;
210 - bry = srcheight - brushoffs.y() - h; 166 - bry = srcheight - brushoffs.y() - h;
211 + brx = this->srcwidth - this->brushoffs.x() - w; 167 + brx = this->srcwidth - this->brushoffs.x() - w;
212 + bry = this->srcheight - this->brushoffs.y() - h; 168 + bry = this->srcheight - this->brushoffs.y() - h;
213 break; 169 break;
214 case QTransformedScreen::Rot270: 170 case QTransformedScreen::Rot270:
215 - brx = srcheight - brushoffs.y() - h; 171 - brx = srcheight - brushoffs.y() - h;
216 - bry = brushoffs.x(); 172 - bry = brushoffs.x();
217 + brx = this->srcheight - this->brushoffs.y() - h; 173 + brx = this->srcheight - this->brushoffs.y() - h;
218 + bry = this->brushoffs.x(); 174 + bry = this->brushoffs.x();
219 break; 175 break;
220 default: 176 default:
221 - brx = brushoffs.x(); 177 - brx = brushoffs.x();
222 - bry = brushoffs.y(); 178 - bry = brushoffs.y();
223 + brx = this->brushoffs.x(); 179 + brx = this->brushoffs.x();
224 + bry = this->brushoffs.y(); 180 + bry = this->brushoffs.y();
225 break; 181 break;
226 } 182 }
227- brushoffs = QPoint( brx, bry ); 183- brushoffs = QPoint( brx, bry );
228+ this->brushoffs = QPoint( brx, bry ); 184+ this->brushoffs = QPoint( brx, bry );
229 185
230- int oldsw = srcwidth; 186- int oldsw = srcwidth;
231- int oldsh = srcheight; 187- int oldsh = srcheight;
232- QSize s = qt_screen->mapToDevice( QSize(srcwidth,srcheight) ); 188- QSize s = qt_screen->mapToDevice( QSize(srcwidth,srcheight) );
233- srcwidth = s.width(); 189- srcwidth = s.width();
234- srcheight = s.height(); 190- srcheight = s.height();
235+ int oldsw = this->srcwidth; 191+ int oldsw = this->srcwidth;
236+ int oldsh = this->srcheight; 192+ int oldsh = this->srcheight;
237+ QSize s = qt_screen->mapToDevice( QSize(this->srcwidth,this->srcheight) ); 193+ QSize s = qt_screen->mapToDevice( QSize(this->srcwidth,this->srcheight) );
238+ this->srcwidth = s.width(); 194+ this->srcwidth = s.width();
239+ this->srcheight = s.height(); 195+ this->srcheight = s.height();
240 196
241 QT_TRANS_GFX_BASE<depth,type>::tiledBlt( r.x(), r.y(), r.width(), r.height() ); 197 QT_TRANS_GFX_BASE<depth,type>::tiledBlt( r.x(), r.y(), r.width(), r.height() );
242 198
243- srcwidth = oldsw; 199- srcwidth = oldsw;
244- srcheight = oldsh; 200- srcheight = oldsh;
245- brushoffs = oldBrushOffs; 201- brushoffs = oldBrushOffs;
246+ this->srcwidth = oldsw; 202+ this->srcwidth = oldsw;
247+ this->srcheight = oldsh; 203+ this->srcheight = oldsh;
248+ this->brushoffs = oldBrushOffs; 204+ this->brushoffs = oldBrushOffs;
249 inDraw = FALSE; 205 inDraw = FALSE;
250 } 206 }
251 207
252diff -ur qt-2.3.7_clean/src/kernel/qgfxvfb_qws.cpp qt-2.3.7/src/kernel/qgfxvfb_qws.cpp 208diff -ur qt-2.3.7_old/src/kernel/qgfxvfb_qws.cpp qt-2.3.7/src/kernel/qgfxvfb_qws.cpp
253 --- qt-2.3.7_clean/src/kernel/qgfxvfb_qws.cpp2004-06-04 02:17:53.000000000 +0200 209 --- qt-2.3.7_old/src/kernel/qgfxvfb_qws.cpp2004-09-10 21:08:04.000000000 +0200
254 +++ qt-2.3.7/src/kernel/qgfxvfb_qws.cpp2004-06-04 02:24:25.000000000 +0200 210 +++ qt-2.3.7/src/kernel/qgfxvfb_qws.cpp2004-09-10 21:08:42.000000000 +0200
255@@ -31,7 +31,6 @@ 211@@ -31,7 +31,6 @@
256 **********************************************************************/ 212 **********************************************************************/
257 213
258 #include "qgfxraster_qws.h" 214 #include "qgfxraster_qws.h"
259- 215-
260 #ifndef QT_NO_QWS_VFB 216 #ifndef QT_NO_QWS_VFB
261 217
262 #include <sys/ipc.h> 218 #include <sys/ipc.h>
263@@ -140,8 +139,8 @@ 219@@ -140,8 +139,8 @@
264 void QGfxVFb<depth,type>::drawPoint( int x, int y ) 220 void QGfxVFb<depth,type>::drawPoint( int x, int y )
265 { 221 {
266 QWSDisplay::grab( TRUE ); 222 QWSDisplay::grab( TRUE );
267- if ( is_screen_gfx ) 223- if ( is_screen_gfx )
268 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) ); 224 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) );
269+ if ( this->is_screen_gfx ) 225+ if ( this->is_screen_gfx )
270 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) ); 226 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) );
271 QGfxRaster<depth,type>::drawPoint( x, y ); 227 QGfxRaster<depth,type>::drawPoint( x, y );
272 QWSDisplay::ungrab(); 228 QWSDisplay::ungrab();
273 } 229 }
274@@ -150,8 +149,8 @@ 230@@ -150,8 +149,8 @@
275 void QGfxVFb<depth,type>::drawPoints( const QPointArray &pa,int x,int y ) 231 void QGfxVFb<depth,type>::drawPoints( const QPointArray &pa,int x,int y )
276 { 232 {
277 QWSDisplay::grab( TRUE ); 233 QWSDisplay::grab( TRUE );
278- if ( is_screen_gfx ) 234- if ( is_screen_gfx )
279 -qvfb_screen->setDirty( clipbounds ); 235 -qvfb_screen->setDirty( clipbounds );
280+ if ( this->is_screen_gfx ) 236+ if ( this->is_screen_gfx )
281 +qvfb_screen->setDirty( this->clipbounds ); 237 +qvfb_screen->setDirty( this->clipbounds );
282 QGfxRaster<depth,type>::drawPoints( pa, x, y ); 238 QGfxRaster<depth,type>::drawPoints( pa, x, y );
283 QWSDisplay::ungrab(); 239 QWSDisplay::ungrab();
284 } 240 }
285@@ -160,9 +159,9 @@ 241@@ -160,9 +159,9 @@
286 void QGfxVFb<depth,type>::drawLine( int x1,int y1,int x2,int y2 ) 242 void QGfxVFb<depth,type>::drawLine( int x1,int y1,int x2,int y2 )
287 { 243 {
288 QWSDisplay::grab( TRUE ); 244 QWSDisplay::grab( TRUE );
289- if ( is_screen_gfx ) { 245- if ( is_screen_gfx ) {
290+ if ( this->is_screen_gfx ) { 246+ if ( this->is_screen_gfx ) {
291 QRect r; 247 QRect r;
292 -r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs ); 248 -r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs );
293 +r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs ); 249 +r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs );
294 qvfb_screen->setDirty( r.normalize() ); 250 qvfb_screen->setDirty( r.normalize() );
295 } 251 }
296 QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 ); 252 QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 );
297@@ -173,8 +172,8 @@ 253@@ -173,8 +172,8 @@
298 void QGfxVFb<depth,type>::fillRect( int x,int y,int w,int h ) 254 void QGfxVFb<depth,type>::fillRect( int x,int y,int w,int h )
299 { 255 {
300 QWSDisplay::grab( TRUE ); 256 QWSDisplay::grab( TRUE );
301- if ( is_screen_gfx ) 257- if ( is_screen_gfx )
302 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); 258 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) );
303+ if ( this->is_screen_gfx ) 259+ if ( this->is_screen_gfx )
304 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); 260 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) );
305 QGfxRaster<depth,type>::fillRect( x, y, w, h ); 261 QGfxRaster<depth,type>::fillRect( x, y, w, h );
306 QWSDisplay::ungrab(); 262 QWSDisplay::ungrab();
307 } 263 }
308@@ -183,8 +182,8 @@ 264@@ -183,8 +182,8 @@
309 void QGfxVFb<depth,type>::drawPolyline( const QPointArray &pa,int x,int y ) 265 void QGfxVFb<depth,type>::drawPolyline( const QPointArray &pa,int x,int y )
310 { 266 {
311 QWSDisplay::grab( TRUE ); 267 QWSDisplay::grab( TRUE );
312- if ( is_screen_gfx ) 268- if ( is_screen_gfx )
313 -qvfb_screen->setDirty( clipbounds ); 269 -qvfb_screen->setDirty( clipbounds );
314+ if ( this->is_screen_gfx ) 270+ if ( this->is_screen_gfx )
315 +qvfb_screen->setDirty( this->clipbounds ); 271 +qvfb_screen->setDirty( this->clipbounds );
316 QGfxRaster<depth,type>::drawPolyline( pa, x, y ); 272 QGfxRaster<depth,type>::drawPolyline( pa, x, y );
317 QWSDisplay::ungrab(); 273 QWSDisplay::ungrab();
318 } 274 }
319@@ -193,8 +192,8 @@ 275@@ -193,8 +192,8 @@
320 void QGfxVFb<depth,type>::drawPolygon( const QPointArray &pa,bool w,int x,int y ) 276 void QGfxVFb<depth,type>::drawPolygon( const QPointArray &pa,bool w,int x,int y )
321 { 277 {
322 QWSDisplay::grab( TRUE ); 278 QWSDisplay::grab( TRUE );
323- if ( is_screen_gfx ) 279- if ( is_screen_gfx )
324 -qvfb_screen->setDirty( clipbounds ); 280 -qvfb_screen->setDirty( clipbounds );
325+ if ( this->is_screen_gfx ) 281+ if ( this->is_screen_gfx )
326 +qvfb_screen->setDirty( this->clipbounds ); 282 +qvfb_screen->setDirty( this->clipbounds );
327 QGfxRaster<depth,type>::drawPolygon( pa, w, x, y ); 283 QGfxRaster<depth,type>::drawPolygon( pa, w, x, y );
328 QWSDisplay::ungrab(); 284 QWSDisplay::ungrab();
329 } 285 }
330@@ -203,8 +202,8 @@ 286@@ -203,8 +202,8 @@
331 void QGfxVFb<depth,type>::blt( int x,int y,int w,int h, int sx, int sy ) 287 void QGfxVFb<depth,type>::blt( int x,int y,int w,int h, int sx, int sy )
332 { 288 {
333 QWSDisplay::grab( TRUE ); 289 QWSDisplay::grab( TRUE );
334- if ( is_screen_gfx ) 290- if ( is_screen_gfx )
335 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) ); 291 -qvfb_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) );
336+ if ( this->is_screen_gfx ) 292+ if ( this->is_screen_gfx )
337 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) ); 293 +qvfb_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) );
338 QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy ); 294 QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy );
339 QWSDisplay::ungrab(); 295 QWSDisplay::ungrab();
340 } 296 }
341@@ -215,8 +214,8 @@ 297@@ -215,8 +214,8 @@
342 QWSDisplay::grab( TRUE ); 298 QWSDisplay::grab( TRUE );
343 int dy = sy - y; 299 int dy = sy - y;
344 int dx = sx - x; 300 int dx = sx - x;
345- if ( is_screen_gfx ) 301- if ( is_screen_gfx )
346 -qvfb_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs, 302 -qvfb_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs,
347+ if ( this->is_screen_gfx ) 303+ if ( this->is_screen_gfx )
348 +qvfb_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs, 304 +qvfb_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs,
349 w+abs(dx), h+abs(dy)) ); 305 w+abs(dx), h+abs(dy)) );
350 QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy ); 306 QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy );
351 QWSDisplay::ungrab(); 307 QWSDisplay::ungrab();
352@@ -227,8 +226,8 @@ 308@@ -227,8 +226,8 @@
353 void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy ) 309 void QGfxVFb<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy )
354 { 310 {
355 QWSDisplay::grab( TRUE ); 311 QWSDisplay::grab( TRUE );
356- if ( is_screen_gfx ) 312- if ( is_screen_gfx )
357 -qvfb_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) ); 313 -qvfb_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) );
358+ if ( this->is_screen_gfx ) 314+ if ( this->is_screen_gfx )
359 +qvfb_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) ); 315 +qvfb_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) );
360 QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy ); 316 QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
361 QWSDisplay::ungrab(); 317 QWSDisplay::ungrab();
362 } 318 }
363@@ -238,8 +237,8 @@ 319@@ -238,8 +237,8 @@
364 void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h ) 320 void QGfxVFb<depth,type>::tiledBlt( int x,int y,int w,int h )
365 { 321 {
366 QWSDisplay::grab( TRUE ); 322 QWSDisplay::grab( TRUE );
367- if ( is_screen_gfx ) 323- if ( is_screen_gfx )
368 -qvfb_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) ); 324 -qvfb_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) );
369+ if ( this->is_screen_gfx ) 325+ if ( this->is_screen_gfx )
370 +qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) ); 326 +qvfb_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) );
371 QGfxRaster<depth,type>::tiledBlt( x, y, w, h ); 327 QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
372 QWSDisplay::ungrab(); 328 QWSDisplay::ungrab();
373 } 329 }
374diff -ur qt-2.3.7_clean/src/tools/qcstring.h qt-2.3.7/src/tools/qcstring.h 330diff -ur qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp qt-2.3.7/src/kernel/qgfxvnc_qws.cpp
375 --- qt-2.3.7_clean/src/tools/qcstring.h2004-06-04 02:17:53.000000000 +0200 331 --- qt-2.3.7_old/src/kernel/qgfxvnc_qws.cpp2004-09-10 21:08:04.000000000 +0200
376 +++ qt-2.3.7/src/tools/qcstring.h2004-06-04 02:24:25.000000000 +0200 332 +++ qt-2.3.7/src/kernel/qgfxvnc_qws.cpp2004-09-10 21:10:54.000000000 +0200
333@@ -971,7 +971,7 @@
334 void QGfxVNC<depth,type>::drawPoint( int x, int y )
335 {
336 QWSDisplay::grab( TRUE );
337- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, 1, 1 ) & clipbounds );
338+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, 1, 1 ) & this->clipbounds );
339 QGfxRaster<depth,type>::drawPoint( x, y );
340 QWSDisplay::ungrab();
341 }
342@@ -981,8 +981,8 @@
343 {
344 QWSDisplay::grab( TRUE );
345 QRect r = pa.boundingRect();
346- r.moveBy( xoffs, yoffs );
347- qvnc_screen->setDirty( r & clipbounds );
348+ r.moveBy( this->xoffs, this->yoffs );
349+ qvnc_screen->setDirty( r & this->clipbounds );
350 QGfxRaster<depth,type>::drawPoints( pa, x, y );
351 QWSDisplay::ungrab();
352 }
353@@ -992,9 +992,9 @@
354 {
355 QWSDisplay::grab( TRUE );
356 QRect r;
357- r.setCoords( x1+xoffs, y1+yoffs, x2+xoffs, y2+yoffs );
358+ r.setCoords( x1+this->xoffs, y1+this->yoffs, x2+this->xoffs, y2+this->yoffs );
359 r = r.normalize();
360- qvnc_screen->setDirty( r & clipbounds );
361+ qvnc_screen->setDirty( r & this->clipbounds );
362 QGfxRaster<depth,type>::drawLine( x1, y1, x2, y2 );
363 QWSDisplay::ungrab();
364 }
365@@ -1003,7 +1003,7 @@
366 void QGfxVNC<depth,type>::fillRect( int x,int y,int w,int h )
367 {
368 QWSDisplay::grab( TRUE );
369- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds );
370+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds );
371 QGfxRaster<depth,type>::fillRect( x, y, w, h );
372 QWSDisplay::ungrab();
373 }
374@@ -1013,8 +1013,8 @@
375 {
376 QWSDisplay::grab( TRUE );
377 QRect r = pa.boundingRect();
378- r.moveBy( xoffs, yoffs );
379- qvnc_screen->setDirty( r & clipbounds );
380+ r.moveBy( this->xoffs, this->yoffs );
381+ qvnc_screen->setDirty( r & this->clipbounds );
382 QGfxRaster<depth,type>::drawPolyline( pa, x, y );
383 QWSDisplay::ungrab();
384 }
385@@ -1024,8 +1024,8 @@
386 {
387 QWSDisplay::grab( TRUE );
388 QRect r = pa.boundingRect();
389- r.moveBy( xoffs, yoffs );
390- qvnc_screen->setDirty( r & clipbounds );
391+ r.moveBy( this->xoffs, this->yoffs );
392+ qvnc_screen->setDirty( r & this->clipbounds );
393 QGfxRaster<depth,type>::drawPolygon( pa, w, x, y );
394 QWSDisplay::ungrab();
395 }
396@@ -1034,7 +1034,7 @@
397 void QGfxVNC<depth,type>::blt( int x,int y,int w,int h, int sx, int sy )
398 {
399 QWSDisplay::grab( TRUE );
400- qvnc_screen->setDirty( QRect( x+xoffs, y+yoffs, w, h ) & clipbounds );
401+ qvnc_screen->setDirty( QRect( x+this->xoffs, y+this->yoffs, w, h ) & this->clipbounds );
402 QGfxRaster<depth,type>::blt( x, y, w, h, sx, sy );
403 QWSDisplay::ungrab();
404 }
405@@ -1045,8 +1045,8 @@
406 QWSDisplay::grab( TRUE );
407 int dy = sy - y;
408 int dx = sx - x;
409- qvnc_screen->setDirty( QRect(QMIN(x,sx) + xoffs, QMIN(y,sy) + yoffs,
410 - w+abs(dx), h+abs(dy)) & clipbounds );
411+ qvnc_screen->setDirty( QRect(QMIN(x,sx) + this->xoffs, QMIN(y,sy) + this->yoffs,
412 + w+abs(dx), h+abs(dy)) & this->clipbounds );
413 QGfxRaster<depth,type>::scroll( x, y, w, h, sx, sy );
414 QWSDisplay::ungrab();
415 }
416@@ -1056,7 +1056,7 @@
417 void QGfxVNC<depth,type>::stretchBlt( int x,int y,int w,int h,int sx,int sy )
418 {
419 QWSDisplay::grab( TRUE );
420- qvnc_screen->setDirty( QRect( x + xoffs, y + yoffs, w, h) & clipbounds );
421+ qvnc_screen->setDirty( QRect( x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
422 QGfxRaster<depth,type>::stretchBlt( x, y, w, h, sx, sy );
423 QWSDisplay::ungrab();
424 }
425@@ -1066,7 +1066,7 @@
426 void QGfxVNC<depth,type>::tiledBlt( int x,int y,int w,int h )
427 {
428 QWSDisplay::grab( TRUE );
429- qvnc_screen->setDirty( QRect(x + xoffs, y + yoffs, w, h) & clipbounds );
430+ qvnc_screen->setDirty( QRect(x + this->xoffs, y + this->yoffs, w, h) & this->clipbounds );
431 QGfxRaster<depth,type>::tiledBlt( x, y, w, h );
432 QWSDisplay::ungrab();
433 }
434diff -ur qt-2.3.7_old/src/tools/qcstring.h qt-2.3.7/src/tools/qcstring.h
435 --- qt-2.3.7_old/src/tools/qcstring.h2004-09-10 21:08:04.000000000 +0200
436 +++ qt-2.3.7/src/tools/qcstring.h2004-09-10 21:08:42.000000000 +0200
377@@ -119,7 +119,7 @@ 437@@ -119,7 +119,7 @@
378 // We want to keep source compatibility for 2.x 438 // We want to keep source compatibility for 2.x
379 // ### TODO for 4.0: completely remove these and the cstr* functions 439 // ### TODO for 4.0: completely remove these and the cstr* functions
380 440
381-#if !defined(QT_GENUINE_STR) 441-#if !defined(QT_GENUINE_STR)
382+#if 0 442+#if 0
383 443
384 #undefstrlen 444 #undefstrlen
385 #define strlen qstrlen 445 #define strlen qstrlen
386diff -ur qt-2.3.7_clean/src/tools/qglobal.h qt-2.3.7/src/tools/qglobal.h 446diff -ur qt-2.3.7_old/src/tools/qglobal.h qt-2.3.7/src/tools/qglobal.h
387 --- qt-2.3.7_clean/src/tools/qglobal.h2004-06-04 02:17:53.000000000 +0200 447 --- qt-2.3.7_old/src/tools/qglobal.h2004-09-10 21:08:04.000000000 +0200
388 +++ qt-2.3.7/src/tools/qglobal.h2004-06-04 02:29:41.000000000 +0200 448 +++ qt-2.3.7/src/tools/qglobal.h2004-09-10 21:08:42.000000000 +0200
389@@ -207,8 +207,16 @@ 449@@ -207,8 +207,16 @@
390 #if __GNUC__ == 2 && __GNUC_MINOR__ == 96 450 #if __GNUC__ == 2 && __GNUC_MINOR__ == 96
391 #define Q_FP_CCAST_BROKEN 451 #define Q_FP_CCAST_BROKEN
392 #endif 452 #endif
393+/* ARM gcc pads structs to 32 bits, even when they contain a single 453+/* ARM gcc pads structs to 32 bits, even when they contain a single
394+ char, or short. We tell gcc to pack QChars to 16 bits, to avoid 454+ char, or short. We tell gcc to pack QChars to 16 bits, to avoid
395+ QString bloat. However, gcc 3.4 doesn't allow us to create references to 455+ QString bloat. However, gcc 3.4 doesn't allow us to create references to
396+ members of a packed struct. (Pointers are OK, because then you 456+ members of a packed struct. (Pointers are OK, because then you
397+ supposedly know what you are doing.) */ 457+ supposedly know what you are doing.) */
398 #if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) 458 #if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
399 #define Q_PACKED __attribute__ ((packed)) 459 #define Q_PACKED __attribute__ ((packed))
400+# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 460+# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
401+# define Q_NO_PACKED_REFERENCE 461+# define Q_NO_PACKED_REFERENCE
402+# endif 462+# endif
403 #endif 463 #endif
404 #elif defined(__xlC__) 464 #elif defined(__xlC__)
405 #define _CC_XLC_ 465 #define _CC_XLC_
406Nur in qt-2.3.7/src/tools: qglobal.h~. 466diff -ur qt-2.3.7_old/src/tools/qsortedlist.h qt-2.3.7/src/tools/qsortedlist.h
407diff -ur qt-2.3.7_clean/src/tools/qsortedlist.h qt-2.3.7/src/tools/qsortedlist.h 467 --- qt-2.3.7_old/src/tools/qsortedlist.h2004-09-10 21:08:04.000000000 +0200
408 --- qt-2.3.7_clean/src/tools/qsortedlist.h2004-06-04 02:17:53.000000000 +0200 468 +++ qt-2.3.7/src/tools/qsortedlist.h2004-09-10 21:08:42.000000000 +0200
409 +++ qt-2.3.7/src/tools/qsortedlist.h2004-06-04 02:24:25.000000000 +0200
410@@ -48,7 +48,7 @@ 469@@ -48,7 +48,7 @@
411 public: 470 public:
412 QSortedList() {} 471 QSortedList() {}
413 QSortedList( const QSortedList<type> &l ) : QList<type>(l) {} 472 QSortedList( const QSortedList<type> &l ) : QList<type>(l) {}
414- ~QSortedList() { clear(); } 473- ~QSortedList() { clear(); }
415+ ~QSortedList() { this->clear(); } 474+ ~QSortedList() { this->clear(); }
416 QSortedList<type> &operator=(const QSortedList<type> &l) 475 QSortedList<type> &operator=(const QSortedList<type> &l)
417 { return (QSortedList<type>&)QList<type>::operator=(l); } 476 { return (QSortedList<type>&)QList<type>::operator=(l); }
418 477
419diff -ur qt-2.3.7_clean/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h 478diff -ur qt-2.3.7_old/src/tools/qstring.h qt-2.3.7/src/tools/qstring.h
420 --- qt-2.3.7_clean/src/tools/qstring.h2004-06-04 02:17:53.000000000 +0200 479 --- qt-2.3.7_old/src/tools/qstring.h2004-09-10 21:08:04.000000000 +0200
421 +++ qt-2.3.7/src/tools/qstring.h2004-06-04 02:54:16.000000000 +0200 480 +++ qt-2.3.7/src/tools/qstring.h2004-09-10 21:08:42.000000000 +0200
422@@ -163,8 +163,16 @@ 481@@ -163,8 +163,16 @@
423 bool isLetterOrNumber() const; 482 bool isLetterOrNumber() const;
424 bool isDigit() const; 483 bool isDigit() const;
425 484
426+ 485+
427+#ifdef Q_NO_PACKED_REFERENCE 486+#ifdef Q_NO_PACKED_REFERENCE
428+ uchar& cell() { return *(&cl); } 487+ uchar& cell() { return *(&cl); }
429+ uchar& row() { return *(&rw); } 488+ uchar& row() { return *(&rw); }
430+#else 489+#else
431 uchar& cell() { return cl; } 490 uchar& cell() { return cl; }
432- uchar& row() { return rw; } 491- uchar& row() { return rw; }
433+ uchar& row() { return rw; } 492+ uchar& row() { return rw; }
434+#endif 493+#endif
435+ 494+
436+ 495+
437 uchar cell() const { return cl; } 496 uchar cell() const { return cl; }
438 uchar row() const { return rw; } 497 uchar row() const { return rw; }
439 498
440Nur in qt-2.3.7/src/tools: qstring.h~.