[Kst] branches/work/kst/portto4/kst/src/libkstmath

[George Staikos]

SVN commit 670232 by staikos:

port to trunk


 M  +5 -16     pluginloader.cpp  


--- branches/work/kst/portto4/kst/src/libkstmath/pluginloader.cpp #670231:670232
@@ -66,32 +66,21 @@
     return 0L;
   }
 
-  if (plug->_lib->hasSymbol(plug->_data._name.toLatin1())) {
-    plug->_symbol = plug->_lib->symbol(plug->_data._name.toLatin1());
-  }
+  plug->_symbol = plug->_lib->resolveSymbol(plug->_data._name.toLatin1());
+  plug->_freeSymbol = plug->_lib->resolveSymbol("freeLocalData");
+  plug->_errorSymbol = plug->_lib->resolveSymbol("errorCode");
 
-  if (plug->_lib->hasSymbol("freeLocalData")) {
-    plug->_freeSymbol = plug->_lib->symbol("freeLocalData");
-  }
-
-  if (plug->_lib->hasSymbol("errorCode")) {
-    plug->_errorSymbol = plug->_lib->symbol("errorCode");
-  }
-
   if (!plug->_symbol) {
     KstDebug::self()->log(i18n("Could not find symbol '%1' in plugin %2.").arg(plug->_data._name).arg(object), KstDebug::Error);
     delete plug;
     return 0L;
   }
 
-  if (plug->_lib->hasSymbol("parameterName")) {
-    plug->_parameterName = plug->_lib->symbol("parameterName");
-  }
-
+  plug->_parameterName = plug->_lib->resolveSymbol("parameterName");
   plug->_xmlFile = xmlfile;
   plug->_soFile = object;
 
-return plug;
+  return plug;
 }