From 00b35a8309bc8ec6bc2899996864f779b85a43af Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Sun, 16 Jan 2011 20:38:08 +0000
Subject: [PATCH] Factor out the code that actually does the reading of UI
 files. This is preparatory to prefs2prefs conversion here, which will be the
 last piece of that work.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37235 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiApplication.cpp | 128 +++++++++++++++------------
 src/frontends/qt4/GuiApplication.h   |  14 ++-
 2 files changed, 82 insertions(+), 60 deletions(-)

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 924697c663..2ddcb0d214 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -2306,6 +2306,74 @@ bool GuiApplication::searchMenu(FuncRequest const & func,
 }
 
 
+// Ensure that a file is read only once (prevents include loops)
+static QStringList uifiles;
+// store which ui files define Toolbars
+static QStringList toolbar_uifiles;
+
+
+GuiApplication::ReturnValues GuiApplication::readUIFile(FileName ui_path)
+{
+	enum {
+		ui_menuset = 1,
+		ui_toolbars,
+		ui_toolbarset,
+		ui_include,
+		ui_last
+	};
+
+	LexerKeyword uitags[] = {
+		{ "include", ui_include },
+		{ "menuset", ui_menuset },
+		{ "toolbars", ui_toolbars },
+		{ "toolbarset", ui_toolbarset }
+	};
+
+	Lexer lex(uitags);
+	lex.setFile(ui_path);
+	if (!lex.isOK()) {
+		lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
+					 << endl;
+	}
+
+	if (lyxerr.debugging(Debug::PARSER))
+		lex.printTable(lyxerr);
+
+	bool error = false;
+	while (lex.isOK()) {
+		switch (lex.lex()) {
+		case ui_include: {
+			lex.next(true);
+			QString const file = toqstr(lex.getString());
+			if (!readUIFile(file, true))
+				return ReadError;
+			break;
+		}
+		case ui_menuset:
+			d->menus_.read(lex);
+			break;
+
+		case ui_toolbarset:
+			d->toolbars_.readToolbars(lex);
+			break;
+
+		case ui_toolbars:
+			d->toolbars_.readToolbarSettings(lex);
+			toolbar_uifiles.push_back(toqstr(ui_path.absFileName()));
+			break;
+
+		default:
+			if (!rtrim(lex.getString()).empty())
+				lex.printError("LyX::ReadUIFile: "
+								 "Unknown menu tag: `$$Token'");
+			error = true;
+			break;
+		}
+	}
+	return (error ? ReadError : ReadOK);
+}
+
+
 bool GuiApplication::readUIFile(QString const & name, bool include)
 {
 	LYXERR(Debug::INIT, "About to read " << name << "...");
@@ -2343,8 +2411,6 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
 		return readUIFile(defaultUIFile, false);
 	}
 
-	// Ensure that a file is read only once (prevents include loops)
-	static QStringList uifiles;
 	QString const uifile = toqstr(ui_path.absFileName());
 	if (uifiles.contains(uifile)) {
 		if (!include) {
@@ -2362,63 +2428,7 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
 
 	LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
 
-	enum {
-		ui_menuset = 1,
-		ui_toolbars,
-		ui_toolbarset,
-		ui_include,
-		ui_last
-	};
-
-	LexerKeyword uitags[] = {
-		{ "include", ui_include },
-		{ "menuset", ui_menuset },
-		{ "toolbars", ui_toolbars },
-		{ "toolbarset", ui_toolbarset }
-	};
-
-	Lexer lex(uitags);
-	lex.setFile(ui_path);
-	if (!lex.isOK()) {
-		lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
-		       << endl;
-	}
-
-	if (lyxerr.debugging(Debug::PARSER))
-		lex.printTable(lyxerr);
-
-	// store which ui files define Toolbars
-	static QStringList toolbar_uifiles;
-
-	while (lex.isOK()) {
-		switch (lex.lex()) {
-		case ui_include: {
-			lex.next(true);
-			QString const file = toqstr(lex.getString());
-			if (!readUIFile(file, true))
-				return false;
-			break;
-		}
-		case ui_menuset:
-			d->menus_.read(lex);
-			break;
-
-		case ui_toolbarset:
-			d->toolbars_.readToolbars(lex);
-			break;
-
-		case ui_toolbars:
-			d->toolbars_.readToolbarSettings(lex);
-			toolbar_uifiles.push_back(uifile);
-			break;
-
-		default:
-			if (!rtrim(lex.getString()).empty())
-				lex.printError("LyX::ReadUIFile: "
-					       "Unknown menu tag: `$$Token'");
-			break;
-		}
-	}
+	readUIFile(ui_path);
 
 	if (include)
 		return true;
diff --git a/src/frontends/qt4/GuiApplication.h b/src/frontends/qt4/GuiApplication.h
index c85c0b8b58..c7ab77bc15 100644
--- a/src/frontends/qt4/GuiApplication.h
+++ b/src/frontends/qt4/GuiApplication.h
@@ -30,6 +30,10 @@ class BufferView;
 class ColorCache;
 class KeySymbol;
 
+namespace support {
+class FileName;
+}
+
 namespace frontend {
 
 class GuiView;
@@ -117,7 +121,7 @@ public:
 	void setCurrentView(GuiView * view) { current_view_ = view; }
 	///
 	QList<int> viewIds() const;
-	
+
 	/// Clear all session information.
 	void clearSession();
 
@@ -183,6 +187,14 @@ private:
 	/// read the given ui (menu/toolbar) file
 	bool readUIFile(QString const & name, bool include = false);
 	///
+	enum ReturnValues {
+		ReadOK,
+		ReadError,
+		FormatMismatch
+	};
+	///
+	ReturnValues readUIFile(support::FileName);
+	///
 	void setGuiLanguage();
 	///
 	void reconfigure(std::string const & option);
-- 
2.39.2