From 0ef459d7a2f067773645ffd247317fe6cc20cc22 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 27 Sep 2012 12:33:29 +0200 Subject: [PATCH] use QLatin1String::size() in qt_setWindowTitle_helperHelper Change-Id: I0c8193a7c6bf8b5f894da3e20af3c4d23e0b593a Reviewed-by: Friedemann Kleint --- src/widgets/kernel/qwidget.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index b74cdea..84bb5a6 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -5530,17 +5530,15 @@ QString qt_setWindowTitle_helperHelper(const QString &title, const QWidget *widg return cap; QLatin1String placeHolder("[*]"); - int placeHolderLength = 3; // QLatin1String doesn't have length() - int index = cap.indexOf(placeHolder); // here the magic begins while (index != -1) { - index += placeHolderLength; + index += placeHolder.size(); int count = 1; while (cap.indexOf(placeHolder, index) == index) { ++count; - index += placeHolderLength; + index += placeHolder.size(); } if (count%2) { // odd number of [*] -> replace last one -- 2.7.4