[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/khtml (silent)
From: Germain Garand <germain () ebooksfrance ! org>
Date: 2007-11-02 5:22:58
Message-ID: 1193980978.613536.7091.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 731866 by ggarand:
SVN_SILENT: cleanup unused variables, debug statements, redundant statements
M +2 -2 ecma/kjs_binding.cpp
M +0 -1 ecma/kjs_html.cpp
M +0 -2 khtmlview.cpp
M +2 -2 rendering/bidi.cpp
M +2 -2 rendering/render_image.cpp
M +2 -12 rendering/render_layer.cpp
M +5 -5 rendering/render_replaced.cpp
M +1 -1 xml/dom_docimpl.cpp
M +1 -1 xml/dom_textimpl.cpp
--- trunk/KDE/kdelibs/khtml/ecma/kjs_binding.cpp #731865:731866
@@ -357,14 +357,14 @@
#endif
#endif
KDE_NO_EXPORT
-bool EmbedLiveConnect::getOwnPropertySlot(ExecState *, const Identifier& prop, \
PropertySlot& slot) +bool EmbedLiveConnect::getOwnPropertySlot(ExecState *, const \
Identifier& prop, PropertySlot& /*slot*/) {
if (m_liveconnect) {
KParts::LiveConnectExtension::Type rettype;
QString retval;
unsigned long retobjid;
if (m_liveconnect->get(objid, prop.qstring(), rettype, retobjid, retval)) {
- ValueImp* val = getLiveConnectValue(m_liveconnect, prop.qstring(), rettype, \
retval, retobjid); + getLiveConnectValue(m_liveconnect, prop.qstring(), rettype, \
retval, retobjid); return true;
}
}
--- trunk/KDE/kdelibs/khtml/ecma/kjs_html.cpp #731865:731866
@@ -1672,7 +1672,6 @@
}
break;
case ID_BODY: {
- DOM::HTMLBodyElementImpl& body = \
static_cast<DOM::HTMLBodyElementImpl&>(element); switch (token) {
case BodyOnLoad: {
DOM::DocumentImpl *doc = impl()->getDocument();
--- trunk/KDE/kdelibs/khtml/khtmlview.cpp #731865:731866
@@ -1229,7 +1229,6 @@
KHTMLWidget* kw = qobject_cast<KHTMLView*>(rw->widget())? \
dynamic_cast<KHTMLWidget*>(rw->widget()) : 0; if (kw && kw->m_kwp->isRedirected())
setCursor = false;
- kDebug() << "setCursor is " << setCursor << "for khmtlview" << this;
}
khtml::RenderStyle* style = (r && r->style()) ? r->style() : 0;
QCursor c;
@@ -1966,7 +1965,6 @@
foreach(QObject* cw, w->children()) {
if (cw->isWidgetType() && !(static_cast<QWidget*>(cw)->windowFlags() & \
Qt::Window)
&& !(static_cast<QWidget*>(cw)->windowModality() & \
Qt::ApplicationModal)) {
- static_cast<QWidget*>(cw)->setAttribute(Qt::WA_WState_InPaintEvent, \
false); setInPaintEventFlag(static_cast<QWidget*>(cw), b);
}
}
--- trunk/KDE/kdelibs/khtml/rendering/bidi.cpp #731865:731866
@@ -1741,7 +1741,7 @@
int cnt = 0;
for (curr = firstRootBox(); curr && !curr->isDirty(); curr = \
curr->nextRootBox()) cnt++; if (curr) {
- kDebug( 6040 ) << "found dirty line at " << cnt;
+ // kDebug( 6040 ) << "found dirty line at " << cnt;
// We have a dirty line.
if (RootInlineBox* prevRootBox = curr->prevRootBox()) {
// We have a previous line.
@@ -1751,7 +1751,7 @@
curr = prevRootBox;
}
} else {
- kDebug( 6040 ) << "No dirty line found";
+ // kDebug( 6040 ) << "No dirty line found";
// No dirty lines were found.
// If the last line didn't break cleanly, treat it as dirty.
if (lastRootBox() && !lastRootBox()->endsWithBreak())
--- trunk/KDE/kdelibs/khtml/rendering/render_image.cpp #731865:731866
@@ -352,8 +352,8 @@
KHTMLAssert( needsLayout());
KHTMLAssert( minMaxKnown() );
- short oldwidth = m_width;
- int oldheight = m_height;
+ short m_width = 0;
+ int m_height;
// minimum height
m_height = m_cachedImage && m_cachedImage->isErrorImage() ? intrinsicHeight() : \
0;
--- trunk/KDE/kdelibs/khtml/rendering/render_layer.cpp #731865:731866
@@ -776,8 +776,6 @@
if (w <= 0 || h <= 0 || (!m_vBar && !m_hBar))
return;
- KHTMLView* view = m_object->element()->getDocument()->view();
-
tx += bl;
ty += bt;
@@ -887,16 +885,9 @@
void RenderLayer::paintScrollbars(RenderObject::PaintInfo& pI)
{
-#ifdef APPLE_CHANGES
- if (m_hBar)
- m_hBar->paint(p, damageRect);
- if (m_vBar)
- m_vBar->paint(p, damageRect);
-#else
if (!m_object->element())
return;
- KHTMLView* view = m_object->element()->getDocument()->view();
if (m_hBar) {
QPoint p = m_hBar->m_kwp->absolutePos();
RenderWidget::paintWidget(pI, m_hBar, p.x(), p.y());
@@ -905,7 +896,6 @@
QPoint p = m_vBar->m_kwp->absolutePos();
RenderWidget::paintWidget(pI, m_vBar, p.x(), p.y());
}
-#endif
}
void RenderLayer::paint(QPainter *p, const QRect& damageRect, bool selectionOnly)
@@ -913,7 +903,7 @@
paintLayer(this, p, damageRect, selectionOnly);
}
-void RenderLayer::setClip(QPainter* p, const QRect& paintDirtyRect, const QRect& \
clipRect, bool setup) +void RenderLayer::setClip(QPainter* p, const QRect& \
paintDirtyRect, const QRect& clipRect, bool /*setup*/) {
if (paintDirtyRect == clipRect)
return;
@@ -929,7 +919,7 @@
v->clipHolder()->push( r );
}
-void RenderLayer::restoreClip(QPainter* p, const QRect& paintDirtyRect, const QRect& \
clipRect, bool cleanup) +void RenderLayer::restoreClip(QPainter* p, const QRect& \
paintDirtyRect, const QRect& clipRect, bool /*cleanup*/) {
if (paintDirtyRect == clipRect)
return;
--- trunk/KDE/kdelibs/khtml/rendering/render_replaced.cpp #731865:731866
@@ -534,10 +534,11 @@
static void setInPaintEventFlag(QWidget* w, bool b = true)
{
w->setAttribute(Qt::WA_WState_InPaintEvent, b);
- foreach(QObject* cw, w->children()) {
- if (cw->isWidgetType()) {
- static_cast<QWidget*>(cw)->setAttribute(Qt::WA_WState_InPaintEvent, \
false);
- setInPaintEventFlag(static_cast<QWidget*>(cw), b);
+ foreach(QObject* o, w->children()) {
+ QWidget* const cw = static_cast<QWidget*>(o);
+ if (o->isWidgetType() && !(cw->windowFlags() & Qt::Window)
+ && !(cw->windowModality() & Qt::ApplicationModal)) {
+ setInPaintEventFlag(cw, b);
}
}
}
@@ -804,7 +805,6 @@
me.clientY() - absy + m_view->contentsY());
QWidget* target = 0;
- KHTMLView* itsaview = qobject_cast<KHTMLView*>(m_widget);
target = m_widget->childAt(p);
if (m_underMouse != target && ev.id() == EventImpl::MOUSEMOVE_EVENT) {
--- trunk/KDE/kdelibs/khtml/xml/dom_docimpl.cpp #731865:731866
@@ -2494,7 +2494,7 @@
dispatchHTMLEvent(EventImpl::LOAD_EVENT,false,false);
}
-void DocumentImpl::setStyleSheet(const DOM::DOMString &url, const DOM::DOMString \
&sheet, const DOM::DOMString &charset) +void DocumentImpl::setStyleSheet(const \
DOM::DOMString &url, const DOM::DOMString &sheet, const DOM::DOMString &/*charset*/) \
{ if (!m_hadLoadError) {
m_url = url.string();
--- trunk/KDE/kdelibs/khtml/xml/dom_textimpl.cpp #731865:731866
@@ -402,7 +402,7 @@
return true;
}
-RenderObject *TextImpl::createRenderer(RenderArena *arena, RenderStyle *style)
+RenderObject *TextImpl::createRenderer(RenderArena *arena, RenderStyle */*style*/)
{
return new (arena) RenderText(this, str);
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic