added mothur.h and fixed includes in many files

[mothur.git] / shared.h

diff --git a/shared.h b/shared.h
index 42c9d65d5e8071ec1ba0ba6d7333487150974b18..fd9179ebce0ed7a7b27cd47eb68ac95c06c3dfe8 100644 (file)
--- a/shared.h
+++ b/shared.h
@@ -12,28 +12,21 @@
  
 using namespace std;
 
-#include <Carbon/Carbon.h>
-#include <iostream>
-#include <fstream>
-#include <iomanip>
-#include <vector>
-#include <string>
-#include <sstream>
-#include <map>
 #include "sharedrabundvector.h"
-#include "listvector.hpp"
+#include "sharedlistvector.h"
+#include "globaldata.hpp"
 
 class Shared {
        public:
                Shared();
                ~Shared();
-               void getSharedVectors(int, ListVector*);
+               void getSharedVectors(int, SharedListVector*);
                map<string, SharedRAbundVector*> sharedGroups; //string is groupname, SharedVector* is out info for that group
                
        private:
                GlobalData* globaldata;
-               void parse(int, ListVector*);
+               void parse(int, SharedListVector*);
                vector< map<string, SharedRAbundVector*> > sharedRAbund;  //contains all the info needed to create the .shared file not sure if we will need 
 };
 
-#endif
\ No newline at end of file
+#endif