mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Fix #10874 compiler warnings.
This commit is contained in:
parent
69d46542ed
commit
e0672b36f3
@ -160,9 +160,9 @@ void GuiInclude::typeChanged(int v)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
|
void GuiInclude::paramsToDialog(InsetCommandParams const & icp)
|
||||||
{
|
{
|
||||||
filenameED->setText(toqstr(params_["filename"]));
|
filenameED->setText(toqstr(icp["filename"]));
|
||||||
|
|
||||||
visiblespaceCB->setChecked(false);
|
visiblespaceCB->setChecked(false);
|
||||||
visiblespaceCB->setEnabled(false);
|
visiblespaceCB->setEnabled(false);
|
||||||
@ -175,7 +175,7 @@ void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
|
|||||||
listingsTB->setPlainText(
|
listingsTB->setPlainText(
|
||||||
qt_("Input listing parameters on the right. Enter ? for a list of parameters."));
|
qt_("Input listing parameters on the right. Enter ? for a list of parameters."));
|
||||||
|
|
||||||
string cmdname = params_.getCmdName();
|
string cmdname = icp.getCmdName();
|
||||||
if (cmdname != "include" &&
|
if (cmdname != "include" &&
|
||||||
cmdname != "verbatiminput" &&
|
cmdname != "verbatiminput" &&
|
||||||
cmdname != "verbatiminput*" &&
|
cmdname != "verbatiminput*" &&
|
||||||
@ -189,7 +189,7 @@ void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
|
|||||||
} else if (cmdname == "input") {
|
} else if (cmdname == "input") {
|
||||||
typeCO->setCurrentIndex(1);
|
typeCO->setCurrentIndex(1);
|
||||||
previewCB->setEnabled(true);
|
previewCB->setEnabled(true);
|
||||||
previewCB->setChecked(params_.preview());
|
previewCB->setChecked(icp.preview());
|
||||||
|
|
||||||
} else if (cmdname == "verbatiminput*") {
|
} else if (cmdname == "verbatiminput*") {
|
||||||
typeCO->setCurrentIndex(2);
|
typeCO->setCurrentIndex(2);
|
||||||
@ -204,7 +204,7 @@ void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
|
|||||||
typeCO->setCurrentIndex(3);
|
typeCO->setCurrentIndex(3);
|
||||||
listingsGB->setEnabled(true);
|
listingsGB->setEnabled(true);
|
||||||
listingsED->setEnabled(true);
|
listingsED->setEnabled(true);
|
||||||
InsetListingsParams par(to_utf8(params_["lstparams"]));
|
InsetListingsParams par(to_utf8(icp["lstparams"]));
|
||||||
// extract caption and label and put them into their respective editboxes
|
// extract caption and label and put them into their respective editboxes
|
||||||
vector<string> pars = getVectorFromString(par.separatedParams(), "\n");
|
vector<string> pars = getVectorFromString(par.separatedParams(), "\n");
|
||||||
for (vector<string>::iterator it = pars.begin();
|
for (vector<string>::iterator it = pars.begin();
|
||||||
@ -331,9 +331,9 @@ QString GuiInclude::browse(QString const & in_name, Type in_type) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool GuiInclude::initialiseParams(std::string const & data)
|
bool GuiInclude::initialiseParams(std::string const & sdata)
|
||||||
{
|
{
|
||||||
InsetCommand::string2params(data, params_);
|
InsetCommand::string2params(sdata, params_);
|
||||||
paramsToDialog(params_);
|
paramsToDialog(params_);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -47,9 +47,9 @@ private Q_SLOTS:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
///
|
///
|
||||||
bool initialiseParams(std::string const & data);
|
bool initialiseParams(std::string const & sdata);
|
||||||
///
|
///
|
||||||
void paramsToDialog(InsetCommandParams const & params_);
|
void paramsToDialog(InsetCommandParams const & icp);
|
||||||
/// clean-up on hide.
|
/// clean-up on hide.
|
||||||
void clearParams() { params_.clear(); }
|
void clearParams() { params_.clear(); }
|
||||||
/// clean-up on hide.
|
/// clean-up on hide.
|
||||||
|
Loading…
Reference in New Issue
Block a user