anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-27 03:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid a name clash with boost 1.34

Browse Source 
* src/lyx_cb.C (reconfigure):
	* src/buffer.C (runChktex):
	* src/lyxfunc.C (dispatch):
	* src/vc-backend.C (doVCCommand):
	* src/lyx_main.C (reconfigureUserLyXDir):
	Explicitly specify lyx::support::Path.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14982 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2006-09-12 17:41:50 +00:00
parent f66b23b4df
commit 179ff08011
5 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/buffer.C
View File

@ -113,7 +113,6 @@ using lyx::support::makeDisplayPath;
using lyx::support::makeLatexName; using lyx::support::makeLatexName;
using lyx::support::onlyFilename; using lyx::support::onlyFilename;
using lyx::support::onlyPath; using lyx::support::onlyPath;
using lyx::support::Path;
using lyx::support::quoteName; using lyx::support::quoteName;
using lyx::support::removeAutosaveFile; using lyx::support::removeAutosaveFile;
using lyx::support::rename; using lyx::support::rename;
@ -1076,7 +1075,7 @@ int Buffer::runChktex()
string const path = temppath(); string const path = temppath();
string const org_path = filePath(); string const org_path = filePath();
Path p(path); // path to LaTeX file lyx::support::Path p(path); // path to LaTeX file
message(_("Running chktex...")); message(_("Running chktex..."));
// Generate the LaTeX file if neccessary // Generate the LaTeX file if neccessary

3
src/lyx_cb.C
View File

@ -67,7 +67,6 @@ using lyx::support::makeAbsPath;
using lyx::support::makeDisplayPath; using lyx::support::makeDisplayPath;
using lyx::support::onlyFilename; using lyx::support::onlyFilename;
using lyx::support::onlyPath; using lyx::support::onlyPath;
using lyx::support::Path;
using lyx::support::package; using lyx::support::package;
using lyx::support::removeAutosaveFile; using lyx::support::removeAutosaveFile;
using lyx::support::rename; using lyx::support::rename;
@ -443,7 +442,7 @@ void reconfigure(BufferView * bv)
bv->buffer()->message(_("Running configure...")); bv->buffer()->message(_("Running configure..."));
// Run configure in user lyx directory // Run configure in user lyx directory
Path p(package().user_support()); lyx::support::Path p(package().user_support());
string const configure_command = package().configure_command(); string const configure_command = package().configure_command();
Systemcall one; Systemcall one;
one.startscript(Systemcall::Wait, configure_command); one.startscript(Systemcall::Wait, configure_command);

3
src/lyx_main.C
View File

@ -71,7 +71,6 @@ using lyx::support::getEnv;
using lyx::support::i18nLibFileSearch; using lyx::support::i18nLibFileSearch;
using lyx::support::libFileSearch; using lyx::support::libFileSearch;
using lyx::support::package; using lyx::support::package;
using lyx::support::Path;
using lyx::support::prependEnvPath; using lyx::support::prependEnvPath;
using lyx::support::rtrim; using lyx::support::rtrim;
using lyx::support::Systemcall; using lyx::support::Systemcall;
@ -133,7 +132,7 @@ void reconfigureUserLyXDir()
string const configure_command = package().configure_command(); string const configure_command = package().configure_command();
lyxerr << lyx::to_utf8(_("LyX: reconfiguring user directory")) << endl; lyxerr << lyx::to_utf8(_("LyX: reconfiguring user directory")) << endl;
Path p(package().user_support()); lyx::support::Path p(package().user_support());
Systemcall one; Systemcall one;
one.startscript(Systemcall::Wait, configure_command); one.startscript(Systemcall::Wait, configure_command);
lyxerr << "LyX: " << lyx::to_utf8(_("Done!")) << endl; lyxerr << "LyX: " << lyx::to_utf8(_("Done!")) << endl;

5
src/lyxfunc.C
View File

@ -118,7 +118,6 @@ using lyx::support::isStrInt;
using lyx::support::makeAbsPath; using lyx::support::makeAbsPath;
using lyx::support::makeDisplayPath; using lyx::support::makeDisplayPath;
using lyx::support::package; using lyx::support::package;
using lyx::support::Path;
using lyx::support::quoteName; using lyx::support::quoteName;
using lyx::support::rtrim; using lyx::support::rtrim;
using lyx::support::split; using lyx::support::split;
@ -931,7 +930,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
// Push directory path. // Push directory path.
string const path = buffer->temppath(); string const path = buffer->temppath();
Path p(path); lyx::support::Path p(path);
// there are three cases here: // there are three cases here:
// 1. we print to a file // 1. we print to a file
@ -1346,7 +1345,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
} }
case LFUN_PREFERENCES_SAVE: { case LFUN_PREFERENCES_SAVE: {
Path p(package().user_support()); lyx::support::Path p(package().user_support());
lyxrc.write("preferences", false); lyxrc.write("preferences", false);
break; break;
} }

3
src/vc-backend.C
View File

@ -30,7 +30,6 @@ using lyx::support::addPath;
using lyx::support::contains; using lyx::support::contains;
using lyx::support::onlyFilename; using lyx::support::onlyFilename;
using lyx::support::onlyPath; using lyx::support::onlyPath;
using lyx::support::Path;
using lyx::support::quoteName; using lyx::support::quoteName;
using lyx::support::rtrim; using lyx::support::rtrim;
using lyx::support::split; using lyx::support::split;
@ -57,7 +56,7 @@ int VCS::doVCCommand(string const & cmd, string const & path)
{ {
lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl; lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl;
Systemcall one; Systemcall one;
Path p(path); lyx::support::Path p(path);
int const ret = one.startscript(Systemcall::Wait, cmd); int const ret = one.startscript(Systemcall::Wait, cmd);
return ret; return ret;
} }