ModuleBase_WidgetChoice is extended to use in a combo box a list of values read from...

[modules/shaper.git] / src / ModuleBase / ModuleBase_IconFactory.cpp

diff --git a/src/ModuleBase/ModuleBase_IconFactory.cpp b/src/ModuleBase/ModuleBase_IconFactory.cpp
index baa8968202d2d000f10da5e4f9834a5835793d45..a691efd3242079f656ea640db9d3df7c32e8a379 100644 (file)
--- a/src/ModuleBase/ModuleBase_IconFactory.cpp
+++ b/src/ModuleBase/ModuleBase_IconFactory.cpp
@@ -14,7 +14,8 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 //
 
 #include "ModuleBase_IconFactory.h"
@@ -61,10 +62,9 @@ QPixmap ModuleBase_IconFactory::loadPixmap(const QString& theValue)
   QPixmap aPixmap(theValue);
 
   if (aPixmap.isNull()) {
-    std::string aPluginPath = Config_XMLReader::pluginConfigFile();
-    QString aPath = QString::fromStdString(aPluginPath) + QDir::separator() + theValue;
-    if (QFile::exists(aPath))
-      aPixmap = QPixmap(aPath);
+    std::string aPath = Config_XMLReader::findConfigFile(theValue.toStdString());
+    if (!aPath.empty())
+      aPixmap = QPixmap(QString::fromStdString(aPath));
   }
   return aPixmap;
 }
@@ -74,10 +74,9 @@ QImage ModuleBase_IconFactory::loadImage(const QString& theValue)
   QImage anImage(theValue);
 
   if (anImage.isNull()) {
-    std::string aPluginPath = Config_XMLReader::pluginConfigFile();
-    QString aPath = QString::fromStdString(aPluginPath) + QDir::separator() + theValue;
-    if (QFile::exists(aPath))
-      anImage = QImage(aPath);
+    std::string aPath = Config_XMLReader::findConfigFile(theValue.toStdString());
+    if (!aPath.empty())
+      anImage = QImage(QString::fromStdString(aPath));
   }
   return anImage;
 }