equal
deleted
inserted
replaced
17 |
17 |
18 #include "hbmenu.h" |
18 #include "hbmenu.h" |
19 #include "hbmenudata.h" |
19 #include "hbmenudata.h" |
20 |
20 |
21 HbAction *HbMenuData::mMenuAction = 0; |
21 HbAction *HbMenuData::mMenuAction = 0; |
22 HbAction *HbMenuData::mActiveAction = 0; |
|
23 bool HbMenuData::mEnabledSetted = false; |
22 bool HbMenuData::mEnabledSetted = false; |
24 bool HbMenuData::mReturnEmptyActionList = false; |
23 bool HbMenuData::mReturnEmptyActionList = false; |
25 QPointF HbMenuData::mExecPoint = QPointF(); |
24 QPointF HbMenuData::mExecPoint = QPointF(); |
26 |
25 |
27 |
26 |
57 return HbMenuData::mMenuAction; |
56 return HbMenuData::mMenuAction; |
58 } |
57 } |
59 |
58 |
60 HbAction* HbMenu::activeAction() |
59 HbAction* HbMenu::activeAction() |
61 { |
60 { |
62 return HbMenuData::mActiveAction; |
61 return mActiveAction; |
63 } |
62 } |
64 |
63 |
65 void HbMenu::setActiveAction(HbAction *action) |
64 void HbMenu::setActiveAction(HbAction *action) |
66 { |
65 { |
67 if (HbMenuData::mActiveAction) |
66 mActiveAction = action; |
68 { |
|
69 delete HbMenuData::mActiveAction; |
|
70 HbMenuData::mActiveAction = 0; |
|
71 } |
|
72 HbMenuData::mActiveAction = action; |
|
73 } |
67 } |
74 |
68 |
75 void HbMenu::setEnabled(bool enabled) |
69 void HbMenu::setEnabled(bool enabled) |
76 { |
70 { |
77 HbMenuData::mEnabledSetted = enabled; |
71 HbMenuData::mEnabledSetted = enabled; |