anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation problem due to same static variable in different files.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21207 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2007-10-25 21:39:47 +00:00
parent aece85ea30
commit dc45268132
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/qt4/GuiInclude.cpp
View File

@ -60,7 +60,8 @@ using support::getVectorFromString;
/// Flags what action is taken by Kernel::dispatch()
static std::string const lfun_name_ = "include";
/// Needed because we're not inheriting from GuiCommand
static std::string const lfun_include_ = "include";
GuiInclude::GuiInclude(LyXView & lv)
@ -330,7 +331,7 @@ bool GuiInclude::isValid()
bool GuiInclude::initialiseParams(string const & data)
{
InsetCommandMailer::string2params(lfun_name_, data, params_);
InsetCommandMailer::string2params(lfun_include_, data, params_);
return true;
}
@ -343,7 +344,7 @@ void GuiInclude::clearParams()
void GuiInclude::dispatchParams()
{
dispatch(FuncRequest(getLfun(), InsetCommandMailer::params2string(lfun_name_, params_)));
dispatch(FuncRequest(getLfun(), InsetCommandMailer::params2string(lfun_include_, params_)));
}

7
src/frontends/qt4/GuiRef.cpp
View File

@ -43,7 +43,8 @@ using support::makeAbsPath;
using support::makeDisplayPath;
/// Flags what action is taken by Kernel::dispatch()
static std::string const lfun_name_ = "ref";
/// Needed because we're not inheriting from GuiCommand
static std::string const lfun_ref_ = "ref";
GuiRef::GuiRef(LyXView & lv)
: GuiDialog(lv, "ref"), params_(REF_CODE)
@ -379,7 +380,7 @@ bool GuiRef::initialiseParams(string const & data)
{
// The name passed with LFUN_INSET_APPLY is also the name
// used to identify the mailer.
InsetCommandMailer::string2params(lfun_name_, data, params_);
InsetCommandMailer::string2params(lfun_ref_, data, params_);
return true;
}
@ -392,7 +393,7 @@ void GuiRef::clearParams()
void GuiRef::dispatchParams()
{
string const lfun = InsetCommandMailer::params2string(lfun_name_, params_);
string const lfun = InsetCommandMailer::params2string(lfun_ref_, params_);
dispatch(FuncRequest(getLfun(), lfun));
}