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

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21207 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 0ea27fd3737ab88b618362bd83e685eb6dd6235d..b02052edfd12250d4d40a5a7af5510a511a1a29a 100644 (file)
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -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_)));
 }
 
 

diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp
index 6de11331efe3006af2facbcc7a26818497d2faf1..5dc8ced74f6979c6218f43f9d9d6ace5a685817b 100644 (file)
--- a/src/frontends/qt4/GuiRef.cpp
+++ b/src/frontends/qt4/GuiRef.cpp
@@ -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));
 }