--- trunk/src/selection/NameFinder.hpp	2005/04/15 22:04:00	507
+++ trunk/src/selection/NameFinder.hpp	2005/12/02 15:38:03	770
@@ -44,14 +44,14 @@
 #include <string>
 #include <map>
 #include "brains/SimInfo.hpp"
-#include "utils/BitSet.hpp"
+#include "utils/OOPSEBitSet.hpp"
 namespace oopse {
 
   class TreeNode{
   public:
     ~TreeNode();
     std::string name;
-    BitSet bs;
+    OOPSEBitSet bs;
     std::map<std::string, TreeNode*> children;
   };
 
@@ -59,15 +59,15 @@ namespace oopse {
   public:
     NameFinder(SimInfo* info);
     ~NameFinder();
-    BitSet  match(const std::string& name);
+    OOPSEBitSet  match(const std::string& name);
 
   private:
     void loadNames();
-    void matchMolecule(const std::string& molName, BitSet& bs);
-    void matchStuntDouble(const std::string& molName, const std::string& sdName, BitSet& bs);
-    void matchRigidAtoms(const std::string& molName, const std::string& rbName, const std::string& rbAtomName, BitSet& bs);
+    void matchMolecule(const std::string& molName, OOPSEBitSet& bs);
+    void matchStuntDouble(const std::string& molName, const std::string& sdName, OOPSEBitSet& bs);
+    void matchRigidAtoms(const std::string& molName, const std::string& rbName, const std::string& rbAtomName, OOPSEBitSet& bs);
 
-    void matchInternalIndex(const std::string& name, int internalIndex, BitSet& bs);
+    void matchInternalIndex(const std::string& name, int internalIndex, OOPSEBitSet& bs);
 
     TreeNode* createNode(TreeNode* parent, const std::string& name);
     std::vector<TreeNode*> getMatchedChildren(TreeNode* node, const std::string& name);