Changeset 756 in ntrip for trunk

Timestamp:

Mar 30, 2008, 5:03:08 PM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (added)
• bns.h (added)
• bns.pro (modified) (1 diff)
• bnsmain.cpp (modified) (3 diffs)
• bnswindow.cpp (modified) (4 diffs)

trunk/BNS/bns.pro

@@ -21 +21 @@
 release:MOC_DIR=.moc/release
 
-HEADERS =             bnsapp.h   bnswindow.h   bnshlpdlg.h   bnshtml.h
+HEADERS =             bns.h   bnswindow.h   bnshlpdlg.h   bnshtml.h
 
-SOURCES = bnsmain.cpp bnsapp.cpp bnswindow.cpp bnshlpdlg.cpp bnshtml.cpp
+SOURCES = bnsmain.cpp bns.cpp bnswindow.cpp bnshlpdlg.cpp bnshtml.cpp
 
 RC_FILE = bns.rc

trunk/BNS/bnsmain.cpp

@@ -15 +15 @@
  * -----------------------------------------------------------------------*/
 
-#include <unistd.h>
-#include <signal.h>
 #include <iostream>
 
-#include "bnsapp.h"
+#include "bns.h"
 #include "bnswindow.h"
 
 using namespace std;
-
-void catch_signal(int) {
-  cout << "Program Interrupted by Ctrl-C" << endl;
-  ((bnsApp*)qApp)->slotQuit();
-}
 
 // Main Program
@@ -41 +34 @@
   }
 
-  QCoreApplication::setOrganizationName("BKG");
-  QCoreApplication::setOrganizationDomain("www.bkg.bund.de");
-  QCoreApplication::setApplicationName("BKG_NTRIP_Server");
+  QApplication app(argc, argv, GUIenabled);
 
-  // Default Settings
-  // ----------------
-  QSettings settings;
-  if (settings.allKeys().size() == 0) {
-  }
-
-  bnsApp app(argc, argv, GUIenabled);
+  app.setOrganizationName("BKG");
+  app.setOrganizationDomain("www.bkg.bund.de");
+  app.setApplicationName("BKG_NTRIP_Server");
 
   // Interactive Mode - open the main window
@@ -63 +50 @@
   // ----------------------------
   else {
-    cerr << "non-interactive mode not yet implemented" << endl;
-    exit(0);
+
   }
 
-  // Start the application
-  // ---------------------
   return app.exec();
 }

trunk/BNS/bnswindow.cpp

@@ -19 +19 @@
 
 #include "bnswindow.h" 
-#include "bnsapp.h" 
 #include "bnshlpdlg.h" 
 
@@ -271 +270 @@
 void bnsWindow::slotMessage(const QByteArray msg) {
 
-  ((bnsApp*)qApp)->slotMessage(msg);
-
   const int maxBufferSize = 10000;
  
@@ -290 +287 @@
     _actStart->setEnabled(true);
     _actStop->setEnabled(false);
-    ((bnsApp*)qApp)->stop();
   }
 }
@@ -304 +300 @@
   slotMessage("============ Start BNS ============");
 
-  ((bnsApp*)qApp)->start();
-}
+}