Mercurial > octave-nkf

comparison libgui/graphics/Menu.cc @ 19659:2f4406e9dad6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of gui-release to default.
author John W. Eaton <jwe@octave.org>
date Fri, 23 Jan 2015 16:40:25 -0500
parents dbb207d10d7c af0399a5aae0
children 3cc0734283dc
comparison
equal deleted inserted replaced
19647:e8e3a89fa370 19659:2f4406e9dad6
56 return QKeySequence (); 56 return QKeySequence ();
57 } 57 }
58 58
59 Menu* Menu::create (const graphics_object& go) 59 Menu* Menu::create (const graphics_object& go)
60 { 60 {
61 Object* parent = Object::parentObject (go); 61 Object* parent_obj = Object::parentObject (go);
62 62
63 if (parent) 63 if (parent_obj)
64 { 64 {
65 QObject* qObj = parent->qObject (); 65 QObject* qObj = parent_obj->qObject ();
66 66
67 if (qObj) 67 if (qObj)
68 return new Menu (go, new QAction (qObj), parent); 68 return new Menu (go, new QAction (qObj), parent_obj);
69 } 69 }
70 70
71 return 0; 71 return 0;
72 } 72 }
73 73