class IndexNamesEqual : public std::unary_function<Index, bool>
{
public:
- IndexNamesEqual(docstring const & name) : name_(name) {}
+ IndexNamesEqual(docstring const & name)
+ : name_(name)
+ {}
bool operator()(Index const & index) const
{
class IndexHasShortcut : public std::unary_function<Index, bool>
{
public:
- IndexHasShortcut(docstring const & shortcut) : shortc_(shortcut) {}
+ IndexHasShortcut(docstring const & shortcut)
+ : shortc_(shortcut)
+ {}
bool operator()(Index const & index) const
{
docstring shortc_;
};
-}
+} // namespace
/////////////////////////////////////////////////////////////////////
// no theApp() with command line export
if (theApp())
theApp()->getRgbColor(Color_indexlabel, color_);
+ else
+ frontend::Application::getRgbColorUncached(Color_indexlabel, color_);
}
{
if (str.size() == 7 && str[0] == '#')
color_ = rgbFromHexName(str);
- else
+ else {
// no color set or invalid color -- use predefined color
- theApp()->getRgbColor(Color_indexlabel, color_);
+ // no theApp() with command line export
+ if (theApp())
+ theApp()->getRgbColor(Color_indexlabel, color_);
+ else
+ frontend::Application::getRgbColorUncached(Color_indexlabel, color_);
+ }
}
docstring sc = s.empty() ?
trim(lowercase(name.substr(0, 3))) : s;
if (findShortcut(sc) != 0) {
- int i = 1;
- docstring scn = sc + convert<docstring>(i);
+ int k = 1;
+ docstring scn = sc + convert<docstring>(k);
while (findShortcut(scn) != 0) {
- ++i;
- scn = sc + convert<docstring>(i);
+ ++k;
+ scn = sc + convert<docstring>(k);
}
in.setShortcut(scn);
} else