indentation update with a few fixed warnings

jef-n · jef-n · commit b64b3fc812b9 · 2012-07-25T20:43:37.000+02:00
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -269,7 +269,7 @@ int main( int argc, char *argv[] )
   QgsDebugMsg( QString( "Android: All params stripped" ) );// Param %1" ).arg( argv[0] ) );
   //put all QGIS settings in the same place
   configpath = QDir::homePath() + QString( "/.qgis/" );
-  QgsDebugMsg( QString( "Android: configpath set to %1" ).arg(configpath) );
+  QgsDebugMsg( QString( "Android: configpath set to %1" ).arg( configpath ) );
 #elif defined(Q_WS_WIN)
   for ( int i = 1; i < argc; i++ )
   {
diff --git a/src/app/qgsdecorationitem.cpp b/src/app/qgsdecorationitem.cpp
@@ -53,10 +53,10 @@ QgsDecorationItem::~QgsDecorationItem()
 
 }
 
-void QgsDecorationItem::update() 
-{ 
+void QgsDecorationItem::update()
+{
   saveToProject();
-  QgisApp::instance()->mapCanvas()->refresh(); 
+  QgisApp::instance()->mapCanvas()->refresh();
 }
 
 void QgsDecorationItem::projectRead()
@@ -70,11 +70,11 @@ void QgsDecorationItem::saveToProject()
   QgsDebugMsg( "Entered" );
   QgsProject::instance()->writeEntry( mNameConfig, "/Enabled", mEnabled );
 }
-void QgsDecorationItem::setName( const char *name ) 
-{ 
-  mName = name; 
+void QgsDecorationItem::setName( const char *name )
+{
+  mName = name;
   mNameConfig = name;
   mNameConfig.remove( " " );
   mNameTranslated = tr( name );
-  QgsDebugMsg( QString( "name=%1 nameconfig=%2 nametrans=%3").arg(mName).arg(mNameConfig).arg(mNameTranslated) );
+  QgsDebugMsg( QString( "name=%1 nameconfig=%2 nametrans=%3" ).arg( mName ).arg( mNameConfig ).arg( mNameTranslated ) );
 }
diff --git a/src/app/qgsmaptoolfreezelabels.cpp b/src/app/qgsmaptoolfreezelabels.cpp
@@ -118,12 +118,12 @@ void QgsMapToolFreezeLabels::showFrozenLabels( bool show )
   mShowFrozen = show;
   if ( mShowFrozen )
   {
-    QgsDebugMsg( QString( "Toggling on frozen label highlighting" ));
+    QgsDebugMsg( QString( "Toggling on frozen label highlighting" ) );
     highlightFrozenLabels();
   }
   else
   {
-    QgsDebugMsg( QString( "Toggling off frozen label highlighting" ));
+    QgsDebugMsg( QString( "Toggling off frozen label highlighting" ) );
     removeFrozenHighlights();
   }
 }
@@ -133,15 +133,15 @@ void QgsMapToolFreezeLabels::updateFrozenLabels()
 {
   if ( mShowFrozen )
   {
-    QgsDebugMsg( QString( "Updating highlighting due to layer editing mode change" ));
+    QgsDebugMsg( QString( "Updating highlighting due to layer editing mode change" ) );
     mCanvas->refresh();
   }
 }
 
 void QgsMapToolFreezeLabels::highlightLabel( QgsVectorLayer* vlayer,
-                                             const QgsLabelPosition& labelpos,
-                                             const QString& id,
-                                             const QColor& color )
+    const QgsLabelPosition& labelpos,
+    const QString& id,
+    const QColor& color )
 {
   QgsRectangle rect = labelpos.labelRect;
 
@@ -152,7 +152,7 @@ void QgsMapToolFreezeLabels::highlightLabel( QgsVectorLayer* vlayer,
     if ( vlayer->crs() != mRender->destinationCrs() )
     {
       rect = mRender->mapToLayerCoordinates( vlayer, rect );
-      QgsDebugMsg( QString( "Reverse transform needed for highlight rectangle" ));
+      QgsDebugMsg( QString( "Reverse transform needed for highlight rectangle" ) );
     }
   }
 
@@ -209,9 +209,9 @@ void QgsMapToolFreezeLabels::highlightFrozenLabels()
   {
     mCurrentLabelPos = *it;
 
-    if( mCurrentLabelPos.isFrozen )
+    if ( mCurrentLabelPos.isFrozen )
     {
-      QString labelStringID = QString("%0|%1").arg(mCurrentLabelPos.layerID, QString::number( mCurrentLabelPos.featureId ) );
+      QString labelStringID = QString( "%0|%1" ).arg( mCurrentLabelPos.layerID, QString::number( mCurrentLabelPos.featureId ) );
 
       // don't highlight again
       if ( mHighlights.contains( labelStringID ) )
@@ -236,7 +236,7 @@ void QgsMapToolFreezeLabels::highlightFrozenLabels()
         lblcolor = QColor( 54, 129, 0, 255 );
       }
 
-      highlightLabel( vlayer, ( *it ), labelStringID, lblcolor);
+      highlightLabel( vlayer, ( *it ), labelStringID, lblcolor );
     }
   }
   QApplication::restoreOverrideCursor();
