Skip to content

Commit

Permalink
Apply patches to allow compilation with FC5 (which actually means wit…
Browse files Browse the repository at this point in the history
…h g++ version 4)

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_7-candidate@5498 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed May 29, 2006
1 parent c8a444b commit c30c0cb
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion qgis/plugins/geoprocessing/qgsdlgpgbuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions qgis/plugins/grid_maker/graticulecreator.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion qgis/providers/gpx/qgsgpxprovider.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion qgis/src/qgslabel.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down
4 changes: 2 additions & 2 deletions qgis/src/qgsproject.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ class QgsProject
write()
*/
//@{
bool QgsProject::dirty() const;
bool dirty() const;

void QgsProject::dirty( bool b );
void dirty( bool b );
//@}


Expand Down
2 changes: 1 addition & 1 deletion qgis/src/qgsprojectproperties.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion qgis/src/qgsrasterlayerproperties.h
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit c30c0cb

Please sign in to comment.