zipunzip.cpp: Replace makedir etc with versions in support::FileName, fix a bug in...

[lyx.git] / src / support / filetools.h

diff --git a/src/support/filetools.h b/src/support/filetools.h
index 512d78db80e2d33147e0a82c7bacd7d2f40e7287..936b7113cbbd9c9e74c9106c418d153844959c52 100644 (file)
--- a/src/support/filetools.h
+++ b/src/support/filetools.h
@@ -13,17 +13,14 @@
 #define LYX_FILETOOL_H
 
 #include "support/docstring.h"
-#include "support/FileName.h"
 
-#include <vector>
 #include <utility>
 #include <string>
 
 namespace lyx {
 namespace support {
 
-/// Creates the per buffer temporary directory
-std::string const createBufferTmpDir();
+class FileName;
 
 /** Creates the global LyX temp dir.
   \p deflt can be an existing directory name. In this case a new directory
@@ -152,7 +149,7 @@ std::string const latex_path(std::string const & path,
                latex_path_dots dots = LEAVE_DOTS);
 
 /// Substitutes active latex characters with underscores in filename
-std::string const makeLatexName(std::string const & file);
+FileName const makeLatexName(FileName const & file);
 
 /** Put the name in quotes suitable for the current shell or python,
     depending on \p style. */
@@ -198,9 +195,6 @@ std::string const unzippedFileName(std::string const & zipped_file);
 FileName const unzipFile(FileName const & zipped_file,
                         std::string const & unzipped_file = std::string());
 
-/// Returns true is path is absolute
-bool absolutePath(std::string const & path);
-
 /// Create absolute path. If impossible, don't do anything
 std::string const expandPath(std::string const & path);
 
@@ -275,17 +269,10 @@ typedef std::pair<int, std::string> cmd_ret;
 
 cmd_ret const runCommand(std::string const & cmd);
 
+
 } // namespace support
 } // namespace lyx
 
-/// The following functions are implemented in minizip/zipunzip.cpp, and are not in
-/// the lyx::support namespace
-
-/// zip several files to a zipfile. In-zip filenames are also specified
-bool zipFiles(std::string const & zipfile, std::vector<std::pair<std::string, std::string> > const & files);
-
-/// Unzip a zip file to a directory
-bool unzipToDir(std::string const & zipfile, std::string const & path);
 
 
 #endif