equal
deleted
inserted
replaced
59 connect(m_networkInfo, SIGNAL (networkNameChanged(QSystemNetworkInfo::NetworkMode,QString)), |
59 connect(m_networkInfo, SIGNAL (networkNameChanged(QSystemNetworkInfo::NetworkMode,QString)), |
60 this, SLOT(networkNameChanged(QSystemNetworkInfo::NetworkMode, QString))); |
60 this, SLOT(networkNameChanged(QSystemNetworkInfo::NetworkMode, QString))); |
61 setTitle(networkName); |
61 setTitle(networkName); |
62 |
62 |
63 // Capturing long press of end key |
63 // Capturing long press of end key |
64 m_keyCapture = new XqKeyCapture(); |
64 m_keyCapture = new XQKeyCapture(); |
65 |
65 |
66 // Dialpad |
66 // Dialpad |
67 m_dialpad = new Dialpad(m_window); |
67 m_dialpad = new Dialpad(m_window); |
68 m_dialpad->setCallButtonEnabled(false); |
68 m_dialpad->setCallButtonEnabled(false); |
69 m_dialpad->setTapOutsideDismiss(true); |
69 m_dialpad->setTapOutsideDismiss(true); |
187 m_bubbleManager->clearActions (bubbleId); |
187 m_bubbleManager->clearActions (bubbleId); |
188 QSignalMapper *mapper = m_bubbleMap.value(bubbleId); |
188 QSignalMapper *mapper = m_bubbleMap.value(bubbleId); |
189 |
189 |
190 if (mapper) { |
190 if (mapper) { |
191 QList<HbAction *> *actions = m_bubbleActionMap.value(bubbleId); |
191 QList<HbAction *> *actions = m_bubbleActionMap.value(bubbleId); |
192 |
192 if (actions) { |
193 foreach (HbAction *action, *actions ) { |
193 foreach (HbAction *action, *actions ) { |
194 mapper->removeMappings(action); |
194 mapper->removeMappings(action); |
195 delete action; |
195 } |
196 } |
196 |
197 |
197 qDeleteAll(*actions); |
198 actions->clear(); |
198 actions->clear(); |
|
199 delete actions; |
|
200 } |
|
201 |
199 m_bubbleMap.remove(bubbleId); |
202 m_bubbleMap.remove(bubbleId); |
200 m_bubbleActionMap.remove(bubbleId); |
203 m_bubbleActionMap.remove(bubbleId); |
201 delete mapper; |
204 delete mapper; |
202 delete actions; |
|
203 } |
205 } |
204 |
206 |
205 } |
207 } |
206 |
208 |
207 void PhoneUIQtView::setToolbarActions(const QList<PhoneAction*>& actions) |
209 void PhoneUIQtView::setToolbarActions(const QList<PhoneAction*>& actions) |