Skip to content

Commit c30c0cb

Browse files
author
g_j_m
committed
Apply patches to allow compilation with FC5 (which actually means with g++ version 4)
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_7-candidate@5498 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent c8a444b commit c30c0cb

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

qgis/plugins/geoprocessing/qgsdlgpgbuffer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class QgsDlgPgBuffer:public QgsDlgPgBufferBase
2929
//! Constructor
3030
QgsDlgPgBuffer( QgisIface * _qI = 0, QWidget * parent = 0, const char *name = 0);
3131
//! Destructor
32-
QgsDlgPgBuffer::~QgsDlgPgBuffer();
32+
~QgsDlgPgBuffer();
3333
//! Set the information label in the dialog
3434
void setBufferLabel(QString & lbl);
3535
//! Get the buffer distance

qgis/plugins/grid_maker/graticulecreator.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class GraticuleCreator
1919
double theXEndPointDouble,
2020
double theYEndPointDouble);
2121
~GraticuleCreator() {};
22-
DBFHandle GraticuleCreator::createDbf (QString theDbfName ) ;
23-
SHPHandle GraticuleCreator::createShapeFile(QString theFileName );
22+
DBFHandle createDbf (QString theDbfName ) ;
23+
SHPHandle createShapeFile(QString theFileName );
2424
void writeDbfRecord (DBFHandle theDbfHandle, int theRecordIdInt, QString theLabel) ;
2525
void writePoint(SHPHandle theShapeHandle, int theRecordInt, double theXDouble, double y );
2626
//! Writes a WGS 84 .prj file for the generated grid

qgis/providers/gpx/qgsgpxprovider.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class QgsGPXProvider : public QgsVectorDataProvider {
142142
const std::map<QString, QString>& attrs);
143143

144144
/** Adds one feature (used by addFeatures()) */
145-
bool QgsGPXProvider::addFeature(QgsFeature* f);
145+
bool addFeature(QgsFeature* f);
146146

147147
/**Returns the default value for attribute @c attr for feature @c f. */
148148
QString getDefaultValue(const QString& attr, QgsFeature* f);

qgis/src/qgslabel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class QgsLabel
9191
void addRequiredFields ( std::list<int> *fields );
9292

9393
//! Available vector fields
94-
std::vector<QgsField> & QgsLabel::fields ( void );
94+
std::vector<QgsField> & fields ( void );
9595

9696
//! Pointer to default attributes
9797
QgsLabelAttributes *layerAttributes ( void );

qgis/src/qgsproject.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ class QgsProject
9595
write()
9696
*/
9797
//@{
98-
bool QgsProject::dirty() const;
98+
bool dirty() const;
9999

100-
void QgsProject::dirty( bool b );
100+
void dirty( bool b );
101101
//@}
102102

103103

qgis/src/qgsprojectproperties.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class QgsProjectProperties : public QgsProjectPropertiesBase
6060
/*! Accessor for projection */
6161
QString projectionWKT();
6262
/*! Indicates that the projection switch is on */
63-
bool QgsProjectProperties::isProjected();
63+
bool isProjected();
6464
public slots:
6565
/*!
6666
* Slot called when a new button (unit) is selected

qgis/src/qgsrasterlayerproperties.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class QgsRasterLayerProperties : public QgsRasterLayerPropertiesBase
6969
/** \brief slot executed when the three band radio button is pressed. */
7070
void rbtnThreeBand_toggled( bool );
7171
/** \brief slot executed when user wishes to refresh raster histogram */
72-
void QgsRasterLayerProperties::pbnHistRefresh_clicked();
72+
void pbnHistRefresh_clicked();
7373
/** Override the SRS specified when the layer was loaded */
7474
void pbnChangeSpatialRefSys_clicked();
7575

0 commit comments

Comments
 (0)