Removed the need for updatePositionManual - when you want to implement custom position

logic simply override updatePosition...




git-svn-id: http://svn.osgeo.org/qgis/trunk@5129 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: timlinux

src/plugins/georeferencer/qgsgeorefdatapoint.cpp

@@ -8,7 +8,6 @@ QgsGeorefDataPoint::QgsGeorefDataPoint(QgsMapCanvas* mapCanvas, int id,
  : QgsMapCanvasItem(mapCanvas), mId(id),
    mPixelCoords(pixelCoords), mMapCoords(mapCoords)
 {
-  mResizeType = ResizeManual;
   updatePosition();
 }
 
@@ -35,14 +34,14 @@ void QgsGeorefDataPoint::drawShape(QPainter & p)
   setSize(textBounds.width() + 6, textBounds.height() + 6);
 }
 
-void QgsGeorefDataPoint::updatePositionManual()
+void QgsGeorefDataPoint::updatePosition()
 {
   QPoint pt = toCanvasCoords(mPixelCoords);
   move(pt.x() - 2, pt.y() - 2);
   show();
 
 //#ifdef QGISDEBUG
-  std::cout << "georefDataPoint::updatePositionManual: " << pt.x() << "," << pt.y() << std::endl;
+  std::cout << "georefDataPoint::updatePosition: " << pt.x() << "," << pt.y() << std::endl;
 //#endif
 
 }

src/plugins/georeferencer/qgsgeorefdatapoint.h

@@ -15,7 +15,7 @@ class QgsGeorefDataPoint : public QgsMapCanvasItem
     virtual void drawShape(QPainter & p);
 
     //! handler for manual updating of position and size
-    virtual void updatePositionManual();
+    virtual void updatePosition();
 
     //! returns coordinates of the point
     QgsPoint pixelCoords() { return mPixelCoords; }

src/plugins/grass/qgsgrassedit.cpp

@@ -76,16 +76,15 @@ class QgsGrassEditLayer : public QgsMapCanvasItem
 
     QgsGrassEditLayer(QgsMapCanvas* mapCanvas):QgsMapCanvasItem(mapCanvas)
     {
-      setResizeType(ResizeManual);
-      updatePositionManual();
+      updatePosition();
     }
 
     virtual void drawShape(QPainter & p)
     {
       p.drawPixmap(0,0, mPixmap);
     }
 
-    virtual void updatePositionManual()
+    virtual void updatePosition()
     {
       int width = mMapCanvas->size().width();
       int height = mMapCanvas->size().height();