Code cleanup: file operations merged into single header, some function names

made less cryptic and changed to indicate if they work on files or directories.

2 files changed, 3 insertions, 4 deletions

diff --git a/source/blender/collada/ImageExporter.cpp b/source/blender/collada/ImageExporter.cpp
index 6c7251016c3..ec3cc0fc984 100644
--- a/source/blender/collada/ImageExporter.cpp
+++ b/source/blender/collada/ImageExporter.cpp
@@ -110,7 +110,7 @@ void ImagesExporter::operator()(Material *ma, Object *ob)
 				// make dest directory if it doesn't exist
 				BLI_make_existing_file(abs);
 			
-				if (BLI_copy_fileops(src, abs) != 0) {
+				if (BLI_copy(src, abs) != 0) {
 					fprintf(stderr, "Cannot copy image to file's directory. \n");
 				}
 			} 
diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp
index b411d61fe37..a0b3d0051b4 100644
--- a/source/blender/collada/collada.cpp
+++ b/source/blender/collada/collada.cpp
@@ -40,9 +40,8 @@ extern "C"
 #include "BKE_context.h"
 
 /* make dummy file */
-#include "BLI_storage.h"
-#include "BLI_path_util.h"
 #include "BLI_fileops.h"
+#include "BLI_path_util.h"
 
 	int collada_import(bContext *C, const char *filepath)
 	{
@@ -62,7 +61,7 @@ extern "C"
 		/* annoying, collada crashes if file cant be created! [#27162] */
 		if(!BLI_exists(filepath)) {
 			BLI_make_existing_file(filepath); /* makes the dir if its not there */
-			if(BLI_touch(filepath) == 0) {
+			if(BLI_file_touch(filepath) == 0) {
 				return 0;
 			}
 		}