diff options
author | Björn Hagemeister | 2014-04-22 16:56:37 +0200 |
---|---|---|
committer | Björn Hagemeister | 2014-04-22 16:56:37 +0200 |
commit | b8c0ce1032adface7eb20b4ecc8c1000eaaa9e65 (patch) | |
tree | 1014a33f430f7a80c7dffe2540696a454e393412 /src/server/main.cpp | |
parent | Merge branch 'master' of dnbd3:pvs2 (diff) | |
download | pvs2-b8c0ce1032adface7eb20b4ecc8c1000eaaa9e65.tar.gz pvs2-b8c0ce1032adface7eb20b4ecc8c1000eaaa9e65.tar.xz pvs2-b8c0ce1032adface7eb20b4ecc8c1000eaaa9e65.zip |
New feature: Change or set tutor manually during session + URL of IP - List
of possible tutors, can be set in command line by starting server.
Diffstat (limited to 'src/server/main.cpp')
-rw-r--r-- | src/server/main.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/server/main.cpp b/src/server/main.cpp index e7c709a..191c234 100644 --- a/src/server/main.cpp +++ b/src/server/main.cpp @@ -1,8 +1,17 @@ +#include <iostream> +#include <stdlib.h> #include "mainwindow/mainwindow.h" #include "util/util.h" int main(int argc, char** argv) { + QString ipListUrl; + if (argc != 2) + { + ipListUrl = ""; + } else { + ipListUrl = argv[1]; + } QApplication app(argc, argv); app.setOrganizationName("openslx"); app.setOrganizationDomain("openslx.org"); @@ -36,6 +45,6 @@ int main(int argc, char** argv) translator.load(":pvsmgr"); app.installTranslator(&translator); - MainWindow pvsmgr; + MainWindow pvsmgr(ipListUrl); return app.exec(); } |