diff --git a/src/core/composer/qgscomposerlabel.cpp b/src/core/composer/qgscomposerlabel.cpp
@@ -20,7 +20,7 @@
 #include <QDomElement>
 #include <QPainter>
 
-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
@@ -41,8 +41,8 @@
 #include <cmath>
 
 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
@@ -26,8 +26,8 @@
 #include <QSvgRenderer>
 
 
-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
@@ -213,7 +213,7 @@ bool QgsComposerTable::calculateMaxColumnWidths( QMap<int, double>& maxWidthMap,
 void QgsComposerTable::adaptItemFrame( const QMap<int, double>& maxWidthMap, const QList<QgsAttributeMap>& 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
@@ -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
@@ -392,14 +392,14 @@ FnDef QgsExpression::BuiltinFunctions[] =
   FnDef( "toreal", 1, fcnToReal, "Conversions" ),
   FnDef( "tostring", 1, fcnToString, "Conversions" ),
   // string manipulation
-  FnDef( "lower", 1, fcnLower, "String", "<b>Convert to lower case</b> "\
-  "<br> Converts a string to lower case letters. " \
+  FnDef( "lower", 1, fcnLower, "String", "<b>Convert to lower case</b> "
+  "<br> Converts a string to lower case letters. "
   "<br> <i>Usage:</i><br>lower('HELLO WORLD') will return 'hello world'" ),
-  FnDef( "upper", 1, fcnUpper, "String" , "<b>Convert to upper case</b> "\
-  "<br> Converts a string to upper case letters. " \
+  FnDef( "upper", 1, fcnUpper, "String" , "<b>Convert to upper case</b> "
+  "<br> Converts a string to upper case letters. "
   "<br> <i>Usage:</i><br>upper('hello world') will return 'HELLO WORLD'" ),
-  FnDef( "length", 1, fcnLength, "String", "<b>Length of string</b> "\
-  "<br> Returns the legnth of a string. " \
+  FnDef( "length", 1, fcnLength, "String", "<b>Length of string</b> "
+  "<br> Returns the legnth of a string. "
   "<br> <i>Usage:</i><br>length('hello') will return 5" ),
   FnDef( "replace", 3, fcnReplace, "String", "<b>Replace a section of a string.</b> " ),
   FnDef( "regexp_replace", 3, fcnRegexpReplace, "String" ),

diff --git 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
@@ -521,7 +521,7 @@ class CORE_EXPORT QgsGeometry
      @return 0 in case of success*/
     int topologicalTestPointsSplit( const GEOSGeometry* splitLine, QList<QgsPoint>& 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
@@ -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
@@ -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<int>& 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<int>& 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
@@ -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
@@ -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
@@ -58,8 +58,8 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
   registerItem( "Operators", "<>", " <> " );
   registerItem( "Operators", "<=", " <= " );
   registerItem( "Operators", ">=", " >= " );
-  registerItem( "Operators", "||", " || ", "<b>|| (String Concatenation)</b> "\
-                "<br> Joins two values together into a string " \
+  registerItem( "Operators", "||", " || ", "<b>|| (String Concatenation)</b> "
+                "<br> Joins two values together into a string "
                 "<br> <i>Usage:</i><br>'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. <br> " \
-                              "Or right click to select loading value options then " \
+    txtHelpText->setText( tr( "Double click to add field name to expression string. <br> "
+                              "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
@@ -32,8 +32,8 @@
 #include <QUiLoader>
 #include <QWidget>
 
-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
@@ -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
@@ -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
@@ -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
@@ -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<QTemporaryFile*> 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<QString> mFilePathsToRemove;
 

diff --git 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
@@ -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
@@ -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<int> attributeIndices() const;
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<QPointF>& symbolPositions, QList<QPointF>& labelShifts ) const
 {
   symbolPositions.clear();

diff --git 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<QgsMarkerSymbolV2*>& symbols, \
+    void renderPoint( const QPointF& point, QgsSymbolV2RenderContext& context, const QList<QgsMarkerSymbolV2*>& symbols,
                       const QStringList& labels );
 
     //helper functions

diff --git 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
@@ -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
@@ -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" ) );