Changeset 8897 in ntrip for trunk/BNC/src/bncmain.cpp

Timestamp:

Mar 13, 2020, 9:52:09 AM (4 years ago)

Author:

stuerze

Message:

adaptation to qt5

File:

• trunk/BNC/src/bncmain.cpp (modified) (5 diffs)

trunk/BNC/src/bncmain.cpp

@@ -367 +367 @@
 
   bool GUIenabled = interactive || displaySet;
-  t_app app(argc, argv, GUIenabled);
-
-  app.setApplicationName("BNC");
-  app.setOrganizationName("BKG");
-  app.setOrganizationDomain("www.bkg.bund.de");
-
-  BNC_CORE->setGUIenabled(GUIenabled);
+  QScopedPointer<QCoreApplication> app(createApplication(argc, argv, GUIenabled));
+
+  if (qobject_cast<QApplication *>(app.data())) { // start GUI version
+    app->setApplicationName("BNC");
+    app->setOrganizationName("BKG");
+    app->setOrganizationDomain("www.bkg.bund.de");
+
+    BNC_CORE->setGUIenabled(GUIenabled);
+  }
+  else { // start non-gui Version
+
+  }
+
   BNC_CORE->setConfFileName( confFileName );
 
@@ -418 +424 @@
     }
 
-    app.setWindowIcon(QPixmap(":ntrip-logo.png"));
-
     bncWin = new bncWindow();
     BNC_CORE->setMainWindow(bncWin);
@@ -475 +479 @@
     BNC_CORE->initCombination();
 
-    BNC_CORE->connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
-
+    //BNC_CORE->connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
+    BNC_CORE->connect(caster, SIGNAL(getThreadsFinished()), app->instance(), SLOT(quit()));
     BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " (" BNC_OS ") ==========", true);
 
@@ -506 +510 @@
   // Start the application
   // ---------------------
-  app.exec();
+  app->exec();
   if (interactive) {
     delete bncWin;
@@ -523 +527 @@
     delete rawFile;
   }
+
   return 0;
 }