Use non-tq sizeHint functions to fix bindings

pull/16/head
Timothy Pearson 13 years ago
parent 2c4de80e1e
commit d4e11a5f48

@ -286,7 +286,7 @@ void KVideoWidget::setDoubleSize()
doubleSizeActivated(); doubleSizeActivated();
} }
TQSize KVideoWidget::tqsizeHint() const TQSize KVideoWidget::sizeHint() const
{ {
return TQSize( videoWidth, videoHeight ); return TQSize( videoWidth, videoHeight );
} }

@ -36,7 +36,7 @@ public:
bool isNormalSize(); bool isNormalSize();
bool isDoubleSize(); bool isDoubleSize();
TQSize tqsizeHint() const; TQSize sizeHint() const;
virtual int heightForWidth ( int w ) const; virtual int heightForWidth ( int w ) const;

@ -572,7 +572,7 @@ public:
ErrorCode createConfigFile(); ErrorCode createConfigFile();
ErrorCode loadConfigFile(); /**< Load the local configuration file. */ ErrorCode loadConfigFile(); /**< Load the local configuration file. */
// ErrorCode configureKab(); /**< Open the configuration dialog for the KabAPI. */ // ErrorCode configureKab(); /**< Open the configuration dialog for the KabAPI. */
// TQSize tqsizeHint(); /**< The preferred (minimal) size of the view. */ // ni // TQSize sizeHint(); /**< The preferred (minimal) size of the view. */ // ni
/** /**
* This method parses a vCard and creates an Entry object from it. * This method parses a vCard and creates an Entry object from it.
*/ */

@ -72,7 +72,7 @@ int KabAPI::exec()
{ {
listbox->setCurrentItem(0); listbox->setCurrentItem(0);
} }
listbox->setMinimumSize(listbox->tqsizeHint()); listbox->setMinimumSize(listbox->sizeHint());
adjustSize(); adjustSize();
resize(tqminimumSize()); resize(tqminimumSize());
return KDialogBase::exec(); return KDialogBase::exec();

@ -47,7 +47,7 @@
/** /**
* This class is used as the codecompletion listbox. It can be resized according to its contents, * This class is used as the codecompletion listbox. It can be resized according to its contents,
* therfor the needed size is provided by tqsizeHint(); * therfor the needed size is provided by sizeHint();
*@short Listbox showing codecompletion *@short Listbox showing codecompletion
*@author Jonas B. Jacobi <j.jacobi@gmx.de> *@author Jonas B. Jacobi <j.jacobi@gmx.de>
*/ */
@ -61,7 +61,7 @@ class KateCCListBox : public TQListBox
{ {
} }
TQSize tqsizeHint() const TQSize sizeHint() const
{ {
int count = this->count(); int count = this->count();
int height = 20; int height = 20;
@ -124,7 +124,7 @@ KateCodeCompletion::KateCodeCompletion( KateView* view )
m_completionListBox->installEventFilter( this ); m_completionListBox->installEventFilter( this );
m_completionPopup->resize(m_completionListBox->tqsizeHint() + TQSize(2,2)); m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2));
m_completionPopup->installEventFilter( this ); m_completionPopup->installEventFilter( this );
m_completionPopup->setFocusProxy( m_view->m_viewInternal ); m_completionPopup->setFocusProxy( m_view->m_viewInternal );
@ -305,7 +305,7 @@ void KateCodeCompletion::updateBox( bool )
} }
kdDebug(13035)<<"KateCodeCompletion::updateBox: Resizing widget"<<endl; kdDebug(13035)<<"KateCodeCompletion::updateBox: Resizing widget"<<endl;
m_completionPopup->resize(m_completionListBox->tqsizeHint() + TQSize(2,2)); m_completionPopup->resize(m_completionListBox->sizeHint() + TQSize(2,2));
TQPoint p = m_view->mapToGlobal( m_view->cursorCoordinates() ); TQPoint p = m_view->mapToGlobal( m_view->cursorCoordinates() );
int x = p.x(); int x = p.x();
int y = p.y() ; int y = p.y() ;

@ -757,7 +757,7 @@ void KateIconBorder::setFoldingMarkersOn( bool enable )
TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); TQTimer::singleShot( 0, this, TQT_SLOT(update()) );
} }
TQSize KateIconBorder::tqsizeHint() const TQSize KateIconBorder::sizeHint() const
{ {
int w = 0; int w = 0;
@ -866,7 +866,7 @@ void KateIconBorder::paintBorder (int /*x*/, int y, int /*width*/, int height)
{ {
// we went from n0 ->n9 lines or vice verca // we went from n0 ->n9 lines or vice verca
// this causes an extra updateGeometry() first time the line numbers // this causes an extra updateGeometry() first time the line numbers
// are displayed, but tqsizeHint() is supposed to be const so we can't set // are displayed, but sizeHint() is supposed to be const so we can't set
// the cached value there. // the cached value there.
m_cachedLNWidth = lnWidth; m_cachedLNWidth = lnWidth;
m_oldBackgroundColor = m_view->renderer()->config()->iconBarColor(); m_oldBackgroundColor = m_view->renderer()->config()->iconBarColor();

@ -127,7 +127,7 @@ class KateIconBorder : public TQWidget
KateIconBorder( KateViewInternal* internalView, TQWidget *parent ); KateIconBorder( KateViewInternal* internalView, TQWidget *parent );
// VERY IMPORTANT ;) // VERY IMPORTANT ;)
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
void updateFont(); void updateFont();
int lineNumberWidth() const; int lineNumberWidth() const;

@ -263,7 +263,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

@ -807,7 +807,7 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm )
TQPushButton* const grant = new TQPushButton( i18n("&Grant All"), dialog, "grant" ); TQPushButton* const grant = new TQPushButton( i18n("&Grant All"), dialog, "grant" );
buttonLayout->addWidget( grant ); buttonLayout->addWidget( grant );
dialogLayout->addLayout( buttonLayout ); dialogLayout->addLayout( buttonLayout );
dialog->resize( dialog->tqminimumSizeHint() ); dialog->resize( dialog->minimumSizeHint() );
//clearWState( WState_Polished ); //clearWState( WState_Polished );
connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) );

@ -391,7 +391,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) {
} else } else
applet->setAppletClass (url.url ()); applet->setAppletClass (url.url ());
AppletParameterDialog (w).exec (); AppletParameterDialog (w).exec ();
applet->setSize (w->tqsizeHint()); applet->setSize (w->sizeHint());
} }
if (!m_statusbar_icon) { if (!m_statusbar_icon) {
KStatusBar *sb = m_statusbar->statusBar(); KStatusBar *sb = m_statusbar->statusBar();
@ -500,7 +500,7 @@ void KJavaAppletViewerBrowserExtension::restoreState (TQDataStream & stream) {
applet->setParameter (key, val); applet->setParameter (key, val);
kdDebug(6100) << "restoreState key:" << key << " val:" << val << endl; kdDebug(6100) << "restoreState key:" << key << " val:" << val << endl;
} }
applet->setSize (w->tqsizeHint ()); applet->setSize (w->sizeHint ());
if (w->isVisible()) if (w->isVisible())
w->showApplet (); w->showApplet ();
} }

@ -98,10 +98,10 @@ void KJavaAppletWidget::setWindow( WId w )
} }
} }
TQSize KJavaAppletWidget::tqsizeHint() const TQSize KJavaAppletWidget::sizeHint() const
{ {
kdDebug(6100) << "KJavaAppletWidget::tqsizeHint()" << endl; kdDebug(6100) << "KJavaAppletWidget::sizeHint()" << endl;
TQSize rval = QXEmbed::tqsizeHint(); TQSize rval = QXEmbed::sizeHint();
if( rval.width() == 0 || rval.height() == 0 ) if( rval.width() == 0 || rval.height() == 0 )
{ {
@ -132,7 +132,7 @@ void KJavaAppletWidget::showEvent (TQShowEvent * e) {
if (!applet()->isCreated() && !applet()->appletClass().isEmpty()) { if (!applet()->isCreated() && !applet()->appletClass().isEmpty()) {
// delayed showApplet // delayed showApplet
if (applet()->size().width() <= 0) if (applet()->size().width() <= 0)
applet()->setSize (tqsizeHint()); applet()->setSize (sizeHint());
showApplet(); showApplet();
} }
} }

@ -96,7 +96,7 @@ public:
*/ */
void showApplet(); void showApplet();
TQSize tqsizeHint() const; TQSize sizeHint() const;
void resize( int, int ); void resize( int, int );
protected slots: protected slots:

@ -63,7 +63,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>311</width> <width>311</width>
<height>21</height> <height>21</height>

@ -70,7 +70,7 @@ short RenderApplet::intrinsicWidth() const
int rval = 300; int rval = 300;
if( m_widget ) if( m_widget )
rval = ((KJavaAppletWidget*)(m_widget))->tqsizeHint().width(); rval = ((KJavaAppletWidget*)(m_widget))->sizeHint().width();
return rval > 10 ? rval : 50; return rval > 10 ? rval : 50;
} }
@ -80,7 +80,7 @@ int RenderApplet::intrinsicHeight() const
int rval = 150; int rval = 150;
if( m_widget ) if( m_widget )
rval = m_widget->tqsizeHint().height(); rval = m_widget->sizeHint().height();
return rval > 10 ? rval : 50; return rval > 10 ? rval : 50;
} }

@ -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, // 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 // 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) m_cachedDocWidth <= m_width)
hDocW = kMin( m_cachedDocWidth, s.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) m_cachedDocHeight <= m_height)
hDocH = kMin( m_cachedDocHeight, s.height() ); hDocH = kMin( m_cachedDocHeight, s.height() );

@ -809,7 +809,7 @@ void RenderFileButton::calcMinMaxWidth()
edit, edit,
TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth())) TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth()))
.expandedTo(TQApplication::globalStrut()); .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() ); setIntrinsicWidth( s.width() + bs.width() );
setIntrinsicHeight( kMax(s.height(), bs.height()) ); setIntrinsicHeight( kMax(s.height(), bs.height()) );
@ -1107,14 +1107,14 @@ void RenderSelect::layout( )
if(size < 1) if(size < 1)
size = kMin(static_cast<KListBox*>(m_widget)->count(), 10u); 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(); height = size*height + 2*w->frameWidth();
setIntrinsicWidth( width ); setIntrinsicWidth( width );
setIntrinsicHeight( height ); setIntrinsicHeight( height );
} }
else { else {
TQSize s(m_widget->tqsizeHint()); TQSize s(m_widget->sizeHint());
setIntrinsicWidth( s.width() ); setIntrinsicWidth( s.width() );
setIntrinsicHeight( s.height() ); setIntrinsicHeight( s.height() );
} }
@ -1651,10 +1651,10 @@ void RenderTextArea::calcMinMaxWidth()
const TQFontMetrics &m = style()->fontMetrics(); const TQFontMetrics &m = style()->fontMetrics();
w->setTabStopWidth(8 * m.width(" ")); w->setTabStopWidth(8 * m.width(" "));
TQSize size( kMax(element()->cols(), 1L)*m.width('x') + w->frameWidth() + 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 + kMax(element()->rows(), 1L)*m.lineSpacing() + w->frameWidth()*4 +
(w->wordWrap() == TQTextEdit::NoWrap ? (w->wordWrap() == TQTextEdit::NoWrap ?
w->horizontalScrollBar()->tqsizeHint().height() : 0) w->horizontalScrollBar()->sizeHint().height() : 0)
); );
setIntrinsicWidth( size.width() ); setIntrinsicWidth( size.width() );

@ -1738,7 +1738,7 @@ void KFileDialog::readConfig( KConfig *kc, const TQString& group )
updateAutoSelectExtension (); updateAutoSelectExtension ();
int w1 = tqminimumSize().width(); int w1 = tqminimumSize().width();
int w2 = toolbar->tqsizeHint().width() + 10; int w2 = toolbar->sizeHint().width() + 10;
if (w1 < w2) if (w1 < w2)
setMinimumWidth(w2); setMinimumWidth(w2);

@ -43,7 +43,7 @@ void KFileMetaPreview::initPreviewProviders()
KImageFilePreview *imagePreview = new KImageFilePreview( m_stack ); KImageFilePreview *imagePreview = new KImageFilePreview( m_stack );
(void) m_stack->addWidget( imagePreview ); (void) m_stack->addWidget( imagePreview );
m_stack->raiseWidget( imagePreview ); m_stack->raiseWidget( imagePreview );
resize( imagePreview->tqsizeHint() ); resize( imagePreview->sizeHint() );
TQStringList mimeTypes = imagePreview->supportedMimeTypes(); TQStringList mimeTypes = imagePreview->supportedMimeTypes();
TQStringList::ConstIterator it = mimeTypes.begin(); TQStringList::ConstIterator it = mimeTypes.begin();

@ -68,9 +68,9 @@ void KFilePreview::init( KFileView *view )
preview = new TQWidget((TQSplitter*)this, "preview"); preview = new TQWidget((TQSplitter*)this, "preview");
TQString tmp = i18n("No preview available."); TQString tmp = i18n("No preview available.");
TQLabel *l = new TQLabel(tmp, preview); TQLabel *l = new TQLabel(tmp, preview);
l->setMinimumSize(l->tqsizeHint()); l->setMinimumSize(l->sizeHint());
l->move(10, 5); l->move(10, 5);
preview->setMinimumWidth(l->tqsizeHint().width()+20); preview->setMinimumWidth(l->sizeHint().width()+20);
setResizeMode(preview, TQSplitter::KeepSize); setResizeMode(preview, TQSplitter::KeepSize);
// Why copy the actions? --ellis, 13 Jan 02. // Why copy the actions? --ellis, 13 Jan 02.
@ -123,7 +123,7 @@ void KFilePreview::setPreviewWidget(const TQWidget *w, const KURL &)
delete preview; delete preview;
preview = const_cast<TQWidget*>(w); preview = const_cast<TQWidget*>(w);
preview->reparent((TQSplitter*)this, 0, TQPoint(0, 0), true); preview->reparent((TQSplitter*)this, 0, TQPoint(0, 0), true);
preview->resize(preview->tqsizeHint()); preview->resize(preview->sizeHint());
preview->show(); preview->show();
} }

@ -133,15 +133,15 @@ void KFileSpeedBar::save( KConfig *config )
writeConfig( config, "KFileDialog Speedbar" ); writeConfig( config, "KFileDialog Speedbar" );
} }
TQSize KFileSpeedBar::tqsizeHint() const TQSize KFileSpeedBar::sizeHint() const
{ {
TQSize tqsizeHint = KURLBar::tqsizeHint(); TQSize sizeHint = KURLBar::sizeHint();
int ems = fontMetrics().width("mmmmmmmmmmmm"); int ems = fontMetrics().width("mmmmmmmmmmmm");
if (tqsizeHint.width() < ems) if (sizeHint.width() < ems)
{ {
tqsizeHint.setWidth(ems); sizeHint.setWidth(ems);
} }
return tqsizeHint; return sizeHint;
} }
#include "kfilespeedbar.moc" #include "kfilespeedbar.moc"

@ -31,7 +31,7 @@ public:
~KFileSpeedBar(); ~KFileSpeedBar();
virtual void save( KConfig *config ); virtual void save( KConfig *config );
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
private: private:
bool m_initializeSpeedbar : 1; bool m_initializeSpeedbar : 1;

@ -367,7 +367,7 @@ void KIconDialog::init()
mContextMap[ mNumContext++ ] = context_id[ i ]; mContextMap[ mNumContext++ ] = context_id[ i ];
} }
} }
mpCombo->setFixedSize(mpCombo->tqsizeHint()); mpCombo->setFixedSize(mpCombo->sizeHint());
mpBrowseBut->setFixedWidth(mpCombo->width()); mpBrowseBut->setFixedWidth(mpCombo->width());

@ -137,7 +137,7 @@ void KImageFilePreview::resizeEvent( TQResizeEvent * )
timer->start( 100, true ); // forces a new preview timer->start( 100, true ); // forces a new preview
} }
TQSize KImageFilePreview::tqsizeHint() const TQSize KImageFilePreview::sizeHint() const
{ {
return TQSize( 20, 200 ); // otherwise it ends up huge??? return TQSize( 20, 200 ); // otherwise it ends up huge???
} }

@ -36,7 +36,7 @@ class KIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
KImageFilePreview(TQWidget *parent); KImageFilePreview(TQWidget *parent);
~KImageFilePreview(); ~KImageFilePreview();
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
public slots: public slots:
virtual void showPreview(const KURL &url); virtual void showPreview(const KURL &url);

@ -56,8 +56,8 @@ protected:
virtual void viewportResizeEvent(TQResizeEvent* ev) virtual void viewportResizeEvent(TQResizeEvent* ev)
{ {
TQScrollView::viewportResizeEvent(ev); TQScrollView::viewportResizeEvent(ev);
m_frame->resize( kMax(m_frame->tqsizeHint().width(), ev->size().width()), m_frame->resize( kMax(m_frame->sizeHint().width(), ev->size().width()),
kMax(m_frame->tqsizeHint().height(), ev->size().height())); kMax(m_frame->sizeHint().height(), ev->size().height()));
}; };
private: private:

@ -138,7 +138,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>20</height> <height>20</height>
@ -155,7 +155,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>318</width> <width>318</width>
<height>16</height> <height>16</height>
@ -286,7 +286,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Fixed</enum> <enum>Fixed</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>30</width> <width>30</width>
<height>20</height> <height>20</height>
@ -391,7 +391,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>

@ -401,7 +401,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
TQToolButton *clearButton = new TQToolButton( this ); TQToolButton *clearButton = new TQToolButton( this );
clearButton->setIconSet( BarIcon( "locationbar_erase" ) ); clearButton->setIconSet( BarIcon( "locationbar_erase" ) );
clearButton->setFixedSize( clearButton->tqsizeHint() ); clearButton->setFixedSize( clearButton->sizeHint() );
connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) ); connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) );
TQToolTip::add( clearButton, i18n( "Clear input field" ) ); TQToolTip::add( clearButton, i18n( "Clear input field" ) );
@ -518,7 +518,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value )
//edit->setText( _value ); //edit->setText( _value );
// This is what caused "can't click on items before clicking on Name header". // This is what caused "can't click on items before clicking on Name header".
// Probably due to the resizeEvent handler using width(). // Probably due to the resizeEvent handler using width().
//resize( minimumWidth(), tqsizeHint().height() ); //resize( minimumWidth(), sizeHint().height() );
edit->setFocus(); edit->setFocus();
slotTextChanged(); slotTextChanged();
} }

@ -41,7 +41,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -120,7 +120,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -230,7 +230,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>50</width> <width>50</width>
<height>20</height> <height>20</height>

@ -29,7 +29,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Minimum</enum> <enum>Minimum</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>16</height> <height>16</height>
@ -259,7 +259,7 @@ Following the command, you can have several place holders which will be replaced
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>53</width> <width>53</width>
<height>20</height> <height>20</height>
@ -287,7 +287,7 @@ Following the command, you can have several place holders which will be replaced
<property name="sizeType"> <property name="sizeType">
<enum>MinimumExpanding</enum> <enum>MinimumExpanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>53</width> <width>53</width>
<height>20</height> <height>20</height>

