--- a/logsui/logscntfinder/inc/logscntfinder.h	Tue May 04 12:39:37 2010 +0300
+++ b/logsui/logscntfinder/inc/logscntfinder.h	Fri May 14 15:52:41 2010 +0300
@@ -24,100 +24,14 @@
 #include <QString>
 #include <qmobilityglobal.h>
 
-
-class LogsCntEntry;
-typedef QObject LogsCntEntryHandle;
-
 QTM_BEGIN_NAMESPACE
 class QContactManager;
 QTM_END_NAMESPACE
 
 QTM_USE_NAMESPACE
 
-class LogsCntText
-{
-public:
-
-    inline LogsCntText() : mHighlights(0){}
-    inline const QString& text() const {return mText;}
-    inline int highlights() const {return mHighlights;}
-    LOGSCNTFINDER_EXPORT QString richText( QString startTag = QString("<b><u>"), 
-                                           QString endTag = QString("</u></b>")) const;
-    
-    
-private:
-    
-    QString mText;
-    QString mTranslatedText;
-    int mHighlights;
-    
-    friend class LogsCntEntry;
-    friend class UT_LogsCntEntry;
-    friend class UT_LogsCntFinder;
-};
-
-typedef QList<LogsCntText> LogsCntTextList;
-
-class LogsCntEntry
-{
-public:
+#include "logscntentry.h"
 
-    enum EntryType {
-        EntryTypeHistory,
-        EntryTypeContact
-    };
-    
-    LOGSCNTFINDER_EXPORT LogsCntEntry( LogsCntEntryHandle& handle, 
-                                       quint32 cid );
-    LogsCntEntry( quint32 cid );
-    LogsCntEntry( const LogsCntEntry& entry );
-    ~LogsCntEntry();
-    LOGSCNTFINDER_EXPORT EntryType type() const;
-    LOGSCNTFINDER_EXPORT const LogsCntTextList& firstName() const;
-    LOGSCNTFINDER_EXPORT const LogsCntTextList& lastName() const;
-    LOGSCNTFINDER_EXPORT quint32 contactId() const;
-    LOGSCNTFINDER_EXPORT LogsCntEntryHandle* handle() const;
-    LOGSCNTFINDER_EXPORT void setFirstName( const QString& name );
-    LOGSCNTFINDER_EXPORT void setLastName( const QString& name );
-    LOGSCNTFINDER_EXPORT const LogsCntText& phoneNumber() const;
-    LOGSCNTFINDER_EXPORT const QString& avatarPath() const;
-    LOGSCNTFINDER_EXPORT void setPhoneNumber( const QString& number );
-    LOGSCNTFINDER_EXPORT void setAvatarPath( const QString& avatarpath );
-    LOGSCNTFINDER_EXPORT const QString& speedDial() const;
-    
-    bool isCached() const;
-    void setHighlights( const QString& pattern );
-    void setSpeedDial( const QString& number );
-    bool match( const QString& pattern ) const;
-
-private:
-    
-    void doSetText( const QString& text, LogsCntTextList& textlist ); 
-    QStringList tokens( const QString& source, const QChar& separ = ' ' ) const;
-    void doSetHighlights( const QString& pattern, LogsCntTextList& nameArray );
-    void resetHighlights( LogsCntTextList& nameArray );
-    bool doSimpleMatch( const QString& pattern ) const;
-    bool doComplexMatch( QStringList patternArray ) const;
-    void padWithZeros( QString& token, const QString& source, int padIndex ) const;
-    
-
-private:
-    
-    EntryType mType;
-    quint32 mCid;
-    LogsCntTextList mFirstName;
-    LogsCntTextList mLastName;
-    bool mCached;
-    LogsCntEntryHandle* mHandle;
-    LogsCntText mPhoneNumber;
-    QString mAvatarPath;
-    QString mSpeedDial;
-    
-    friend class UT_LogsCntEntry;
-    friend class UT_LogsCntFinder;
-};
-
-typedef QList<LogsCntEntry*> LogsCntEntryList;
     
 /**
  * Log events and contacts finder
@@ -199,12 +113,14 @@
     void addResult( LogsCntEntry* entry );
     void updateResult( LogsCntEntry* entry );
     bool isProgressivePattern( const QString& pattern ) const;
+    void setCurrentPattern( const QString& pattern );
     
     
     
 private:
     
     QString mCurrentPredictivePattern;
+    QString mCurrentInputPattern;
     LogsCntEntryList mResults;
     QContactManager* mContactManager;
     LogsCntEntryList mHistoryEvents;