From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 12 Feb 2009 00:59:49 +0000 (+0100)
Subject: Change str.indexOf(rx) to rx.indexIn(str)
X-Git-Tag: 0.4.0~71
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7d7c70c5c27be65af2d53df5cca27265c2d1d666

Change str.indexOf(rx) to rx.indexIn(str)

This might (!) fix the freezes encountered when running a binary compiled against Qt 4.4
with Qt 4.5. Not tested though.

cf. http://labs.trolltech.com/blogs/2008/11/04/910/
---

diff --git a/src/qtui/chatitem.cpp b/src/qtui/chatitem.cpp
index de96b2df..934fadf3 100644
--- a/src/qtui/chatitem.cpp
+++ b/src/qtui/chatitem.cpp
@@ -445,7 +445,7 @@ QList<ContentsChatItem::Clickable> ContentsChatItem::findClickables() const {
     for(int i = 0; i < regExpCount; i++) {
       if(matches[i] < 0 || matchEnd[i] > str.length()) continue;
       if(idx >= matchEnd[i]) {
-        matches[i] = str.indexOf(regExp[i], qMax(matchEnd[i], idx));
+        matches[i] = regExp[i].indexIn(str, qMax(matchEnd[i], idx));
         if(matches[i] >= 0) matchEnd[i] = matches[i] + regExp[i].cap(1).length();
       }
       if(matches[i] >= 0 && matches[i] < minidx) {