--- providers/gpx/qgsgpxprovider.h~ 2006-05-15 22:33:39.000000000 +0000 +++ providers/gpx/qgsgpxprovider.h 2006-05-15 22:33:43.000000000 +0000 @@ -142,7 +142,7 @@ const std::map<QString, QString>& attrs); /** Adds one feature (used by addFeatures()) */ - bool QgsGPXProvider::addFeature(QgsFeature* f); + bool addFeature(QgsFeature* f); /**Returns the default value for attribute @c attr for feature @c f. */ QString getDefaultValue(const QString& attr, QgsFeature* f); --- plugins/georeferencer/datapointacetate.h~ 2006-05-15 22:45:28.000000000 +0000 +++ plugins/georeferencer/datapointacetate.h 2006-05-15 22:45:41.000000000 +0000 @@ -13,8 +13,7 @@ class DataPointAcetate : public QgsAcetateObject { public: - DataPointAcetate::DataPointAcetate(const QgsPoint& pixelCoords, - const QgsPoint& mapCoords) + DataPointAcetate(const QgsPoint& pixelCoords, const QgsPoint& mapCoords) // UGLY! : QgsAcetateObject(const_cast<QgsPoint&>(pixelCoords)), mCoords(mapCoords) {