summaryrefslogtreecommitdiffstats
path: root/khtml/rendering
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 23:54:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 23:54:16 -0600
commitd4e11a5f488204ab8886e167c7c4af1e6e16ab58 (patch)
tree367a2caa6169a869cfbf6395dffe2d28e0f72654 /khtml/rendering
parent2c4de80e1e29b261fe8770483f97b2d702e4bd08 (diff)
downloadtdelibs-d4e11a5f488204ab8886e167c7c4af1e6e16ab58.tar.gz
tdelibs-d4e11a5f488204ab8886e167c7c4af1e6e16ab58.zip
Use non-tq sizeHint functions to fix bindings
Diffstat (limited to 'khtml/rendering')
-rw-r--r--khtml/rendering/render_applet.cpp4
-rw-r--r--khtml/rendering/render_canvas.cpp4
-rw-r--r--khtml/rendering/render_form.cpp10
3 files changed, 9 insertions, 9 deletions
diff --git a/khtml/rendering/render_applet.cpp b/khtml/rendering/render_applet.cpp
index 3bf373f73..3a00589e2 100644
--- a/khtml/rendering/render_applet.cpp
+++ b/khtml/rendering/render_applet.cpp
@@ -70,7 +70,7 @@ short RenderApplet::intrinsicWidth() const
int rval = 300;
if( m_widget )
- rval = ((KJavaAppletWidget*)(m_widget))->tqsizeHint().width();
+ rval = ((KJavaAppletWidget*)(m_widget))->sizeHint().width();
return rval > 10 ? rval : 50;
}
@@ -80,7 +80,7 @@ int RenderApplet::intrinsicHeight() const
int rval = 150;
if( m_widget )
- rval = m_widget->tqsizeHint().height();
+ rval = m_widget->sizeHint().height();
return rval > 10 ? rval : 50;
}
diff --git a/khtml/rendering/render_canvas.cpp b/khtml/rendering/render_canvas.cpp
index 3a5c558ac..e5947369d 100644
--- a/khtml/rendering/render_canvas.cpp
+++ b/khtml/rendering/render_canvas.cpp
@@ -217,11 +217,11 @@ void RenderCanvas::updateDocumentSize()
// if we are about to show a scrollbar, and the document is sized to the viewport w or h,
// then reserve the scrollbar space so that it doesn't trigger the _other_ scrollbar
- if (!vss && m_width - m_view->verticalScrollBar()->tqsizeHint().width() == s.width() &&
+ if (!vss && m_width - m_view->verticalScrollBar()->sizeHint().width() == s.width() &&
m_cachedDocWidth <= m_width)
hDocW = kMin( m_cachedDocWidth, s.width() );
- if (!hss && m_height - m_view->horizontalScrollBar()->tqsizeHint().height() == s.height() &&
+ if (!hss && m_height - m_view->horizontalScrollBar()->sizeHint().height() == s.height() &&
m_cachedDocHeight <= m_height)
hDocH = kMin( m_cachedDocHeight, s.height() );
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index 13843fb7a..479d98727 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -809,7 +809,7 @@ void RenderFileButton::calcMinMaxWidth()
edit,
TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth()))
.expandedTo(TQApplication::globalStrut());
- TQSize bs = static_cast<KURLRequester*>( m_widget )->tqminimumSizeHint() - edit->tqminimumSizeHint();
+ TQSize bs = static_cast<KURLRequester*>( m_widget )->minimumSizeHint() - edit->minimumSizeHint();
setIntrinsicWidth( s.width() + bs.width() );
setIntrinsicHeight( kMax(s.height(), bs.height()) );
@@ -1107,14 +1107,14 @@ void RenderSelect::layout( )
if(size < 1)
size = kMin(static_cast<KListBox*>(m_widget)->count(), 10u);
- width += 2*w->frameWidth() + w->verticalScrollBar()->tqsizeHint().width();
+ width += 2*w->frameWidth() + w->verticalScrollBar()->sizeHint().width();
height = size*height + 2*w->frameWidth();
setIntrinsicWidth( width );
setIntrinsicHeight( height );
}
else {
- TQSize s(m_widget->tqsizeHint());
+ TQSize s(m_widget->sizeHint());
setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() );
}
@@ -1651,10 +1651,10 @@ void RenderTextArea::calcMinMaxWidth()
const TQFontMetrics &m = style()->fontMetrics();
w->setTabStopWidth(8 * m.width(" "));
TQSize size( kMax(element()->cols(), 1L)*m.width('x') + w->frameWidth() +
- w->verticalScrollBar()->tqsizeHint().width(),
+ w->verticalScrollBar()->sizeHint().width(),
kMax(element()->rows(), 1L)*m.lineSpacing() + w->frameWidth()*4 +
(w->wordWrap() == TQTextEdit::NoWrap ?
- w->horizontalScrollBar()->tqsizeHint().height() : 0)
+ w->horizontalScrollBar()->sizeHint().height() : 0)
);
setIntrinsicWidth( size.width() );