Some clazy warnings

nyalldawson · nyalldawson · commit cc543d6b9d19 · 2018-10-23T16:41:30.000+10:00
diff --git a/src/core/layout/qgslayoutexporter.cpp b/src/core/layout/qgslayoutexporter.cpp
@@ -47,6 +47,9 @@ class LayoutContextPreviewSettingRestorer
       mLayout->renderContext().mIsPreviewRender = mPreviousSetting;
     }
 
+    LayoutContextPreviewSettingRestorer( const LayoutContextPreviewSettingRestorer &other ) = delete;
+    LayoutContextPreviewSettingRestorer &operator=( const LayoutContextPreviewSettingRestorer &other ) = delete;
+
   private:
     QgsLayout *mLayout = nullptr;
     bool mPreviousSetting = false;
@@ -75,6 +78,9 @@ class LayoutGuideHider
       }
     }
 
+    LayoutGuideHider( const LayoutGuideHider &other ) = delete;
+    LayoutGuideHider &operator=( const LayoutGuideHider &other ) = delete;
+
   private:
     QgsLayout *mLayout = nullptr;
     QHash< QgsLayoutGuide *, bool > mPrevVisibility;
@@ -108,6 +114,9 @@ class LayoutItemHider
       }
     }
 
+    LayoutItemHider( const LayoutItemHider &other ) = delete;
+    LayoutItemHider &operator=( const LayoutItemHider &other ) = delete;
+
   private:
 
     QHash<QGraphicsItem *, bool> mPrevVisibility;
@@ -206,6 +215,9 @@ class LayoutItemCacheSettingRestorer
       }
     }
 
+    LayoutItemCacheSettingRestorer( const LayoutItemCacheSettingRestorer &other ) = delete;
+    LayoutItemCacheSettingRestorer &operator=( const LayoutItemCacheSettingRestorer &other ) = delete;
+
   private:
     QgsLayout *mLayout = nullptr;
     QHash< QGraphicsItem *, QGraphicsItem::CacheMode > mPrevCacheMode;
@@ -296,6 +308,9 @@ class LayoutContextSettingsRestorer
       mLayout->renderContext().setCurrentExportLayer( mPreviousExportLayer );
     }
 
+    LayoutContextSettingsRestorer( const LayoutContextSettingsRestorer &other ) = delete;
+    LayoutContextSettingsRestorer &operator=( const LayoutContextSettingsRestorer &other ) = delete;
+
   private:
     QgsLayout *mLayout = nullptr;
     double mPreviousDpi = 0;
@@ -1118,7 +1133,7 @@ void QgsLayoutExporter::updatePrinterPageSize( QgsLayout *layout, QPrinter &prin
   printer.setPageMargins( QMarginsF( 0, 0, 0, 0 ) );
 }
 
