equal
deleted
inserted
replaced
141 return LogsAbstractModel::createCall(item); |
141 return LogsAbstractModel::createCall(item); |
142 } |
142 } |
143 const LogsMatchesModelItemContainer& matchItem = |
143 const LogsMatchesModelItemContainer& matchItem = |
144 static_cast<const LogsMatchesModelItemContainer&>( item ); |
144 static_cast<const LogsMatchesModelItemContainer&>( item ); |
145 LogsCall* logscall = new LogsCall(matchItem.contact(), matchItem.number()); |
145 LogsCall* logscall = new LogsCall(matchItem.contact(), matchItem.number()); |
146 if (!logscall->isAllowedCallType()) { |
|
147 delete logscall; |
|
148 logscall = 0; |
|
149 } |
|
150 QVariant var = qVariantFromValue(logscall); |
146 QVariant var = qVariantFromValue(logscall); |
151 LOGS_QDEBUG( "logs [ENG] <- LogsMatchesModel::createCall()" ) |
147 LOGS_QDEBUG( "logs [ENG] <- LogsMatchesModel::createCall()" ) |
152 return var; |
148 return var; |
153 } |
149 } |
154 |
150 |
687 list << mFormattedCallerId; |
683 list << mFormattedCallerId; |
688 list << mParentModel.dateAndTimeString( |
684 list << mParentModel.dateAndTimeString( |
689 mEvent->time().toTimeSpec(Qt::LocalTime) ); |
685 mEvent->time().toTimeSpec(Qt::LocalTime) ); |
690 } else if ( mContactId > 0 ) { |
686 } else if ( mContactId > 0 ) { |
691 list << mContactName; |
687 list << mContactName; |
692 list << mContactNumber; |
688 list << mParentModel.phoneNumString(mContactNumber); |
693 } |
689 } |
694 return list; |
690 return list; |
695 } |
691 } |
696 |
692 |
697 // ----------------------------------------------------------------------------- |
693 // ----------------------------------------------------------------------------- |
745 { |
741 { |
746 QString callerId; |
742 QString callerId; |
747 getFormattedName(callerId, entry.firstName()); |
743 getFormattedName(callerId, entry.firstName()); |
748 |
744 |
749 if ( callerId.length() == 0 ) { |
745 if ( callerId.length() == 0 ) { |
750 callerId = entry.phoneNumber().richText(); |
746 callerId = mParentModel.phoneNumString(entry.phoneNumber().richText()); |
751 } |
747 } |
752 |
748 |
753 return callerId.trimmed(); |
749 return callerId.trimmed(); |
754 } |
750 } |
755 |
751 |