Index: trunk/BNS/bns.cpp
===================================================================
--- trunk/BNS/bns.cpp	(revision 3044)
+++ trunk/BNS/bns.cpp	(revision 3045)
@@ -340,5 +340,5 @@
   in >> hlp >> _year >> _month >> _day >> _hour >> _min >> _sec;
 
-  GPSweekFromYMDhms(_year, _month, _day, _hour, _min, _sec, _GPSweek, _GPSweeks);
+  BNS::GPSweekFromYMDhms(_year, _month, _day, _hour, _min, _sec, _GPSweek, _GPSweeks);
 
   if (_echoStream) {
@@ -625,9 +625,9 @@
     
     if (ii == 1) {
-      XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw);
+      BNS::XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw);
       dClk = (xx(4) + xx(5) - xB(4)) * 299792458.0;
     }
     else {
-      XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw2);
+      BNS::XYZ_to_RSW(xB.Rows(1,3), vv, dx, rsw2);
     }
   }
Index: trunk/BNS/bnseph.cpp
===================================================================
--- trunk/BNS/bnseph.cpp	(revision 3044)
+++ trunk/BNS/bnseph.cpp	(revision 3045)
@@ -27,4 +27,5 @@
 
 using namespace std;
+using namespace BNS;
 
 // Constructor
Index: trunk/BNS/bnseph.h
===================================================================
--- trunk/BNS/bnseph.h	(revision 3044)
+++ trunk/BNS/bnseph.h	(revision 3045)
@@ -24,5 +24,5 @@
   virtual void position(int GPSweek, double GPSweeks, ColumnVector& xc,
                         ColumnVector& vv) const = 0;
-  virtual t_irc read(const QStringList& lines) = 0;
+  virtual BNS::t_irc read(const QStringList& lines) = 0;
   virtual int  IOD() const = 0;
   virtual int  RTCM3(unsigned char *) = 0;
@@ -42,5 +42,5 @@
   };
   virtual ~t_ephGlo() {};
-  virtual t_irc  read(const QStringList& lines);
+  virtual BNS::t_irc  read(const QStringList& lines);
   virtual void position(int GPSweek, double GPSweeks, ColumnVector& xc,
                         ColumnVector& vv) const;
@@ -76,5 +76,5 @@
   t_ephGPS() {};
   virtual ~t_ephGPS() {};
-  virtual t_irc  read(const QStringList& lines);
+  virtual BNS::t_irc  read(const QStringList& lines);
   virtual void position(int GPSweek, double GPSweeks, ColumnVector& xc,
                         ColumnVector& vv) const;
Index: trunk/BNS/bnsoutf.cpp
===================================================================
--- trunk/BNS/bnsoutf.cpp	(revision 3044)
+++ trunk/BNS/bnsoutf.cpp	(revision 3045)
@@ -22,4 +22,5 @@
 
 using namespace std;
+using namespace BNS;
 
 // Constructor
Index: trunk/BNS/bnsoutf.h
===================================================================
--- trunk/BNS/bnsoutf.h	(revision 3044)
+++ trunk/BNS/bnsoutf.h	(revision 3045)
@@ -14,6 +14,6 @@
   virtual ~bnsoutf();
 
-  virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
-                      const ColumnVector& xx, bool append);
+  virtual BNS::t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
+                           const ColumnVector& xx, bool append);
 
  protected:
Index: trunk/BNS/bnsrinex.cpp
===================================================================
--- trunk/BNS/bnsrinex.cpp	(revision 3044)
+++ trunk/BNS/bnsrinex.cpp	(revision 3045)
@@ -23,4 +23,5 @@
 
 using namespace std;
+using namespace BNS;
 
 // Constructor
Index: trunk/BNS/bnsrinex.h
===================================================================
--- trunk/BNS/bnsrinex.h	(revision 3044)
+++ trunk/BNS/bnsrinex.h	(revision 3045)
@@ -13,6 +13,6 @@
            const QString& intr, int sampl);
   virtual ~bnsRinex();
