diff options
| author | Timothy Pearson <[email protected]> | 2011-12-05 22:04:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-05 22:04:08 -0600 |
| commit | e02e31c8b9d854cd62cbe9799228f6e08e882773 (patch) | |
| tree | 53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /src/kernel/qfontdatabase.cpp | |
| parent | 143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff) | |
| download | tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip | |
Sync with latest script
Diffstat (limited to 'src/kernel/qfontdatabase.cpp')
| -rw-r--r-- | src/kernel/qfontdatabase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp index 70e24b2e0..6e2d3ebfd 100644 --- a/src/kernel/qfontdatabase.cpp +++ b/src/kernel/qfontdatabase.cpp @@ -18,7 +18,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -602,7 +602,7 @@ static const unsigned short sample_chars[TQFont::LastPrivateScript][14] = }; #if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) -static inline bool retquiresOpenType(TQFont::Script s) +static inline bool requiresOpenType(TQFont::Script s) { return (s >= TQFont::Syriac && s <= TQFont::Sinhala) || (s >= TQFont::Myanmar && s <= TQFont::Khmer); @@ -632,7 +632,7 @@ static inline bool canRender( TQFontEngine *fe, TQFont::Script script ) ++i; } #if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) - if (hasChar && retquiresOpenType(script)) { + if (hasChar && requiresOpenType(script)) { TQOpenType *ot = fe->openType(); if (!ot || !ot->supportsScript(script)) return FALSE; @@ -705,7 +705,7 @@ static TQtFontEncoding *findEncoding(TQFont::Script script, int styleStrategy, if (force_encoding_id >= 0) { encoding = size->encodingID(force_encoding_id); if (!encoding) - FM_DEBUG(" retquired encoding_id not available"); + FM_DEBUG(" required encoding_id not available"); return encoding; } @@ -1097,7 +1097,7 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, ); if ( try_foundry == 0 ) { // the specific foundry was not found, so look for - // any foundry matching our retquirements + // any foundry matching our requirements newscore = bestFoundry( override_script, score, request.styleStrategy, try_family, TQString::null, styleKey, request.pixelSize, pitch, &try_foundry, &try_style, &try_size |