@ -1966,7 +1966,7 @@ void KFilePermissionsPropsPlugin::slotShowAdvancedPermissions() {
TQWhatsThis::add(l, execWhatsThis); TQWhatsThis::add(l, execWhatsThis);
theNotSpecials.append( l ); theNotSpecials.append( l );
// GJ: Add space between normal and special modes // GJ: Add space between normal and special modes
TQSize size = l->tqsizeHint(); TQSize size = l->sizeHint();
size.setWidth(size.width() + 15); size.setWidth(size.width() + 15);
l->setFixedSize(size); l->setFixedSize(size);
gl->addWidget (l, 1, 3); gl->addWidget (l, 1, 3);
@ -2685,35 +2685,35 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl
tmpQLabel = new TQLabel( d->m_frame, "Label_1" ); tmpQLabel = new TQLabel( d->m_frame, "Label_1" );
tmpQLabel->setText( i18n("Pattern ( example: *.html;*.htm )") ); tmpQLabel->setText( i18n("Pattern ( example: *.html;*.htm )") );
tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); tmpQLabel->setMinimumSize(tmpQLabel->sizeHint());
mainlayout->addWidget(tmpQLabel, 1); mainlayout->addWidget(tmpQLabel, 1);
//patternEdit->setGeometry( 10, 40, 210, 30 ); //patternEdit->setGeometry( 10, 40, 210, 30 );
//patternEdit->setText( "" ); //patternEdit->setText( "" );
patternEdit->setMaxLength( 512 ); patternEdit->setMaxLength( 512 );
patternEdit->setMinimumSize( patternEdit->tqsizeHint() ); patternEdit->setMinimumSize( patternEdit->sizeHint() );
patternEdit->setFixedHeight( fontHeight ); patternEdit->setFixedHeight( fontHeight );
mainlayout->addWidget(patternEdit, 1); mainlayout->addWidget(patternEdit, 1);
tmpQLabel = new TQLabel( d->m_frame, "Label_2" ); tmpQLabel = new TQLabel( d->m_frame, "Label_2" );
tmpQLabel->setText( i18n("Mime Type") ); tmpQLabel->setText( i18n("Mime Type") );
tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); tmpQLabel->setMinimumSize(tmpQLabel->sizeHint());
mainlayout->addWidget(tmpQLabel, 1); mainlayout->addWidget(tmpQLabel, 1);
//mimeEdit->setGeometry( 10, 160, 210, 30 ); //mimeEdit->setGeometry( 10, 160, 210, 30 );
mimeEdit->setMaxLength( 256 ); mimeEdit->setMaxLength( 256 );
mimeEdit->setMinimumSize( mimeEdit->tqsizeHint() ); mimeEdit->setMinimumSize( mimeEdit->sizeHint() );
mimeEdit->setFixedHeight( fontHeight ); mimeEdit->setFixedHeight( fontHeight );
mainlayout->addWidget(mimeEdit, 1); mainlayout->addWidget(mimeEdit, 1);
tmpQLabel = new TQLabel( d->m_frame, "Label_3" ); tmpQLabel = new TQLabel( d->m_frame, "Label_3" );
tmpQLabel->setText( i18n("Comment") ); tmpQLabel->setText( i18n("Comment") );
tmpQLabel->setMinimumSize(tmpQLabel->tqsizeHint()); tmpQLabel->setMinimumSize(tmpQLabel->sizeHint());
mainlayout->addWidget(tmpQLabel, 1); mainlayout->addWidget(tmpQLabel, 1);
//commentEdit->setGeometry( 10, 100, 210, 30 ); //commentEdit->setGeometry( 10, 100, 210, 30 );
commentEdit->setMaxLength( 256 ); commentEdit->setMaxLength( 256 );
commentEdit->setMinimumSize( commentEdit->tqsizeHint() ); commentEdit->setMinimumSize( commentEdit->sizeHint() );
commentEdit->setFixedHeight( fontHeight ); commentEdit->setFixedHeight( fontHeight );
mainlayout->addWidget(commentEdit, 1); mainlayout->addWidget(commentEdit, 1);

