obsolete qpoint member in KHTMLWidgetPrivate

[Slava Tokarev]

Hi,

I have a small patch that removes QPoint m_pos & QPoint setPos()
method from KHTMLWidgetPrivate. I hope that could give some better
memory usage. The only class that's using them is ScrollBarWidget. So
in my aproach QPoint goes directly to ScrollBarWidget.
Is it ok to commit? I've tested it on several pages with vertical
scrolling and it works as expected.


Index: rendering/render_form.h
===================================================================
--- rendering/render_form.h     (revision 835686)
+++ rendering/render_form.h     (working copy)
@@ -538,6 +538,10 @@
 public:
     ScrollBarWidget( QWidget * parent = 0 ): QScrollBar(parent) {
m_kwp->setIsRedirected( true ); }
     ScrollBarWidget( Qt::Orientation orientation, QWidget * parent =
0 ): QScrollBar(orientation, parent) { m_kwp->setIsRedirected( true );
}
+    void setPos(const QPoint& pos) { m_pos = pos; }
+    QPoint absolutePos() const { return m_pos; }
+private:
+    QPoint m_pos;
 };

 } //namespace
Index: rendering/render_replaced.h
===================================================================
--- rendering/render_replaced.h (revision 835686)
+++ rendering/render_replaced.h (working copy)
@@ -179,9 +179,7 @@
     void setRenderWidget(RenderWidget* rw) { m_rw = rw; }
     bool isRedirected() const { return m_redirected; }
     void setIsRedirected( bool b ) { m_redirected = b; }
-    void setPos( const QPoint& p ) { m_pos = p; }
 private:
-    QPoint m_pos;
     RenderWidget *m_rw;
     bool m_redirected;
 };
Index: rendering/render_layer.cpp
===================================================================
--- rendering/render_layer.cpp  (revision 835686)
+++ rendering/render_layer.cpp  (working copy)
@@ -843,13 +843,13 @@
     if (m_vBar) {
        QRect vBarRect = QRect(tx + w - sw, ty, sw, h - (m_hBar ? sw : 0));
         m_vBar->resize(vBarRect.width(), vBarRect.height());
-        m_vBar->m_kwp->setPos(QPoint(vBarRect.x(), vBarRect.y()));
+        m_vBar->setPos(QPoint(vBarRect.x(), vBarRect.y()));
     }

     if (m_hBar) {
        QRect hBarRect = QRect(tx, ty + h - sw, w - (m_vBar ? sw : 0), sw);
         m_hBar->resize(hBarRect.width(), hBarRect.height());
-        m_hBar->m_kwp->setPos(QPoint(hBarRect.x(), hBarRect.y()));
+        m_hBar->setPos(QPoint(hBarRect.x(), hBarRect.y()));
     }
 #endif
 }
@@ -945,11 +945,11 @@
        return;

     if (m_hBar) {
-       QPoint p = m_hBar->m_kwp->absolutePos();
+       QPoint p = m_hBar->absolutePos();
        RenderWidget::paintWidget(pI, m_hBar, p.x(), p.y());
     }
     if (m_vBar) {
-        QPoint p = m_vBar->m_kwp->absolutePos();
+        QPoint p = m_vBar->absolutePos();
        RenderWidget::paintWidget(pI, m_vBar, p.x(), p.y());
     }
 }
Index: rendering/render_replaced.cpp
===================================================================
--- rendering/render_replaced.cpp       (revision 835686)
+++ rendering/render_replaced.cpp       (working copy)
@@ -1153,7 +1153,7 @@
 QPoint KHTMLWidgetPrivate::absolutePos()
 {
         if (!m_rw)
-            return m_pos;
+            return QPoint();
         int x, y;
         m_rw->absolutePosition(x, y);
         x += m_rw->borderLeft()+m_rw->paddingLeft();


Best regards,
Vyacheslav Tokarev (vtokarev)