1 files changed, 12 insertions, 12 deletions

diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index be38aba368..508d472062 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -168,7 +168,7 @@ public:
         if (key >= QTextFormat::FirstFontProperty && key <= QTextFormat::LastFontProperty)
             fontDirty = true;
 
-        for (int i = 0; i < props.count(); ++i)
+        for (int i = 0; i < props.size(); ++i)
             if (props.at(i).key == key) {
                 props[i].value = value;
                 return;
@@ -178,7 +178,7 @@ public:
 
     inline void clearProperty(qint32 key)
     {
-        for (int i = 0; i < props.count(); ++i)
+        for (int i = 0; i < props.size(); ++i)
             if (props.at(i).key == key) {
                 hashDirty = true;
                 if (key >= QTextFormat::FirstFontProperty && key <= QTextFormat::LastFontProperty)
@@ -190,7 +190,7 @@ public:
 
     inline int propertyIndex(qint32 key) const
     {
-        for (int i = 0; i < props.count(); ++i)
+        for (int i = 0; i < props.size(); ++i)
             if (props.at(i).key == key)
                 return i;
         return -1;
@@ -257,7 +257,7 @@ static inline size_t variantHash(const QVariant &variant)
     case QMetaType::Bool: return 0x371818 + variant.toBool();
     case QMetaType::QPen: return 0x02020202 + hash(qvariant_cast<QPen>(variant));
     case QMetaType::QVariantList:
-        return 0x8377U + qvariant_cast<QVariantList>(variant).count();
+        return 0x8377U + qvariant_cast<QVariantList>(variant).size();
     case QMetaType::QColor: return hash(qvariant_cast<QColor>(variant));
       case QMetaType::QTextLength:
         return 0x377 + hash(qvariant_cast<QTextLength>(variant).rawValue());
@@ -318,7 +318,7 @@ void QTextFormatPrivate::recalcFont() const
     QFont::SpacingType spacingType = QFont::PercentageSpacing;
     qreal letterSpacing = 0.0;
 
-    for (int i = 0; i < props.count(); ++i) {
+    for (int i = 0; i < props.size(); ++i) {
         switch (props.at(i).key) {
             case QTextFormat::FontFamilies:
                 f.setFamilies(props.at(i).value.toStringList());
@@ -951,7 +951,7 @@ void QTextFormat::merge(const QTextFormat &other)
 
     const QList<QT_PREPEND_NAMESPACE(Property)> &otherProps = other.d.constData()->props;
     p->props.reserve(p->props.size() + otherProps.size());
-    for (int i = 0; i < otherProps.count(); ++i) {
+    for (int i = 0; i < otherProps.size(); ++i) {
         const QT_PREPEND_NAMESPACE(Property) &prop = otherProps.at(i);
         p->insertProperty(prop.key, prop.value);
     }
@@ -1323,7 +1323,7 @@ QMap<int, QVariant> QTextFormat::properties() const
 {
     QMap<int, QVariant> map;
     if (d) {
-        for (int i = 0; i < d->props.count(); ++i)
+        for (int i = 0; i < d->props.size(); ++i)
             map.insert(d->props.at(i).key, d->props.at(i).value);
     }
     return map;
@@ -1335,7 +1335,7 @@ QMap<int, QVariant> QTextFormat::properties() const
 */
 int QTextFormat::propertyCount() const
 {
-    return d ? d->props.count() : 0;
+    return d ? d->props.size() : 0;
 }
 
 /*!
@@ -2237,7 +2237,7 @@ QTextBlockFormat::QTextBlockFormat(const QTextFormat &fmt)
 void QTextBlockFormat::setTabPositions(const QList<QTextOption::Tab> &tabs)
 {
     QList<QVariant> list;
-    list.reserve(tabs.count());
+    list.reserve(tabs.size());
     QList<QTextOption::Tab>::ConstIterator iter = tabs.constBegin();
     while (iter != tabs.constEnd()) {
         QVariant v;
@@ -2262,7 +2262,7 @@ QList<QTextOption::Tab> QTextBlockFormat::tabPositions() const
     QList<QTextOption::Tab> answer;
     QList<QVariant> variantsList = qvariant_cast<QList<QVariant> >(variant);
     QList<QVariant>::Iterator iter = variantsList.begin();
-    answer.reserve(variantsList.count());
+    answer.reserve(variantsList.size());
     while(iter != variantsList.end()) {
         answer.append( qvariant_cast<QTextOption::Tab>(*iter));
         ++iter;
@@ -3988,7 +3988,7 @@ int QTextFormatCollection::createObjectIndex(const QTextFormat &f)
 
 QTextFormat QTextFormatCollection::format(int idx) const
 {
-    if (idx < 0 || idx >= formats.count())
+    if (idx < 0 || idx >= formats.size())
         return QTextFormat();
 
     return formats.at(idx);
@@ -3997,7 +3997,7 @@ QTextFormat QTextFormatCollection::format(int idx) const
 void QTextFormatCollection::setDefaultFont(const QFont &f)
 {
     defaultFnt = f;
-    for (int i = 0; i < formats.count(); ++i)
+    for (int i = 0; i < formats.size(); ++i)
         if (formats.at(i).d)
             formats[i].d->resolveFont(defaultFnt);
 }