@ -268,7 +268,7 @@ void KURLBarItem::paint( TQPainter *p )
} }
} }
TQSize KURLBarItem::tqsizeHint() const TQSize KURLBarItem::sizeHint() const
{ {
int wmin = 0; int wmin = 0;
int hmin = 0; int hmin = 0;
@ -284,9 +284,9 @@ TQSize KURLBarItem::tqsizeHint() const
} }
if ( lb->isVertical() ) if ( lb->isVertical() )
wmin = QMIN( wmin, lb->viewport()->tqsizeHint().width() ); wmin = QMIN( wmin, lb->viewport()->sizeHint().width() );
else else
hmin = QMIN( hmin, lb->viewport()->tqsizeHint().height() ); hmin = QMIN( hmin, lb->viewport()->sizeHint().height() );
return TQSize( wmin, hmin ); return TQSize( wmin, hmin );
} }
@ -294,17 +294,17 @@ TQSize KURLBarItem::tqsizeHint() const
int KURLBarItem::width( const TQListBox *lb ) const int KURLBarItem::width( const TQListBox *lb ) const
{ {
if ( static_cast<const KURLBarListBox *>( lb )->isVertical() ) if ( static_cast<const KURLBarListBox *>( lb )->isVertical() )
return QMAX( tqsizeHint().width(), lb->viewport()->width() ); return QMAX( sizeHint().width(), lb->viewport()->width() );
else else
return tqsizeHint().width(); return sizeHint().width();
} }
int KURLBarItem::height( const TQListBox *lb ) const int KURLBarItem::height( const TQListBox *lb ) const
{ {
if ( static_cast<const KURLBarListBox *>( lb )->isVertical() ) if ( static_cast<const KURLBarListBox *>( lb )->isVertical() )
return tqsizeHint().height(); return sizeHint().height();
else else
return QMAX( tqsizeHint().height(), lb->viewport()->height() ); return QMAX( sizeHint().height(), lb->viewport()->height() );
} }
bool KURLBarItem::isPersistent() const bool KURLBarItem::isPersistent() const
@ -435,7 +435,7 @@ void KURLBar::setIconSize( int size )
item = static_cast<KURLBarItem*>( item->next() ); item = static_cast<KURLBarItem*>( item->next() );
} }
resize( tqsizeHint() ); resize( sizeHint() );
updateGeometry(); updateGeometry();
} }
@ -466,14 +466,14 @@ void KURLBar::paletteChange( const TQPalette & )
setPalette( pal ); setPalette( pal );
} }
TQSize KURLBar::tqsizeHint() const TQSize KURLBar::sizeHint() const
{ {
return m_listBox->tqsizeHint(); return m_listBox->sizeHint();
#if 0 #if 0
// this code causes vertical and or horizontal scrollbars appearing // this code causes vertical and or horizontal scrollbars appearing
// depending on the text, font, moonphase and earth rotation. Just using // depending on the text, font, moonphase and earth rotation. Just using
// m_listBox->tqsizeHint() fixes this (although the widget can then be // m_listBox->sizeHint() fixes this (although the widget can then be
// resized to a smaller size so that scrollbars appear). // resized to a smaller size so that scrollbars appear).
int w = 0; int w = 0;
int h = 0; int h = 0;
@ -484,7 +484,7 @@ TQSize KURLBar::tqsizeHint() const
item; item;
item = static_cast<KURLBarItem*>( item->next() ) ) { item = static_cast<KURLBarItem*>( item->next() ) ) {
TQSize sh = item->tqsizeHint(); TQSize sh = item->sizeHint();
if ( vertical ) { if ( vertical ) {
w = QMAX( w, sh.width() ); w = QMAX( w, sh.width() );
@ -508,9 +508,9 @@ TQSize KURLBar::tqsizeHint() const
#endif #endif
} }
TQSize KURLBar::tqminimumSizeHint() const TQSize KURLBar::minimumSizeHint() const
{ {
TQSize s = tqsizeHint(); // ### TQSize s = sizeHint(); // ###
int w = s.width() + m_listBox->verticalScrollBar()->width(); int w = s.width() + m_listBox->verticalScrollBar()->width();
int h = s.height() + m_listBox->horizontalScrollBar()->height(); int h = s.height() + m_listBox->horizontalScrollBar()->height();
return TQSize( w, h ); return TQSize( w, h );

@ -109,7 +109,7 @@ public:
* returns the preferred size of this item * returns the preferred size of this item
* @since 3.1 * @since 3.1
*/ */
TQSize tqsizeHint() const; TQSize sizeHint() const;
/** /**
* returns the width of this item. * returns the width of this item.
@ -319,12 +319,12 @@ public:
* @returns a proper sizehint, depending on the orientation and the number * @returns a proper sizehint, depending on the orientation and the number
* of items available. * of items available.
*/ */
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
/** /**
* @returns a proper minimum size (reimplemented) * @returns a proper minimum size (reimplemented)
*/ */
virtual TQSize tqminimumSizeHint() const; virtual TQSize minimumSizeHint() const;
/** /**
* Call this method to read a saved configuration from @p config, * Call this method to read a saved configuration from @p config,

@ -67,7 +67,7 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName)
topLayout->addWidget( label ); topLayout->addWidget( label );
urlRequester_ = new KURLRequester( urlName, plainPage(), "urlRequester" ); urlRequester_ = new KURLRequester( urlName, plainPage(), "urlRequester" );
urlRequester_->setMinimumWidth( urlRequester_->tqsizeHint().width() * 3 ); urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 );
topLayout->addWidget( urlRequester_ ); topLayout->addWidget( urlRequester_ );
urlRequester_->setFocus(); urlRequester_->setFocus();
connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)),

@ -171,8 +171,8 @@ void DefaultProgress::init()
connect( d->cancelClose, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) ); connect( d->cancelClose, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) );
hBox->addWidget( d->cancelClose ); hBox->addWidget( d->cancelClose );
resize( tqsizeHint() ); resize( sizeHint() );
setMaximumHeight(tqsizeHint().height()); setMaximumHeight(sizeHint().height());
d->keepOpenChecked = false; d->keepOpenChecked = false;
d->noCaptionYet = true; d->noCaptionYet = true;

@ -88,7 +88,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
lbl = new TQLabel( main ); lbl = new TQLabel( main );
lbl->setPixmap( pix ); lbl->setPixmap( pix );
lbl->tqsetAlignment( Qt::AlignLeft|Qt::AlignVCenter ); lbl->tqsetAlignment( Qt::AlignLeft|Qt::AlignVCenter );
lbl->setFixedSize( lbl->tqsizeHint() ); lbl->setFixedSize( lbl->sizeHint() );
d->layout->addWidget( lbl, 0, 0, Qt::AlignLeft ); d->layout->addWidget( lbl, 0, 0, Qt::AlignLeft );
} }
d->prompt = new TQLabel( main ); d->prompt = new TQLabel( main );
@ -107,11 +107,11 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
// Row 4: Username field // Row 4: Username field
d->userNameLabel = new TQLabel( i18n("&Username:"), main ); d->userNameLabel = new TQLabel( i18n("&Username:"), main );
d->userNameLabel->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft ); d->userNameLabel->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft );
d->userNameLabel->setFixedSize( d->userNameLabel->tqsizeHint() ); d->userNameLabel->setFixedSize( d->userNameLabel->sizeHint() );
d->userNameHBox = new TQHBox( main ); d->userNameHBox = new TQHBox( main );
d->userEdit = new KLineEdit( d->userNameHBox ); d->userEdit = new KLineEdit( d->userNameHBox );
TQSize s = d->userEdit->tqsizeHint(); TQSize s = d->userEdit->sizeHint();
d->userEdit->setFixedHeight( s.height() ); d->userEdit->setFixedHeight( s.height() );
d->userEdit->setMinimumWidth( s.width() ); d->userEdit->setMinimumWidth( s.width() );
d->userNameLabel->setBuddy( d->userEdit ); d->userNameLabel->setBuddy( d->userEdit );
@ -124,14 +124,14 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
// Row 6: Password field // Row 6: Password field
lbl = new TQLabel( i18n("&Password:"), main ); lbl = new TQLabel( i18n("&Password:"), main );
lbl->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft ); lbl->tqsetAlignment( Qt::AlignVCenter | Qt::AlignLeft );
lbl->setFixedSize( lbl->tqsizeHint() ); lbl->setFixedSize( lbl->sizeHint() );
TQHBox* hbox = new TQHBox( main ); TQHBox* hbox = new TQHBox( main );
d->passEdit = new KLineEdit( hbox ); d->passEdit = new KLineEdit( hbox );
if ( cfg->readEntry("EchoMode", "OneStar") == "NoEcho" ) if ( cfg->readEntry("EchoMode", "OneStar") == "NoEcho" )
d->passEdit->setEchoMode( TQLineEdit::NoEcho ); d->passEdit->setEchoMode( TQLineEdit::NoEcho );
else else
d->passEdit->setEchoMode( TQLineEdit::Password ); d->passEdit->setEchoMode( TQLineEdit::Password );
s = d->passEdit->tqsizeHint(); s = d->passEdit->sizeHint();
d->passEdit->setFixedHeight( s.height() ); d->passEdit->setFixedHeight( s.height() );
d->passEdit->setMinimumWidth( s.width() ); d->passEdit->setMinimumWidth( s.width() );
lbl->setBuddy( d->passEdit ); lbl->setBuddy( d->passEdit );
@ -145,7 +145,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
// Row 8: Keep Password // Row 8: Keep Password
hbox = new TQHBox( main ); hbox = new TQHBox( main );
d->keepCheckBox = new TQCheckBox( i18n("&Keep password"), hbox ); d->keepCheckBox = new TQCheckBox( i18n("&Keep password"), hbox );
d->keepCheckBox->setFixedSize( d->keepCheckBox->tqsizeHint() ); d->keepCheckBox->setFixedSize( d->keepCheckBox->sizeHint() );
d->keep = cfg->readBoolEntry("Keep", false ); d->keep = cfg->readBoolEntry("Keep", false );
d->keepCheckBox->setChecked( d->keep ); d->keepCheckBox->setChecked( d->keep );
connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool ))); connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool )));
@ -165,7 +165,7 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user,
d->userEdit->setFocus(); d->userEdit->setFocus();
d->userEditCombo = 0; d->userEditCombo = 0;
// setFixedSize( tqsizeHint() ); // setFixedSize( sizeHint() );
} }
TQString PasswordDialog::username() const TQString PasswordDialog::username() const
@ -240,7 +240,7 @@ void PasswordDialog::addCommentLine( const TQString& label,
TQLabel* lbl = new TQLabel( label, main); TQLabel* lbl = new TQLabel( label, main);
lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignRight ); lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignRight );
lbl->setFixedSize( lbl->tqsizeHint() ); lbl->setFixedSize( lbl->sizeHint() );
d->layout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft ); d->layout->addWidget( lbl, d->nRow+2, 0, Qt::AlignLeft );
lbl = new TQLabel( comment, main); lbl = new TQLabel( comment, main);
lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignLeft|TQt::WordBreak ); lbl->tqsetAlignment( Qt::AlignVCenter|Qt::AlignLeft|TQt::WordBreak );
@ -304,7 +304,7 @@ void PasswordDialog::setKnownLogins( const TQMap<TQString, TQString>& knownLogin
delete d->userEdit; delete d->userEdit;
d->userEditCombo = new KComboBox( true, d->userNameHBox ); d->userEditCombo = new KComboBox( true, d->userNameHBox );
d->userEdit = d->userEditCombo->lineEdit(); d->userEdit = d->userEditCombo->lineEdit();
TQSize s = d->userEditCombo->tqsizeHint(); TQSize s = d->userEditCombo->sizeHint();
d->userEditCombo->setFixedHeight( s.height() ); d->userEditCombo->setFixedHeight( s.height() );
d->userEditCombo->setMinimumWidth( s.width() ); d->userEditCombo->setMinimumWidth( s.width() );
d->userNameLabel->setBuddy( d->userEditCombo ); d->userNameLabel->setBuddy( d->userEditCombo );

@ -380,7 +380,7 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption,
d->bCancel->setDefault( true ); d->bCancel->setDefault( true );
layout->addWidget( d->bCancel ); layout->addWidget( d->bCancel );
resize( tqsizeHint() ); resize( sizeHint() );
} }
RenameDlg::~RenameDlg() RenameDlg::~RenameDlg()

@ -71,8 +71,8 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo
// vlayout->addStrut( 360 ); makes dlg at least that wide // vlayout->addStrut( 360 ); makes dlg at least that wide
TQLabel * lb = new TQLabel( _error_text, this ); TQLabel * lb = new TQLabel( _error_text, this );
lb->setFixedHeight( lb->tqsizeHint().height() ); lb->setFixedHeight( lb->sizeHint().height() );
lb->setMinimumWidth( lb->tqsizeHint().width() ); lb->setMinimumWidth( lb->sizeHint().width() );
vlayout->addWidget( lb ); vlayout->addWidget( lb );
vlayout->addSpacing( 10 ); vlayout->addSpacing( 10 );
@ -82,26 +82,26 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo
if ( b0 ) if ( b0 )
{ {
b0->setDefault( true ); b0->setDefault( true );
b0->setFixedSize( b0->tqsizeHint() ); b0->setFixedSize( b0->sizeHint() );
layout->addWidget( b0 ); layout->addWidget( b0 );
layout->addSpacing( 5 ); layout->addSpacing( 5 );
} }
if ( b1 ) if ( b1 )
{ {
b1->setFixedSize( b1->tqsizeHint() ); b1->setFixedSize( b1->sizeHint() );
layout->addWidget( b1 ); layout->addWidget( b1 );
layout->addSpacing( 5 ); layout->addSpacing( 5 );
} }
if ( b2 ) if ( b2 )
{ {
b2->setFixedSize( b2->tqsizeHint() ); b2->setFixedSize( b2->sizeHint() );
layout->addWidget( b2 ); layout->addWidget( b2 );
layout->addSpacing( 5 ); layout->addSpacing( 5 );
} }
vlayout->addStretch( 10 ); vlayout->addStretch( 10 );
vlayout->activate(); vlayout->activate();
resize( tqsizeHint() ); resize( sizeHint() );
} }
SkipDlg::~SkipDlg() SkipDlg::~SkipDlg()

@ -64,7 +64,7 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button )
m_pLabel->installEventFilter( this ); m_pLabel->installEventFilter( this );
m_pLabel->setMinimumWidth( w ); m_pLabel->setMinimumWidth( w );
stack->addWidget( m_pLabel, 2 ); stack->addWidget( m_pLabel, 2 );
setMinimumSize( tqsizeHint() ); setMinimumSize( sizeHint() );
mode = None; mode = None;
setMode(); setMode();

@ -331,7 +331,7 @@ void KSSLInfoDlg::displayCert(KSSLCertificate *x) {
} }
d->_csl->setText(errorStr); d->_csl->setText(errorStr);
d->_csl->setMinimumSize(d->_csl->tqsizeHint()); d->_csl->setMinimumSize(d->_csl->sizeHint());
d->_subject->setValues(x->getSubject()); d->_subject->setValues(x->getSubject());
d->_issuer->setValues(x->getIssuer()); d->_issuer->setValues(x->getIssuer());

@ -37,7 +37,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>41</width> <width>41</width>
<height>21</height> <height>21</height>
@ -99,7 +99,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>61</width> <width>61</width>
<height>21</height> <height>21</height>

@ -36,7 +36,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>21</height> <height>21</height>
@ -135,7 +135,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>140</width> <width>140</width>
<height>21</height> <height>21</height>
@ -152,7 +152,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>140</width> <width>140</width>
<height>31</height> <height>31</height>
@ -311,7 +311,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>51</height> <height>51</height>
@ -328,7 +328,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>101</width> <width>101</width>
<height>21</height> <height>21</height>
@ -345,7 +345,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>111</width> <width>111</width>
<height>31</height> <height>31</height>
@ -362,7 +362,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>70</height> <height>70</height>
@ -417,7 +417,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>121</height> <height>121</height>
@ -450,7 +450,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>51</height> <height>51</height>

@ -47,7 +47,7 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name )
layout->addWidget( startR ); layout->addWidget( startR );
layout->addWidget( startT ); layout->addWidget( startT );
layout->addWidget( test ); layout->addWidget( test );
resize( layout->tqsizeHint() ); resize( layout->sizeHint() );
connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) ); connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) );
connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) ); connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) );

@ -144,24 +144,24 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr )
hbLayout = new TQHBoxLayout( topLayout, 15 ); hbLayout = new TQHBoxLayout( topLayout, 15 );
pbStart = new TQPushButton( "&Start", main_widget ); pbStart = new TQPushButton( "&Start", main_widget );
pbStart->setFixedSize( pbStart->tqsizeHint() ); pbStart->setFixedSize( pbStart->sizeHint() );
connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) ); connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) );
hbLayout->addWidget( pbStart, 5 ); hbLayout->addWidget( pbStart, 5 );
pbStop = new TQPushButton( "Sto&p", main_widget ); pbStop = new TQPushButton( "Sto&p", main_widget );
pbStop->setFixedSize( pbStop->tqsizeHint() ); pbStop->setFixedSize( pbStop->sizeHint() );
pbStop->setEnabled( false ); pbStop->setEnabled( false );
connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) ); connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) );
hbLayout->addWidget( pbStop, 5 ); hbLayout->addWidget( pbStop, 5 );
// close button // close button
close = new TQPushButton( "&Close", main_widget ); close = new TQPushButton( "&Close", main_widget );
close->setFixedSize( close->tqsizeHint() ); close->setFixedSize( close->sizeHint() );
connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit())); connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit()));
topLayout->addWidget( close, 5 ); topLayout->addWidget( close, 5 );
main_widget->setMinimumSize( main_widget->tqsizeHint() ); main_widget->setMinimumSize( main_widget->sizeHint() );
setCentralWidget( main_widget ); setCentralWidget( main_widget );
slave = 0; slave = 0;
@ -545,7 +545,7 @@ int main(int argc, char **argv) {
KioslaveTest test( src, dest, op, pr ); KioslaveTest test( src, dest, op, pr );
test.show(); test.show();
// Bug in KTMW / Qt / layouts ? // Bug in KTMW / Qt / layouts ?
test.resize( test.tqsizeHint() ); test.resize( test.sizeHint() );
app.setMainWidget(&test); app.setMainWidget(&test);
app.exec(); app.exec();

@ -103,7 +103,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
TQLabel* icon = new TQLabel( hBox ); TQLabel* icon = new TQLabel( hBox );
icon->setPixmap( TQMessageBox::standardIcon(TQMessageBox::Warning) ); icon->setPixmap( TQMessageBox::standardIcon(TQMessageBox::Warning) );
icon->tqsetAlignment( Qt::AlignCenter ); icon->tqsetAlignment( Qt::AlignCenter );
icon->setFixedSize( 2*icon->tqsizeHint() ); icon->setFixedSize( 2*icon->sizeHint() );
int count = cookieList.count(); int count = cookieList.count();
@ -203,7 +203,7 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList,
vlayout->addWidget( bbox ); vlayout->addWidget( bbox );
setFixedSize( tqsizeHint() ); setFixedSize( sizeHint() );
} }
KCookieWin::~KCookieWin() KCookieWin::~KCookieWin()
@ -313,7 +313,7 @@ KCookieDetail::KCookieDetail( KHttpCookieList cookieList, int cookieCount,
if ( cookieCount > 1 ) if ( cookieCount > 1 )
{ {
TQPushButton* btnNext = new TQPushButton( i18n("Next cookie","&Next >>"), this ); TQPushButton* btnNext = new TQPushButton( i18n("Next cookie","&Next >>"), this );
btnNext->setFixedSize( btnNext->tqsizeHint() ); btnNext->setFixedSize( btnNext->sizeHint() );
grid->addMultiCellWidget( btnNext, 8, 8, 0, 1 ); grid->addMultiCellWidget( btnNext, 8, 8, 0, 1 );
connect( btnNext, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextCookie()) ); connect( btnNext, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextCookie()) );
#ifndef QT_NO_TOOLTIP #ifndef QT_NO_TOOLTIP

@ -106,7 +106,7 @@ void KMdiTaskBarButton::fitText( const TQString& origStr, int newWidth )
{ {
TQButton::setText( m_actualText ); TQButton::setText( m_actualText );
int actualWidth = tqsizeHint().width(); int actualWidth = sizeHint().width();
int realLetterCount = origStr.length(); int realLetterCount = origStr.length();
int newLetterCount = ( newWidth * realLetterCount ) / actualWidth; int newLetterCount = ( newWidth * realLetterCount ) / actualWidth;
int w = newWidth + 1; int w = newWidth + 1;
@ -348,9 +348,9 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth )
for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) for ( b = m_pButtonList->first();b;b = m_pButtonList->next() )
{ {
b->setText( b->actualText() ); b->setText( b->actualText() );
if ( b->width() != b->tqsizeHint().width() ) if ( b->width() != b->sizeHint().width() )
{ {
b->setFixedWidth( b->tqsizeHint().width() ); b->setFixedWidth( b->sizeHint().width() );
b->show(); b->show();
} }
} }

@ -82,7 +82,7 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
TQT_SLOT( slotNameChanged(const TQString &))); TQT_SLOT( slotNameChanged(const TQString &)));
slotNameChanged( mName->text() ); slotNameChanged( mName->text() );
setMinimumSize( tqsizeHint() ); setMinimumSize( sizeHint() );
} }
void ConfigDialog::setInEditMode( bool value ) void ConfigDialog::setInEditMode( bool value )

@ -123,7 +123,7 @@ Click here if you consider that the unknown word is not misspelled and you want
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>74</width> <width>74</width>
<height>20</height> <height>20</height>
@ -298,7 +298,7 @@ Click here if you consider that the unknown word is not misspelled and you want
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>

@ -2468,8 +2468,8 @@ TQSize AsteroidStyle::tqsizeFromContents(ContentsType ct,
TQMenuItem *mi = o.menuItem(); TQMenuItem *mi = o.menuItem();
if (mi->custom()) { if (mi->custom()) {
sw = mi->custom()->tqsizeHint().width(); sw = mi->custom()->sizeHint().width();
sh = mi->custom()->tqsizeHint().height(); sh = mi->custom()->sizeHint().height();
} else if (mi->widget()) { } else if (mi->widget()) {
/* This is a do-nothing branch */ /* This is a do-nothing branch */
} else if (mi->isSeparator()) { } else if (mi->isSeparator()) {

@ -1185,7 +1185,7 @@ void HighColorStyle::tqdrawControl( TQ_ControlElement element,
// Make the label indicate if the button is a default button or not // Make the label indicate if the button is a default button or not
if ( active || button->isDefault() ) { if ( active || button->isDefault() ) {
// Draw "fake" bold text - this enables the font metrics to remain // Draw "fake" bold text - this enables the font metrics to remain
// the same as computed in TQPushButton::tqsizeHint(), but gives // the same as computed in TQPushButton::sizeHint(), but gives
// a reasonable bold effect. // a reasonable bold effect.
int i; int i;
@ -1875,8 +1875,8 @@ TQSize HighColorStyle::tqsizeFromContents( ContentsType contents,
int w = contentSize.width(), h = contentSize.height(); int w = contentSize.width(), h = contentSize.height();
if ( mi->custom() ) { if ( mi->custom() ) {
w = mi->custom()->tqsizeHint().width(); w = mi->custom()->sizeHint().width();
h = mi->custom()->tqsizeHint().height(); h = mi->custom()->sizeHint().height();
if ( ! mi->custom()->fullSpan() ) if ( ! mi->custom()->fullSpan() )
h += 2*itemVMargin + 2*itemFrame; h += 2*itemVMargin + 2*itemFrame;
} }

@ -1730,8 +1730,8 @@ TQSize HighContrastStyle::tqsizeFromContents( ContentsType contents,
int w = contentSize.width(), h = contentSize.height(); int w = contentSize.width(), h = contentSize.height();
if ( mi->custom() ) { if ( mi->custom() ) {
w = mi->custom()->tqsizeHint().width(); w = mi->custom()->sizeHint().width();
h = mi->custom()->tqsizeHint().height(); h = mi->custom()->sizeHint().height();
if ( ! mi->custom()->fullSpan() ) if ( ! mi->custom()->fullSpan() )
h += 2*itemVMargin + 2*itemFrame; h += 2*itemVMargin + 2*itemFrame;
} }

@ -1936,7 +1936,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQComboBox* combo) const
{ {
if (combo->width() >= 80) if (combo->width() >= 80)
return false; return false;
int suggestedWidth = combo->tqsizeHint().width(); int suggestedWidth = combo->sizeHint().width();
if (combo->width() - suggestedWidth < -5) if (combo->width() - suggestedWidth < -5)
return true; return true;
@ -2475,8 +2475,8 @@ TQSize KeramikStyle::tqsizeFromContents( ContentsType contents,
int w = contentSize.width(), h = contentSize.height(); int w = contentSize.width(), h = contentSize.height();
if ( mi->custom() ) { if ( mi->custom() ) {
w = mi->custom()->tqsizeHint().width(); w = mi->custom()->sizeHint().width();
h = mi->custom()->tqsizeHint().height(); h = mi->custom()->sizeHint().height();
if ( ! mi->custom()->fullSpan() ) if ( ! mi->custom()->fullSpan() )
h += 2*itemVMargin + 2*itemFrame; h += 2*itemVMargin + 2*itemFrame;
} }
@ -2586,7 +2586,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
{ {
//Note that the widget here == the combo, not the completion //Note that the widget here == the combo, not the completion
//box, so we don't get any recursion //box, so we don't get any recursion
int suggestedWidth = widget->tqsizeHint().width(); int suggestedWidth = widget->sizeHint().width();
TQRect def = opt.rect(); TQRect def = opt.rect();
def.addCoords( 4, -4, -6, 4 ); def.addCoords( 4, -4, -6, 4 );

@ -260,8 +260,8 @@ TQSize KThemeStyle::tqsizeFromContents( ContentsType contents,
if ( mi->custom() ) if ( mi->custom() )
{ {
w = mi->custom() ->tqsizeHint().width(); w = mi->custom() ->sizeHint().width();
h = mi->custom() ->tqsizeHint().height(); h = mi->custom() ->sizeHint().height();
if ( ! mi->custom() ->fullSpan() ) if ( ! mi->custom() ->fullSpan() )
h += 2 * itemVMargin + 2 * itemFrame; h += 2 * itemVMargin + 2 * itemFrame;
} }
@ -1178,7 +1178,7 @@ void KThemeStyle::tqdrawControl( ControlElement element,
if ( active || button->isDefault() && button->isEnabled() ) if ( active || button->isDefault() && button->isEnabled() )
{ {
// Draw "fake" bold text - this enables the font metrics to remain // Draw "fake" bold text - this enables the font metrics to remain
// the same as computed in TQPushButton::tqsizeHint(), but gives // the same as computed in TQPushButton::sizeHint(), but gives
// a reasonable bold effect. // a reasonable bold effect.
int i; int i;

@ -1529,8 +1529,8 @@ TQSize LightStyleV2::tqsizeFromContents( ContentsType contents,
int w = contentsSize.width(), h = contentsSize.height(); int w = contentsSize.width(), h = contentsSize.height();
if (mi->custom()) { if (mi->custom()) {
w = mi->custom()->tqsizeHint().width(); w = mi->custom()->sizeHint().width();
h = mi->custom()->tqsizeHint().height(); h = mi->custom()->sizeHint().height();
if (! mi->custom()->fullSpan() && h < 22) if (! mi->custom()->fullSpan() && h < 22)
h = 22; h = 22;
} else if(mi->widget()) { } else if(mi->widget()) {

@ -1756,8 +1756,8 @@ TQSize LightStyleV3::tqsizeFromContents( ContentsType contents,
int w = contentsSize.width(), h = contentsSize.height(); int w = contentsSize.width(), h = contentsSize.height();
if (mi->custom()) { if (mi->custom()) {
w = mi->custom()->tqsizeHint().width(); w = mi->custom()->sizeHint().width();
h = mi->custom()->tqsizeHint().height(); h = mi->custom()->sizeHint().height();
if (! mi->custom()->fullSpan() && h < 22) if (! mi->custom()->fullSpan() && h < 22)
h = 22; h = 22;
} else if(mi->widget()) { } else if(mi->widget()) {

@ -3365,8 +3365,8 @@ TQSize PlastikStyle::tqsizeFromContents(ContentsType t,
bool checkable = popup->isCheckable(); bool checkable = popup->isCheckable();
if (mi->custom()) { if (mi->custom()) {
w = mi->custom()->tqsizeHint().width(); w = mi->custom()->sizeHint().width();
h = mi->custom()->tqsizeHint().height(); h = mi->custom()->sizeHint().height();
if (!mi->custom()->fullSpan() ) if (!mi->custom()->fullSpan() )
h += 4; h += 4;
} else if (mi->widget()) { } else if (mi->widget()) {

@ -456,7 +456,7 @@ void KMultiTabBarButton::showEvent( TQShowEvent* he) {
} }
TQSize KMultiTabBarButton::tqsizeHint() const TQSize KMultiTabBarButton::sizeHint() const
{ {
constPolish(); constPolish();
@ -577,12 +577,12 @@ void KMultiTabBarTab::updateState()
if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) { if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) {
setFixedWidth(24); setFixedWidth(24);
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) { if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
setFixedHeight(KMultiTabBarButton::tqsizeHint().width()); setFixedHeight(KMultiTabBarButton::sizeHint().width());
} else setFixedHeight(36); } else setFixedHeight(36);
} else { } else {
setFixedHeight(24); setFixedHeight(24);
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) { if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
setFixedWidth(KMultiTabBarButton::tqsizeHint().width()); setFixedWidth(KMultiTabBarButton::sizeHint().width());
} else setFixedWidth(36); } else setFixedWidth(36);
} }
} else { } else {
@ -633,7 +633,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
const int height = 24; const int height = 24;
if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) { if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (isOn())) {
if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right)) if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right))
sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint(); sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint();
else sh=TQSize(this->width(),this->height()); else sh=TQSize(this->width(),this->height());
} }
else else

@ -239,7 +239,7 @@ public slots:
*/ */
void setText(const TQString &); void setText(const TQString &);
TQSize tqsizeHint() const; TQSize sizeHint() const;
protected: protected:
KMultiTabBar::KMultiTabBarPosition m_position; KMultiTabBar::KMultiTabBarPosition m_position;

@ -32,7 +32,7 @@
/** /**
* we need to insert the strings after the dialog is set * we need to insert the strings after the dialog is set
* up, otherwise TQComboBox will deliver an aweful big tqsizeHint * up, otherwise TQComboBox will deliver an aweful big sizeHint
* for long replacement texts. * for long replacement texts.
*/ */
class KReplaceDialog::KReplaceDialogPrivate { class KReplaceDialog::KReplaceDialogPrivate {

@ -44,7 +44,7 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name)
connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked()));
m_remove->setEnabled(false); m_remove->setEnabled(false);
m_view->setFixedHeight(TQMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->tqsizeHint().height()*2)); m_view->setFixedHeight(TQMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().height()*2));
TQHBoxLayout *l0 = new TQHBoxLayout(this, 0, 3); TQHBoxLayout *l0 = new TQHBoxLayout(this, 0, 3);
TQVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0); TQVBoxLayout *l1 = new TQVBoxLayout(0, 0, 0);

@ -44,7 +44,7 @@ ImagePosition::ImagePosition(TQWidget *parent, const char *name)
: TQWidget(parent,name) : TQWidget(parent,name)
{ {
position_ = Center; position_ = Center;
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
pix_.load(locate("data", "tdeprint/preview-mini.png")); pix_.load(locate("data", "tdeprint/preview-mini.png"));
} }
@ -147,7 +147,7 @@ void ImagePosition::paintEvent(TQPaintEvent*)
p.end(); p.end();
} }
TQSize ImagePosition::tqsizeHint() const TQSize ImagePosition::sizeHint() const
{ {
return TQSize(60, 80); return TQSize(60, 80);
} }

@ -45,7 +45,7 @@ public:
void setPosition(int horiz = 1, int vert = 1); void setPosition(int horiz = 1, int vert = 1);
PositionType position() const { return (PositionType)position_; } PositionType position() const { return (PositionType)position_; }
TQString positionString() const; TQString positionString() const;
TQSize tqsizeHint() const; TQSize sizeHint() const;
protected: protected:
void paintEvent(TQPaintEvent *); void paintEvent(TQPaintEvent *);

@ -72,7 +72,7 @@ void ImagePreview::setBlackAndWhite(bool on){
update(); update();
} }
TQSize ImagePreview::tqminimumSizeHint() const TQSize ImagePreview::minimumSizeHint() const
{ {
return image_.size(); return image_.size();
} }

@ -32,7 +32,7 @@ public:
void setParameters(int brightness, int hue, int saturation, int gamma); void setParameters(int brightness, int hue, int saturation, int gamma);
void setImage(const TQImage& image); void setImage(const TQImage& image);
void setBlackAndWhite(bool on); void setBlackAndWhite(bool on);
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
private: // Private attributes private: // Private attributes
int brightness_; int brightness_;

@ -313,7 +313,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name)
TQRadioButton *left = new TQRadioButton(positionbox); TQRadioButton *left = new TQRadioButton(positionbox);
TQRadioButton *right = new TQRadioButton(positionbox); TQRadioButton *right = new TQRadioButton(positionbox);
TQRadioButton *hcenter = new TQRadioButton(positionbox); TQRadioButton *hcenter = new TQRadioButton(positionbox);
TQSize sz = bottom->tqsizeHint(); TQSize sz = bottom->sizeHint();
bottom->setFixedSize(sz); bottom->setFixedSize(sz);
vcenter->setFixedSize(sz); vcenter->setFixedSize(sz);
top->setFixedSize(sz); top->setFixedSize(sz);

@ -153,12 +153,12 @@ void KPTagsPage::getOptions(TQMap<TQString,TQString>& opts, bool)
} }
} }
TQSize KPTagsPage::tqsizeHint() const TQSize KPTagsPage::sizeHint() const
{ {
return TQSize(-1, -1); return TQSize(-1, -1);
} }
TQSize KPTagsPage::tqminimumSizeHint() const TQSize KPTagsPage::minimumSizeHint() const
{ {
return TQSize(-1, -1); return TQSize(-1, -1);
} }

@ -34,8 +34,8 @@ public:
void setOptions(const TQMap<TQString,TQString>& opts); void setOptions(const TQMap<TQString,TQString>& opts);
bool isValid(TQString& msg); bool isValid(TQString& msg);
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
private: private:
TQTable *m_tags; TQTable *m_tags;

@ -263,7 +263,7 @@ void KFileList::slotOpenFile()
} }
} }
TQSize KFileList::tqsizeHint() const TQSize KFileList::sizeHint() const
{ {
return TQSize(100, 100); return TQSize(100, 100);
} }

@ -37,7 +37,7 @@ public:
void setFileList(const TQStringList&); void setFileList(const TQStringList&);
TQStringList fileList() const; TQStringList fileList() const;
TQSize tqsizeHint() const; TQSize sizeHint() const;
protected slots: protected slots:
void slotAddFile(); void slotAddFile();

@ -194,7 +194,7 @@ KPPosterPage::KPPosterPage( TQWidget *parent, const char *name )
m_lockbtn->setToggleButton( true ); m_lockbtn->setToggleButton( true );
m_lockbtn->setPixmap( SmallIcon( "encrypted" ) ); m_lockbtn->setPixmap( SmallIcon( "encrypted" ) );
m_lockbtn->setOn( true ); m_lockbtn->setOn( true );
m_lockbtn->setFixedSize( m_lockbtn->tqsizeHint() ); m_lockbtn->setFixedSize( m_lockbtn->sizeHint() );
TQToolTip::add( m_lockbtn, i18n( "Link/unlink poster and print size" ) ); TQToolTip::add( m_lockbtn, i18n( "Link/unlink poster and print size" ) );
for ( int i=0; i<KPrinter::NPageSize-1; i++ ) for ( int i=0; i<KPrinter::NPageSize-1; i++ )

@ -118,7 +118,7 @@ void CJanusWidget::CListBox::computeWidth()
item = item->next(); item = item->next();
} }
if (verticalScrollBar()->isVisible()) if (verticalScrollBar()->isVisible())
w += verticalScrollBar()->tqsizeHint().width(); w += verticalScrollBar()->sizeHint().width();
w += (frameWidth()*2); w += (frameWidth()*2);
setFixedWidth(w); setFixedWidth(w);
} }

@ -105,9 +105,9 @@ void KMPrinterView::slotPrinterSelected(const TQString& p)
m_current = p; m_current = p;
} }
TQSize KMPrinterView::tqminimumSizeHint() const TQSize KMPrinterView::minimumSizeHint() const
{ {
return TQWidgetStack::tqminimumSizeHint(); return TQWidgetStack::minimumSizeHint();
} }
#include "kmprinterview.moc" #include "kmprinterview.moc"

@ -42,7 +42,7 @@ public:
void setViewType(ViewType t); void setViewType(ViewType t);
ViewType viewType() const { return m_type; } ViewType viewType() const { return m_type; }
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
signals: signals:
void printerSelected(const TQString&); void printerSelected(const TQString&);

