summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorisanae <14251494+isanae@users.noreply.github.com>2020-07-30 00:48:46 -0400
committerisanae <14251494+isanae@users.noreply.github.com>2020-11-03 11:39:06 -0500
commitc4df6b8ec98feb34cc9b9785e6d4d0eac6b3f571 (patch)
treec874d57f52243362ab2e7114c3d409b6326729cc /src/main.cpp
parentc699aeb6d862f2c0960de126538931e4f13368b7 (diff)
split nexus connection stuff into NexusConnectionUI so it can be reused in the instance creation dialog
removed the PluginContainer* parameter from NexusInterface::instance() - it's a singleton, so it only needs to be given once, not every time - it doesn't even matter because the first time instance() is called, it creates the singleton, but the plugin container is always null - and setPluginContainer() is called much later from OrganizerCore with the correct value added non functional nexus page to instance creation dialog
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 58e22466..93580931 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -395,7 +395,7 @@ int runApplication(
QString apiKey;
if (settings.nexus().apiKey(apiKey)) {
- NexusInterface::instance(pluginContainer.get())->getAccessManager()->apiCheck(apiKey);
+ NexusInterface::instance().getAccessManager()->apiCheck(apiKey);
}
log::debug("initializing tutorials");
@@ -415,8 +415,8 @@ int runApplication(
// set up main window and its data structures
MainWindow mainWindow(settings, organizer, *pluginContainer);
- NexusInterface::instance(pluginContainer.get())
- ->getAccessManager()->setTopLevelWidget(&mainWindow);
+ NexusInterface::instance()
+ .getAccessManager()->setTopLevelWidget(&mainWindow);
QObject::connect(&mainWindow, SIGNAL(styleChanged(QString)), &application,
SLOT(setStyleFile(QString)));
@@ -443,8 +443,8 @@ int runApplication(
res = application.exec();
mainWindow.close();
- NexusInterface::instance(pluginContainer.get())
- ->getAccessManager()->setTopLevelWidget(nullptr);
+ NexusInterface::instance()
+ .getAccessManager()->setTopLevelWidget(nullptr);
}
settings.geometry().resetIfNeeded();