X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readcluster.cpp;h=b6cb71de5fdbb888f4a7c1614987f74cd0bf8b1a;hb=0cefb55a2616975bd4a144fc345693695ffc9bb6;hp=d8227101b2c339b3904e95144d11f5cccb068dd3;hpb=5cc45e630ccee2c3503e1bfe7e9b3524898cef8a;p=mothur.git

diff --git a/readcluster.cpp b/readcluster.cpp
index d822710..b6cb71d 100644
--- a/readcluster.cpp
+++ b/readcluster.cpp
@@ -109,7 +109,7 @@ int ReadCluster::convertPhylip2Column(NameAssignment*& nameMap){
 					
 					for(int j=0;j<i;j++){
 					
-						if (m->control_pressed) { in.close(); out.close(); remove(tempFile.c_str()); return 0; }
+						if (m->control_pressed) { in.close(); out.close(); m->mothurRemove(tempFile); return 0; }
 						
 						in >> distance;
 						
@@ -126,7 +126,7 @@ int ReadCluster::convertPhylip2Column(NameAssignment*& nameMap){
 					
 					for(int j=0;j<i;j++){
 						
-						if (m->control_pressed) { in.close(); out.close(); remove(tempFile.c_str()); return 0; }
+						if (m->control_pressed) { in.close(); out.close(); m->mothurRemove(tempFile); return 0; }
 						
 						in >> distance;
 						
@@ -148,7 +148,7 @@ int ReadCluster::convertPhylip2Column(NameAssignment*& nameMap){
 				if(nameMap == NULL){
 					list->set(i, name);
 					for(int j=0;j<nseqs;j++){
-						if (m->control_pressed) { in.close(); out.close(); remove(tempFile.c_str()); return 0; }
+						if (m->control_pressed) { in.close(); out.close(); m->mothurRemove(tempFile); return 0; }
 						
 						in >> distance;
 					
@@ -163,7 +163,7 @@ int ReadCluster::convertPhylip2Column(NameAssignment*& nameMap){
 					if(nameMap->count(name)==0){        m->mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); m->mothurOutEndLine(); }
 					
 					for(int j=0;j<nseqs;j++){
-						if (m->control_pressed) { in.close(); out.close(); remove(tempFile.c_str()); return 0; }
+						if (m->control_pressed) { in.close(); out.close(); m->mothurRemove(tempFile); return 0; }
 						
 						in >> distance;
                         
@@ -201,7 +201,7 @@ int ReadCluster::convertPhylip2Column(NameAssignment*& nameMap){
 		float dist;
 		
 		while (in2) {
-			if (m->control_pressed) { in2.close(); out2.close(); remove(tempFile.c_str()); remove(outputFile.c_str()); return 0; }
+			if (m->control_pressed) { in2.close(); out2.close(); m->mothurRemove(tempFile); m->mothurRemove(outputFile); return 0; }
 			
 			in2 >> first >> second >> dist;
 			out2 << rowToName[first] << '\t' << rowToName[second] << '\t' << dist << endl;
@@ -210,10 +210,10 @@ int ReadCluster::convertPhylip2Column(NameAssignment*& nameMap){
 		in2.close();
 		out2.close();
 		
-		remove(tempFile.c_str());
+		m->mothurRemove(tempFile);
 		distFile = outputFile;
 	
-		if (m->control_pressed) {  remove(outputFile.c_str());  }
+		if (m->control_pressed) {  m->mothurRemove(outputFile);  }
 
 		return 0;
 	}