Changeset 8897 in ntrip

Timestamp:

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

Author:

stuerze

Message:

adaptation to qt5

Location:

trunk/BNC/src

Files:

• app.cpp (modified) (2 diffs)
• app.h (modified) (2 diffs)
• bncmain.cpp (modified) (5 diffs)

trunk/BNC/src/app.cpp

@@ -11 +11 @@
  * Created:    05-Jan-2013
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
 
-#include <QFileOpenEvent>
-
-#include "app.h" 
+#include "app.h"
 #include "bnccore.h"
 
 using namespace std;
 
+QCoreApplication* createApplication(int& argc, char* argv[], bool GUIenabled) {
+
+  if (GUIenabled) {
+    return new t_app(argc, argv);
+  }
+
+  qDebug() << "bin hier";
+  return new QCoreApplication(argc, argv);
+}
+
+
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_app::t_app(int& argc, char* argv[], bool GUIenabled) : QApplication(argc, argv, GUIenabled) {
+t_app::t_app(int& argc, char* argv[]) : QApplication(argc, argv) {
+  setWindowIcon(QPixmap(":ntrip-logo.png"));
 }
 
@@ -41 +51 @@
     return true;
   }
-    
+
   return QApplication::event(ev);
 }
 
+

trunk/BNC/src/app.h

@@ -3 +3 @@
 
 #include <QApplication>
-#include <QEvent>
+#include <QFileOpenEvent>
+#include <QtGui>
+
+
+QCoreApplication* createApplication(int& argc, char* argv[], bool GUIenabled);
 
 class t_app : public QApplication {
  Q_OBJECT
  public:
-  t_app(int& argc, char* argv[], bool GUIenabled);
+  t_app(int& argc, char* argv[]);
   virtual ~t_app();
  protected:
@@ -15 +19 @@
 };
 
+
 #endif
-

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;
 }