diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-17 18:20:57 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-07-17 18:20:57 -0500 |
| commit | afe922f3d9f62716f4e559fb1e374c04afd3db63 (patch) | |
| tree | 9a671bad1056ab07f627f5e8fa774da7002e7b15 /tqtinterface/qt4/tools/designer | |
| parent | 656b2d3e1c0a8d10f19300480f6e797a65381d1e (diff) | |
| download | experimental-afe922f3d9f62716f4e559fb1e374c04afd3db63.tar.gz experimental-afe922f3d9f62716f4e559fb1e374c04afd3db63.zip | |
Rename tqsize* to size*
Diffstat (limited to 'tqtinterface/qt4/tools/designer')
76 files changed, 209 insertions, 209 deletions
diff --git a/tqtinterface/qt4/tools/designer/designer/about.ui b/tqtinterface/qt4/tools/designer/designer/about.ui index db2e11b..0f9126a 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -198,7 +198,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 d52fad4..509e743 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::tqsizeHint() const +TQSize TQDesignerToolBarSeparator::sizeHint() 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 adde1b4..6aeb7f4 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 tqsizeHint() const; + TQSize sizeHint() 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 ce3f105..4ce7983 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="tqsizeHint"> + <property name="sizeHint"> <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 e3911bd..9b9eedc 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>342</width> <height>0</height> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>111</width> <height>0</height> @@ -222,7 +222,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 8497775..b16c791 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="tqsizeHint"> + <property name="sizeHint"> <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 322fabc..4ad9259 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>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> @@ -210,7 +210,7 @@ <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</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 f5d5a01..2044d3a 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -534,7 +534,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -607,7 +607,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -821,7 +821,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -907,7 +907,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 91531c3..c5d9d94 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->tqsizeHint.width() ); - spinHeight->setValue( w->tqsizeHint.height() ); + spinWidth->setValue( w->sizeHint.width() ); + spinHeight->setValue( w->sizeHint.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->tqsizeHint.setHeight( h ); + w->sizeHint.setHeight( h ); updateCustomWidgetSizes(); } @@ -357,7 +357,7 @@ void CustomWidgetEditor::widthChanged( int wid ) if ( !i || !w ) return; - w->tqsizeHint.setWidth( wid ); + w->sizeHint.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->tqsizeHint.width() << "</width>" << endl; - ts << makeIndent2( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl; + ts << makeIndent2( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; + ts << makeIndent2( indent ) << "<height>" << w->sizeHint.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 9e12f4e..bb16593 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 1bf7426..a1ff91b 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -183,7 +183,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -244,7 +244,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -263,7 +263,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/designer/defs.h b/tqtinterface/qt4/tools/designer/designer/defs.h index b6560d1..fb06317 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 <tqsizepolicy.h> +#include <sizepolicy.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 5d95587..5250f54 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -361,7 +361,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -525,7 +525,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -573,7 +573,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 1c0f39f..44b4435 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="tqsizeHint"> + <property name="sizeHint"> <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 0b102e9..e19d0ca 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 <tqsizegrip.h> +#include <sizegrip.h> #include <tqpushbutton.h> #include <tqwhatsthis.h> #include <tqmetaobject.h> @@ -414,8 +414,8 @@ void FormWindow::insertWidget() r.setHeight( 20 ); } } else { - r.setWidth( w->tqsizeHint().width() ); - r.setHeight( w->tqsizeHint().height() ); + r.setWidth( w->sizeHint().width() ); + r.setHeight( w->sizeHint().height() ); } } diff --git a/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui b/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui index 329ca8f..50700e9 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 325678d..8c9119e 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -316,7 +316,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 acb6766..e8266c3 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)tqsizePolicy().verData(); - return (SizeType)tqsizePolicy().horData(); + return (SizeType)sizePolicy().verData(); + return (SizeType)sizePolicy().horData(); } int Spacer::tqalignment() const @@ -972,7 +972,7 @@ TQSize Spacer::tqminimumSize() const return s; } -TQSize Spacer::tqsizeHint() const +TQSize Spacer::sizeHint() const { return sh; } @@ -982,7 +982,7 @@ void Spacer::setSizeHint( const TQSize &s ) { sh = s; if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout ) - resize( tqsizeHint() ); + resize( sizeHint() ); updateGeometry(); } diff --git a/tqtinterface/qt4/tools/designer/designer/layout.h b/tqtinterface/qt4/tools/designer/designer/layout.h index 3b07fcc..1b6821d 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 tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true ) + Q_PROPERTY( TQSize sizeHint READ sizeHint 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 tqsizeHint() const; + TQSize sizeHint() 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 78e06c5..714d7da 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -310,7 +310,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 f1e3d2a..baa6b0c 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="tqsizeHint"> + <property name="sizeHint"> <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 049d7c7..75b912e 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -604,7 +604,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -649,7 +649,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 def15eb..5a78cce 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 <tqsizegrip.h> +#include <sizegrip.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->tqsizeHint.width() ); - l << TQString::number( w->tqsizeHint.height() ); + l << TQString::number( w->sizeHint.width() ); + l << TQString::number( w->sizeHint.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->tqsizeHint.setWidth( l[ 3 ].toInt() ); - w->tqsizeHint.setHeight( l[ 4 ].toInt() ); + w->sizeHint.setWidth( l[ 3 ].toInt() ); + w->sizeHint.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 1bfc825..5993636 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::tqsizeHint() const +TQSize MenuBarEditor::sizeHint() 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( tqsizeHint() ); + resize( sizeHint() ); } return TQMenuBar::eventFilter( o, e ); } diff --git a/tqtinterface/qt4/tools/designer/designer/menubareditor.h b/tqtinterface/qt4/tools/designer/designer/menubareditor.h index 913f0a8..c6e63f1 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 tqsizeHint() const; - TQSize tqminimumSize() const { return tqsizeHint(); } - TQSize tqminimumSizeHint() const { return tqsizeHint(); } + TQSize sizeHint() const; + TQSize tqminimumSize() const { return sizeHint(); } + TQSize tqminimumSizeHint() const { return sizeHint(); } 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 501e6cc..5bb9b30 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; - tqsizeHint = TQSize( -1, -1 ); + sizeHint = 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; - tqsizeHint = w.tqsizeHint; + sizeHint = w.sizeHint; 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; - tqsizeHint = w.tqsizeHint; + sizeHint = w.sizeHint; 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 08e01f5..4f12bac 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 <tqsizepolicy.h> +#include <sizepolicy.h> #include <tqsize.h> #include <tqwidgetlist.h> #include <tqcursor.h> @@ -109,7 +109,7 @@ public: TQString className; TQString includeFile; IncludePolicy includePolicy; - TQSize tqsizeHint; + TQSize sizeHint; 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 87d4603..9e7aa1d 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="tqsizeHint"> + <property name="sizeHint"> <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 ea28f3c..4b33a96 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 36dbd59..41cfd9e 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -350,7 +350,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 c869d97..5cdf667 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -480,7 +480,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -572,7 +572,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 59c50b9..1f2195c 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="tqsizeHint"> + <property name="sizeHint"> <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 c456633..b46b689 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>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> @@ -875,7 +875,7 @@ <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</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 51f17b3..81cf37b 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -541,7 +541,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 6ecba7b..5ad8ed0 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="tqsizeHint"> + <property name="sizeHint"> <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 284f554..7ca6718 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>71</height> @@ -213,7 +213,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 c74d2a3..a425e06 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 <tqsizepolicy.h> +#include <sizepolicy.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->tqsizeHint().width() ); + resetButton->setFixedWidth( resetButton->sizeHint().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->tqsizeHint().width() + 10, r.height() ); + resetButton->parentWidget()->resize( resetButton->sizeHint().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 6c19964..130fe9c 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 <tqsizegrip.h> +#include <sizegrip.h> #include <tqapplication.h> #include <tqvbox.h> @@ -95,8 +95,8 @@ void TQCompletionEdit::placeListBox() return; } - popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ), - listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 ); + popup->resize( TQMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ), + listbox->sizeHint().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 a2a33af..68404e6 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="tqsizeHint"> + <property name="sizeHint"> <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 053c155..2978c10 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->tqsizeHint() ) ); + formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) ); } 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( "tqsizeHint" ) ) - changed << "tqsizeHint"; + if ( !changed.tqcontains( "sizeHint" ) ) + changed << "sizeHint"; 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->tqsizeHint.width() << "</width>" << endl; - ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl; + ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; + ts << makeIndent( indent ) << "<height>" << w->sizeHint.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->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() ); + w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() ); else if ( n3.tagName() == "height" ) - w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() ); + w->sizeHint.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 bfa704b..b0edaeb 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -234,7 +234,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -279,7 +279,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 f0c6ef3..76743d6 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( tqsizeFDiagCursor ); + setCursor( sizeFDiagCursor ); break; case Top: - setCursor( tqsizeVerCursor ); + setCursor( sizeVerCursor ); break; case RightTop: - setCursor( tqsizeBDiagCursor ); + setCursor( sizeBDiagCursor ); break; case Right: - setCursor( tqsizeHorCursor ); + setCursor( sizeHorCursor ); break; case RightBottom: - setCursor( tqsizeFDiagCursor ); + setCursor( sizeFDiagCursor ); break; case Bottom: - setCursor( tqsizeVerCursor ); + setCursor( sizeVerCursor ); break; case LeftBottom: - setCursor( tqsizeBDiagCursor ); + setCursor( sizeBDiagCursor ); break; case Left: - setCursor( tqsizeHorCursor ); + setCursor( sizeHorCursor ); break; } } diff --git a/tqtinterface/qt4/tools/designer/designer/startdialog.ui b/tqtinterface/qt4/tools/designer/designer/startdialog.ui index 531e7ac..5c8b9df 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="tqsizeHint"> + <property name="sizeHint"> <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 c2419c3..90e672c 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::tqsizeHint() const +TQSize StyledButton::sizeHint() const { return TQSize( 50, 25 ); } diff --git a/tqtinterface/qt4/tools/designer/designer/styledbutton.h b/tqtinterface/qt4/tools/designer/designer/styledbutton.h index 68a4adc..f624aad 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 tqsizeHint() const; + TQSize sizeHint() 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 fea785a..9d60116 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -216,7 +216,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -447,7 +447,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -503,7 +503,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 6ea81ff..644c15c 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>21</height> @@ -221,7 +221,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <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 84ccb85..ab1fbc6 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 <tqsizegrip.h> +#include <sizegrip.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::tqsizePolicy(); + sp = TQWidget::sizePolicy(); return; } @@ -1666,13 +1666,13 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( !w->tqsizePolicy().mayGrowHorizontally() ) + if ( !w->sizePolicy().mayGrowHorizontally() ) ht &= ~TQSizePolicy::Minimum; - if ( !w->tqsizePolicy().mayShrinkHorizontally() ) + if ( !w->sizePolicy().mayShrinkHorizontally() ) ht &= ~TQSizePolicy::Maximum; - if ( w->tqsizePolicy().mayGrowVertically() ) + if ( w->sizePolicy().mayGrowVertically() ) vt |= TQSizePolicy::Minimum; - if ( w->tqsizePolicy().mayShrinkVertically() ) + if ( w->sizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } } else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) { @@ -1687,13 +1687,13 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( w->tqsizePolicy().mayGrowHorizontally() ) + if ( w->sizePolicy().mayGrowHorizontally() ) ht |= TQSizePolicy::Minimum; - if ( w->tqsizePolicy().mayShrinkHorizontally() ) + if ( w->sizePolicy().mayShrinkHorizontally() ) ht |= TQSizePolicy::Maximum; - if ( !w->tqsizePolicy().mayGrowVertically() ) + if ( !w->sizePolicy().mayGrowVertically() ) vt &= ~TQSizePolicy::Minimum; - if ( !w->tqsizePolicy().mayShrinkVertically() ) + if ( !w->sizePolicy().mayShrinkVertically() ) vt &= ~TQSizePolicy::Maximum; } } else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) { @@ -1712,13 +1712,13 @@ void TQLayoutWidget::updateSizePolicy() continue; TQWidget *w = (TQWidget*)o; - if ( w->tqsizePolicy().mayGrowHorizontally() ) + if ( w->sizePolicy().mayGrowHorizontally() ) ht |= TQSizePolicy::Minimum; - if ( w->tqsizePolicy().mayShrinkHorizontally() ) + if ( w->sizePolicy().mayShrinkHorizontally() ) ht |= TQSizePolicy::Maximum; - if ( w->tqsizePolicy().mayGrowVertically() ) + if ( w->sizePolicy().mayGrowVertically() ) vt |= TQSizePolicy::Minimum; - if ( w->tqsizePolicy().mayShrinkVertically() ) + if ( w->sizePolicy().mayShrinkVertically() ) vt |= TQSizePolicy::Maximum; } } diff --git a/tqtinterface/qt4/tools/designer/designer/widgetfactory.h b/tqtinterface/qt4/tools/designer/designer/widgetfactory.h index 77c0574..dbd8d3c 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::tqsizePolicy() ) {} + TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( TQWidget::sizePolicy() ) {} TQSizePolicy sizePolicy() const; void updateSizePolicy(); @@ -276,11 +276,11 @@ public: setBackgroundMode( TQt::PaletteDark ); } - TQSize tqsizeHint() const { - TQSize sh = cusw->tqsizeHint; + TQSize sizeHint() const { + TQSize sh = cusw->sizeHint; if ( sh.isValid() ) return sh; - return TQWidget::tqsizeHint(); + return TQWidget::sizeHint(); } TQString realClassName() { return cusw->className; } diff --git a/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui b/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui index 6a2a14a..9c758c8 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="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -208,7 +208,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/editor/completion.cpp b/tqtinterface/qt4/tools/designer/editor/completion.cpp index 1b42cb0..1ca2f89 100644 --- a/tqtinterface/qt4/tools/designer/editor/completion.cpp +++ b/tqtinterface/qt4/tools/designer/editor/completion.cpp @@ -41,7 +41,7 @@ #include <tqapplication.h> #include <tqregexp.h> #include "arghintwidget.h" -#include <tqsizegrip.h> +#include <sizegrip.h> #include <tqtimer.h> static TQColor getColor( const TQString &type ) @@ -299,7 +299,7 @@ bool EditorCompletion::doCompletion() (void)new CompletionItem( completionListBox, (*it).text, (*it).type, (*it).postfix, (*it).prefix, (*it).postfix2 ); cList = lst; - completionPopup->resize( completionListBox->tqsizeHint() + + completionPopup->resize( completionListBox->sizeHint() + TQSize( completionListBox->verticalScrollBar()->width() + 4, completionListBox->horizontalScrollBar()->height() + 4 ) ); completionListBox->setCurrentItem( 0 ); @@ -698,7 +698,7 @@ void EditorCompletion::showCompletion( const TQValueList<CompletionEntry> &lst ) (void)new CompletionItem( completionListBox, (*it).text, (*it).type, (*it).postfix, (*it).prefix, (*it).postfix2 ); cList = lst; - completionPopup->resize( completionListBox->tqsizeHint() + + completionPopup->resize( completionListBox->sizeHint() + TQSize( completionListBox->verticalScrollBar()->width() + 4, completionListBox->horizontalScrollBar()->height() + 4 ) ); completionListBox->setCurrentItem( 0 ); diff --git a/tqtinterface/qt4/tools/designer/editor/preferences.ui b/tqtinterface/qt4/tools/designer/editor/preferences.ui index 9b65ef2..739baee 100644 --- a/tqtinterface/qt4/tools/designer/editor/preferences.ui +++ b/tqtinterface/qt4/tools/designer/editor/preferences.ui @@ -270,7 +270,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/tqtinterface/qt4/tools/designer/examples/addressbook/addressdetails.ui b/tqtinterface/qt4/tools/designer/examples/addressbook/addressdetails.ui index 46963e6..cf4a28a 100644 --- a/tqtinterface/qt4/tools/designer/examples/addressbook/addressdetails.ui +++ b/tqtinterface/qt4/tools/designer/examples/addressbook/addressdetails.ui @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -173,7 +173,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/examples/addressbook/search.ui b/tqtinterface/qt4/tools/designer/examples/addressbook/search.ui index 4dd1386..047066b 100644 --- a/tqtinterface/qt4/tools/designer/examples/addressbook/search.ui +++ b/tqtinterface/qt4/tools/designer/examples/addressbook/search.ui @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui b/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui index 6a5a1f1..86cc17e 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui +++ b/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>11</height> diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui b/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui index 2863f02..fb205e6 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui +++ b/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui @@ -55,7 +55,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>9</height> diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/optionsform.ui b/tqtinterface/qt4/tools/designer/examples/colortool/optionsform.ui index 2e8a4c2..bb4682f 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/optionsform.ui +++ b/tqtinterface/qt4/tools/designer/examples/colortool/optionsform.ui @@ -101,7 +101,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>10</height> diff --git a/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.ui b/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.ui index 00aa9a0..b7bab2a 100644 --- a/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.ui +++ b/tqtinterface/qt4/tools/designer/examples/credit/creditformbase.ui @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -146,7 +146,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/examples/metric/metric.ui b/tqtinterface/qt4/tools/designer/examples/metric/metric.ui index 8ff4427..580f54f 100644 --- a/tqtinterface/qt4/tools/designer/examples/metric/metric.ui +++ b/tqtinterface/qt4/tools/designer/examples/metric/metric.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -224,7 +224,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -268,7 +268,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui b/tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui index 5e78a47..47cf042 100644 --- a/tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui +++ b/tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/mainfilesettings.ui b/tqtinterface/qt4/tools/designer/plugins/cppeditor/mainfilesettings.ui index 468525f..ea98fb6 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/mainfilesettings.ui +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/mainfilesettings.ui @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui index b6d8642..55b335e 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui @@ -80,7 +80,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -249,7 +249,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp index cb71661..770d3e9 100644 --- a/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp @@ -555,15 +555,15 @@ bool Dlg2Ui::isWidgetType( const TQDomElement& e ) void Dlg2Ui::emitSpacer( int spacing, int stretch ) { TQString orientationStr; - TQSize tqsizeHint; + TQSize sizeHint; TQString sizeType = TQString( "Fixed" ); if ( yyBoxKind == TQString("hbox") ) { orientationStr = TQString( "Horizontal" ); - tqsizeHint = TQSize( spacing, 20 ); + sizeHint = TQSize( spacing, 20 ); } else { orientationStr = TQString( "Vertical" ); - tqsizeHint = TQSize( 20, spacing ); + sizeHint = TQSize( 20, spacing ); } if ( stretch > 0 ) sizeType = TQString( "Expanding" ); @@ -573,7 +573,7 @@ void Dlg2Ui::emitSpacer( int spacing, int stretch ) TQString("Spacer%1").arg(uniqueSpacer++).latin1() ); emitProperty( TQString("orientation"), orientationStr, TQString("enum") ); if ( spacing > 0 ) - emitProperty( TQString("tqsizeHint"), tqsizeHint, TQString("qsize") ); + emitProperty( TQString("sizeHint"), sizeHint, TQString("qsize") ); emitProperty( TQString("sizeType"), sizeType, TQString("enum") ); emitClosing( TQString("spacer") ); } diff --git a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp index 4571cf5..4931878 100644 --- a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp @@ -43,7 +43,7 @@ #include <tqmessagebox.h> #include <tqrect.h> #include <tqregexp.h> -#include <tqsizepolicy.h> +#include <sizepolicy.h> #include <ctype.h> diff --git a/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui b/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui index 7e8dada..365d960 100644 --- a/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui +++ b/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui @@ -91,7 +91,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -166,7 +166,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -243,7 +243,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -344,7 +344,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -528,7 +528,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -545,7 +545,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -562,7 +562,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -625,7 +625,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -642,7 +642,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui index c08c829..6137629 100644 --- a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui +++ b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -253,7 +253,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -338,7 +338,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -665,7 +665,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -722,7 +722,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -930,7 +930,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -974,7 +974,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1074,7 +1074,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1125,7 +1125,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1176,7 +1176,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1282,7 +1282,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1365,7 +1365,7 @@ name like "qt%" <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1382,7 +1382,7 @@ name like "qt%" <property name="sizeType"> <enum>Maximum</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -1488,7 +1488,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1551,7 +1551,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1568,7 +1568,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -1585,7 +1585,7 @@ name like "qt%" <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/shared/domtool.cpp b/tqtinterface/qt4/tools/designer/shared/domtool.cpp index 0c50fbf..8175b2a 100644 --- a/tqtinterface/qt4/tools/designer/shared/domtool.cpp +++ b/tqtinterface/qt4/tools/designer/shared/domtool.cpp @@ -33,7 +33,7 @@ #include "domtool.h" -#include <tqsizepolicy.h> +#include <sizepolicy.h> #include <tqcolor.h> #include <tqcursor.h> #include <tqdatetime.h> diff --git a/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp b/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp index bf6335d..b49537e 100644 --- a/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp +++ b/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp @@ -44,7 +44,7 @@ #include <tqfont.h> #include <tqobject.h> #include <tqrect.h> -#include <tqsizepolicy.h> +#include <sizepolicy.h> /* The .uib file format is the binary counterpart of the .ui file diff --git a/tqtinterface/qt4/tools/designer/templates/Configuration_Dialog.ui b/tqtinterface/qt4/tools/designer/templates/Configuration_Dialog.ui index 9ae02fe..12a0b29 100644 --- a/tqtinterface/qt4/tools/designer/templates/Configuration_Dialog.ui +++ b/tqtinterface/qt4/tools/designer/templates/Configuration_Dialog.ui @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Bottom).ui b/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Bottom).ui index 24ecc7f..0d153bd 100644 --- a/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Bottom).ui +++ b/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Bottom).ui @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Right).ui b/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Right).ui index dd354f0..6874935 100644 --- a/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Right).ui +++ b/tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Right).ui @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/templates/Tab_Dialog.ui b/tqtinterface/qt4/tools/designer/templates/Tab_Dialog.ui index 64a2ed3..5ef82c0 100644 --- a/tqtinterface/qt4/tools/designer/templates/Tab_Dialog.ui +++ b/tqtinterface/qt4/tools/designer/templates/Tab_Dialog.ui @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp b/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp index 4a5b8ae..a0bc77c 100644 --- a/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp +++ b/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp @@ -97,8 +97,8 @@ static void createDescription( const TQValueList<Widget> &l, TQTextStream &ts ) ts << makeIndent( indent ) << "<header location=\"" << w.location << "\">" << w.include << "</header>" << endl; ts << makeIndent( indent ) << "<sizehint>" << endl; indent++; - ts << makeIndent( indent ) << "<width>" << w.w->tqsizeHint().width() << "</width>" << endl; - ts << makeIndent( indent ) << "<height>" << w.w->tqsizeHint().height() << "</height>" << endl; + ts << makeIndent( indent ) << "<width>" << w.w->sizeHint().width() << "</width>" << endl; + ts << makeIndent( indent ) << "<height>" << w.w->sizeHint().height() << "</height>" << endl; indent--; ts << makeIndent( indent ) << "</sizehint>" << endl; ts << makeIndent( indent ) << "<container>" << ( w.w->inherits( "TQGroupBox" ) || w.w->inherits( "TQWidgetStack" ) ) << "</container>" << endl; diff --git a/tqtinterface/qt4/tools/designer/uic/object.cpp b/tqtinterface/qt4/tools/designer/uic/object.cpp index 1ce89b8..a489e22 100644 --- a/tqtinterface/qt4/tools/designer/uic/object.cpp +++ b/tqtinterface/qt4/tools/designer/uic/object.cpp @@ -35,7 +35,7 @@ #include "parser.h" #include "domtool.h" #include <tqregexp.h> -#include <tqsizepolicy.h> +#include <sizepolicy.h> #include <tqstringlist.h> #define NO_STATIC_COLORS #include <globaldefs.h> diff --git a/tqtinterface/qt4/tools/designer/uic/uic.cpp b/tqtinterface/qt4/tools/designer/uic/uic.cpp index 5eed175..488813b 100644 --- a/tqtinterface/qt4/tools/designer/uic/uic.cpp +++ b/tqtinterface/qt4/tools/designer/uic/uic.cpp @@ -909,7 +909,7 @@ TQString Uic::createSpacerImpl( const TQDomElement &e, const TQString& /*parentC objClass = e.tagName(); objName = registerObject( getObjectName( e ) ); - TQSize size = DomTool::readProperty( e, "tqsizeHint", TQSize( 0, 0 ) ).toSize(); + TQSize size = DomTool::readProperty( e, "sizeHint", TQSize( 0, 0 ) ).toSize(); TQString sizeType = DomTool::readProperty( e, "sizeType", "Expanding" ).toString(); bool isVspacer = DomTool::readProperty( e, "orientation", "Horizontal" ) == "Vertical"; diff --git a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp index 57ea838..7b6168d 100644 --- a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp +++ b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp @@ -693,7 +693,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, if ( name == "orientation" ) { vertical = ( value == "Vertical" ); - } else if ( name == "tqsizeHint" ) { + } else if ( name == "sizeHint" ) { w = value.toSize().width(); h = value.toSize().height(); } else if ( name == "sizeType" ) { @@ -1949,7 +1949,7 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout ) orient = Qt::Vertical; } else if ( prop == "sizeType" ) { sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() ); - } else if ( prop == "tqsizeHint" ) { + } else if ( prop == "sizeHint" ) { w = n.firstChild().firstChild().firstChild().toText().data().toInt(); h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt(); } |