Changeset 9959 in ntrip

Timestamp:

Jan 26, 2023, 11:51:50 AM (2 years ago)

Author:

stuerze

Message:

minor changes to be msvc compatible

Location:

trunk/BNC/src

Files:

• bncfigureppp.cpp (modified) (10 diffs)
• bncnetqueryudp.cpp (modified) (7 diffs)
• bncwindow.cpp (modified) (1 diff)
• pppWidgets.cpp (modified) (1 diff)

trunk/BNC/src/bncfigureppp.cpp

@@ -29 +29 @@
  * Class:      bncFigurePPP
  *
- * Purpose:    
+ * Purpose:
  *
  * Author:     Mervart
@@ -35 +35 @@
  * Created:    11-Nov-2009
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -60 +60 @@
 // Destructor
 ////////////////////////////////////////////////////////////////////////////
-bncFigurePPP::~bncFigurePPP() { 
+bncFigurePPP::~bncFigurePPP() {
   for (int ii = 0; ii < _pos.size(); ++ii) {
     delete _pos[ii];
@@ -66 +66 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncFigurePPP::reset() {
@@ -77 +77 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncFigurePPP::slotNewPosition(QByteArray staID, bncTime time, QVector<double> xx){
@@ -85 +85 @@
   bncSettings settings;
 
-  if (settings.value("PPP/audioResponse").toString() != "" ) { 
+  if (settings.value("PPP/audioResponse").toString() != "" ) {
     _audioResponseThreshold = settings.value("PPP/audioResponse").toDouble();
   }
@@ -136 +136 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncFigurePPP::paintEvent(QPaintEvent *) {
@@ -157 +157 @@
     // --------------------------------------------------------
     _neuMax = 0.0;
-    double neu[_pos.size()][3];
+    vector< vector<double> > neu(_pos.size(), vector<double>(3));
     for (int ii = 0; ii < _pos.size(); ++ii) {
       for (int ic = 0; ic < 3; ++ic) {
@@ -172 +172 @@
         _neuMax = 0.151;
       }
-      
+
       unsigned hour, minute;
       double   second;
@@ -223 +223 @@
           if ( xFirstCharTic > pltPoint(_tMin, 0.0).x()) {
             painter.setPen(QColor(Qt::black));
-            painter.drawText(int(xFirstCharTic), int(pntTic.y() + ww * 1.7), 
+            painter.drawText(int(xFirstCharTic), int(pntTic.y() + ww * 1.7),
                              strTic);
-            painter.drawLine(pntTic.x(), pntTic.y(), 
+            painter.drawLine(pntTic.x(), pntTic.y(),
                              pntTic.x(), pntTic.y()+ww/2);
           }

trunk/BNC/src/bncnetqueryudp.cpp

@@ -11 +11 @@
  * Created:    04-Feb-2009
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -50 +50 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryUdp::stop() {
@@ -57 +57 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryUdp::slotKeepAlive() {
@@ -66 +66 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryUdp::waitForRequestResult(const QUrl&, QByteArray&) {
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncNetQueryUdp::waitForReadyRead(QByteArray& outData) {
@@ -129 +129 @@
     QString passW = QUrl::fromPercentEncoding(_url.password().toLatin1());
     QByteArray userAndPwd;
-    
+
     if(!uName.isEmpty() || !passW.isEmpty()) {
       userAndPwd = "Authorization: Basic " + (uName.toLatin1() + ":" +
       passW.toLatin1()).toBase64() + "\r\n";
     }
-    
+
     QByteArray reqStr = "GET " + _url.path().toLatin1() + " HTTP/1.1\r\n"
                       + "Host: " + _url.host().toLatin1() + "\r\n"
@@ -143 +143 @@
     }
     reqStr += userAndPwd + "Connection: close\r\n\r\n";
-    
-    char rtpbuffer[12 + reqStr.size()];
+
+    std::vector <char> rtpbuffer(12 + reqStr.size());
     rtpbuffer[0]  = 128;
     rtpbuffer[1]  =  97;
@@ -151 +151 @@
     }
     for (int ii = 0; ii < reqStr.size(); ii++) {
-      rtpbuffer[12+ii] = reqStr[ii]; 
+      rtpbuffer[12+ii] = reqStr[ii];
     }
 

trunk/BNC/src/bncwindow.cpp

@@ -1835 +1835 @@
 
   int nRows = _mountPointsTable->rowCount();
-  bool flg[nRows];
+  std::vector <bool> flg(nRows);
   for (int iRow = 0; iRow < nRows; iRow++) {
     if (_mountPointsTable->item(iRow,1)->isSelected()) {

trunk/BNC/src/pppWidgets.cpp

@@ -612 +612 @@
 void t_pppWidgets::slotDelStation() {
   int nRows = _staTable->rowCount();
-  bool flg[nRows];
+  std::vector <bool> flg(nRows);
   for (int iRow = 0; iRow < nRows; iRow++) {
-    if (_staTable->isItemSelected(_staTable->item(iRow,1))) {
+    if (_staTable->item(iRow,1)->isSelected()) {
       flg[iRow] = true;
     }