X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=0197a8a4b38eb4bd1e0b4133817e91dc53df74c0;hb=32ef0d04c48a1751abbb5e3b17d1bec25f22c255;hp=8b2b75bf7d747f8eb7f63d9b389cfd25d14a622b;hpb=76a135cf07b775033b3031d609e6e0a084af1c91;p=lyx.git

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 8b2b75bf7d..0197a8a4b3 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -26,6 +26,7 @@
 #include "lyxrc.h"
 #include "support/path.h"
 #include "support/filetools.h"
+#include "buffer.h"
 #include "bufferlist.h"
 #include "debug.h"
 #include "support/FileInfo.h"
@@ -42,10 +43,6 @@
 #include "converter.h"
 #include "language.h"
 #include "support/os.h"
-// for NO_LATEX
-#if 1
-#include "lyxfont.h"
-#endif
 
 using std::endl;
 
@@ -132,7 +129,8 @@ LyX::LyX(int * argc, char * argv[])
 	}
 
 	if (first_start) {
-		string splash = i18nLibFileSearch("examples", "splash.lyx");
+		string const splash =
+			i18nLibFileSearch("examples", "splash.lyx");
 		lyxerr[Debug::INIT] << "Opening splash document "
 			       << splash << "..." << endl;
 		Buffer * loadb = bufferlist.loadLyXFile(splash);
@@ -289,7 +287,7 @@ void LyX::init(bool gui)
 			    << searchpath << endl;
 
 	string const filename = "chkconfig.ltx";
-	string temp = FileOpenSearch(searchpath, filename, string());
+	string const temp = FileOpenSearch(searchpath, filename, string());
 	system_lyxdir = OnlyPath(temp);
 
 	// Reduce "path/../path" stuff out of system directory
@@ -365,11 +363,12 @@ void LyX::init(bool gui)
 
 	// Check that user LyX directory is ok. We don't do that if
 	// running in batch mode.
-	if (gui)
+	if (gui) {
 		queryUserLyXDir(explicit_userdir);
-	else
+	} else {
 		first_start = false;
-
+	}
+	
 	//
 	// Shine up lyxrc defaults
 	//
@@ -590,7 +589,7 @@ bool LyX::readRcFile(string const & name)
 {
 	lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
 	
-	string lyxrc_path = LibFileSearch(string(), name);
+	string const lyxrc_path = LibFileSearch(string(), name);
 	if (!lyxrc_path.empty()){
 	        lyxerr[Debug::INIT] << "Found " << name
 				    << " in " << lyxrc_path << endl;
@@ -601,8 +600,10 @@ bool LyX::readRcFile(string const & name)
 			return false;
 		}
 		return true;
-	} else
+	} else {
 	  	lyxerr[Debug::INIT] << "Could not find " << name << endl;
+	}
+	
 	return false;
 }
 
@@ -623,7 +624,7 @@ void LyX::readUIFile(string const & name)
 
 	lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
 	
-	string ui_path = LibFileSearch("ui", name, "ui");
+	string const ui_path = LibFileSearch("ui", name, "ui");
 
 	if (ui_path.empty()) {
 	  	lyxerr[Debug::INIT] << "Could not find " << name << endl;
@@ -635,7 +636,7 @@ void LyX::readUIFile(string const & name)
 			    << " in " << ui_path << endl;
 	LyXLex lex(uitags, ui_last - 1);
 	lex.setFile(ui_path);
-	if (!lex.IsOK()) {
+	if (!lex.isOK()) {
 		lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
 		       << endl;
 	}
@@ -643,7 +644,7 @@ void LyX::readUIFile(string const & name)
 	if (lyxerr.debugging(Debug::PARSER))
 		lex.printTable(lyxerr);
 
-	while (lex.IsOK()) {
+	while (lex.isOK()) {
 		switch (lex.lex()) {
 		case ui_menuset: 
 			menubackend.read(lex);
@@ -654,7 +655,7 @@ void LyX::readUIFile(string const & name)
 			break;
 
 		default:
-			if(!strip(lex.GetString()).empty())
+			if(!strip(lex.getString()).empty())
 				lex.printError("LyX::ReadUIFile: "
 					       "Unknown menu tag: `$$Token'");
 			break;
@@ -668,7 +669,7 @@ void LyX::readLanguagesFile(string const & name)
 {
 	lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
 
-	string lang_path = LibFileSearch(string(), name);
+	string const lang_path = LibFileSearch(string(), name);
 	if (lang_path.empty()) {
 		lyxerr[Debug::INIT] << "Could not find " << name << endl;
 		languages.setDefaults();
@@ -683,7 +684,7 @@ void LyX::readEncodingsFile(string const & name)
 {
 	lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
 
-	string enc_path = LibFileSearch(string(), name);
+	string const enc_path = LibFileSearch(string(), name);
 	if (enc_path.empty()) {
 		lyxerr[Debug::INIT] << "Could not find " << name << endl;
 		return;