From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:21:02 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- khtml/rendering/render_frames.cpp | 4 ++-- khtml/rendering/render_image.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'khtml/rendering') diff --git a/khtml/rendering/render_frames.cpp b/khtml/rendering/render_frames.cpp index bc3f00be4..2535b534e 100644 --- a/khtml/rendering/render_frames.cpp +++ b/khtml/rendering/render_frames.cpp @@ -509,7 +509,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT) { setResizing(true); - KApplication::setOverrideCursor(TQCursor(m_cursor)); + TDEApplication::setOverrideCursor(TQCursor(m_cursor)); m_vSplitPos = _x; m_hSplitPos = _y; m_oldpos = -1; @@ -519,7 +519,7 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) if(m_resizing && evt->id() == EventImpl::MOUSEUP_EVENT) { setResizing(false); - KApplication::restoreOverrideCursor(); + TDEApplication::restoreOverrideCursor(); if(m_vSplit != -1 ) { diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp index e387920d6..f931e9ca5 100644 --- a/khtml/rendering/render_image.cpp +++ b/khtml/rendering/render_image.cpp @@ -266,7 +266,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) if ( !berrorPic ) { //tqDebug("qDrawShadePanel %d/%d/%d/%d", _tx + leftBorder, _ty + topBorder, cWidth, cHeight); qDrawShadePanel( paintInfo.p, _tx + leftBorder + leftPad, _ty + topBorder + topPad, cWidth, cHeight, - KApplication::palette().inactive(), true, 1 ); + TDEApplication::palette().inactive(), true, 1 ); } TQPixmap const* pix = i ? &i->pixmap() : 0; if(berrorPic && pix && (cWidth >= pix->width()+4) && (cHeight >= pix->height()+4) ) -- cgit v1.2.1