Yet more qt3 to qt4 changes and #include tidy ups

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4776 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 29, 2006 · 05da18d · 05da18d
1 parent 7ea030f
commit 05da18d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/src/core/qgssvgcache.cpp b/src/core/qgssvgcache.cpp
@@ -18,17 +18,13 @@
 
 #include <iostream>
 
-#include <qimage.h>
-#include <qpainter.h>
-#include <q3picture.h>
-#include <qsettings.h>
-#include <qmessagebox.h>
-
-#include "qgssvgcache.h"
-//Added by qt3to4:
+#include <QPainter>
+#include <QSettings>
 #include <QPixmap>
 #include <QSvgRenderer>
 
+#include "qgssvgcache.h"
+
 
 QgsSVGCache::QgsSVGCache() {
   QSettings settings;

diff --git a/src/core/qgssvgcache.h b/src/core/qgssvgcache.h
@@ -22,7 +22,7 @@
 #include <map>
 #include <queue>
 
-#include <qpixmap.h>
+#include <QPixmap>
 #include <QSvgRenderer>
 
 /** This class is a singleton that does all the SVG rendering in QGIS.

diff --git a/src/core/qgssymbol.cpp b/src/core/qgssymbol.cpp
@@ -24,14 +24,8 @@
 #include "qgssvgcache.h"
 #include "qgsmarkercatalogue.h"
 
-#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 <QPainter>
+#include <QString>
 
 QgsSymbol::QgsSymbol(QGis::VectorType t, QString lvalue, QString uvalue, QString label) : 
       mLowerValue(lvalue),

diff --git a/src/core/qgssymbol.h b/src/core/qgssymbol.h
@@ -22,10 +22,10 @@
 #include <iostream>
 
 #include "qgis.h"
-#include <qbrush.h>
-#include <qpen.h>
-#include <qpixmap.h>
-#include <qdom.h>
+#include <QBrush>
+#include <QPen>
+#include <QPixmap>
+#include <QDomNode>
 
 class QString;