Changeset 8127 in ntrip for trunk/BNC/src/rinex/rnxobsfile.cpp

Timestamp:

May 10, 2017, 3:20:54 PM (7 years ago)

Author:

stoecker

Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

File:

• trunk/BNC/src/rinex/rnxobsfile.cpp (modified) (4 diffs)

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -166 +166 @@
     else if (key == "# / TYPES OF OBSERV") {
       if (_version == 0.0) {
-        _version = t_rnxObsHeader::defaultRnxObsVersion2;
+        _version = defaultRnxObsVersion2;
       }
       QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly);
@@ -190 +190 @@
     else if (key == "SYS / # / OBS TYPES") {
       if (_version == 0.0) {
-        _version = t_rnxObsHeader::defaultRnxObsVersion3;
+        _version = defaultRnxObsVersion3;
       }
       QTextStream* in = new QTextStream(value.toAscii(), QIODevice::ReadOnly);
@@ -307 +307 @@
 
   if (version <= 2) {
-    _version = t_rnxObsHeader::defaultRnxObsVersion2;
+    _version = defaultRnxObsVersion2;
   }
   else {
-    _version = t_rnxObsHeader::defaultRnxObsVersion3;
+    _version = defaultRnxObsVersion3;
   }
 
@@ -371 +371 @@
 
   if (version <= 2) {
-    _version = t_rnxObsHeader::defaultRnxObsVersion2;
+    _version = defaultRnxObsVersion2;
   }
   else {
-    _version = t_rnxObsHeader::defaultRnxObsVersion3;
+    _version = defaultRnxObsVersion3;
   }
   _interval        = header._interval;