aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2014-01-20 08:01:51 +0100
committerStefan Weil <sw@weilnetz.de>2014-01-20 08:01:51 +0100
commit82c802cc4db4d783f7255cc7f8489a7e03a65687 (patch)
tree9973394a1ace3cf13af1dca1c041984a5ad43593
parentedffd742fe6a17f0ac075aac839cafcd4413334c (diff)
downloadscintilla-mirror-82c802cc4db4d783f7255cc7f8489a7e03a65687.tar.gz
Fix typos in comments (qt)
-rw-r--r--qt/ScintillaEditBase/Notes.txt2
-rw-r--r--qt/ScintillaEditBase/PlatQt.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/qt/ScintillaEditBase/Notes.txt b/qt/ScintillaEditBase/Notes.txt
index 6658aaa7a..4abc9bb78 100644
--- a/qt/ScintillaEditBase/Notes.txt
+++ b/qt/ScintillaEditBase/Notes.txt
@@ -4,7 +4,7 @@ Issues with Scintilla for Qt
Qt reports character descenders are 1 pixel shorter than they really are.
There is a tweak in the code to add a pixel in. This may have to be reviewed for Qt 5.
There's a comment in the Qt code for Windows:
- // ### we substract 1 to even out the historical +1 in QFontMetrics's
+ // ### we subtract 1 to even out the historical +1 in QFontMetrics's
// ### height=asc+desc+1 equation. Fix in Qt5.
The clocks used aren't great. QTime is a time since midnight clock so wraps around and
diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index 836df1f9b..9b63b30de 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -528,7 +528,7 @@ XYPOSITION SurfaceImpl::Descent(Font &font)
QFontMetrics metrics(*FontPointer(font), device);
// Qt returns 1 less than true descent
// See: QFontEngineWin::descent which says:
- // ### we substract 1 to even out the historical +1 in QFontMetrics's
+ // ### we subtract 1 to even out the historical +1 in QFontMetrics's
// ### height=asc+desc+1 equation. Fix in Qt5.
return metrics.descent() + 1;
}
@@ -1088,7 +1088,7 @@ public:
virtual Function FindFunction(const char *name) {
if (lib) {
- // C++ standard doesn't like casts betwen function pointers and void pointers so use a union
+ // C++ standard doesn't like casts between function pointers and void pointers so use a union
union {
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
QFunctionPointer fp;