merged pat's trim seqs edits with sarah's major overhaul of global data; also added...

[mothur.git] / fileoutput.h

diff --git a/fileoutput.h b/fileoutput.h
index 209dd1b1772cc1f58e18cce4826ffcddd541d278..7dfb0c00b48b93e9d6cb121ba905de7cdc8a5dcb 100644 (file)
--- a/fileoutput.h
+++ b/fileoutput.h
@@ -2,7 +2,6 @@
 #define FILEOUTPUT_H
 
 #include "mothur.h"
-#include "globaldata.hpp"
 
 /***********************************************************************/
 
@@ -20,7 +19,6 @@ public:
        virtual string getFileName() = 0;
 
 protected:
-       GlobalData* globaldata;
        int renameOk;
 
 };     
@@ -127,7 +125,7 @@ private:
 class ColumnFile : public FileOutput {
        
 public:
-       ColumnFile(string n, string i) : FileOutput(), iters(i), inName(n), counter(0), outName(getPathName(n) + ".temp") { globaldata = GlobalData::getInstance(); };
+       ColumnFile(string n, string i) : FileOutput(), iters(i), inName(n), counter(0), outName(getPathName(n) + ".temp") {};
        ~ColumnFile();
        
        //to make compatible with parent class