sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace Qt3 stuff by Qt4 stuff

Browse Source 
Tidy up #includes


git-svn-id: http://svn.osgeo.org/qgis/trunk@4761 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
g_j_m 2006-01-28 01:39:04 +00:00
parent 271172e36a
commit 0f80ae4f0d
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/qgsmarkercatalogue.cpp
View File

@ -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);

12
src/core/qgsmarkercatalogue.h
View File

@ -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{