kconfig: qconf: refactor ConfigInfoView::clicked()

Most of the code in ConfigInfoView::clicked() is unnecessary.
There is no need to use the regular expression to search for a symbol.
Calling sym_find() is simpler and faster.

The hyperlink always begins with the "s" tag, and there is no other
tag used. Remove it.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index a208ef33128ff3a4376f168bd2563a61bb9c84f3..f59a9597f09b5473ec229c91d36d2f7006d305b7 100644 (file)
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1001,7 +1001,7 @@ void ConfigInfoView::menuInfo(void)
                        if (sym->name) {
                                stream << " (";
                                if (showDebug())
-                                       stream << "<a href=\"s" << sym->name << "\">";
+                                       stream << "<a href=\"" << sym->name << "\">";
                                stream << print_filter(sym->name);
                                if (showDebug())
                                        stream << "</a>";
@@ -1010,7 +1010,7 @@ void ConfigInfoView::menuInfo(void)
                } else if (sym->name) {
                        stream << "<big><b>";
                        if (showDebug())
-                               stream << "<a href=\"s" << sym->name << "\">";
+                               stream << "<a href=\"" << sym->name << "\">";
                        stream << print_filter(sym->name);
                        if (showDebug())
                                stream << "</a>";
@@ -1124,7 +1124,7 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char
        QTextStream *stream = reinterpret_cast<QTextStream *>(data);
 
        if (sym && sym->name && !(sym->flags & SYMBOL_CONST)) {
-               *stream << "<a href=\"s" << sym->name << "\">";
+               *stream << "<a href=\"" << sym->name << "\">";
                *stream << print_filter(str);
                *stream << "</a>";
        } else {
@@ -1134,39 +1134,11 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char
 
 void ConfigInfoView::clicked(const QUrl &url)
 {
-       QByteArray str = url.toEncoded();
-       const std::size_t count = str.size();
-       char *data = new char[count + 2];  // '$' + '\0'
-       struct symbol **result;
-       struct menu *m = NULL;
+       struct menu *m;
 
-       if (count < 1) {
-               delete[] data;
-               return;
-       }
-
-       memcpy(data, str.constData(), count);
-       data[count] = '\0';
-
-       /* Seek for exact match */
-       data[0] = '^';
-       strcat(data, "$");
-       result = sym_re_search(data);
-       if (!result) {
-               delete[] data;
-               return;
-       }
-
-       sym = *result;
-
-       /* Seek for the menu which holds the symbol */
-       for (struct property *prop = sym->prop; prop; prop = prop->next) {
-                   if (prop->type != P_PROMPT && prop->type != P_MENU)
-                           continue;
-                   m = prop->menu;
-                   break;
-       }
+       sym = sym_find(url.toEncoded().constData());
 
+       m = sym_get_prompt_menu(sym);
        if (!m) {
                /* Symbol is not visible as a menu */
                symbolInfo();
@@ -1174,9 +1146,6 @@ void ConfigInfoView::clicked(const QUrl &url)
        } else {
                emit menuSelected(m);
        }
-
-       free(result);
-       delete[] data;
 }
 
 void ConfigInfoView::contextMenuEvent(QContextMenuEvent *event)