avoid use of QIcon in data items in threads

blazek · blazek · commit e0ab4b2c7ccc · 2014-11-14T11:52:10.000+01:00
diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
@@ -535,7 +535,10 @@ void QgsBrowserModel::refresh( const QModelIndex& theIndex )
 QVector<QgsDataItem*> QgsBrowserModel::createChildren( QgsDataItem* item )
 {
   QgsDebugMsg( "Entered" );
+  QTime time;
+  time.start();
   QVector <QgsDataItem*> children = item->createChildren();
+  QgsDebugMsg( QString( "Children created in %1 ms" ).arg( time.elapsed() ) );
   // Children objects must be pushed to main thread.
   foreach ( QgsDataItem* child, children )
   {
diff --git a/src/providers/wcs/qgswcsdataitems.cpp b/src/providers/wcs/qgswcsdataitems.cpp
@@ -235,8 +235,6 @@ QVector<QgsDataItem*>QgsWCSRootItem::createChildren()
   {
     QgsOWSConnection connection( "WCS", connName );
     QgsDataItem * conn = new QgsWCSConnectionItem( this, connName, mPath + "/" + connName, connection.uri().encodedUri() );
-
-    conn->setIcon( QgsApplication::getThemeIcon( "mIconConnect.png" ) );
     connections.append( conn );
   }
   return connections;
diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp
@@ -29,7 +29,7 @@ QgsWFSLayerItem::QgsWFSLayerItem( QgsDataItem* parent, QString name, QgsDataSour
 {
   mUri = QgsWFSCapabilities( uri.encodedUri() ).uriGetFeature( featureType, crsString );
   mPopulated = true;
-  mIconName = "mIconWfs.svg";
+  mIconName = "mIconConnect.png";
 }
 
 QgsWFSLayerItem::~QgsWFSLayerItem()
@@ -155,7 +155,6 @@ QVector<QgsDataItem*> QgsWFSRootItem::createChildren()
     QgsOWSConnection connection( "WFS", connName );
     QString path = "wfs:/" + connName;
     QgsDataItem * conn = new QgsWFSConnectionItem( this, connName, path, connection.uri().encodedUri() );
-    conn->setIcon( QgsApplication::getThemeIcon( "mIconConnect.png" ) );
     connections.append( conn );
   }
   return connections;
diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp
@@ -32,7 +32,7 @@ QgsWMSConnectionItem::QgsWMSConnectionItem( QgsDataItem* parent, QString name, Q
     : QgsDataCollectionItem( parent, name, path )
     , mUri( uri )
 {
-  mIconName = "mIconWms.svg";
+  mIconName = "mIconConnect.png";
 }
 
 QgsWMSConnectionItem::~QgsWMSConnectionItem()
@@ -374,7 +374,6 @@ QVector<QgsDataItem*> QgsWMSRootItem::createChildren()
     QgsWMSConnection connection( connName );
     QgsDataItem * conn = new QgsWMSConnectionItem( this, connName, mPath + "/" + connName, connection.uri().encodedUri() );
 
-    conn->setIcon( QgsApplication::getThemeIcon( "mIconConnect.png" ) );
     connections.append( conn );
   }
   return connections;

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,10 @@ void QgsBrowserModel::refresh( const QModelIndex& theIndex )`
`535`	`535`	`QVector<QgsDataItem> QgsBrowserModel::createChildren( QgsDataItem item )`
`536`	`536`	`{`
`537`	`537`	`QgsDebugMsg( "Entered" );`
	`538`	`+ QTime time;`
	`539`	`+ time.start();`
`538`	`540`	`QVector <QgsDataItem*> children = item->createChildren();`
	`541`	`+ QgsDebugMsg( QString( "Children created in %1 ms" ).arg( time.elapsed() ) );`
`539`	`542`	`// Children objects must be pushed to main thread.`
`540`	`543`	`foreach ( QgsDataItem* child, children )`
`541`	`544`	`{`
Original file line number	Diff line number	Diff line change
`@@ -235,8 +235,6 @@ QVector<QgsDataItem*>QgsWCSRootItem::createChildren()`
`235`	`235`	`{`
`236`	`236`	`QgsOWSConnection connection( "WCS", connName );`
`237`	`237`	`QgsDataItem * conn = new QgsWCSConnectionItem( this, connName, mPath + "/" + connName, connection.uri().encodedUri() );`
`238`		`-`
`239`		`- conn->setIcon( QgsApplication::getThemeIcon( "mIconConnect.png" ) );`
`240`	`238`	`connections.append( conn );`
`241`	`239`	`}`
`242`	`240`	`return connections;`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ QgsWFSLayerItem::QgsWFSLayerItem( QgsDataItem* parent, QString name, QgsDataSour`
`29`	`29`	`{`
`30`	`30`	`mUri = QgsWFSCapabilities( uri.encodedUri() ).uriGetFeature( featureType, crsString );`
`31`	`31`	`mPopulated = true;`
`32`		`- mIconName = "mIconWfs.svg";`
	`32`	`+ mIconName = "mIconConnect.png";`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`QgsWFSLayerItem::~QgsWFSLayerItem()`
`@@ -155,7 +155,6 @@ QVector<QgsDataItem*> QgsWFSRootItem::createChildren()`
`155`	`155`	`QgsOWSConnection connection( "WFS", connName );`
`156`	`156`	`QString path = "wfs:/" + connName;`
`157`	`157`	`QgsDataItem * conn = new QgsWFSConnectionItem( this, connName, path, connection.uri().encodedUri() );`
`158`		`- conn->setIcon( QgsApplication::getThemeIcon( "mIconConnect.png" ) );`
`159`	`158`	`connections.append( conn );`
`160`	`159`	`}`
`161`	`160`	`return connections;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ QgsWMSConnectionItem::QgsWMSConnectionItem( QgsDataItem* parent, QString name, Q`
`32`	`32`	`: QgsDataCollectionItem( parent, name, path )`
`33`	`33`	`, mUri( uri )`
`34`	`34`	`{`
`35`		`- mIconName = "mIconWms.svg";`
	`35`	`+ mIconName = "mIconConnect.png";`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`QgsWMSConnectionItem::~QgsWMSConnectionItem()`
`@@ -374,7 +374,6 @@ QVector<QgsDataItem*> QgsWMSRootItem::createChildren()`
`374`	`374`	`QgsWMSConnection connection( connName );`
`375`	`375`	`QgsDataItem * conn = new QgsWMSConnectionItem( this, connName, mPath + "/" + connName, connection.uri().encodedUri() );`
`376`	`376`
`377`		`- conn->setIcon( QgsApplication::getThemeIcon( "mIconConnect.png" ) );`
`378`	`377`	`connections.append( conn );`
`379`	`378`	`}`
`380`	`379`	`return connections;`