From 41843646b7e0133227ad14db4f33b2d9d7e4d156 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Mon, 18 Mar 2013 20:42:20 +0100
Subject: [PATCH] Fix monolithic build

---
 src/LyXVC.cpp                 |  2 +-
 src/LyXVC.h                   |  2 +-
 src/VCBackend.cpp             | 20 ++++++++++----------
 src/frontends/qt4/GuiView.cpp |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 2dd5ac154c..19f265cc67 100644
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -322,7 +322,7 @@ string LyXVC::toggleReadOnly()
 	case VCS::LOCKED: {
 		LYXERR(Debug::LYXVC, "LyXVC: toggle to unlocked");
 		string log;
-		if (checkIn(log) != Success)
+		if (checkIn(log) != VCSuccess)
 			return string();
 		return log;
 	}
diff --git a/src/LyXVC.h b/src/LyXVC.h
index 9b1c747b82..3036a396e3 100644
--- a/src/LyXVC.h
+++ b/src/LyXVC.h
@@ -44,7 +44,7 @@ public:
 		Cancelled,    ///< command was cancelled
 		ErrorBefore,  ///< error before executing command
 		ErrorCommand, ///< error while executing command
-		Success       ///< command was executed successfully
+		VCSuccess     ///< command was executed successfully
 	};
 	///
 	LyXVC();
diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index bc78d761d1..753bd63890 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -276,7 +276,7 @@ LyXVC::CommandResult RCS::checkIn(string const & msg, string & log)
 	if (ret)
 		return LyXVC::ErrorCommand;
 	log = "RCS: Proceeded";
-	return LyXVC::Success;
+	return LyXVC::VCSuccess;
 }
 
 
@@ -846,7 +846,7 @@ LyXVC::CommandResult CVS::checkIn(string const & msg, string & log)
 			if (unedit())
 				return LyXVC::ErrorCommand;
 		log = "CVS: Proceeded";
-		return LyXVC::Success;
+		return LyXVC::VCSuccess;
 	case LocallyModified:
 	case LocallyAdded: {
 		int rc = doVCCommand("cvs -q commit -m \"" + msg + "\" "
@@ -855,7 +855,7 @@ LyXVC::CommandResult CVS::checkIn(string const & msg, string & log)
 		if (rc)
 			return LyXVC::ErrorCommand;
 		log = "CVS: Proceeded";
-		return LyXVC::Success;
+		return LyXVC::VCSuccess;
 	}
 	case NeedsMerge:
 	case NeedsCheckout:
@@ -1274,7 +1274,7 @@ string SVN::rename(support::FileName const & newFile, string const & msg)
 	f.push_back(owner_->fileName());
 	f.push_back(newFile);
 	string log;
-	if (checkIn(f, msg, log) != LyXVC::Success) {
+	if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
 		cmd = "svn revert -q " +
 			quoteName(onlyFileName(owner_->absFileName())) + ' ' +
 			quoteName(relFile);
@@ -1306,7 +1306,7 @@ string SVN::copy(support::FileName const & newFile, string const & msg)
 		return string();
 	vector<support::FileName> f(1, newFile);
 	string log;
-	if (checkIn(f, msg, log) == LyXVC::Success)
+	if (checkIn(f, msg, log) == LyXVC::VCSuccess)
 		return log;
 	return string();
 }
@@ -1336,7 +1336,7 @@ SVN::checkIn(vector<support::FileName> const & f, string const & msg, string & l
 	os << " > " << quoteName(tmpf.toFilesystemEncoding());
 	LyXVC::CommandResult ret =
 		doVCCommand(os.str(), FileName(owner_->filePath())) ?
-			LyXVC::ErrorCommand : LyXVC::Success;
+			LyXVC::ErrorCommand : LyXVC::VCSuccess;
 
 	string res = scanLogFile(tmpf, log);
 	if (!res.empty()) {
@@ -1353,7 +1353,7 @@ SVN::checkIn(vector<support::FileName> const & f, string const & msg, string & l
 	tmpf.removeFile();
 	if (!log.empty())
 		log.insert(0, "SVN: ");
-	if (ret == LyXVC::Success && log.empty())
+	if (ret == LyXVC::VCSuccess && log.empty())
 		log = "SVN: Proceeded";
 	return ret;
 }
@@ -1916,7 +1916,7 @@ string GIT::rename(support::FileName const & newFile, string const & msg)
 	f.push_back(owner_->fileName());
 	f.push_back(newFile);
 	string log;
-	if (checkIn(f, msg, log) != LyXVC::Success) {
+	if (checkIn(f, msg, log) != LyXVC::VCSuccess) {
 		cmd = "git checkout -q " +
 			quoteName(onlyFileName(owner_->absFileName())) + ' ' +
 			quoteName(relFile);
@@ -1966,7 +1966,7 @@ GIT::checkIn(vector<support::FileName> const & f, string const & msg, string & l
 	os << " > " << quoteName(tmpf.toFilesystemEncoding());
 	LyXVC::CommandResult ret =
 		doVCCommand(os.str(), FileName(owner_->filePath())) ?
-			LyXVC::ErrorCommand : LyXVC::Success;
+			LyXVC::ErrorCommand : LyXVC::VCSuccess;
 
 	string res = scanLogFile(tmpf, log);
 	if (!res.empty()) {
@@ -1980,7 +1980,7 @@ GIT::checkIn(vector<support::FileName> const & f, string const & msg, string & l
 	tmpf.removeFile();
 	if (!log.empty())
 		log.insert(0, "GIT: ");
-	if (ret == LyXVC::Success && log.empty())
+	if (ret == LyXVC::VCSuccess && log.empty())
 		log = "GIT: Proceeded";
 	return ret;
 }
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 4ea9e79dae..bb8da339d4 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2876,7 +2876,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd, DispatchResult & dr)
 					buffer->lyxvc().checkIn(log);
 				dr.setMessage(log);
 				if (ret == LyXVC::ErrorCommand ||
-				    ret == LyXVC::Success)
+				    ret == LyXVC::VCSuccess)
 					reloadBuffer(*buffer);
 				if (buffer->lyxvc().isCheckInWithConfirmation()) {
 					frontend::Alert::error(
@@ -2903,7 +2903,7 @@ void GuiView::dispatchVC(FuncRequest const & cmd, DispatchResult & dr)
 			// an error occured before the real checkin VCS command
 			// was executed, since the VCS might have changed the
 			// file even if it could not checkin successfully.
-			if (ret == LyXVC::ErrorCommand || ret == LyXVC::Success)
+			if (ret == LyXVC::ErrorCommand || ret == LyXVC::VCSuccess)
 				reloadBuffer(*buffer);
 		}
 		break;
-- 
2.39.2