X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=65bd38cb65ab16655c503d6ab51701075069a380;hb=dad1fc66e44a4dad94eb1e9ffd5736bf8f59ae6d;hp=94561f85cb8b3e948d5047e6d1792e5f72368acd;hpb=00efea79702404ee13d1dd593aabeb72897cfb61;p=lyx.git

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 94561f85cb..65bd38cb65 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -9,10 +9,6 @@
 #include <config.h>
 #include <version.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyx_main.h"
 
 #include "support/filetools.h"
@@ -136,7 +132,7 @@ LyX::LyX(int & argc, char * argv[])
 	// Execute batch commands if available
 	if (!batch_command.empty()) {
 		lyxerr[Debug::INIT] << "About to handle -x '"
-		       << batch_command << "'" << endl;
+		       << batch_command << '\'' << endl;
 
 		Buffer * last_loaded = 0;
 
@@ -294,8 +290,8 @@ void LyX::init(bool gui)
 		FileInfo file(fullbinpath, true);
 		followlink = file.isLink();
 		if (followlink) {
-			lyxerr << " directory " << fullbinpath
-			       << " is a link" << endl;
+			lyxerr[Debug::INIT] << " directory " << fullbinpath
+					    << " is a link" << endl;
 			string link;
 			if (LyXReadLink(fullbinpath, link, true)) {
 				fullbinpath = link;
@@ -364,7 +360,7 @@ void LyX::init(bool gui)
 #if USE_BOOST_FORMAT
 			lyxerr << boost::format(_("Using built-in default %1$s"
 						  " but expect problems."))
-				% LYX_DIR
+				% static_cast<char *>(LYX_DIR)
 			       << endl;
 #else
 			lyxerr << _("Using built-in default ") << LYX_DIR
@@ -447,7 +443,7 @@ void LyX::init(bool gui)
 	// If there is a preferences file we read that instead
 	// of the old lyxrc file.
 	if (!readRcFile("preferences"))
-	    readRcFile("lyxrc");
+		readRcFile("lyxrc");
 
 	readEncodingsFile("encodings");
 	readLanguagesFile("languages");
@@ -463,11 +459,6 @@ void LyX::init(bool gui)
 	// Read menus
 	readUIFile(lyxrc.ui_file);
 
-	// Bind the X dead keys to the corresponding LyX functions if
-	// necessary.
-	if (lyxrc.override_x_deadkeys)
-		deadKeyBindings(toplevel_keymap.get());
-
 	if (lyxerr.debugging(Debug::LYXRC)) {
 		lyxrc.print();
 	}
@@ -886,7 +877,7 @@ int parse_import(string const & type, string const & file)
 		exit(1);
 	}
 
-	batch = "buffer-import " + type + " " + file;
+	batch = "buffer-import " + type + ' ' + file;
 	return 2;
 }