X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=trimoligos.h;h=5f4f9f06ba48032777e332c3267ae048937d9b48;hp=f3e695406d44a880ed2adc0029e730b6502185fc;hb=fefd5ee1517abd3bc38b469cb2dffc85a1571c7e;hpb=7d9e2bc58855132983da7ac9342880bc95055f77

diff --git a/trimoligos.h b/trimoligos.h
index f3e6954..5f4f9f0 100644
--- a/trimoligos.h
+++ b/trimoligos.h
@@ -15,14 +15,6 @@
 #include "sequence.hpp"
 #include "qualityscores.h"
 
-struct oligosPair {
-	string forward;
-	string reverse;
-	
-	oligosPair() { forward = ""; reverse = "";  }
-	oligosPair(string f, string r) : forward(f), reverse(r) {}
-	~oligosPair() {}
-};
 
 class TrimOligos {
 	
@@ -56,13 +48,10 @@ class TrimOligos {
         bool findReverse(Sequence&, int&, int&);
     
         string reverseOligo(string);
-        string getTrashCode() { return trashCode; }
-				
 	
 	private:
 		int pdiffs, bdiffs, ldiffs, sdiffs;
         bool paired;
-        string trashCode;
 	
 		map<string, int> barcodes;
 		map<string, int> primers;
@@ -85,6 +74,9 @@ class TrimOligos {
         
         int stripPairedBarcode(Sequence& seq, QualityScores& qual, int& group);
         int stripPairedPrimers(Sequence& seq, QualityScores& qual, int& group, bool);
+        int stripPairedBarcode(Sequence& seq,  int& group);
+        int stripPairedPrimers(Sequence& seq,  int& group);
+
 };
 
 #endif