@ -275,7 +275,7 @@ void KXmlCommandSelector::slotHelpCommand()
{ {
KPopupFrame *pop = new KPopupFrame( m_helpbtn ); KPopupFrame *pop = new KPopupFrame( m_helpbtn );
KActiveLabel *lab = new KActiveLabel( m_help, pop ); KActiveLabel *lab = new KActiveLabel( m_help, pop );
lab->resize( lab->tqsizeHint() ); lab->resize( lab->sizeHint() );
pop->setMainWidget( lab ); pop->setMainWidget( lab );
pop->exec( m_helpbtn->mapToGlobal( TQPoint( m_helpbtn->width(), 0 ) ) ); pop->exec( m_helpbtn->mapToGlobal( TQPoint( m_helpbtn->width(), 0 ) ) );
pop->close( 0 ); pop->close( 0 );

@ -42,7 +42,7 @@ bool SidePixmap::isValid()
&& (m_side.width() == m_tiledown.width())); && (m_side.width() == m_tiledown.width()));
} }
TQSize SidePixmap::tqsizeHint() const TQSize SidePixmap::sizeHint() const
{ {
return (TQSize(m_side.width()+lineWidth(), 300+lineWidth())); return (TQSize(m_side.width()+lineWidth(), 300+lineWidth()));
} }

@ -29,7 +29,7 @@ class TDEPRINT_EXPORT SidePixmap : public TQFrame
{ {
public: public:
SidePixmap(TQWidget *parent = 0, const char *name = 0); SidePixmap(TQWidget *parent = 0, const char *name = 0);
TQSize tqsizeHint() const; TQSize sizeHint() const;
bool isValid(); bool isValid();
protected: protected:

@ -60,7 +60,7 @@ MessageWindow::~MessageWindow()
void MessageWindow::slotTimer() void MessageWindow::slotTimer()
{ {
TQSize psz = parentWidget()->size(), sz = tqsizeHint(); TQSize psz = parentWidget()->size(), sz = sizeHint();
move( parentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) ); move( parentWidget()->mapToGlobal( TQPoint( (psz.width()-sz.width())/2, (psz.height()-sz.height())/2 ) ) );
if ( !isVisible() ) if ( !isVisible() )
{ {

@ -86,8 +86,8 @@ void StatusWindow::setMessage(const TQString& msg)
{ {
//QSize oldSz = size(); //QSize oldSz = size();
m_label->setText(msg); m_label->setText(msg);
//QSize sz = m_label->tqsizeHint(); //QSize sz = m_label->sizeHint();
//sz += TQSize(layout()->margin()*2, layout()->margin()*2+layout()->spacing()+m_button->tqsizeHint().height()); //sz += TQSize(layout()->margin()*2, layout()->margin()*2+layout()->spacing()+m_button->sizeHint().height());
// dialog will never be smaller // dialog will never be smaller
//sz = sz.expandedTo(oldSz); //sz = sz.expandedTo(oldSz);
//resize(sz); //resize(sz);

@ -58,8 +58,8 @@ class KAboutTabWidget : public TQTabWidget
{ {
public: public:
KAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {} KAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {}
TQSize tqsizeHint() const { TQSize sizeHint() const {
return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) ); return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) );
} }
}; };
@ -256,7 +256,7 @@ void KAboutContributor::updateLayout( void )
} }
gbox->activate(); gbox->activate();
setMinimumSize( tqsizeHint() ); setMinimumSize( sizeHint() );
} }
@ -272,9 +272,9 @@ void KAboutContributor::fontChange( const TQFont &/*oldFont*/ )
} }
TQSize KAboutContributor::tqsizeHint( void ) const TQSize KAboutContributor::sizeHint( void ) const
{ {
return tqminimumSizeHint(); return minimumSizeHint();
} }
@ -427,9 +427,9 @@ void KAboutContainerBase::show( void )
TQWidget::show(); TQWidget::show();
} }
TQSize KAboutContainerBase::tqsizeHint( void ) const TQSize KAboutContainerBase::sizeHint( void ) const
{ {
return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) ); return tqminimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
} }
void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ ) void KAboutContainerBase::fontChange( const TQFont &/*oldFont*/ )
@ -790,7 +790,7 @@ void KAboutContainer::childEvent( TQChildEvent *e )
TQWidget* const w = static_cast<TQWidget *>(e->child()); TQWidget* const w = static_cast<TQWidget *>(e->child());
mVbox->addWidget( w, 0, mAlignment ); mVbox->addWidget( w, 0, mAlignment );
const TQSize s( tqsizeHint() ); const TQSize s( sizeHint() );
setMinimumSize( s ); setMinimumSize( s );
TQObjectList const l = childrenListObject(); // silence please TQObjectList const l = childrenListObject(); // silence please
@ -806,10 +806,10 @@ void KAboutContainer::childEvent( TQChildEvent *e )
} }
TQSize KAboutContainer::tqsizeHint( void ) const TQSize KAboutContainer::sizeHint( void ) const
{ {
// //
// The size is computed by adding the tqsizeHint().height() of all // The size is computed by adding the sizeHint().height() of all
// widget children and taking the width of the widest child and adding // widget children and taking the width of the widest child and adding
// layout()->margin() and layout()->spacing() // layout()->margin() and layout()->spacing()
// //
@ -831,10 +831,10 @@ TQSize KAboutContainer::tqsizeHint( void ) const
TQSize s = w->tqminimumSize(); TQSize s = w->tqminimumSize();
if( s.isEmpty() ) if( s.isEmpty() )
{ {
s = w->tqminimumSizeHint(); s = w->minimumSizeHint();
if( s.isEmpty() ) if( s.isEmpty() )
{ {
s = w->tqsizeHint(); s = w->sizeHint();
if( s.isEmpty() ) if( s.isEmpty() )
{ {
s = TQSize( 100, 100 ); // Default size s = TQSize( 100, 100 ); // Default size
@ -864,9 +864,9 @@ TQSize KAboutContainer::tqsizeHint( void ) const
} }
TQSize KAboutContainer::tqminimumSizeHint( void ) const TQSize KAboutContainer::minimumSizeHint( void ) const
{ {
return tqsizeHint(); return sizeHint();
} }
@ -960,8 +960,8 @@ public:
void setWork(const TQString&); void setWork(const TQString&);
/** The size hint. Very important here, since KAboutWidget relies on it for /** The size hint. Very important here, since KAboutWidget relies on it for
* geometry management. */ * geometry management. */
TQSize tqsizeHint(); TQSize sizeHint();
TQSize tqminimumSizeHint(void); TQSize minimumSizeHint(void);
virtual void show( void ); virtual void show( void );
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -1096,7 +1096,7 @@ KAboutContributor::setWork(const TQString& w)
#if 0 #if 0
QSize QSize
KAboutContributor::tqsizeHint() KAboutContributor::sizeHint()
{ {
// ############################################################################ // ############################################################################
const int FrameWidth=frameWidth(); const int FrameWidth=frameWidth();
@ -1104,8 +1104,8 @@ KAboutContributor::tqsizeHint()
int maxx, maxy; int maxx, maxy;
TQRect rect; TQRect rect;
// ----- first calculate name and email width: // ----- first calculate name and email width:
maxx=name->tqsizeHint().width(); maxx=name->sizeHint().width();
maxx=QMAX(maxx, email->tqsizeHint().width()+WORKTEXT_IDENTATION); maxx=QMAX(maxx, email->sizeHint().width()+WORKTEXT_IDENTATION);
// ----- now determine "work" text rectangle: // ----- now determine "work" text rectangle:
if(!work.isEmpty()) // save time if(!work.isEmpty()) // save time
{ {
@ -1116,10 +1116,10 @@ KAboutContributor::tqsizeHint()
{ {
maxx=WorkTextWidth+WORKTEXT_IDENTATION; maxx=WorkTextWidth+WORKTEXT_IDENTATION;
} }
maxx=QMAX(maxx, url->tqsizeHint().width()+WORKTEXT_IDENTATION); maxx=QMAX(maxx, url->sizeHint().width()+WORKTEXT_IDENTATION);
// ----- // -----
maxy=2*(name->tqsizeHint().height()+Grid); // need a space above the KURLLabels maxy=2*(name->sizeHint().height()+Grid); // need a space above the KURLLabels
maxy+=/* email */ name->tqsizeHint().height(); maxy+=/* email */ name->sizeHint().height();
maxy+=rect.height(); maxy+=rect.height();
// ----- // -----
maxx+=2*FrameWidth; maxx+=2*FrameWidth;
@ -1128,16 +1128,16 @@ KAboutContributor::tqsizeHint()
// ############################################################################ // ############################################################################
} }
TQSize KAboutContributor::tqminimumSizeHint(void) TQSize KAboutContributor::minimumSizeHint(void)
{ {
return( tqsizeHint() ); return( sizeHint() );
} }
void KAboutContributor::show( void ) void KAboutContributor::show( void )
{ {
TQFrame::show(); TQFrame::show();
setMinimumSize( tqsizeHint() ); setMinimumSize( sizeHint() );
} }
@ -1151,15 +1151,15 @@ KAboutContributor::resizeEvent(TQResizeEvent*)
int cy=framewidth; int cy=framewidth;
// ----- // -----
name->setGeometry name->setGeometry
(framewidth, framewidth, childwidth, name->tqsizeHint().height()); (framewidth, framewidth, childwidth, name->sizeHint().height());
cy=name->height()+Grid; cy=name->height()+Grid;
email->setGeometry email->setGeometry
(framewidth+WORKTEXT_IDENTATION, cy, (framewidth+WORKTEXT_IDENTATION, cy,
childwidth-WORKTEXT_IDENTATION, /* email */ name->tqsizeHint().height()); childwidth-WORKTEXT_IDENTATION, /* email */ name->sizeHint().height());
cy+=name->height()+Grid; cy+=name->height()+Grid;
url->setGeometry url->setGeometry
(framewidth+WORKTEXT_IDENTATION, cy, (framewidth+WORKTEXT_IDENTATION, cy,
childwidth-WORKTEXT_IDENTATION, /* url */ name->tqsizeHint().height()); childwidth-WORKTEXT_IDENTATION, /* url */ name->sizeHint().height());
// the work text is drawn in the paint event // the work text is drawn in the paint event
// ############################################################################ // ############################################################################
} }
@ -1186,15 +1186,15 @@ KAboutContributor::paintEvent(TQPaintEvent* e)
#if 0 #if 0
TQSize KAboutContributor::tqsizeHint( void ) TQSize KAboutContributor::sizeHint( void )
{ {
int s = KDialog::spacingHint(); int s = KDialog::spacingHint();
int h = fontMetrics().lineSpacing()*3 + 2*s; int h = fontMetrics().lineSpacing()*3 + 2*s;
int m = frameWidth(); int m = frameWidth();
int w = name->tqsizeHint().width(); int w = name->sizeHint().width();
w = QMAX( w, email->tqsizeHint().width()+s); w = QMAX( w, email->sizeHint().width()+s);
w = QMAX( w, url->tqsizeHint().width()+s); w = QMAX( w, url->sizeHint().width()+s);
if( work.isEmpty() == false ) if( work.isEmpty() == false )
{ {
@ -1214,10 +1214,10 @@ TQSize KAboutContributor::tqsizeHint( void )
int s = 3; int s = 3;
int m = frameWidth() + KDialog::spacingHint(); int m = frameWidth() + KDialog::spacingHint();
int h = ls * 3 + s * 2; int h = ls * 3 + s * 2;
int w = name->tqsizeHint().width(); int w = name->sizeHint().width();
w = QMAX( w, email->tqsizeHint().width()+WORKTEXT_IDENTATION); w = QMAX( w, email->sizeHint().width()+WORKTEXT_IDENTATION);
w = QMAX( w, url->tqsizeHint().width()+WORKTEXT_IDENTATION); w = QMAX( w, url->sizeHint().width()+WORKTEXT_IDENTATION);
if( work.isEmpty() == false ) if( work.isEmpty() == false )
{ {
const int WorkTextWidth=200; const int WorkTextWidth=200;
@ -1257,7 +1257,7 @@ void KAboutContributor::resizeEvent(TQResizeEvent*)
int x = frameWidth() + KDialog::spacingHint(); int x = frameWidth() + KDialog::spacingHint();
int y = x; int y = x;
int w = width() - 2*x; int w = width() - 2*x;
int h = name->tqsizeHint().height(); int h = name->sizeHint().height();
int s = 3; int s = 3;
name->setGeometry( x, y, w, h ); name->setGeometry( x, y, w, h );
@ -1291,7 +1291,7 @@ void KAboutContributor::paintEvent( TQPaintEvent *e )
int s = 3; int s = 3;
int x = frameWidth() + KDialog::spacingHint() + WORKTEXT_IDENTATION; int x = frameWidth() + KDialog::spacingHint() + WORKTEXT_IDENTATION;
int w = width()-WORKTEXT_IDENTATION-2*(frameWidth()+KDialog::spacingHint()); int w = width()-WORKTEXT_IDENTATION-2*(frameWidth()+KDialog::spacingHint());
int y = frameWidth()+KDialog::spacingHint()+(name->tqsizeHint().height()+s)*3; int y = frameWidth()+KDialog::spacingHint()+(name->sizeHint().height()+s)*3;
int h = height()-y-frameWidth(); int h = height()-y-frameWidth();
TQPainter paint( this ); TQPainter paint( this );
@ -1350,33 +1350,33 @@ KAboutWidget::adjust()
// ----- // -----
if(showMaintainer) if(showMaintainer)
{ {
total_size=maintainer->tqsizeHint(); total_size=maintainer->sizeHint();
maintWidth=total_size.width(); maintWidth=total_size.width();
maintHeight=total_size.height(); maintHeight=total_size.height();
} else { } else {
maintWidth=0; maintWidth=0;
maintHeight=0; maintHeight=0;
} }
total_size=author->tqsizeHint(); total_size=author->sizeHint();
logo->adjustSize(); logo->adjustSize();
cy=version->tqsizeHint().height()+Grid; cy=version->sizeHint().height()+Grid;
cx=logo->width(); cx=logo->width();
tempx=QMAX(total_size.width(), maintWidth); tempx=QMAX(total_size.width(), maintWidth);
cx+=Grid+tempx; cx+=Grid+tempx;
cx=QMAX(cx, version->tqsizeHint().width()); cx=QMAX(cx, version->sizeHint().width());
cy+=QMAX(logo->height(), cy+=QMAX(logo->height(),
total_size.height()+(showMaintainer ? Grid+maintHeight : 0)); total_size.height()+(showMaintainer ? Grid+maintHeight : 0));
// ----- // -----
if(!contributors.isEmpty()) if(!contributors.isEmpty())
{ {
cx=QMAX(cx, cont->tqsizeHint().width()); cx=QMAX(cx, cont->sizeHint().width());
cy+=cont->tqsizeHint().height()+Grid; cy+=cont->sizeHint().height()+Grid;
TQPtrListIterator<KAboutContributor> _pos(contributors); TQPtrListIterator<KAboutContributor> _pos(contributors);
KAboutContributor* currEntry; KAboutContributor* currEntry;
while ( (currEntry = _pos.current()) ) while ( (currEntry = _pos.current()) )
{ {
++_pos; ++_pos;
cy+=currEntry->tqsizeHint().height(); cy+=currEntry->sizeHint().height();
} }
} }
// ----- // -----
@ -1459,7 +1459,7 @@ KAboutWidget::resizeEvent(TQResizeEvent*)
// ############################################################################ // ############################################################################
int _x=0, _y, cx, tempx, tempy; int _x=0, _y, cx, tempx, tempy;
// ----- set version label geometry: // ----- set version label geometry:
version->setGeometry(0, 0, width(), version->tqsizeHint().height()); version->setGeometry(0, 0, width(), version->sizeHint().height());
_y=version->height()+Grid; _y=version->height()+Grid;
// ----- move logo to correct position: // ----- move logo to correct position:
logo->adjustSize(); logo->adjustSize();
@ -1468,16 +1468,16 @@ KAboutWidget::resizeEvent(TQResizeEvent*)
tempx=logo->width()+Grid; tempx=logo->width()+Grid;
cx=width()-tempx; cx=width()-tempx;
author->setGeometry author->setGeometry
(tempx, _y, cx, author->tqsizeHint().height()); (tempx, _y, cx, author->sizeHint().height());
maintainer->setGeometry maintainer->setGeometry
(tempx, _y+author->height()+Grid, cx, maintainer->tqsizeHint().height()); (tempx, _y+author->height()+Grid, cx, maintainer->sizeHint().height());
_y+=QMAX(logo->height(), _y+=QMAX(logo->height(),
author->height()+(showMaintainer ? Grid+maintainer->height() : 0)); author->height()+(showMaintainer ? Grid+maintainer->height() : 0));
// ----- // -----
if(!contributors.isEmpty()) if(!contributors.isEmpty())
{ {
tempy=cont->tqsizeHint().height(); tempy=cont->sizeHint().height();
cont->setGeometry(0, _y, width(), tempy); cont->setGeometry(0, _y, width(), tempy);
cont->show(); cont->show();
_y+=tempy+Grid; _y+=tempy+Grid;
@ -1489,7 +1489,7 @@ KAboutWidget::resizeEvent(TQResizeEvent*)
while( (currEntry = _pos.current()) ) while( (currEntry = _pos.current()) )
{ {
++_pos; ++_pos;
tempy=currEntry->tqsizeHint().height(); tempy=currEntry->sizeHint().height();
// y+=Grid; // y+=Grid;
currEntry->setGeometry(_x, _y, width(), tempy); currEntry->setGeometry(_x, _y, width(), tempy);
_y+=tempy; _y+=tempy;
@ -1567,7 +1567,7 @@ void KAboutDialog::adjust()
if( !about ) { return; } if( !about ) { return; }
about->adjust(); about->adjust();
//initializeGeometry(); //initializeGeometry();
resize( tqsizeHint() ); resize( sizeHint() );
} }

@ -66,8 +66,8 @@ class TDEUI_EXPORT KAboutContainer : public TQFrame
bool showframe = false, bool showBold = false ); bool showframe = false, bool showBold = false );
void addImage( const TQString &fileName, int tqalignment=AlignLeft ); void addImage( const TQString &fileName, int tqalignment=AlignLeft );
virtual TQSize tqsizeHint( void ) const; virtual TQSize sizeHint( void ) const;
virtual TQSize tqminimumSizeHint( void ) const; virtual TQSize minimumSizeHint( void ) const;
protected: protected:
virtual void childEvent( TQChildEvent *e ); virtual void childEvent( TQChildEvent *e );
@ -115,7 +115,7 @@ class TDEUI_EXPORT KAboutContributor : public TQFrame
TQString getURL( void ) const; TQString getURL( void ) const;
TQString getWork( void ) const; TQString getWork( void ) const;
virtual TQSize tqsizeHint( void ) const; virtual TQSize sizeHint( void ) const;
protected: protected:
virtual void fontChange( const TQFont &oldFont ); virtual void fontChange( const TQFont &oldFont );

@ -88,7 +88,7 @@ class KAboutContainerBase : public TQWidget
public: public:
KAboutContainerBase( int layoutType, TQWidget *parent = 0, char *name = 0 ); KAboutContainerBase( int layoutType, TQWidget *parent = 0, char *name = 0 );
virtual void show( void ); virtual void show( void );
virtual TQSize tqsizeHint( void ) const; virtual TQSize sizeHint( void ) const;
void setTitle( const TQString &title ); void setTitle( const TQString &title );
void setImage( const TQString &fileName ); void setImage( const TQString &fileName );

@ -627,8 +627,8 @@ void KSelectAction::updateItems( int id )
TQStringList::ConstIterator it = lst.begin(); TQStringList::ConstIterator it = lst.begin();
for( ; it != lst.end(); ++it ) for( ; it != lst.end(); ++it )
cb->insertItem( *it ); cb->insertItem( *it );
// qt caches and never recalculates the tqsizeHint() // qt caches and never recalculates the sizeHint()
// qcombobox.cpp recommends calling setFont to tqinvalidate the tqsizeHint // qcombobox.cpp recommends calling setFont to tqinvalidate the sizeHint
// setFont sets own_font = True, so we're a bit mean and calll // setFont sets own_font = True, so we're a bit mean and calll
// unsetFont which calls setFont and then overwrites the own_font // unsetFont which calls setFont and then overwrites the own_font
cb->unsetFont(); cb->unsetFont();
@ -678,7 +678,7 @@ int KSelectAction::plug( TQWidget *widget, int index )
if ( cb ) if ( cb )
{ {
if (!isEditable()) cb->setFocusPolicy(TQ_NoFocus); if (!isEditable()) cb->setFocusPolicy(TQ_NoFocus);
cb->setMinimumWidth( cb->tqsizeHint().width() ); cb->setMinimumWidth( cb->sizeHint().width() );
if ( d->m_comboWidth > 0 ) if ( d->m_comboWidth > 0 )
{ {
cb->setMinimumWidth( d->m_comboWidth ); cb->setMinimumWidth( d->m_comboWidth );
@ -1534,7 +1534,7 @@ int KFontAction::plug( TQWidget *w, int index )
TQT_SLOT( slotActivated( const TQString & ) ) ); TQT_SLOT( slotActivated( const TQString & ) ) );
cb->setEnabled( isEnabled() ); cb->setEnabled( isEnabled() );
bar->insertWidget( id_, comboWidth(), cb, index ); bar->insertWidget( id_, comboWidth(), cb, index );
cb->setMinimumWidth( cb->tqsizeHint().width() ); cb->setMinimumWidth( cb->sizeHint().width() );
addContainer( bar, id_ ); addContainer( bar, id_ );

@ -111,7 +111,7 @@ void KActiveLabel::keyPressEvent( TQKeyEvent *e )
} }
} }
TQSize KActiveLabel::tqminimumSizeHint() const TQSize KActiveLabel::minimumSizeHint() const
{ {
TQSize ms = tqminimumSize(); TQSize ms = tqminimumSize();
if ((ms.width() > 0) && (ms.height() > 0)) if ((ms.width() > 0) && (ms.height() > 0))
@ -134,9 +134,9 @@ TQSize KActiveLabel::tqminimumSizeHint() const
return TQSize(w, h); return TQSize(w, h);
} }
TQSize KActiveLabel::tqsizeHint() const TQSize KActiveLabel::sizeHint() const
{ {
return tqminimumSizeHint(); return minimumSizeHint();
} }
#include "kactivelabel.moc" #include "kactivelabel.moc"

@ -56,8 +56,8 @@ public:
*/ */
KActiveLabel(const TQString & text, TQWidget * parent, const char * name = 0); KActiveLabel(const TQString & text, TQWidget * parent, const char * name = 0);
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
TQSize tqsizeHint() const; TQSize sizeHint() const;
public slots: public slots:
/** /**

@ -40,7 +40,7 @@ KArrowButton::~KArrowButton()
delete d; delete d;
} }
TQSize KArrowButton::tqsizeHint() const TQSize KArrowButton::sizeHint() const
{ {
return TQSize( 12, 12 ); return TQSize( 12, 12 );
} }

@ -59,7 +59,7 @@ class TDEUI_EXPORT KArrowButton : public TQPushButton
/** /**
* Reimplemented from TQPushButton. * Reimplemented from TQPushButton.
*/ */
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
/** /**
* Returns the arrow type * Returns the arrow type

@ -102,7 +102,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name)
lockBox = new TQLabel(this); lockBox = new TQLabel(this);
lockBox->setFrameStyle(TQFrame::WinPanel|TQFrame::Raised); lockBox->setFrameStyle(TQFrame::WinPanel|TQFrame::Raised);
lockBox->setPixmap(lockPM); lockBox->setPixmap(lockPM);
lockBox->setFixedSize(lockBox->tqsizeHint()); lockBox->setFixedSize(lockBox->sizeHint());
lockLabel = new TQLabel(this); lockLabel = new TQLabel(this);
lockLabel->setFrameStyle(TQFrame::NoFrame); lockLabel->setFrameStyle(TQFrame::NoFrame);
@ -114,7 +114,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name)
else else
lockLabel->setText(openLockText); lockLabel->setText(openLockText);
lockLabel->tqsetAlignment(AlignCenter); lockLabel->tqsetAlignment(AlignCenter);
lockLabel->setMinimumSize(lockLabel->tqsizeHint()); lockLabel->setMinimumSize(lockLabel->sizeHint());
lockLabel->setText(lockText); lockLabel->setText(lockText);
layout = new TQHBoxLayout(this); layout = new TQHBoxLayout(this);
@ -124,7 +124,7 @@ KAuthIcon::KAuthIcon(TQWidget *parent, const char *name)
layout->addWidget(lockLabel, 0, AlignRight|AlignVCenter); layout->addWidget(lockLabel, 0, AlignRight|AlignVCenter);
layout->activate(); layout->activate();
resize(tqsizeHint()); resize(sizeHint());
} }
KAuthIcon::~KAuthIcon() KAuthIcon::~KAuthIcon()
@ -132,7 +132,7 @@ KAuthIcon::~KAuthIcon()
} }
TQSize KAuthIcon::tqsizeHint() const TQSize KAuthIcon::sizeHint() const
{ {
return layout->tqminimumSize(); return layout->tqminimumSize();
} }

@ -55,7 +55,7 @@ public:
KAuthIcon(TQWidget *parent = 0, const char *name = 0); KAuthIcon(TQWidget *parent = 0, const char *name = 0);
~KAuthIcon(); ~KAuthIcon();
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
/** /**
* return the status of whatever is being monitored. * return the status of whatever is being monitored.
*/ */

@ -39,7 +39,7 @@
* which makes the buttons look better. * which makes the buttons look better.
* *
* 01/17/98 Mario Weilguni <mweilguni@sime.com> * 01/17/98 Mario Weilguni <mweilguni@sime.com>
* Fixed a bug in tqsizeHint() * Fixed a bug in sizeHint()
* Improved the handling of Motif default buttons * Improved the handling of Motif default buttons
* *
* 01/09/98 Mario Weilguni <mweilguni@sime.com> * 01/09/98 Mario Weilguni <mweilguni@sime.com>
@ -178,7 +178,7 @@ void KButtonBox::layout() {
++itr; ++itr;
} }
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
} }
void KButtonBox::placeButtons() { void KButtonBox::placeButtons() {
@ -300,7 +300,7 @@ TQSize KButtonBox::bestButtonSize() const {
return s; return s;
} }
TQSize KButtonBox::tqsizeHint() const { TQSize KButtonBox::sizeHint() const {
unsigned int dw; unsigned int dw;
if(data->buttons.isEmpty()) if(data->buttons.isEmpty())
@ -355,7 +355,7 @@ TQSizePolicy KButtonBox::sizePolicy() const
* as minimum width * as minimum width
*/ */
TQSize KButtonBox::buttonSizeHint(TQPushButton *b) const { TQSize KButtonBox::buttonSizeHint(TQPushButton *b) const {
TQSize s = b->tqsizeHint(); TQSize s = b->sizeHint();
const TQSize ms = b->tqminimumSize(); const TQSize ms = b->tqminimumSize();
if(s.width() < minButtonWidth) if(s.width() < minButtonWidth)
s.setWidth(minButtonWidth); s.setWidth(minButtonWidth);

@ -65,7 +65,7 @@ public:
* This size is * This size is
* calculated by the width/height of all buttons plus border/autoborder. * calculated by the width/height of all buttons plus border/autoborder.
*/ */
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
virtual TQSizePolicy sizePolicy() const; virtual TQSizePolicy sizePolicy() const;
virtual void resizeEvent(TQResizeEvent *); virtual void resizeEvent(TQResizeEvent *);

@ -110,7 +110,7 @@ void KCharSelectTable::setTableNum( int _tableNum )
} }
//================================================================== //==================================================================
TQSize KCharSelectTable::tqsizeHint() const TQSize KCharSelectTable::sizeHint() const
{ {
int w = cellWidth(); int w = cellWidth();
int h = cellHeight(); int h = cellHeight();
@ -381,30 +381,30 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
bar->setSpacing( KDialog::spacingHint() ); bar->setSpacing( KDialog::spacingHint() );
TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar ); TQLabel* const lFont = new TQLabel( i18n( "Font:" ), bar );
lFont->resize( lFont->tqsizeHint() ); lFont->resize( lFont->sizeHint() );
lFont->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); lFont->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter );
lFont->setMaximumWidth( lFont->tqsizeHint().width() ); lFont->setMaximumWidth( lFont->sizeHint().width() );
fontCombo = new TQComboBox( true, bar ); fontCombo = new TQComboBox( true, bar );
fillFontCombo(); fillFontCombo();
fontCombo->resize( fontCombo->tqsizeHint() ); fontCombo->resize( fontCombo->sizeHint() );
connect( fontCombo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( fontSelected( const TQString & ) ) ); connect( fontCombo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( fontSelected( const TQString & ) ) );
TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar ); TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar );
lTable->resize( lTable->tqsizeHint() ); lTable->resize( lTable->sizeHint() );
lTable->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); lTable->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter );
lTable->setMaximumWidth( lTable->tqsizeHint().width() ); lTable->setMaximumWidth( lTable->sizeHint().width() );
tableSpinBox = new TQSpinBox( 0, 255, 1, bar ); tableSpinBox = new TQSpinBox( 0, 255, 1, bar );
tableSpinBox->resize( tableSpinBox->tqsizeHint() ); tableSpinBox->resize( tableSpinBox->sizeHint() );
connect( tableSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( tableChanged( int ) ) ); connect( tableSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( tableChanged( int ) ) );
TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar ); TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar );
lUnicode->resize( lUnicode->tqsizeHint() ); lUnicode->resize( lUnicode->sizeHint() );
lUnicode->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter ); lUnicode->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter );
lUnicode->setMaximumWidth( lUnicode->tqsizeHint().width() ); lUnicode->setMaximumWidth( lUnicode->sizeHint().width() );
const TQRegExp rx( "[a-fA-F0-9]{1,4}" ); const TQRegExp rx( "[a-fA-F0-9]{1,4}" );
TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) ); TQValidator* const validator = new TQRegExpValidator( rx, TQT_TQOBJECT(this) );
@ -412,7 +412,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f
d->tqunicodeLine = new KLineEdit( bar ); d->tqunicodeLine = new KLineEdit( bar );
d->tqunicodeLine->setValidator(validator); d->tqunicodeLine->setValidator(validator);
lUnicode->setBuddy(d->tqunicodeLine); lUnicode->setBuddy(d->tqunicodeLine);
d->tqunicodeLine->resize( d->tqunicodeLine->tqsizeHint() ); d->tqunicodeLine->resize( d->tqunicodeLine->sizeHint() );
slotUpdateUnicode(_chr); slotUpdateUnicode(_chr);
connect( d->tqunicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) ); connect( d->tqunicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) );
@ -452,9 +452,9 @@ KCharSelect::~KCharSelect()
} }
//================================================================== //==================================================================
TQSize KCharSelect::tqsizeHint() const TQSize KCharSelect::sizeHint() const
{ {
return TQVBox::tqsizeHint(); return TQVBox::sizeHint();
} }
//================================================================== //==================================================================

