Use SC_Filesystem instead of SC_DirUtils everywhere

jamshark70 · Jul 24, 2017 · 867871a · 867871a
1 parent 0edf563
commit 867871a
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 36 deletions.
diff --git a/SCDoc/SCDocPrim.cpp b/SCDoc/SCDocPrim.cpp
@@ -22,7 +22,6 @@
 #include "PyrPrimitive.h"
 #include "PyrSymbol.h"
 #include "SCBase.h"
-//#include "SC_DirUtils.h" // TODO_BRIAN: no longer needed, delete this
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/editors/sc-ide/core/util/standard_dirs.cpp b/editors/sc-ide/core/util/standard_dirs.cpp
@@ -20,8 +20,7 @@
 
 #include "standard_dirs.hpp"
 
-//#include <SC_DirUtils.h>
-// TODO_BRIAN: move this into SC_DirUtils
+#include "SC_Filesystem.hpp"
 
 namespace ScIDE {
 

diff --git a/editors/sc-ide/core/util/standard_dirs.hpp b/editors/sc-ide/core/util/standard_dirs.hpp
@@ -23,6 +23,8 @@
 
 #include <QString>
 
+// @TODO: change to SC_Filesystem instead
+
 namespace ScIDE {
 
 enum StandardDirectory {

diff --git a/lang/LangPrimSource/PyrFilePrim.cpp b/lang/LangPrimSource/PyrFilePrim.cpp
@@ -31,7 +31,7 @@ Primitives for File i/o.
 #include "PyrFilePrim.h"
 #include "ReadWriteMacros.h"
 #include "SCBase.h"
-//#include "SC_DirUtils.h"
+#include "SC_Filesystem.hpp"
 #include "sc_popen.h"
 
 #include <stdlib.h>

diff --git a/lang/LangPrimSource/PyrPlatformPrim.cpp b/lang/LangPrimSource/PyrPlatformPrim.cpp
@@ -23,7 +23,7 @@ Primitives for platform dependent directories, constants etc.
 
 */
 
-//#include "SC_DirUtils.h"
+#include "SC_Filesystem.hpp"
 #include "PyrPrimitive.h"
 #include "PyrKernel.h"
 #ifdef _WIN32

diff --git a/lang/LangPrimSource/PyrPrimitive.cpp b/lang/LangPrimSource/PyrPrimitive.cpp
@@ -46,7 +46,7 @@
 //#include "Wacom.h"
 #include "InitAlloc.h"
 #include "SC_LanguageConfig.hpp"
-//#include "SC_DirUtils.h"
+#include "SC_Filesystem.hpp"
 #include "SC_Version.hpp"
 #include <map>
 

diff --git a/lang/LangPrimSource/PyrStringPrim.cpp b/lang/LangPrimSource/PyrStringPrim.cpp
@@ -31,7 +31,7 @@ Primitives for String.
 #include <stdlib.h>
 #include <ctype.h>
 #include "PyrLexer.h"
-//#include "SC_DirUtils.h"
+#include "SC_Filesystem.hpp"
 #ifdef _WIN32
 # include <direct.h>
 # include "SC_Win32Utils.h"

diff --git a/lang/LangPrimSource/PyrUnixPrim.cpp b/lang/LangPrimSource/PyrUnixPrim.cpp
@@ -34,7 +34,7 @@ Primitives for Unix.
 #include "VMGlobals.h"
 #include "GC.h"
 #include "SC_RGen.h"
-//#include "SC_DirUtils.h" // TODO_BRIAN: delete this include
+#include "SC_Filesystem.hpp"
 #include "sc_popen.h"
 #include "SCBase.h"
 

diff --git a/lang/LangSource/PyrLexer.cpp b/lang/LangSource/PyrLexer.cpp
@@ -66,7 +66,7 @@
 
 #include "SC_LanguageConfig.hpp"
 
-//#include "SC_DirUtils.h"
+#include "SC_Filesystem.hpp"
 #include "SC_TextUtils.hpp"
 
 int yyparse();

diff --git a/lang/LangSource/SC_LanguageClient.cpp b/lang/LangSource/SC_LanguageClient.cpp
@@ -47,7 +47,7 @@
 #include "PyrSched.h"
 #include "GC.h"
 #include "VMGlobals.h"
-//#include "SC_DirUtils.h"
+#include "SC_Filesystem.hpp"
 #include "SCBase.h"
 #include "SC_StringBuffer.h"
 

diff --git a/lang/LangSource/SC_LanguageConfig.cpp b/lang/LangSource/SC_LanguageConfig.cpp
@@ -22,27 +22,13 @@
  */
 
 #include "SC_LanguageConfig.hpp"
-#include "SCBase.h"
-#include "SC_DirUtils.h"
-
-#include <assert.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#ifdef _WIN32
-# include "SC_Win32Utils.h"
-#else
-# include <sys/param.h>
-# include <unistd.h>
-# include <libgen.h>
-#endif
-
-#include <fstream>
-
-#include <boost/filesystem.hpp>
-#include <yaml-cpp/yaml.h>
+#include "SC_Filesystem.hpp"               // getDirectory
+
+#include "SCBase.h"                        // postfl
+
+#include <boost/filesystem/operations.hpp> // exists (, canonical?)
+#include <boost/filesystem/fstream.hpp>    // ofstream
+#include <yaml-cpp/yaml.h>                 // YAML
 
 static const char* INCLUDE_PATHS = "includePaths";
 static const char* EXCLUDE_PATHS = "excludePaths";

diff --git a/lang/LangSource/SC_TerminalClient.cpp b/lang/LangSource/SC_TerminalClient.cpp
@@ -56,7 +56,7 @@
 #include "PyrLexer.h"
 #include "PyrSlot.h"
 #include "VMGlobals.h"
-//#include "SC_DirUtils.h"   // for gIdeName
+#include "SC_Filesystem.hpp"
 #include "SC_LanguageConfig.hpp"
 #include "SC_Version.hpp"
 

diff --git a/server/scsynth/SC_GraphDef.cpp b/server/scsynth/SC_GraphDef.cpp
@@ -35,7 +35,7 @@
 #include "ReadWriteMacros.h"
 #include "SC_Prototypes.h"
 #include "SC_CoreAudio.h"
-//#include "SC_DirUtils.h"
+#include "SC_Filesystem.hpp"
 
 
 #include <stdio.h>

diff --git a/server/scsynth/SC_Lib_Cintf.cpp b/server/scsynth/SC_Lib_Cintf.cpp
@@ -28,7 +28,7 @@
 #include "SC_WorldOptions.h"
 #include "SC_StringParser.h"
 #include "SC_InterfaceTable.h"
-//#include "SC_DirUtils.h"
+#include "SC_Filesystem.hpp"
 #include <stdexcept>
 #ifndef _MSC_VER
 #include <dirent.h>

diff --git a/server/scsynth/SC_SequencedCommand.cpp b/server/scsynth/SC_SequencedCommand.cpp
@@ -25,7 +25,7 @@
 #include "scsynthsend.h"
 #include "SC_Prototypes.h"
 #include "SC_HiddenWorld.h"
-//#include "SC_DirUtils.h"
+#include "SC_Filesystem.hpp"
 #include "SC_StringParser.h"
 #include "../../common/SC_SndFileHelpers.hpp"
 #include "SC_WorldOptions.h"

diff --git a/server/scsynth/SC_World.cpp b/server/scsynth/SC_World.cpp
@@ -41,7 +41,7 @@
 #include "SC_Errors.h"
 #include <stdio.h>
 #include "SC_Prototypes.h"
-//#include "SC_DirUtils.h"
+#include "SC_Filesystem.hpp"
 #include "SC_Lock.h"
 #include "SC_Lib_Cintf.h"
 #include "../../common/SC_SndFileHelpers.hpp"