}
-InsetCollapsible const & InsetCollapsible::operator=(InsetCollapsible const & that)
+InsetCollapsible & InsetCollapsible::operator=(InsetCollapsible const & that)
{
if (&that == this)
return *this;
///
InsetCollapsible(InsetCollapsible const & rhs);
///
- InsetCollapsible const & operator=(InsetCollapsible const &);
+ InsetCollapsible & operator=(InsetCollapsible const &);
///
virtual ~InsetCollapsible();
///
// Lgb
//FIXME: why do we set in stone the type here?
-InsetFloat::InsetFloat(Buffer * buf, string params_str)
+InsetFloat::InsetFloat(Buffer * buf, string const & params_str)
: InsetCaptionable(buf)
{
string2params(params_str, params_);
// sidewaysfloats always use their own page,
// therefore don't output the p option that is always set
if (!placement.empty()
- && (!params_.sideways || (params_.sideways && from_ascii(placement) != "p")))
+ && (!params_.sideways || from_ascii(placement) != "p"))
os << '[' << from_ascii(placement) << ']';
os << '\n';
class InsetFloat : public InsetCaptionable
{
public:
- InsetFloat(Buffer * buffer, std::string params_str);
+ InsetFloat(Buffer * buffer, std::string const & params_str);
///
static void string2params(std::string const &, InsetFloatParams &);
///
// If needed, use converters to produce a latex file from the child
if (tmpwritefile != writefile) {
ErrorList el;
- Converters::RetVal const retval =
+ Converters::RetVal const conv_retval =
theConverters().convert(tmp, tmpwritefile, writefile,
included_file, inc_format, tex_format, el);
- if (retval == Converters::KILLED && buffer().isClone() &&
+ if (conv_retval == Converters::KILLED && buffer().isClone() &&
buffer().isExporting()) {
// We really shouldn't get here, I don't think.
LYXERR0("No conversion exception?");
throw ConversionException();
- } else if (retval != Converters::SUCCESS && !runparams.silent) {
+ } else if (conv_retval != Converters::SUCCESS && !runparams.silent) {
docstring msg = bformat(_("Included file `%1$s' "
"was not exported correctly.\n "
"LaTeX export is probably incomplete."),
return list;
}
-bool translateString(docstring const in, docstring & out, string const lcode)
+bool translateString(docstring const & in, docstring & out, string const & lcode)
{
out = translateIfPossible(in, lcode);
return in != out;
} // namespace anon
-docstring InsetInfoParams::getDate(string const iname, QDate const date) const
+docstring InsetInfoParams::getDate(string const & iname, QDate const date) const
{
QLocale loc;
if (lang)
}
-docstring InsetInfoParams::getTime(string const iname, QTime const time) const
+docstring InsetInfoParams::getTime(string const & iname, QTime const time) const
{
QLocale loc;
if (lang)
UNKNOWN_INFO, // Invalid type
};
///
- docstring getDate(std::string const, QDate const date = QDate::currentDate()) const;
+ docstring getDate(std::string const &, QDate const date = QDate::currentDate()) const;
///
- docstring getTime(std::string const, QTime const time = QTime::currentTime()) const;
+ docstring getTime(std::string const &, QTime const time = QTime::currentTime()) const;
///
std::vector<std::pair<std::string,docstring>> getArguments(Buffer const * buf,
std::string const &) const;
str = "eld";
}
- int i;
-
// '.' wildcard means: keep current style
if (!allow_wildcards || str[0] != '.') {
+ int i;
for (i = 0; i < stylescount(); ++i) {
if (str[0] == style_char[i]) {
res = QuoteStyle(i);
str = "eld";
}
- int i;
-
// '.' wildcard means: keep current side
if (!allow_wildcards || str[1] != '.') {
+ int i;
for (i = 0; i < 2; ++i) {
if (str[1] == side_char[i]) {
res = InsetQuotesParams::QuoteSide(i);
str = "eld";
}
- int i;
-
// '.' wildcard means: keep current level
if (!allow_wildcards || str[2] != '.') {
+ int i;
for (i = 0; i < 2; ++i) {
if (str[2] == level_char[i]) {
res = InsetQuotesParams::QuoteLevel(i);
InsetText::InsetText(InsetText const & in)
- : Inset(in), text_(this, in.text_)
+ : Inset(in), drawFrame_(in.drawFrame_), frame_color_(in.frame_color_),
+ text_(this, in.text_)
{
- drawFrame_ = in.drawFrame_;
- frame_color_ = in.frame_color_;
}
Paragraph const & par = pars[size_type(pit)];
if (par.needsCProtection(fragile))
return true;
- docstring const pars = par.asString();
+ docstring const par_str = par.asString();
for (int k = 0; k < nchars_escape; k++) {
- if (contains(pars, chars_escape[k]))
+ if (contains(par_str, chars_escape[k]))
return true;
}
}