@ -56,7 +56,7 @@ public:
KCharSelectTable( TQWidget *parent, const char *name, const TQString &_font, KCharSelectTable( TQWidget *parent, const char *name, const TQString &_font,
const TQChar &_chr, int _tableNum ); const TQChar &_chr, int _tableNum );
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
virtual void resizeEvent( TQResizeEvent * ); virtual void resizeEvent( TQResizeEvent * );
virtual void setFont( const TQString &_font ); virtual void setFont( const TQString &_font );
@ -157,7 +157,7 @@ public:
/** /**
* Reimplemented. * Reimplemented.
*/ */
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
/** /**
* Sets the font which is displayed to @p font * Sets the font which is displayed to @p font

@ -130,7 +130,7 @@ void KColorButton::drawButtonLabel( TQPainter *painter )
} }
} }
TQSize KColorButton::tqsizeHint() const TQSize KColorButton::sizeHint() const
{ {
return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)). return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(40, 15)).
expandedTo(TQApplication::globalStrut()); expandedTo(TQApplication::globalStrut());

@ -80,7 +80,7 @@ public:
*/ */
void setDefaultColor( const TQColor &c ); void setDefaultColor( const TQColor &c );
TQSize tqsizeHint() const; TQSize sizeHint() const;
signals: signals:
/** /**

@ -597,7 +597,7 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols)
connect( mNamedColorList, TQT_SIGNAL(highlighted( const TQString & )), connect( mNamedColorList, TQT_SIGNAL(highlighted( const TQString & )),
this, TQT_SLOT( slotColorTextSelected( const TQString & )) ); this, TQT_SLOT( slotColorTextSelected( const TQString & )) );
setFixedSize( tqsizeHint()); setFixedSize( sizeHint());
connect( combo, TQT_SIGNAL(activated(const TQString &)), connect( combo, TQT_SIGNAL(activated(const TQString &)),
this, TQT_SLOT(slotSetPalette( const TQString &))); this, TQT_SLOT(slotSetPalette( const TQString &)));
} }
@ -1157,7 +1157,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal )
TQT_SLOT( setColor( const TQColor&))); TQT_SLOT( setColor( const TQColor&)));
tl_layout->activate(); tl_layout->activate();
page->setMinimumSize( page->tqsizeHint() ); page->setMinimumSize( page->sizeHint() );
readSettings(); readSettings();
d->bRecursion = false; d->bRecursion = false;
@ -1223,7 +1223,7 @@ KColorDialog::setDefaultColor( const TQColor& col )
mainWidget()->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); // cancel setFixedSize() mainWidget()->setMaximumSize( TQWIDGETSIZE_MAX, TQWIDGETSIZE_MAX ); // cancel setFixedSize()
d->tl_layout->activate(); d->tl_layout->activate();
mainWidget()->setMinimumSize( mainWidget()->tqsizeHint() ); mainWidget()->setMinimumSize( mainWidget()->sizeHint() );
disableResize(); disableResize();
connect( d->cbDefaultColor, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDefaultColorClicked() ) ); connect( d->cbDefaultColor, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDefaultColorClicked() ) );

@ -764,14 +764,14 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget
new TQListViewItem( m_pListView, *it ); new TQListViewItem( m_pListView, *it );
} }
m_pListView->setMinimumSize( m_pListView->tqsizeHint() ); m_pListView->setMinimumSize( m_pListView->sizeHint() );
connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) );
enableButton( KDialogBase::User1, false ); enableButton( KDialogBase::User1, false );
resize( tqsizeHint() ); resize( sizeHint() );
} }
KHistoryComboEditor::~KHistoryComboEditor() KHistoryComboEditor::~KHistoryComboEditor()

@ -260,7 +260,7 @@ void KCompletionBox::popup()
clearSelection(); clearSelection();
if ( !isVisible() ) if ( !isVisible() )
show(); show();
else if ( size().height() != tqsizeHint().height() ) else if ( size().height() != sizeHint().height() )
sizeAndPosition(); sizeAndPosition();
} }
} }
@ -335,8 +335,8 @@ TQRect KCompletionBox::calculateGeometry() const
int ih = itemHeight(); int ih = itemHeight();
int h = QMIN( 15 * ih, (int) count() * ih ) + 2*frameWidth(); int h = QMIN( 15 * ih, (int) count() * ih ) + 2*frameWidth();
int w = (d->m_parent) ? d->m_parent->width() : KListBox::tqminimumSizeHint().width(); int w = (d->m_parent) ? d->m_parent->width() : KListBox::minimumSizeHint().width();
w = QMAX( KListBox::tqminimumSizeHint().width(), w ); w = QMAX( KListBox::minimumSizeHint().width(), w );
//If we're inside a combox, Qt by default makes the dropdown //If we're inside a combox, Qt by default makes the dropdown
// as wide as the combo, and gives the style a chance // as wide as the combo, and gives the style a chance
@ -373,7 +373,7 @@ TQRect KCompletionBox::calculateGeometry() const
return TQRect(x, y, w, h); return TQRect(x, y, w, h);
} }
TQSize KCompletionBox::tqsizeHint() const TQSize KCompletionBox::sizeHint() const
{ {
return calculateGeometry().size(); return calculateGeometry().size();
} }
@ -520,7 +520,7 @@ void KCompletionBox::setItems( const TQStringList& items )
triggerUpdate( false ); triggerUpdate( false );
} }
if ( isVisible() && size().height() != tqsizeHint().height() ) if ( isVisible() && size().height() != sizeHint().height() )
sizeAndPosition(); sizeAndPosition();
blockSignals( block ); blockSignals( block );

@ -61,7 +61,7 @@ public:
*/ */
~KCompletionBox(); ~KCompletionBox();
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
/** /**
* @returns true if selecting an item results in the emition of the selected signal. * @returns true if selecting an item results in the emition of the selected signal.

@ -390,7 +390,7 @@ KDatePicker::selectYearClicked()
KPopupFrame* popup = new KPopupFrame(this); KPopupFrame* popup = new KPopupFrame(this);
KDateInternalYearSelector* picker = new KDateInternalYearSelector(popup); KDateInternalYearSelector* picker = new KDateInternalYearSelector(popup);
// ----- // -----
picker->resize(picker->tqsizeHint()); picker->resize(picker->sizeHint());
picker->setYear( table->getDate().year() ); picker->setYear( table->getDate().year() );
picker->selectAll(); picker->selectAll();
popup->setMainWidget(picker); popup->setMainWidget(picker);
@ -467,9 +467,9 @@ KDatePicker::todayButtonClicked()
} }
TQSize TQSize
KDatePicker::tqsizeHint() const KDatePicker::sizeHint() const
{ {
return TQWidget::tqsizeHint(); return TQWidget::sizeHint();
} }
void void

@ -90,7 +90,7 @@ public:
* size hint, try adding 28 to each of the reported numbers of * size hint, try adding 28 to each of the reported numbers of
* pixels. * pixels.
**/ **/
TQSize tqsizeHint() const; TQSize sizeHint() const;
/** /**
* Sets the date. * Sets the date.

@ -561,14 +561,14 @@ void KDateTable::focusOutEvent( TQFocusEvent *e )
} }
TQSize TQSize
KDateTable::tqsizeHint() const KDateTable::sizeHint() const
{ {
if(maxCell.height()>0 && maxCell.width()>0) if(maxCell.height()>0 && maxCell.width()>0)
{ {
return TQSize(maxCell.width()*numCols()+2*frameWidth(), return TQSize(maxCell.width()*numCols()+2*frameWidth(),
(maxCell.height()+2)*numRows()+2*frameWidth()); (maxCell.height()+2)*numRows()+2*frameWidth());
} else { } else {
kdDebug() << "KDateTable::tqsizeHint: obscure failure - " << endl; kdDebug() << "KDateTable::sizeHint: obscure failure - " << endl;
return TQSize(-1, -1); return TQSize(-1, -1);
} }
} }
@ -713,7 +713,7 @@ KDateInternalMonthPicker::KDateInternalMonthPicker
} }
TQSize TQSize
KDateInternalMonthPicker::tqsizeHint() const KDateInternalMonthPicker::sizeHint() const
{ {
return TQSize((max.width()+6)*numCols()+2*frameWidth(), return TQSize((max.width()+6)*numCols()+2*frameWidth(),
(max.height()+6)*numRows()+2*frameWidth()); (max.height()+6)*numRows()+2*frameWidth());

@ -98,7 +98,7 @@ public:
/** /**
* The size hint. * The size hint.
*/ */
TQSize tqsizeHint() const; TQSize sizeHint() const;
/** /**
* Return the result. 0 means no selection (reject()), 1..12 are the * Return the result. 0 means no selection (reject()), 1..12 are the
* months. * months.
@ -289,9 +289,9 @@ public:
* To save some time, the size of the largest used cell content is * To save some time, the size of the largest used cell content is
* calculated in each paintCell() call, since all calculations have * calculated in each paintCell() call, since all calculations have
* to be done there anyway. The size is stored in maxCell. The * to be done there anyway. The size is stored in maxCell. The
* tqsizeHint() simply returns a multiple of maxCell. * sizeHint() simply returns a multiple of maxCell.
*/ */
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
/** /**
* Set the font size of the date table. * Set the font size of the date table.
*/ */

@ -428,7 +428,7 @@ KSMModalDialog::KSMModalDialog(TQWidget* parent)
setCaption( i18n("Please wait...") ); setCaption( i18n("Please wait...") );
// Center the dialog // Center the dialog
TQSize sh = tqsizeHint(); TQSize sh = sizeHint();
TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos());
move(rect.x() + (rect.width() - sh.width())/2, rect.y() + (rect.height() - sh.height())/2); move(rect.x() + (rect.width() - sh.width())/2, rect.y() + (rect.height() - sh.height())/2);

