Index: trunk/BNC/src/rinex/rnxobsfile.cpp
===================================================================
--- trunk/BNC/src/rinex/rnxobsfile.cpp	(revision 4454)
+++ trunk/BNC/src/rinex/rnxobsfile.cpp	(revision 4480)
@@ -48,9 +48,9 @@
 using namespace std;
 
-const QString t_rnxObsFile::t_rnxObsHeader::_emptyStr;
+const QString t_rnxObsHeader::_emptyStr;
 
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_rnxObsFile::t_rnxObsHeader::t_rnxObsHeader() {
+t_rnxObsHeader::t_rnxObsHeader() {
   _antNEU.ReSize(3); _antNEU = 0.0;
   _antXYZ.ReSize(3); _antXYZ = 0.0;
@@ -67,10 +67,10 @@
 // Destructor
 ////////////////////////////////////////////////////////////////////////////
-t_rnxObsFile::t_rnxObsHeader::~t_rnxObsHeader() {
+t_rnxObsHeader::~t_rnxObsHeader() {
 }
 
 // Read Header
 ////////////////////////////////////////////////////////////////////////////
-t_irc t_rnxObsFile::t_rnxObsHeader::read(QTextStream* stream, int maxLines) {
+t_irc t_rnxObsHeader::read(QTextStream* stream, int maxLines) {
   int numLines = 0;
   while ( stream->status() == QTextStream::Ok && !stream->atEnd() ) {
@@ -205,5 +205,5 @@
 // Number of Observation Types (satellite-system specific)
 ////////////////////////////////////////////////////////////////////////////
-int t_rnxObsFile::t_rnxObsHeader::nTypes(char sys) const {
+int t_rnxObsHeader::nTypes(char sys) const {
   if (_version < 3.0) {
     return _obsTypesV2.size();
@@ -221,5 +221,5 @@
 // Observation Type (satellite-system specific)
 ////////////////////////////////////////////////////////////////////////////
-const QString& t_rnxObsFile::t_rnxObsHeader::obsType(char sys, int index) const {
+const QString& t_rnxObsHeader::obsType(char sys, int index) const {
   if (_version < 3.0) {
     return _obsTypesV2.at(index);
Index: trunk/BNC/src/rinex/rnxobsfile.h
===================================================================
--- trunk/BNC/src/rinex/rnxobsfile.h	(revision 4454)
+++ trunk/BNC/src/rinex/rnxobsfile.h	(revision 4480)
@@ -37,4 +37,36 @@
 
 #define MAXPRN_GPS 32
+
+class t_rnxObsHeader {
+ public:
+  t_rnxObsHeader();
+  ~t_rnxObsHeader();
+
+  t_irc           read(QTextStream* stream, int maxLines = 0);
+  int             nTypes(char sys) const;
+  const QString&  obsType(char sys, int index) const;
+
+  static const QString          _emptyStr;
+  float                         _version;
+  double                        _interval;
+  QString                       _antennaNumber;
+  QString                       _antennaName;
+  QString                       _markerName;
+  QString                       _markerNumber;
+  QString                       _observer;
+  QString                       _agency;
+  QString                       _receiverNumber;
+  QString                       _receiverType;
+  QString                       _receiverVersion;
+  ColumnVector                  _antNEU;
+  ColumnVector                  _antXYZ;
+  ColumnVector                  _antBSG;
+  ColumnVector                  _xyz;
+  QVector<QString>              _obsTypesV2;
+  QMap<char, QVector<QString> > _obsTypesV3;
+  int                           _wlFactorsL1[MAXPRN_GPS+1];
+  int                           _wlFactorsL2[MAXPRN_GPS+1];
+  bncTime                       _startTime;
+};
 
 class t_rnxObsFile {
@@ -99,44 +131,4 @@
   }
 
- protected:
-  t_rnxObsFile() {};
-  void openRead(const QString& fileName);
-  void openWrite(const QString& fileName);
-  void close();
-
- private: 
-  class t_rnxObsHeader {
-   public:
-    t_rnxObsHeader();
-    ~t_rnxObsHeader();
-
-    t_irc           read(QTextStream* stream, int maxLines = 0);
-    int             nTypes(char sys) const;
-    const QString&  obsType(char sys, int index) const;
- 
-    static const QString          _emptyStr;
-    float                         _version;
-    double                        _interval;
-    QString                       _antennaNumber;
-    QString                       _antennaName;
-    QString                       _markerName;
-    QString                       _markerNumber;
-    QString                       _observer;
-    QString                       _agency;
-    QString                       _receiverNumber;
-    QString                       _receiverType;
-    QString                       _receiverVersion;
-    ColumnVector                  _antNEU;
-    ColumnVector                  _antXYZ;
-    ColumnVector                  _antBSG;
-    ColumnVector                  _xyz;
-    QVector<QString>              _obsTypesV2;
-    QMap<char, QVector<QString> > _obsTypesV3;
-    int                           _wlFactorsL1[MAXPRN_GPS+1];
-    int                           _wlFactorsL2[MAXPRN_GPS+1];
-    bncTime                       _startTime;
-  };
-
- public:
   const t_rnxObsHeader& header() const {return _header;}
   void setHeader(const t_rnxObsHeader& header, double version);
@@ -149,4 +141,8 @@
   enum e_trafo {trafoNone, trafo2to3, trafo3to2};
 
+  t_rnxObsFile() {};
+  void openRead(const QString& fileName);
+  void openWrite(const QString& fileName);
+  void close();
   void writeEpochV2(const t_rnxEpo* epo);
   void writeEpochV3(const t_rnxEpo* epo);