diff options
Diffstat (limited to 'khtml')
| -rw-r--r-- | khtml/khtml_part.cpp | 4 | ||||
| -rw-r--r-- | khtml/khtmlview.cpp | 4 | ||||
| -rw-r--r-- | khtml/misc/loader.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp index 0699b799a..5076e1c89 100644 --- a/khtml/khtml_part.cpp +++ b/khtml/khtml_part.cpp @@ -233,7 +233,7 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof ) else if ( prof == BrowserViewGUI ) setXMLFile( "khtml_browser.rc" ); - d = new KHTMLPartPrivate(tqparent()); + d = new KHTMLPartPrivate(parent()); d->m_view = view; setWidget( d->m_view ); @@ -5090,7 +5090,7 @@ void KHTMLPart::slotChildDocCreated() void KHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ) { - khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->tqparent() ); + khtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() ); KHTMLPart *callingHtmlPart = const_cast<KHTMLPart *>(dynamic_cast<const KHTMLPart *>(sender()->parent())); // TODO: handle child target correctly! currently the script are always executed fur the parent diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp index 75ecea21f..bcf9ede59 100644 --- a/khtml/khtmlview.cpp +++ b/khtml/khtmlview.cpp @@ -1285,8 +1285,8 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) attr.save_under = True; XChangeWindowAttributes( qt_xdisplay(), d->cursor_icon_widget->winId(), CWSaveUnder, &attr ); d->cursor_icon_widget->resize( icon_pixmap.width(), icon_pixmap.height()); - if( icon_pixmap.tqmask() ) - d->cursor_icon_widget->setMask( *icon_pixmap.tqmask()); + if( icon_pixmap.mask() ) + d->cursor_icon_widget->setMask( *icon_pixmap.mask()); else d->cursor_icon_widget->clearMask(); d->cursor_icon_widget->setBackgroundPixmap( icon_pixmap ); diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp index 220c9ea2d..de7d5aea2 100644 --- a/khtml/misc/loader.cpp +++ b/khtml/misc/loader.cpp @@ -564,7 +564,7 @@ const TQPixmap &CachedImage::tiled_pixmap(const TQColor& newc, int xWidth, int x bgSize = TQSize(xWidth, xHeight); //See whether we can - and should - pre-blend - if (isvalid && (r.hasAlphaChannel() || r.tqmask() )) { + if (isvalid && (r.hasAlphaChannel() || r.mask() )) { bg = new TQPixmap(xWidth, xHeight, r.depth()); bg->fill(newc); bitBlt(bg, 0, 0, src); @@ -749,8 +749,8 @@ void CachedImage::movieStatus(int status) { TQPixmap* pix = new TQPixmap; pix->convertFromImage( TQImage(p->convertToImage()).convertDepth( 1 ), MonoOnly|AvoidDither ); - if ( p->tqmask() ) - pix->setMask( *p->tqmask() ); + if ( p->mask() ) + pix->setMask( *p->mask() ); delete p; p = pix; monochrome = false; |