drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

Remove unnecesary cleanup tasks from Studio MainWindow

Browse Source
This commit is contained in:
Gary Talent 2018-02-16 00:54:01 -06:00
parent c2c87e0363
commit 4368c1ae4a
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nostalgia/studio/mainwindow.cpp
View File

@ -67,9 +67,6 @@ MainWindow::MainWindow(QString profilePath) {
MainWindow::~MainWindow() {
closeProject();
for (auto f : m_cleanupTasks) {
f();
}
}
void MainWindow::loadPlugins() {
@ -102,16 +99,12 @@ void MainWindow::loadPluginDir(QString dir) {
void MainWindow::loadPlugin(QString pluginPath) {
qDebug() << "Loading plugin:" << pluginPath;
auto loader = new QPluginLoader(pluginPath);
auto plugin = qobject_cast<Plugin*>(loader->instance());
QPluginLoader loader(pluginPath);
auto plugin = qobject_cast<Plugin*>(loader.instance());
if (plugin) {
m_cleanupTasks.push_back([loader]() {
loader->unload();
delete loader;
});
m_plugins.push_back(plugin);
} else {
qInfo() << loader->errorString();
qInfo() << loader.errorString();
}
}
@ -184,9 +177,6 @@ QAction *MainWindow::addAction(QMenu *menu, QString text, QString toolTip, const
auto action = menu->addAction(text);
action->setStatusTip(toolTip);
auto conn = connect(action, SIGNAL(triggered()), tgt, cb);
m_cleanupTasks.push_back([this, conn]() {
QObject::disconnect(conn);
});
return action;
}
@ -196,9 +186,6 @@ QAction *MainWindow::addAction(QMenu *menu, QString text, QString toolTip,
action->setShortcuts(key);
action->setStatusTip(toolTip);
auto conn = connect(action, SIGNAL(triggered()), tgt, cb);
m_cleanupTasks.push_back([this, conn]() {
QObject::disconnect(conn);
});
return action;
}
@ -208,9 +195,6 @@ QAction *MainWindow::addAction(QMenu *menu, QString text, QString toolTip,
action->setShortcuts(key);
action->setStatusTip(toolTip);
auto conn = connect(action, &QAction::triggered, cb);
m_cleanupTasks.push_back([this, conn]() {
QObject::disconnect(conn);
});
return action;
}

1
src/nostalgia/studio/mainwindow.hpp
View File

@ -89,7 +89,6 @@ class MainWindow: public QMainWindow {
QAction *m_importAction = nullptr;
Context m_ctx;
QPointer<QMenu> m_viewMenu;
QVector<std::function<void()>> m_cleanupTasks;
QVector<QPointer<QDockWidget>> m_dockWidgets;
QTreeView *m_projectExplorer = nullptr;
QVector<Plugin*> m_plugins;