Skip to content
Permalink
Browse files

Fix build error and warnings

  • Loading branch information
nyalldawson committed Feb 20, 2017
1 parent 7daa4b5 commit e54bc9aaeda33437af69f8681c7f46aa41a903c6
Showing with 20 additions and 13 deletions.
  1. +4 −0 src/core/qgscacheindex.h
  2. +3 −0 src/core/qgscolorscheme.h
  3. +13 −13 src/core/qgsvectorlayer.cpp
@@ -30,6 +30,10 @@ class QgsFeatureIterator;
class CORE_EXPORT QgsAbstractCacheIndex
{
public:

/**
* Constructor for QgsAbstractCacheIndex.
*/
QgsAbstractCacheIndex() = default;
virtual ~QgsAbstractCacheIndex() = default;

@@ -54,6 +54,9 @@ class CORE_EXPORT QgsColorScheme
};
Q_DECLARE_FLAGS( SchemeFlags, SchemeFlag )

/**
* Constructor for QgsColorScheme.
*/
QgsColorScheme() = default;

virtual ~QgsColorScheme() = default;
@@ -4166,22 +4166,22 @@ QString QgsVectorLayer::metadata() const
//
myMetadata += R"(<p class="glossy">)" + tr( "Layer Spatial Reference System" ) + "</p>\n";
myMetadata += QLatin1String( "<p>" );
myMetadata += crs().toProj4().replace( '"', QLatin1String( R"( " )" ) );
myMetadata += QLatin1String( " < / p > \n" );
myMetadata += crs().toProj4().replace( '"', QLatin1String( " \"" ) );
myMetadata += QLatin1String( "</p>\n" );

//
// Display project (output) spatial ref system
//
//
// Display project (output) spatial ref system
//
#if 0
// TODO: disabled for now, will revisit later [MD]
//myMetadata += "<tr> < td bgcolor = \"gray\">";
myMetadata += "<p class=\"glossy\">" + tr( "Project (Output) Spatial Reference System" ) + "</p>\n";
myMetadata += "<p>";
myMetadata += coordinateTransform->destCRS().toProj4().replace( '"', " \"" );
myMetadata += "</p>\n";
// TODO: disabled for now, will revisit later [MD]
//myMetadata += "<tr> < td bgcolor = \"gray\">";
myMetadata += "<p class=\"glossy\">" + tr( "Project (Output) Spatial Reference System" ) + "</p>\n";
myMetadata += "<p>";
myMetadata += coordinateTransform->destCRS().toProj4().replace( '"', " \"" );
myMetadata += "</p>\n";
#endif
}
catch ( QgsCsException &cse )
}
catch ( QgsCsException &cse )
{
Q_UNUSED( cse );
QgsDebugMsg( cse.what() );

0 comments on commit e54bc9a

Please sign in to comment.
You can’t perform that action at this time.