diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 23:54:16 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-02 19:04:46 +0200 |
| commit | 18aecb8ec08ac370cb99e78e63acee0275e6334c (patch) | |
| tree | a13f6ea3f960137e10cd775fe2d5fa51edd4636e /khtml/java | |
| parent | a9c64e7a807d469d0c3695cd9ab23ab1b4c289b3 (diff) | |
| download | tdelibs-18aecb8ec08ac370cb99e78e63acee0275e6334c.tar.gz tdelibs-18aecb8ec08ac370cb99e78e63acee0275e6334c.zip | |
Use non-tq sizeHint functions to fix bindings
(cherry picked from commit d4e11a5f488204ab8886e167c7c4af1e6e16ab58)
Diffstat (limited to 'khtml/java')
| -rw-r--r-- | khtml/java/kjavaappletserver.cpp | 2 | ||||
| -rw-r--r-- | khtml/java/kjavaappletviewer.cpp | 4 | ||||
| -rw-r--r-- | khtml/java/kjavaappletwidget.cpp | 8 | ||||
| -rw-r--r-- | khtml/java/kjavaappletwidget.h | 2 |
4 files changed, 8 insertions, 8 deletions
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 a8238b9f0..16b66000a 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 f69ee59aa..18f5be341 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: |