From e54bc9aaeda33437af69f8681c7f46aa41a903c6 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 21 Feb 2017 09:01:29 +1000 Subject: [PATCH] Fix build error and warnings --- src/core/qgscacheindex.h | 4 ++++ src/core/qgscolorscheme.h | 3 +++ src/core/qgsvectorlayer.cpp | 26 +++++++++++++------------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/core/qgscacheindex.h b/src/core/qgscacheindex.h index 3c46a1aedb9..bd307d55a8e 100644 --- a/src/core/qgscacheindex.h +++ b/src/core/qgscacheindex.h @@ -30,6 +30,10 @@ class QgsFeatureIterator; class CORE_EXPORT QgsAbstractCacheIndex { public: + + /** + * Constructor for QgsAbstractCacheIndex. + */ QgsAbstractCacheIndex() = default; virtual ~QgsAbstractCacheIndex() = default; diff --git a/src/core/qgscolorscheme.h b/src/core/qgscolorscheme.h index d12b37cda39..45abd30f798 100644 --- a/src/core/qgscolorscheme.h +++ b/src/core/qgscolorscheme.h @@ -54,6 +54,9 @@ class CORE_EXPORT QgsColorScheme }; Q_DECLARE_FLAGS( SchemeFlags, SchemeFlag ) + /** + * Constructor for QgsColorScheme. + */ QgsColorScheme() = default; virtual ~QgsColorScheme() = default; diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index fb17848593d..89d67539790 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -4166,22 +4166,22 @@ QString QgsVectorLayer::metadata() const // myMetadata += R"(

)" + tr( "Layer Spatial Reference System" ) + "

\n"; myMetadata += QLatin1String( "

" ); - myMetadata += crs().toProj4().replace( '"', QLatin1String( R"( " )" ) ); - myMetadata += QLatin1String( " < / p > \n" ); + myMetadata += crs().toProj4().replace( '"', QLatin1String( " \"" ) ); + myMetadata += QLatin1String( "

\n" ); - // - // Display project (output) spatial ref system - // + // + // Display project (output) spatial ref system + // #if 0 - // TODO: disabled for now, will revisit later [MD] - //myMetadata += " < td bgcolor = \"gray\">"; - myMetadata += "

" + tr( "Project (Output) Spatial Reference System" ) + "

\n"; - myMetadata += "

"; - myMetadata += coordinateTransform->destCRS().toProj4().replace( '"', " \"" ); - myMetadata += "

\n"; + // TODO: disabled for now, will revisit later [MD] + //myMetadata += " < td bgcolor = \"gray\">"; + myMetadata += "

" + tr( "Project (Output) Spatial Reference System" ) + "

\n"; + myMetadata += "

"; + myMetadata += coordinateTransform->destCRS().toProj4().replace( '"', " \"" ); + myMetadata += "

\n"; #endif - } - catch ( QgsCsException &cse ) + } + catch ( QgsCsException &cse ) { Q_UNUSED( cse ); QgsDebugMsg( cse.what() );