Minor adjustments to main.cpp

remotes/origin/HEAD
markuspg 8 years ago
parent 4e090a771a
commit a506443ed7

@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2016 Markus Prasser * Copyright 2014-2018 Markus Prasser
* *
* This file is part of Labcontrol. * This file is part of Labcontrol.
* *
@ -17,20 +17,22 @@
* along with Labcontrol. If not, see <http://www.gnu.org/licenses/>. * along with Labcontrol. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <memory> #include "mainwindow.h"
#include "Lib/settings.h"
#include <QApplication> #include <QApplication>
#include "mainwindow.h" #include <memory>
#include "Lib/settings.h"
std::unique_ptr< lc::Settings > settings; std::unique_ptr<lc::Settings> settings;
int main( int argc, char *argv[] ) { int main(int argc, char *argv[])
QApplication a{ argc, argv }; {
settings.reset( new lc::Settings{ QSettings{ "Labcontrol", "Labcontrol" } } ); QApplication a{argc, argv};
settings = std::make_unique<lc::Settings>(QSettings{"Labcontrol",
"Labcontrol"});
lc::MainWindow w; lc::MainWindow w;
w.show(); w.show();
return a.exec(); return a.exec();
} }

Loading…
Cancel
Save