diff options
author | Denis Kenzior <denkenz@gmail.com> | 2017-08-21 13:31:03 -0500 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2017-08-21 13:31:03 -0500 |
commit | 90c4713c559a179ae69de26e0c327070126ea5b8 (patch) | |
tree | 945c8dfb8ccf2e06b7eec619e1e179f6e96310b8 | |
parent | 9d3be1d2b54af5779bf5fbe8473deca9a32258e1 (diff) | |
download | phonesim-90c4713c559a179ae69de26e0c327070126ea5b8.tar.gz |
main: Use QCoreApplication when -gui is not provided
QCoreApplication does not open an X connection
-rw-r--r-- | src/main.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index 665d038..684a9b7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -34,10 +34,11 @@ static void usage() int main(int argc, char **argv) { - QApplication app(argc, argv); QString filename = NULL; + QCoreApplication *app; int port = 12345; int index; + int r; bool with_gui = false; // Parse the command-line. @@ -76,14 +77,24 @@ int main(int argc, char **argv) usage(); } + if (with_gui) { + QApplication *gui = new QApplication(argc, argv); + gui->setQuitOnLastWindowClosed(false); + + app = gui; + } else + app = new QCoreApplication(argc, argv); + PhoneSimServer *pss = new PhoneSimServer(filename, port, 0); - if (with_gui) { - app.setQuitOnLastWindowClosed(false); + if (with_gui) pss->setHardwareManipulator(new ControlFactory); - } else + else pss->setHardwareManipulator(new HardwareManipulatorFactory); - return app.exec(); + r = app->exec(); + delete app; + + return r; } |