Index: trunk/BNC/RTCM3/RTCM3Decoder.cpp
===================================================================
--- trunk/BNC/RTCM3/RTCM3Decoder.cpp	(revision 2702)
+++ trunk/BNC/RTCM3/RTCM3Decoder.cpp	(revision 2709)
@@ -243,6 +243,6 @@
               // ---
               if      (satID >= PRN_GPS_START     && satID <= PRN_GPS_END) {
-                obs->_o.satSys = 'G';
-                obs->_o.satNum = satID;
+                obs->satSys = 'G';
+                obs->satNum = satID;
               }
 
@@ -250,9 +250,9 @@
               // -------
               else if (satID >= PRN_GLONASS_START && satID <= PRN_GLONASS_END) {
-                obs->_o.satSys = 'R';
-                obs->_o.satNum = satID - PRN_GLONASS_START + 1;
-                if (obs->_o.satNum <= PRN_GLONASS_NUM && 
-                    parser.GLOFreq[obs->_o.satNum-1] != 0) {
-                  obs->_o.slotNum   = parser.GLOFreq[obs->_o.satNum-1] - 100;
+                obs->satSys = 'R';
+                obs->satNum = satID - PRN_GLONASS_START + 1;
+                if (obs->satNum <= PRN_GLONASS_NUM && 
+                    parser.GLOFreq[obs->satNum-1] != 0) {
+                  obs->slotNum   = parser.GLOFreq[obs->satNum-1] - 100;
                 }
                 else { 
@@ -265,6 +265,6 @@
               // -------
               else if (satID >= PRN_GALILEO_START && satID <= PRN_GALILEO_END) {
-                obs->_o.satSys = 'E';
-                obs->_o.satNum = satID - PRN_GALILEO_START + 1;
+                obs->satSys = 'E';
+                obs->satNum = satID - PRN_GALILEO_START + 1;
               }
 
@@ -272,6 +272,6 @@
               // ----
               else if (satID >= PRN_WAAS_START && satID <= PRN_WAAS_END) {
-                obs->_o.satSys = 'S';
-                obs->_o.satNum = satID - PRN_WAAS_START + 20;
+                obs->satSys = 'S';
+                obs->satNum = satID - PRN_WAAS_START + 20;
               }
 
@@ -279,6 +279,6 @@
               // -------------
               else if (satID >= PRN_GIOVE_START && satID <= PRN_GIOVE_END) {
-                obs->_o.satSys = 'E';
-                obs->_o.satNum = satID - PRN_GIOVE_START + PRN_GIOVE_OFFSET;
+                obs->satSys = 'E';
+                obs->satNum = satID - PRN_GIOVE_START + PRN_GIOVE_OFFSET;
               }
 
@@ -297,9 +297,9 @@
               }
 
-              obs->_o.GPSWeek  = gnssData.week;
-              obs->_o.GPSWeeks = gnssData.timeofweek / 1000.0;
-
-              QString prn = QString("%1%2").arg(obs->_o.satSys)
-                            .arg(obs->_o.satNum, 2, 10, QChar('0'));
+              obs->GPSWeek  = gnssData.week;
+              obs->GPSWeeks = gnssData.timeofweek / 1000.0;
+
+              QString prn = QString("%1%2").arg(obs->satSys)
+                            .arg(obs->satNum, 2, 10, QChar('0'));
 
               // Handle loss-of-lock flags
@@ -318,5 +318,5 @@
                   _slip_cnt_L1[prn] = 1;
                 }
-                obs->_o.slip_cnt_L1 = _slip_cnt_L1[prn];
+                obs->slip_cnt_L1 = _slip_cnt_L1[prn];
               }
               if (GNSSDF2_LOCKLOSSL2 & gnssData.dataflags2[iSat]) {
@@ -327,5 +327,5 @@
                   _slip_cnt_L2[prn] = 1;
                 }
-                obs->_o.slip_cnt_L2 = _slip_cnt_L2[prn];
+                obs->slip_cnt_L2 = _slip_cnt_L2[prn];
               }
               if (GNSSDF2_LOCKLOSSL5 & gnssData.dataflags2[iSat]) {
@@ -336,5 +336,5 @@
                   _slip_cnt_L5[prn] = 1;
                 }
-                obs->_o.slip_cnt_L5 = _slip_cnt_L5[prn];
+                obs->slip_cnt_L5 = _slip_cnt_L5[prn];
               }
 
@@ -357,62 +357,62 @@
 
                   if      (iEntry == GNSSENTRY_C1DATA) {
-                    obs->_o.C1  = gnssData.measdata[iSat][iEntry];
+                    obs->C1  = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_C2DATA) {
-                    obs->_o.C2  = gnssData.measdata[iSat][iEntry];
+                    obs->C2  = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_P1DATA) {
-                    obs->_o.P1  = gnssData.measdata[iSat][iEntry];
+                    obs->P1  = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_P2DATA) {
-                    obs->_o.P2  = gnssData.measdata[iSat][iEntry];
+                    obs->P2  = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_L1CDATA) {
-                    obs->_o.L1C = gnssData.measdata[iSat][iEntry];
+                    obs->L1C = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_L1PDATA) {
-                    obs->_o.L1P = gnssData.measdata[iSat][iEntry];
+                    obs->L1P = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_L2CDATA) {
-                    obs->_o.L2C = gnssData.measdata[iSat][iEntry];
+                    obs->L2C = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_L2PDATA) {
-                    obs->_o.L2P = gnssData.measdata[iSat][iEntry];
+                    obs->L2P = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_D1CDATA) {
-                    obs->_o.D1C = gnssData.measdata[iSat][iEntry];
+                    obs->D1C = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_D1PDATA) {
-                    obs->_o.D1P = gnssData.measdata[iSat][iEntry];
+                    obs->D1P = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_S1CDATA) {
-                    obs->_o.S1C = gnssData.measdata[iSat][iEntry];
+                    obs->S1C = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_S1PDATA) {
-                    obs->_o.S1P = gnssData.measdata[iSat][iEntry];
+                    obs->S1P = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_D2CDATA) {
-                    obs->_o.D2C = gnssData.measdata[iSat][iEntry];
+                    obs->D2C = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_D2PDATA) {
-                    obs->_o.D2P = gnssData.measdata[iSat][iEntry];
+                    obs->D2P = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_S2CDATA) {
-                    obs->_o.S2C = gnssData.measdata[iSat][iEntry];
+                    obs->S2C = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_S2PDATA) {
-                    obs->_o.S2P = gnssData.measdata[iSat][iEntry];
+                    obs->S2P = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_C5DATA) {
-                    obs->_o.C5  = gnssData.measdata[iSat][iEntry];
+                    obs->C5  = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_L5DATA) {
-                    obs->_o.L5  = gnssData.measdata[iSat][iEntry];
+                    obs->L5  = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_D5DATA) {
-                    obs->_o.D5  = gnssData.measdata[iSat][iEntry];
+                    obs->D5  = gnssData.measdata[iSat][iEntry];
                   }
                   else if (iEntry == GNSSENTRY_S5DATA) {
-                    obs->_o.S5  = gnssData.measdata[iSat][iEntry];
+                    obs->S5  = gnssData.measdata[iSat][iEntry];
                   }
                 }