Index: trunk/GnssCenter/monitor/const.cpp
===================================================================
--- trunk/GnssCenter/monitor/const.cpp	(revision 5446)
+++ trunk/GnssCenter/monitor/const.cpp	(revision 5447)
@@ -1,3 +1,5 @@
 #include "const.h"
+
+using namespace GnssCenter;
 
 const double t_CST::aell    = 6378137.000;
Index: trunk/GnssCenter/monitor/const.h
===================================================================
--- trunk/GnssCenter/monitor/const.h	(revision 5446)
+++ trunk/GnssCenter/monitor/const.h	(revision 5447)
@@ -1,4 +1,6 @@
 #ifndef CONST_H
 #define CONST_H
+
+namespace GnssCenter {
 
 enum t_irc {failure = -1, success, fatal}; // return code
@@ -10,4 +12,5 @@
 };
 
+} // namespace GnssCenter
 
 #endif
Index: trunk/GnssCenter/monitor/monitor.cpp
===================================================================
--- trunk/GnssCenter/monitor/monitor.cpp	(revision 5446)
+++ trunk/GnssCenter/monitor/monitor.cpp	(revision 5447)
@@ -36,5 +36,5 @@
 using namespace GnssCenter;
 
-Q_EXPORT_PLUGIN2(gnsscenter_monitor, GnssCenter::t_monitorFactory)
+Q_EXPORT_PLUGIN2(gnsscenter_monitor, t_monitorFactory)
 
 // Constructor
Index: trunk/GnssCenter/monitor/monitor.h
===================================================================
--- trunk/GnssCenter/monitor/monitor.h	(revision 5446)
+++ trunk/GnssCenter/monitor/monitor.h	(revision 5447)
@@ -7,9 +7,8 @@
 
 namespace GnssCenter {
-class t_worldPlot;
+  class t_worldPlot;
+  class t_thriftClient;
+  class t_thriftResult;
 }
-
-class t_thriftClient;
-class t_thriftResult;
 
 namespace GnssCenter {
Index: trunk/GnssCenter/monitor/thriftclient.cpp
===================================================================
--- trunk/GnssCenter/monitor/thriftclient.cpp	(revision 5446)
+++ trunk/GnssCenter/monitor/thriftclient.cpp	(revision 5447)
@@ -16,7 +16,9 @@
 using namespace boost;
 
+using namespace GnssCenter;
+
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_thriftClient::t_thriftClient(GnssCenter::t_monitor* parent) {
+t_thriftClient::t_thriftClient(t_monitor* parent) {
   _stop   = false;
   _parent = parent;
@@ -66,5 +68,5 @@
 // Constructor
 //////////////////////////////////////////////////////////////////////////////
-t_thriftHandler::t_thriftHandler(GnssCenter::t_monitor* parent) {
+t_thriftHandler::t_thriftHandler(t_monitor* parent) {
   _parent = parent;
 }
Index: trunk/GnssCenter/monitor/thriftclient.h
===================================================================
--- trunk/GnssCenter/monitor/thriftclient.h	(revision 5446)
+++ trunk/GnssCenter/monitor/thriftclient.h	(revision 5447)
@@ -18,4 +18,6 @@
   class t_monitor;
 }
+
+namespace GnssCenter {
 
 class t_thriftResult {
@@ -39,5 +41,5 @@
 class t_thriftHandler : public RtnetDataIf {
  public:
-  t_thriftHandler(GnssCenter::t_monitor* parent);
+  t_thriftHandler(t_monitor* parent);
   ~t_thriftHandler();
   void startDataStream() {}
@@ -58,5 +60,5 @@
     double _z;
   };
-  GnssCenter::t_monitor*              _parent;
+  t_monitor*              _parent;
   std::map<std::string, t_stationCrd> _stationCrd;
 };
@@ -64,5 +66,5 @@
 class t_thriftClient : public QThread {
  public:
-  t_thriftClient(GnssCenter::t_monitor* parent);
+  t_thriftClient(t_monitor* parent);
   ~t_thriftClient();
   virtual void run();
@@ -73,8 +75,10 @@
 
  private:
-  QMutex                 _mutex;
-  GnssCenter::t_monitor* _parent;
-  bool                   _stop;
+  QMutex     _mutex;
+  t_monitor* _parent;
+  bool       _stop;
 };
 
+} // namespace GnssCenter
+
 #endif
Index: trunk/GnssCenter/monitor/utils.cpp
===================================================================
--- trunk/GnssCenter/monitor/utils.cpp	(revision 5446)
+++ trunk/GnssCenter/monitor/utils.cpp	(revision 5447)
@@ -5,4 +5,5 @@
 
 using namespace std;
+using namespace GnssCenter;
 
 // Rectangular Coordinates -> Ellipsoidal Coordinates
Index: trunk/GnssCenter/monitor/utils.h
===================================================================
--- trunk/GnssCenter/monitor/utils.h	(revision 5446)
+++ trunk/GnssCenter/monitor/utils.h	(revision 5447)
@@ -3,4 +3,6 @@
 
 #include "const.h"
+
+namespace GnssCenter {
 
 t_irc xyz2ell(const double* XYZ, double* Ell);
@@ -10,3 +12,5 @@
 void neu2xyz(const double* Ell, const double* neu, double* xyz);
 
+} // namespace GnssCenter
+
 #endif
