more qt4 port

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

8 files changed, 22 insertions, 21 deletions

diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index fd996427d..1a9ff344c 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -191,13 +191,13 @@ bool KviKvsObject_dockwindow::function_setAllowedDockAreas(KviKvsObjectFunctionC
 	if(!widget())return true; // hum ? dead ?
 
 	Qt::DockWidgetAreas fAreas = Qt::NoDockWidgetArea;
-	if(szFlags.find('t',false))fAreas |= Qt::TopDockWidgetArea;
-	if(szFlags.find('l',false))fAreas |= Qt::LeftDockWidgetArea;
-	if(szFlags.find('r',false))fAreas |= Qt::RightDockWidgetArea;
-	if(szFlags.find('b',false))fAreas |= Qt::BottomDockWidgetArea;
+	if(szFlags.indexOf('t',Qt::CaseInsensitive))fAreas |= Qt::TopDockWidgetArea;
+	if(szFlags.indexOf('l',Qt::CaseInsensitive))fAreas |= Qt::LeftDockWidgetArea;
+	if(szFlags.indexOf('r',Qt::CaseInsensitive))fAreas |= Qt::RightDockWidgetArea;
+	if(szFlags.indexOf('b',Qt::CaseInsensitive))fAreas |= Qt::BottomDockWidgetArea;
 	_pDockWindow->setAllowedAreas(fAreas);
 	QDockWidget::DockWidgetFeatures fFeatures = _pDockWindow->features();
-	if(szFlags.find('f',false))
+	if(szFlags.indexOf('f',Qt::CaseInsensitive))
 		fFeatures |= QDockWidget::DockWidgetFloatable;
 	else
 		fFeatures &= ~QDockWidget::DockWidgetFloatable;
@@ -218,13 +218,13 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c)
 
 	if(!widget())return true; // hum ? dead ?
 	g_pFrame->removeDockWidget(_pDockWindow);
-	if(szDock.find('m',false) == -1)_pDockWindow->setFloating(false);
-	if(szDock.find('t',false) != -1)g_pFrame->addDockWidget(Qt::TopDockWidgetArea,_pDockWindow);
-	else if(szDock.find('l',false) != -1)g_pFrame->addDockWidget(Qt::LeftDockWidgetArea,_pDockWindow);
-	else if(szDock.find('r',false) != -1)g_pFrame->addDockWidget(Qt::RightDockWidgetArea,_pDockWindow);
-	else if(szDock.find('b',false) != -1)g_pFrame->addDockWidget(Qt::BottomDockWidgetArea,_pDockWindow);
-	else if(szDock.find('f',false) != -1)_pDockWindow->setFloating(true);
-	else if(szDock.find('m',false) != -1)qDebug("Sorry: no support for minimized dock widgets in Qt4");
+	if(szDock.indexOf('m',Qt::CaseInsensitive) == -1)_pDockWindow->setFloating(false);
+	if(szDock.indexOf('t',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::TopDockWidgetArea,_pDockWindow);
+	else if(szDock.indexOf('l',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::LeftDockWidgetArea,_pDockWindow);
+	else if(szDock.indexOf('r',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::RightDockWidgetArea,_pDockWindow);
+	else if(szDock.indexOf('b',Qt::CaseInsensitive) != -1)g_pFrame->addDockWidget(Qt::BottomDockWidgetArea,_pDockWindow);
+	else if(szDock.indexOf('f',Qt::CaseInsensitive) != -1)_pDockWindow->setFloating(true);
+	else if(szDock.indexOf('m',Qt::CaseInsensitive) != -1)qDebug("Sorry: no support for minimized dock widgets in Qt4");
 	else c->warning(__tr2qs("Invalid dock area specified"));
 	return true;
 }
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp
index 1603f51b3..73bfbc6dc 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/class_tbrowser.cpp
@@ -99,8 +99,9 @@ bool KviKvsObject_textbrowser::function_setSource(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("I can't find the specified file '%Q'."),&szFile);
 		return true;
 	}
-
-	if (widget()) ((QTextBrowser *)widget())->setSource(szFile);
+	QUrl url;
+	url.setFileName(szFile);
+	if (widget()) ((QTextBrowser *)widget())->setSource(url);
 	return true;
 }
 
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 6f88fee5b..c27b0b53d 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -127,7 +127,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 		pParams->at(i)->asString(s);
 		if (!s.isEmpty())
 		{
-		int idx = s.find("::");
+		int idx = s.indexOf("::");
 		if( idx != -1 ) {
 			szClass = s.left(idx);
 			szName  = s.right(s.length() - idx - 2);
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 9a3a0dc19..6eaf68a66 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -330,7 +330,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr
 				bool bOk = true;
 				for(int j=0;j<lKeywords.count();j++)
 				{
-					if(szText.find(lKeywords.at(j),0,false) == -1)
+					if(szText.indexOf(lKeywords.at(j),0,Qt::CaseInsensitive) == -1)
 					{
 						bOk = false;
 						break;
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 649663da6..f6c1a9045 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -584,13 +584,13 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 		{
 			// local path, loaded
 			QString tmp = szCurrent;
-			int idx = tmp.findRev("/");
+			int idx = tmp.lastIndexOf("/");
 			if(idx != -1)
 			{
 				szCurrent = tmp.right(tmp.length() - (idx + 1));
 				tmp = szCurrent;
 			}
-			idx = tmp.findRev("\\");
+			idx = tmp.lastIndexOf("\\");
 			if(idx != -1)
 			{
 				szCurrent = tmp.right(tmp.length() - (idx + 1));
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 2dc87d151..864038db4 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -160,7 +160,7 @@ bool KviNickServRuleEditor::validate()
 		return false;
 	}
 	
-	if(s.find(QChar(' ')) != -1)
+	if(s.indexOf(QChar(' ')) != -1)
 	{
 		QMessageBox::warning(this,m,__tr2qs_ctx("The Nickname field can't contain spaces!","options"),o);
 		return false;
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index a12d02bac..1b883c455 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -319,7 +319,7 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const QPoint &
 				for(KviIrcMask * m = i->user()->maskList()->first();m;m = i->user()->maskList()->next())

 				{

 					QString tmp = m->nick();

-					if((tmp.find('*') == -1) && (tmp.find('?') == -1) && (!tmp.isEmpty()))

+					if((tmp.indexOf('*') == -1) && (tmp.indexOf('?') == -1) && (!tmp.isEmpty()))

 					{

 						if(!szMask.isEmpty())szMask.append(' ');

 						szMask.append(tmp);

diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index f3789f307..3ab49bcd9 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -696,7 +696,7 @@ int check_url(KviWindow *w,const QString &szUrl) // return 0 if no occurence of
 
 	for(KviStr *tmpi=g_pBanList->first();tmpi;tmpi=g_pBanList->next())
 	{
-		if (szUrl.find(QString(tmpi->ptr())) != -1) tmp++;
+		if (szUrl.indexOf(QString(tmpi->ptr()),Qt::CaseInsensitive) != -1) tmp++;
 	}
 	if (tmp > 0) return tmp;