From 9709002c41c38b48eae61b3b8aaa328287d5225f Mon Sep 17 00:00:00 2001
From: g_j_m <g_j_m@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Sat, 28 Jan 2006 01:39:04 +0000
Subject: [PATCH] Replace Qt3 stuff by Qt4 stuff Tidy up #includes

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4761 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/core/qgsmarkercatalogue.cpp | 20 ++++++++++----------
 src/core/qgsmarkercatalogue.h   | 12 +++++-------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/core/qgsmarkercatalogue.cpp b/src/core/qgsmarkercatalogue.cpp
index 05dd385dabcc..20f107d438b4 100644
--- a/src/core/qgsmarkercatalogue.cpp
+++ b/src/core/qgsmarkercatalogue.cpp
@@ -16,15 +16,15 @@
 #include <cmath>
 #include <iostream>
 
-#include <qpainter.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qbitmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qrect.h>
-#include <q3pointarray.h>
-#include <qdir.h>
+#include <QPen>
+#include <QBrush>
+#include <QPainter>
+#include <QPixmap>
+#include <QString>
+#include <QStringList>
+#include <QRect>
+#include <QPolygon>
+#include <QDir>
 #include <QPicture>
 
 #include "qgsapplication.h"
@@ -145,7 +145,7 @@ QPicture QgsMarkerCatalogue::hardMarker ( QString name, int s, QPen pen, QBrush
     else if ( name == "diamond" ) 
     {
 	half = (int) ( sqrt(area/2.) );
-	Q3PointArray pa(4);
+	QPolygon pa(4);
 	pa.setPoint ( 0, 0, half);
 	pa.setPoint ( 1, half, 2*half);
 	pa.setPoint ( 2, 2*half, half);
diff --git a/src/core/qgsmarkercatalogue.h b/src/core/qgsmarkercatalogue.h
index 66c2bab32dbe..06b38febf152 100644
--- a/src/core/qgsmarkercatalogue.h
+++ b/src/core/qgsmarkercatalogue.h
@@ -18,14 +18,12 @@
 
 #include <iostream>
 
-#include <qbrush.h>
-#include <qpen.h>
-#include <qpixmap.h>
-#include <qpicture.h>
-#include <qdom.h>
-#include <qstringlist.h>
-
 class QString;
+class QStringList;
+class QPicture;
+class QPixmap;
+class QPen;
+class QBrush;
 
 /** Catalogue of point symbols */
 class QgsMarkerCatalogue{