TQt4 port kchmviewer

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kchmviewer@1234150 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 21 insertions, 21 deletions

diff --git a/lib/libchmfile/libchmfile_search.cpp b/lib/libchmfile/libchmfile_search.cpp
index 41acfb3..3820879 100644
--- a/lib/libchmfile/libchmfile_search.cpp
+++ b/lib/libchmfile/libchmfile_search.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include "libchmfile.h"
 #include "libchmfileimpl.h"
@@ -28,20 +28,20 @@
 #define DEBUG_SEARCH(A)
 
 
-static inline void validateWord ( QString & word, bool & query_valid )
+static inline void validateWord ( TQString & word, bool & query_valid )
 {
-	QRegExp rxvalid ("[^\\d\\w_\\.]+");
+	TQRegExp rxvalid ("[^\\d\\w_\\.]+");
 	
-	QString orig = word;
+	TQString orig = word;
 	word.remove ( rxvalid );
 		
 	if ( word != orig )
 		query_valid = false;
 }
 
-static inline void validateWords ( QStringList & wordlist, bool & query_valid )
+static inline void validateWords ( TQStringList & wordlist, bool & query_valid )
 {
-	QRegExp rxvalid ("[^\\d\\w_\\.]+");
+	TQRegExp rxvalid ("[^\\d\\w_\\.]+");
 	
 	for ( unsigned int i = 0; i < wordlist.size(); i++ )
 		validateWord ( wordlist[i], query_valid );
@@ -116,7 +116,7 @@ static inline void findNextWords ( QT34VECTOR<u_int64_t> & src, const QT34VECTOR
 }
 
 
-inline bool searchPhrase( LCHMFileImpl * impl, const QStringList & phrase, LCHMSearchProgressResults & results )
+inline bool searchPhrase( LCHMFileImpl * impl, const TQStringList & phrase, LCHMSearchProgressResults & results )
 {
 	// Accumulate the phrase data here.
 	LCHMSearchProgressResults phrasekeeper;
@@ -173,11 +173,11 @@ inline bool searchPhrase( LCHMFileImpl * impl, const QStringList & phrase, LCHMS
 
 
 
-bool LCHMFile::searchQuery( const QString& inquery, QStringList * searchresults, unsigned int limit )
+bool LCHMFile::searchQuery( const TQString& inquery, TQStringList * searchresults, unsigned int limit )
 {
-	QStringList words_must_exist, words_must_not_exist, words_highlight;
-	QT34VECTOR<QStringList> phrases_must_exist;
-	QString query = inquery;
+	TQStringList words_must_exist, words_must_not_exist, words_highlight;
+	QT34VECTOR<TQStringList> phrases_must_exist;
+	TQString query = inquery;
 	bool query_valid = true;
 	LCHMSearchProgressResults results;
 	int pos;
@@ -196,15 +196,15 @@ bool LCHMFile::searchQuery( const QString& inquery, QStringList * searchresults,
 	*   If there is no prefix, the word considered as required.
 	*/
 	
-	QRegExp rxphrase( "\"(.*)\"" );
-	QRegExp rxword( "([^\\s]+)" );
+	TQRegExp rxphrase( "\"(.*)\"" );
+	TQRegExp rxword( "([^\\s]+)" );
 	rxphrase.setMinimal( TRUE );
 
 	// First, get the phrase queries
 	while ( (pos = rxphrase.search (query, 0)) != -1 )
 	{
 		// A phrase query found. Locate its boundaries, and parse it.
-		QStringList plist = QStringList::split ( QRegExp ("\\s+"), rxphrase.cap ( 1 ));
+		TQStringList plist = TQStringList::split ( TQRegExp ("\\s+"), rxphrase.cap ( 1 ));
 		
 		validateWords ( plist, query_valid );
 		
@@ -218,8 +218,8 @@ bool LCHMFile::searchQuery( const QString& inquery, QStringList * searchresults,
 	while ( (pos = rxword.search (query, 0)) != -1 )
 	{
 		// A phrase query found. Locate its boundaries, and parse it.
-		QString word = rxword.cap ( 1 );
-		QChar type = '+';
+		TQString word = rxword.cap ( 1 );
+		TQChar type = '+';
 		
 		if ( word[0] == '-' || word[0] == '+' )
 		{
@@ -237,17 +237,17 @@ bool LCHMFile::searchQuery( const QString& inquery, QStringList * searchresults,
 		query.remove (pos, rxword.matchedLength());
 	}
 
-#if defined (DUMP_SEARCH_QUERY)
+#if defined (DUMP_SEARCH_TQUERY)
 	// Dump the search query
-	QString qdump;
+	TQString qdump;
 	for ( i = 0; i < phrases_must_exist.size(); i++ )
-		qdump += QString(" \"") + phrases_must_exist[i].join (" ") + QString ("\"");
+		qdump += TQString(" \"") + phrases_must_exist[i].join (" ") + TQString ("\"");
 
 	for ( i = 0; i < words_must_not_exist.size(); i++ )
-		qdump += QString (" -") + words_must_not_exist[i];
+		qdump += TQString (" -") + words_must_not_exist[i];
 	
 	for ( i = 0; i < words_must_exist.size(); i++ )
-		qdump += QString (" +") + words_must_exist[i];
+		qdump += TQString (" +") + words_must_exist[i];
 
 	qDebug ("Search query dump: %s", qdump.ascii());
 #endif