-  virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
-                      const ColumnVector& xx);
+  virtual BNS::t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
+                           const ColumnVector& xx);
 
  private:
Index: trunk/BNS/bnssp3.cpp
===================================================================
--- trunk/BNS/bnssp3.cpp	(revision 3044)
+++ trunk/BNS/bnssp3.cpp	(revision 3045)
@@ -23,4 +23,5 @@
 
 using namespace std;
+using namespace BNS;
 
 // Constructor
Index: trunk/BNS/bnssp3.h
===================================================================
--- trunk/BNS/bnssp3.h	(revision 3044)
+++ trunk/BNS/bnssp3.h	(revision 3045)
@@ -13,6 +13,6 @@
          const QString& intr, int sampl);
   virtual ~bnsSP3();
-  virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
-                      const ColumnVector& xx, bool append);
+  virtual BNS::t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
+                           const ColumnVector& xx, bool append);
 
  private:
Index: trunk/BNS/bnsutils.cpp
===================================================================
--- trunk/BNS/bnsutils.cpp	(revision 3044)
+++ trunk/BNS/bnsutils.cpp	(revision 3045)
@@ -25,4 +25,6 @@
 
 using namespace std;
+
+namespace BNS {
 
 // 
@@ -209,2 +211,3 @@
 }
 
+} // namespace BNS
Index: trunk/BNS/bnsutils.h
===================================================================
--- trunk/BNS/bnsutils.h	(revision 3044)
+++ trunk/BNS/bnsutils.h	(revision 3045)
@@ -11,28 +11,29 @@
 class gpsEph;
 
-enum t_irc {failure = -1, success}; // return code
-
-void expandEnvVar(QString& str);
-
-QDateTime dateAndTimeFromGPSweek(int GPSWeek, double GPSWeeks);
-
-void GPSweekFromDateAndTime(const QDateTime& dateTime, 
-                            int& GPSWeek, double& GPSWeeks);
-
-void GPSweekFromYMDhms(int year, int month, int day, int hour, int min,
-                       double sec, int& GPSWeek, double& GPSWeeks);
-
-void mjdFromDateAndTime(const QDateTime& dateTime, int& mjd, double& dayfrac);
-
-void currentGPSWeeks(int& week, double& sec);
-
-void XYZ_to_RSW(const ColumnVector& rr, const ColumnVector& vv,
-                const ColumnVector& xyz, ColumnVector& rsw);
-
-ColumnVector rungeKutta4(double xi, const ColumnVector& yi, double dx,
-                         double* acc,
-	   ColumnVector (*der)(double x, const ColumnVector& y, double* acc));
-
-QByteArray waitForLine(QTcpSocket* socket);
-
+namespace BNS {
+  enum t_irc {failure = -1, success}; // return code
+  
+  void expandEnvVar(QString& str);
+  
+  QDateTime dateAndTimeFromGPSweek(int GPSWeek, double GPSWeeks);
+  
+  void GPSweekFromDateAndTime(const QDateTime& dateTime, 
+                              int& GPSWeek, double& GPSWeeks);
+  
+  void GPSweekFromYMDhms(int year, int month, int day, int hour, int min,
+                         double sec, int& GPSWeek, double& GPSWeeks);
+  
+  void mjdFromDateAndTime(const QDateTime& dateTime, int& mjd, double& dayfrac);
+  
+  void currentGPSWeeks(int& week, double& sec);
+  
+  void XYZ_to_RSW(const ColumnVector& rr, const ColumnVector& vv,
+                  const ColumnVector& xyz, ColumnVector& rsw);
+  
+  ColumnVector rungeKutta4(double xi, const ColumnVector& yi, double dx,
+                           double* acc,
+  	   ColumnVector (*der)(double x, const ColumnVector& y, double* acc));
+  
+  QByteArray waitForLine(QTcpSocket* socket);
+}
 #endif