Fix compilation on Linux

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

diff --git a/src/ModuleBase/ModuleBase_WidgetChoice.cpp b/src/ModuleBase/ModuleBase_WidgetChoice.cpp
index f8b4ff5167d9c56c51f524fbf5e51c53e2c9560b..5797e7cc8de201b0882d34a9a37610fe44bdf8cd 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetChoice.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetChoice.cpp
@@ -5,7 +5,8 @@
 // Author:      Vitaly Smetannikov
 
 #include "ModuleBase_WidgetChoice.h"
-#include <ModuleBase_Tools.h>
+#include "ModuleBase_Tools.h"
+#include "ModuleBase_IconFactory.h"
 
 #include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_Data.h>
@@ -62,7 +63,7 @@ ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent,
         aBtn->setCheckable(true);
         aBtn->setToolTip(aBtnTxt);
 
-        QPixmap aIcon(aIconList.at(aId));
+        QPixmap aIcon = ModuleBase_IconFactory::loadPixmap(aIconList.at(aId));
         aBtn->setIcon(aIcon);
         aBtn->setIconSize(aIcon.size());
         
@@ -83,7 +84,7 @@ ModuleBase_WidgetChoice::ModuleBase_WidgetChoice(QWidget* theParent,
   } else {
     myLabel = new QLabel(aLabelText, this);
     if (!aLabelIcon.isEmpty())
-      myLabel->setPixmap(QPixmap(aLabelIcon));
+      myLabel->setPixmap(ModuleBase_IconFactory::loadPixmap(aLabelIcon));
     aLayout->addWidget(myLabel);
 
     std::string aToolstr = theData->widgetTooltip();
@@ -104,7 +105,7 @@ ModuleBase_WidgetChoice::~ModuleBase_WidgetChoice()
 {
 }
   
-bool ModuleBase_WidgetChoice::storeValueCustom() const
+bool ModuleBase_WidgetChoice::storeValueCustom()
 {
   DataPtr aData = myFeature->data();
   std::shared_ptr<ModelAPI_AttributeInteger> aIntAttr = aData->integer(attributeID());