X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2FMainwindow.cxx;fp=src%2Fgui%2FMainwindow.cxx;h=859311032c79c45a49e1721d97ab32b1c67e61a6;hp=f28f1e25a23161630c985e52319ab13d74582660;hb=9b99fc5856d5fe88bb1d2aad4d2ee7cd86b5be57;hpb=3d7b4d3a5f6c17823bb79490256661ddb5e7ab83 diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx index f28f1e2..8593110 100644 --- a/src/gui/Mainwindow.cxx +++ b/src/gui/Mainwindow.cxx @@ -43,15 +43,11 @@ Mainwindow::Mainwindow(InformationManager* mgr) QMenu* interpretermenu = menuBar()->addMenu(tr("&Interpreter")); - QPluginLoader* loader = new QPluginLoader("libguilePlugin", this); - if (!loader->load()) - LOG4CXX_ERROR(logger, "Loading plugin failed: " << loader->errorString().toStdString()); - interpreter["GUILE"] = qobject_cast(loader->instance()); fdock = new FridaDock(tr("Frida Dock"), this); fdock->addTab(new LogDock(fdock), "Log"); - fdock->addTab(new ScriptingDock(interpreter["GUILE"], fdock), "guile"); + fdock->addTab(new ScriptingDock(manager->getInterpreter("GUILE"), fdock), "guile"); fdock->setAllowedAreas(Qt::BottomDockWidgetArea); addDockWidget(Qt::BottomDockWidgetArea, fdock); QAction* guileLoad = new QAction(tr("&GUILE"), this); @@ -60,10 +56,10 @@ Mainwindow::Mainwindow(InformationManager* mgr) [&]() { QString fileName = QFileDialog::getOpenFileName(this, tr("Open Script"), "", tr("Binaries") + " (*." + - interpreter["GUILE"]->fileExtension().c_str() + ")"); + manager->getInterpreter("GUILE")->fileExtension().c_str() + ")"); std::stringstream a, b; std::string c; - interpreter["GUILE"]->loadFile(fileName.toStdString(), a, b, c); + manager->getInterpreter("GUILE")->loadFile(fileName.toStdString(), a, b, c); }); listWidget = new QTreeWidget();