Fix bug 2485 and crash on middle mouse paste on math

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index a7fc41b27778eb49a00bee211a846607a89e110e..c61b15cd27aca7d698c085dd626eb00d884528b8 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -30,6 +30,7 @@
 #include "language.h"
 #include "session.h"
 #include "LColor.h"
+#include "lyx_cb.h"
 #include "lyxfunc.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
@@ -58,19 +59,19 @@
 #include <iostream>
 #include <csignal>
 
-using lyx::support::AddName;
-using lyx::support::AddPath;
+using lyx::support::addName;
+using lyx::support::addPath;
 using lyx::support::bformat;
 using lyx::support::createDirectory;
 using lyx::support::createLyXTmpDir;
-using lyx::support::FileSearch;
+using lyx::support::fileSearch;
 using lyx::support::getEnv;
 using lyx::support::i18nLibFileSearch;
-using lyx::support::LibFileSearch;
+using lyx::support::libFileSearch;
 using lyx::support::package;
 using lyx::support::Path;
 using lyx::support::prependEnvPath;
-using lyx::support::QuoteName;
+using lyx::support::quoteName;
 using lyx::support::rtrim;
 
 namespace os = lyx::support::os;
@@ -87,8 +88,6 @@ using std::system;
 #endif
 
 
-extern void QuitLyX(bool);
-
 extern LyXServer * lyxserver;
 
 // This is the global bufferlist object
@@ -117,9 +116,9 @@ void showFileError(string const & error)
 void reconfigureUserLyXDir()
 {
        string const configure_script =
-               AddName(package().system_support(), "configure.py");
+               addName(package().system_support(), "configure.py");
        string const configure_command =
-               "python " + QuoteName(configure_script);
+               "python " + quoteName(configure_script);
 
        lyxerr << _("LyX: reconfiguring user directory") << endl;
        Path p(package().user_support());
@@ -245,7 +244,7 @@ void LyX::priv_exec(int & argc, char * argv[])
                // clear this list to save a few bytes of RAM
                session_->clearLastOpenedFiles();
        }
-       
+
        // Execute batch commands if available
        if (!batch_command.empty()) {
 
@@ -260,7 +259,7 @@ void LyX::priv_exec(int & argc, char * argv[])
                for (; it != end; ++it) {
                        // get absolute path of file and add ".lyx" to
                        // the filename if necessary
-                       string s = FileSearch(string(), *it, "lyx");
+                       string s = fileSearch(string(), *it, "lyx");
                        if (s.empty()) {
                                last_loaded = newFile(*it, string(), true);
                        } else {
@@ -277,7 +276,7 @@ void LyX::priv_exec(int & argc, char * argv[])
                if (last_loaded) {
                        bool success = false;
                        if (last_loaded->dispatch(batch_command, &success)) {
-                               QuitLyX(false);
+                               quitLyX(false);
                                exit(!success);
                        }
                }
@@ -288,7 +287,7 @@ void LyX::priv_exec(int & argc, char * argv[])
                lyx_gui::start(batch_command, files);
        else {
                // Something went wrong above
-               QuitLyX(false);
+               quitLyX(false);
                exit(EXIT_FAILURE);
        }
 }
@@ -360,10 +359,10 @@ static void error_handler(int err_sig)
                break;
        case SIGSEGV:
                lyxerr << "\nlyx: SIGSEGV signal caught\n"
-                         "Sorry, you have found a bug in LyX. "
-                         "Please read the bug-reporting instructions "
-                         "in Help->Introduction and send us a bug report, "
-                         "if necessary. Thanks !\nBye." << endl;
+                         "Sorry, you have found a bug in LyX. "
+                         "Please read the bug-reporting instructions "
+                         "in Help->Introduction and send us a bug report, "
+                         "if necessary. Thanks !\nBye." << endl;
                break;
        case SIGINT:
        case SIGTERM:
@@ -429,7 +428,7 @@ void LyX::init(bool gui)
        lyxrc.document_path = package().document_dir();
 
        if (lyxrc.template_path.empty()) {
-               lyxrc.template_path = AddPath(package().system_support(),
+               lyxrc.template_path = addPath(package().system_support(),
                                              "templates");
        }
 
@@ -453,9 +452,9 @@ void LyX::init(bool gui)
 
        string prefsfile = "preferences";
        // back compatibility to lyxs < 1.1.6
-       if (LibFileSearch(string(), prefsfile).empty())
+       if (libFileSearch(string(), prefsfile).empty())
                prefsfile = "lyxrc";
-       if (!LibFileSearch(string(), prefsfile).empty())
+       if (!libFileSearch(string(), prefsfile).empty())
                readRcFile(prefsfile);
 
        readEncodingsFile("encodings");
@@ -501,10 +500,10 @@ void LyX::init(bool gui)
        package().temp_dir() = createLyXTmpDir(lyxrc.tempdir_path);
        if (package().temp_dir().empty()) {
                Alert::error(_("Could not create temporary directory"),
-                            bformat(_("Could not create a temporary directory in\n"
-                                      "%1$s. Make sure that this\n"
-                                      "path exists and is writable and try again."),
-                                    lyxrc.tempdir_path));
+                            bformat(_("Could not create a temporary directory in\n"
+                                      "%1$s. Make sure that this\n"
+                                      "path exists and is writable and try again."),
+                                    lyxrc.tempdir_path));
                // createLyXTmpDir() tries sufficiently hard to create a
                // usable temp dir, so the probability to come here is
                // close to zero. We therefore don't try to overcome this
@@ -622,9 +621,9 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
            fs::is_directory(package().user_support())) {
                first_start = false;
                string const configure_script =
-                       AddName(package().system_support(), "configure.py");
+                       addName(package().system_support(), "configure.py");
                string const userDefaults =
-                       AddName(package().user_support(), "lyxrc.defaults");
+                       addName(package().user_support(), "lyxrc.defaults");
                if (fs::exists(configure_script) &&
                    fs::exists(userDefaults) &&
                    fs::last_write_time(configure_script)
@@ -672,7 +671,7 @@ void LyX::readRcFile(string const & name)
 {
        lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
 
-       string const lyxrc_path = LibFileSearch(string(), name);
+       string const lyxrc_path = libFileSearch(string(), name);
        if (!lyxrc_path.empty()) {
 
                lyxerr[Debug::INIT] << "Found " << name
@@ -719,7 +718,7 @@ void LyX::readUIFile(string const & name)
 
        lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
 
-       string const 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;
@@ -775,7 +774,7 @@ void LyX::readLanguagesFile(string const & name)
 {
        lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
 
-       string const lang_path = LibFileSearch(string(), name);
+       string const lang_path = libFileSearch(string(), name);
        if (lang_path.empty()) {
                showFileError(name);
                return;
@@ -789,7 +788,7 @@ void LyX::readEncodingsFile(string const & name)
 {
        lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
 
-       string const enc_path = LibFileSearch(string(), name);
+       string const enc_path = libFileSearch(string(), name);
        if (enc_path.empty()) {
                showFileError(name);
                return;