More Qt4 port and some small fixes

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@351 17fca916-40b9-46aa-a4ea-0a15b648b75c

5 files changed, 66 insertions, 27 deletions

diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index a3e04d6ca..c416b714e 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -52,7 +52,9 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 //#warning "Re enable this when using Qt 3.0 : QProcess "
 	m_pTextBrowser = new QTextBrowser(this,"text_browser");
 	m_pTextBrowser->setFrameStyle(QFrame::StyledPanel|QFrame::Sunken);
+#ifndef COMPILE_USE_QT4
 	m_pTextBrowser->setFocusPolicy(QWidget::NoFocus);
+#endif
 	m_pToolBar = new KviTalHBox(this);
 
 	m_pBtnIndex = new KviStyledToolButton(m_pToolBar);
@@ -97,7 +99,11 @@ KviHelpWidget::~KviHelpWidget()
 
 void KviHelpWidget::showIndex()
 {
+#ifdef COMPILE_USE_QT4
+	m_pTextBrowser->setSource(QUrl("index.html"));
+#else
 	m_pTextBrowser->setSource("index.html");
+#endif
 }
 
 void KviHelpWidget::resizeEvent(QResizeEvent *e)
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index eb40416ac..197e9e811 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -38,7 +38,7 @@
 #include <qmessagebox.h>
 #include <qregexp.h>
 #include <qtooltip.h>
-#include <qvaluelist.h>
+#include "kvi_valuelist.h"
 
 extern Index        * g_pDocIndex;
 extern KviPtrList<KviHelpWindow> * g_pHelpWindowList;
@@ -59,7 +59,11 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
 		if ( QFileInfo( szDoclist ).exists() && QFileInfo( szDict ).exists() ) {
 			g_pDocIndex->readDict();
 		} else {
+#ifdef COMPILE_USE_QT4
+			QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 0,100 );
+#else
 			QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 );
+#endif
 			connect(g_pDocIndex,SIGNAL(indexingProgress(int)), pProgressDialog, SLOT(setProgress(int)) );
 			g_pDocIndex->makeIndex();
 			g_pDocIndex->writeDict();
@@ -70,7 +74,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
 	}
 	
 	g_pHelpWindowList->append(this);
-	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter");
+	m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter");
 	m_pHelpWidget = new KviHelpWidget(m_pSplitter,lpFrm);
 
 	m_pToolBar=new KviTalVBox(m_pSplitter);
@@ -110,7 +114,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
 	m_pResultBox = new KviTalListBox(m_pSearchTab);
 	connect(m_pResultBox,SIGNAL(selected(int)),this,SLOT(searchSelected ( int )));
 	
-	QValueList<int> li;
+	KviValueList<int> li;
 	li.append(width()-80);
 	li.append(80);
 	m_pSplitter->setSizes(li);
@@ -130,7 +134,7 @@ void KviHelpWindow::saveProperties(KviConfig *cfg)
 
 void KviHelpWindow::loadProperties(KviConfig *cfg)
 {
-	QValueList<int> def;
+	KviValueList<int> def;
 	int w = width();
 	def.append((w * 82) / 100);
 	def.append((w * 18) / 100);
@@ -142,7 +146,11 @@ void KviHelpWindow::loadProperties(KviConfig *cfg)
 void KviHelpWindow::refreshIndex()
 {
 	m_pIndexListBox->clear();
+#ifdef COMPILE_USE_QT4
+	QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 0,100 );
+#else
 	QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 );
+#endif
 	connect(g_pDocIndex,SIGNAL(indexingProgress(int)), pProgressDialog, SLOT(setProgress(int)) );
 	g_pDocIndex->makeIndex();
 	g_pDocIndex->writeDict();
