class BranchNamesEqual : public std::unary_function<Branch, bool>
{
public:
- BranchNamesEqual(docstring const & name) : name_(name) {}
+ BranchNamesEqual(docstring const & name)
+ : name_(name)
+ {}
bool operator()(Branch const & branch) const
{
private:
docstring name_;
};
+
}
// no theApp() with command line export
if (theApp())
theApp()->getRgbColor(Color_background, color_);
+ else
+ frontend::Application::getRgbColorUncached(Color_background, color_);
}
}
-bool Branch::hasFilenameSuffix() const
+bool Branch::hasFileNameSuffix() const
{
return filenameSuffix_;
}
-void Branch::setFilenameSuffix(bool b)
+void Branch::setFileNameSuffix(bool b)
{
filenameSuffix_ = b;
}
{
if (str.size() == 7 && str[0] == '#')
color_ = rgbFromHexName(str);
- else
+ else {
// no color set or invalid color - use normal background
- theApp()->getRgbColor(Color_background, color_);
+ // no theApp() with command line export
+ if (theApp())
+ theApp()->getRgbColor(Color_background, color_);
+ else
+ frontend::Application::getRgbColorUncached(Color_background, color_);
+ }
}
Branch br;
br.setBranch(name);
br.setSelected(false);
- br.setFilenameSuffix(false);
+ br.setFileNameSuffix(false);
list.push_back(br);
}
if (j == docstring::npos)
}
-docstring BranchList::getFilenameSuffix() const
+docstring BranchList::getFileNameSuffix() const
{
docstring result;
List::const_iterator it = list.begin();
for (; it != list.end(); ++it) {
- if (it->isSelected() && it->hasFilenameSuffix())
+ if (it->isSelected() && it->hasFileNameSuffix())
result += "-" + it->branch();
}
return support::subst(result, from_ascii("/"), from_ascii("_"));