Switch to unified view

a/src/qtgui/rclhelp.cpp b/src/qtgui/rclhelp.cpp
...
...
32
void HelpClient::installMap(string wname, string section)
32
void HelpClient::installMap(string wname, string section)
33
{
33
{
34
    helpmap[wname] = section;
34
    helpmap[wname] = section;
35
}
35
}
36
36
37
HelpClient::HelpClient(QObject *parent, const char *name)
37
HelpClient::HelpClient(QObject *parent, const char *)
38
    : QObject(parent, name)
38
    : QObject(parent)
39
{
39
{
40
    parent->installEventFilter(this);
40
    parent->installEventFilter(this);
41
}
41
}
42
    
42
    
43
bool HelpClient::eventFilter(QObject *obj, QEvent *event)
43
bool HelpClient::eventFilter(QObject *obj, QEvent *event)
...
...
50
    if (ke->key() == Qt::Key_F1 || ke->key() == Qt::Key_Help) {
50
    if (ke->key() == Qt::Key_F1 || ke->key() == Qt::Key_Help) {
51
        if (obj->isWidgetType()) {
51
        if (obj->isWidgetType()) {
52
        QWidget *widget = static_cast<QWidget *>(obj)->focusWidget();
52
        QWidget *widget = static_cast<QWidget *>(obj)->focusWidget();
53
        map<string, string>::iterator it = helpmap.end();
53
        map<string, string>::iterator it = helpmap.end();
54
        while (widget) {
54
        while (widget) {
55
          it = helpmap.find(widget->name());
55
          it = helpmap.find((const char *)widget->objectName().toUtf8());
56
            if (it != helpmap.end())
56
            if (it != helpmap.end())
57
            break;
57
            break;
58
            widget = widget->parentWidget();
58
            widget = widget->parentWidget();
59
        }
59
        }
60
        if (time(0) - last_start > 5) {
60
        if (time(0) - last_start > 5) {