Apply patches to allow compilation with FC5 (which actually means wit…

…h g++ version 4) git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_7-candidate@5498 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 29, 2006 · c30c0cb · c30c0cb
1 parent c8a444b
commit c30c0cb
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/qgis/plugins/geoprocessing/qgsdlgpgbuffer.h b/qgis/plugins/geoprocessing/qgsdlgpgbuffer.h
@@ -29,7 +29,7 @@ class QgsDlgPgBuffer:public QgsDlgPgBufferBase
   //! Constructor
     QgsDlgPgBuffer( QgisIface * _qI = 0, QWidget * parent = 0, const char *name = 0);
     //! Destructor
-    QgsDlgPgBuffer::~QgsDlgPgBuffer();
+    ~QgsDlgPgBuffer();
     //! Set the information label in the dialog
     void setBufferLabel(QString & lbl);
     //! Get the buffer distance

diff --git a/qgis/plugins/grid_maker/graticulecreator.h b/qgis/plugins/grid_maker/graticulecreator.h
@@ -19,8 +19,8 @@ class GraticuleCreator
                          double theXEndPointDouble,
                          double theYEndPointDouble);
         ~GraticuleCreator() {};
-        DBFHandle GraticuleCreator::createDbf (QString theDbfName ) ;
-        SHPHandle GraticuleCreator::createShapeFile(QString theFileName ); 
+        DBFHandle createDbf (QString theDbfName ) ;
+        SHPHandle createShapeFile(QString theFileName ); 
         void writeDbfRecord (DBFHandle theDbfHandle, int theRecordIdInt, QString theLabel) ;
         void writePoint(SHPHandle theShapeHandle, int theRecordInt, double theXDouble, double y ); 
         //! Writes a WGS 84 .prj file for the generated grid

diff --git a/qgis/providers/gpx/qgsgpxprovider.h b/qgis/providers/gpx/qgsgpxprovider.h
@@ -142,7 +142,7 @@ class QgsGPXProvider : public QgsVectorDataProvider {
 			     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);

diff --git a/qgis/src/qgslabel.h b/qgis/src/qgslabel.h
@@ -91,7 +91,7 @@ class QgsLabel
     void addRequiredFields ( std::list<int> *fields );
 
     //! Available vector fields
-    std::vector<QgsField> & QgsLabel::fields ( void );
+    std::vector<QgsField> & fields ( void );
 
     //! Pointer to default attributes
     QgsLabelAttributes *layerAttributes ( void );

diff --git a/qgis/src/qgsproject.h b/qgis/src/qgsproject.h
@@ -95,9 +95,9 @@ class QgsProject
        write()
      */
     //@{
-    bool QgsProject::dirty() const;
+    bool dirty() const;
 
-    void QgsProject::dirty( bool b );
+    void dirty( bool b );
     //@}
 
 

diff --git a/qgis/src/qgsprojectproperties.h b/qgis/src/qgsprojectproperties.h
@@ -60,7 +60,7 @@ class QgsProjectProperties : public QgsProjectPropertiesBase
   /*! Accessor for projection */
   QString projectionWKT();
   /*! Indicates that the projection switch is on */
-  bool QgsProjectProperties::isProjected();
+  bool isProjected();
 public slots:
   /*! 
    * Slot called when a new button (unit) is selected

diff --git a/qgis/src/qgsrasterlayerproperties.h b/qgis/src/qgsrasterlayerproperties.h
@@ -69,7 +69,7 @@ class QgsRasterLayerProperties : public QgsRasterLayerPropertiesBase
         /** \brief slot executed when the three band radio button is pressed. */
         void rbtnThreeBand_toggled( bool );
         /** \brief slot executed when user wishes to refresh raster histogram */
-        void QgsRasterLayerProperties::pbnHistRefresh_clicked();
+        void pbnHistRefresh_clicked();
         /** Override the SRS specified when the layer was loaded */
         void pbnChangeSpatialRefSys_clicked();