@ -230,7 +230,7 @@ void SButton::resize( bool sameWidth, int margin,
for( p = list.first(); p; p = list.next() ) for( p = list.first(); p; p = list.next() )
{ {
const TQSize s( p->tqsizeHint() ); const TQSize s( p->sizeHint() );
if( s.height() > h ) { h = s.height(); } if( s.height() > h ) { h = s.height(); }
if( s.width() > w ) { w = s.width(); } if( s.width() > w ) { w = s.width(); }
} }
@ -239,7 +239,7 @@ void SButton::resize( bool sameWidth, int margin,
{ {
for( p = list.first(); p; p = list.next() ) for( p = list.first(); p; p = list.next() )
{ {
TQSize s( p->tqsizeHint() ); TQSize s( p->sizeHint() );
if( sameWidth ) { s.setWidth( w ); } if( sameWidth ) { s.setWidth( w ); }
p->setFixedWidth( s.width() ); p->setFixedWidth( s.width() );
t += s.width() + spacing; t += s.width() + spacing;
@ -253,7 +253,7 @@ void SButton::resize( bool sameWidth, int margin,
// sameWidth has no effect here // sameWidth has no effect here
for( p = list.first(); p; p = list.next() ) for( p = list.first(); p; p = list.next() )
{ {
TQSize s( p->tqsizeHint() ); TQSize s( p->sizeHint() );
s.setWidth( w ); s.setWidth( w );
p->setFixedSize( s ); p->setFixedSize( s );
t += s.height() + spacing; t += s.height() + spacing;
@ -429,17 +429,17 @@ void KDialogBase::adjustSize()
// if (layout()) // if (layout())
// layout()->activate(); // layout()->activate();
if( d->bFixed ) if( d->bFixed )
setFixedSize( tqsizeHint() ); setFixedSize( sizeHint() );
else else
resize( tqsizeHint() ); resize( sizeHint() );
} }
TQSize KDialogBase::tqsizeHint() const TQSize KDialogBase::sizeHint() const
{ {
return d->minSize.expandedTo( tqminimumSizeHint() ) + d->incSize; return d->minSize.expandedTo( minimumSizeHint() ) + d->incSize;
} }
TQSize KDialogBase::tqminimumSizeHint() const TQSize KDialogBase::minimumSizeHint() const
{ {
const int m = marginHint(); const int m = marginHint();
const int s = spacingHint(); const int s = spacingHint();
@ -464,13 +464,13 @@ TQSize KDialogBase::tqminimumSizeHint() const
// //
if( mJanus ) if( mJanus )
{ {
s2 = mJanus->tqminimumSizeHint() + zeroByS; s2 = mJanus->minimumSizeHint() + zeroByS;
} }
else if( mMainWidget ) else if( mMainWidget )
{ {
s2 = mMainWidget->tqsizeHint() + zeroByS; s2 = mMainWidget->sizeHint() + zeroByS;
s2 = s2.expandedTo( mMainWidget->tqminimumSize() ); s2 = s2.expandedTo( mMainWidget->tqminimumSize() );
s2 = s2.expandedTo( mMainWidget->tqminimumSizeHint() ); s2 = s2.expandedTo( mMainWidget->minimumSizeHint() );
if( s2.isEmpty() ) if( s2.isEmpty() )
{ {
s2 = TQSize( 100, 100+s ); s2 = TQSize( 100, 100+s );
@ -485,9 +485,9 @@ TQSize KDialogBase::tqminimumSizeHint() const
if (d->detailsWidget && d->bDetails) if (d->detailsWidget && d->bDetails)
{ {
s2 = d->detailsWidget->tqsizeHint() + zeroByS; s2 = d->detailsWidget->sizeHint() + zeroByS;
s2 = s2.expandedTo( d->detailsWidget->tqminimumSize() ); s2 = s2.expandedTo( d->detailsWidget->tqminimumSize() );
s2 = s2.expandedTo( d->detailsWidget->tqminimumSizeHint() ); s2 = s2.expandedTo( d->detailsWidget->minimumSizeHint() );
s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() ); s1.rwidth() = QMAX( s1.rwidth(), s2.rwidth() );
s1.rheight() += s2.rheight(); s1.rheight() += s2.rheight();
} }
@ -530,7 +530,7 @@ TQSize KDialogBase::tqminimumSizeHint() const
void KDialogBase::disableResize() void KDialogBase::disableResize()
{ {
setFixedSize( tqsizeHint() ); setFixedSize( sizeHint() );
} }
@ -748,7 +748,7 @@ void KDialogBase::setButtonStyle( int style )
{ {
newButton = actionButton( (ButtonCode) (layout[i] & ~(Stretch | Filler))); newButton = actionButton( (ButtonCode) (layout[i] & ~(Stretch | Filler)));
if (newButton) if (newButton)
lay->addSpacing(newButton->tqsizeHint().width()); lay->addSpacing(newButton->sizeHint().width());
} }
continue; continue;
} }
@ -1751,8 +1751,8 @@ TQSize KDialogBase::configDialogSize( KConfig& config,
int scnum = TQApplication::desktop()->screenNumber(parentWidget()); int scnum = TQApplication::desktop()->screenNumber(parentWidget());
TQRect desk = TQApplication::desktop()->screenGeometry(scnum); TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
w = tqsizeHint().width(); w = sizeHint().width();
h = tqsizeHint().height(); h = sizeHint().height();
KConfigGroupSaver cs(&config, groupName); KConfigGroupSaver cs(&config, groupName);
w = config.readNumEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), w ); w = config.readNumEntry( TQString::tqfromLatin1("Width %1").arg( desk.width()), w );

@ -426,8 +426,8 @@ class TDEUI_EXPORT KDialogBase : public KDialog
* resized before showing it. * resized before showing it.
**/ **/
virtual void adjustSize(); virtual void adjustSize();
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
virtual TQSize tqminimumSizeHint() const; virtual TQSize minimumSizeHint() const;
/** /**
* Retrieve the empty page when the predefined layout is used in @p Plain * Retrieve the empty page when the predefined layout is used in @p Plain
@ -828,7 +828,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
/** /**
* read the dialogs size from the configuration according to the screen size. * read the dialogs size from the configuration according to the screen size.
* If no size is saved for one dimension of the screen, tqsizeHint() is returned. * If no size is saved for one dimension of the screen, sizeHint() is returned.
* *
* @param groupName Name of the group to read from. The old group * @param groupName Name of the group to read from. The old group
* of KGlobal::config is preserved. * of KGlobal::config is preserved.
@ -837,7 +837,7 @@ class TDEUI_EXPORT KDialogBase : public KDialog
/** /**
* read the dialogs size from the configuration according to the screen size. * read the dialogs size from the configuration according to the screen size.
* If no size is saved for one dimension of the screen, tqsizeHint() is returned. * If no size is saved for one dimension of the screen, sizeHint() is returned.
* *
* @param config The KConfig object to read from * @param config The KConfig object to read from
* @param groupName Name of the group to read from. The old group * @param groupName Name of the group to read from. The old group

@ -345,7 +345,7 @@ void KDockWidgetHeader::setDragPanel( KDockWidgetHeaderDrag* nd )
layout->activate(); layout->activate();
kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->tqminimumSize().height()<<endl; kdDebug(282)<<"KdockWidgetHeader::setDragPanel:minimum height="<<layout->tqminimumSize().height()<<endl;
//FIXME somebody left this here, but we don't know what the hell it's for. //FIXME somebody left this here, but we don't know what the hell it's for.
drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/tqsizeHint().height() ); drag->setFixedHeight( closeButton->height()); // /*layout->minimumS*/sizeHint().height() );
} }
void KDockWidgetHeader::addButton(KDockButton_Private* btn) { void KDockWidgetHeader::addButton(KDockButton_Private* btn) {

@ -51,8 +51,8 @@ KDualColorButton::KDualColorButton(TQWidget *parent, const char *name, TQWidget*
curColor = Foreground; curColor = Foreground;
dragFlag = false; dragFlag = false;
miniCtlFlag = false; miniCtlFlag = false;
if(tqsizeHint().isValid()) if(sizeHint().isValid())
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
setAcceptDrops(true); setAcceptDrops(true);
} }
@ -72,8 +72,8 @@ KDualColorButton::KDualColorButton(const TQColor &fgColor, const TQColor &bgColo
curColor = Foreground; curColor = Foreground;
dragFlag = false; dragFlag = false;
miniCtlFlag = false; miniCtlFlag = false;
if(tqsizeHint().isValid()) if(sizeHint().isValid())
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
setAcceptDrops(true); setAcceptDrops(true);
} }
@ -104,7 +104,7 @@ TQColor KDualColorButton::currentColor() const
return (curColor == Background ? bg.color() : fg.color()); return (curColor == Background ? bg.color() : fg.color());
} }
TQSize KDualColorButton::tqsizeHint() const TQSize KDualColorButton::sizeHint() const
{ {
return TQSize(34, 34); return TQSize(34, 34);
} }

@ -94,7 +94,7 @@ public:
* Returns the minimum size needed to display the widget and all its * Returns the minimum size needed to display the widget and all its
* controls. * controls.
*/ */
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
public slots: public slots:
/** /**
* Sets the foreground color. * Sets the foreground color.

@ -427,7 +427,7 @@ void KEditToolbar::init()
connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool))); connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool)));
enableButtonApply(false); enableButtonApply(false);
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
s_defaultToolbar = 0L; s_defaultToolbar = 0L;
} }
@ -547,7 +547,7 @@ KEditToolbarWidget::KEditToolbarWidget(KActionCollection *collection,
// now load in our toolbar combo box // now load in our toolbar combo box
loadToolbarCombo(); loadToolbarCombo();
adjustSize(); adjustSize();
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
} }
KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar, KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar,
@ -561,7 +561,7 @@ KEditToolbarWidget::KEditToolbarWidget(const TQString& defaultToolbar,
// now load in our toolbar combo box // now load in our toolbar combo box
loadToolbarCombo(defaultToolbar); loadToolbarCombo(defaultToolbar);
adjustSize(); adjustSize();
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
} }
KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory, KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory,
@ -573,7 +573,7 @@ KEditToolbarWidget::KEditToolbarWidget( KXMLGUIFactory* factory,
// now load in our toolbar combo box // now load in our toolbar combo box
loadToolbarCombo(); loadToolbarCombo();
adjustSize(); adjustSize();
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
} }
KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar, KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar,
@ -586,7 +586,7 @@ KEditToolbarWidget::KEditToolbarWidget( const TQString& defaultToolbar,
// now load in our toolbar combo box // now load in our toolbar combo box
loadToolbarCombo(defaultToolbar); loadToolbarCombo(defaultToolbar);
adjustSize(); adjustSize();
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
} }
KEditToolbarWidget::~KEditToolbarWidget() KEditToolbarWidget::~KEditToolbarWidget()

@ -66,7 +66,7 @@ static int minimumListWidth( const TQListBox *list )
} }
if( w == 0 ) { w = 40; } if( w == 0 ) { w = 40; }
w += list->frameWidth() * 2; w += list->frameWidth() * 2;
w += list->verticalScrollBar()->tqsizeHint().width(); w += list->verticalScrollBar()->sizeHint().width();
return w; return w;
} }
@ -403,9 +403,9 @@ TQButton::ToggleState KFontChooser::sizeIsRelative() const
: TQButton::NoChange; : TQButton::NoChange;
} }
TQSize KFontChooser::tqsizeHint( void ) const TQSize KFontChooser::sizeHint( void ) const
{ {
return tqminimumSizeHint(); return minimumSizeHint();
} }

@ -252,7 +252,7 @@ public:
/** /**
* Reimplemented for internal reasons. * Reimplemented for internal reasons.
*/ */
virtual TQSize tqsizeHint( void ) const; virtual TQSize sizeHint( void ) const;
signals: signals:
/** /**

@ -758,14 +758,14 @@ void KJanusWidget::setFocus()
} }
TQSize KJanusWidget::tqminimumSizeHint() const TQSize KJanusWidget::minimumSizeHint() const
{ {
if( mFace == TreeList || mFace == IconList ) if( mFace == TreeList || mFace == IconList )
{ {
TQSize s1( KDialog::spacingHint(), KDialog::spacingHint()*2 ); TQSize s1( KDialog::spacingHint(), KDialog::spacingHint()*2 );
TQSize s2(0,0); TQSize s2(0,0);
TQSize s3(0,0); TQSize s3(0,0);
TQSize s4( mPageStack->tqsizeHint() ); TQSize s4( mPageStack->sizeHint() );
if( mFace == TreeList ) if( mFace == TreeList )
{ {
@ -781,7 +781,7 @@ TQSize KJanusWidget::tqminimumSizeHint() const
if( mTitleLabel->isVisible() ) if( mTitleLabel->isVisible() )
{ {
s3 += mTitleLabel->tqsizeHint(); s3 += mTitleLabel->sizeHint();
s3.rheight() += mTitleSep->tqminimumSize().height(); s3.rheight() += mTitleSep->tqminimumSize().height();
} }
@ -795,7 +795,7 @@ TQSize KJanusWidget::tqminimumSizeHint() const
} }
else if( mFace == Tabbed ) else if( mFace == Tabbed )
{ {
return mTabControl->tqsizeHint(); return mTabControl->sizeHint();
} }
else if( mFace == Swallow ) else if( mFace == Swallow )
{ {
@ -803,7 +803,7 @@ TQSize KJanusWidget::tqminimumSizeHint() const
} }
else if( mFace == Plain ) else if( mFace == Plain )
{ {
return mPlainPage->tqsizeHint(); return mPlainPage->sizeHint();
} }
else else
{ {
@ -813,9 +813,9 @@ TQSize KJanusWidget::tqminimumSizeHint() const
} }
TQSize KJanusWidget::tqsizeHint() const TQSize KJanusWidget::sizeHint() const
{ {
return tqminimumSizeHint(); return minimumSizeHint();
} }
@ -914,7 +914,7 @@ bool KJanusWidget::eventFilter( TQObject *o, TQEvent *e )
if( item ) if( item )
{ {
int lw = item->width( mIconList ); int lw = item->width( mIconList );
int sw = mIconList->verticalScrollBar()->tqsizeHint().width(); int sw = mIconList->verticalScrollBar()->sizeHint().width();
mIconList->setFixedWidth( lw+sw+mIconList->frameWidth()*2 ); mIconList->setFixedWidth( lw+sw+mIconList->frameWidth()*2 );
} }
} }
@ -978,7 +978,7 @@ void KJanusWidget::IconListBox::updateWidth()
if( verticalScrollBar()->isVisible() ) if( verticalScrollBar()->isVisible() )
{ {
maxWidth += verticalScrollBar()->tqsizeHint().width(); maxWidth += verticalScrollBar()->sizeHint().width();
} }
setFixedWidth( maxWidth + frameWidth()*2 ); setFixedWidth( maxWidth + frameWidth()*2 );

@ -55,7 +55,7 @@ class KGuiItem;
* on the page, plain widget or the swallowed widget this will be taken care * on the page, plain widget or the swallowed widget this will be taken care
* of automatically. The size is used when the KJanusWidget determines its * of automatically. The size is used when the KJanusWidget determines its
* own minimum size. You get the minimum size by using the * own minimum size. You get the minimum size by using the
* tqminimumSizeHint() or tqsizeHint() methods. * minimumSizeHint() or sizeHint() methods.
* *
* Pages that have been added in TreeList, IconList or Tabbed mode can be * Pages that have been added in TreeList, IconList or Tabbed mode can be
* removed by simply deleting the page. However, it would be preferable to use * removed by simply deleting the page. However, it would be preferable to use
@ -186,7 +186,7 @@ class TDEUI_EXPORT KJanusWidget : public TQWidget
* *
* @return The minimum size. * @return The minimum size.
*/ */
virtual TQSize tqminimumSizeHint() const; virtual TQSize minimumSizeHint() const;
/** /**
* Returns the recommended size for the widget in order to be displayed * Returns the recommended size for the widget in order to be displayed
@ -194,7 +194,7 @@ class TDEUI_EXPORT KJanusWidget : public TQWidget
* *
* @return The recommended size. * @return The recommended size.
*/ */
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
/** /**
* Returns the empty widget that is available in Plain mode. * Returns the empty widget that is available in Plain mode.

@ -98,7 +98,7 @@ void KKeyButton::setShortcut( const KShortcut& cut )
void KKeyButton::setText( const TQString& text ) void KKeyButton::setText( const TQString& text )
{ {
TQPushButton::setText( text ); TQPushButton::setText( text );
setFixedSize( tqsizeHint().width()+12, tqsizeHint().height()+8 ); setFixedSize( sizeHint().width()+12, sizeHint().height()+8 );
} }
void KKeyButton::captureShortcut() void KKeyButton::captureShortcut()

@ -423,7 +423,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts )
d->pbtnShortcut = new KKeyButton(d->fCArea, "key"); d->pbtnShortcut = new KKeyButton(d->fCArea, "key");
d->pbtnShortcut->setEnabled( false ); d->pbtnShortcut->setEnabled( false );
connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const KShortcut&)), TQT_SLOT(capturedShortcut(const KShortcut&)) ); connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const KShortcut&)), TQT_SLOT(capturedShortcut(const KShortcut&)) );
grid->addRowSpacing( 1, d->pbtnShortcut->tqsizeHint().height() + 5 ); grid->addRowSpacing( 1, d->pbtnShortcut->sizeHint().height() + 5 );
wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, " wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, "
"you can press the key-combination which you would like to be assigned " "you can press the key-combination which you would like to be assigned "
@ -601,7 +601,7 @@ void KKeyChooser::slotSettingsChanged( int category )
void KKeyChooser::fontChange( const TQFont & ) void KKeyChooser::fontChange( const TQFont & )
{ {
d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->tqsizeHint().height() ); d->fCArea->setMinimumHeight( 4*d->pbtnShortcut->sizeHint().height() );
int widget_width = 0; int widget_width = 0;

@ -627,13 +627,13 @@ KLed::off()
} }
TQSize TQSize
KLed::tqsizeHint() const KLed::sizeHint() const
{ {
return TQSize(16, 16); return TQSize(16, 16);
} }
TQSize TQSize
KLed::tqminimumSizeHint() const KLed::minimumSizeHint() const
{ {
return TQSize(16, 16 ); return TQSize(16, 16 );
} }

@ -249,8 +249,8 @@ public:
*/ */
void setLook( Look look ); void setLook( Look look );
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
virtual TQSize tqminimumSizeHint() const; virtual TQSize minimumSizeHint() const;
public slots: public slots:

@ -44,7 +44,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value,
topLayout->addWidget( label, 1 ); topLayout->addWidget( label, 1 );
edit = new KLineEdit( plainPage(), 0L ); edit = new KLineEdit( plainPage(), 0L );
edit->setMinimumWidth(edit->tqsizeHint().width() * 3); edit->setMinimumWidth(edit->sizeHint().width() * 3);
label->setBuddy(edit); // please "scheck" style label->setBuddy(edit); // please "scheck" style
// connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); // connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) );
connect( edit, TQT_SIGNAL(textChanged(const TQString&)), connect( edit, TQT_SIGNAL(textChanged(const TQString&)),
@ -75,7 +75,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value,
layout->addWidget(label, 0, 0, AlignLeft); layout->addWidget(label, 0, 0, AlignLeft);
edit = new KLineEdit( this, 0L ); edit = new KLineEdit( this, 0L );
edit->setMinimumWidth(edit->tqsizeHint().width() * 3); edit->setMinimumWidth(edit->sizeHint().width() * 3);
connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) );
if ( _file_mode ) { if ( _file_mode ) {

@ -1188,12 +1188,12 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
{ {
case KToolBar::Top: case KToolBar::Top:
case KToolBar::Bottom: case KToolBar::Bottom:
size += TQSize(0, tb->tqsizeHint().height()); size += TQSize(0, tb->sizeHint().height());
break; break;
case KToolBar::Left: case KToolBar::Left:
case KToolBar::Right: case KToolBar::Right:
size += TQSize(toolBar()->tqsizeHint().width(), 0); size += TQSize(toolBar()->sizeHint().width(), 0);
break; break;
case KToolBar::Flat: case KToolBar::Flat:
@ -1212,7 +1212,7 @@ TQSize KMainWindow::sizeForCentralWidgetSize(TQSize size)
} }
TQStatusBar *sb = internalStatusBar(); TQStatusBar *sb = internalStatusBar();
if( sb && !sb->isHidden() ) if( sb && !sb->isHidden() )
size += TQSize(0, sb->tqsizeHint().height()); size += TQSize(0, sb->sizeHint().height());
return size; return size;
} }

@ -452,7 +452,7 @@ public:
* have been created and placed inside the main window (i.e. for 99% of * have been created and placed inside the main window (i.e. for 99% of
* apps setCentralWidget()) * apps setCentralWidget())
* - Widgets that inherit from TQWidget (like game boards) should overload * - Widgets that inherit from TQWidget (like game boards) should overload
* "virtual TQSize tqsizeHint() const;" to specify a default size rather * "virtual TQSize sizeHint() const;" to specify a default size rather
* than letting TQWidget::adjust use the default size of 0x0. * than letting TQWidget::adjust use the default size of 0x0.
*/ */
void setAutoSaveSettings( const TQString & groupName = TQString::tqfromLatin1("MainWindow"), void setAutoSaveSettings( const TQString & groupName = TQString::tqfromLatin1("MainWindow"),
@ -657,10 +657,10 @@ public:
* *
* @deprecated You normally don't need this, the recommended way to achieve a * @deprecated You normally don't need this, the recommended way to achieve a
* certain central widget size is as follows: * certain central widget size is as follows:
* @li Override tqsizeHint() in the central widget so that it * @li Override sizeHint() in the central widget so that it
* returns the desired size. * returns the desired size.
* @li Call updateGeometry() in the central widget whenever the * @li Call updateGeometry() in the central widget whenever the
* desired size changes. This ensures that the new tqsizeHint() is properly * desired size changes. This ensures that the new sizeHint() is properly
* propagated to any parent layout. * propagated to any parent layout.
* @li Now call adjustSize() in the mainwindow to resize the * @li Now call adjustSize() in the mainwindow to resize the
* mainwindow such that the central widget will become the desired size. * mainwindow such that the central widget will become the desired size.

@ -394,7 +394,7 @@ void KMenuBar::checkSize( int& w, int& h )
{ {
if( !d->topLevel || d->fallback_mode ) if( !d->topLevel || d->fallback_mode )
return; return;
TQSize s = tqsizeHint(); TQSize s = sizeHint();
w = s.width(); w = s.width();
h = s.height(); h = s.height();
// This is not done as setMinimumSize(), because that would set the minimum // This is not done as setMinimumSize(), because that would set the minimum
@ -404,17 +404,17 @@ void KMenuBar::checkSize( int& w, int& h )
h = KMAX( h, d->min_size.height()); h = KMAX( h, d->min_size.height());
} }
// QMenuBar's tqsizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet // QMenuBar's sizeHint() gives wrong size (insufficient width), which causes wrapping in the kicker applet
TQSize KMenuBar::tqsizeHint() const TQSize KMenuBar::sizeHint() const
{ {
if( !d->topLevel || block_resize > 0 ) if( !d->topLevel || block_resize > 0 )
return TQMenuBar::tqsizeHint(); return TQMenuBar::sizeHint();
// Since TQMenuBar::tqsizeHint() may indirectly call resize(), // Since TQMenuBar::sizeHint() may indirectly call resize(),
// avoid infinite recursion. // avoid infinite recursion.
++block_resize; ++block_resize;
// find the minimum useful height, and enlarge the width until the menu fits in that height (one row) // find the minimum useful height, and enlarge the width until the menu fits in that height (one row)
int h = heightForWidth( 1000000 ); int h = heightForWidth( 1000000 );
int w = TQMenuBar::tqsizeHint().width(); int w = TQMenuBar::sizeHint().width();
// optimization - don't call heightForWidth() too many times // optimization - don't call heightForWidth() too many times
while( heightForWidth( w + 12 ) > h ) while( heightForWidth( w + 12 ) > h )
w += 12; w += 12;
@ -448,7 +448,7 @@ bool KMenuBar::x11Event( XEvent* ev )
void KMenuBar::updateMenuBarSize() void KMenuBar::updateMenuBarSize()
{ {
menuContentsChanged(); // trigger invalidating calculated size menuContentsChanged(); // trigger invalidating calculated size
resize( tqsizeHint()); // and resize to preferred size resize( sizeHint()); // and resize to preferred size
} }
void KMenuBar::setFrameStyle( int style ) void KMenuBar::setFrameStyle( int style )

@ -84,7 +84,7 @@ public:
virtual void setFrameStyle( int ); virtual void setFrameStyle( int );
virtual void setLineWidth( int ); virtual void setLineWidth( int );
virtual void setMargin( int ); virtual void setMargin( int );
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
protected slots: protected slots:
void slotReadConfig(); void slotReadConfig();
protected: protected:

@ -247,7 +247,7 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon,
if ( details.length() < 512 ) { if ( details.length() < 512 ) {
KActiveLabel *label3 = new KActiveLabel(qrichtextify(details), KActiveLabel *label3 = new KActiveLabel(qrichtextify(details),
detailsGroup); detailsGroup);
label3->setMinimumSize(label3->tqsizeHint()); label3->setMinimumSize(label3->sizeHint());
if (!(options & KMessageBox::AllowLink)) if (!(options & KMessageBox::AllowLink))
{ {
TQObject::disconnect(label3, TQT_SIGNAL(linkClicked(const TQString &)), TQObject::disconnect(label3, TQT_SIGNAL(linkClicked(const TQString &)),

@ -130,16 +130,16 @@ void KNumInput::layout(bool deep)
int w1 = m_colw1; int w1 = m_colw1;
int w2 = m_colw2; int w2 = m_colw2;
// label tqsizeHint // label sizeHint
m_sizeLabel = (m_label ? m_label->tqsizeHint() : TQSize(0,0)); m_sizeLabel = (m_label ? m_label->sizeHint() : TQSize(0,0));
if(m_label && (m_tqalignment & AlignVCenter)) if(m_label && (m_tqalignment & AlignVCenter))
m_colw1 = m_sizeLabel.width() + 4; m_colw1 = m_sizeLabel.width() + 4;
else else
m_colw1 = 0; m_colw1 = 0;
// slider tqsizeHint // slider sizeHint
m_sizeSlider = (m_slider ? m_slider->tqsizeHint() : TQSize(0, 0)); m_sizeSlider = (m_slider ? m_slider->sizeHint() : TQSize(0, 0));
doLayout(); doLayout();
@ -187,9 +187,9 @@ TQSizePolicy KNumInput::sizePolicy() const
return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed );
} }
TQSize KNumInput::tqsizeHint() const TQSize KNumInput::sizeHint() const
{ {
return tqminimumSizeHint(); return minimumSizeHint();
} }
void KNumInput::setSteps(int minor, int major) void KNumInput::setSteps(int minor, int major)
@ -412,7 +412,7 @@ void KIntNumInput::setEditFocus(bool mark)
m_spin->setEditFocus(mark); m_spin->setEditFocus(mark);
} }
TQSize KIntNumInput::tqminimumSizeHint() const TQSize KIntNumInput::minimumSizeHint() const
{ {
constPolish(); constPolish();
@ -428,7 +428,7 @@ TQSize KIntNumInput::tqminimumSizeHint() const
// label is in the same row as the other widgets // label is in the same row as the other widgets
h = QMAX(h, m_sizeLabel.height() + 2); h = QMAX(h, m_sizeLabel.height() + 2);
w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0; w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
w += m_colw1 + m_colw2; w += m_colw1 + m_colw2;
if(m_tqalignment & (AlignTop|AlignBottom)) if(m_tqalignment & (AlignTop|AlignBottom))
@ -439,7 +439,7 @@ TQSize KIntNumInput::tqminimumSizeHint() const
void KIntNumInput::doLayout() void KIntNumInput::doLayout()
{ {
m_sizeSpin = m_spin->tqsizeHint(); m_sizeSpin = m_spin->sizeHint();
m_colw2 = m_sizeSpin.width(); m_colw2 = m_sizeSpin.width();
if (m_label) if (m_label)
@ -653,7 +653,7 @@ void KDoubleNumInput::slotEmitRelativeValueChanged( double value )
emit relativeValueChanged( value / d->referencePoint ); emit relativeValueChanged( value / d->referencePoint );
} }
TQSize KDoubleNumInput::tqminimumSizeHint() const TQSize KDoubleNumInput::minimumSizeHint() const
{ {
constPolish(); constPolish();
@ -669,7 +669,7 @@ TQSize KDoubleNumInput::tqminimumSizeHint() const
// label is in the same row as the other widgets // label is in the same row as the other widgets
h = QMAX(h, m_sizeLabel.height() + 2); h = QMAX(h, m_sizeLabel.height() + 2);
w = m_slider ? m_slider->tqsizeHint().width() + 8 : 0; w = m_slider ? m_slider->sizeHint().width() + 8 : 0;
w += m_colw1 + m_colw2; w += m_colw1 + m_colw2;
if(m_tqalignment & (AlignTop|AlignBottom)) if(m_tqalignment & (AlignTop|AlignBottom))
@ -719,7 +719,7 @@ void KDoubleNumInput::resizeEvent(TQResizeEvent* e)
void KDoubleNumInput::doLayout() void KDoubleNumInput::doLayout()
{ {
m_sizeEdit = d->spin->tqsizeHint(); m_sizeEdit = d->spin->sizeHint();
m_colw2 = m_sizeEdit.width(); m_colw2 = m_sizeEdit.width();
} }

@ -117,7 +117,7 @@ public:
* *
* @return the preferred size necessary to show the control * @return the preferred size necessary to show the control
*/ */
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
protected: protected:
/** /**
@ -318,7 +318,7 @@ public:
* *
* @return the minimum size necessary to show the control * @return the minimum size necessary to show the control
*/ */
virtual TQSize tqminimumSizeHint() const; virtual TQSize minimumSizeHint() const;
public slots: public slots:
/** /**
@ -599,7 +599,7 @@ public:
void setSpecialValueText(const TQString& text); void setSpecialValueText(const TQString& text);
virtual void setLabel(const TQString & label, int a = AlignLeft | AlignTop); virtual void setLabel(const TQString & label, int a = AlignLeft | AlignTop);
virtual TQSize tqminimumSizeHint() const; virtual TQSize minimumSizeHint() const;
virtual bool eventFilter(TQObject*, TQEvent*); virtual bool eventFilter(TQObject*, TQEvent*);
public slots: public slots:

@ -136,7 +136,7 @@ public:
* location in the Window Manager Dock. Please note that the size can not be larger than the * location in the Window Manager Dock. Please note that the size can not be larger than the
* maxsize given by the handler. * maxsize given by the handler.
**/ **/
virtual TQSize tqsizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; } virtual TQSize sizeHint(Position /*p*/, TQSize maxsize) const { return maxsize; }
/** /**
* Always use this KConfig object to save/load your extensions configuration. * Always use this KConfig object to save/load your extensions configuration.

@ -355,7 +355,7 @@ void KPasswordDialog::init()
lbl = new TQLabel(m_pMain); lbl = new TQLabel(m_pMain);
lbl->setPixmap(pix); lbl->setPixmap(pix);
lbl->tqsetAlignment(AlignHCenter|AlignVCenter); lbl->tqsetAlignment(AlignHCenter|AlignVCenter);
lbl->setFixedSize(lbl->tqsizeHint()); lbl->setFixedSize(lbl->sizeHint());
m_pGrid->addWidget(lbl, 0, 0, (TQ_Alignment)AlignCenter); m_pGrid->addWidget(lbl, 0, 0, (TQ_Alignment)AlignCenter);
} }
@ -373,7 +373,7 @@ void KPasswordDialog::init()
lbl = new TQLabel(m_pMain); lbl = new TQLabel(m_pMain);
lbl->tqsetAlignment(AlignLeft|AlignVCenter); lbl->tqsetAlignment(AlignLeft|AlignVCenter);
lbl->setText(i18n("&Password:")); lbl->setText(i18n("&Password:"));
lbl->setFixedSize(lbl->tqsizeHint()); lbl->setFixedSize(lbl->sizeHint());
m_pGrid->addWidget(lbl, 7, 0, (TQ_Alignment)AlignLeft); m_pGrid->addWidget(lbl, 7, 0, (TQ_Alignment)AlignLeft);
TQHBoxLayout *h_lay = new TQHBoxLayout(); TQHBoxLayout *h_lay = new TQHBoxLayout();
@ -381,7 +381,7 @@ void KPasswordDialog::init()
m_pEdit = new KPasswordEdit(m_pMain); m_pEdit = new KPasswordEdit(m_pMain);
m_pEdit2 = 0; m_pEdit2 = 0;
lbl->setBuddy(m_pEdit); lbl->setBuddy(m_pEdit);
TQSize size = m_pEdit->tqsizeHint(); TQSize size = m_pEdit->sizeHint();
m_pEdit->setFixedHeight(size.height()); m_pEdit->setFixedHeight(size.height());
m_pEdit->setMinimumWidth(size.width()); m_pEdit->setMinimumWidth(size.width());
h_lay->addWidget(m_pEdit); h_lay->addWidget(m_pEdit);
@ -392,7 +392,7 @@ void KPasswordDialog::init()
m_pGrid->addRowSpacing(8, 10); m_pGrid->addRowSpacing(8, 10);
m_pGrid->setRowStretch(8, 12); m_pGrid->setRowStretch(8, 12);
TQCheckBox* const cb = new TQCheckBox(i18n("&Keep password"), m_pMain); TQCheckBox* const cb = new TQCheckBox(i18n("&Keep password"), m_pMain);
cb->setFixedSize(cb->tqsizeHint()); cb->setFixedSize(cb->sizeHint());
if (m_Keep > 1) if (m_Keep > 1)
cb->setChecked(true); cb->setChecked(true);
else else
@ -404,14 +404,14 @@ void KPasswordDialog::init()
lbl = new TQLabel(m_pMain); lbl = new TQLabel(m_pMain);
lbl->tqsetAlignment(AlignLeft|AlignVCenter); lbl->tqsetAlignment(AlignLeft|AlignVCenter);
lbl->setText(i18n("&Verify:")); lbl->setText(i18n("&Verify:"));
lbl->setFixedSize(lbl->tqsizeHint()); lbl->setFixedSize(lbl->sizeHint());
m_pGrid->addWidget(lbl, 9, 0, (TQ_Alignment)AlignLeft); m_pGrid->addWidget(lbl, 9, 0, (TQ_Alignment)AlignLeft);
h_lay = new TQHBoxLayout(); h_lay = new TQHBoxLayout();
m_pGrid->addLayout(h_lay, 9, 2); m_pGrid->addLayout(h_lay, 9, 2);
m_pEdit2 = new KPasswordEdit(m_pMain); m_pEdit2 = new KPasswordEdit(m_pMain);
lbl->setBuddy(m_pEdit2); lbl->setBuddy(m_pEdit2);
size = m_pEdit2->tqsizeHint(); size = m_pEdit2->sizeHint();
m_pEdit2->setFixedHeight(size.height()); m_pEdit2->setFixedHeight(size.height());
m_pEdit2->setMinimumWidth(size.width()); m_pEdit2->setMinimumWidth(size.width());
h_lay->addWidget(m_pEdit2); h_lay->addWidget(m_pEdit2);
@ -491,7 +491,7 @@ void KPasswordDialog::addLine(TQString key, TQString value)
TQLabel *lbl = new TQLabel(key, m_pMain); TQLabel *lbl = new TQLabel(key, m_pMain);
lbl->tqsetAlignment(AlignLeft|AlignTop); lbl->tqsetAlignment(AlignLeft|AlignTop);
lbl->setFixedSize(lbl->tqsizeHint()); lbl->setFixedSize(lbl->sizeHint());
m_pGrid->addWidget(lbl, m_Row+2, 0, (TQ_Alignment)AlignLeft); m_pGrid->addWidget(lbl, m_Row+2, 0, (TQ_Alignment)AlignLeft);
lbl = new TQLabel(value, m_pMain); lbl = new TQLabel(value, m_pMain);

@ -194,8 +194,8 @@ void KPassivePopup::mouseReleaseEvent( TQMouseEvent *e )
void KPassivePopup::show() void KPassivePopup::show()
{ {
if ( size() != tqsizeHint() ) if ( size() != sizeHint() )
resize( tqsizeHint() ); resize( sizeHint() );
if ( d->fixedPosition.isNull() ) if ( d->fixedPosition.isNull() )
positionSelf(); positionSelf();

@ -115,7 +115,7 @@ void KPopupTitle::paintEvent(TQPaintEvent *)
} }
} }
TQSize KPopupTitle::tqsizeHint() const TQSize KPopupTitle::sizeHint() const
{ {
return tqminimumSize(); return tqminimumSize();
} }

@ -74,7 +74,7 @@ public:
*/ */
TQPixmap icon() const { return miniicon; } TQPixmap icon() const { return miniicon; }
TQSize tqsizeHint() const; TQSize sizeHint() const;
public slots: public slots:
/// @since 3.1 /// @since 3.1

@ -408,7 +408,7 @@ KSpellConfig::fillInDialog ()
if ( dictFromList() ) if ( dictFromList() )
whichelement = langfnames.findIndex(dictionary()); whichelement = langfnames.findIndex(dictionary());
dictcombo->setMinimumWidth (dictcombo->tqsizeHint().width()); dictcombo->setMinimumWidth (dictcombo->sizeHint().width());
if (dictionary().isEmpty() || whichelement!=-1) if (dictionary().isEmpty() || whichelement!=-1)
{ {

@ -352,7 +352,7 @@ protected:
virtual void drawContents( TQPainter * ); virtual void drawContents( TQPainter * );
virtual TQSize tqminimumSize() const virtual TQSize tqminimumSize() const
{ return tqsizeHint(); } { return sizeHint(); }
private: private:
void init(); void init();

@ -100,7 +100,7 @@ void KSeparator::drawFrame(TQPainter *p)
} }
TQSize KSeparator::tqsizeHint() const TQSize KSeparator::sizeHint() const
{ {
if ( frameStyle() & VLine ) if ( frameStyle() & VLine )
return TQSize(2, 0); return TQSize(2, 0);

@ -70,7 +70,7 @@ class TDEUI_EXPORT KSeparator : public TQFrame
/** /**
* The recommended height (width) for a horizontal (vertical) separator. * The recommended height (width) for a horizontal (vertical) separator.
**/ **/
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
protected: protected:
/** /**

@ -111,7 +111,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -165,7 +165,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>

@ -37,7 +37,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>0</height> <height>0</height>
@ -95,7 +95,7 @@
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>

@ -100,7 +100,7 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b
TQT_SLOT(slotConfigChanged()) ); TQT_SLOT(slotConfigChanged()) );
setHelp( "spelldlg", "kspell" ); setHelp( "spelldlg", "kspell" );
setMinimumSize( tqsizeHint() ); setMinimumSize( sizeHint() );
emit ready( false ); emit ready( false );
} }

@ -123,7 +123,7 @@ Click here if you consider that the unknown word is not misspelled and you want
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>21</width> <width>21</width>
<height>20</height> <height>20</height>
@ -276,7 +276,7 @@ Click here if you consider that the unknown word is not misspelled and you want
<property name="sizeType"> <property name="sizeType">
<enum>Expanding</enum> <enum>Expanding</enum>
</property> </property>
<property name="tqsizeHint"> <property name="sizeHint">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>

@ -36,16 +36,16 @@ void KSqueezedTextLabel::resizeEvent( TQResizeEvent * ) {
squeezeTextToLabel(); squeezeTextToLabel();
} }
TQSize KSqueezedTextLabel::tqminimumSizeHint() const TQSize KSqueezedTextLabel::minimumSizeHint() const
{ {
TQSize sh = TQLabel::tqminimumSizeHint(); TQSize sh = TQLabel::minimumSizeHint();
sh.setWidth(-1); sh.setWidth(-1);
return sh; return sh;
} }
TQSize KSqueezedTextLabel::tqsizeHint() const TQSize KSqueezedTextLabel::sizeHint() const
{ {
return TQSize(contentsRect().width(), TQLabel::tqsizeHint().height()); return TQSize(contentsRect().width(), TQLabel::sizeHint().height());
} }
void KSqueezedTextLabel::setText( const TQString &text ) { void KSqueezedTextLabel::setText( const TQString &text ) {

@ -53,8 +53,8 @@ public:
KSqueezedTextLabel( TQWidget *parent, const char *name = 0 ); KSqueezedTextLabel( TQWidget *parent, const char *name = 0 );
KSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 ); KSqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 );
virtual TQSize tqminimumSizeHint() const; virtual TQSize minimumSizeHint() const;
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
/** /**
* Overridden for internal reasons; the API remains unaffected. * Overridden for internal reasons; the API remains unaffected.
*/ */

@ -125,7 +125,7 @@ void KTabCtl::setSizes()
{ {
unsigned i; unsigned i;
TQSize min(tabs->tqsizeHint()); /* the minimum required size for the tabbar */ TQSize min(tabs->sizeHint()); /* the minimum required size for the tabbar */
tabs->resize(min); /* make sure that the tabbar does not require more space than actually needed. */ tabs->resize(min); /* make sure that the tabbar does not require more space than actually needed. */
@ -190,16 +190,16 @@ void KTabCtl::setShape( TQTabBar::Shape tqshape )
} }
TQSize TQSize
KTabCtl::tqsizeHint() const KTabCtl::sizeHint() const
{ {
/* desired size of the tabbar */ /* desired size of the tabbar */
TQSize hint(tabs->tqsizeHint()); TQSize hint(tabs->sizeHint());
/* overall desired size of all pages */ /* overall desired size of all pages */
TQSize pageHint; TQSize pageHint;
for (unsigned int i = 0; i < pages.size(); i++) for (unsigned int i = 0; i < pages.size(); i++)
{ {
TQSize sizeI(pages[i]->tqsizeHint()); TQSize sizeI(pages[i]->sizeHint());
if (sizeI.isValid()) if (sizeI.isValid())
{ {
@ -229,7 +229,7 @@ KTabCtl::tqsizeHint() const
} }
/* /*
* If not at least a one page has a valid tqsizeHint we have to return * If not at least a one page has a valid sizeHint we have to return
* an invalid size as well. * an invalid size as well.
*/ */
return (pageHint); return (pageHint);

@ -62,7 +62,7 @@ public:
void setTabEnabled(const TQString&, bool); void setTabEnabled(const TQString&, bool);
void setBorder(bool); void setBorder(bool);
void setShape( TQTabBar::Shape tqshape ); void setShape( TQTabBar::Shape tqshape );
virtual TQSize tqsizeHint() const; virtual TQSize sizeHint() const;
protected: protected:
void paintEvent(TQPaintEvent *); void paintEvent(TQPaintEvent *);

@ -253,7 +253,7 @@ void KTabWidget::resizeTabs( int changeTabIndex )
newMaxLength=d->m_maxLength; newMaxLength=d->m_maxLength;
uint lcw=0, rcw=0; uint lcw=0, rcw=0;
int tabBarHeight = tabBar()->tqsizeHint().height(); int tabBarHeight = tabBar()->sizeHint().height();
if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() ) if ( cornerWidget( TopLeft ) && cornerWidget( TopLeft )->isVisible() )
lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight ); lcw = QMAX( cornerWidget( TopLeft )->width(), tabBarHeight );
if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() ) if ( cornerWidget( TopRight ) && cornerWidget( TopRight )->isVisible() )
@ -451,7 +451,7 @@ void KTabWidget::removePage( TQWidget * w ) {
bool KTabWidget::isEmptyTabbarSpace( const TQPoint &point ) const bool KTabWidget::isEmptyTabbarSpace( const TQPoint &point ) const
{ {
TQSize size( tabBar()->tqsizeHint() ); TQSize size( tabBar()->sizeHint() );
if ( ( tabPosition()==Top && point.y()< size.height() ) || ( tabPosition()==Bottom && point.y()>(height()-size.height() ) ) ) { if ( ( tabPosition()==Top && point.y()< size.height() ) || ( tabPosition()==Bottom && point.y()>(height()-size.height() ) ) ) {
TQWidget *rightcorner = cornerWidget( TopRight ); TQWidget *rightcorner = cornerWidget( TopRight );
if ( rightcorner ) { if ( rightcorner ) {

@ -181,7 +181,7 @@ void KToolBarSeparator::styleChange( TQStyle& )
setOrientation( orient ); setOrientation( orient );
} }
TQSize KToolBarSeparator::tqsizeHint() const TQSize KToolBarSeparator::sizeHint() const
{ {
int dim = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); int dim = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this );
return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 ); return orientation() == Qt::Vertical ? TQSize( 0, dim ) : TQSize( dim, 0 );
@ -1240,7 +1240,7 @@ void KToolBar::rebuildLayout()
continue; continue;
KToolBarSeparator *ktbs = tqt_dynamic_cast<KToolBarSeparator *>(w); KToolBarSeparator *ktbs = tqt_dynamic_cast<KToolBarSeparator *>(w);
if ( ktbs && !ktbs->showLine() ) { if ( ktbs && !ktbs->showLine() ) {
l->addSpacing( orientation() == Qt::Vertical ? w->tqsizeHint().height() : w->tqsizeHint().width() ); l->addSpacing( orientation() == Qt::Vertical ? w->sizeHint().height() : w->sizeHint().width() );
w->hide(); w->hide();
continue; continue;
} }
@ -1343,7 +1343,7 @@ TQSizePolicy KToolBar::sizePolicy() const
return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); return TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding );
} }
TQSize KToolBar::tqsizeHint() const TQSize KToolBar::sizeHint() const
{ {
TQSize minSize(0,0); TQSize minSize(0,0);
KToolBar *ncThis = const_cast<KToolBar *>(this); KToolBar *ncThis = const_cast<KToolBar *>(this);
@ -1357,7 +1357,7 @@ TQSize KToolBar::tqsizeHint() const
case KToolBar::Bottom: case KToolBar::Bottom:
for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() ) for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() )
{ {
TQSize sh = w->tqsizeHint(); TQSize sh = w->sizeHint();
if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored )
sh.setWidth( 1 ); sh.setWidth( 1 );
if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored )
@ -1379,7 +1379,7 @@ TQSize KToolBar::tqsizeHint() const
case KToolBar::Right: case KToolBar::Right:
for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() ) for ( TQWidget *w = ncThis->widgets.first(); w; w = ncThis->widgets.next() )
{ {
TQSize sh = w->tqsizeHint(); TQSize sh = w->sizeHint();
if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored ) if ( w->tqsizePolicy().horData() == TQSizePolicy::Ignored )
sh.setWidth( 1 ); sh.setWidth( 1 );
if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored ) if ( w->tqsizePolicy().verData() == TQSizePolicy::Ignored )
@ -1395,7 +1395,7 @@ TQSize KToolBar::tqsizeHint() const
break; break;
default: default:
minSize = TQToolBar::tqsizeHint(); minSize = TQToolBar::sizeHint();
break; break;
} }
return minSize; return minSize;
@ -1403,12 +1403,12 @@ TQSize KToolBar::tqsizeHint() const
TQSize KToolBar::tqminimumSize() const TQSize KToolBar::tqminimumSize() const
{ {
return tqminimumSizeHint(); return minimumSizeHint();
} }
TQSize KToolBar::tqminimumSizeHint() const TQSize KToolBar::minimumSizeHint() const
{ {
return tqsizeHint(); return sizeHint();
} }
bool KToolBar::highlight() const bool KToolBar::highlight() const

@ -62,7 +62,7 @@ class TDEUI_EXPORT KToolBarSeparator : public TQFrame
public: public:
KToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 ); KToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 );
TQSize tqsizeHint() const; TQSize sizeHint() const;
Orientation orientation() const { return orient; } Orientation orientation() const { return orient; }
TQSizePolicy sizePolicy() const; TQSizePolicy sizePolicy() const;
bool showLine() const { return line; } bool showLine() const { return line; }
@ -945,8 +945,8 @@ public:
void setStretchableWidget( TQWidget *w ); void setStretchableWidget( TQWidget *w );
TQSizePolicy sizePolicy() const; TQSizePolicy sizePolicy() const;
bool highlight() const; bool highlight() const;
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
void hide(); void hide();

@ -734,12 +734,12 @@ void KToolBarButton::setToggle(bool flag)
disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled()));
} }
TQSize KToolBarButton::tqsizeHint() const TQSize KToolBarButton::sizeHint() const
{ {
return d->size; return d->size;
} }
TQSize KToolBarButton::tqminimumSizeHint() const TQSize KToolBarButton::minimumSizeHint() const
{ {
return d->size; return d->size;
} }

@ -292,8 +292,8 @@ protected:
/// @since 3.4 /// @since 3.4
void mouseReleaseEvent( TQMouseEvent * ); void mouseReleaseEvent( TQMouseEvent * );
void showMenu(); void showMenu();
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
TQSize tqminimumSize() const; TQSize tqminimumSize() const;
/// @since 3.1 /// @since 3.1

@ -1332,7 +1332,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window)
// L2500: Specifies that this widget can use additional space, // L2500: Specifies that this widget can use additional space,
// and that it can survive on less than tqsizeHint(). // and that it can survive on less than sizeHint().
TQSizePolicy QXEmbed::sizePolicy() const TQSizePolicy QXEmbed::sizePolicy() const
{ {
return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding );
@ -1340,13 +1340,13 @@ TQSizePolicy QXEmbed::sizePolicy() const
// L2520: Returns a size sufficient for the embedded window // L2520: Returns a size sufficient for the embedded window
TQSize QXEmbed::tqsizeHint() const TQSize QXEmbed::sizeHint() const
{ {
return tqminimumSizeHint(); return minimumSizeHint();
} }
// L2550: Returns the minimum size specified by the embedded window. // L2550: Returns the minimum size specified by the embedded window.
TQSize QXEmbed::tqminimumSizeHint() const TQSize QXEmbed::minimumSizeHint() const
{ {
int minw = 0; int minw = 0;
int minh = 0; int minh = 0;

@ -188,8 +188,8 @@ public:
bool autoDelete() const; bool autoDelete() const;
/* Reimp */ /* Reimp */
TQSize tqsizeHint() const; TQSize sizeHint() const;
TQSize tqminimumSizeHint() const; TQSize minimumSizeHint() const;
TQSizePolicy sizePolicy() const; TQSizePolicy sizePolicy() const;
bool eventFilter( TQObject *, TQEvent * ); bool eventFilter( TQObject *, TQEvent * );
bool customWhatsThis() const; bool customWhatsThis() const;

@ -38,7 +38,7 @@ int main(int argc, char **argv) {
"Press OK or Cancel when done" "Press OK or Cancel when done"
, w); , w);
l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
l->setMinimumSize(l->tqsizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w); KButtonBox *bbox = new KButtonBox(w);
TQPushButton *b = bbox->addButton("OK"); TQPushButton *b = bbox->addButton("OK");
@ -66,7 +66,7 @@ int main(int argc, char **argv) {
"OK and Cancel are right aligned\n"\ "OK and Cancel are right aligned\n"\
"Try resizing the window!", w); "Try resizing the window!", w);
l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
l->setMinimumSize(l->tqsizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w); KButtonBox *bbox = new KButtonBox(w);
bbox->addStretch(1); bbox->addStretch(1);
@ -92,7 +92,7 @@ int main(int argc, char **argv) {
"OK and Cancel are middle aligned\n"\ "OK and Cancel are middle aligned\n"\
"Try resizing the window!", w); "Try resizing the window!", w);
l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
l->setMinimumSize(l->tqsizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w); KButtonBox *bbox = new KButtonBox(w);
bbox->addStretch(1); bbox->addStretch(1);
@ -121,7 +121,7 @@ int main(int argc, char **argv) {
"since it will look ugly -- " "since it will look ugly -- "
"anyway, it works", w); "anyway, it works", w);
l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
l->setMinimumSize(l->tqsizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w); KButtonBox *bbox = new KButtonBox(w);
bbox->addStretch(1); bbox->addStretch(1);
@ -153,7 +153,7 @@ int main(int argc, char **argv) {
"the former example!" "the former example!"
,w); ,w);
l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
l->setMinimumSize(l->tqsizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w); KButtonBox *bbox = new KButtonBox(w);
bbox->addStretch(1); bbox->addStretch(1);
@ -183,7 +183,7 @@ int main(int argc, char **argv) {
"too?" "too?"
,w); ,w);
l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak); l->tqsetAlignment(Qt::AlignVCenter|Qt::AlignLeft|Qt::WordBreak);
l->setMinimumSize(l->tqsizeHint()); l->setMinimumSize(l->sizeHint());
tl->addWidget(l,1); tl->addWidget(l,1);
KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical); KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical);
TQPushButton *b = bbox->addButton("OK"); TQPushButton *b = bbox->addButton("OK");

