diff options
Diffstat (limited to 'tqtinterface/qt4/tools/designer/designer')
50 files changed, 143 insertions, 143 deletions
diff --git a/tqtinterface/qt4/tools/designer/designer/about.ui b/tqtinterface/qt4/tools/designer/designer/about.ui index 0f9126a..db2e11b 100644 --- a/tqtinterface/qt4/tools/designer/designer/about.ui +++ b/tqtinterface/qt4/tools/designer/designer/about.ui @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -198,7 +198,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp b/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp index 509e743..d52fad4 100644 --- a/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp +++ b/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp @@ -170,7 +170,7 @@ void TQDesignerToolBarSeparator::styleChange( TQStyle& ) setOrientation( orient ); } -TQSize TQDesignerToolBarSeparator::sizeHint() const +TQSize TQDesignerToolBarSeparator::tqsizeHint() const { int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); diff --git a/tqtinterface/qt4/tools/designer/designer/actiondnd.h b/tqtinterface/qt4/tools/designer/designer/actiondnd.h index 6aeb7f4..adde1b4 100644 --- a/tqtinterface/qt4/tools/designer/designer/actiondnd.h +++ b/tqtinterface/qt4/tools/designer/designer/actiondnd.h @@ -154,7 +154,7 @@ class TQDesignerToolBarSeparator : public TQWidget public: TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 ); - TQSize sizeHint() const; + TQSize tqsizeHint() const; Qt::Orientation orientation() const { return orient; } public Q_SLOTS: void setOrientation( Qt::Orientation ); diff --git a/tqtinterface/qt4/tools/designer/designer/actioneditor.ui b/tqtinterface/qt4/tools/designer/designer/actioneditor.ui index 4ce7983..ce3f105 100644 --- a/tqtinterface/qt4/tools/designer/designer/actioneditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/actioneditor.ui @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui b/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui index 9b9eedc..e3911bd 100644 --- a/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui +++ b/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui @@ -69,7 +69,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>342</width> <height>0</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>111</width> <height>0</height> @@ -222,7 +222,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>0</height> diff --git a/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui b/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui index b16c791..8497775 100644 --- a/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui +++ b/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/createtemplate.ui b/tqtinterface/qt4/tools/designer/designer/createtemplate.ui index 4ad9259..322fabc 100644 --- a/tqtinterface/qt4/tools/designer/designer/createtemplate.ui +++ b/tqtinterface/qt4/tools/designer/designer/createtemplate.ui @@ -138,7 +138,7 @@ <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> @@ -210,7 +210,7 @@ <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui b/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui index 2044d3a..f5d5a01 100644 --- a/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -534,7 +534,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -607,7 +607,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -821,7 +821,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -907,7 +907,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp index c5d9d94..91531c3 100644 --- a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp @@ -202,8 +202,8 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i ) previewPixmap->setPixmap( *w->pixmap ); else previewPixmap->setText( "" ); - spinWidth->setValue( w->sizeHint.width() ); - spinHeight->setValue( w->sizeHint.height() ); + spinWidth->setValue( w->tqsizeHint.width() ); + spinHeight->setValue( w->tqsizeHint.height() ); sizeHor->setCurrentItem( size_type_to_int( w->sizePolicy.horData() ) ); sizeVer->setCurrentItem( size_type_to_int( w->sizePolicy.verData() ) ); checkContainer->setChecked( w->isContainer ); @@ -313,7 +313,7 @@ void CustomWidgetEditor::heightChanged( int h ) if ( !i || !w ) return; - w->sizeHint.setHeight( h ); + w->tqsizeHint.setHeight( h ); updateCustomWidgetSizes(); } @@ -357,7 +357,7 @@ void CustomWidgetEditor::widthChanged( int wid ) if ( !i || !w ) return; - w->sizeHint.setWidth( wid ); + w->tqsizeHint.setWidth( wid ); updateCustomWidgetSizes(); } @@ -713,8 +713,8 @@ void CustomWidgetEditor::saveDescription() << "\">" << w->includeFile << "</header>" << endl; ts << makeIndent2( indent ) << "<sizehint>" << endl; indent++; - ts << makeIndent2( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; - ts << makeIndent2( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl; + ts << makeIndent2( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl; + ts << makeIndent2( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl; indent--; ts << makeIndent2( indent ) << "</sizehint>" << endl; ts << makeIndent2( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl; diff --git a/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui b/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui index bb16593..9e12f4e 100644 --- a/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/dbconnections.ui b/tqtinterface/qt4/tools/designer/designer/dbconnections.ui index a1ff91b..1bf7426 100644 --- a/tqtinterface/qt4/tools/designer/designer/dbconnections.ui +++ b/tqtinterface/qt4/tools/designer/designer/dbconnections.ui @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -183,7 +183,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -244,7 +244,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -263,7 +263,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/defs.h b/tqtinterface/qt4/tools/designer/designer/defs.h index fb06317..b6560d1 100644 --- a/tqtinterface/qt4/tools/designer/designer/defs.h +++ b/tqtinterface/qt4/tools/designer/designer/defs.h @@ -34,7 +34,7 @@ #ifndef DEFS_H #define DEFS_H -#include <sizepolicy.h> +#include <tqsizepolicy.h> #include <tqstring.h> #define POINTER_TOOL 32000 diff --git a/tqtinterface/qt4/tools/designer/designer/editfunctions.ui b/tqtinterface/qt4/tools/designer/designer/editfunctions.ui index 5250f54..5d95587 100644 --- a/tqtinterface/qt4/tools/designer/designer/editfunctions.ui +++ b/tqtinterface/qt4/tools/designer/designer/editfunctions.ui @@ -196,7 +196,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -361,7 +361,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -525,7 +525,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -573,7 +573,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/finddialog.ui b/tqtinterface/qt4/tools/designer/designer/finddialog.ui index 44b4435..1c0f39f 100644 --- a/tqtinterface/qt4/tools/designer/designer/finddialog.ui +++ b/tqtinterface/qt4/tools/designer/designer/finddialog.ui @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/formwindow.cpp b/tqtinterface/qt4/tools/designer/designer/formwindow.cpp index e19d0ca..0b102e9 100644 --- a/tqtinterface/qt4/tools/designer/designer/formwindow.cpp +++ b/tqtinterface/qt4/tools/designer/designer/formwindow.cpp @@ -65,7 +65,7 @@ #include <tqpalette.h> #include <tqmessagebox.h> #include <tqpopupmenu.h> -#include <sizegrip.h> +#include <tqsizegrip.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> #include <tqmetaobject.h> @@ -414,8 +414,8 @@ void FormWindow::insertWidget() r.setHeight( 20 ); } } else { - r.setWidth( w->sizeHint().width() ); - r.setHeight( w->sizeHint().height() ); + r.setWidth( w->tqsizeHint().width() ); + r.setHeight( w->tqsizeHint().height() ); } } diff --git a/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui b/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui index 50700e9..329ca8f 100644 --- a/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui +++ b/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui b/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui index 8c9119e..325678d 100644 --- a/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui @@ -137,7 +137,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -316,7 +316,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/layout.cpp b/tqtinterface/qt4/tools/designer/designer/layout.cpp index e8266c3..acb6766 100644 --- a/tqtinterface/qt4/tools/designer/designer/layout.cpp +++ b/tqtinterface/qt4/tools/designer/designer/layout.cpp @@ -950,8 +950,8 @@ void Spacer::setSizeType( SizeType t ) Spacer::SizeType Spacer::sizeType() const { if ( orient == Qt::Vertical ) - return (SizeType)sizePolicy().verData(); - return (SizeType)sizePolicy().horData(); + return (SizeType)tqsizePolicy().verData(); + return (SizeType)tqsizePolicy().horData(); } int Spacer::tqalignment() const @@ -972,7 +972,7 @@ TQSize Spacer::tqminimumSize() const return s; } -TQSize Spacer::sizeHint() const +TQSize Spacer::tqsizeHint() const { return sh; } @@ -982,7 +982,7 @@ void Spacer::setSizeHint( const TQSize &s ) { sh = s; if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout ) - resize( sizeHint() ); + resize( tqsizeHint() ); updateGeometry(); } diff --git a/tqtinterface/qt4/tools/designer/designer/layout.h b/tqtinterface/qt4/tools/designer/designer/layout.h index 1b6821d..3b07fcc 100644 --- a/tqtinterface/qt4/tools/designer/designer/layout.h +++ b/tqtinterface/qt4/tools/designer/designer/layout.h @@ -132,7 +132,7 @@ class Spacer : public TQWidget Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) TQ_ENUMS( SizeType ) Q_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType ) - Q_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) + Q_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true ) TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false ) private: @@ -150,7 +150,7 @@ public: Spacer( TQWidget *tqparent, const char *name ); TQSize tqminimumSize() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; void setSizeType( SizeType t ); SizeType sizeType() const; int tqalignment() const; diff --git a/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui b/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui index 714d7da..78e06c5 100644 --- a/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -310,7 +310,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/listeditor.ui b/tqtinterface/qt4/tools/designer/designer/listeditor.ui index baa6b0c..f1e3d2a 100644 --- a/tqtinterface/qt4/tools/designer/designer/listeditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/listeditor.ui @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui b/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui index 75b912e..049d7c7 100644 --- a/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -604,7 +604,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -649,7 +649,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp b/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp index 5a78cce..def15eb 100644 --- a/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp +++ b/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp @@ -115,7 +115,7 @@ #include <tqsettings.h> #include <tqaccel.h> #include <tqtooltip.h> -#include <sizegrip.h> +#include <tqsizegrip.h> #include <tqtextview.h> #include <tqassistantclient.h> #include <stdlib.h> @@ -2216,8 +2216,8 @@ void MainWindow::writeConfig() l << w->className; l << w->includeFile; l << TQString::number( (int)w->includePolicy ); - l << TQString::number( w->sizeHint.width() ); - l << TQString::number( w->sizeHint.height() ); + l << TQString::number( w->tqsizeHint.width() ); + l << TQString::number( w->tqsizeHint.height() ); l << TQString::number( w->lstSignals.count() ); for ( TQValueList<TQCString>::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it ) l << TQString( fixArgs( *it ) ); @@ -2356,8 +2356,8 @@ void MainWindow::readConfig() w->className = l[ 0 ]; w->includeFile = l[ 1 ]; w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt(); - w->sizeHint.setWidth( l[ 3 ].toInt() ); - w->sizeHint.setHeight( l[ 4 ].toInt() ); + w->tqsizeHint.setWidth( l[ 3 ].toInt() ); + w->tqsizeHint.setHeight( l[ 4 ].toInt() ); uint c = 5; if ( l.count() > c ) { int numSignals = l[ c ].toInt(); diff --git a/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp b/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp index 5993636..1bfc825 100644 --- a/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp +++ b/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp @@ -507,7 +507,7 @@ void MenuBarEditor::deleteItem( int index ) } } -TQSize MenuBarEditor::sizeHint() const +TQSize MenuBarEditor::tqsizeHint() const { return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) ); } @@ -581,7 +581,7 @@ bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e ) lineEdit->hide(); update(); } else if ( e->type() == TQEvent::LayoutHint ) { - resize( sizeHint() ); + resize( tqsizeHint() ); } return TQMenuBar::eventFilter( o, e ); } diff --git a/tqtinterface/qt4/tools/designer/designer/menubareditor.h b/tqtinterface/qt4/tools/designer/designer/menubareditor.h index c6e63f1..913f0a8 100644 --- a/tqtinterface/qt4/tools/designer/designer/menubareditor.h +++ b/tqtinterface/qt4/tools/designer/designer/menubareditor.h @@ -127,9 +127,9 @@ public: void focusItem( int index = -1 ); void deleteItem( int index = -1 ); - TQSize sizeHint() const; - TQSize tqminimumSize() const { return sizeHint(); } - TQSize tqminimumSizeHint() const { return sizeHint(); } + TQSize tqsizeHint() const; + TQSize tqminimumSize() const { return tqsizeHint(); } + TQSize tqminimumSizeHint() const { return tqsizeHint(); } int heightForWidth( int max_width ) const; void show(); diff --git a/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp b/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp index 5bb9b30..501e6cc 100644 --- a/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp +++ b/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp @@ -1278,7 +1278,7 @@ MetaDataBase::CustomWidget::CustomWidget() className = "MyCustomWidget"; includeFile = "mywidget.h"; includePolicy = Local; - sizeHint = TQSize( -1, -1 ); + tqsizeHint = TQSize( -1, -1 ); pixmap = new TQPixmap( TQPixmap::fromMimeSource( "designer_customwidget.png" ) ); id = -1; sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); @@ -1290,7 +1290,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w ) className = w.className; includeFile = w.includeFile; includePolicy = w.includePolicy; - sizeHint = w.sizeHint; + tqsizeHint = w.tqsizeHint; if ( w.pixmap ) pixmap = new TQPixmap( *w.pixmap ); else @@ -1341,7 +1341,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW className = w.className; includeFile = w.includeFile; includePolicy = w.includePolicy; - sizeHint = w.sizeHint; + tqsizeHint = w.tqsizeHint; if ( w.pixmap ) pixmap = new TQPixmap( *w.pixmap ); else diff --git a/tqtinterface/qt4/tools/designer/designer/metadatabase.h b/tqtinterface/qt4/tools/designer/designer/metadatabase.h index 4f12bac..08e01f5 100644 --- a/tqtinterface/qt4/tools/designer/designer/metadatabase.h +++ b/tqtinterface/qt4/tools/designer/designer/metadatabase.h @@ -39,7 +39,7 @@ #include <tqstringlist.h> #include <tqmap.h> #include <tqptrlist.h> -#include <sizepolicy.h> +#include <tqsizepolicy.h> #include <tqsize.h> #include <tqwidgetlist.h> #include <tqcursor.h> @@ -109,7 +109,7 @@ public: TQString className; TQString includeFile; IncludePolicy includePolicy; - TQSize sizeHint; + TQSize tqsizeHint; TQSizePolicy sizePolicy; TQPixmap *pixmap; TQValueList<TQCString> lstSignals; diff --git a/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui b/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui index 9e7aa1d..87d4603 100644 --- a/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui @@ -131,7 +131,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/newform.ui b/tqtinterface/qt4/tools/designer/designer/newform.ui index 4b33a96..ea28f3c 100644 --- a/tqtinterface/qt4/tools/designer/designer/newform.ui +++ b/tqtinterface/qt4/tools/designer/designer/newform.ui @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui b/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui index 41cfd9e..36dbd59 100644 --- a/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui @@ -215,7 +215,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -350,7 +350,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui b/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui index 5cdf667..c869d97 100644 --- a/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui +++ b/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -480,7 +480,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -572,7 +572,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui b/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui index 1f2195c..59c50b9 100644 --- a/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui b/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui index b46b689..c456633 100644 --- a/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui +++ b/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui @@ -824,7 +824,7 @@ <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> @@ -875,7 +875,7 @@ <enum>Expanding</enum> </property> <property> - <name>sizeHint</name> + <name>tqsizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/preferences.ui b/tqtinterface/qt4/tools/designer/designer/preferences.ui index 81cf37b..51f17b3 100644 --- a/tqtinterface/qt4/tools/designer/designer/preferences.ui +++ b/tqtinterface/qt4/tools/designer/designer/preferences.ui @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -541,7 +541,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/previewwidget.ui b/tqtinterface/qt4/tools/designer/designer/previewwidget.ui index 5ad8ed0..6ecba7b 100644 --- a/tqtinterface/qt4/tools/designer/designer/previewwidget.ui +++ b/tqtinterface/qt4/tools/designer/designer/previewwidget.ui @@ -295,7 +295,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/projectsettings.ui b/tqtinterface/qt4/tools/designer/designer/projectsettings.ui index 7ca6718..284f554 100644 --- a/tqtinterface/qt4/tools/designer/designer/projectsettings.ui +++ b/tqtinterface/qt4/tools/designer/designer/projectsettings.ui @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>71</height> @@ -213,7 +213,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp index a425e06..c74d2a3 100644 --- a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp +++ b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp @@ -71,7 +71,7 @@ #include <tqcolordialog.h> #include <tqlabel.h> #include <tqlayout.h> -#include <sizepolicy.h> +#include <tqsizepolicy.h> #include <tqbitmap.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -411,7 +411,7 @@ void PropertyItem::createResetButton() resetButton = new TQPushButton( hbox ); setupStyle( resetButton ); resetButton->setPixmap( TQPixmap::fromMimeSource( "designer_resetproperty.png" ) ); - resetButton->setFixedWidth( resetButton->sizeHint().width() ); + resetButton->setFixedWidth( resetButton->tqsizeHint().width() ); hbox->tqlayout()->tqsetAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); @@ -453,7 +453,7 @@ void PropertyItem::placeEditor( TQWidget *w ) r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() ); w->resize( r.size() ); listview->moveChild( w, r.x(), r.y() ); - resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() ); + resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() ); listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() ); resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) ); } diff --git a/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp b/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp index 130fe9c..6c19964 100644 --- a/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp +++ b/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp @@ -33,7 +33,7 @@ #include "qcompletionedit.h" #include <tqlistbox.h> -#include <sizegrip.h> +#include <tqsizegrip.h> #include <tqapplication.h> #include <tqvbox.h> @@ -95,8 +95,8 @@ void TQCompletionEdit::placeListBox() return; } - popup->resize( TQMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ), - listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 ); + popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ), + listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 ); TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) ); if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() ) diff --git a/tqtinterface/qt4/tools/designer/designer/replacedialog.ui b/tqtinterface/qt4/tools/designer/designer/replacedialog.ui index 68404e6..a2a33af 100644 --- a/tqtinterface/qt4/tools/designer/designer/replacedialog.ui +++ b/tqtinterface/qt4/tools/designer/designer/replacedialog.ui @@ -151,7 +151,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/resource.cpp b/tqtinterface/qt4/tools/designer/designer/resource.cpp index 2978c10..053c155 100644 --- a/tqtinterface/qt4/tools/designer/designer/resource.cpp +++ b/tqtinterface/qt4/tools/designer/designer/resource.cpp @@ -629,7 +629,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject ) formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize(). expandedTo( formwindow->tqminimumSizeHint() ) ) ); else - formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) ); + formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) ); } return TRUE; @@ -1424,8 +1424,8 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( ::tqqt_cast<Spacer*>(w) ) { - if ( !changed.tqcontains( "sizeHint" ) ) - changed << "sizeHint"; + if ( !changed.tqcontains( "tqsizeHint" ) ) + changed << "tqsizeHint"; if ( !changed.tqcontains( "geometry" ) ) changed << "geometry"; } else { @@ -2630,8 +2630,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) << "\">" << w->includeFile << "</header>" << endl; ts << makeIndent( indent ) << "<sizehint>" << endl; indent++; - ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; - ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl; + ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl; + ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl; indent--; ts << makeIndent( indent ) << "</sizehint>" << endl; ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl; @@ -2687,9 +2687,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r ) TQDomElement n3 = n2.firstChild().toElement(); while ( !n3.isNull() ) { if ( n3.tagName() == "width" ) - w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() ); + w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "height" ) - w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() ); + w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() ); n3 = n3.nextSibling().toElement(); } } else if ( n2.tagName() == "sizepolicy" ) { diff --git a/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui b/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui index b0edaeb..bfa704b 100644 --- a/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui +++ b/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui @@ -116,7 +116,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -234,7 +234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp b/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp index 76743d6..f0c6ef3 100644 --- a/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp +++ b/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp @@ -64,28 +64,28 @@ void SizeHandle::updateCursor() switch ( dir ) { case LeftTop: - setCursor( sizeFDiagCursor ); + setCursor( tqsizeFDiagCursor ); break; case Top: - setCursor( sizeVerCursor ); + setCursor( tqsizeVerCursor ); break; case RightTop: - setCursor( sizeBDiagCursor ); + setCursor( tqsizeBDiagCursor ); break; case Right: - setCursor( sizeHorCursor ); + setCursor( tqsizeHorCursor ); break; case RightBottom: - setCursor( sizeFDiagCursor ); + setCursor( tqsizeFDiagCursor ); break; case Bottom: - setCursor( sizeVerCursor ); + setCursor( tqsizeVerCursor ); break; case LeftBottom: - setCursor( sizeBDiagCursor ); + setCursor( tqsizeBDiagCursor ); break; case Left: - setCursor( sizeHorCursor ); + setCursor( tqsizeHorCursor ); break; } } diff --git a/tqtinterface/qt4/tools/designer/designer/startdialog.ui b/tqtinterface/qt4/tools/designer/designer/startdialog.ui index 5c8b9df..531e7ac 100644 --- a/tqtinterface/qt4/tools/designer/designer/startdialog.ui +++ b/tqtinterface/qt4/tools/designer/designer/startdialog.ui @@ -223,7 +223,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp b/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp index 90e672c..c2419c3 100644 --- a/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp +++ b/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp @@ -124,7 +124,7 @@ void StyledButton::setScale( bool on ) scalePixmap(); } -TQSize StyledButton::sizeHint() const +TQSize StyledButton::tqsizeHint() const { return TQSize( 50, 25 ); } diff --git a/tqtinterface/qt4/tools/designer/designer/styledbutton.h b/tqtinterface/qt4/tools/designer/designer/styledbutton.h index f624aad..68a4adc 100644 --- a/tqtinterface/qt4/tools/designer/designer/styledbutton.h +++ b/tqtinterface/qt4/tools/designer/designer/styledbutton.h @@ -72,7 +72,7 @@ public: void setScale( bool ); bool scale() const; - TQSize sizeHint() const; + TQSize tqsizeHint() const; TQSize tqminimumSizeHint() const; void setFormWindow( FormWindow *fw ) { formWindow = fw; } diff --git a/tqtinterface/qt4/tools/designer/designer/tableeditor.ui b/tqtinterface/qt4/tools/designer/designer/tableeditor.ui index 9d60116..fea785a 100644 --- a/tqtinterface/qt4/tools/designer/designer/tableeditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/tableeditor.ui @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -447,7 +447,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -503,7 +503,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/variabledialog.ui b/tqtinterface/qt4/tools/designer/designer/variabledialog.ui index 644c15c..6ea81ff 100644 --- a/tqtinterface/qt4/tools/designer/designer/variabledialog.ui +++ b/tqtinterface/qt4/tools/designer/designer/variabledialog.ui @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>21</height> @@ -221,7 +221,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>0</width> <height>21</height> diff --git a/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp b/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp index ab1fbc6..84ccb85 100644 --- a/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp +++ b/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp @@ -94,7 +94,7 @@ #include <tqapplication.h> #include <tqsplitter.h> #include <tqtoolbox.h> -#include <sizegrip.h> +#include <tqsizegrip.h> #ifndef TQT_NO_SQL #include "database.h" #endif @@ -1621,7 +1621,7 @@ bool TQLayoutWidget::event( TQEvent *e ) void TQLayoutWidget::updateSizePolicy() { if ( childrenListObject().isEmpty() || childrenListObject().count() == 0 ) { - sp = TQWidget::sizePolicy(); + sp = TQWidget::tqsizePolicy(); return; } @@ -1666,13 +1666,13 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( !w->sizePolicy().mayGrowHorizontally() ) + if ( !w->tqsizePolicy().mayGrowHorizontally() ) ht &= ~TQSizePolicy::Minimum; - if ( !w->sizePolicy().mayShrinkHorizontally() ) + if ( !w->tqsizePolicy().mayShrinkHorizontally() ) ht &= ~TQSizePolicy::Maximum; - if ( w->sizePolicy().mayGrowVertically() ) + if ( w->tqsizePolicy().mayGrowVertically() ) vt |= TQSizePolicy::Minimum; - if ( w->sizePolicy().mayShrinkVertically() ) + if ( w->tqsizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } } else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) { @@ -1687,13 +1687,13 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( w->sizePolicy().mayGrowHorizontally() ) + if ( w->tqsizePolicy().mayGrowHorizontally() ) ht |= TQSizePolicy::Minimum; - if ( w->sizePolicy().mayShrinkHorizontally() ) + if ( w->tqsizePolicy().mayShrinkHorizontally() ) ht |= TQSizePolicy::Maximum; - if ( !w->sizePolicy().mayGrowVertically() ) + if ( !w->tqsizePolicy().mayGrowVertically() ) vt &= ~TQSizePolicy::Minimum; - if ( !w->sizePolicy().mayShrinkVertically() ) + if ( !w->tqsizePolicy().mayShrinkVertically() ) vt &= ~TQSizePolicy::Maximum; } } else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) { @@ -1712,13 +1712,13 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( w->sizePolicy().mayGrowHorizontally() ) + if ( w->tqsizePolicy().mayGrowHorizontally() ) ht |= TQSizePolicy::Minimum; - if ( w->sizePolicy().mayShrinkHorizontally() ) + if ( w->tqsizePolicy().mayShrinkHorizontally() ) ht |= TQSizePolicy::Maximum; - if ( w->sizePolicy().mayGrowVertically() ) + if ( w->tqsizePolicy().mayGrowVertically() ) vt |= TQSizePolicy::Minimum; - if ( w->sizePolicy().mayShrinkVertically() ) + if ( w->tqsizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } } diff --git a/tqtinterface/qt4/tools/designer/designer/widgetfactory.h b/tqtinterface/qt4/tools/designer/designer/widgetfactory.h index dbd8d3c..77c0574 100644 --- a/tqtinterface/qt4/tools/designer/designer/widgetfactory.h +++ b/tqtinterface/qt4/tools/designer/designer/widgetfactory.h @@ -249,7 +249,7 @@ class TQLayoutWidget : public TQWidget TQ_OBJECT public: - TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( TQWidget::sizePolicy() ) {} + TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( TQWidget::tqsizePolicy() ) {} TQSizePolicy sizePolicy() const; void updateSizePolicy(); @@ -276,11 +276,11 @@ public: setBackgroundMode( TQt::PaletteDark ); } - TQSize sizeHint() const { - TQSize sh = cusw->sizeHint; + TQSize tqsizeHint() const { + TQSize sh = cusw->tqsizeHint; if ( sh.isValid() ) return sh; - return TQWidget::sizeHint(); + return TQWidget::tqsizeHint(); } TQString realClassName() { return cusw->className; } diff --git a/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui b/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui index 9c758c8..6a2a14a 100644 --- a/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui @@ -140,7 +140,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> |