summaryrefslogtreecommitdiffstats
path: root/khtml
diff options
context:
space:
mode:
Diffstat (limited to 'khtml')
-rw-r--r--khtml/htmlpageinfo.ui2
-rw-r--r--khtml/java/kjavaappletserver.cpp2
-rw-r--r--khtml/java/kjavaappletviewer.cpp4
-rw-r--r--khtml/java/kjavaappletwidget.cpp8
-rw-r--r--khtml/java/kjavaappletwidget.h2
-rw-r--r--khtml/kjserrordlg.ui2
-rw-r--r--khtml/rendering/render_applet.cpp4
-rw-r--r--khtml/rendering/render_canvas.cpp4
-rw-r--r--khtml/rendering/render_form.cpp10
9 files changed, 19 insertions, 19 deletions
diff --git a/khtml/htmlpageinfo.ui b/khtml/htmlpageinfo.ui
index 21d341f91..5dd21cd6f 100644
--- a/khtml/htmlpageinfo.ui
+++ b/khtml/htmlpageinfo.ui
@@ -263,7 +263,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/khtml/java/kjavaappletserver.cpp b/khtml/java/kjavaappletserver.cpp
index a34f37ea7..18de1e40a 100644
--- a/khtml/java/kjavaappletserver.cpp
+++ b/khtml/java/kjavaappletserver.cpp
@@ -807,7 +807,7 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm )
TQPushButton* const grant = new TQPushButton( i18n("&Grant All"), dialog, "grant" );
buttonLayout->addWidget( grant );
dialogLayout->addLayout( buttonLayout );
- dialog->resize( dialog->tqminimumSizeHint() );
+ dialog->resize( dialog->minimumSizeHint() );
//clearWState( WState_Polished );
connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );
diff --git a/khtml/java/kjavaappletviewer.cpp b/khtml/java/kjavaappletviewer.cpp
index a3f8fc361..9071fa5d5 100644
--- a/khtml/java/kjavaappletviewer.cpp
+++ b/khtml/java/kjavaappletviewer.cpp
@@ -391,7 +391,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) {
} else
applet->setAppletClass (url.url ());
AppletParameterDialog (w).exec ();
- applet->setSize (w->tqsizeHint());
+ applet->setSize (w->sizeHint());
}
if (!m_statusbar_icon) {
KStatusBar *sb = m_statusbar->statusBar();
@@ -500,7 +500,7 @@ void KJavaAppletViewerBrowserExtension::restoreState (TQDataStream & stream) {
applet->setParameter (key, val);
kdDebug(6100) << "restoreState key:" << key << " val:" << val << endl;
}
- applet->setSize (w->tqsizeHint ());
+ applet->setSize (w->sizeHint ());
if (w->isVisible())
w->showApplet ();
}
diff --git a/khtml/java/kjavaappletwidget.cpp b/khtml/java/kjavaappletwidget.cpp
index 5dae56875..efbc841b8 100644
--- a/khtml/java/kjavaappletwidget.cpp
+++ b/khtml/java/kjavaappletwidget.cpp
@@ -98,10 +98,10 @@ void KJavaAppletWidget::setWindow( WId w )
}
}
-TQSize KJavaAppletWidget::tqsizeHint() const
+TQSize KJavaAppletWidget::sizeHint() const
{
- kdDebug(6100) << "KJavaAppletWidget::tqsizeHint()" << endl;
- TQSize rval = QXEmbed::tqsizeHint();
+ kdDebug(6100) << "KJavaAppletWidget::sizeHint()" << endl;
+ TQSize rval = QXEmbed::sizeHint();
if( rval.width() == 0 || rval.height() == 0 )
{
@@ -132,7 +132,7 @@ void KJavaAppletWidget::showEvent (TQShowEvent * e) {
if (!applet()->isCreated() && !applet()->appletClass().isEmpty()) {
// delayed showApplet
if (applet()->size().width() <= 0)
- applet()->setSize (tqsizeHint());
+ applet()->setSize (sizeHint());
showApplet();
}
}
diff --git a/khtml/java/kjavaappletwidget.h b/khtml/java/kjavaappletwidget.h
index 5bd644e8e..e84f96039 100644
--- a/khtml/java/kjavaappletwidget.h
+++ b/khtml/java/kjavaappletwidget.h
@@ -96,7 +96,7 @@ public:
*/
void showApplet();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
void resize( int, int );
protected slots:
diff --git a/khtml/kjserrordlg.ui b/khtml/kjserrordlg.ui
index 1cf9f88af..d5e9c7e28 100644
--- a/khtml/kjserrordlg.ui
+++ b/khtml/kjserrordlg.ui
@@ -63,7 +63,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>311</width>
<height>21</height>
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() );
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 01:02:48 +0000