From afe922f3d9f62716f4e559fb1e374c04afd3db63 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 17 Jul 2011 18:20:57 -0500 Subject: Rename tqsize* to size* --- tqtinterface/qt4/tools/assistant/finddialog.ui | 2 +- tqtinterface/qt4/tools/assistant/helpdialog.ui | 6 ++-- tqtinterface/qt4/tools/assistant/settingsdialog.ui | 6 ++-- tqtinterface/qt4/tools/assistant/topicchooser.ui | 2 +- tqtinterface/qt4/tools/designer/designer/about.ui | 6 ++-- .../qt4/tools/designer/designer/actiondnd.cpp | 2 +- .../qt4/tools/designer/designer/actiondnd.h | 2 +- .../qt4/tools/designer/designer/actioneditor.ui | 2 +- .../tools/designer/designer/configtoolboxdialog.ui | 6 ++-- .../tools/designer/designer/connectiondialog.ui | 2 +- .../qt4/tools/designer/designer/createtemplate.ui | 4 +-- .../tools/designer/designer/customwidgeteditor.ui | 12 ++++---- .../designer/designer/customwidgeteditorimpl.cpp | 12 ++++---- .../tools/designer/designer/dbconnectioneditor.ui | 4 +-- .../qt4/tools/designer/designer/dbconnections.ui | 12 ++++---- tqtinterface/qt4/tools/designer/designer/defs.h | 2 +- .../qt4/tools/designer/designer/editfunctions.ui | 8 ++--- .../qt4/tools/designer/designer/finddialog.ui | 2 +- .../qt4/tools/designer/designer/formwindow.cpp | 6 ++-- .../qt4/tools/designer/designer/gotolinedialog.ui | 4 +-- .../qt4/tools/designer/designer/iconvieweditor.ui | 4 +-- .../qt4/tools/designer/designer/layout.cpp | 8 ++--- tqtinterface/qt4/tools/designer/designer/layout.h | 4 +-- .../qt4/tools/designer/designer/listboxeditor.ui | 4 +-- .../qt4/tools/designer/designer/listeditor.ui | 2 +- .../qt4/tools/designer/designer/listvieweditor.ui | 6 ++-- .../qt4/tools/designer/designer/mainwindow.cpp | 10 +++--- .../qt4/tools/designer/designer/menubareditor.cpp | 4 +-- .../qt4/tools/designer/designer/menubareditor.h | 6 ++-- .../qt4/tools/designer/designer/metadatabase.cpp | 6 ++-- .../qt4/tools/designer/designer/metadatabase.h | 4 +-- .../qt4/tools/designer/designer/multilineeditor.ui | 2 +- .../qt4/tools/designer/designer/newform.ui | 4 +-- .../qt4/tools/designer/designer/paletteeditor.ui | 4 +-- .../designer/designer/paletteeditoradvanced.ui | 6 ++-- .../designer/designer/pixmapcollectioneditor.ui | 2 +- .../qt4/tools/designer/designer/pixmapfunction.ui | 4 +-- .../qt4/tools/designer/designer/preferences.ui | 4 +-- .../qt4/tools/designer/designer/previewwidget.ui | 2 +- .../qt4/tools/designer/designer/projectsettings.ui | 4 +-- .../qt4/tools/designer/designer/propertyeditor.cpp | 6 ++-- .../tools/designer/designer/qcompletionedit.cpp | 6 ++-- .../qt4/tools/designer/designer/replacedialog.ui | 2 +- .../qt4/tools/designer/designer/resource.cpp | 14 ++++----- .../tools/designer/designer/richtextfontdialog.ui | 6 ++-- .../qt4/tools/designer/designer/sizehandle.cpp | 16 +++++----- .../qt4/tools/designer/designer/startdialog.ui | 2 +- .../qt4/tools/designer/designer/styledbutton.cpp | 2 +- .../qt4/tools/designer/designer/styledbutton.h | 2 +- .../qt4/tools/designer/designer/tableeditor.ui | 10 +++--- .../qt4/tools/designer/designer/variabledialog.ui | 4 +-- .../qt4/tools/designer/designer/widgetfactory.cpp | 28 ++++++++--------- .../qt4/tools/designer/designer/widgetfactory.h | 8 ++--- .../qt4/tools/designer/designer/wizardeditor.ui | 4 +-- .../qt4/tools/designer/editor/completion.cpp | 6 ++-- .../qt4/tools/designer/editor/preferences.ui | 2 +- .../examples/addressbook/addressdetails.ui | 4 +-- .../tools/designer/examples/addressbook/search.ui | 2 +- .../designer/examples/colortool/colornameform.ui | 4 +-- .../tools/designer/examples/colortool/findform.ui | 4 +-- .../designer/examples/colortool/optionsform.ui | 2 +- .../designer/examples/credit/creditformbase.ui | 6 ++-- .../qt4/tools/designer/examples/metric/metric.ui | 6 ++-- .../tools/designer/examples/multiclip/multiclip.ui | 2 +- .../designer/plugins/cppeditor/mainfilesettings.ui | 2 +- .../designer/plugins/cppeditor/projectsettings.ui | 4 +-- .../qt4/tools/designer/plugins/dlg/dlg2ui.cpp | 8 ++--- .../qt4/tools/designer/plugins/glade/glade2ui.cpp | 2 +- .../designer/plugins/wizards/mainwindowwizard.ui | 18 +++++------ .../designer/plugins/wizards/sqlformwizard.ui | 36 +++++++++++----------- tqtinterface/qt4/tools/designer/shared/domtool.cpp | 2 +- tqtinterface/qt4/tools/designer/shared/ui2uib.cpp | 2 +- .../designer/templates/Configuration_Dialog.ui | 2 +- .../templates/Dialog_with_Buttons_(Bottom).ui | 2 +- .../templates/Dialog_with_Buttons_(Right).ui | 2 +- .../qt4/tools/designer/templates/Tab_Dialog.ui | 2 +- .../qt4/tools/designer/tools/createcw/main.cpp | 4 +-- tqtinterface/qt4/tools/designer/uic/object.cpp | 2 +- tqtinterface/qt4/tools/designer/uic/uic.cpp | 2 +- .../qt4/tools/designer/uilib/tqwidgetfactory.cpp | 4 +-- tqtinterface/qt4/tools/linguist/linguist/about.ui | 6 ++-- .../qt4/tools/linguist/linguist/phraselv.cpp | 4 +-- .../qt4/tools/linguist/linguist/phraselv.h | 2 +- .../qt4/tools/linguist/linguist/statistics.ui | 4 +-- .../qt4/tools/linguist/linguist/statistics.ui.h | 2 +- tqtinterface/qt4/tools/qconfig/main.cpp | 4 +-- tqtinterface/qt4/tools/qtconfig/colorbutton.cpp | 2 +- tqtinterface/qt4/tools/qtconfig/colorbutton.h | 2 +- tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui | 8 ++--- .../tools/qtconfig/paletteeditoradvancedbase.ui | 6 ++-- .../qt4/tools/qtconfig/previewwidgetbase.ui | 2 +- tqtinterface/qt4/tools/qvfb/config.ui | 10 +++--- tqtinterface/qt4/tools/qvfb/qvfb.cpp | 2 +- tqtinterface/qt4/tools/qvfb/qvfbview.cpp | 2 +- tqtinterface/qt4/tools/qvfb/qvfbview.h | 2 +- 95 files changed, 246 insertions(+), 246 deletions(-) (limited to 'tqtinterface/qt4/tools') diff --git a/tqtinterface/qt4/tools/assistant/finddialog.ui b/tqtinterface/qt4/tools/assistant/finddialog.ui index 56fd582..b5df98a 100644 --- a/tqtinterface/qt4/tools/assistant/finddialog.ui +++ b/tqtinterface/qt4/tools/assistant/finddialog.ui @@ -165,7 +165,7 @@ Expanding - + 31 0 diff --git a/tqtinterface/qt4/tools/assistant/helpdialog.ui b/tqtinterface/qt4/tools/assistant/helpdialog.ui index 3f61572..2fdc116 100644 --- a/tqtinterface/qt4/tools/assistant/helpdialog.ui +++ b/tqtinterface/qt4/tools/assistant/helpdialog.ui @@ -217,7 +217,7 @@ Expanding - + 20 20 @@ -283,7 +283,7 @@ Fixed - + 20 20 @@ -363,7 +363,7 @@ Expanding - + 61 21 diff --git a/tqtinterface/qt4/tools/assistant/settingsdialog.ui b/tqtinterface/qt4/tools/assistant/settingsdialog.ui index f2ae9b2..5b12862 100644 --- a/tqtinterface/qt4/tools/assistant/settingsdialog.ui +++ b/tqtinterface/qt4/tools/assistant/settingsdialog.ui @@ -215,7 +215,7 @@ Expanding - + 20 30 @@ -352,7 +352,7 @@ Expanding - + 20 81 @@ -417,7 +417,7 @@ Expanding - + 0 20 diff --git a/tqtinterface/qt4/tools/assistant/topicchooser.ui b/tqtinterface/qt4/tools/assistant/topicchooser.ui index 364e23f..2780e9e 100644 --- a/tqtinterface/qt4/tools/assistant/topicchooser.ui +++ b/tqtinterface/qt4/tools/assistant/topicchooser.ui @@ -106,7 +106,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -167,7 +167,7 @@ Expanding - + 20 20 @@ -198,7 +198,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 @@ Expanding - + 342 0 @@ -126,7 +126,7 @@ Expanding - + 111 0 @@ -222,7 +222,7 @@ Expanding - + 41 0 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 @@ Expanding - + 20 20 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 @@ Expanding - tqsizeHint + sizeHint 20 20 @@ -210,7 +210,7 @@ Expanding - tqsizeHint + sizeHint 20 20 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 @@ Expanding - + 20 20 @@ -167,7 +167,7 @@ Expanding - + 20 20 @@ -534,7 +534,7 @@ Expanding - + 20 20 @@ -607,7 +607,7 @@ Expanding - + 20 20 @@ -821,7 +821,7 @@ Expanding - + 20 20 @@ -907,7 +907,7 @@ Expanding - + 20 20 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 << "" << endl; ts << makeIndent2( indent ) << "" << endl; indent++; - ts << makeIndent2( indent ) << "" << w->tqsizeHint.width() << "" << endl; - ts << makeIndent2( indent ) << "" << w->tqsizeHint.height() << "" << endl; + ts << makeIndent2( indent ) << "" << w->sizeHint.width() << "" << endl; + ts << makeIndent2( indent ) << "" << w->sizeHint.height() << "" << endl; indent--; ts << makeIndent2( indent ) << "" << endl; ts << makeIndent2( indent ) << "" << (int)w->isContainer << "" << 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 @@ Expanding - + 20 20 @@ -120,7 +120,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -149,7 +149,7 @@ Expanding - + 20 20 @@ -183,7 +183,7 @@ Expanding - + 20 20 @@ -216,7 +216,7 @@ Expanding - + 20 20 @@ -244,7 +244,7 @@ Expanding - + 20 20 @@ -263,7 +263,7 @@ Expanding - + 20 20 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 +#include #include #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 @@ Expanding - + 20 20 @@ -361,7 +361,7 @@ Fixed - + 20 16 @@ -525,7 +525,7 @@ Expanding - + 20 20 @@ -573,7 +573,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 #include #include -#include +#include #include #include #include @@ -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 @@ Expanding - + 20 20 @@ -146,7 +146,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -316,7 +316,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -310,7 +310,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -604,7 +604,7 @@ Expanding - + 20 20 @@ -649,7 +649,7 @@ Expanding - + 20 20 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 #include #include -#include +#include #include #include #include @@ -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::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 #include #include -#include +#include #include #include #include @@ -109,7 +109,7 @@ public: TQString className; TQString includeFile; IncludePolicy includePolicy; - TQSize tqsizeHint; + TQSize sizeHint; TQSizePolicy sizePolicy; TQPixmap *pixmap; TQValueList 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -184,7 +184,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -350,7 +350,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -480,7 +480,7 @@ Expanding - + 20 20 @@ -572,7 +572,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 @@ Expanding - tqsizeHint + sizeHint 20 20 @@ -875,7 +875,7 @@ Expanding - tqsizeHint + sizeHint 20 20 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 @@ Expanding - + 20 20 @@ -541,7 +541,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 @@ Expanding - + 21 71 @@ -213,7 +213,7 @@ Expanding - + 20 20 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 #include #include -#include +#include #include #include #include @@ -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 -#include +#include #include #include @@ -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 @@ Expanding - + 20 20 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(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 << "" << endl; ts << makeIndent( indent ) << "" << endl; indent++; - ts << makeIndent( indent ) << "" << w->tqsizeHint.width() << "" << endl; - ts << makeIndent( indent ) << "" << w->tqsizeHint.height() << "" << endl; + ts << makeIndent( indent ) << "" << w->sizeHint.width() << "" << endl; + ts << makeIndent( indent ) << "" << w->sizeHint.height() << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; ts << makeIndent( indent ) << "" << (int)w->isContainer << "" << 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 @@ Expanding - + 20 20 @@ -234,7 +234,7 @@ Expanding - + 20 16 @@ -279,7 +279,7 @@ Expanding - + 20 20 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 @@ Expanding - + 0 20 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 @@ Expanding - + 20 20 @@ -194,7 +194,7 @@ Expanding - + 20 20 @@ -216,7 +216,7 @@ Expanding - + 20 20 @@ -447,7 +447,7 @@ Expanding - + 20 20 @@ -503,7 +503,7 @@ Expanding - + 20 20 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 @@ Expanding - + 0 21 @@ -221,7 +221,7 @@ Expanding - + 0 21 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 #include #include -#include +#include #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(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(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 @@ Expanding - + 20 20 @@ -208,7 +208,7 @@ Expanding - + 20 20 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 #include #include "arghintwidget.h" -#include +#include #include 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 &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 @@ Expanding - + 20 0 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 @@ Expanding - + 20 20 @@ -173,7 +173,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 0 @@ -108,7 +108,7 @@ Expanding - + 0 11 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 @@ Expanding - + 20 0 @@ -80,7 +80,7 @@ Expanding - + 0 9 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 @@ Expanding - + 0 10 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 @@ Expanding - + 20 20 @@ -146,7 +146,7 @@ Expanding - + 20 20 @@ -171,7 +171,7 @@ Expanding - + 20 20 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 @@ Expanding - + 0 20 @@ -224,7 +224,7 @@ Expanding - + 20 0 @@ -268,7 +268,7 @@ Expanding - + 0 20 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -249,7 +249,7 @@ Expanding - + 20 20 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 #include #include -#include +#include #include 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 @@ Expanding - + 20 20 @@ -166,7 +166,7 @@ Expanding - + 20 20 @@ -243,7 +243,7 @@ Expanding - + 20 20 @@ -344,7 +344,7 @@ Expanding - + 20 20 @@ -528,7 +528,7 @@ Expanding - + 20 20 @@ -545,7 +545,7 @@ Expanding - + 20 20 @@ -562,7 +562,7 @@ Expanding - + 20 20 @@ -625,7 +625,7 @@ Expanding - + 20 20 @@ -642,7 +642,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -253,7 +253,7 @@ Expanding - + 20 20 @@ -304,7 +304,7 @@ Expanding - + 20 20 @@ -338,7 +338,7 @@ Expanding - + 20 20 @@ -665,7 +665,7 @@ Expanding - + 20 20 @@ -722,7 +722,7 @@ Expanding - + 20 20 @@ -930,7 +930,7 @@ Expanding - + 20 20 @@ -974,7 +974,7 @@ Expanding - + 20 20 @@ -1074,7 +1074,7 @@ name like "qt%" Expanding - + 20 20 @@ -1125,7 +1125,7 @@ name like "qt%" Expanding - + 20 20 @@ -1176,7 +1176,7 @@ name like "qt%" Expanding - + 20 20 @@ -1282,7 +1282,7 @@ name like "qt%" Expanding - + 20 20 @@ -1365,7 +1365,7 @@ name like "qt%" Maximum - + 20 20 @@ -1382,7 +1382,7 @@ name like "qt%" Maximum - + 16 20 @@ -1488,7 +1488,7 @@ name like "qt%" Expanding - + 20 20 @@ -1551,7 +1551,7 @@ name like "qt%" Expanding - + 20 20 @@ -1568,7 +1568,7 @@ name like "qt%" Expanding - + 20 20 @@ -1585,7 +1585,7 @@ name like "qt%" Expanding - + 20 20 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 +#include #include #include #include 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 #include #include -#include +#include /* 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 &l, TQTextStream &ts ) ts << makeIndent( indent ) << "
" << w.include << "
" << endl; ts << makeIndent( indent ) << "" << endl; indent++; - ts << makeIndent( indent ) << "" << w.w->tqsizeHint().width() << "" << endl; - ts << makeIndent( indent ) << "" << w.w->tqsizeHint().height() << "" << endl; + ts << makeIndent( indent ) << "" << w.w->sizeHint().width() << "" << endl; + ts << makeIndent( indent ) << "" << w.w->sizeHint().height() << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; ts << makeIndent( indent ) << "" << ( w.w->inherits( "TQGroupBox" ) || w.w->inherits( "TQWidgetStack" ) ) << "" << 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 -#include +#include #include #define NO_STATIC_COLORS #include 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(); } diff --git a/tqtinterface/qt4/tools/linguist/linguist/about.ui b/tqtinterface/qt4/tools/linguist/linguist/about.ui index 4d57398..875b854 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/about.ui +++ b/tqtinterface/qt4/tools/linguist/linguist/about.ui @@ -133,7 +133,7 @@ Expanding - + 20 20 @@ -164,7 +164,7 @@ Expanding - + 20 20 @@ -195,7 +195,7 @@ Expanding - + 20 20 diff --git a/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp b/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp index 15177c0..b0907ea 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp @@ -165,7 +165,7 @@ PhraseLV::~PhraseLV() // delete what; } -TQSize PhraseLV::tqsizeHint() const +TQSize PhraseLV::sizeHint() const { - return TQSize( TQListView::tqsizeHint().width(), 50 ); + return TQSize( TQListView::sizeHint().width(), 50 ); } diff --git a/tqtinterface/qt4/tools/linguist/linguist/phraselv.h b/tqtinterface/qt4/tools/linguist/linguist/phraselv.h index e6fedd6..0317b53 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/phraselv.h +++ b/tqtinterface/qt4/tools/linguist/linguist/phraselv.h @@ -74,7 +74,7 @@ public: PhraseLV( TQWidget *tqparent, const char *name ); ~PhraseLV(); - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; private: TQWhatsThis *what; diff --git a/tqtinterface/qt4/tools/linguist/linguist/statistics.ui b/tqtinterface/qt4/tools/linguist/linguist/statistics.ui index 1d304d7..59c7570 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/statistics.ui +++ b/tqtinterface/qt4/tools/linguist/linguist/statistics.ui @@ -69,7 +69,7 @@ Expanding - + 40 20 @@ -94,7 +94,7 @@ Expanding - + 40 20 diff --git a/tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h b/tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h index 0207d0a..8860273 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h +++ b/tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h @@ -33,7 +33,7 @@ void Statistics::init() { - setFixedHeight( tqsizeHint().height() ); + setFixedHeight( sizeHint().height() ); } void Statistics::updateStats( int w1, int c1, int cs1, int w2, int c2, int cs2 ) diff --git a/tqtinterface/qt4/tools/qconfig/main.cpp b/tqtinterface/qt4/tools/qconfig/main.cpp index 22b6a8b..57eaa31 100644 --- a/tqtinterface/qt4/tools/qconfig/main.cpp +++ b/tqtinterface/qt4/tools/qconfig/main.cpp @@ -533,7 +533,7 @@ void Main::loadFeatures(const TQString& filename) } #ifdef FIXED_LAYOUT - lv->setFixedWidth(lv->tqsizeHint().width()); + lv->setFixedWidth(lv->sizeHint().width()); #endif } @@ -727,7 +727,7 @@ int main(int argc, char** argv) } m.loadFeatures(qfeatures); m.loadConfig(qconfig); - m.resize(m.tqsizeHint()+TQSize(500,300)); + m.resize(m.sizeHint()+TQSize(500,300)); app.setMainWidget(&m); m.show(); return app.exec(); diff --git a/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp b/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp index 4dd152f..a5f0271 100644 --- a/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp +++ b/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp @@ -76,7 +76,7 @@ void ColorButton::changeColor() } -TQSize ColorButton::tqsizeHint() const +TQSize ColorButton::sizeHint() const { return TQSize(40, 25); } diff --git a/tqtinterface/qt4/tools/qtconfig/colorbutton.h b/tqtinterface/qt4/tools/qtconfig/colorbutton.h index 451c6df..c052ff8 100644 --- a/tqtinterface/qt4/tools/qtconfig/colorbutton.h +++ b/tqtinterface/qt4/tools/qtconfig/colorbutton.h @@ -49,7 +49,7 @@ public: const TQColor &color() const { return col; } void setColor(const TQColor &); - TQSize tqsizeHint() const; + TQSize sizeHint() const; TQSize tqminimumSizeHint() const; void mousePressEvent(TQMouseEvent *); diff --git a/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui b/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui index fb56464..5b8d004 100644 --- a/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui +++ b/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui @@ -227,7 +227,7 @@ Expanding - + 70 20 @@ -1039,7 +1039,7 @@ Expanding - + 20 40 @@ -1157,7 +1157,7 @@ Minimum - + 20 20 @@ -1321,7 +1321,7 @@ Minimum - + 20 20 diff --git a/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui b/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui index 8daf961..7f108ea 100644 --- a/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui +++ b/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui @@ -273,7 +273,7 @@ Expanding - + 20 20 @@ -437,7 +437,7 @@ Expanding - + 20 20 @@ -515,7 +515,7 @@ Expanding - + 20 20 diff --git a/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui b/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui index a01b57c..5860223 100644 --- a/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui +++ b/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui @@ -295,7 +295,7 @@ Expanding - + 20 20 diff --git a/tqtinterface/qt4/tools/qvfb/config.ui b/tqtinterface/qt4/tools/qvfb/config.ui index f7a8b6c..22245a0 100644 --- a/tqtinterface/qt4/tools/qvfb/config.ui +++ b/tqtinterface/qt4/tools/qvfb/config.ui @@ -191,7 +191,7 @@ Expanding - + 20 20 @@ -540,7 +540,7 @@ Expanding - + 20 20 @@ -1397,7 +1397,7 @@ Expanding - + 20 20 @@ -1414,7 +1414,7 @@ Expanding - + 20 20 @@ -1444,7 +1444,7 @@ Expanding - + 20 20 diff --git a/tqtinterface/qt4/tools/qvfb/qvfb.cpp b/tqtinterface/qt4/tools/qvfb/qvfb.cpp index 8fb4cb1..1e01c51 100644 --- a/tqtinterface/qt4/tools/qvfb/qvfb.cpp +++ b/tqtinterface/qt4/tools/qvfb/qvfb.cpp @@ -114,7 +114,7 @@ void TQVFb::init( int display_id, int w, int h, int d, const TQString &skin_name view->setMargin( 0 ); view->setFrameStyle( TQFrame::NoFrame ); setCentralWidget( view ); - resize( tqsizeHint() ); + resize( sizeHint() ); view->show(); } diff --git a/tqtinterface/qt4/tools/qvfb/qvfbview.cpp b/tqtinterface/qt4/tools/qvfb/qvfbview.cpp index f7d0669..163c41d 100644 --- a/tqtinterface/qt4/tools/qvfb/qvfbview.cpp +++ b/tqtinterface/qt4/tools/qvfb/qvfbview.cpp @@ -165,7 +165,7 @@ TQVFbView::~TQVFbView() unlink( keyboardPipe ); } -TQSize TQVFbView::tqsizeHint() const +TQSize TQVFbView::sizeHint() const { int f = 2 * frameWidth(); return TQSize( contentsWidth() + f, contentsHeight() + f ); diff --git a/tqtinterface/qt4/tools/qvfb/qvfbview.h b/tqtinterface/qt4/tools/qvfb/qvfbview.h index df5adcc..af85f54 100644 --- a/tqtinterface/qt4/tools/qvfb/qvfbview.h +++ b/tqtinterface/qt4/tools/qvfb/qvfbview.h @@ -67,7 +67,7 @@ public: double zoom() const { return zm; } - TQSize tqsizeHint() const; + TQSize sizeHint() const; public Q_SLOTS: void setTouchscreenEmulation( bool ); -- cgit v1.2.3