From 86b063d2da3353eac0615284f4ef7fa3c7db01e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Thu, 31 Aug 2006 20:36:07 +0000 Subject: [PATCH] Use correct types for qstring, also to avoid 64<->32 bit issues. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14858 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/qfont_metrics.C | 6 +++--- src/frontends/qt4/qt_helpers.C | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/frontends/qt4/qfont_metrics.C b/src/frontends/qt4/qfont_metrics.C index f886ed79a0..6abda06299 100644 --- a/src/frontends/qt4/qfont_metrics.C +++ b/src/frontends/qt4/qfont_metrics.C @@ -44,9 +44,9 @@ int smallcapswidth(QString const & s, LyXFont const & f) int w = 0; - size_t const ls = s.size(); + int const ls = s.size(); - for (size_t i = 0; i < ls; ++i) { + for (int i = 0; i < ls; ++i) { QChar const & c = s[i]; QChar const uc = c.toUpper(); if (c != uc) @@ -147,7 +147,7 @@ int font_metrics::width(char_type const * s, size_t ls, LyXFont const & f) return fi.width(ucs2[0].unicode()); int w = 0; - for (size_t i = 0; i < ls; ++i) + for (unsigned int i = 0; i < ls; ++i) w += fi.width(ucs2[i].unicode()); return w; diff --git a/src/frontends/qt4/qt_helpers.C b/src/frontends/qt4/qt_helpers.C index 348b0cf191..662bb8493c 100644 --- a/src/frontends/qt4/qt_helpers.C +++ b/src/frontends/qt4/qt_helpers.C @@ -144,9 +144,9 @@ QString const ucs4_to_qstring(vector const & ucs4) vector qstring_to_ucs4(QString const & qstr) { - size_t ls = qstr.size(); + int ls = qstr.size(); vector ucs4; - for (size_t i = 0; i < ls; ++i) + for (int i = 0; i < ls; ++i) ucs4.push_back(static_cast(qstr[i].unicode())); return ucs4; @@ -155,9 +155,9 @@ vector qstring_to_ucs4(QString const & qstr) void qstring_to_ucs4(QString const & qstr, vector & ucs4) { - size_t ls = qstr.size(); + int ls = qstr.size(); ucs4.clear(); - for (size_t i = 0; i < ls; ++i) + for (int i = 0; i < ls; ++i) ucs4.push_back(static_cast(qstr[i].unicode())); }