@@ -173,7 +181,11 @@ void KviHelpWindow::startSearch()
 	(*it) = (*it).replace( "\"", "" );
     }
     if ( str.contains( '\"' ) ) {
+#ifdef COMPILE_USE_QT4
+	if ( (str.count( '\"' ))%2 == 0 ) {
+#else
 	if ( (str.contains( '\"' ))%2 == 0 ) {
+#endif
 	    int beg = 0;
 	    int end = 0;
 	    QString s;
@@ -199,7 +211,11 @@ void KviHelpWindow::startSearch()
 	    return;
 	}
     }
+#ifdef COMPILE_USE_QT4
+    setCursor( Qt::WaitCursor );
+#else
     setCursor( waitCursor );
+#endif
     m_foundDocs.clear();
     m_foundDocs = g_pDocIndex->query( m_terms, termSeq, seqWords );
  
@@ -228,7 +244,11 @@ void KviHelpWindow::startSearch()
     if ( !s.isEmpty() )
 	m_terms << s;
 
+#ifdef COMPILE_USE_QT4
+    setCursor( Qt::ArrowCursor );
+#else
     setCursor( arrowCursor );
+#endif
 }
 
 QTextBrowser * KviHelpWindow::textBrowser()
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index 7db099ab6..d4ca466d9 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -69,7 +69,7 @@
 #include <ctype.h>
 
 
-
+#ifndef COMPILE_USE_QT4
 int TermList::compareItems( QPtrCollection::Item i1, QPtrCollection::Item i2 )
 
 {
@@ -85,7 +85,7 @@ int TermList::compareItems( QPtrCollection::Item i1, QPtrCollection::Item i2 )
     return 1;
 
 }
-
+#endif
 
 
 QDataStream &operator>>( QDataStream &s, Document &l )
@@ -394,7 +394,7 @@ void Index::readDict()
     dict.clear();
     QDataStream s( &f );
     QString key;
-    QValueList<Document> docs;
+    KviValueList<Document> docs;
     while ( !s.atEnd() ) {
 	s >> key;
 	s >> docs;
@@ -442,7 +442,7 @@ QStringList Index::query( const QStringList &terms, const QStringList &termSeq,
 
 	if ( (*it).contains( '*' ) ) {
 
-	    QValueList<Document> wcts = setupDummyTerm( getWildcardTerms( *it ) );
+	    KviValueList<Document> wcts = setupDummyTerm( getWildcardTerms( *it ) );
 
 	    termList.append( new Term( "dummy", wcts.count(), wcts ) );
 
@@ -474,17 +474,17 @@ QStringList Index::query( const QStringList &terms, const QStringList &termSeq,
 
 
 
-    QValueList<Document> minDocs = minTerm->documents;
+    KviValueList<Document> minDocs = minTerm->documents;
 
-    QValueList<Document>::iterator C;
+    KviValueList<Document>::iterator C;
 
-    QValueList<Document>::ConstIterator It;
+    KviValueList<Document>::ConstIterator It;
 
     Term *t = termList.first();
 
     for ( ; t; t = termList.next() ) {
 
-	QValueList<Document> docs = t->documents;
+	KviValueList<Document> docs = t->documents;
 
 	C = minDocs.begin();
 
@@ -596,7 +596,7 @@ QStringList Index::getWildcardTerms( const QString &term )
 
     QStringList terms = split( term );
 
-    QValueList<QString>::iterator iter;
+    KviValueList<QString>::iterator iter;
 
 
 
@@ -720,7 +720,7 @@ QStringList Index::split( const QString &str )
 
 
 
-QValueList<Document> Index::setupDummyTerm( const QStringList &terms )
+KviValueList<Document> Index::setupDummyTerm( const QStringList &terms )
 
 {
 
@@ -746,7 +746,7 @@ QValueList<Document> Index::setupDummyTerm( const QStringList &terms )
 
 
 
-    QValueList<Document> maxList;
+    KviValueList<Document> maxList;
 
 
 
@@ -760,13 +760,13 @@ QValueList<Document> Index::setupDummyTerm( const QStringList &terms )
 
 
 
-    QValueList<Document>::iterator docIt;
+    KviValueList<Document>::iterator docIt;
 
     Term *t = termList.first();
 
     while ( t ) {
 
-	QValueList<Document> docs = t->documents;
+	KviValueList<Document> docs = t->documents;
 
 	for ( docIt = docs.begin(); docIt != docs.end(); ++docIt ) {
 
@@ -912,9 +912,9 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo
 
     QStringList wordLst;
 
-    QValueList<uint> a, b;
+    KviValueList<uint> a, b;
 
-    QValueList<uint>::iterator aIt;
+    KviValueList<uint>::iterator aIt;
 
     for ( ; patIt != patterns.end(); ++patIt ) {
 
diff --git a/src/modules/help/index.h b/src/modules/help/index.h
index 10b65e532..fc8ab72a9 100755
--- a/src/modules/help/index.h
+++ b/src/modules/help/index.h
@@ -31,6 +31,8 @@
 
 #include <qstringlist.h>
 #include "kvi_dict.h"
+#include "kvi_list.h"
+#include "kvi_valuelist.h"
 #include <qdatastream.h>
 #include <qobject.h>
 
@@ -62,12 +64,12 @@ class Index : public QObject
 public:
     struct Entry {
 	Entry( int d ) { documents.append( Document( d, 1 ) ); }
-	Entry( QValueList<Document> l ) : documents( l ) {}
-	QValueList<Document> documents;
+	Entry( KviValueList<Document> l ) : documents( l ) {}
+	KviValueList<Document> documents;
     };
     struct PosEntry {
 	PosEntry( int p ) { positions.append( p ); }
-	QValueList<uint> positions;
+	KviValueList<uint> positions;
     };
     Index( const QString &dp, const QString &hp );
     Index( const QStringList &dl, const QString &hp );
@@ -92,7 +94,7 @@ private:
     void insertInDict( const QString&, int );
     QStringList getWildcardTerms( const QString& );
     QStringList split( const QString& );
-    QValueList<Document> setupDummyTerm( const QStringList& );
+    KviValueList<Document> setupDummyTerm( const QStringList& );
     bool searchForPattern( const QStringList&, const QStringList&, const QString& );
     void buildMiniDict( const QString& );
     QStringList docList;
@@ -107,18 +109,20 @@ private:
 };
 
 struct Term {
-    Term( const QString &t, int f, QValueList<Document> l )
+    Term( const QString &t, int f, KviValueList<Document> l )
 	: term( t ), frequency( f ), documents( l ) {}
     QString term;
     int frequency;
-    QValueList<Document>documents;
+    KviValueList<Document>documents;
 };
 
-class TermList : public QPtrList<Term>
+class TermList : public KviPtrList<Term>
 {
 public:
-    TermList() : QPtrList<Term>() {}
+    TermList() : KviPtrList<Term>() {}
+#ifndef COMPILE_USE_QT4
     int compareItems( QPtrCollection::Item i1, QPtrCollection::Item i2 );
+#endif
 };
 
 #endif
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index a9ea33eb3..5f1c30f02 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -32,6 +32,11 @@
 
 #include "kvi_frame.h"
 
+#ifdef COMPILE_USE_QT4
+	#include <q3mimefactory.h>
+#endif
+
+
 #include <qsplitter.h>
 Index        * g_pDocIndex = 0;
 KviPtrList<KviHelpWidget> * g_pHelpWidgetList = 0;
@@ -140,7 +145,11 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("document",KVS_PT_STRING,KVS_PF_OPTIONAL,doc)
 	KVSM_PARAMETERS_END(c)
 	if(doc.isEmpty())doc = "index.html";
+#ifdef COMPILE_USE_QT4
+	Q3MimeSourceFactory * f = Q3MimeSourceFactory::defaultFactory();
+#else
 	QMimeSourceFactory * f = QMimeSourceFactory::defaultFactory();
+#endif
 	if(f)
 	{
 		if(!f->data(doc))