From 509ed151ac07ec63fff1185d5e325e4588007c9f Mon Sep 17 00:00:00 2001 From: John Levon Date: Wed, 7 Aug 2002 15:18:22 +0000 Subject: [PATCH] fix compile git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4891 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 4 ++++ src/frontends/qt2/Menubar_pimpl.C | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index cff469664a..ecc20a18e3 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2002-08-07 John Levon + + * Menubar_pimpl.C: fix compile for gcc 3.1 + 2002-08-06 John Levon * ui/QSpellcheckerDialogBase.ui: diff --git a/src/frontends/qt2/Menubar_pimpl.C b/src/frontends/qt2/Menubar_pimpl.C index ef8d4ac69d..6d9cfa47c7 100644 --- a/src/frontends/qt2/Menubar_pimpl.C +++ b/src/frontends/qt2/Menubar_pimpl.C @@ -75,7 +75,7 @@ Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe) Menu tomenu; Menu const frommenu = menubackend_.getMenu(m->submenuname()); menubackend_.expand(frommenu, tomenu, owner_->buffer()); - fillMenu(createMenu(owner_->menuBar(), m), tomenu); + fillMenu(createMenu(owner_->menuBar(), &(*m)), tomenu); } } @@ -100,10 +100,10 @@ void Menubar::Pimpl::fillMenu(QMenuData * qmenu, Menu const & menu) if (m->kind() == MenuItem::Separator) { qmenu->insertSeparator(); } else if (m->kind() == MenuItem::Submenu) { - fillMenu(createMenu(qmenu, m), *m->submenu()); + fillMenu(createMenu(qmenu, &(*m)), *m->submenu()); } else { qmenu->insertItem(getLabel(*m).c_str(), m->action()); - MenuItemInfo const info(qmenu, m->action(), m); + MenuItemInfo const info(qmenu, m->action(), &(*m)); items_[m->label()] = info; updateItem(info); }