@ -7,7 +7,7 @@ int main (int argc,char **argv)
KApplication app( argc, argv, "kcharselecttest" ); KApplication app( argc, argv, "kcharselecttest" );
KCharSelect selector( 0, "char selector" ); KCharSelect selector( 0, "char selector" );
selector.resize( selector.tqsizeHint() ); selector.resize( selector.sizeHint() );
selector.show(); selector.show();
selector.setCaption( "KCharSelect Test" ); selector.setCaption( "KCharSelect Test" );

@ -23,7 +23,7 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name)
layout->addWidget(colorBtn, 0); layout->addWidget(colorBtn, 0);
layout->addWidget(lbl, 1); layout->addWidget(lbl, 1);
layout->activate(); layout->activate();
resize(tqsizeHint()); resize(sizeHint());
} }
void KDualColorWidget::slotFgChanged(const TQColor &c) void KDualColorWidget::slotFgChanged(const TQColor &c)

@ -25,18 +25,18 @@ ExampleWidget::ExampleWidget( TQWidget *parent, const char *name )
// and sub-layouts. // and sub-layouts.
TQSize sh; TQSize sh;
setText("<p>Hello.</p>"); setText("<p>Hello.</p>");
sh = tqsizeHint(); sh = sizeHint();
qWarning("SizeHint = %d x %d", sh.width(), sh.height()); qWarning("SizeHint = %d x %d", sh.width(), sh.height());
setText("Hello."); setText("Hello.");
sh = tqsizeHint(); sh = sizeHint();
qWarning("SizeHint = %d x %d", sh.width(), sh.height()); qWarning("SizeHint = %d x %d", sh.width(), sh.height());
setText("<p>Hello<br>World</p>"); setText("<p>Hello<br>World</p>");
sh = tqsizeHint(); sh = sizeHint();
qWarning("SizeHint = %d x %d", sh.width(), sh.height()); qWarning("SizeHint = %d x %d", sh.width(), sh.height());
// setText("Hello\nWorld"); // setText("Hello\nWorld");
sh = tqsizeHint(); sh = sizeHint();
qWarning("SizeHint = %d x %d", sh.width(), sh.height()); qWarning("SizeHint = %d x %d", sh.width(), sh.height());
setMinimumSize(tqsizeHint()); setMinimumSize(sizeHint());
} }

