diff --git a/src/analysis/interpolation/qgsgridfilewriter.cpp b/src/analysis/interpolation/qgsgridfilewriter.cpp index e18a6bed58bc..b7cffce6e94f 100644 --- a/src/analysis/interpolation/qgsgridfilewriter.cpp +++ b/src/analysis/interpolation/qgsgridfilewriter.cpp @@ -20,8 +20,9 @@ #include #include -QgsGridFileWriter::QgsGridFileWriter( QgsInterpolator* i, QString outputPath, QgsRectangle extent, int nCols, int nRows , double cellSizeX, double cellSizeY ): \ - mInterpolator( i ), mOutputFilePath( outputPath ), mInterpolationExtent( extent ), mNumColumns( nCols ), mNumRows( nRows ), mCellSizeX( cellSizeX ), mCellSizeY( cellSizeY ) +QgsGridFileWriter::QgsGridFileWriter( QgsInterpolator* i, QString outputPath, QgsRectangle extent, int nCols, int nRows , double cellSizeX, double cellSizeY ) + : mInterpolator( i ), mOutputFilePath( outputPath ), mInterpolationExtent( extent ), mNumColumns( nCols ), mNumRows( nRows ) + , mCellSizeX( cellSizeX ), mCellSizeY( cellSizeY ) { } diff --git a/src/analysis/raster/qgsaspectfilter.h b/src/analysis/raster/qgsaspectfilter.h index 4832290a0aec..15bc2cb40b7f 100644 --- a/src/analysis/raster/qgsaspectfilter.h +++ b/src/analysis/raster/qgsaspectfilter.h @@ -29,10 +29,11 @@ class ANALYSIS_EXPORT QgsAspectFilter: public QgsDerivativeFilter protected: protected: - /**Calculates output value from nine input values. The input values and the output value can be equal to the \ + /**Calculates output value from nine input values. The input values and the output value can be equal to the nodata value if not present or outside of the border. Must be implemented by subclasses*/ - float processNineCellWindow( float* x11, float* x21, float* x31, \ - float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 ); + float processNineCellWindow( float* x11, float* x21, float* x31, + float* x12, float* x22, float* x32, + float* x13, float* x23, float* x33 ); }; #endif // QGSASPECTFILTER_H diff --git a/src/analysis/raster/qgsderivativefilter.cpp b/src/analysis/raster/qgsderivativefilter.cpp index 8b64ff480a19..73a6aef5f9dc 100644 --- a/src/analysis/raster/qgsderivativefilter.cpp +++ b/src/analysis/raster/qgsderivativefilter.cpp @@ -17,8 +17,8 @@ #include "qgsderivativefilter.h" -QgsDerivativeFilter::QgsDerivativeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \ - QgsNineCellFilter( inputFile, outputFile, outputFormat ) +QgsDerivativeFilter::QgsDerivativeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ) + : QgsNineCellFilter( inputFile, outputFile, outputFormat ) { } diff --git a/src/analysis/raster/qgsderivativefilter.h b/src/analysis/raster/qgsderivativefilter.h index 2ac97b8c89be..19bba16f2bfe 100644 --- a/src/analysis/raster/qgsderivativefilter.h +++ b/src/analysis/raster/qgsderivativefilter.h @@ -27,8 +27,9 @@ class QgsDerivativeFilter: public QgsNineCellFilter QgsDerivativeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ); virtual ~QgsDerivativeFilter(); //to be implemented by subclasses - virtual float processNineCellWindow( float* x11, float* x21, float* x31, float* x12, float* x22, \ - float* x32, float* x13, float* x23, float* x33 ) = 0; + virtual float processNineCellWindow( float* x11, float* x21, float* x31, + float* x12, float* x22, float* x32, + float* x13, float* x23, float* x33 ) = 0; protected: /**Calculates the first order derivative in x-direction according to Horn (1981)*/ diff --git a/src/analysis/raster/qgsninecellfilter.cpp b/src/analysis/raster/qgsninecellfilter.cpp index ed942b5933b9..3d2bb9668f58 100644 --- a/src/analysis/raster/qgsninecellfilter.cpp +++ b/src/analysis/raster/qgsninecellfilter.cpp @@ -25,8 +25,8 @@ #define TO8(x) (x).toLocal8Bit().constData() #endif -QgsNineCellFilter::QgsNineCellFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \ - mInputFile( inputFile ), mOutputFile( outputFile ), mOutputFormat( outputFormat ), mCellSizeX( -1 ), mCellSizeY( -1 ), mInputNodataValue( -1 ), mOutputNodataValue( -1 ) +QgsNineCellFilter::QgsNineCellFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ) + : mInputFile( inputFile ), mOutputFile( outputFile ), mOutputFormat( outputFormat ), mCellSizeX( -1 ), mCellSizeY( -1 ), mInputNodataValue( -1 ), mOutputNodataValue( -1 ) { } @@ -153,17 +153,17 @@ int QgsNineCellFilter::processRaster( QProgressDialog* p ) { if ( j == 0 ) { - resultLine[j] = processNineCellWindow( &mInputNodataValue, &scanLine1[j], &scanLine1[j+1], &mInputNodataValue, &scanLine2[j], \ + resultLine[j] = processNineCellWindow( &mInputNodataValue, &scanLine1[j], &scanLine1[j+1], &mInputNodataValue, &scanLine2[j], &scanLine2[j+1], &mInputNodataValue, &scanLine3[j], &scanLine3[j+1] ); } else if ( j == xSize - 1 ) { - resultLine[j] = processNineCellWindow( &scanLine1[j-1], &scanLine1[j], &mInputNodataValue, &scanLine2[j-1], &scanLine2[j], \ + resultLine[j] = processNineCellWindow( &scanLine1[j-1], &scanLine1[j], &mInputNodataValue, &scanLine2[j-1], &scanLine2[j], &mInputNodataValue, &scanLine3[j-1], &scanLine3[j], &mInputNodataValue ); } else { - resultLine[j] = processNineCellWindow( &scanLine1[j-1], &scanLine1[j], &scanLine1[j+1], &scanLine2[j-1], &scanLine2[j], \ + resultLine[j] = processNineCellWindow( &scanLine1[j-1], &scanLine1[j], &scanLine1[j+1], &scanLine2[j-1], &scanLine2[j], &scanLine2[j+1], &scanLine3[j-1], &scanLine3[j], &scanLine3[j+1] ); } } diff --git a/src/analysis/raster/qgsninecellfilter.h b/src/analysis/raster/qgsninecellfilter.h index fdf3e86c209a..bf0612b81e93 100644 --- a/src/analysis/raster/qgsninecellfilter.h +++ b/src/analysis/raster/qgsninecellfilter.h @@ -23,8 +23,8 @@ class QProgressDialog; -/**Base class for raster analysis methods that work with a 3x3 cell filter and calculate the value of each cell based on \ -the cell value and the eight neighbour cells. Common examples are slope and aspect calculation in DEMs. Subclasses only implement \ +/**Base class for raster analysis methods that work with a 3x3 cell filter and calculate the value of each cell based on +the cell value and the eight neighbour cells. Common examples are slope and aspect calculation in DEMs. Subclasses only implement the method that calculates the new value from the nine values. Everything else (reading file, writing file) is done by this subclass*/ class ANALYSIS_EXPORT QgsNineCellFilter @@ -52,10 +52,11 @@ class ANALYSIS_EXPORT QgsNineCellFilter GDALDatasetH openOutputFile( GDALDatasetH inputDataset, GDALDriverH outputDriver ); protected: - /**Calculates output value from nine input values. The input values and the output value can be equal to the \ + /**Calculates output value from nine input values. The input values and the output value can be equal to the nodata value if not present or outside of the border. Must be implemented by subclasses*/ - virtual float processNineCellWindow( float* x11, float* x21, float* x31, \ - float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 ) = 0; + virtual float processNineCellWindow( float* x11, float* x21, float* x31, + float* x12, float* x22, float* x32, + float* x13, float* x23, float* x33 ) = 0; QString mInputFile; QString mOutputFile; diff --git a/src/analysis/raster/qgsruggednessfilter.cpp b/src/analysis/raster/qgsruggednessfilter.cpp index 40f1d705dadb..70d40d930b6d 100644 --- a/src/analysis/raster/qgsruggednessfilter.cpp +++ b/src/analysis/raster/qgsruggednessfilter.cpp @@ -33,7 +33,7 @@ QgsRuggednessFilter::~QgsRuggednessFilter() } -float QgsRuggednessFilter::processNineCellWindow( float* x11, float* x21, float* x31, \ +float QgsRuggednessFilter::processNineCellWindow( float* x11, float* x21, float* x31, float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 ) { //the formula would be that easy without nodata values... diff --git a/src/analysis/raster/qgsruggednessfilter.h b/src/analysis/raster/qgsruggednessfilter.h index 36402cfb179d..8f85b0230c76 100644 --- a/src/analysis/raster/qgsruggednessfilter.h +++ b/src/analysis/raster/qgsruggednessfilter.h @@ -29,7 +29,7 @@ class ANALYSIS_EXPORT QgsRuggednessFilter: public QgsNineCellFilter ~QgsRuggednessFilter(); protected: - /**Calculates output value from nine input values. The input values and the output value can be equal to the \ + /**Calculates output value from nine input values. The input values and the output value can be equal to the nodata value if not present or outside of the border. Must be implemented by subclasses*/ float processNineCellWindow( float* x11, float* x21, float* x31, \ float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 ); diff --git a/src/analysis/raster/qgsslopefilter.cpp b/src/analysis/raster/qgsslopefilter.cpp index e21c4d7b09de..ea7942bc02d0 100644 --- a/src/analysis/raster/qgsslopefilter.cpp +++ b/src/analysis/raster/qgsslopefilter.cpp @@ -17,8 +17,8 @@ #include "qgsslopefilter.h" -QgsSlopeFilter::QgsSlopeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \ - QgsDerivativeFilter( inputFile, outputFile, outputFormat ) +QgsSlopeFilter::QgsSlopeFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ) + : QgsDerivativeFilter( inputFile, outputFile, outputFormat ) { } @@ -28,7 +28,7 @@ QgsSlopeFilter::~QgsSlopeFilter() } -float QgsSlopeFilter::processNineCellWindow( float* x11, float* x21, float* x31, \ +float QgsSlopeFilter::processNineCellWindow( float* x11, float* x21, float* x31, float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 ) { float derX = calcFirstDerX( x11, x21, x31, x12, x22, x32, x13, x23, x33 ); diff --git a/src/analysis/raster/qgsslopefilter.h b/src/analysis/raster/qgsslopefilter.h index a3f9ff68b47f..2bdc5db5a596 100644 --- a/src/analysis/raster/qgsslopefilter.h +++ b/src/analysis/raster/qgsslopefilter.h @@ -28,10 +28,11 @@ class ANALYSIS_EXPORT QgsSlopeFilter: public QgsDerivativeFilter ~QgsSlopeFilter(); protected: - /**Calculates output value from nine input values. The input values and the output value can be equal to the \ + /**Calculates output value from nine input values. The input values and the output value can be equal to the nodata value if not present or outside of the border. Must be implemented by subclasses*/ - float processNineCellWindow( float* x11, float* x21, float* x31, \ - float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 ); + float processNineCellWindow( float* x11, float* x21, float* x31, + float* x12, float* x22, float* x32, + float* x13, float* x23, float* x33 ); }; #endif // QGSSLOPEFILTER_H diff --git a/src/analysis/raster/qgstotalcurvaturefilter.cpp b/src/analysis/raster/qgstotalcurvaturefilter.cpp index b3b7f3af3054..e5b57e582b0c 100644 --- a/src/analysis/raster/qgstotalcurvaturefilter.cpp +++ b/src/analysis/raster/qgstotalcurvaturefilter.cpp @@ -17,8 +17,8 @@ #include "qgstotalcurvaturefilter.h" -QgsTotalCurvatureFilter::QgsTotalCurvatureFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ): \ - QgsNineCellFilter( inputFile, outputFile, outputFormat ) +QgsTotalCurvatureFilter::QgsTotalCurvatureFilter( const QString& inputFile, const QString& outputFile, const QString& outputFormat ) + : QgsNineCellFilter( inputFile, outputFile, outputFormat ) { } @@ -28,12 +28,12 @@ QgsTotalCurvatureFilter::~QgsTotalCurvatureFilter() } -float QgsTotalCurvatureFilter::processNineCellWindow( float* x11, float* x21, float* x31, float* x12, \ +float QgsTotalCurvatureFilter::processNineCellWindow( float* x11, float* x21, float* x31, float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 ) { //return nodata if one value is the nodata value - if ( *x11 == mInputNodataValue || *x21 == mInputNodataValue || *x31 == mInputNodataValue || *x12 == mInputNodataValue \ - || *x22 == mInputNodataValue || *x32 == mInputNodataValue || *x13 == mInputNodataValue || *x23 == mInputNodataValue \ + if ( *x11 == mInputNodataValue || *x21 == mInputNodataValue || *x31 == mInputNodataValue || *x12 == mInputNodataValue + || *x22 == mInputNodataValue || *x32 == mInputNodataValue || *x13 == mInputNodataValue || *x23 == mInputNodataValue || *x33 == mInputNodataValue ) { return mOutputNodataValue; diff --git a/src/analysis/raster/qgstotalcurvaturefilter.h b/src/analysis/raster/qgstotalcurvaturefilter.h index b935c8608b74..ab872357784b 100644 --- a/src/analysis/raster/qgstotalcurvaturefilter.h +++ b/src/analysis/raster/qgstotalcurvaturefilter.h @@ -28,10 +28,11 @@ class ANALYSIS_EXPORT QgsTotalCurvatureFilter: public QgsNineCellFilter ~QgsTotalCurvatureFilter(); protected: - /**Calculates total curvature from nine input values. The input values and the output value can be equal to the \ + /**Calculates total curvature from nine input values. The input values and the output value can be equal to the nodata value if not present or outside of the border. Must be implemented by subclasses*/ - float processNineCellWindow( float* x11, float* x21, float* x31, \ - float* x12, float* x22, float* x32, float* x13, float* x23, float* x33 ); + float processNineCellWindow( float* x11, float* x21, float* x31, + float* x12, float* x22, float* x32, + float* x13, float* x23, float* x33 ); }; #endif // QGSTOTALCURVATUREFILTER_H diff --git a/src/analysis/vector/qgsoverlayanalyzer.h b/src/analysis/vector/qgsoverlayanalyzer.h index 367758104740..7d2cdfce10aa 100644 --- a/src/analysis/vector/qgsoverlayanalyzer.h +++ b/src/analysis/vector/qgsoverlayanalyzer.h @@ -45,8 +45,8 @@ class ANALYSIS_EXPORT QgsOverlayAnalyzer @param onlySelectedFeatures if true, only selected features are considered, else all the features @param p progress dialog (or 0 if no progress dialog is to be shown) @note: added in version 1.4*/ - bool intersection( QgsVectorLayer* layerA, QgsVectorLayer* layerB, \ - const QString& shapefileName, bool onlySelectedFeatures = false, \ + bool intersection( QgsVectorLayer* layerA, QgsVectorLayer* layerB, + const QString& shapefileName, bool onlySelectedFeatures = false, QProgressDialog* p = 0 ); #if 0 diff --git a/src/analysis/vector/qgszonalstatistics.h b/src/analysis/vector/qgszonalstatistics.h index ff5e8328a169..44981a05e6e1 100644 --- a/src/analysis/vector/qgszonalstatistics.h +++ b/src/analysis/vector/qgszonalstatistics.h @@ -44,14 +44,14 @@ class ANALYSIS_EXPORT QgsZonalStatistics int& offsetX, int& offsetY, int& nCellsX, int& nCellsY ) const; /**Returns statistics by considering the pixels where the center point is within the polygon (fast)*/ - void statisticsFromMiddlePointTest( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY, \ + void statisticsFromMiddlePointTest( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY, double cellSizeX, double cellSizeY, const QgsRectangle& rasterBBox, double& sum, double& count ); - void statisticsFromMiddlePointTest_improved( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY, \ + void statisticsFromMiddlePointTest_improved( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY, double cellSizeX, double cellSizeY, const QgsRectangle& rasterBBox, double& sum, double& count ); /**Returns statistics with precise pixel - polygon intersection test (slow) */ - void statisticsFromPreciseIntersection( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY, \ + void statisticsFromPreciseIntersection( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY, double cellSizeX, double cellSizeY, const QgsRectangle& rasterBBox, double& sum, double& count ); diff --git a/src/app/composer/qgscomposermanager.h b/src/app/composer/qgscomposermanager.h index 944f735adc8d..f1d1730cbcfc 100644 --- a/src/app/composer/qgscomposermanager.h +++ b/src/app/composer/qgscomposermanager.h @@ -22,7 +22,7 @@ class QListWidgetItem; class QgsComposer; -/**A dialog that shows the existing composer instances. Lets the user add new \ +/**A dialog that shows the existing composer instances. Lets the user add new instances and change title of existing ones*/ class QgsComposerManager: public QDialog, private Ui::QgsComposerManagerBase { diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 737a96d89fd5..ddd0643e7469 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -3517,7 +3517,7 @@ QgsGeometry* QgisApp::unionGeometries( const QgsVectorLayer* vl, QgsFeatureList& //convert unionGeom to a multipart geometry in case it is necessary to match the layer type QGis::WkbType t = vl->wkbType(); - bool layerIsMultiType = ( t == QGis::WKBMultiPoint || t == QGis::WKBMultiPoint25D || t == QGis::WKBMultiLineString \ + bool layerIsMultiType = ( t == QGis::WKBMultiPoint || t == QGis::WKBMultiPoint25D || t == QGis::WKBMultiLineString || t == QGis::WKBMultiLineString25D || t == QGis::WKBMultiPolygon || t == QGis::WKBMultiPoint25D ); if ( layerIsMultiType && !unionGeom->isMultipart() ) { diff --git a/src/app/qgsdecorationscalebardialog.cpp b/src/app/qgsdecorationscalebardialog.cpp index 5f490d71363b..f43a0b7b7b00 100644 --- a/src/app/qgsdecorationscalebardialog.cpp +++ b/src/app/qgsdecorationscalebardialog.cpp @@ -42,7 +42,7 @@ QgsDecorationScaleBarDialog::QgsDecorationScaleBarDialog( QgsDecorationScaleBar& spnSize->setValue( mDeco.mPreferredSize ); chkSnapping->setChecked( mDeco.mSnapping ); - \ + cboPlacement->clear(); cboPlacement->addItems( mDeco.mPlacementLabels ); cboPlacement->setCurrentIndex( mDeco.mPlacementIndex ); diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp index c49bf5001224..5b67fb5fb79a 100644 --- a/src/app/qgsfieldcalculator.cpp +++ b/src/app/qgsfieldcalculator.cpp @@ -476,7 +476,7 @@ void QgsFieldCalculator::getFieldValues( int limit ) void QgsFieldCalculator::setOkButtonState() { bool okEnabled = true; - if (( mOutputFieldNameLineEdit->text().isEmpty() && mUpdateExistingFieldCheckBox->checkState() == Qt::Unchecked )\ + if (( mOutputFieldNameLineEdit->text().isEmpty() && mUpdateExistingFieldCheckBox->checkState() == Qt::Unchecked ) || mExpressionTextEdit->toPlainText().isEmpty() ) { okEnabled = false; diff --git a/src/app/qgsformannotationdialog.cpp b/src/app/qgsformannotationdialog.cpp index 4c4172ef49d9..03ee4d8a1ada 100644 --- a/src/app/qgsformannotationdialog.cpp +++ b/src/app/qgsformannotationdialog.cpp @@ -5,8 +5,8 @@ #include #include -QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsFormAnnotationItem* item, QWidget * parent, Qt::WindowFlags f ): \ - QDialog( parent, f ), mItem( item ), mEmbeddedWidget( 0 ) +QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsFormAnnotationItem* item, QWidget * parent, Qt::WindowFlags f ) + : QDialog( parent, f ), mItem( item ), mEmbeddedWidget( 0 ) { setupUi( this ); mEmbeddedWidget = new QgsAnnotationWidget( mItem ); diff --git a/src/app/qgsmaptooladdvertex.cpp b/src/app/qgsmaptooladdvertex.cpp index c5cb35be84cd..a012600ab628 100644 --- a/src/app/qgsmaptooladdvertex.cpp +++ b/src/app/qgsmaptooladdvertex.cpp @@ -104,8 +104,8 @@ void QgsMapToolAddVertex::canvasReleaseEvent( QMouseEvent * e ) QList::iterator filterIt = filteredSnapResults.begin(); for ( ; filterIt != filteredSnapResults.end(); ++filterIt ) { - if ( filterIt->snappedAtGeometry == recentIt->snappedAtGeometry \ - && filterIt->snappedVertexNr == recentIt->snappedVertexNr \ + if ( filterIt->snappedAtGeometry == recentIt->snappedAtGeometry + && filterIt->snappedVertexNr == recentIt->snappedVertexNr && filterIt->beforeVertexNr == recentIt->beforeVertexNr ) { filteredSnapResults.erase( filterIt ); diff --git a/src/app/qgsmaptoolrotatepointsymbols.h b/src/app/qgsmaptoolrotatepointsymbols.h index b35963473e1e..eaf1b56c8128 100644 --- a/src/app/qgsmaptoolrotatepointsymbols.h +++ b/src/app/qgsmaptoolrotatepointsymbols.h @@ -36,7 +36,7 @@ class QgsMapToolRotatePointSymbols: public QgsMapToolEdit bool isEditTool() {return true;} - /**Returns true if the symbols of a maplayer can be rotated. This means the layer \ + /**Returns true if the symbols of a maplayer can be rotated. This means the layer is a vector layer, has type point or multipoint and has at least one rotation attribute in the renderer*/ static bool layerIsRotatable( QgsMapLayer* ml ); diff --git a/src/app/qgspointrotationitem.h b/src/app/qgspointrotationitem.h index ae4b84ee51bc..5e57133822f7 100644 --- a/src/app/qgspointrotationitem.h +++ b/src/app/qgspointrotationitem.h @@ -39,7 +39,7 @@ class QgsPointRotationItem: public QgsMapCanvasItem /**Sets the center point of the rotation symbol (in map coordinates)*/ void setPointLocation( const QgsPoint& p ); - /**Sets the rotation of the symbol and displays the new rotation number. \ + /**Sets the rotation of the symbol and displays the new rotation number. Units are degrees, starting from north direction, clockwise direction*/ void setSymbolRotation( int r ) {mRotation = r;} diff --git a/src/core/composer/qgscomposerarrow.cpp b/src/core/composer/qgscomposerarrow.cpp index 04f7ca2fe1e9..c167af81deb4 100644 --- a/src/core/composer/qgscomposerarrow.cpp +++ b/src/core/composer/qgscomposerarrow.cpp @@ -260,7 +260,7 @@ void QgsComposerArrow::setArrowHeadWidth( double width ) void QgsComposerArrow::adaptItemSceneRect() { //rectangle containing start and end point - QRectF rect = QRectF( qMin( mStartPoint.x(), mStopPoint.x() ), qMin( mStartPoint.y(), mStopPoint.y() ), \ + QRectF rect = QRectF( qMin( mStartPoint.x(), mStopPoint.x() ), qMin( mStartPoint.y(), mStopPoint.y() ), qAbs( mStopPoint.x() - mStartPoint.x() ), qAbs( mStopPoint.y() - mStartPoint.y() ) ); double enlarge = 0; if ( mMarkerMode == DefaultMarker ) diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp index ea43fcbc1c32..9770078fe861 100644 --- a/src/core/composer/qgscomposerattributetable.cpp +++ b/src/core/composer/qgscomposerattributetable.cpp @@ -43,7 +43,8 @@ bool QgsComposerAttributeTableCompare::operator()( const QgsAttributeMap& m1, co } -QgsComposerAttributeTable::QgsComposerAttributeTable( QgsComposition* composition ): QgsComposerTable( composition ), mVectorLayer( 0 ), mComposerMap( 0 ), \ +QgsComposerAttributeTable::QgsComposerAttributeTable( QgsComposition* composition ) + : QgsComposerTable( composition ), mVectorLayer( 0 ), mComposerMap( 0 ), mMaximumNumberOfFeatures( 5 ), mShowOnlyVisibleFeatures( true ) { //set first vector layer from layer registry as default one diff --git a/src/core/composer/qgscomposeritem.h b/src/core/composer/qgscomposeritem.h index 4e11cf7440b7..cdb380a262e4 100644 --- a/src/core/composer/qgscomposeritem.h +++ b/src/core/composer/qgscomposeritem.h @@ -296,7 +296,7 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem /**Returns angle of the line from p1 to p2 (clockwise, starting at N)*/ double angle( const QPointF& p1, const QPointF& p2 ) const; - /**Returns the current (zoom level dependent) tolerance to decide if mouse position is close enough to the \ + /**Returns the current (zoom level dependent) tolerance to decide if mouse position is close enough to the item border for resizing*/ double rectHandlerBorderTolerance() const; diff --git a/src/core/composer/qgscomposerlabel.cpp b/src/core/composer/qgscomposerlabel.cpp index d9d25d95f25d..20322377083d 100644 --- a/src/core/composer/qgscomposerlabel.cpp +++ b/src/core/composer/qgscomposerlabel.cpp @@ -20,7 +20,7 @@ #include #include -QgsComposerLabel::QgsComposerLabel( QgsComposition *composition ): QgsComposerItem( composition ), mMargin( 1.0 ), mFontColor( QColor( 0, 0, 0 ) ), \ +QgsComposerLabel::QgsComposerLabel( QgsComposition *composition ): QgsComposerItem( composition ), mMargin( 1.0 ), mFontColor( QColor( 0, 0, 0 ) ), mHAlignment( Qt::AlignLeft ), mVAlignment( Qt::AlignTop ) { //default font size is 10 point @@ -104,7 +104,7 @@ void QgsComposerLabel::adjustSizeToText() double textWidth = textWidthMillimeters( mFont, displayText() ); double fontAscent = fontAscentMillimeters( mFont ); - setSceneRect( QRectF( transform().dx(), transform().dy(), textWidth + 2 * mMargin + 2 * pen().widthF() + 1, \ + setSceneRect( QRectF( transform().dx(), transform().dy(), textWidth + 2 * mMargin + 2 * pen().widthF() + 1, fontAscent + 2 * mMargin + 2 * pen().widthF() + 1 ) ); } diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp index 81eb0b492ed7..51112d574315 100644 --- a/src/core/composer/qgscomposermap.cpp +++ b/src/core/composer/qgscomposermap.cpp @@ -41,8 +41,8 @@ #include QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int width, int height ) - : QgsComposerItem( x, y, width, height, composition ), mKeepLayerSet( false ), mGridEnabled( false ), mGridStyle( Solid ), \ - mGridIntervalX( 0.0 ), mGridIntervalY( 0.0 ), mGridOffsetX( 0.0 ), mGridOffsetY( 0.0 ), mGridAnnotationPrecision( 3 ), mShowGridAnnotation( false ), \ + : QgsComposerItem( x, y, width, height, composition ), mKeepLayerSet( false ), mGridEnabled( false ), mGridStyle( Solid ), + mGridIntervalX( 0.0 ), mGridIntervalY( 0.0 ), mGridOffsetX( 0.0 ), mGridOffsetY( 0.0 ), mGridAnnotationPrecision( 3 ), mShowGridAnnotation( false ), mGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ), mGridAnnotationDirection( Horizontal ), mCrossLength( 3 ), mMapCanvas( 0 ), mDrawCanvasItems( true ) { @@ -86,8 +86,8 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w } QgsComposerMap::QgsComposerMap( QgsComposition *composition ) - : QgsComposerItem( 0, 0, 10, 10, composition ), mKeepLayerSet( false ), mGridEnabled( false ), mGridStyle( Solid ), \ - mGridIntervalX( 0.0 ), mGridIntervalY( 0.0 ), mGridOffsetX( 0.0 ), mGridOffsetY( 0.0 ), mGridAnnotationPrecision( 3 ), mShowGridAnnotation( false ), \ + : QgsComposerItem( 0, 0, 10, 10, composition ), mKeepLayerSet( false ), mGridEnabled( false ), mGridStyle( Solid ), + mGridIntervalX( 0.0 ), mGridIntervalY( 0.0 ), mGridOffsetX( 0.0 ), mGridOffsetY( 0.0 ), mGridAnnotationPrecision( 3 ), mShowGridAnnotation( false ), mGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ), mGridAnnotationDirection( Horizontal ), mCrossLength( 3 ), mMapCanvas( 0 ), mDrawCanvasItems( true ) { @@ -793,8 +793,8 @@ bool QgsComposerMap::readXML( const QDomElement& itemElem, const QDomDocument& d mGridOffsetX = gridElem.attribute( "offsetX", "0" ).toDouble(); mGridOffsetY = gridElem.attribute( "offsetY", "0" ).toDouble(); mGridPen.setWidthF( gridElem.attribute( "penWidth", "0" ).toDouble() ); - mGridPen.setColor( QColor( gridElem.attribute( "penColorRed", "0" ).toInt(), \ - gridElem.attribute( "penColorGreen", "0" ).toInt(), \ + mGridPen.setColor( QColor( gridElem.attribute( "penColorRed", "0" ).toInt(), + gridElem.attribute( "penColorGreen", "0" ).toInt(), gridElem.attribute( "penColorBlue", "0" ).toInt() ) ); mCrossLength = gridElem.attribute( "crossLength", "3" ).toDouble(); diff --git a/src/core/composer/qgscomposerpicture.cpp b/src/core/composer/qgscomposerpicture.cpp index 41ad49f3cf3f..0dc7b8c26219 100644 --- a/src/core/composer/qgscomposerpicture.cpp +++ b/src/core/composer/qgscomposerpicture.cpp @@ -26,8 +26,8 @@ #include -QgsComposerPicture::QgsComposerPicture( QgsComposition *composition ): QgsComposerItem( composition ), mMode( Unknown ), \ - mRotationMap( 0 ) +QgsComposerPicture::QgsComposerPicture( QgsComposition *composition ) + : QgsComposerItem( composition ), mMode( Unknown ), mRotationMap( 0 ) { mPictureWidth = rect().width(); } diff --git a/src/core/composer/qgscomposertable.cpp b/src/core/composer/qgscomposertable.cpp index 8776cdfa713d..81be29f9cc41 100644 --- a/src/core/composer/qgscomposertable.cpp +++ b/src/core/composer/qgscomposertable.cpp @@ -213,7 +213,7 @@ bool QgsComposerTable::calculateMaxColumnWidths( QMap& maxWidthMap, void QgsComposerTable::adaptItemFrame( const QMap& maxWidthMap, const QList& attributeList ) { //calculate height - double totalHeight = fontAscentMillimeters( mHeaderFont ) + attributeList.size() * fontAscentMillimeters( mContentFont ) \ + double totalHeight = fontAscentMillimeters( mHeaderFont ) + attributeList.size() * fontAscentMillimeters( mContentFont ) + ( attributeList.size() + 1 ) * mLineTextDistance * 2 + ( attributeList.size() + 2 ) * mGridStrokeWidth; //adapt frame to total width diff --git a/src/core/composer/qgscomposertable.h b/src/core/composer/qgscomposertable.h index cd54e572c57e..d0a9f6c421a1 100644 --- a/src/core/composer/qgscomposertable.h +++ b/src/core/composer/qgscomposertable.h @@ -58,7 +58,7 @@ class CORE_EXPORT QgsComposerTable: public QgsComposerItem void setGridColor( const QColor& c ) { mGridColor = c; } QColor gridColor() const { return mGridColor; } - /**Adapts the size of the frame to match the content. This is normally done in the paint method, but sometimes \ + /**Adapts the size of the frame to match the content. This is normally done in the paint method, but sometimes it needs to be done before the first render*/ void adjustFrameToSize(); diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp index 55d04ff74f4d..d296fc5ebfe1 100644 --- a/src/core/qgsexpression.cpp +++ b/src/core/qgsexpression.cpp @@ -392,14 +392,14 @@ FnDef QgsExpression::BuiltinFunctions[] = FnDef( "toreal", 1, fcnToReal, "Conversions" ), FnDef( "tostring", 1, fcnToString, "Conversions" ), // string manipulation - FnDef( "lower", 1, fcnLower, "String", "Convert to lower case "\ - "
Converts a string to lower case letters. " \ + FnDef( "lower", 1, fcnLower, "String", "Convert to lower case " + "
Converts a string to lower case letters. " "
Usage:
lower('HELLO WORLD') will return 'hello world'" ), - FnDef( "upper", 1, fcnUpper, "String" , "Convert to upper case "\ - "
Converts a string to upper case letters. " \ + FnDef( "upper", 1, fcnUpper, "String" , "Convert to upper case " + "
Converts a string to upper case letters. " "
Usage:
upper('hello world') will return 'HELLO WORLD'" ), - FnDef( "length", 1, fcnLength, "String", "Length of string "\ - "
Returns the legnth of a string. " \ + FnDef( "length", 1, fcnLength, "String", "Length of string " + "
Returns the legnth of a string. " "
Usage:
length('hello') will return 5" ), FnDef( "replace", 3, fcnReplace, "String", "Replace a section of a string. " ), FnDef( "regexp_replace", 3, fcnRegexpReplace, "String" ), diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp index bdf9f8084d9c..7c8f81b48b4b 100644 --- a/src/core/qgsgeometry.cpp +++ b/src/core/qgsgeometry.cpp @@ -6138,7 +6138,7 @@ QgsGeometry* QgsGeometry::combine( QgsGeometry* geometry ) GEOSGeometry* unionGeom = GEOSUnion( mGeos, geometry->mGeos ); QGis::WkbType thisGeomType = wkbType(); QGis::WkbType otherGeomType = geometry->wkbType(); - if (( thisGeomType == QGis::WKBLineString || thisGeomType == QGis::WKBLineString25D ) \ + if (( thisGeomType == QGis::WKBLineString || thisGeomType == QGis::WKBLineString25D ) && ( otherGeomType == QGis::WKBLineString || otherGeomType == QGis::WKBLineString25D ) ) { GEOSGeometry* mergedGeom = GEOSLineMerge( unionGeom ); diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h index c933707466f6..55a36e2dc46d 100644 --- a/src/core/qgsgeometry.h +++ b/src/core/qgsgeometry.h @@ -521,7 +521,7 @@ class CORE_EXPORT QgsGeometry @return 0 in case of success*/ int topologicalTestPointsSplit( const GEOSGeometry* splitLine, QList& testPoints ) const; - /**Creates a new line from an original line and a reshape line. The part of the input line from the first to the last intersection with the \ + /**Creates a new line from an original line and a reshape line. The part of the input line from the first to the last intersection with the reshape line will be replaced. The calling function takes ownership of the result. @param origLine the original line @param reshapeLineGeos the reshape line diff --git a/src/core/qgspalgeometry.h b/src/core/qgspalgeometry.h index d2b267b6c68b..e1a215c53cd5 100644 --- a/src/core/qgspalgeometry.h +++ b/src/core/qgspalgeometry.h @@ -28,7 +28,7 @@ class QgsOverlayObject; class CORE_EXPORT QgsPALGeometry: public pal::PalGeometry { public: - /**Constructor that takes the geometry representation as geos object. \ + /**Constructor that takes the geometry representation as geos object. Note that the class does not take ownership*/ QgsPALGeometry( QgsOverlayObject* op ); ~QgsPALGeometry(); diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp index 09d6622d118e..d348932f04ff 100644 --- a/src/core/qgspallabeling.cpp +++ b/src/core/qgspallabeling.cpp @@ -256,7 +256,7 @@ static void _writeDataDefinedPropertyMap( QgsVectorLayer* layer, const QMap< Qgs } } -static void _readDataDefinedProperty( QgsVectorLayer* layer, QgsPalLayerSettings::DataDefinedProperties p, \ +static void _readDataDefinedProperty( QgsVectorLayer* layer, QgsPalLayerSettings::DataDefinedProperties p, QMap< QgsPalLayerSettings::DataDefinedProperties, int >& propertyMap ) { QVariant propertyField = layer->customProperty( "labeling/dataDefinedProperty" + QString::number( p ) ); @@ -785,7 +785,7 @@ int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QSet& attrIndices, return 0; - int fldIndex ; + int fldIndex = -1; if ( lyrTmp.isExpression ) { if ( lyrTmp.fieldName.isEmpty() ) @@ -797,6 +797,9 @@ int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QSet& attrIndices, fldIndex = layer->fieldNameIndex( name ); attrIndices.insert( fldIndex ); } + + if ( fldIndex == -1 ) + return 0; } else { diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h index 6bd1447e1385..3aeefe986834 100644 --- a/src/core/qgspallabeling.h +++ b/src/core/qgspallabeling.h @@ -231,7 +231,7 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface void drawLabelCandidateRect( pal::LabelPosition* lp, QPainter* painter, const QgsMapToPixel* xform ); //!drawLabel - void drawLabel( pal::LabelPosition* label, QPainter* painter, const QFont& f, const QColor& c, const QgsMapToPixel* xform, double bufferSize = -1, \ + void drawLabel( pal::LabelPosition* label, QPainter* painter, const QFont& f, const QColor& c, const QgsMapToPixel* xform, double bufferSize = -1, const QColor& bufferColor = QColor( 255, 255, 255 ), bool drawBuffer = false ); static void drawLabelBuffer( QPainter* p, QString text, const QFont& font, double size, QColor color ); diff --git a/src/gui/qgsannotationitem.cpp b/src/gui/qgsannotationitem.cpp index cbeb58a43d16..ee0b8ad44243 100644 --- a/src/gui/qgsannotationitem.cpp +++ b/src/gui/qgsannotationitem.cpp @@ -119,7 +119,7 @@ void QgsAnnotationItem::updateBalloon() { //first test if the point is in the frame. In that case we don't need a balloon. if ( !mMapPositionFixed || - ( mOffsetFromReferencePoint.x() < 0 && ( mOffsetFromReferencePoint.x() + mFrameSize.width() ) > 0 \ + ( mOffsetFromReferencePoint.x() < 0 && ( mOffsetFromReferencePoint.x() + mFrameSize.width() ) > 0 && mOffsetFromReferencePoint.y() < 0 && ( mOffsetFromReferencePoint.y() + mFrameSize.height() ) > 0 ) ) { mBalloonSegment = -1; @@ -252,16 +252,16 @@ QLineF QgsAnnotationItem::segment( int index ) switch ( index ) { case 0: - return QLineF( mOffsetFromReferencePoint.x(), mOffsetFromReferencePoint.y(), mOffsetFromReferencePoint.x() \ + return QLineF( mOffsetFromReferencePoint.x(), mOffsetFromReferencePoint.y(), mOffsetFromReferencePoint.x() + mFrameSize.width(), mOffsetFromReferencePoint.y() ); case 1: - return QLineF( mOffsetFromReferencePoint.x() + mFrameSize.width(), mOffsetFromReferencePoint.y(), \ + return QLineF( mOffsetFromReferencePoint.x() + mFrameSize.width(), mOffsetFromReferencePoint.y(), mOffsetFromReferencePoint.x() + mFrameSize.width(), mOffsetFromReferencePoint.y() + mFrameSize.height() ); case 2: - return QLineF( mOffsetFromReferencePoint.x() + mFrameSize.width(), mOffsetFromReferencePoint.y() + mFrameSize.height(), \ + return QLineF( mOffsetFromReferencePoint.x() + mFrameSize.width(), mOffsetFromReferencePoint.y() + mFrameSize.height(), mOffsetFromReferencePoint.x(), mOffsetFromReferencePoint.y() + mFrameSize.height() ); case 3: - return QLineF( mOffsetFromReferencePoint.x(), mOffsetFromReferencePoint.y() + mFrameSize.height(), \ + return QLineF( mOffsetFromReferencePoint.x(), mOffsetFromReferencePoint.y() + mFrameSize.height(), mOffsetFromReferencePoint.x(), mOffsetFromReferencePoint.y() ); default: return QLineF(); @@ -328,7 +328,7 @@ QgsAnnotationItem::MouseMoveAction QgsAnnotationItem::moveActionForPosition( con } //finally test if pos is in the frame area - if ( itemPos.x() >= mOffsetFromReferencePoint.x() && itemPos.x() <= ( mOffsetFromReferencePoint.x() + mFrameSize.width() ) \ + if ( itemPos.x() >= mOffsetFromReferencePoint.x() && itemPos.x() <= ( mOffsetFromReferencePoint.x() + mFrameSize.width() ) && itemPos.y() >= mOffsetFromReferencePoint.y() && itemPos.y() <= ( mOffsetFromReferencePoint.y() + mFrameSize.height() ) ) { return MoveFramePosition; diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp index 4a5c29eeea83..058dd5f66475 100644 --- a/src/gui/qgsexpressionbuilderwidget.cpp +++ b/src/gui/qgsexpressionbuilderwidget.cpp @@ -58,8 +58,8 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent ) registerItem( "Operators", "<>", " <> " ); registerItem( "Operators", "<=", " <= " ); registerItem( "Operators", ">=", " >= " ); - registerItem( "Operators", "||", " || ", "|| (String Concatenation) "\ - "
Joins two values together into a string " \ + registerItem( "Operators", "||", " || ", "|| (String Concatenation) " + "
Joins two values together into a string " "
Usage:
'Dia' || Diameter" ); registerItem( "Operators", "LIKE", " LIKE " ); registerItem( "Operators", "ILIKE", " ILIKE " ); @@ -104,8 +104,8 @@ void QgsExpressionBuilderWidget::on_expressionTree_clicked( const QModelIndex &i // right click so we just show the help. if ( item->getItemType() == QgsExpressionItem::Field ) { - txtHelpText->setText( tr( "Double click to add field name to expression string.
" \ - "Or right click to select loading value options then " \ + txtHelpText->setText( tr( "Double click to add field name to expression string.
" + "Or right click to select loading value options then " "double click an item in the value list to add it to the expression string." ) ); txtHelpText->setToolTip( txtHelpText->text() ); } diff --git a/src/gui/qgsformannotationitem.cpp b/src/gui/qgsformannotationitem.cpp index 601ae61b7f8b..4861971ac3e5 100644 --- a/src/gui/qgsformannotationitem.cpp +++ b/src/gui/qgsformannotationitem.cpp @@ -32,8 +32,8 @@ #include #include -QgsFormAnnotationItem::QgsFormAnnotationItem( QgsMapCanvas* canvas, QgsVectorLayer* vlayer, bool hasFeature, int feature ): \ - QgsAnnotationItem( canvas ), mWidgetContainer( 0 ), mDesignerWidget( 0 ), mVectorLayer( vlayer ), \ +QgsFormAnnotationItem::QgsFormAnnotationItem( QgsMapCanvas* canvas, QgsVectorLayer* vlayer, bool hasFeature, int feature ) + : QgsAnnotationItem( canvas ), mWidgetContainer( 0 ), mDesignerWidget( 0 ), mVectorLayer( vlayer ), mHasAssociatedFeature( hasFeature ), mFeature( feature ) { mWidgetContainer = new QGraphicsProxyWidget( this ); @@ -133,8 +133,8 @@ void QgsFormAnnotationItem::paint( QPainter * painter, const QStyleOptionGraphic drawMarkerSymbol( painter ); } - mWidgetContainer->setGeometry( QRectF( mOffsetFromReferencePoint.x() + mFrameBorderWidth / 2.0, mOffsetFromReferencePoint.y() \ - + mFrameBorderWidth / 2.0, mFrameSize.width() - mFrameBorderWidth, mFrameSize.height() \ + mWidgetContainer->setGeometry( QRectF( mOffsetFromReferencePoint.x() + mFrameBorderWidth / 2.0, mOffsetFromReferencePoint.y() + + mFrameBorderWidth / 2.0, mFrameSize.width() - mFrameBorderWidth, mFrameSize.height() - mFrameBorderWidth ) ); if ( isSelected() ) @@ -230,7 +230,7 @@ void QgsFormAnnotationItem::setFeatureForMapPosition() QSettings settings; double identifyValue = settings.value( "/Map/identifyRadius", QGis::DEFAULT_IDENTIFY_RADIUS ).toDouble(); double halfIdentifyWidth = mMapCanvas->extent().width() / 100 / 2 * identifyValue; - QgsRectangle searchRect( mMapPosition.x() - halfIdentifyWidth, mMapPosition.y() - halfIdentifyWidth, \ + QgsRectangle searchRect( mMapPosition.x() - halfIdentifyWidth, mMapPosition.y() - halfIdentifyWidth, mMapPosition.x() + halfIdentifyWidth, mMapPosition.y() + halfIdentifyWidth ); mVectorLayer->select( noAttributes, searchRect, false, true ); diff --git a/src/mapserver/qgis_map_serv.cpp b/src/mapserver/qgis_map_serv.cpp index 4fe4a09cc5f8..08b25b6c67fb 100644 --- a/src/mapserver/qgis_map_serv.cpp +++ b/src/mapserver/qgis_map_serv.cpp @@ -267,13 +267,15 @@ int main( int argc, char * argv[] ) { serviceString = serviceIt->second; } - /*else +#if 0 + else { QgsDebugMsg( "unable to find 'SERVICE' parameter, exiting..." ); theRequestHandler->sendServiceException( QgsMapServiceException( "ServiceNotSpecified", "Service not specified. The SERVICE parameter is mandatory" ) ); delete theRequestHandler; continue; - }*/ + } +#endif QgsWMSServer* theServer = 0; try diff --git a/src/mapserver/qgscomparisonfilter.h b/src/mapserver/qgscomparisonfilter.h index fa609bd2dd69..7ace46a33a3c 100644 --- a/src/mapserver/qgscomparisonfilter.h +++ b/src/mapserver/qgscomparisonfilter.h @@ -44,7 +44,7 @@ class QgsComparisonFilter: public QgsFilter }; QgsComparisonFilter(); - /**Constructor that takes index of the feature attribute, type of comparison \ + /**Constructor that takes index of the feature attribute, type of comparison and reference value to compare against*/ QgsComparisonFilter( int propertyIndex, COMPARISON_TYPE ct, QString value ); ~QgsComparisonFilter(); diff --git a/src/mapserver/qgsconfigparser.cpp b/src/mapserver/qgsconfigparser.cpp index 83e7bd13b9f3..19e841ca0eda 100644 --- a/src/mapserver/qgsconfigparser.cpp +++ b/src/mapserver/qgsconfigparser.cpp @@ -281,10 +281,12 @@ void QgsConfigParser::appendCRSElementsToLayer( QDomElement& layerElement, QDomD for ( int i = constrainedCrsList.size() - 1; i >= 0; --i ) { appendCRSElementToLayer( layerElement, titleElement, constrainedCrsList.at( i ), doc ); - /*QDomElement crsElement = doc.createElement( "CRS" ); +#if 0 + QDomElement crsElement = doc.createElement( "CRS" ); QDomText crsText = doc.createTextNode( constrainedCrsList.at( i ) ); crsElement.appendChild( crsText ); - layerElement.insertAfter( crsElement, titleElement );*/ + layerElement.insertAfter( crsElement, titleElement ); +#endif } } else //no crs constraint @@ -293,10 +295,12 @@ void QgsConfigParser::appendCRSElementsToLayer( QDomElement& layerElement, QDomD for ( ; crsIt != crsList.constEnd(); ++crsIt ) { appendCRSElementToLayer( layerElement, titleElement, *crsIt, doc ); - /*QDomElement crsElement = doc.createElement( "CRS" ); +#if 0 + QDomElement crsElement = doc.createElement( "CRS" ); QDomText crsText = doc.createTextNode( *crsIt ); crsElement.appendChild( crsText ); - layerElement.insertAfter( crsElement, titleElement );*/ + layerElement.insertAfter( crsElement, titleElement ); +#endif } } } diff --git a/src/mapserver/qgsconfigparser.h b/src/mapserver/qgsconfigparser.h index e6588d1bf6a8..2bbb57bc5e84 100644 --- a/src/mapserver/qgsconfigparser.h +++ b/src/mapserver/qgsconfigparser.h @@ -133,7 +133,7 @@ class QgsConfigParser /**Stores the temporary file objects. The class takes ownership of the objects and deletes them in the destructor*/ mutable QList mFilesToRemove; - /**Stores paths of files that need to be removed after each request (necessary because of contours shapefiles that \ + /**Stores paths of files that need to be removed after each request (necessary because of contours shapefiles that cannot be handles with QTemporaryFile*/ mutable QList mFilePathsToRemove; diff --git a/src/mapserver/qgshttprequesthandler.cpp b/src/mapserver/qgshttprequesthandler.cpp index 9fc9bf3663ef..1196f0f2667e 100644 --- a/src/mapserver/qgshttprequesthandler.cpp +++ b/src/mapserver/qgshttprequesthandler.cpp @@ -345,7 +345,7 @@ void QgsHttpRequestHandler::requestStringToParameterMap( const QString& request, { formatString = "PNG"; } - else if ( formatString.compare( "image/jpeg", Qt::CaseInsensitive ) == 0 || formatString.compare( "image/jpg", Qt::CaseInsensitive ) == 0 \ + else if ( formatString.compare( "image/jpeg", Qt::CaseInsensitive ) == 0 || formatString.compare( "image/jpg", Qt::CaseInsensitive ) == 0 || formatString.compare( "jpg", Qt::CaseInsensitive ) == 0 ) { formatString = "JPG"; diff --git a/src/mapserver/qgsmslayerbuilder.h b/src/mapserver/qgsmslayerbuilder.h index f02e36bfa2d6..bf3d8b5085d4 100644 --- a/src/mapserver/qgsmslayerbuilder.h +++ b/src/mapserver/qgsmslayerbuilder.h @@ -46,7 +46,7 @@ class QgsMSLayerBuilder /**Tries to create a suitable layer name from a URL. */ virtual QString layerNameFromUri( const QString& uri ) const; /**Helper function that creates a new temporary file with random name under /tmp/qgis_wms_serv/ - and returns the path of the file (Unix). On Windows, it is created in the current working directory \ + and returns the path of the file (Unix). On Windows, it is created in the current working directory and returns the filename only*/ QString createTempFile() const; /**Resets the former symbology of a raster layer. This is important for single band layers (e.g. dems) diff --git a/src/mapserver/qgssldrule.h b/src/mapserver/qgssldrule.h index d26768be7dc6..948c656c7acd 100644 --- a/src/mapserver/qgssldrule.h +++ b/src/mapserver/qgssldrule.h @@ -49,7 +49,7 @@ class QgsSLDRule const QgsFilter* filter() const {return mFilter;} - /**Returns a set of attribute indices needed in this rule (filter indices and if any\ + /**Returns a set of attribute indices needed in this rule (filter indices and if any rotation attribute index and scaling attribute index */ QSet attributeIndices() const; diff --git a/src/mapserver/qgswmsserver.h b/src/mapserver/qgswmsserver.h index 5da0d1a79b81..25288629c6ff 100644 --- a/src/mapserver/qgswmsserver.h +++ b/src/mapserver/qgswmsserver.h @@ -53,10 +53,10 @@ class QgsWMSServer ~QgsWMSServer(); /**Returns an XML file with the capabilities description (as described in the WMS specs)*/ QDomDocument getCapabilities(); - /**Returns the map legend as an image (or a null pointer in case of error). The caller takes ownership\ + /**Returns the map legend as an image (or a null pointer in case of error). The caller takes ownership of the image object*/ QImage* getLegendGraphics(); - /**Returns the map as an image (or a null pointer in case of error). The caller takes ownership\ + /**Returns the map as an image (or a null pointer in case of error). The caller takes ownership of the image object)*/ QImage* getMap(); /**Returns an SLD file with the style of the requested layer. Exception is raised in case of troubles :-)*/ diff --git a/src/plugins/diagram_overlay/qgsbardiagramfactory.h b/src/plugins/diagram_overlay/qgsbardiagramfactory.h index f13105d3c3b6..6954484e83d4 100644 --- a/src/plugins/diagram_overlay/qgsbardiagramfactory.h +++ b/src/plugins/diagram_overlay/qgsbardiagramfactory.h @@ -59,7 +59,7 @@ class QgsBarDiagramFactory: public QgsWKNDiagramFactory scaling attribute)*/ int getMaximumHeight( int size, const QgsAttributeMap& featureAttributes ) const; - /**Calculates the value to size unit ratio for the bar chart (based on the size \ + /**Calculates the value to size unit ratio for the bar chart (based on the size of the scaling attribute) @return the ratio or -1 in case of error*/ double sizeValueRatioBarChart( int size, const QgsAttributeMap& featureAttributes ) const; diff --git a/src/plugins/diagram_overlay/qgsdiagramfactory.h b/src/plugins/diagram_overlay/qgsdiagramfactory.h index 00f6f26a06d1..8a533cebb1b5 100644 --- a/src/plugins/diagram_overlay/qgsdiagramfactory.h +++ b/src/plugins/diagram_overlay/qgsdiagramfactory.h @@ -33,8 +33,8 @@ class QImage; class QgsDiagramFactory { public: - /**Describes if the size describes one dimensional height (e.g. bar chart), \ - a diameter (e.g. piechart) or a squareside. This may be taken into consideration \ + /**Describes if the size describes one dimensional height (e.g. bar chart), + a diameter (e.g. piechart) or a squareside. This may be taken into consideration from a renderer for interpolation*/ enum SizeType { @@ -57,7 +57,7 @@ class QgsDiagramFactory @param f feature that is symbolized by the diagram @param renderContext rendering parameters*/ virtual QImage* createDiagram( int size, const QgsFeature& f, const QgsRenderContext& renderContext ) const = 0; - /**Creates the text/images for the legend items. The caller takes ownership of the generated \ + /**Creates the text/images for the legend items. The caller takes ownership of the generated image objects. @param size diagram size that should be represented in the legend @param u size may be in MM on output device or in map units on map diff --git a/src/plugins/diagram_overlay/qgsdiagramrenderer.h b/src/plugins/diagram_overlay/qgsdiagramrenderer.h index 2ca3b61aded1..78f5a2c87a6c 100644 --- a/src/plugins/diagram_overlay/qgsdiagramrenderer.h +++ b/src/plugins/diagram_overlay/qgsdiagramrenderer.h @@ -107,7 +107,7 @@ class QgsDiagramRenderer @return 0 in case of success*/ virtual int calculateDiagramSize( const QgsFeature& f, int& size ) const; /**Does (linear or discrete) interpolation*/ - int interpolateSize( double value, double lowerValue, double upperValue, int lowerSize, \ + int interpolateSize( double value, double lowerValue, double upperValue, int lowerSize, int upperSize ) const; }; diff --git a/src/plugins/diagram_overlay/qgssvgdiagramfactory.h b/src/plugins/diagram_overlay/qgssvgdiagramfactory.h index 7368d6170b9e..ea07d90b7f00 100644 --- a/src/plugins/diagram_overlay/qgssvgdiagramfactory.h +++ b/src/plugins/diagram_overlay/qgssvgdiagramfactory.h @@ -32,7 +32,7 @@ class QgsSVGDiagramFactory: public QgsDiagramFactory @param f feature that is symbolized by the diagram @param renderContext rendering parameters*/ QImage* createDiagram( int size, const QgsFeature& f, const QgsRenderContext& renderContext ) const; - /**Creates the text/images for the legend items. The caller takes ownership of the generated \ + /**Creates the text/images for the legend items. The caller takes ownership of the generated image objects. @param size diagram size that should be represented in the legend @param renderContext rendering parameters diff --git a/src/plugins/georeferencer/qgsgcpcanvasitem.cpp b/src/plugins/georeferencer/qgsgcpcanvasitem.cpp index e36743a49a19..0c3f2727fb45 100644 --- a/src/plugins/georeferencer/qgsgcpcanvasitem.cpp +++ b/src/plugins/georeferencer/qgsgcpcanvasitem.cpp @@ -85,7 +85,7 @@ void QgsGCPCanvasItem::paint( QPainter* p ) textFont.setPixelSize( fontSizePainterUnits( 12, context ) ); p->setFont( textFont ); QRectF textBounds = p->boundingRect( 3 * context.scaleFactor(), 3 * context.scaleFactor(), 5 * context.scaleFactor(), 5 * context.scaleFactor(), Qt::AlignLeft, msg ); - mTextBoxRect = QRectF( textBounds.x() - context.scaleFactor() * 1, textBounds.y() - context.scaleFactor() * 1, \ + mTextBoxRect = QRectF( textBounds.x() - context.scaleFactor() * 1, textBounds.y() - context.scaleFactor() * 1, textBounds.width() + 2 * context.scaleFactor(), textBounds.height() + 2 * context.scaleFactor() ); p->drawRect( mTextBoxRect ); p->drawText( textBounds, Qt::AlignLeft, msg ); diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp index c6bc1924be96..b8503e7aa817 100644 --- a/src/plugins/georeferencer/qgsgeorefplugingui.cpp +++ b/src/plugins/georeferencer/qgsgeorefplugingui.cpp @@ -980,8 +980,10 @@ void QgsGeorefPluginGui::createDockWidgets() dockWidgetGCPpoints->setWidget( mGCPListWidget ); connect( mGCPListWidget, SIGNAL( jumpToGCP( uint ) ), this, SLOT( jumpToGCP( uint ) ) ); - /*connect( mGCPListWidget, SIGNAL( replaceDataPoint( QgsGeorefDataPoint*, int ) ), - this, SLOT( replaceDataPoint( QgsGeorefDataPoint*, int ) ) );*/ +#if 0 + connect( mGCPListWidget, SIGNAL( replaceDataPoint( QgsGeorefDataPoint*, int ) ), + this, SLOT( replaceDataPoint( QgsGeorefDataPoint*, int ) ) ); +#endif connect( mGCPListWidget, SIGNAL( deleteDataPoint( int ) ), this, SLOT( deleteDataPoint( int ) ) ); connect( mGCPListWidget, SIGNAL( pointEnabled( QgsGeorefDataPoint*, int ) ), this, SLOT( updateGeorefTransform() ) ); @@ -1182,7 +1184,7 @@ bool QgsGeorefPluginGui::georeference() if ( !checkReadyGeoref() ) return false; - if ( mModifiedRasterFileName.isEmpty() && ( QgsGeorefTransform::Linear == mGeorefTransform.transformParametrisation() || \ + if ( mModifiedRasterFileName.isEmpty() && ( QgsGeorefTransform::Linear == mGeorefTransform.transformParametrisation() || QgsGeorefTransform::Helmert == mGeorefTransform.transformParametrisation() ) ) { QgsPoint origin; diff --git a/src/plugins/georeferencer/qgsgeoreftransform.cpp b/src/plugins/georeferencer/qgsgeoreftransform.cpp index a643fb67f694..897f2db6948e 100644 --- a/src/plugins/georeferencer/qgsgeoreftransform.cpp +++ b/src/plugins/georeferencer/qgsgeoreftransform.cpp @@ -179,8 +179,8 @@ void QgsGeorefTransform::selectTransformParametrisation( TransformParametrisatio bool QgsGeorefTransform::providesAccurateInverseTransformation() const { - return ( mTransformParametrisation == Linear \ - || mTransformParametrisation == Helmert \ + return ( mTransformParametrisation == Linear + || mTransformParametrisation == Helmert || mTransformParametrisation == PolynomialOrder1 ); } diff --git a/src/plugins/georeferencer/qgsresidualplotitem.h b/src/plugins/georeferencer/qgsresidualplotitem.h index f3e825863664..a5e6e0a3b7f0 100644 --- a/src/plugins/georeferencer/qgsresidualplotitem.h +++ b/src/plugins/georeferencer/qgsresidualplotitem.h @@ -20,7 +20,7 @@ #include "qgsgcplist.h" #include "qgsrectangle.h" -/**A composer item to visualise the distribution of georeference residuals. For the visualisation, \ +/**A composer item to visualise the distribution of georeference residuals. For the visualisation, the length of the residual arrows are scaled*/ class QgsResidualPlotItem: public QgsComposerItem { diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp index 28e8fa2a3210..8dbedae13d0c 100644 --- a/src/plugins/globe/globe_plugin.cpp +++ b/src/plugins/globe/globe_plugin.cpp @@ -60,7 +60,6 @@ using namespace osgEarth::Util::Controls; #define MOVE_OFFSET 0.05 -//static const char * const sIdent = "$Id: plugin.cpp 9327 2008-09-14 11:18:44Z jef $"; static const QString sName = QObject::tr( "Globe" ); static const QString sDescription = QObject::tr( "Overlay data on a 3D globe" ); static const QString sPluginVersion = QObject::tr( "Version 0.1" ); @@ -859,9 +858,9 @@ bool NavigationControl::handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActi bool KeyboardControlHandler::handle( const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& /*aa*/ ) { - /* +#if 0 osgEarth::Util::EarthManipulator::Settings* _manipSettings = _manip->getSettings(); - _manip->getSettings()->bindKey(osgEarth::Util::EarthManipulator::ACTION_ZOOM_IN, osgGA::GUIEventAdapter::KEY_Space); + _manip->getSettings()->bindKey( osgEarth::Util::EarthManipulator::ACTION_ZOOM_IN, osgGA::GUIEventAdapter::KEY_Space ); //install default action bindings: osgEarth::Util::EarthManipulator::ActionOptions options; @@ -898,9 +897,8 @@ bool KeyboardControlHandler::handle( const osgGA::GUIEventAdapter& ea, osgGA::GU _manipSettings->setThrowingEnabled( false ); _manipSettings->setLockAzimuthWhilePanning( true ); - _manip->applySettings(_manipSettings); - - */ + _manip->applySettings( _manipSettings ); +#endif switch ( ea.getEventType() ) { diff --git a/src/plugins/globe/globe_plugin_dialog.h b/src/plugins/globe/globe_plugin_dialog.h index 229f3644a131..552cbde8cb45 100644 --- a/src/plugins/globe/globe_plugin_dialog.h +++ b/src/plugins/globe/globe_plugin_dialog.h @@ -1,6 +1,3 @@ -/* - * $Id$ - */ /*************************************************************************** globe_plugin_dialog.h - settings dialog for the globe plugin -------------------------------------- diff --git a/src/plugins/globe/qgsosgearthtilesource.cpp b/src/plugins/globe/qgsosgearthtilesource.cpp index 9cce1b4f53bc..1a2683df0ef2 100644 --- a/src/plugins/globe/qgsosgearthtilesource.cpp +++ b/src/plugins/globe/qgsosgearthtilesource.cpp @@ -153,11 +153,11 @@ QImage* QgsOsgEarthTileSource::createImage( int width, int height ) const } //apply DPI parameter if present. - /* - int dpm = dpi / 0.0254; - qImage->setDotsPerMeterX(dpm); - qImage->setDotsPerMeterY(dpm); - */ +#if 0 + int dpm = dpi / 0.0254; + qImage->setDotsPerMeterX( dpm ); + qImage->setDotsPerMeterY( dpm ); +#endif return qImage; } diff --git a/src/plugins/grass/qgsgrassselect.cpp b/src/plugins/grass/qgsgrassselect.cpp index bb93984d7d45..d56c4eb9ca77 100644 --- a/src/plugins/grass/qgsgrassselect.cpp +++ b/src/plugins/grass/qgsgrassselect.cpp @@ -311,12 +311,12 @@ void QgsGrassSelect::setMaps() { emap->setCurrentIndex( sel ); } - /* +#if 0 else { - emap->clearEdit(); // set box line empty + emap->clearEdit(); // set box line empty } - */ +#endif if ( !emap->isHidden() ) { buttonBox->button( QDialogButtonBox::Ok )->setDefault( emap->count() > 0 ); diff --git a/src/plugins/interpolation/qgsinterpolationdialog.cpp b/src/plugins/interpolation/qgsinterpolationdialog.cpp index b96c9a6721ba..456fca3d2a63 100644 --- a/src/plugins/interpolation/qgsinterpolationdialog.cpp +++ b/src/plugins/interpolation/qgsinterpolationdialog.cpp @@ -191,7 +191,7 @@ void QgsInterpolationDialog::on_buttonBox_accepted() } //create grid file writer - QgsGridFileWriter theWriter( theInterpolator, fileName, outputBBox, mNumberOfColumnsSpinBox->value(), \ + QgsGridFileWriter theWriter( theInterpolator, fileName, outputBBox, mNumberOfColumnsSpinBox->value(), mNumberOfRowsSpinBox->value(), mCellsizeXSpinBox->value(), mCellSizeYSpinBox->value() ); if ( theWriter.writeFile( true ) == 0 ) { diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp b/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp index 039338fb5d9f..a4dc7ca17bff 100644 --- a/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp +++ b/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp @@ -475,7 +475,7 @@ void QgsPointDisplacementRenderer::setCenterSymbol( QgsMarkerSymbolV2* symbol ) -void QgsPointDisplacementRenderer::calculateSymbolAndLabelPositions( const QPointF& centerPoint, int nPosition, double radius, \ +void QgsPointDisplacementRenderer::calculateSymbolAndLabelPositions( const QPointF& centerPoint, int nPosition, double radius, double symbolDiagonal, QList& symbolPositions, QList& labelShifts ) const { symbolPositions.clear(); diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h b/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h index b388723c5fea..9f1923b2e3a1 100644 --- a/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h +++ b/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h @@ -137,7 +137,7 @@ class QgsPointDisplacementRenderer: public QgsFeatureRendererV2 QString getLabel( const QgsFeature& f ); //rendering methods - void renderPoint( const QPointF& point, QgsSymbolV2RenderContext& context, const QList& symbols, \ + void renderPoint( const QPointF& point, QgsSymbolV2RenderContext& context, const QList& symbols, const QStringList& labels ); //helper functions diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp b/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp index cabece5fd6ce..b43c4b8a4a4e 100644 --- a/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp +++ b/src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp @@ -31,8 +31,8 @@ QgsRendererV2Widget* QgsPointDisplacementRendererWidget::create( QgsVectorLayer* return new QgsPointDisplacementRendererWidget( layer, style, renderer ); } -QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ): \ - QgsRendererV2Widget( layer, style ), mEmbeddedRendererWidget( 0 ) +QgsPointDisplacementRendererWidget::QgsPointDisplacementRendererWidget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) + : QgsRendererV2Widget( layer, style ), mEmbeddedRendererWidget( 0 ) { if ( !layer ) { diff --git a/src/providers/wfs/qgswfsdata.h b/src/providers/wfs/qgswfsdata.h index c119e7cdcf9b..5c37e0f2c639 100644 --- a/src/providers/wfs/qgswfsdata.h +++ b/src/providers/wfs/qgswfsdata.h @@ -135,7 +135,7 @@ class QgsWFSData: public QObject /**Returns pointer to main window or 0 if it does not exist*/ QWidget* findMainWindow() const; /**This function evaluates the layer bounding box from the features and sets it to mExtent. - Less efficient compared to reading the bbox from the provider, so it is only done if the wfs server \ + Less efficient compared to reading the bbox from the provider, so it is only done if the wfs server does not provider extent information.*/ void calculateExtentFromFeatures() const; diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp index e1f86308de15..a60dfadad382 100644 --- a/src/providers/wfs/qgswfsprovider.cpp +++ b/src/providers/wfs/qgswfsprovider.cpp @@ -2084,7 +2084,7 @@ QDomElement QgsWFSProvider::createTransactionElement( QDomDocument& doc ) const transactionElem.setAttribute( "version", "1.0.0" ); transactionElem.setAttribute( "service", "WFS" ); transactionElem.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" ); - transactionElem.setAttribute( "xsi:schemaLocation", mWfsNamespace + " " \ + transactionElem.setAttribute( "xsi:schemaLocation", mWfsNamespace + " " + dataSourceUri().replace( QString( "GetFeature" ), QString( "DescribeFeatureType" ) ) ); QString namespacePrefix = nameSpacePrefix( parameterFromUrl( "typename" ) );