Fix: a plugin may implement two interfaces

This commit is contained in:
Clement Jamin 2014-10-29 15:34:01 +01:00
parent 72513db3b0
commit ae0a88708b
2 changed files with 6 additions and 2 deletions

View File

@ -186,7 +186,9 @@ void MainWindow::loadPlugins()
loader.setFileName(pluginsDir.absoluteFilePath(fileName)); loader.setFileName(pluginsDir.absoluteFilePath(fileName));
QObject *obj = loader.instance(); QObject *obj = loader.instance();
if(obj) { if(obj) {
if (!initPlugin(obj) && !initIOPlugin(obj)) bool init1 = initPlugin(obj);
bool init2 = initIOPlugin(obj);
if (!init1 && !init2)
qdebug << "not for this program"; qdebug << "not for this program";
else else
qdebug << "success"; qdebug << "success";

View File

@ -453,7 +453,9 @@ void MainWindow::loadPlugins()
QObject *obj = loader.instance(); QObject *obj = loader.instance();
if(obj) { if(obj) {
obj->setObjectName(name); obj->setObjectName(name);
if (!initPlugin(obj) && !initIOPlugin(obj)) bool init1 = initPlugin(obj);
bool init2 = initIOPlugin(obj);
if (!init1 && !init2)
qdebug << "not for this program"; qdebug << "not for this program";
else else
qdebug << "success"; qdebug << "success";