Browse Source

fix(framework): singleton message shouldn't be displayed and loading plugin error shoud be displayed.

master
Ulrich Van Den Hekke 6 years ago
parent
commit
aed92372d0
  1. 16
      framework/core/xinxsingleton.h
  2. 2
      framework/plugins/xinxpluginsloader.cpp

16
framework/core/xinxsingleton.h

@ -44,15 +44,15 @@ public:
{
if (_self == NULL)
{
std::cout << "Lock singleton of type " << typeid(T).name() << std::endl;
qDebug() << "Lock singleton of type " << typeid(T).name();
QMutexLocker locker(&_self_mutex);
if (_self == NULL)
{
std::cout << "Pre-create singleton of type " << typeid(T).name() << std::endl;
qDebug() << "Pre-create singleton of type " << typeid(T).name();
_self = new T;
std::cout << "Post-create singleton of type " << typeid(T).name() << std::endl;
qDebug() << "Post-create singleton of type " << typeid(T).name();
_self->initialisation();
std::cout << "Post-init singleton of type " << typeid(T).name() << std::endl;
qDebug() << "Post-init singleton of type " << typeid(T).name();
}
}
@ -95,15 +95,15 @@ public:
{
if (_self == NULL)
{
std::cout << "Lock singleton of type " << typeid(T).name() << std::endl;
qDebug() << "Lock singleton of type " << typeid(T).name();
QMutexLocker locker(&_self_mutex);
if (_self == NULL)
{
std::cout << "Pre-create singleton of type " << typeid(T).name() << std::endl;
qDebug() << "Pre-create singleton of type " << typeid(T).name();
_self = new T;
std::cout << "Post-create singleton of type " << typeid(T).name() << std::endl;
qDebug() << "Post-create singleton of type " << typeid(T).name();
_self->initialisation();
std::cout << "Post-init singleton of type " << typeid(T).name() << std::endl;
qDebug() << "Post-init singleton of type " << typeid(T).name();
}
}

2
framework/plugins/xinxpluginsloader.cpp

@ -418,7 +418,7 @@ void XinxPluginsLoader::loadPlugins()
if (plugin)
addPlugin(plugin);
else
qDebug() << loader.errorString();
qCritical() << loader.errorString();
}
}

Loading…
Cancel
Save