summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 22:07:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 22:07:55 -0600
commit3ad1b623ac4af0f19db3580e4ef6b0d923260ba0 (patch)
tree3b77748c913634d88310c7933877b201532d4ae1 /src/kernel
parente02e31c8b9d854cd62cbe9799228f6e08e882773 (diff)
downloadtqt3-3ad1b623ac4af0f19db3580e4ef6b0d923260ba0.tar.gz
tqt3-3ad1b623ac4af0f19db3580e4ef6b0d923260ba0.zip
Sync again
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/qfontengine_x11.cpp8
-rw-r--r--src/kernel/qpainter_x11.cpp2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index fe63cff2e..5693e238d 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -2255,8 +2255,8 @@ static inline char *tag_to_string(FT_ULong tag)
#define DefaultScript FT_MAKE_TAG('D', 'F', 'L', 'T')
enum {
- RetquiresGsub = 1,
- RetquiresGpos = 2
+ RequiresGsub = 1,
+ RequiresGpos = 2
};
struct OTScripts {
@@ -2440,7 +2440,7 @@ bool TQOpenType::checkScript(unsigned int script)
uint tag = ot_scripts[script].tag;
int requirements = ot_scripts[script].flags;
- if (requirements & RetquiresGsub) {
+ if (requirements & RequiresGsub) {
if (!gsub)
return FALSE;
@@ -2454,7 +2454,7 @@ bool TQOpenType::checkScript(unsigned int script)
}
}
- if (requirements & RetquiresGpos) {
+ if (requirements & RequiresGpos) {
if (!gpos)
return FALSE;
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index 3aad71641..d2127be2f 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -2813,7 +2813,7 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h,
else
sy = sy % sh;
/*
- Retquirements for optimizing tiled pixmaps:
+ Requirements for optimizing tiled pixmaps:
- not an external device
- not scale or rotshear
- not mono pixmap