Index: branches/BNC_2.12/src/rinex/rnxobsfile.cpp
===================================================================
--- branches/BNC_2.12/src/rinex/rnxobsfile.cpp	(revision 8541)
+++ branches/BNC_2.12/src/rinex/rnxobsfile.cpp	(revision 8628)
@@ -334,16 +334,19 @@
 
     _obsTypes['J'] << "C1C" << "L1C"  << "S1C"
-                   << "C1S" << "L1S"  << "S1S"
-                   << "C1L" << "L1L"  << "S1L"
+                   << "C1Z" << "L1Z"  << "S1Z"
                    << "C1X" << "L1X"  << "S1X"
-                   << "C2S" << "L2S"  << "S2S"
                    << "C2L" << "L2L"  << "S2L"
                    << "C2X" << "L2X"  << "S2X"
-                   << "C5X" << "L5X"  << "S5X";
+                   << "C5Q" << "L5Q"  << "S5Q"
+                   << "C5X" << "L5X"  << "S5X"
+                   << "C6L" << "L6L"  << "S6L";
 
     _obsTypes['R'] << "C1C" << "L1C" << "S1C"
                    << "C1P" << "L1P" << "S1P"
                    << "C2C" << "L2C" << "S2C"
-                   << "C2P" << "L2P" << "S2P";
+                   << "C2P" << "L2P" << "S2P"
+                   << "C3I" << "L3I" << "S3I"
+                   << "C4X" << "L4X" << "S4X"
+                   << "C6X" << "L6X" << "S5X";
 
     _obsTypes['E'] << "C1X" << "L1X" << "S1X"
@@ -1317,10 +1320,10 @@
   QString dateStr;
   QTextStream(&dateStr) << QString(" %1 %2 %3 %4 %5%6")
-    .arg(int(fmod(year, 100)), 2, 10, QChar('0'))
-    .arg(month,                2, 10, QChar('0'))
-    .arg(day,                  2, 10, QChar('0'))
-    .arg(hour,                 2, 10, QChar('0'))
-    .arg(min,                  2, 10, QChar('0'))
-    .arg(sec,                 11, 'f', 7);
+    .arg(int(fmod(double(year), 100.0)), 2, 10, QChar('0'))
+    .arg(month,                          2, 10, QChar('0'))
+    .arg(day,                            2, 10, QChar('0'))
+    .arg(hour,                           2, 10, QChar('0'))
+    .arg(min,                            2, 10, QChar('0'))
+    .arg(sec,                           11, 'f', 7);
 
   int flag = 0;