@ -20,7 +20,7 @@ TestWidget::TestWidget(TQWidget *parent, const char *name)
init(); init();
setText("We added \"Client Test\" to kicker. Click the K Menu to check."); setText("We added \"Client Test\" to kicker. Click the K Menu to check.");
resize(tqsizeHint()); resize(sizeHint());
} }
void TestWidget::init() void TestWidget::init()

@ -140,7 +140,7 @@ KRulerTest::KRulerTest( const char *name )
beginMark = new KIntNumInput(0, lineEdit); beginMark = new KIntNumInput(0, lineEdit);
beginMark->setRange(-1000, 1000, 1, false); beginMark->setRange(-1000, 1000, 1, false);
beginMark->move(5, 15); beginMark->move(5, 15);
beginMark->setFixedSize(beginMark->tqsizeHint()); beginMark->setFixedSize(beginMark->sizeHint());
connect(beginMark, TQT_SIGNAL(valueChanged(int)), connect(beginMark, TQT_SIGNAL(valueChanged(int)),
hruler, TQT_SLOT(slotNewOffset(int)) ); hruler, TQT_SLOT(slotNewOffset(int)) );
connect(beginMark, TQT_SIGNAL(valueChanged(int)), connect(beginMark, TQT_SIGNAL(valueChanged(int)),
@ -148,7 +148,7 @@ KRulerTest::KRulerTest( const char *name )
endMark = new KIntNumInput(0, lineEdit); endMark = new KIntNumInput(0, lineEdit);
endMark->setRange(-1000, 1000, 1, false); endMark->setRange(-1000, 1000, 1, false);
endMark->move(5, 35); endMark->move(5, 35);
endMark->setFixedSize(endMark->tqsizeHint()); endMark->setFixedSize(endMark->sizeHint());
connect(endMark, TQT_SIGNAL(valueChanged(int)), connect(endMark, TQT_SIGNAL(valueChanged(int)),
hruler, TQT_SLOT(slotEndOffset(int)) ); hruler, TQT_SLOT(slotEndOffset(int)) );
connect(endMark, TQT_SIGNAL(valueChanged(int)), connect(endMark, TQT_SIGNAL(valueChanged(int)),
@ -156,7 +156,7 @@ KRulerTest::KRulerTest( const char *name )
lengthInput = new KIntNumInput(0, lineEdit); lengthInput = new KIntNumInput(0, lineEdit);
lengthInput->setRange(-1000, 1000, 1, false); lengthInput->setRange(-1000, 1000, 1, false);
lengthInput->move(5, 55); lengthInput->move(5, 55);
lengthInput->setFixedSize(lengthInput->tqsizeHint()); lengthInput->setFixedSize(lengthInput->sizeHint());
connect(lengthInput, TQT_SIGNAL(valueChanged(int)), connect(lengthInput, TQT_SIGNAL(valueChanged(int)),
hruler, TQT_SLOT(slotEndOffset(int)) ); hruler, TQT_SLOT(slotEndOffset(int)) );
connect(lengthInput, TQT_SIGNAL(valueChanged(int)), connect(lengthInput, TQT_SIGNAL(valueChanged(int)),
@ -169,21 +169,21 @@ KRulerTest::KRulerTest( const char *name )
transX = new KDoubleNumInput(0.0, vertrot); transX = new KDoubleNumInput(0.0, vertrot);
transX->setRange(-1000, 1000, 1, false); transX->setRange(-1000, 1000, 1, false);
transX->move(5, 15); transX->move(5, 15);
transX->setFixedSize(transX->tqsizeHint()); transX->setFixedSize(transX->sizeHint());
//transX->setLabel("transx", AlignLeft); //transX->setLabel("transx", AlignLeft);
connect(transX, TQT_SIGNAL(valueChanged(double)), connect(transX, TQT_SIGNAL(valueChanged(double)),
TQT_SLOT(slotSetXTrans(double)) ); TQT_SLOT(slotSetXTrans(double)) );
transY = new KDoubleNumInput(-12.0, vertrot); transY = new KDoubleNumInput(-12.0, vertrot);
transY->setRange(-1000, 1000, 1, false); transY->setRange(-1000, 1000, 1, false);
transY->move(5, 35); transY->move(5, 35);
transY->setFixedSize(transY->tqsizeHint()); transY->setFixedSize(transY->sizeHint());
//transY->setLabel("transy", AlignLeft); //transY->setLabel("transy", AlignLeft);
connect(transY, TQT_SIGNAL(valueChanged(double)), connect(transY, TQT_SIGNAL(valueChanged(double)),
TQT_SLOT(slotSetYTrans(double)) ); TQT_SLOT(slotSetYTrans(double)) );
rotV = new KDoubleNumInput(90.0, vertrot); rotV = new KDoubleNumInput(90.0, vertrot);
rotV->setRange(-1000, 1000, 1, false); rotV->setRange(-1000, 1000, 1, false);
rotV->move(5, 55); rotV->move(5, 55);
rotV->setFixedSize(rotV->tqsizeHint()); rotV->setFixedSize(rotV->sizeHint());
//rotV->setLabel("rot", AlignLeft); //rotV->setLabel("rot", AlignLeft);
connect(rotV, TQT_SIGNAL(valueChanged(double)), connect(rotV, TQT_SIGNAL(valueChanged(double)),
TQT_SLOT(slotSetRotate(double)) ); TQT_SLOT(slotSetRotate(double)) );

Loading…
Cancel
Save