summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2009-08-13 17:19:26 (GMT)
committermread <qt-info@nokia.com>2009-08-13 17:19:26 (GMT)
commit8958c2dfa426115a28e4034b98f56ef318f5ccfa (patch)
treecb1fb1b1de5d201011fd446b2b45fd23222ffa49 /src/gui/text
parentf76b4e1b4a55008cc45f633c7be55ae9d063dc5b (diff)
downloadQt-8958c2dfa426115a28e4034b98f56ef318f5ccfa.zip
Qt-8958c2dfa426115a28e4034b98f56ef318f5ccfa.tar.gz
Qt-8958c2dfa426115a28e4034b98f56ef318f5ccfa.tar.bz2
Changing names of Symbian leave <-> qt throw translation functions
due to http://qt-reviews.europe.nokia.com/r/67/
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontdatabase_s60.cpp2
-rw-r--r--src/gui/text/qfontengine_s60.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
index 39fc5e1..3fc3744 100644
--- a/src/gui/text/qfontdatabase_s60.cpp
+++ b/src/gui/text/qfontdatabase_s60.cpp
@@ -221,7 +221,7 @@ static void initializeDb()
QS60Data::screenDevice()->TypefaceSupport(typefaceSupport, i);
CFont *font; // We have to get a font instance in order to know all the details
TFontSpec fontSpec(typefaceSupport.iTypeface.iName, 11);
- qt_throwIfError(QS60Data::screenDevice()->GetNearestFontInPixels(font, fontSpec));
+ qt_symbian_throwIfError(QS60Data::screenDevice()->GetNearestFontInPixels(font, fontSpec));
if (font->TypeUid() == KCFbsFontUid) {
TOpenFontFaceAttrib faceAttrib;
const CFbsFont *cfbsFont = dynamic_cast<const CFbsFont *>(font);
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp
index d3de8e2..ebff9c8 100644
--- a/src/gui/text/qfontengine_s60.cpp
+++ b/src/gui/text/qfontengine_s60.cpp
@@ -132,9 +132,9 @@ QFontEngineS60::QFontEngineS60(const QFontDef &request, const QFontEngineS60Exte
QS60WindowSurface::unlockBitmapHeap();
m_textRenderBitmap = q_check_ptr(new CFbsBitmap()); // CBase derived object needs check on new
const TSize bitmapSize(1, 1); // It is just a dummy bitmap that I need to keep the font alive (or maybe not)
- qt_throwIfError(m_textRenderBitmap->Create(bitmapSize, EGray256));
+ qt_symbian_throwIfError(m_textRenderBitmap->Create(bitmapSize, EGray256));
QT_TRAP_THROWING(m_textRenderBitmapDevice = CFbsBitmapDevice::NewL(m_textRenderBitmap));
- qt_throwIfError(m_textRenderBitmapDevice->CreateContext(m_textRenderBitmapGc));
+ qt_symbian_throwIfError(m_textRenderBitmapDevice->CreateContext(m_textRenderBitmapGc));
cache_cost = sizeof(QFontEngineS60) + bitmapSize.iHeight * bitmapSize.iWidth * 4;
TFontSpec fontSpec(qt_QString2TPtrC(request.family), m_fontSizeInPixels);