make frontend::Application a bit slimmer

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index c9f462ef907e475b6603b0d460165897709810cf..b6d1df8d4b59027fe8d10a292490deacd7c09c9f 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -48,8 +48,6 @@
 
 #include "frontends/alert.h"
 #include "frontends/Application.h"
-#include "frontends/Dialogs.h"
-#include "frontends/Gui.h"
 #include "frontends/LyXView.h"
 
 #include "support/environment.h"
@@ -376,39 +374,6 @@ void LyX::setGuiLanguage(std::string const & language)
 }
 
 
-Buffer const * LyX::updateInset(Inset const * inset) const
-{
-       if (quitting || !inset)
-               return 0;
-
-       Buffer const * buffer_ptr = 0;
-       vector<int> const & view_ids = pimpl_->application_->gui().viewIds();
-       vector<int>::const_iterator it = view_ids.begin();
-       vector<int>::const_iterator const end = view_ids.end();
-       for (; it != end; ++it) {
-               Buffer const * ptr =
-                       pimpl_->application_->gui().view(*it).updateInset(inset);
-               if (ptr)
-                       buffer_ptr = ptr;
-       }
-       return buffer_ptr;
-}
-
-
-void LyX::hideDialogs(std::string const & name, Inset * inset) const
-{
-       if (quitting || !use_gui)
-               return;
-
-       vector<int> const & view_ids = pimpl_->application_->gui().viewIds();
-       vector<int>::const_iterator it = view_ids.begin();
-       vector<int>::const_iterator const end = view_ids.end();
-       for (; it != end; ++it)
-               pimpl_->application_->gui().view(*it).getDialogs().
-                       hide(name, inset);
-}
-
-
 int LyX::exec(int & argc, char * argv[])
 {
        // Here we need to parse the command line. At least
@@ -515,8 +480,8 @@ void LyX::prepareExit()
 
        // do any other cleanup procedures now
        if (package().temp_dir() != package().system_temp_dir()) {
-               LYXERR(Debug::INFO) << "Deleting tmp dir "
-                                   << package().temp_dir().absFilename() << endl;
+               LYXERR(Debug::INFO, "Deleting tmp dir "
+                                   << package().temp_dir().absFilename());
 
                if (!package().temp_dir().destroyDirectory()) {
                        docstring const msg =
@@ -565,9 +530,9 @@ int LyX::init(int & argc, char * argv[])
        }
 
        // Initialization of LyX (reads lyxrc and more)
-       LYXERR(Debug::INIT) << "Initializing LyX::init..." << endl;
+       LYXERR(Debug::INIT, "Initializing LyX::init...");
        bool success = init();
-       LYXERR(Debug::INIT) << "Initializing LyX::init...done" << endl;
+       LYXERR(Debug::INIT, "Initializing LyX::init...done");
        if (!success)
                return EXIT_FAILURE;
 
@@ -656,8 +621,7 @@ void LyX::execBatchCommands()
        if (pimpl_->batch_command.empty())
                return;
 
-       LYXERR(Debug::INIT) << "About to handle -x '"
-               << pimpl_->batch_command << '\'' << endl;
+       LYXERR(Debug::INIT, "About to handle -x '" << pimpl_->batch_command << '\'');
 
        pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(pimpl_->batch_command));
 }
@@ -917,7 +881,7 @@ bool LyX::init()
                return false;
 
        // Load the layouts
-       LYXERR(Debug::INIT) << "Reading layouts..." << endl;
+       LYXERR(Debug::INIT, "Reading layouts...");
        if (!LyXSetStyle())
                return false;
        //...and the modules
@@ -973,11 +937,10 @@ bool LyX::init()
                return false;
        }
 
-       LYXERR(Debug::INIT) << "LyX tmp dir: `"
-                           << package().temp_dir().absFilename()
-                           << '\'' << endl;
+       LYXERR(Debug::INIT, "LyX tmp dir: `"
+                           << package().temp_dir().absFilename() << '\'');
 
-       LYXERR(Debug::INIT) << "Reading session information '.lyx/session'..." << endl;
+       LYXERR(Debug::INIT, "Reading session information '.lyx/session'...");
        pimpl_->session_.reset(new Session(lyxrc.num_lastfiles));
 
        // This must happen after package initialization and after lyxrc is
@@ -1099,21 +1062,19 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
 
 bool LyX::readRcFile(string const & name)
 {
-       LYXERR(Debug::INIT) << "About to read " << name << "... ";
+       LYXERR(Debug::INIT, "About to read " << name << "... ");
 
        FileName const lyxrc_path = libFileSearch(string(), name);
        if (!lyxrc_path.empty()) {
-
-               LYXERR(Debug::INIT) << "Found in " << lyxrc_path << endl;
-
+               LYXERR(Debug::INIT, "Found in " << lyxrc_path);
                if (lyxrc.read(lyxrc_path) < 0) {
                        showFileError(name);
                        return false;
                }
-       } else
-               LYXERR(Debug::INIT) << "Not found." << lyxrc_path << endl;
+       } else {
+               LYXERR(Debug::INIT, "Not found." << lyxrc_path);
+       }
        return true;
-
 }
 
 
@@ -1141,14 +1102,12 @@ bool LyX::readUIFile(string const & name, bool include)
        std::list<string>::const_iterator end = uifiles.end();
        it = std::find(it, end, name);
        if (it != end) {
-               LYXERR(Debug::INIT) << "UI file '" << name
-                                   << "' has been read already. "
-                                   << "Is this an include loop?"
-                                   << endl;
+               LYXERR(Debug::INIT, "UI file '" << name << "' has been read already. "
+                                   << "Is this an include loop?");
                return false;
        }
 
-       LYXERR(Debug::INIT) << "About to read " << name << "..." << endl;
+       LYXERR(Debug::INIT, "About to read " << name << "...");
 
 
        FileName ui_path;
@@ -1162,15 +1121,14 @@ bool LyX::readUIFile(string const & name, bool include)
                ui_path = libFileSearch("ui", name, "ui");
 
        if (ui_path.empty()) {
-               LYXERR(Debug::INIT) << "Could not find " << name << endl;
+               LYXERR(Debug::INIT, "Could not find " << name);
                showFileError(name);
                return false;
        }
 
        uifiles.push_back(name);
 
-       LYXERR(Debug::INIT) << "Found " << name
-                           << " in " << ui_path << endl;
+       LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
        Lexer lex(uitags, ui_last - 1);
        lex.setFile(ui_path);
        if (!lex.isOK()) {
@@ -1216,7 +1174,7 @@ bool LyX::readUIFile(string const & name, bool include)
 // Read the languages file `name'
 bool LyX::readLanguagesFile(string const & name)
 {
-       LYXERR(Debug::INIT) << "About to read " << name << "..." << endl;
+       LYXERR(Debug::INIT, "About to read " << name << "...");
 
        FileName const lang_path = libFileSearch(string(), name);
        if (lang_path.empty()) {
@@ -1232,8 +1190,8 @@ bool LyX::readLanguagesFile(string const & name)
 bool LyX::readEncodingsFile(string const & enc_name,
                            string const & symbols_name)
 {
-       LYXERR(Debug::INIT) << "About to read " << enc_name << " and "
-                           << symbols_name << "..." << endl;
+       LYXERR(Debug::INIT, "About to read " << enc_name << " and "
+                           << symbols_name << "...");
 
        FileName const symbols_path = libFileSearch(string(), symbols_name);
        if (symbols_path.empty()) {