#include <config.h>
+#include "support/filetools.h"
+
#include "support/convert.h"
+#include "support/debug.h"
#include "support/environment.h"
-#include "support/filetools.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
#include "support/os.h"
#include "support/Package.h"
#include "support/Path.h"
#include "support/Systemcall.h"
+#include "support/qstring_helpers.h"
-// FIXME Interface violation
-#include "gettext.h"
-#include "debug.h"
+#include <QDir>
#include <boost/assert.hpp>
-#include <boost/filesystem/operations.hpp>
#include <boost/regex.hpp>
#include <fcntl.h>
#include <fstream>
#include <sstream>
-using std::endl;
-using std::getline;
-using std::make_pair;
-using std::string;
-using std::ifstream;
-using std::ostringstream;
-using std::vector;
-using std::pair;
-
-namespace fs = boost::filesystem;
+using namespace std;
namespace lyx {
namespace support {
// Substitutes spaces with underscores in filename (and path)
-string const makeLatexName(string const & file)
+FileName const makeLatexName(FileName const & file)
{
- string name = onlyFilename(file);
- string const path = onlyPath(file);
+ string name = file.onlyFileName();
+ string const path = file.onlyPath().absFilename() + "/";
// ok so we scan through the string twice, but who cares.
+ // FIXME: in Unicode time this will break for sure! There is
+ // a non-latin world out there...
string const keep = "abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"@!'()*+,-./0123456789:;<=>?[]`|";
while ((pos = name.find_first_not_of(keep, pos)) != string::npos)
name[pos++] = '_';
- return addName(path, name);
+ FileName latex_name(path + name);
+ latex_name.changeExtension(".tex");
+ return latex_name;
}
variable. But we don't use the value if the currently
selected locale is the C locale. This is a GNU extension.
- Otherwise, w use a trick to guess what gettext has done:
+ Otherwise, w use a trick to guess what support/gettext.has done:
each po file is able to tell us its name. (JMarc)
*/
LYXERR(Debug::FILES, "createTmpDir: tempdir=`" << tempdir << "'\n"
<< "createTmpDir: mask=`" << mask << '\'');
- FileName const tmpfl(tempName(tempdir, mask));
- // lyx::tempName actually creates a file to make sure that it
+ FileName const tmpfl = FileName::tempName(tempdir.absFilename()
+ + "/" + mask);
+ // FileName::tempName actually creates a file to make sure that it
// stays unique. So we have to delete it before we can create
// a dir with the same name. Note also that we are not thread
// safe because of the gap between unlink and mkdir. (Lgb)
- unlink(tmpfl);
+ tmpfl.removeFile();
- if (tmpfl.empty() || mkdir(tmpfl, 0700)) {
+ if (tmpfl.empty() || !tmpfl.createDirectory(0700)) {
lyxerr << "LyX could not create the temporary directory '"
<< tmpfl << "'" << endl;
return FileName();
package().temp_dir().absFilename() + "/lyx_tmpbuf" +
convert<string>(count++);
- if (mkdir(FileName(tmpfl), 0777)) {
+ if (!FileName(tmpfl).createDirectory(0777)) {
lyxerr << "LyX could not create the temporary directory '"
<< tmpfl << "'" << endl;
return string();
if (deflt.empty() || deflt.absFilename() == "/tmp")
return createTmpDir(FileName("/tmp"), "lyx_tmpdir");
- if (!mkdir(deflt, 0777))
+ if (deflt.createDirectory(0777))
return deflt;
if (deflt.isDirWritable()) {
// If basepath is empty, use CWD as base.
FileName const makeAbsPath(string const & relPath, string const & basePath)
{
+ FileName relative_path(relPath);
// checks for already absolute path
- if (os::is_absolute_path(relPath))
- return FileName(relPath);
+ if (relative_path.isAbsolute())
+ return relative_path;
// Copies given paths
string tempRel = os::internal_path(relPath);
string tempBase;
- if (os::is_absolute_path(basePath))
+ FileName base_path(basePath);
+ if (base_path.isAbsolute())
tempBase = basePath;
else
- tempBase = addPath(getcwd().absFilename(), basePath);
+ tempBase = addPath(FileName::getcwd().absFilename(), basePath);
// Handle /./ at the end of the path
while (suffixIs(tempBase, "/./"))
}
// returns absolute path
- return FileName(os::internal_path(tempBase));
+ return FileName(tempBase);
}
}
-/// Returns true is path is absolute
-bool absolutePath(string const & path)
-{
- return os::is_absolute_path(path);
-}
-
-
// Create absolute path. If impossible, don't do anything
// Supports ./ and ~/. Later we can add support for ~logname/. (Asger)
string const expandPath(string const & path)
{
// checks for already absolute path
string rTemp = replaceEnvironmentPath(path);
- if (os::is_absolute_path(rTemp))
+ FileName abs_path(rTemp);
+ if (abs_path.isAbsolute())
return rTemp;
string temp;
rTemp = split(rTemp, temp, '/');
if (temp == ".")
- return getcwd().absFilename() + '/' + rTemp;
+ return FileName::getcwd().absFilename() + '/' + rTemp;
if (temp == "~")
return package().home_dir().absFilename() + '/' + rTemp;
}
-// Normalize a path. Constracts path/../path
-// Can't handle "../../" or "/../" (Asger)
-// Also converts paths like /foo//bar ==> /foo/bar
-string const normalizePath(string const & path)
-{
- // Normalize paths like /foo//bar ==> /foo/bar
- static boost::regex regex("/{2,}");
- string const tmppath = boost::regex_merge(path, regex, "/");
-
- fs::path const npath = fs::path(tmppath, fs::no_check).normalize();
-
- if (!npath.is_complete())
- return "./" + npath.string() + '/';
-
- return npath.string() + '/';
-}
-
-
// Search the string for ${VAR} and $VAR and replace VAR using getenv.
string const replaceEnvironmentPath(string const & path)
{
LYXERR(Debug::LATEX, "kpse status = " << c.first << '\n'
<< "kpse result = `" << rtrim(c.second, "\n\r") << '\'');
if (c.first != -1)
- return FileName(os::internal_path(rtrim(to_utf8(from_filesystem8bit(c.second)),
- "\n\r")));
+ return FileName(rtrim(to_utf8(from_filesystem8bit(c.second)), "\n\r"));
else
return FileName();
}
a += '#';
FileName const autosave(a);
if (autosave.exists())
- unlink(autosave);
+ autosave.removeFile();
}
LYXERR(Debug::GRAPHICS, "[readBB_from_PSFile] " << message);
// FIXME: Why is this func deleting a file? (Lgb)
if (zipped)
- unlink(file);
+ file.removeFile();
}
static boost::regex bbox_re(
"^%%BoundingBox:\\s*([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)");
- std::ifstream is(file_.toFilesystemEncoding().c_str());
+ ifstream is(file_.toFilesystemEncoding().c_str());
while (is) {
string s;
getline(is,s);
return cmp;
}
+
} //namespace support
} // namespace lyx
projects / lyx.git / blobdiff