summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2011-01-07 11:37:12 (GMT)
committerSergio Ahumada <sergio.ahumada@nokia.com>2011-01-07 11:37:12 (GMT)
commit67267842ce658d956f11d52194566b6de1f84f9a (patch)
tree5efbab1f89f2f0ae46a09dfdd4225394122ae8a0 /src/gui/text
parent84658ec4e650b12dcea6f886b530e66a195465cf (diff)
downloadQt-67267842ce658d956f11d52194566b6de1f84f9a.zip
Qt-67267842ce658d956f11d52194566b6de1f84f9a.tar.gz
Qt-67267842ce658d956f11d52194566b6de1f84f9a.tar.bz2
Doc: Fixing typo
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontengine_p.h2
-rw-r--r--src/gui/text/qtextdocument_p.cpp2
-rw-r--r--src/gui/text/qtextdocumentlayout.cpp2
-rw-r--r--src/gui/text/qtextengine.cpp2
-rw-r--r--src/gui/text/qtextlist.cpp2
-rw-r--r--src/gui/text/qzip.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index fc26eef..c9dd5bc 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -180,7 +180,7 @@ public:
void addBitmapFontToPath(qreal x, qreal y, const QGlyphLayout &, QPainterPath *, QTextItem::RenderFlags);
/**
* Create a qimage with the alpha values for the glyph.
- * Returns an image indexed_8 with index values ranging from 0=fully transparant to 255=opaque
+ * Returns an image indexed_8 with index values ranging from 0=fully transparent to 255=opaque
*/
virtual QImage alphaMapForGlyph(glyph_t);
virtual QImage alphaMapForGlyph(glyph_t, const QTransform &t);
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 0bdd20d..14d85b7 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -91,7 +91,7 @@ QT_BEGIN_NAMESPACE
END_OF_PARA/START_OF_FRAME/END_OF_FRAME (see below).
Lists are not in here, as they are treated specially. A list is just
- a collection of (not neccessarily connected) blocks, that share the
+ a collection of (not necessarily connected) blocks, that share the
same objectIndex() in the format that refers to the list format and
object.
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index ff14490..a1bea12 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -327,7 +327,7 @@ static inline bool isLineSeparatorBlockAfterTable(const QTextBlock &block, const
/*
-Optimisation strategies:
+Optimization strategies:
HTML layout:
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 3bd6122..75dcf57 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1879,7 +1879,7 @@ void QTextEngine::justify(const QScriptLine &line)
if (end == layoutData->string.length())
return; // no justification at end of paragraph
if (end && layoutData->items[findItem(end-1)].analysis.flags == QScriptAnalysis::LineOrParagraphSeparator)
- return; // no justification at the end of an explicitely separated line
+ return; // no justification at the end of an explicitly separated line
}
// justify line
diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp
index a0ff520..b66766e 100644
--- a/src/gui/text/qtextlist.cpp
+++ b/src/gui/text/qtextlist.cpp
@@ -235,7 +235,7 @@ QString QTextList::itemText(const QTextBlock &blockIt) const
if (i % 4) {
// c[i] == 4|5|9|40|50|90|400|500|900
if ((i-2) % 4) {
- // c[i] == 4|9|40|90|400|900 => with substraction (IV, IX, XL, XC, ...)
+ // c[i] == 4|9|40|90|400|900 => with subtraction (IV, IX, XL, XC, ...)
numDigits = 2;
}
else {
diff --git a/src/gui/text/qzip.cpp b/src/gui/text/qzip.cpp
index 6f099a9..c449588 100644
--- a/src/gui/text/qzip.cpp
+++ b/src/gui/text/qzip.cpp
@@ -825,7 +825,7 @@ int QZipReader::count() const
/*!
Returns a FileInfo of an entry in the zipfile.
- The \a index is the index into the directoy listing of the zipfile.
+ The \a index is the index into the directory listing of the zipfile.
Returns an invalid FileInfo if \a index is out of boundaries.
\sa fileInfoList()