diff -r acd4e87b24b4 -r 2f0af9ba7665 logsui/logscntfinder/inc/logscntentry.h --- a/logsui/logscntfinder/inc/logscntentry.h Fri Sep 17 16:47:32 2010 +0300 +++ b/logsui/logscntfinder/inc/logscntentry.h Fri Oct 15 14:47:48 2010 +0300 @@ -22,18 +22,17 @@ #include #include #include - +#include "logspredictivetranslator.h" class LogsCntEntry; typedef QObject LogsCntEntryHandle; -class LogsCntText +class LogsCntText : public LogsCntToken { + 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(""), QString endTag = QString("")) const; @@ -41,8 +40,6 @@ private: - QString mText; - QString mTranslatedText; int mHighlights; friend class LogsCntEntry; @@ -91,8 +88,6 @@ void doSetHighlights( const QString& patternItem, QMutableListIterator& names ); void resetHighlights( LogsCntTextList& nameArray ); - bool doSimpleMatch( const QString& pattern ) const; - bool doComplexMatch( const QStringList& patternArray ) const; int startsWith( const LogsCntText& nameItem, const QString& pattern ) const; private: