diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-13 02:13:22 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-23 02:38:43 +0200 |
| commit | 578ff82fb1d55e4ac6996fe9c4b148c6e2eda679 (patch) | |
| tree | c86b9582a16e85de2a5e6e979d96726d0c87cf55 | |
| parent | 79f7061c5e7cc9c38e2a98dad7c005ce4ff836c8 (diff) | |
| download | kchmviewer-578ff82fb1d55e4ac6996fe9c4b148c6e2eda679.tar.gz kchmviewer-578ff82fb1d55e4ac6996fe9c4b148c6e2eda679.zip | |
Fix inadvertent "TQ" changes.
(cherry picked from commit b0050498932208810dd4555744eb81bb49a95633)
| -rw-r--r-- | lib/libchmfile/libchmfile_search.cpp | 2 | ||||
| -rw-r--r-- | 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 3820879..9a7c216 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 b4b2c3a..e79c723 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 |