remove redundant lyxerr.debugging checks; macro LYXERR already checks whether the...

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 0b59f51e92765fdce09247266d70c5ea31e039d3..c22e4c14ba72f736edbfaf662ad12280248fa217 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -481,7 +481,7 @@ void LyX::prepareExit()
 
        // do any other cleanup procedures now
        if (package().temp_dir() != package().system_temp_dir()) {
-               lyxerr[Debug::INFO] << "Deleting tmp dir "
+               LYXERR(Debug::INFO) << "Deleting tmp dir "
                                    << package().temp_dir() << endl;
 
                if (!destroyDir(FileName(package().temp_dir()))) {
@@ -531,9 +531,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..." << endl;
        bool success = init();
-       lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl;
+       LYXERR(Debug::INIT) << "Initializing LyX::init...done" << endl;
        if (!success)
                return EXIT_FAILURE;
 
@@ -585,7 +585,7 @@ void LyX::execBatchCommands()
        if (batch_command.empty())
                return;
 
-       lyxerr[Debug::INIT] << "About to handle -x '"
+       LYXERR(Debug::INIT) << "About to handle -x '"
                << batch_command << '\'' << endl;
 
        pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(batch_command));
@@ -634,7 +634,7 @@ LyXView * LyX::newLyXView()
        unsigned int height = 510;
        // default icon size, will be overwritten by  stored session value
        unsigned int iconSizeXY = 0;
-       bool maximize = false;
+       int maximized = LyXView::NotMaximized;
        // first try lyxrc
        if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
                width = lyxrc.geometry_width;
@@ -648,8 +648,9 @@ LyXView * LyX::newLyXView()
                val = session().sessionInfo().load("WindowHeight");
                if (!val.empty())
                        height = convert<unsigned int>(val);
-               if (session().sessionInfo().load("WindowIsMaximized") == "yes")
-                       maximize = true;
+               val = session().sessionInfo().load("WindowMaximized");
+               if (!val.empty())
+                       maximized = convert<int>(val);
                val = session().sessionInfo().load("IconSizeXY");
                if (!val.empty())
                        iconSizeXY = convert<unsigned int>(val);
@@ -674,7 +675,7 @@ LyXView * LyX::newLyXView()
        }
 
        // create the main window
-       LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximize, iconSizeXY, geometryArg);
+       LyXView * view = &pimpl_->application_->createView(width, height, posx, posy, maximized, iconSizeXY, geometryArg);
 
        return view;
 }
@@ -875,7 +876,7 @@ bool LyX::init()
                return false;
 
        // Load the layouts
-       lyxerr[Debug::INIT] << "Reading layouts..." << endl;
+       LYXERR(Debug::INIT) << "Reading layouts..." << endl;
        if (!LyXSetStyle())
                return false;
 
@@ -922,11 +923,9 @@ bool LyX::init()
                return false;
        }
 
-       if (lyxerr.debugging(Debug::INIT)) {
-               lyxerr << "LyX tmp dir: `" << package().temp_dir() << '\'' << endl;
-       }
+       LYXERR(Debug::INIT) << "LyX tmp dir: `" << package().temp_dir() << '\'' << endl;
 
-       lyxerr[Debug::INIT] << "Reading session information '.lyx/session'..." << endl;
+       LYXERR(Debug::INIT) << "Reading session information '.lyx/session'..." << endl;
        pimpl_->session_.reset(new Session(lyxrc.num_lastfiles));
 
        // This must happen after package initialization and after lyxrc is
@@ -1106,19 +1105,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 << endl;
 
                if (lyxrc.read(lyxrc_path) < 0) {
                        showFileError(name);
                        return false;
                }
        } else
-               lyxerr[Debug::INIT] << "Not found." << lyxrc_path << endl;
+               LYXERR(Debug::INIT) << "Not found." << lyxrc_path << endl;
        return true;
 
 }
@@ -1148,14 +1147,14 @@ 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
+               LYXERR(Debug::INIT) << "UI file '" << name
                                    << "' has been read already. "
                                    << "Is this an include loop?"
                                    << endl;
                return false;
        }
 
-       lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
+       LYXERR(Debug::INIT) << "About to read " << name << "..." << endl;
 
        
        FileName ui_path;
@@ -1169,14 +1168,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 << endl;
                showFileError(name);
                return false;
        }
 
        uifiles.push_back(name);
 
-       lyxerr[Debug::INIT] << "Found " << name
+       LYXERR(Debug::INIT) << "Found " << name
                            << " in " << ui_path << endl;
        LyXLex lex(uitags, ui_last - 1);
        lex.setFile(ui_path);
@@ -1223,7 +1222,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 << "..." << endl;
 
        FileName const lang_path = libFileSearch(string(), name);
        if (lang_path.empty()) {
@@ -1239,7 +1238,7 @@ 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 "
+       LYXERR(Debug::INIT) << "About to read " << enc_name << " and "
                            << symbols_name << "..." << endl;
 
        FileName const symbols_path = libFileSearch(string(), symbols_name);