[Kde-cygwin-cvs] CVS: qt-3/src/kernel qclipboard_win.cpp,1.1.2.7.2.14,1.1.2.7.2.15 qfontengine_win.cpp,1.1.2.33,1.1.2.34 qpainter_win.cpp,1.1.2.15.2.55,1.1.2.15.2.56 qpixmap_win.cpp,1.1.2.13.2.37,1.1.2.13.2.38 qregion_win.cpp,1.1.2.7.2.13,1.1.2.7.2.14

[Christian E. <che...@us...>]

Update of /cvsroot/kde-cygwin/qt-3/src/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2253/src/kernel

Modified Files:
      Tag: QT_WIN32_3_3_BRANCH
	qclipboard_win.cpp qfontengine_win.cpp qpainter_win.cpp 
	qpixmap_win.cpp qregion_win.cpp 
Log Message:
remove some compiler warnings

Index: qclipboard_win.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qclipboard_win.cpp,v
retrieving revision 1.1.2.7.2.14
retrieving revision 1.1.2.7.2.15
diff -u -r1.1.2.7.2.14 -r1.1.2.7.2.15
--- qclipboard_win.cpp	12 Feb 2005 12:51:13 -0000	1.1.2.7.2.14
+++ qclipboard_win.cpp	24 Oct 2005 16:07:40 -0000	1.1.2.7.2.15
@@ -154,7 +154,7 @@
 
     if ( n >= 0 ) {
         QPtrList<QWindowsMime> ptrlst = QWindowsMime::all();
-        if ( n < ptrlst.count() ) {
+        if ( ( unsigned int ) n < ptrlst.count() ) {
             return ptrlst.at( n ) ->mimeFor( ptrlst.at( n ) ->cf( 0 ) );
         }
     }

Index: qfontengine_win.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qfontengine_win.cpp,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -r1.1.2.33 -r1.1.2.34
--- qfontengine_win.cpp	7 Jul 2005 07:47:36 -0000	1.1.2.33
+++ qfontengine_win.cpp	24 Oct 2005 16:07:40 -0000	1.1.2.34
@@ -596,8 +596,8 @@
 {
     glyph_metrics_t overall;
 
-    int ymax = 0;
-    int xmax = 0;
+    unsigned int ymax = 0;
+    unsigned int xmax = 0;
 
     GLYPHMETRICS gmw = {0};
     MAT2 mat;

Index: qpainter_win.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qpainter_win.cpp,v
retrieving revision 1.1.2.15.2.55
retrieving revision 1.1.2.15.2.56
diff -u -r1.1.2.15.2.55 -r1.1.2.15.2.56
--- qpainter_win.cpp	12 Jul 2005 18:26:55 -0000	1.1.2.15.2.55
+++ qpainter_win.cpp	24 Oct 2005 16:07:40 -0000	1.1.2.15.2.56
@@ -1104,46 +1104,6 @@
         return FALSE;
     }
     killPStack();
-    if ( testf( FontMet ) )       // remove references to this
-        ; //todo QFontMetrics::reset( this );
-    if ( testf( FontInf ) )       // remove references to this
-        ; //todo QFontMetrics::reset( this );
-
-    //    if ( pdev->devType() == QInternal::Widget )
-    //        ReleaseDC( ( ( QWidget * ) pdev ) ->winId(), hdc );
-    //#### This should not be necessary:
-    /*    if ( pdev->devType() == QInternal::Widget  &&
-      ((QWidget*)pdev)->testWFlags(WPaintUnclipped) ) {
-     if ( gc )
-         XSetSubwindowMode( dpy, gc, ClipByChildren );
-     if ( gc_brush )
-         XSetSubwindowMode( dpy, gc_brush, ClipByChildren );
-        }
-    */
-    // Holgi TODO release pen and bruch references on windows too,
-    // when we are building custom ones... do i have to release
-    // stock ones too?
-    /*    if ( gc_brush ) {    // restore brush gc
-     if ( brushRef ) {
-         release_gc( brushRef );
-         brushRef = 0;
-     } else {
-         free_gc( dpy, gc_brush, testf(UsePrivateCx) );
-     }
-     gc_brush = 0;
-
-        }
-    */
-    /*    if ( gc ) {     // restore pen gc
-     if ( penRef ) {
-         release_gc( penRef );
-         penRef = 0;
-     } else {
-         free_gc( dpy, gc, testf(UsePrivateCx) );
-     }
-     gc = 0;
-        }
-    */
     if ( testf( ExtDev ) )
         pdev->cmd( QPaintDevice::PdcEnd, this, 0 );
 

Index: qpixmap_win.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qpixmap_win.cpp,v
retrieving revision 1.1.2.13.2.37
retrieving revision 1.1.2.13.2.38
diff -u -r1.1.2.13.2.37 -r1.1.2.13.2.38
--- qpixmap_win.cpp	18 Jun 2005 11:10:10 -0000	1.1.2.13.2.37
+++ qpixmap_win.cpp	24 Oct 2005 16:07:40 -0000	1.1.2.13.2.38
@@ -166,7 +166,6 @@
     } else {
         BITMAPINFO bmpInfo;
         void *lpBits;
-        int nSize;
 
         bmpInfo.bmiHeader.biSize = sizeof( BITMAPINFOHEADER );
         bmpInfo.bmiHeader.biWidth = data->w;
@@ -519,7 +518,6 @@
         image.setColor( 1, Qt::white.rgb() );
     }
 
-    QRgb q;
     uchar *bits;
     // No need for Unicode here
     long sbpr;
@@ -855,7 +853,7 @@
     uchar *srow;
     QImage::Endian sord = image.bitOrder();
     const uchar* f = qt_get_bitflip_array();
-    int x, y, alpha;
+    int x, y;
 
     if ( sdepth == 8 || sdepth == 16 || sdepth == 32 )
         data->realAlphaBits = new uchar[ w * h ];

Index: qregion_win.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/kernel/Attic/qregion_win.cpp,v
retrieving revision 1.1.2.7.2.13
retrieving revision 1.1.2.7.2.14
diff -u -r1.1.2.7.2.13 -r1.1.2.7.2.14
--- qregion_win.cpp	12 Jul 2005 18:27:01 -0000	1.1.2.7.2.13
+++ qregion_win.cpp	24 Oct 2005 16:07:40 -0000	1.1.2.7.2.14
@@ -424,7 +424,7 @@
 
     a = QMemArray<QRect>(rd->rdh.nCount);
     RECT *r = reinterpret_cast<RECT*>(rd->Buffer);
-    for (int i = 0; i < a.size(); ++i) {
+    for (unsigned int i = 0; i < a.size(); ++i) {
         a[i].setCoords(r->left, r->top, r->right - 1, r->bottom - 1);
         ++r;
     }