diff options
| -rw-r--r-- | src/gui/widgets/qmenu.cpp | 37 | ||||
| -rw-r--r-- | tools/qdoc3/doc.cpp | 11 |
2 files changed, 12 insertions, 36 deletions
diff --git a/src/gui/widgets/qmenu.cpp b/src/gui/widgets/qmenu.cpp index 74c2a9e..56ca004 100644 --- a/src/gui/widgets/qmenu.cpp +++ b/src/gui/widgets/qmenu.cpp @@ -1247,37 +1247,16 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) response to button presses; these are just like context menus except for how they are invoked. - \raw HTML - <table align="center" cellpadding="0"> - <tr> - <td> - \endraw - \inlineimage plastique-menu.png - \raw HTML - </td> - <td> - \endraw - \inlineimage windowsxp-menu.png - \raw HTML - </td> - <td> - \endraw - \inlineimage macintosh-menu.png - \raw HTML - </td> - - </tr> - <tr> - <td colspan="3"> - \endraw - A menu shown in \l{Plastique Style Widget Gallery}{Plastique widget style}, + \table + \row + \o \inlineimage plastique-menu.png + \o \inlineimage windowsxp-menu.png + \o \inlineimage macintosh-menu.png + \row + \o {3,1} A menu shown in \l{Plastique Style Widget Gallery}{Plastique widget style}, \l{Windows XP Style Widget Gallery}{Windows XP widget style}, and \l{Macintosh Style Widget Gallery}{Macintosh widget style}. - \raw HTML - </td> - </tr> - </table> - \endraw + \endtable \section1 Actions diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp index 4873d8b..f7f537c 100644 --- a/tools/qdoc3/doc.cpp +++ b/tools/qdoc3/doc.cpp @@ -562,24 +562,21 @@ void DocParser::parse(const QString& source, case CMD_DIV: x = getArgument(true); leavePara(); - enterPara(Atom::DivLeft, Atom::DivRight,x); -#if 0 if (x.contains('=')) { - leavePara(); enterPara(Atom::DivLeft, Atom::DivRight,x); + openedCommands.push(cmd); } else { - leavePara(); append(Atom::DivLeft, x); openedCommands.push(cmd); enterPara(); } -#endif + break; case CMD_ENDDIV: leavePara(); - // append(Atom::DivRight); - // closeCommand(cmd); + append(Atom::DivRight); + closeCommand(cmd); break; case CMD_CODELINE: { |