--- branches/new_design/OOPSE-3.0/src/visitors/BaseVisitor.hpp	2004/12/01 19:32:45	1817
+++ branches/new_design/OOPSE-3.0/src/visitors/BaseVisitor.hpp	2004/12/01 20:05:49	1818
@@ -2,16 +2,13 @@ using namespace std;
 #define _BASEVISITOR_H_
 #include <iostream>
 #include <string>
-using namespace std;
 
-
-class SimInfo;
-
 namespace oopse {
     
 class Atom;
 class DirectionalAtom;
 class RigidBody;
+class SimInfo;
 
 class BaseVisitor{
   public:
@@ -22,9 +19,9 @@ class BaseVisitor{
 
     virtual void update() {}
 
-    const string& getVisitorName() {return visitorName;}
-    virtual const string toString() {
-      string result;
+    const std::string& getVisitorName() {return visitorName;}
+    virtual const std::string toString() {
+      std::string result;
       char buffer[65535];
 
       sprintf(buffer,"------------------------------------------------------------------\n");
@@ -40,8 +37,10 @@ class BaseVisitor{
     }
 
   protected:
+    
     BaseVisitor() {}
-    string visitorName;
+
+    std::string visitorName;
 };
 
 }//end namespace oopse