-QgsLayoutExporter::ExportResult QgsLayoutExporter::renderToLayeredSvg( const SvgExportSettings &settings, double width, double height, int page, QRectF bounds, const QString &filename, int svgLayerId, const QString &layerName, QDomDocument &svg, QDomNode &svgDocRoot, bool includeMetadata ) const
+QgsLayoutExporter::ExportResult QgsLayoutExporter::renderToLayeredSvg( const SvgExportSettings &settings, double width, double height, int page, const QRectF &bounds, const QString &filename, int svgLayerId, const QString &layerName, QDomDocument &svg, QDomNode &svgDocRoot, bool includeMetadata ) const
 {
   QBuffer svgBuffer;
   {
@@ -1572,13 +1587,13 @@ bool QgsLayoutExporter::saveImage( const QImage &image, const QString &imageFile
   }
   if ( projectForMetadata )
   {
-    w.setText( "Author", projectForMetadata->metadata().author() );
+    w.setText( QStringLiteral( "Author" ), projectForMetadata->metadata().author() );
     const QString creator = QStringLiteral( "QGIS %1" ).arg( Qgis::QGIS_VERSION );
-    w.setText( "Creator", creator );
-    w.setText( "Producer", creator );
-    w.setText( "Subject", projectForMetadata->metadata().abstract() );
-    w.setText( "Created", projectForMetadata->metadata().creationDateTime().toString( Qt::ISODate ) );
-    w.setText( "Title", projectForMetadata->metadata().title() );
+    w.setText( QStringLiteral( "Creator" ), creator );
+    w.setText( QStringLiteral( "Producer" ), creator );
+    w.setText( QStringLiteral( "Subject" ), projectForMetadata->metadata().abstract() );
+    w.setText( QStringLiteral( "Created" ), projectForMetadata->metadata().creationDateTime().toString( Qt::ISODate ) );
+    w.setText( QStringLiteral( "Title" ), projectForMetadata->metadata().title() );
 
     const QgsAbstractMetadataBase::KeywordMap keywords = projectForMetadata->metadata().keywords();
     QStringList allKeywords;
@@ -1587,7 +1602,7 @@ bool QgsLayoutExporter::saveImage( const QImage &image, const QString &imageFile
       allKeywords.append( QStringLiteral( "%1: %2" ).arg( it.key(), it.value().join( ',' ) ) );
     }
     const QString keywordString = allKeywords.join( ';' );
-    w.setText( "Keywords", keywordString );
+    w.setText( QStringLiteral( "Keywords" ), keywordString );
   }
   return w.write( image );
 }
diff --git a/src/core/layout/qgslayoutexporter.h b/src/core/layout/qgslayoutexporter.h
@@ -543,7 +543,7 @@ class CORE_EXPORT QgsLayoutExporter
 
     static void updatePrinterPageSize( QgsLayout *layout, QPrinter &printer, int page );
 
-    ExportResult renderToLayeredSvg( const SvgExportSettings &settings, double width, double height, int page, QRectF bounds,
+    ExportResult renderToLayeredSvg( const SvgExportSettings &settings, double width, double height, int page, const QRectF &bounds,
                                      const QString &filename, int svgLayerId, const QString &layerName,
                                      QDomDocument &svg, QDomNode &svgDocRoot, bool includeMetadata ) const;
 

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@ class LayoutContextPreviewSettingRestorer`
`47`	`47`	`mLayout->renderContext().mIsPreviewRender = mPreviousSetting;`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ LayoutContextPreviewSettingRestorer( const LayoutContextPreviewSettingRestorer &other ) = delete;`
	`51`	`+ LayoutContextPreviewSettingRestorer &operator=( const LayoutContextPreviewSettingRestorer &other ) = delete;`
	`52`	`+`
`50`	`53`	`private:`
`51`	`54`	`QgsLayout *mLayout = nullptr;`
`52`	`55`	`bool mPreviousSetting = false;`
`@@ -75,6 +78,9 @@ class LayoutGuideHider`
`75`	`78`	`}`
`76`	`79`	`}`
`77`	`80`
	`81`	`+ LayoutGuideHider( const LayoutGuideHider &other ) = delete;`
	`82`	`+ LayoutGuideHider &operator=( const LayoutGuideHider &other ) = delete;`
	`83`	`+`
`78`	`84`	`private:`
`79`	`85`	`QgsLayout *mLayout = nullptr;`
`80`	`86`	`QHash< QgsLayoutGuide *, bool > mPrevVisibility;`
`@@ -108,6 +114,9 @@ class LayoutItemHider`
`108`	`114`	`}`
`109`	`115`	`}`
`110`	`116`
	`117`	`+ LayoutItemHider( const LayoutItemHider &other ) = delete;`
	`118`	`+ LayoutItemHider &operator=( const LayoutItemHider &other ) = delete;`
	`119`	`+`
`111`	`120`	`private:`
`112`	`121`
`113`	`122`	`QHash<QGraphicsItem *, bool> mPrevVisibility;`
`@@ -206,6 +215,9 @@ class LayoutItemCacheSettingRestorer`
`206`	`215`	`}`
`207`	`216`	`}`
`208`	`217`
	`218`	`+ LayoutItemCacheSettingRestorer( const LayoutItemCacheSettingRestorer &other ) = delete;`
	`219`	`+ LayoutItemCacheSettingRestorer &operator=( const LayoutItemCacheSettingRestorer &other ) = delete;`
	`220`	`+`
`209`	`221`	`private:`
`210`	`222`	`QgsLayout *mLayout = nullptr;`
`211`	`223`	`QHash< QGraphicsItem *, QGraphicsItem::CacheMode > mPrevCacheMode;`
`@@ -296,6 +308,9 @@ class LayoutContextSettingsRestorer`
`296`	`308`	`mLayout->renderContext().setCurrentExportLayer( mPreviousExportLayer );`
`297`	`309`	`}`
`298`	`310`
	`311`	`+ LayoutContextSettingsRestorer( const LayoutContextSettingsRestorer &other ) = delete;`
	`312`	`+ LayoutContextSettingsRestorer &operator=( const LayoutContextSettingsRestorer &other ) = delete;`
	`313`	`+`
`299`	`314`	`private:`
`300`	`315`	`QgsLayout *mLayout = nullptr;`
`301`	`316`	`double mPreviousDpi = 0;`
`@@ -1118,7 +1133,7 @@ void QgsLayoutExporter::updatePrinterPageSize( QgsLayout *layout, QPrinter &prin`
`1118`	`1133`	`printer.setPageMargins( QMarginsF( 0, 0, 0, 0 ) );`
`1119`	`1134`	`}`
`1120`	`1135`
`1121`		`-QgsLayoutExporter::ExportResult QgsLayoutExporter::renderToLayeredSvg( const SvgExportSettings &settings, double width, double height, int page, QRectF bounds, const QString &filename, int svgLayerId, const QString &layerName, QDomDocument &svg, QDomNode &svgDocRoot, bool includeMetadata ) const`
	`1136`	`+QgsLayoutExporter::ExportResult QgsLayoutExporter::renderToLayeredSvg( const SvgExportSettings &settings, double width, double height, int page, const QRectF &bounds, const QString &filename, int svgLayerId, const QString &layerName, QDomDocument &svg, QDomNode &svgDocRoot, bool includeMetadata ) const`
`1122`	`1137`	`{`
`1123`	`1138`	`QBuffer svgBuffer;`
`1124`	`1139`	`{`
`@@ -1572,13 +1587,13 @@ bool QgsLayoutExporter::saveImage( const QImage &image, const QString &imageFile`
`1572`	`1587`	`}`
`1573`	`1588`	`if ( projectForMetadata )`
`1574`	`1589`	`{`
`1575`		`- w.setText( "Author", projectForMetadata->metadata().author() );`
	`1590`	`+ w.setText( QStringLiteral( "Author" ), projectForMetadata->metadata().author() );`
`1576`	`1591`	`const QString creator = QStringLiteral( "QGIS %1" ).arg( Qgis::QGIS_VERSION );`
`1577`		`- w.setText( "Creator", creator );`
`1578`		`- w.setText( "Producer", creator );`
`1579`		`- w.setText( "Subject", projectForMetadata->metadata().abstract() );`
`1580`		`- w.setText( "Created", projectForMetadata->metadata().creationDateTime().toString( Qt::ISODate ) );`
`1581`		`- w.setText( "Title", projectForMetadata->metadata().title() );`
	`1592`	`+ w.setText( QStringLiteral( "Creator" ), creator );`
	`1593`	`+ w.setText( QStringLiteral( "Producer" ), creator );`
	`1594`	`+ w.setText( QStringLiteral( "Subject" ), projectForMetadata->metadata().abstract() );`
	`1595`	`+ w.setText( QStringLiteral( "Created" ), projectForMetadata->metadata().creationDateTime().toString( Qt::ISODate ) );`
	`1596`	`+ w.setText( QStringLiteral( "Title" ), projectForMetadata->metadata().title() );`
`1582`	`1597`
`1583`	`1598`	`const QgsAbstractMetadataBase::KeywordMap keywords = projectForMetadata->metadata().keywords();`
`1584`	`1599`	`QStringList allKeywords;`
`@@ -1587,7 +1602,7 @@ bool QgsLayoutExporter::saveImage( const QImage &image, const QString &imageFile`
`1587`	`1602`	`allKeywords.append( QStringLiteral( "%1: %2" ).arg( it.key(), it.value().join( ',' ) ) );`
`1588`	`1603`	`}`
`1589`	`1604`	`const QString keywordString = allKeywords.join( ';' );`
`1590`		`- w.setText( "Keywords", keywordString );`
	`1605`	`+ w.setText( QStringLiteral( "Keywords" ), keywordString );`
`1591`	`1606`	`}`
`1592`	`1607`	`return w.write( image );`
`1593`	`1608`	`}`