diff -r 41c0a814d878 -r 6c9acdc6adc0 logsui/logsengine/inc/logsmatchesmodel.h --- a/logsui/logsengine/inc/logsmatchesmodel.h Fri Jun 11 13:38:41 2010 +0300 +++ b/logsui/logsengine/inc/logsmatchesmodel.h Thu Jun 24 14:44:14 2010 +0300 @@ -26,6 +26,7 @@ class LogsDbConnector; class LogsCntFinder; class LogsCntEntry; +class LogsCntText; class LogsContact; class LogsMatchesModelItemContainer; class LogsThumbIconManager; @@ -74,6 +75,7 @@ void eventsUpdated(const QModelIndex& first, const QModelIndex& last); void eventsAdded(const QModelIndex& parent, int first, int last); void eventsRemoved(const QModelIndex& parent, int first, int last); + void eventsResetted(); void doSearchQuery(); void doModelReset(); @@ -89,6 +91,7 @@ void getLogsMatches( const QString& pattern, bool async = false, bool force = false ); void updateSearchEntry(LogsCntEntry& entry, LogsEvent& event); QString stripPhoneNumber(const QString& phoneNumber) const; + void addEventForSearching(int index, LogsEvent& event); private: //data @@ -125,6 +128,7 @@ unsigned int contact() const; QString number() const; QString contactName() const; + QString contactNameSimple() const; bool isNull() const; bool isEventMatch() const; QStringList texts(); @@ -136,13 +140,18 @@ QString getFormattedCallerId(const LogsCntEntry& entry) const; void getFormattedContactInfo( - const LogsCntEntry& entry, QString& contactName, QString& contactNumber ) const; + const LogsCntEntry& entry, QString& contactName, + QString& contactNameSimple, QString& contactNumber ) const; + void getFormattedName(QString& formattedName, const QList& list) const; + void getFormattedName(QString& formattedName, QString& formattedNameSimple, + const QList& list) const; private: LogsAbstractModel& mParentModel; unsigned int mContactId; QString mContactName; + QString mContactNameSimple; QString mContactNumber; QString mAvatarPath; QString mFormattedCallerId;