Fix build error and warnings

This commit is contained in:
Nyall Dawson 2017-02-21 09:01:29 +10:00
parent 7daa4b591e
commit e54bc9aaed
3 changed files with 20 additions and 13 deletions

View File

@ -30,6 +30,10 @@ class QgsFeatureIterator;
class CORE_EXPORT QgsAbstractCacheIndex class CORE_EXPORT QgsAbstractCacheIndex
{ {
public: public:
/**
* Constructor for QgsAbstractCacheIndex.
*/
QgsAbstractCacheIndex() = default; QgsAbstractCacheIndex() = default;
virtual ~QgsAbstractCacheIndex() = default; virtual ~QgsAbstractCacheIndex() = default;

View File

@ -54,6 +54,9 @@ class CORE_EXPORT QgsColorScheme
}; };
Q_DECLARE_FLAGS( SchemeFlags, SchemeFlag ) Q_DECLARE_FLAGS( SchemeFlags, SchemeFlag )
/**
* Constructor for QgsColorScheme.
*/
QgsColorScheme() = default; QgsColorScheme() = default;
virtual ~QgsColorScheme() = default; virtual ~QgsColorScheme() = default;

View File

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