Removed some TODOs

elpaso · elpaso · commit dd0cce23cd85 · 2018-01-09T08:08:26.000+01:00
diff --git a/src/core/layout/qgscompositionconverter.cpp b/src/core/layout/qgscompositionconverter.cpp
@@ -216,7 +216,7 @@ QList<QgsLayoutItem *> QgsCompositionConverter::addItemsFromCompositionXml( QgsL
   // known multi-frame types
   LayoutHtml, //!< Html multiframe item
   LayoutAttributeTable, //!< Attribute table
-  LayoutTextTable, //!< Preset text table
+  LayoutTextTable, //!< Preset text table IGNORE!
   */
 
   // Label
@@ -249,7 +249,7 @@ QList<QgsLayoutItem *> QgsCompositionConverter::addItemsFromCompositionXml( QgsL
     newItems << layoutItem ;
   }
 
-  // Polygon TODO:frames and background are ignored: is that ok?
+  // Polygon
   for ( int i = 0; i < parentElement.elementsByTagName( QStringLiteral( "ComposerPolygon" ) ).size(); i++ )
   {
     QDomNode itemNode( parentElement.elementsByTagName( QStringLiteral( "ComposerPolygon" ) ).at( i ) );
@@ -259,7 +259,7 @@ QList<QgsLayoutItem *> QgsCompositionConverter::addItemsFromCompositionXml( QgsL
     newItems << layoutItem ;
   }
 
-  // Polyline TODO:frames and background are ignored: is that ok?
+  // Polylin
   for ( int i = 0; i < parentElement.elementsByTagName( QStringLiteral( "ComposerPolyline" ) ).size(); i++ )
   {
     QDomNode itemNode( parentElement.elementsByTagName( QStringLiteral( "ComposerPolyline" ) ).at( i ) );
@@ -269,7 +269,7 @@ QList<QgsLayoutItem *> QgsCompositionConverter::addItemsFromCompositionXml( QgsL
     newItems << layoutItem ;
   }
 
-  // Arrow TODO:frames and background are ignored: is that ok?
+  // Arrow
   for ( int i = 0; i < parentElement.elementsByTagName( QStringLiteral( "ComposerArrow" ) ).size(); i++ )
   {
     QDomNode itemNode( parentElement.elementsByTagName( QStringLiteral( "ComposerArrow" ) ).at( i ) );
diff --git a/src/core/layout/qgscompositionconverter.h b/src/core/layout/qgscompositionconverter.h
@@ -4,7 +4,7 @@
  ---------------------
  begin                : 13.12.2017
  copyright            : (C) 2017 by Alessandro Pasotti
- email                : apasotti at boundlessgeo dot com
+ email                : elpaso at itopen dot it
  ***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ QList<QgsLayoutItem *> QgsCompositionConverter::addItemsFromCompositionXml( QgsL`
`216`	`216`	`// known multi-frame types`
`217`	`217`	`LayoutHtml, //!< Html multiframe item`
`218`	`218`	`LayoutAttributeTable, //!< Attribute table`
`219`		`- LayoutTextTable, //!< Preset text table`
	`219`	`+ LayoutTextTable, //!< Preset text table IGNORE!`
`220`	`220`	`*/`
`221`	`221`
`222`	`222`	`// Label`
`@@ -249,7 +249,7 @@ QList<QgsLayoutItem *> QgsCompositionConverter::addItemsFromCompositionXml( QgsL`
`249`	`249`	`newItems << layoutItem ;`
`250`	`250`	`}`
`251`	`251`
`252`		`- // Polygon TODO:frames and background are ignored: is that ok?`
	`252`	`+ // Polygon`
`253`	`253`	`for ( int i = 0; i < parentElement.elementsByTagName( QStringLiteral( "ComposerPolygon" ) ).size(); i++ )`
`254`	`254`	`{`
`255`	`255`	`QDomNode itemNode( parentElement.elementsByTagName( QStringLiteral( "ComposerPolygon" ) ).at( i ) );`
`@@ -259,7 +259,7 @@ QList<QgsLayoutItem *> QgsCompositionConverter::addItemsFromCompositionXml( QgsL`
`259`	`259`	`newItems << layoutItem ;`
`260`	`260`	`}`
`261`	`261`
`262`		`- // Polyline TODO:frames and background are ignored: is that ok?`
	`262`	`+ // Polylin`
`263`	`263`	`for ( int i = 0; i < parentElement.elementsByTagName( QStringLiteral( "ComposerPolyline" ) ).size(); i++ )`
`264`	`264`	`{`
`265`	`265`	`QDomNode itemNode( parentElement.elementsByTagName( QStringLiteral( "ComposerPolyline" ) ).at( i ) );`
`@@ -269,7 +269,7 @@ QList<QgsLayoutItem *> QgsCompositionConverter::addItemsFromCompositionXml( QgsL`
`269`	`269`	`newItems << layoutItem ;`
`270`	`270`	`}`
`271`	`271`
`272`		`- // Arrow TODO:frames and background are ignored: is that ok?`
	`272`	`+ // Arrow`
`273`	`273`	`for ( int i = 0; i < parentElement.elementsByTagName( QStringLiteral( "ComposerArrow" ) ).size(); i++ )`
`274`	`274`	`{`
`275`	`275`	`QDomNode itemNode( parentElement.elementsByTagName( QStringLiteral( "ComposerArrow" ) ).at( i ) );`