Skip to content
Snippets Groups Projects
Commit 33e30a11 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

in App/main, do without global pointers (Win error)

parent 3d804394
No related branches found
No related tags found
1 merge request!427Reduce include dependences in GUI; break cyclic dependence between View and Model
Pipeline #48427 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
App/main.cpp
+ 4
− 4
View file @ 33e30a11
...@@ -60,14 +60,14 @@ int main(int argc, char* argv[]) ...@@ -60,14 +60,14 @@ int main(int argc, char* argv[])
register1DDataLoaders(); register1DDataLoaders();
auto style = baApp->settings().styleToUse(); auto style = GSettings.settings().styleToUse();
baApp->loadStyle(style); GSettings.loadStyle(style);
QString dir = SessionData::appDataFolder(); QString dir = SessionData::appDataFolder();
if (!QDir().exists(dir)) if (!QDir().exists(dir))
QDir().mkpath(dir); QDir().mkpath(dir);
gSessionData->instrumentLibrary.load(); GSession.instrumentLibrary.load();
MainWindow win; MainWindow win;
if (options.find("geometry")) if (options.find("geometry"))
...@@ -77,7 +77,7 @@ int main(int argc, char* argv[]) ...@@ -77,7 +77,7 @@ int main(int argc, char* argv[])
ret = QApplication::exec(); ret = QApplication::exec();
gSessionData->instrumentLibrary.saveIfModified(); GSession.instrumentLibrary.saveIfModified();
#if !defined(BUILD_DEBUG) #if !defined(BUILD_DEBUG)
} catch (...) { } catch (...) {
QMessageBox box; QMessageBox box;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment