more qt4 porting (misc + removing qt3 listview)

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

4 files changed, 11 insertions, 14 deletions

diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index 176e9aa1d..261f63afe 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -58,19 +58,16 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 	m_pBtnIndex = new QToolButton(m_pToolBar);
 	m_pBtnIndex->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPINDEX));
 	connect(m_pBtnIndex,SIGNAL(clicked()),this,SLOT(showIndex()));
-	//m_pBtnIndex->setUsesBigPixmap(true);
 
 	m_pBtnBackward = new QToolButton(m_pToolBar);
 	m_pBtnBackward->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPBACK));
 	connect(m_pBtnBackward,SIGNAL(clicked()),m_pTextBrowser,SLOT(backward()));
 	m_pBtnBackward->setEnabled(false);
-	//m_pBtnBackward->setUsesBigPixmap(true);
 
 	m_pBtnForward = new QToolButton(m_pToolBar);
 	m_pBtnForward->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPFORWARD));
 	connect(m_pBtnForward,SIGNAL(clicked()),m_pTextBrowser,SLOT(forward()));
 	m_pBtnForward->setEnabled(false);
-	//m_pBtnForward->setUsesBigPixmap(true);
 
 	QWidget* pSpacer=new QWidget(m_pToolBar);
 
@@ -79,7 +76,6 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 		QToolButton * b = new QToolButton(m_pToolBar);
 		b->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPCLOSE));
 		connect(b,SIGNAL(clicked()),this,SLOT(doClose()));
-		//b->setUsesBigPixmap(true);
 	}
 
 	m_pToolBar->setStretchFactor(pSpacer,1);
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index ceae44f98..a23946bf1 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -270,7 +270,7 @@ void KviHelpWindow::indexSelected ( QListWidgetItem *item )
 void KviHelpWindow::searchSelected ( QListWidgetItem *item )
 {
 	if (!item) return;
-	int i=g_pDocIndex->titlesList().findIndex(item->text());
+	int i=g_pDocIndex->titlesList().indexOf(item->text());
 	textBrowser()->setSource(QUrl::fromLocalFile(g_pDocIndex->documentList()[ i ]));
 }
 
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index 2ab2dbe3c..a9a028876 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -477,8 +477,8 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo
 		qWarning( warn.toUtf8().data() );
 		return FALSE;
 	}
-	else debug("Open file %s",fileName.utf8().data());
-	debug("Patterns %s and words %s",patterns.join(",").utf8().data(),words.join(",").utf8().data());
+	else debug("Open file %s",fileName.toUtf8().data());
+	debug("Patterns %s and words %s",patterns.join(",").toUtf8().data(),words.join(",").toUtf8().data());
 	wordNum = 3;
 	miniDict.clear();
 
@@ -545,7 +545,7 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo
 			aIt = a.begin();
 
 			while ( aIt != a.end() ) {
-				if ( b.find( *aIt + 1 ) != b.end() ) {
+				if ( b.indexOf( *aIt + 1 ) != b.at(b.count()-1) ) {
 					(*aIt)++;
 					++aIt;
 				} else {
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index fb26650a7..8ab14e65c 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -28,7 +28,7 @@
 #include "kvi_sourcesdate.h"
 #include "kvi_app.h"
 #include "kvi_frame.h"
-

+
 #include <QDir>
 #include <QFileInfo>
 #include <QSplitter>
@@ -136,15 +136,15 @@ static bool help_kvs_cmd_search(KviKvsModuleCommandCall * c)
 static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	QString doc, szHelpDir;
-        QDir dirHelp;

+        QDir dirHelp;
 
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("document",KVS_PT_STRING,KVS_PF_OPTIONAL,doc)
 	KVSM_PARAMETERS_END(c)
 
-	g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help);

-        dirHelp = QDir(szHelpDir);

-

+	g_pApp->getGlobalKvircDirectory(szHelpDir,KviApp::Help);
+        dirHelp = QDir(szHelpDir);
+
 	if(doc.isEmpty()){
 		doc = dirHelp.absoluteFilePath("index.html");
 		qDebug ("No file, use default at path %s",doc.toUtf8().data());
@@ -170,7 +170,8 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 
 	if(!c->switches()->find('n',"new"))
 	{
-		KviHelpWidget * w = (KviHelpWidget *)c->window()->frame()->child("help_widget","KviHelpWidget");
+		KviHelpWidget * w = (KviHelpWidget *)c->window()->frame()->findChild<KviHelpWidget *>("help_widget");
+
 		if(w)
 		{
 			w->textBrowser()->setSource(QUrl::fromLocalFile(f->absoluteFilePath()));