From: Enrico Forestieri <forenr@lyx.org>
Date: Tue, 12 Sep 2006 17:41:50 +0000 (+0000)
Subject: Avoid a name clash with boost 1.34
X-Git-Tag: 1.6.10~12590
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=179ff08011620faa94ff186bdb30ae2d9639e4e7;p=features.git

Avoid a name clash with boost 1.34

	* 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
---

diff --git a/src/buffer.C b/src/buffer.C
index 23f2405d21..ff5bc7f4c7 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -113,7 +113,6 @@ using lyx::support::makeDisplayPath;
 using lyx::support::makeLatexName;
 using lyx::support::onlyFilename;
 using lyx::support::onlyPath;
-using lyx::support::Path;
 using lyx::support::quoteName;
 using lyx::support::removeAutosaveFile;
 using lyx::support::rename;
@@ -1076,7 +1075,7 @@ int Buffer::runChktex()
 	string const path = temppath();
 	string const org_path = filePath();
 
-	Path p(path); // path to LaTeX file
+	lyx::support::Path p(path); // path to LaTeX file
 	message(_("Running chktex..."));
 
 	// Generate the LaTeX file if neccessary
diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index df07a86090..2a4d9b69bd 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -67,7 +67,6 @@ using lyx::support::makeAbsPath;
 using lyx::support::makeDisplayPath;
 using lyx::support::onlyFilename;
 using lyx::support::onlyPath;
-using lyx::support::Path;
 using lyx::support::package;
 using lyx::support::removeAutosaveFile;
 using lyx::support::rename;
@@ -443,7 +442,7 @@ void reconfigure(BufferView * bv)
 	bv->buffer()->message(_("Running configure..."));
 
 	// 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();
 	Systemcall one;
 	one.startscript(Systemcall::Wait, configure_command);
diff --git a/src/lyx_main.C b/src/lyx_main.C
index a01b2c7f47..d87fff26fb 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -71,7 +71,6 @@ using lyx::support::getEnv;
 using lyx::support::i18nLibFileSearch;
 using lyx::support::libFileSearch;
 using lyx::support::package;
-using lyx::support::Path;
 using lyx::support::prependEnvPath;
 using lyx::support::rtrim;
 using lyx::support::Systemcall;
@@ -133,7 +132,7 @@ void reconfigureUserLyXDir()
 	string const configure_command = package().configure_command();
 
 	lyxerr << lyx::to_utf8(_("LyX: reconfiguring user directory")) << endl;
-	Path p(package().user_support());
+	lyx::support::Path p(package().user_support());
 	Systemcall one;
 	one.startscript(Systemcall::Wait, configure_command);
 	lyxerr << "LyX: " << lyx::to_utf8(_("Done!")) << endl;
diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 6a48ac6d9f..04b8f8183d 100644
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -118,7 +118,6 @@ using lyx::support::isStrInt;
 using lyx::support::makeAbsPath;
 using lyx::support::makeDisplayPath;
 using lyx::support::package;
-using lyx::support::Path;
 using lyx::support::quoteName;
 using lyx::support::rtrim;
 using lyx::support::split;
@@ -931,7 +930,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 
 			// Push directory path.
 			string const path = buffer->temppath();
-			Path p(path);
+			lyx::support::Path p(path);
 
 			// there are three cases here:
 			// 1. we print to a file
@@ -1346,7 +1345,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
 		}
 
 		case LFUN_PREFERENCES_SAVE: {
-			Path p(package().user_support());
+			lyx::support::Path p(package().user_support());
 			lyxrc.write("preferences", false);
 			break;
 		}
diff --git a/src/vc-backend.C b/src/vc-backend.C
index 3225bc18ba..8e8c43a15c 100644
--- a/src/vc-backend.C
+++ b/src/vc-backend.C
@@ -30,7 +30,6 @@ using lyx::support::addPath;
 using lyx::support::contains;
 using lyx::support::onlyFilename;
 using lyx::support::onlyPath;
-using lyx::support::Path;
 using lyx::support::quoteName;
 using lyx::support::rtrim;
 using lyx::support::split;
@@ -57,7 +56,7 @@ int VCS::doVCCommand(string const & cmd, string const & path)
 {
 	lyxerr[Debug::LYXVC] << "doVCCommand: " << cmd << endl;
 	Systemcall one;
-	Path p(path);
+	lyx::support::Path p(path);
 	int const ret = one.startscript(Systemcall::Wait, cmd);
 	return ret;
 }