Misc. tidy up.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5290 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 16, 2006 · 5c641d2 · 5c641d2
1 parent 8ca7fd9
commit 5c641d2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/core/qgsrect.cpp b/src/core/qgsrect.cpp
@@ -22,8 +22,8 @@
 #ifdef WIN32
 #include <limits>
 #endif
-#include <qstring.h>
-#include <qtextstream.h> 
+#include <QString>
+#include <QTextStream> 
 
 #include "qgspoint.h"
 #include "qgsrect.h"
@@ -86,7 +86,7 @@ void QgsRect::setMinimal()
   ymax =-std::numeric_limits<double>::max();
 }
 
-void QgsRect::scale(double scaleFactor, QgsPoint * cp)
+void QgsRect::scale(double scaleFactor, const QgsPoint * cp)
 {
   // scale from the center
   double centerX, centerY;
@@ -107,7 +107,7 @@ void QgsRect::scale(double scaleFactor, QgsPoint * cp)
   ymax = centerY + newHeight / 2.0;
 }
 
-void QgsRect::expand(double scaleFactor, QgsPoint * cp)
+void QgsRect::expand(double scaleFactor, const QgsPoint * cp)
 {
   // scale from the center
   double centerX, centerY;

diff --git a/src/core/qgsrect.h b/src/core/qgsrect.h
@@ -21,9 +21,7 @@
 
 #include <iosfwd>
 
-#ifndef QSTRING_H
-#include <qstring.h>
-#endif
+class QString;
 
 #include "qgspoint.h"
 
@@ -79,9 +77,9 @@ class QgsRect
     //! Center point of the rectangle
     QgsPoint center() const;
     //! Scale the rectangle around its center point
-    void scale(double, QgsPoint *c =0);
+    void scale(double, const QgsPoint *c =0);
     //! Expand the rectangle to support zoom out scaling
-    void expand(double, QgsPoint *c = 0);
+    void expand(double, const QgsPoint *c = 0);
     //! return the intersection with the given rectangle
     QgsRect intersect(QgsRect *rect);
     //! expand the rectangle so that covers both the original rectangle and the given rectangle