48     return callId;

    48     return callId;

    49 }

    49 }

    50 

    50 

    51 int PhoneBubbleWrapper::createCallHeader (int callId)

    51 int PhoneBubbleWrapper::createCallHeader (int callId)

    52 {

    52 {

    53     int bubble;

    54     int bubble;

    54 

    55 

    55     if (!m_bubbles.contains (callId)) {

    56     if (!m_bubbles.contains (callId)) {

    56         bubble = m_bubbleManager.createCallHeader ();

    57         bubble = m_bubbleManager.createCallHeader ();

    57         m_bubbles.insert (callId, bubble);

    58         m_bubbles.insert (callId, bubble);

    63     return bubble;

    64     return bubble;

    64 }

    65 }

    65 

    66 

    66 void PhoneBubbleWrapper::removeCallHeader (int callId)

    67 void PhoneBubbleWrapper::removeCallHeader (int callId)

    67 {

    68 {

    68     if (m_bubbles.contains (callId)) {

    70     if (m_bubbles.contains (callId)) {

    69         m_bubbleManager.removeCallHeader (m_bubbles [callId]);

    71         m_bubbleManager.removeCallHeader (m_bubbles [callId]);

    70         m_bubbles.remove (callId);       

    72         m_bubbles.remove (callId);       

    71     }

    73     }

    72 }

    74 }

   194     }

   196     }

   195 }

   197 }

   196 

   198 

   197 int PhoneBubbleWrapper::activeCallCount()

   199 int PhoneBubbleWrapper::activeCallCount()

   198 {

   200 {

   199     int count(0);

   202     int count(0);

   200     QMap<int, int> callStateList = callStates();

   203     QMap<int, int> callStateList = callStates();

   201     

   204     

   202     for (int i=0; i<callStateList.size(); ++i) {

   205     for (int i=0; i<callStateList.size(); ++i) {

   203         if ( callStateList.values().at(i) == EPEStateConnected ||

   206         if ( callStateList.values().at(i) == EPEStateConnected ||

   212     return count;

   215     return count;

   213 }

   216 }

   214 

   217 

   215 QMap<int, int> PhoneBubbleWrapper::callStates() const 

   218 QMap<int, int> PhoneBubbleWrapper::callStates() const 

   216 {

   219 {

   217     QMap<int, int> ret;

   221     QMap<int, int> ret;

   218     

   222     

   219     for (int i=0; i<m_callStates.size(); ++i) {

   223     for (int i=0; i<m_callStates.size(); ++i) {

   220         if ( false == m_conferenceList.contains(m_callStates.keys().at(i)) 

   224         if ( false == m_conferenceList.contains(m_callStates.keys().at(i)) 

   221              && m_bubbles.keys().contains(m_callStates.keys().at(i)) ) {

   225              && m_bubbles.keys().contains(m_callStates.keys().at(i)) ) {

   227     return ret;

   231     return ret;

   228 }

   232 }

   229 

   233 

   230 QMap<int, int> PhoneBubbleWrapper::bubbles() const

   234 QMap<int, int> PhoneBubbleWrapper::bubbles() const

   231 {

   235 {

   232     QMap<int, int> ret;

   237     QMap<int, int> ret;

   233     

   238     

   234     for (int i=0; i<m_bubbles.size(); ++i) {

   239     for (int i=0; i<m_bubbles.size(); ++i) {

   235         if ( false == m_conferenceList.contains(m_bubbles.keys().at(i)) ) {

   240         if ( false == m_conferenceList.contains(m_bubbles.keys().at(i)) ) {

   236             ret.insert(m_bubbles.keys().at(i), m_bubbles.value(m_bubbles.keys().at(i)));

   241             ret.insert(m_bubbles.keys().at(i), m_bubbles.value(m_bubbles.keys().at(i)));

   244         int callId,

   249         int callId,

   245         int callState,

   250         int callState,

   246         const TDesC &labelText, 

   251         const TDesC &labelText, 

   247         const TDesC &cliText)

   252         const TDesC &cliText)

   248 {

   253 {

   249     int callId1;

   255     int callId1;

   250     int callId2;

   256     int callId2;

   251     int bubble = -1;

   257     int bubble = -1;

   252     if (getCallIdsForConference(callId1, callId2)) {

   258     if (getCallIdsForConference(callId1, callId2)) {

   253         m_bubbleManager.startChanges();

   259         m_bubbleManager.startChanges();

   293     return m_conferenceList.contains(callId);

   299     return m_conferenceList.contains(callId);

   294 }

   300 }

   295 

   301 

   296 void PhoneBubbleWrapper::removeCallFromConference(int callId)

   302 void PhoneBubbleWrapper::removeCallFromConference(int callId)

   297 {

   303 {

   298     if (m_conferenceList.contains(callId)) {

   305     if (m_conferenceList.contains(callId)) {

   299         m_bubbleManager.startChanges();

   306         m_bubbleManager.startChanges();

   300         if(1<m_conferenceList.size()) {

   307         if(1<m_conferenceList.size()) {

   301             m_bubbleManager.removeRowFromConference(m_bubbles.value(callId));

   308             m_bubbleManager.removeRowFromConference(m_bubbles.value(callId));

   302             m_conferenceList.removeOne(callId);

   309             m_conferenceList.removeOne(callId);