anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

usr strfwd

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21617 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2007-11-14 21:36:01 +00:00
parent e6042e15f3
commit f4292fcec7
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/LyX.cpp
View File

@ -149,9 +149,9 @@ void reconfigureUserLyXDir()
/// The main application class private implementation.
struct LyX::Singletons
struct LyX::Impl
{
Singletons()
Impl()
{
// Set the default User Interface language as soon as possible.
// The language used will be derived from the environment
@ -189,9 +189,13 @@ struct LyX::Singletons
///
Movers movers_;
///
Movers system_movers_;
/// has this user started lyx for the first time?
bool first_start;
/// the parsed command line batch command if any
std::string batch_command;
};
///
@ -228,7 +232,7 @@ LyX::LyX()
: first_start(false)
{
singleton_ = this;
pimpl_ = new Singletons;
pimpl_ = new Impl;
}
@ -438,7 +442,7 @@ int LyX::exec(int & argc, char * argv[])
loadFiles();
if (batch_command.empty() || pimpl_->buffer_list_.empty()) {
if (pimpl_->batch_command.empty() || pimpl_->buffer_list_.empty()) {
prepareExit();
return EXIT_SUCCESS;
}
@ -451,7 +455,7 @@ int LyX::exec(int & argc, char * argv[])
if (buf != buf->masterBuffer())
continue;
bool success = false;
buf->dispatch(batch_command, &success);
buf->dispatch(pimpl_->batch_command, &success);
final_success |= success;
}
prepareExit();
@ -649,13 +653,13 @@ void LyX::execBatchCommands()
}
// Execute batch commands if available
if (batch_command.empty())
if (pimpl_->batch_command.empty())
return;
LYXERR(Debug::INIT) << "About to handle -x '"
<< batch_command << '\'' << endl;
<< pimpl_->batch_command << '\'' << endl;
pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(batch_command));
pimpl_->lyxfunc_.dispatch(lyxaction.lookupFunc(pimpl_->batch_command));
}
@ -1433,7 +1437,7 @@ void LyX::easyParse(int & argc, char * argv[])
}
}
batch_command = batch;
pimpl_->batch_command = batch;
}

13
src/LyX.h
View File

@ -14,7 +14,7 @@
#ifndef LYX_H
#define LYX_H
#include <string>
#include "support/strfwd.h"
namespace lyx {
@ -170,14 +170,13 @@ private:
/// shows up a parsing error on screen
void printError(ErrorItem const &);
/// Use the Pimpl idiom to hide the internals.
// Mostly used for singletons.
struct Impl;
Impl * pimpl_;
/// has this user started lyx for the first time?
bool first_start;
/// the parsed command line batch command if any
std::string batch_command;
/// Use the Pimpl idiom to hide the internals.
struct Singletons;
Singletons * pimpl_;
friend Movers & theMovers();
friend Mover const & getMover(std::string const & fmt);