From b0050498932208810dd4555744eb81bb49a95633 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 13 Apr 2012 02:13:22 -0500 Subject: [PATCH] Fix inadvertent "TQ" changes. --- lib/libchmfile/libchmfile_search.cpp | 2 +- src/kchmsearchengine_impl.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/libchmfile/libchmfile_search.cpp b/lib/libchmfile/libchmfile_search.cpp index 13d4212..928a809 100644 --- a/lib/libchmfile/libchmfile_search.cpp +++ b/lib/libchmfile/libchmfile_search.cpp @@ -237,7 +237,7 @@ bool LCHMFile::searchQuery( const TQString& inquery, TQStringList * searchresult query.remove (pos, rxword.matchedLength()); } -#if defined (DUMP_SEARCH_TQUERY) +#if defined (DUMP_SEARCH_QUERY) // Dump the search query TQString qdump; for ( i = 0; i < phrases_must_exist.size(); i++ ) diff --git a/src/kchmsearchengine_impl.cpp b/src/kchmsearchengine_impl.cpp index 0352ee3..89db7e7 100644 --- a/src/kchmsearchengine_impl.cpp +++ b/src/kchmsearchengine_impl.cpp @@ -183,12 +183,12 @@ bool Index::parseDocumentToStringlist( const TQString & filename, TQStringList & { STATE_OUTSIDE_TAGS, // outside HTML tags; parse text STATE_IN_HTML_TAG, // inside HTML tags; wait for end tag - STATE_IN_TQUOTES, // inside HTML tags and inside quotes; wait for end quote (in var QuoteChar) + STATE_IN_QUOTES, // inside HTML tags and inside quotes; wait for end quote (in var QuoteChar) STATE_IN_HTML_ENTITY, // inside HTML entity; parse the entity }; state_t state = STATE_OUTSIDE_TAGS; - TQChar QuoteChar; // used in STATE_IN_TQUOTES + TQChar QuoteChar; // used in STATE_IN_QUOTES for ( unsigned int j = 0; j < text.length(); j++ ) { @@ -203,7 +203,7 @@ bool Index::parseDocumentToStringlist( const TQString & filename, TQStringList & // Ignore everything until we see '>' (end of HTML tag) or quote char (quote start) if ( ch == '"' || ch == '\'' ) { - state = STATE_IN_TQUOTES; + state = STATE_IN_QUOTES; QuoteChar = ch; } else if ( ch == '>' ) @@ -211,7 +211,7 @@ bool Index::parseDocumentToStringlist( const TQString & filename, TQStringList & continue; } - else if ( state == STATE_IN_TQUOTES ) + else if ( state == STATE_IN_QUOTES ) { // We are inside quoted text inside HTML tag. // Ignore everything until we see the quote character again