Couple more qt3 to qt4 changes

g_j_m · g_j_m · commit e51f74eb2a7f · 2006-01-29T01:45:26.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@4775 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgsdelattrdialog.cpp b/src/gui/qgsdelattrdialog.cpp
@@ -18,7 +18,6 @@
 #include "qgsdelattrdialog.h"
 #include "qgsfield.h"
 #include <q3header.h>
-#include <q3listbox.h>
 
 QgsDelAttrDialog::QgsDelAttrDialog(Q3Header* header): QgsDelAttrDialogBase()
 {
diff --git a/src/gui/qgsrasterlayerproperties.cpp b/src/gui/qgsrasterlayerproperties.cpp
@@ -24,7 +24,7 @@ email                : tim@linfiniti.com
 #include <qgsrasterlayer.h>
 
 #include <QPainter>
-#include <Q3PointArray>
+#include <QPolygon>
 #include <iostream>
 
 const char * const ident = 
@@ -821,7 +821,7 @@ void QgsRasterLayerProperties::on_pbnHistRefresh_clicked()
   if (rasterLayer->getRasterLayerType()
           == QgsRasterLayer::PALETTE) //paletted layers have hard coded color entries
   {
-    Q3PointArray myPointArray(myLastBinWithData);
+    QPolygon myPointArray(myLastBinWithData);
     QgsColorTable *myColorTable=rasterLayer->colorTable(1);
 #ifdef QGISDEBUG
     std::cout << "Making paletted image histogram....computing band stats" << std::endl;
@@ -903,7 +903,7 @@ void QgsRasterLayerProperties::on_pbnHistRefresh_clicked()
       if ( myItem->isSelected() )
       {
 
-        Q3PointArray myPointArray(myLastBinWithData);
+        QPolygon myPointArray(myLastBinWithData);
         for (int myBin = 0; myBin <myLastBinWithData; myBin++)
         {
           double myBinValue = myRasterBandStats.histogramVector->at(myBin);
@@ -1022,7 +1022,7 @@ void QgsRasterLayerProperties::on_pbnHistRefresh_clicked()
   myPainter.setPen( Qt::gray );
   for (int i=0;i<myXDivisions;++i)
   {
-    Q3PointArray myPointArray(4);
+    QPolygon myPointArray(4);
     myPointArray.setPoint(0,(i*myXDivisions)+myYGutterWidth , myImageHeight-myXGutterHeight);
     myPointArray.setPoint(1,(i*myXDivisions)+myYGutterWidth , myImageHeight-(myXGutterHeight-5));
     myPointArray.setPoint(2,(i*myXDivisions)+myYGutterWidth , myImageHeight-myXGutterHeight);
@@ -1037,7 +1037,7 @@ void QgsRasterLayerProperties::on_pbnHistRefresh_clicked()
   for (int i=myYDivisions;i>0;--i)
   {
 
-    Q3PointArray myPointArray(4);
+    QPolygon myPointArray(4);
     int myYOrigin = myImageHeight-myXGutterHeight;
     myPointArray.setPoint(0,myYGutterWidth,myYOrigin-(i*myYDivisions ));
     myPointArray.setPoint(1,myYGutterWidth-5,myYOrigin-(i*myYDivisions ));

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@`
`18`	`18`	`#include "qgsdelattrdialog.h"`
`19`	`19`	`#include "qgsfield.h"`
`20`	`20`	`#include <q3header.h>`
`21`		`-#include <q3listbox.h>`
`22`	`21`
`23`	`22`	`QgsDelAttrDialog::QgsDelAttrDialog(Q3Header* header): QgsDelAttrDialogBase()`
`24`	`23`	`{`