From b956886e819c8c6929c327e92d9d5e09174da0cb Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Wed, 20 Jan 2016 17:00:11 +0100
Subject: [PATCH] [processing] Initialize icons before first usage

---
 .../plugins/processing/algs/qgis/QGISAlgorithmProvider.py   | 4 ++--
 python/plugins/processing/core/GeoAlgorithm.py              | 6 +++---
 python/plugins/processing/gui/PostgisTableSelector.py       | 6 +++---
 python/plugins/processing/modeler/ModelerGraphicItem.py     | 6 +++---
 python/plugins/processing/script/ScriptAlgorithm.py         | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py b/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
index d1fbdd1135e..7f77489bdcc 100644
--- a/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
+++ b/python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py
@@ -141,10 +141,10 @@ pluginPath = os.path.normpath(os.path.join(
 
 class QGISAlgorithmProvider(AlgorithmProvider):
 
-    _icon = QIcon(os.path.join(pluginPath, 'images', 'qgis.png'))
-
     def __init__(self):
         AlgorithmProvider.__init__(self)
+        self._icon = QIcon(os.path.join(pluginPath, 'images', 'qgis.png'))
+
         self.alglist = [SumLines(), PointsInPolygon(),
                         PointsInPolygonWeighted(), PointsInPolygonUnique(),
                         BasicStatisticsStrings(), BasicStatisticsNumbers(),
diff --git a/python/plugins/processing/core/GeoAlgorithm.py b/python/plugins/processing/core/GeoAlgorithm.py
index c6c52e951fc..091185929fe 100644
--- a/python/plugins/processing/core/GeoAlgorithm.py
+++ b/python/plugins/processing/core/GeoAlgorithm.py
@@ -48,9 +48,8 @@ from processing.algs.help import shortHelp
 
 class GeoAlgorithm:
 
-    _icon = QIcon(os.path.dirname(__file__) + '/../images/alg.png')
-
     def __init__(self):
+        self._icon = QIcon(os.path.dirname(__file__) + '/../images/alg.png')
         # Parameters needed by the algorithm
         self.parameters = list()
 
@@ -219,7 +218,8 @@ class GeoAlgorithm:
 
     def _checkParameterValuesBeforeExecuting(self):
         for param in self.parameters:
-            if isinstance(param, (ParameterRaster, ParameterVector, ParameterMultipleInput)):
+            if isinstance(param, (ParameterRaster, ParameterVector,
+                                  ParameterMultipleInput)):
                 if param.value:
                     if isinstance(param, ParameterMultipleInput):
                         inputlayers = param.value.split(';')
diff --git a/python/plugins/processing/gui/PostgisTableSelector.py b/python/plugins/processing/gui/PostgisTableSelector.py
index 2403fbf0acd..b32ae207e53 100644
--- a/python/plugins/processing/gui/PostgisTableSelector.py
+++ b/python/plugins/processing/gui/PostgisTableSelector.py
@@ -85,10 +85,10 @@ class PostgisTableSelector(BASE, WIDGET):
 
 class ConnectionItem(QtGui.QTreeWidgetItem):
 
-    connIcon = QtGui.QIcon(os.path.dirname(__file__) + '/../images/postgis.png')
-    schemaIcon = QtGui.QIcon(os.path.dirname(__file__) + '/../images/namespace.png')
-
     def __init__(self, connection):
+        self.connIcon = QtGui.QIcon(os.path.dirname(__file__) + '/../images/postgis.png')
+        self.schemaIcon = QtGui.QIcon(os.path.dirname(__file__) + '/../images/namespace.png')
+
         QtGui.QTreeWidgetItem.__init__(self)
         self.setChildIndicatorPolicy(QtGui.QTreeWidgetItem.ShowIndicator)
         self.connection = connection
diff --git a/python/plugins/processing/modeler/ModelerGraphicItem.py b/python/plugins/processing/modeler/ModelerGraphicItem.py
index 71b72deaf73..7c006cc8951 100644
--- a/python/plugins/processing/modeler/ModelerGraphicItem.py
+++ b/python/plugins/processing/modeler/ModelerGraphicItem.py
@@ -383,10 +383,10 @@ class FoldButtonGraphicItem(FlatButtonGraphicItem):
     WIDTH = 11
     HEIGHT = 11
 
-    icons = {True: QIcon(os.path.join(pluginPath, 'images', 'plus.png')),
-             False: QIcon(os.path.join(pluginPath, 'images', 'minus.png'))}
-
     def __init__(self, position, action, folded):
+        self.icons = {True: QIcon(os.path.join(pluginPath, 'images', 'plus.png')),
+                      False: QIcon(os.path.join(pluginPath, 'images', 'minus.png'))}
+
         self.folded = folded
         icon = self.icons[self.folded]
         super(FoldButtonGraphicItem, self).__init__(icon, position, action)
diff --git a/python/plugins/processing/script/ScriptAlgorithm.py b/python/plugins/processing/script/ScriptAlgorithm.py
index fda7ab6e0a2..834f4a5110c 100644
--- a/python/plugins/processing/script/ScriptAlgorithm.py
+++ b/python/plugins/processing/script/ScriptAlgorithm.py
@@ -58,8 +58,6 @@ pluginPath = os.path.split(os.path.dirname(__file__))[0]
 
 class ScriptAlgorithm(GeoAlgorithm):
 
-    _icon = QtGui.QIcon(os.path.join(pluginPath, 'images', 'script.png'))
-
     def __init__(self, descriptionFile, script=None):
         """The script parameter can be used to directly pass the code
         of the script without a file.
@@ -69,6 +67,8 @@ class ScriptAlgorithm(GeoAlgorithm):
         """
 
         GeoAlgorithm.__init__(self)
+        self._icon = QtGui.QIcon(os.path.join(pluginPath, 'images', 'script.png'))
+
         self.script = script
         self.allowEdit = True
         self.noCRSWarning = False