StelModuleMgr.cpp   StelModuleMgr.cpp 
skipping to change at line 23 skipping to change at line 23
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#include <QDebug> #include <QDebug>
#include <QPluginLoader> #include <QPluginLoader>
#include <QSettings> #include <QSettings>
#include <QDir>
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelModule.hpp" #include "StelModule.hpp"
#include "StelFileMgr.hpp" #include "StelFileMgr.hpp"
#include "StelPluginInterface.hpp" #include "StelPluginInterface.hpp"
#include "StelIniParser.hpp" #include "StelIniParser.hpp"
StelModuleMgr::StelModuleMgr() : callingListsToRegenerate(true), pluginDesc riptorListLoaded(false) StelModuleMgr::StelModuleMgr() : callingListsToRegenerate(true), pluginDesc riptorListLoaded(false)
{ {
skipping to change at line 244 skipping to change at line 245
moduleFullPath = StelFileMgr::findFile(moduleFullPat h, StelFileMgr::File); moduleFullPath = StelFileMgr::findFile(moduleFullPat h, StelFileMgr::File);
} }
catch (std::runtime_error& e) catch (std::runtime_error& e)
{ {
continue; continue;
} }
QPluginLoader loader(moduleFullPath); QPluginLoader loader(moduleFullPath);
if (!loader.load()) if (!loader.load())
{ {
qWarning() << "Couldn't load the dynamic library: " << moduleFullPath << ": " << loader.errorString(); qWarning() << "Couldn't load the dynamic library: " << QDir::toNativeSeparators(moduleFullPath) << ": " << loader.errorString() ;
qWarning() << "Plugin " << dir << " will not be load ed."; qWarning() << "Plugin " << dir << " will not be load ed.";
continue; continue;
} }
QObject* obj = loader.instance(); QObject* obj = loader.instance();
if (!obj) if (!obj)
{ {
qWarning() << "Couldn't open the dynamic library: " << moduleFullPath << ": " << loader.errorString(); qWarning() << "Couldn't open the dynamic library: " << QDir::toNativeSeparators(moduleFullPath) << ": " << loader.errorString() ;
qWarning() << "Plugin " << dir << " will not be open ."; qWarning() << "Plugin " << dir << " will not be open .";
continue; continue;
} }
StelPluginInterface* pluginInterface = qobject_cast<StelPlug inInterface *>(obj); StelPluginInterface* pluginInterface = qobject_cast<StelPlug inInterface *>(obj);
if (pluginInterface) if (pluginInterface)
{ {
StelModuleMgr::PluginDescriptor mDesc; StelModuleMgr::PluginDescriptor mDesc;
mDesc.info = pluginInterface->getPluginInfo(); mDesc.info = pluginInterface->getPluginInfo();
mDesc.pluginInterface = pluginInterface; mDesc.pluginInterface = pluginInterface;
 End of changes. 3 change blocks. 
2 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/