@@ -253,7 +253,7 @@ void QgsMapToolFreezeLabels::removeFrozenHighlights()
   QApplication::restoreOverrideCursor();
 }
 
-void QgsMapToolFreezeLabels::freezeThawLabels( const QgsRectangle& ext, QMouseEvent * e  )
+void QgsMapToolFreezeLabels::freezeThawLabels( const QgsRectangle& ext, QMouseEvent * e )
 {
 
   bool doThaw = e->modifiers() & Qt::ShiftModifier ? true : false;
@@ -312,10 +312,10 @@ void QgsMapToolFreezeLabels::freezeThawLabels( const QgsRectangle& ext, QMouseEv
       continue;
     }
 
-    QString labelStringID = QString("%0|%1").arg(mCurrentLabelPos.layerID, QString::number( mCurrentLabelPos.featureId ) );
+    QString labelStringID = QString( "%0|%1" ).arg( mCurrentLabelPos.layerID, QString::number( mCurrentLabelPos.featureId ) );
 
     // thaw label
-    if ( mCurrentLabelPos.isFrozen && !doHide && ( doThaw  || toggleThawOrFreeze  ) )
+    if ( mCurrentLabelPos.isFrozen && !doHide && ( doThaw  || toggleThawOrFreeze ) )
     {
       // thaw previously frozen label (set attribute table fields to NULL)
       if ( freezeThawLabel( vlayer, mCurrentLabelPos, false ) )
@@ -370,8 +370,8 @@ void QgsMapToolFreezeLabels::freezeThawLabels( const QgsRectangle& ext, QMouseEv
 }
 
 bool QgsMapToolFreezeLabels::freezeThawLabel( QgsVectorLayer* vlayer,
-                                              const QgsLabelPosition& labelpos,
-                                              bool freeze )
+    const QgsLabelPosition& labelpos,
+    bool freeze )
 {
   // skip diagrams
   if ( labelpos.isDiagram )
diff --git a/src/app/qgsmaptoolfreezelabels.h b/src/app/qgsmaptoolfreezelabels.h
@@ -89,7 +89,7 @@ class QgsMapToolFreezeLabels: public QgsMapToolLabel
                          const QColor& color );
 
     //! Select valid labels to freeze or thaw
-    void freezeThawLabels( const QgsRectangle& ext, QMouseEvent * e  );
+    void freezeThawLabels( const QgsRectangle& ext, QMouseEvent * e );
 
     //! Freeze or thaw label relative to whether its editable
     bool freezeThawLabel( QgsVectorLayer* vlayer,
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -1570,7 +1570,7 @@ void QgsRasterLayerProperties::updatePipeItems()
     QTreeWidgetItem *item = mPipeTreeWidget->topLevelItem( i );
     if ( !item ) continue;
     // Checkboxes disabled for now, see above
-    /*
+#if 0
     bool on = interface->on();
     Qt::ItemFlags flags = item->flags();
     if ( pipe->canSetOn( i, !on ) )
@@ -1582,6 +1582,6 @@ void QgsRasterLayerProperties::updatePipeItems()
       flags |= ( Qt::ItemFlags )~Qt::ItemIsUserCheckable;
     }
     item->setFlags( flags );
-    */
+#endif
   }
 }
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1008,7 +1008,7 @@ void QgsVectorLayerProperties::saveStyleAsMenuTriggered( QAction *action )
   if ( index < 0 )
     return;
 
