diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-16 02:40:35 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-16 02:40:35 +0000 |
| commit | bab40890696ec68c337dc290880423a0602b83c7 (patch) | |
| tree | 6ba03f720b1fa88235ba339e7aedb4455430357e /khtml/rendering/render_text.cpp | |
| parent | f7e71d47719ab6094cf4a9fafffa5ea351973522 (diff) | |
| download | tdelibs-bab40890696ec68c337dc290880423a0602b83c7.tar.gz tdelibs-bab40890696ec68c337dc290880423a0602b83c7.zip | |
Finished remaining porting to new TQt API
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/rendering/render_text.cpp')
| -rw-r--r-- | khtml/rendering/render_text.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/khtml/rendering/render_text.cpp b/khtml/rendering/render_text.cpp index 788110a6d..ffae3a624 100644 --- a/khtml/rendering/render_text.cpp +++ b/khtml/rendering/render_text.cpp @@ -318,10 +318,10 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, const int thickness = shadow->blur; const int w = m_width+2*thickness; const int h = m_height+2*thickness; - const QRgb color = shadow->color.rgb(); + const TQRgb color = shadow->color.rgb(); const int gray = tqGray(color); const bool inverse = (gray < 100); - const QRgb bgColor = (inverse) ? tqRgb(255,255,255) : tqRgb(0,0,0); + const TQRgb bgColor = (inverse) ? tqRgb(255,255,255) : tqRgb(0,0,0); TQPixmap pixmap(w, h); pixmap.fill(bgColor); TQPainter p; @@ -334,7 +334,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, m_reversed ? TQPainter::RTL : TQPainter::LTR); p.end(); - TQImage img = pixmap.convertToImage().convertDepth(32); + TQImage img = TQT_TQIMAGE_OBJECT(pixmap.convertToImage()).convertDepth(32); int md = thickness*thickness; // max-dist^2 @@ -363,7 +363,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, memset(amap, 0, h*w*(sizeof(float))); for(int j=thickness; j<h-thickness; j++) { for(int i=thickness; i<w-thickness; i++) { - QRgb col= img.pixel(i,j); + TQRgb col= img.pixel(i,j); if (col == bgColor) continue; float g = tqGray(col); if (inverse) @@ -642,7 +642,7 @@ int InlineTextBoxArray::compareItems( Item d1, Item d2 ) return static_cast<InlineTextBox*>(d1)->m_y - static_cast<InlineTextBox*>(d2)->m_y; } -// remove this once QVector::bsearch is fixed +// remove this once TQVector::bsearch is fixed int InlineTextBoxArray::findFirstMatching(Item d) const { int len = count(); @@ -729,7 +729,7 @@ RenderText::~RenderText() void RenderText::deleteInlineBoxes(RenderArena* arena) { - // this is a slight variant of QArray::clear(). + // this is a slight variant of TQArray::clear(). // We don't delete the array itself here because its // likely to be used in the same size later again, saves // us resize() calls |