-  saveStyleAs( (StyleType) index );
+  saveStyleAs(( StyleType ) index );
 }
 
 void QgsVectorLayerProperties::saveStyleAs( StyleType styleType )
@@ -1029,7 +1029,7 @@ void QgsVectorLayerProperties::saveStyleAs( StyleType styleType )
   }
 
   QString myOutputFileName = QFileDialog::getSaveFileName( this, tr( "Save layer properties as style file" ),
-                                                           myLastUsedDir, format );
+                             myLastUsedDir, format );
   if ( myOutputFileName.isNull() ) //dialog canceled
   {
     return;
diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
@@ -147,7 +147,7 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope
   private slots:
 
     /** save the style based on selected format from the menu */
-      void saveStyleAsMenuTriggered( QAction * );
+    void saveStyleAsMenuTriggered( QAction * );
 
   protected:
 
diff --git a/src/core/gps/qgsqtlocationconnection.cpp b/src/core/gps/qgsqtlocationconnection.cpp
@@ -158,7 +158,7 @@ void QgsQtLocationConnection::startGPS()
     if ( locationDataSource )
     {
       locationDataSource->setPreferredPositioningMethods( QGeoPositionInfoSource::SatellitePositioningMethods );  //QGeoPositionInfoSource::AllPositioningMethods
-      locationDataSource->setUpdateInterval(1000);
+      locationDataSource->setUpdateInterval( 1000 );
       // Whenever the location data source signals that the current
       // position is updated, the positionUpdated function is called.
       QObject::connect( locationDataSource,
diff --git a/src/core/qgsrasterdataprovider.h b/src/core/qgsrasterdataprovider.h
@@ -451,21 +451,21 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
     /**Writes into the provider datasource*/
     virtual bool write( void* data, int band, int width, int height, int xOffset, int yOffset )
     {
-        Q_UNUSED( data );
-        Q_UNUSED( band );
-        Q_UNUSED( width );
-        Q_UNUSED( height );
-        Q_UNUSED( xOffset );
-        Q_UNUSED( yOffset );
-        return false;
+      Q_UNUSED( data );
+      Q_UNUSED( band );
+      Q_UNUSED( width );
+      Q_UNUSED( height );
+      Q_UNUSED( xOffset );
+      Q_UNUSED( yOffset );
+      return false;
     }
 
     /** Creates a new dataset with mDataSourceURI
         @return true in case of success*/
     virtual bool create( const QString& format, int nBands,
-                         QgsRasterDataProvider::DataType type, 
+                         QgsRasterDataProvider::DataType type,
                          int width, int height, double* geoTransform,
-                         const QgsCoordinateReferenceSystem& crs, 
+                         const QgsCoordinateReferenceSystem& crs,
                          QStringList createOptions = QStringList() /*e.v. color table*/ )
     {
       Q_UNUSED( format );
diff --git a/src/core/qgsrasterprojector.cpp b/src/core/qgsrasterprojector.cpp
@@ -34,8 +34,8 @@ QgsRasterProjector::QgsRasterProjector(
     , mDestExtent( theDestExtent )
     , mExtent( theExtent )
     , mDestRows( theDestRows ), mDestCols( theDestCols )
-    , mMaxSrcXRes( theMaxSrcXRes ), mMaxSrcYRes( theMaxSrcYRes )
     , pHelperTop( 0 ), pHelperBottom( 0 )
+    , mMaxSrcXRes( theMaxSrcXRes ), mMaxSrcYRes( theMaxSrcYRes )
 {
   QgsDebugMsg( "Entered" );
   QgsDebugMsg( "theDestExtent = " + theDestExtent.toString() );
@@ -53,8 +53,8 @@ QgsRasterProjector::QgsRasterProjector(
     , mDestCRS( theDestCRS )
     , mCoordinateTransform( theDestCRS, theSrcCRS )
     , mExtent( theExtent )
-    , mMaxSrcXRes( theMaxSrcXRes ), mMaxSrcYRes( theMaxSrcYRes )
     , pHelperTop( 0 ), pHelperBottom( 0 )
+    , mMaxSrcXRes( theMaxSrcXRes ), mMaxSrcYRes( theMaxSrcYRes )
 {
   QgsDebugMsg( "Entered" );
 }
diff --git a/src/core/qgsscaleutils.cpp b/src/core/qgsscaleutils.cpp
@@ -62,9 +62,9 @@ bool QgsScaleUtils::loadScaleList( const QString &fileName, QStringList &scales,
   if ( !doc.setContent( &file, true, &errorStr, &errorLine, &errorColumn ) )
   {
     errorMessage = QString( "Parse error at line %1, column %2:\n%3" )
-                          .arg( errorLine )
-                          .arg( errorColumn )
-                          .arg( errorStr );
+                   .arg( errorLine )
+                   .arg( errorColumn )
+                   .arg( errorStr );
     return false;
   }
 
diff --git a/src/core/raster/qgsmultibandcolorrenderer.cpp b/src/core/raster/qgsmultibandcolorrenderer.cpp
@@ -103,6 +103,7 @@ QgsRasterRenderer* QgsMultiBandColorRenderer::create( const QDomElement& elem, Q
 
 void * QgsMultiBandColorRenderer::readBlock( int bandNo, QgsRectangle  const & extent, int width, int height )
 {
+  Q_UNUSED( bandNo );
   if ( !mInput )
   {
     return 0;
@@ -136,7 +137,6 @@ void * QgsMultiBandColorRenderer::readBlock( int bandNo, QgsRectangle  const & e
     transparencyType = ( QgsRasterInterface::DataType )mInput->dataType( mAlphaBand );
   }
 
-  double oversamplingX = 1.0, oversamplingY = 1.0;
   QSet<int> bands;
   if ( mRedBand > 0 )
   {
@@ -203,9 +203,6 @@ void * QgsMultiBandColorRenderer::readBlock( int bandNo, QgsRectangle  const & e
   int redVal = 0;
   int greenVal = 0;
   int blueVal = 0;
-  int redDataVal = 0;
-  int greenDataVal = 0;
-  int blueDataVal = 0;
   QRgb defaultColor = qRgba( 255, 255, 255, 0 );
   double currentOpacity = mOpacity; //opacity (between 0 and 1)
 
@@ -227,17 +224,14 @@ void * QgsMultiBandColorRenderer::readBlock( int bandNo, QgsRectangle  const & e
       if ( mRedBand > 0 )
       {
         redVal = readValue( redData, redType, currentRasterPos );
-        redDataVal = redVal;
       }
       if ( mGreenBand > 0 )
       {
         greenVal = readValue( greenData, greenType, currentRasterPos );
-        greenDataVal = greenVal;
       }
       if ( mBlueBand > 0 )
       {
         blueVal = readValue( blueData, blueType, currentRasterPos );
-        blueDataVal = blueVal;
       }
 
       //apply default color if red, green or blue not in displayable range
diff --git a/src/core/raster/qgsrasterfilewriter.h b/src/core/raster/qgsrasterfilewriter.h
@@ -45,7 +45,7 @@ class CORE_EXPORT QgsRasterFileWriter
     int maxTileWidth() const { return mMaxTileWidth; }
 
     void setMaxTileHeight( int h ) { mMaxTileHeight = h; }
-    int maxTileHeight() const { return mMaxTileHeight; } 
+    int maxTileHeight() const { return mMaxTileHeight; }
 
     // for now not putting createOptions in all methods, use createOptions()
     void setCreateOptions( const QStringList& list ) { mCreateOptions = list; }
@@ -72,7 +72,7 @@ class CORE_EXPORT QgsRasterFileWriter
     QgsRasterDataProvider* createPartProvider( const QgsRectangle& extent, int nCols, int iterCols, int iterRows,
         int iterLeft, int iterTop,
         const QString& outputUrl, int fileIndex, int nBands, QgsRasterInterface::DataType type,
-                                               const QgsCoordinateReferenceSystem& crs );
+        const QgsCoordinateReferenceSystem& crs );
 
     /**Init VRT (for tiled mode) or create global output provider (single-file mode)*/
     QgsRasterDataProvider* initOutput( int nCols, int nRows, const QgsCoordinateReferenceSystem& crs, double* geoTransform, int nBands,
diff --git a/src/core/raster/qgsrasterinterface.cpp b/src/core/raster/qgsrasterinterface.cpp
@@ -50,6 +50,12 @@ bool QgsRasterInterface::typeIsNumeric( DataType dataType ) const
     case CFloat32:
     case CFloat64:
       return true;
+
+    case UnknownDataType:
+    case ARGB32:
+    case ARGB32_Premultiplied:
+    case TypeCount:
+      return false;
   }
   return false;
 }
@@ -61,6 +67,21 @@ bool QgsRasterInterface::typeIsColor( DataType dataType ) const
     case ARGB32:
     case ARGB32_Premultiplied:
       return true;
+
+    case UnknownDataType:
+    case Byte:
+    case UInt16:
+    case Int16:
+    case UInt32:
+    case Int32:
+    case Float32:
+    case CInt16:
+    case Float64:
+    case CInt32:
+    case CFloat32:
+    case CFloat64:
+    case TypeCount:
+      return false;
   }
   return false;
 }
diff --git a/src/core/raster/qgsrasterpipe.cpp b/src/core/raster/qgsrasterpipe.cpp
@@ -129,11 +129,6 @@ bool QgsRasterPipe::set( QgsRasterInterface* theInterface )
 
   if ( !theInterface ) return false;
 
-  QgsRasterDataProvider * provider = dynamic_cast<QgsRasterDataProvider *>( theInterface );
-  QgsRasterRenderer * renderer;
-  QgsRasterResampleFilter * resampleFilter;
-  QgsRasterProjector * projector;
-
   Role role = interfaceRole( theInterface );
 
   // We dont know where to place unknown interface
diff --git a/src/core/raster/qgsrasterrenderer.h b/src/core/raster/qgsrasterrenderer.h
@@ -68,8 +68,7 @@ class CORE_EXPORT QgsRasterRenderer : public QgsRasterInterface
     /**Get symbology items if provided by renderer*/
     virtual void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const { Q_UNUSED( symbolItems ); }
 
-    virtual void writeXML( QDomDocument& doc, QDomElement& parentElem ) const {}
-
+    virtual void writeXML( QDomDocument&, QDomElement& ) const {}
     /**Sets base class members from xml. Usually called from create() methods of subclasses*/
     void readXML( const QDomElement& rendererElem );
 
diff --git a/src/core/raster/qgsrasterresamplefilter.cpp b/src/core/raster/qgsrasterresamplefilter.cpp
@@ -113,6 +113,7 @@ void QgsRasterResampleFilter::setZoomedOutResampler( QgsRasterResampler* r )
 
 void * QgsRasterResampleFilter::readBlock( int bandNo, QgsRectangle  const & extent, int width, int height )
 {
+  Q_UNUSED( bandNo );
   QgsDebugMsg( "Entered" );
   if ( !mInput ) return 0;
 
diff --git a/src/core/raster/qgssinglebandcolordatarenderer.cpp b/src/core/raster/qgssinglebandcolordatarenderer.cpp
@@ -55,8 +55,6 @@ void * QgsSingleBandColorDataRenderer::readBlock( int bandNo, QgsRectangle  cons
 
   bool hasTransparency = usesTransparency();
 
-  QgsRasterInterface::DataType rasterType = ( QgsRasterInterface::DataType )mInput->dataType( mBand );
-
   void* rasterData = mInput->block( bandNo, extent, width, height );
 
   currentRasterPos = 0;
diff --git a/src/core/raster/qgssinglebandgrayrenderer.cpp b/src/core/raster/qgssinglebandgrayrenderer.cpp
diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
diff --git a/src/gui/qgsattributeeditor.cpp b/src/gui/qgsattributeeditor.cpp
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
diff --git a/src/providers/gdal/qgsgdalprovider.h b/src/providers/gdal/qgsgdalprovider.h
diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ int main( int argc, char *argv[] )`
`269`	`269`	`QgsDebugMsg( QString( "Android: All params stripped" ) );// Param %1" ).arg( argv[0] ) );`
`270`	`270`	`//put all QGIS settings in the same place`
`271`	`271`	`configpath = QDir::homePath() + QString( "/.qgis/" );`
`272`		`- QgsDebugMsg( QString( "Android: configpath set to %1" ).arg(configpath) );`
	`272`	`+ QgsDebugMsg( QString( "Android: configpath set to %1" ).arg( configpath ) );`
`273`	`273`	`#elif defined(Q_WS_WIN)`
`274`	`274`	`for ( int i = 1; i < argc; i++ )`
`275`	`275`	`{`
Original file line number	Diff line number	Diff line change
`@@ -118,12 +118,12 @@ void QgsMapToolFreezeLabels::showFrozenLabels( bool show )`
`118`	`118`	`mShowFrozen = show;`
`119`	`119`	`if ( mShowFrozen )`
`120`	`120`	`{`
`121`		`- QgsDebugMsg( QString( "Toggling on frozen label highlighting" ));`
	`121`	`+ QgsDebugMsg( QString( "Toggling on frozen label highlighting" ) );`
`122`	`122`	`highlightFrozenLabels();`
`123`	`123`	`}`
`124`	`124`	`else`
`125`	`125`	`{`
`126`		`- QgsDebugMsg( QString( "Toggling off frozen label highlighting" ));`
	`126`	`+ QgsDebugMsg( QString( "Toggling off frozen label highlighting" ) );`
`127`	`127`	`removeFrozenHighlights();`
`128`	`128`	`}`
`129`	`129`	`}`
`@@ -133,15 +133,15 @@ void QgsMapToolFreezeLabels::updateFrozenLabels()`
`133`	`133`	`{`
`134`	`134`	`if ( mShowFrozen )`
`135`	`135`	`{`
`136`		`- QgsDebugMsg( QString( "Updating highlighting due to layer editing mode change" ));`
	`136`	`+ QgsDebugMsg( QString( "Updating highlighting due to layer editing mode change" ) );`
`137`	`137`	`mCanvas->refresh();`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`void QgsMapToolFreezeLabels::highlightLabel( QgsVectorLayer* vlayer,`
`142`		`- const QgsLabelPosition& labelpos,`
`143`		`- const QString& id,`
`144`		`- const QColor& color )`
	`142`	`+ const QgsLabelPosition& labelpos,`
	`143`	`+ const QString& id,`
	`144`	`+ const QColor& color )`
`145`	`145`	`{`
`146`	`146`	`QgsRectangle rect = labelpos.labelRect;`
`147`	`147`
`@@ -152,7 +152,7 @@ void QgsMapToolFreezeLabels::highlightLabel( QgsVectorLayer* vlayer,`
`152`	`152`	`if ( vlayer->crs() != mRender->destinationCrs() )`
`153`	`153`	`{`
`154`	`154`	`rect = mRender->mapToLayerCoordinates( vlayer, rect );`
`155`		`- QgsDebugMsg( QString( "Reverse transform needed for highlight rectangle" ));`
	`155`	`+ QgsDebugMsg( QString( "Reverse transform needed for highlight rectangle" ) );`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
`@@ -209,9 +209,9 @@ void QgsMapToolFreezeLabels::highlightFrozenLabels()`
`209`	`209`	`{`
`210`	`210`	`mCurrentLabelPos = *it;`
`211`	`211`
`212`		`- if( mCurrentLabelPos.isFrozen )`
	`212`	`+ if ( mCurrentLabelPos.isFrozen )`
`213`	`213`	`{`
`214`		`- QString labelStringID = QString("%0\|%1").arg(mCurrentLabelPos.layerID, QString::number( mCurrentLabelPos.featureId ) );`
	`214`	`+ QString labelStringID = QString( "%0\|%1" ).arg( mCurrentLabelPos.layerID, QString::number( mCurrentLabelPos.featureId ) );`
`215`	`215`
`216`	`216`	`// don't highlight again`
`217`	`217`	`if ( mHighlights.contains( labelStringID ) )`
`@@ -236,7 +236,7 @@ void QgsMapToolFreezeLabels::highlightFrozenLabels()`
`236`	`236`	`lblcolor = QColor( 54, 129, 0, 255 );`
`237`	`237`	`}`
`238`	`238`
`239`		`- highlightLabel( vlayer, ( *it ), labelStringID, lblcolor);`
	`239`	`+ highlightLabel( vlayer, ( *it ), labelStringID, lblcolor );`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`	`QApplication::restoreOverrideCursor();`
`@@ -253,7 +253,7 @@ void QgsMapToolFreezeLabels::removeFrozenHighlights()`
`253`	`253`	`QApplication::restoreOverrideCursor();`
`254`	`254`	`}`
`255`	`255`
`256`		`-void QgsMapToolFreezeLabels::freezeThawLabels( const QgsRectangle& ext, QMouseEvent * e )`
	`256`	`+void QgsMapToolFreezeLabels::freezeThawLabels( const QgsRectangle& ext, QMouseEvent * e )`
`257`	`257`	`{`
`258`	`258`
`259`	`259`	`bool doThaw = e->modifiers() & Qt::ShiftModifier ? true : false;`
`@@ -312,10 +312,10 @@ void QgsMapToolFreezeLabels::freezeThawLabels( const QgsRectangle& ext, QMouseEv`
`312`	`312`	`continue;`
`313`	`313`	`}`
`314`	`314`
`315`		`- QString labelStringID = QString("%0\|%1").arg(mCurrentLabelPos.layerID, QString::number( mCurrentLabelPos.featureId ) );`
	`315`	`+ QString labelStringID = QString( "%0\|%1" ).arg( mCurrentLabelPos.layerID, QString::number( mCurrentLabelPos.featureId ) );`
`316`	`316`
`317`	`317`	`// thaw label`
`318`		`- if ( mCurrentLabelPos.isFrozen && !doHide && ( doThaw \|\| toggleThawOrFreeze ) )`
	`318`	`+ if ( mCurrentLabelPos.isFrozen && !doHide && ( doThaw \|\| toggleThawOrFreeze ) )`
`319`	`319`	`{`
`320`	`320`	`// thaw previously frozen label (set attribute table fields to NULL)`
`321`	`321`	`if ( freezeThawLabel( vlayer, mCurrentLabelPos, false ) )`
`@@ -370,8 +370,8 @@ void QgsMapToolFreezeLabels::freezeThawLabels( const QgsRectangle& ext, QMouseEv`
`370`	`370`	`}`
`371`	`371`
`372`	`372`	`bool QgsMapToolFreezeLabels::freezeThawLabel( QgsVectorLayer* vlayer,`
`373`		`- const QgsLabelPosition& labelpos,`
`374`		`- bool freeze )`
	`373`	`+ const QgsLabelPosition& labelpos,`
	`374`	`+ bool freeze )`
`375`	`375`	`{`
`376`	`376`	`// skip diagrams`
`377`	`377`	`if ( labelpos.isDiagram )`
Original file line number	Diff line number	Diff line change
`@@ -1570,7 +1570,7 @@ void QgsRasterLayerProperties::updatePipeItems()`
`1570`	`1570`	`QTreeWidgetItem *item = mPipeTreeWidget->topLevelItem( i );`
`1571`	`1571`	`if ( !item ) continue;`
`1572`	`1572`	`// Checkboxes disabled for now, see above`
`1573`		`- /*`
	`1573`	`+#if 0`
`1574`	`1574`	`bool on = interface->on();`
`1575`	`1575`	`Qt::ItemFlags flags = item->flags();`
`1576`	`1576`	`if ( pipe->canSetOn( i, !on ) )`
`@@ -1582,6 +1582,6 @@ void QgsRasterLayerProperties::updatePipeItems()`
`1582`	`1582`	`flags \|= ( Qt::ItemFlags )~Qt::ItemIsUserCheckable;`
`1583`	`1583`	`}`
`1584`	`1584`	`item->setFlags( flags );`
`1585`		`- */`
	`1585`	`+#endif`
`1586`	`1586`	`}`
`1587`	`1587`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1008,7 +1008,7 @@ void QgsVectorLayerProperties::saveStyleAsMenuTriggered( QAction *action )`
`1008`	`1008`	`if ( index < 0 )`
`1009`	`1009`	`return;`
`1010`	`1010`
`1011`		`- saveStyleAs( (StyleType) index );`
	`1011`	`+ saveStyleAs(( StyleType ) index );`
`1012`	`1012`	`}`
`1013`	`1013`
`1014`	`1014`	`void QgsVectorLayerProperties::saveStyleAs( StyleType styleType )`
`@@ -1029,7 +1029,7 @@ void QgsVectorLayerProperties::saveStyleAs( StyleType styleType )`
`1029`	`1029`	`}`
`1030`	`1030`
`1031`	`1031`	`QString myOutputFileName = QFileDialog::getSaveFileName( this, tr( "Save layer properties as style file" ),`
`1032`		`- myLastUsedDir, format );`
	`1032`	`+ myLastUsedDir, format );`
`1033`	`1033`	`if ( myOutputFileName.isNull() ) //dialog canceled`
`1034`	`1034`	`{`
`1035`	`1035`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ void QgsQtLocationConnection::startGPS()`
`158`	`158`	`if ( locationDataSource )`
`159`	`159`	`{`
`160`	`160`	`locationDataSource->setPreferredPositioningMethods( QGeoPositionInfoSource::SatellitePositioningMethods ); //QGeoPositionInfoSource::AllPositioningMethods`
`161`		`- locationDataSource->setUpdateInterval(1000);`
	`161`	`+ locationDataSource->setUpdateInterval( 1000 );`
`162`	`162`	`// Whenever the location data source signals that the current`
`163`	`163`	`// position is updated, the positionUpdated function is called.`
`164`	`164`	`QObject::connect( locationDataSource,`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ QgsRasterProjector::QgsRasterProjector(`
`34`	`34`	`, mDestExtent( theDestExtent )`
`35`	`35`	`, mExtent( theExtent )`
`36`	`36`	`, mDestRows( theDestRows ), mDestCols( theDestCols )`
`37`		`- , mMaxSrcXRes( theMaxSrcXRes ), mMaxSrcYRes( theMaxSrcYRes )`
`38`	`37`	`, pHelperTop( 0 ), pHelperBottom( 0 )`
	`38`	`+ , mMaxSrcXRes( theMaxSrcXRes ), mMaxSrcYRes( theMaxSrcYRes )`
`39`	`39`	`{`
`40`	`40`	`QgsDebugMsg( "Entered" );`
`41`	`41`	`QgsDebugMsg( "theDestExtent = " + theDestExtent.toString() );`
`@@ -53,8 +53,8 @@ QgsRasterProjector::QgsRasterProjector(`
`53`	`53`	`, mDestCRS( theDestCRS )`
`54`	`54`	`, mCoordinateTransform( theDestCRS, theSrcCRS )`
`55`	`55`	`, mExtent( theExtent )`
`56`		`- , mMaxSrcXRes( theMaxSrcXRes ), mMaxSrcYRes( theMaxSrcYRes )`
`57`	`56`	`, pHelperTop( 0 ), pHelperBottom( 0 )`
	`57`	`+ , mMaxSrcXRes( theMaxSrcXRes ), mMaxSrcYRes( theMaxSrcYRes )`
`58`	`58`	`{`
`59`	`59`	`QgsDebugMsg( "Entered" );`
`60`	`60`	`}`