summaryrefslogtreecommitdiffstats
path: root/tqtinterface/qt4/tools
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-17 19:19:26 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-07-17 19:19:26 -0500
commit33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd (patch)
tree4939d6567b50d0dd669257422a6868aa1259e62b /tqtinterface/qt4/tools
parentf01eee0362e54f47d0266295c5263790c04b6510 (diff)
downloadexperimental-33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd.tar.gz
experimental-33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd.zip
Revert "Rename tqsize* to size*"
This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da.
Diffstat (limited to 'tqtinterface/qt4/tools')
-rw-r--r--tqtinterface/qt4/tools/assistant/finddialog.ui2
-rw-r--r--tqtinterface/qt4/tools/assistant/helpdialog.ui6
-rw-r--r--tqtinterface/qt4/tools/assistant/settingsdialog.ui6
-rw-r--r--tqtinterface/qt4/tools/assistant/topicchooser.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/about.ui6
-rw-r--r--tqtinterface/qt4/tools/designer/designer/actiondnd.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/actiondnd.h2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/actioneditor.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui6
-rw-r--r--tqtinterface/qt4/tools/designer/designer/connectiondialog.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/createtemplate.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui12
-rw-r--r--tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp12
-rw-r--r--tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/dbconnections.ui12
-rw-r--r--tqtinterface/qt4/tools/designer/designer/defs.h2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/editfunctions.ui8
-rw-r--r--tqtinterface/qt4/tools/designer/designer/finddialog.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/formwindow.cpp6
-rw-r--r--tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/layout.cpp8
-rw-r--r--tqtinterface/qt4/tools/designer/designer/layout.h4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/listboxeditor.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/listeditor.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/listvieweditor.ui6
-rw-r--r--tqtinterface/qt4/tools/designer/designer/mainwindow.cpp10
-rw-r--r--tqtinterface/qt4/tools/designer/designer/menubareditor.cpp4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/menubareditor.h6
-rw-r--r--tqtinterface/qt4/tools/designer/designer/metadatabase.cpp6
-rw-r--r--tqtinterface/qt4/tools/designer/designer/metadatabase.h4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/multilineeditor.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/newform.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/paletteeditor.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui6
-rw-r--r--tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/preferences.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/previewwidget.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/projectsettings.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp6
-rw-r--r--tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp6
-rw-r--r--tqtinterface/qt4/tools/designer/designer/replacedialog.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/resource.cpp14
-rw-r--r--tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui6
-rw-r--r--tqtinterface/qt4/tools/designer/designer/sizehandle.cpp16
-rw-r--r--tqtinterface/qt4/tools/designer/designer/startdialog.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/styledbutton.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/styledbutton.h2
-rw-r--r--tqtinterface/qt4/tools/designer/designer/tableeditor.ui10
-rw-r--r--tqtinterface/qt4/tools/designer/designer/variabledialog.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp28
-rw-r--r--tqtinterface/qt4/tools/designer/designer/widgetfactory.h8
-rw-r--r--tqtinterface/qt4/tools/designer/designer/wizardeditor.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/editor/completion.cpp6
-rw-r--r--tqtinterface/qt4/tools/designer/editor/preferences.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/examples/addressbook/addressdetails.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/examples/addressbook/search.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/examples/colortool/findform.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/examples/colortool/optionsform.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/examples/credit/creditformbase.ui6
-rw-r--r--tqtinterface/qt4/tools/designer/examples/metric/metric.ui6
-rw-r--r--tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/plugins/cppeditor/mainfilesettings.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui4
-rw-r--r--tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp8
-rw-r--r--tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui18
-rw-r--r--tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui36
-rw-r--r--tqtinterface/qt4/tools/designer/shared/domtool.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/shared/ui2uib.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/templates/Configuration_Dialog.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Bottom).ui2
-rw-r--r--tqtinterface/qt4/tools/designer/templates/Dialog_with_Buttons_(Right).ui2
-rw-r--r--tqtinterface/qt4/tools/designer/templates/Tab_Dialog.ui2
-rw-r--r--tqtinterface/qt4/tools/designer/tools/createcw/main.cpp4
-rw-r--r--tqtinterface/qt4/tools/designer/uic/object.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/uic/uic.cpp2
-rw-r--r--tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp4
-rw-r--r--tqtinterface/qt4/tools/linguist/linguist/about.ui6
-rw-r--r--tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp4
-rw-r--r--tqtinterface/qt4/tools/linguist/linguist/phraselv.h2
-rw-r--r--tqtinterface/qt4/tools/linguist/linguist/statistics.ui4
-rw-r--r--tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h2
-rw-r--r--tqtinterface/qt4/tools/qconfig/main.cpp4
-rw-r--r--tqtinterface/qt4/tools/qtconfig/colorbutton.cpp2
-rw-r--r--tqtinterface/qt4/tools/qtconfig/colorbutton.h2
-rw-r--r--tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui8
-rw-r--r--tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui6
-rw-r--r--tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui2
-rw-r--r--tqtinterface/qt4/tools/qvfb/config.ui10
-rw-r--r--tqtinterface/qt4/tools/qvfb/qvfb.cpp2
-rw-r--r--tqtinterface/qt4/tools/qvfb/qvfbview.cpp2
-rw-r--r--tqtinterface/qt4/tools/qvfb/qvfbview.h2
95 files changed, 246 insertions, 246 deletions
diff --git a/tqtinterface/qt4/tools/assistant/finddialog.ui b/tqtinterface/qt4/tools/assistant/finddialog.ui
index b5df98a..56fd582 100644
--- a/tqtinterface/qt4/tools/assistant/finddialog.ui
+++ b/tqtinterface/qt4/tools/assistant/finddialog.ui
@@ -165,7 +165,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>31</width>
<height>0</height>
diff --git a/tqtinterface/qt4/tools/assistant/helpdialog.ui b/tqtinterface/qt4/tools/assistant/helpdialog.ui
index 2fdc116..3f61572 100644
--- a/tqtinterface/qt4/tools/assistant/helpdialog.ui
+++ b/tqtinterface/qt4/tools/assistant/helpdialog.ui
@@ -217,7 +217,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -283,7 +283,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -363,7 +363,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>61</width>
<height>21</height>
diff --git a/tqtinterface/qt4/tools/assistant/settingsdialog.ui b/tqtinterface/qt4/tools/assistant/settingsdialog.ui
index 5b12862..f2ae9b2 100644
--- a/tqtinterface/qt4/tools/assistant/settingsdialog.ui
+++ b/tqtinterface/qt4/tools/assistant/settingsdialog.ui
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>30</height>
@@ -352,7 +352,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>81</height>
@@ -417,7 +417,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/assistant/topicchooser.ui b/tqtinterface/qt4/tools/assistant/topicchooser.ui
index 2780e9e..364e23f 100644
--- a/tqtinterface/qt4/tools/assistant/topicchooser.ui
+++ b/tqtinterface/qt4/tools/assistant/topicchooser.ui
@@ -106,7 +106,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/about.ui b/tqtinterface/qt4/tools/designer/designer/about.ui
index 0f9126a..db2e11b 100644
--- a/tqtinterface/qt4/tools/designer/designer/about.ui
+++ b/tqtinterface/qt4/tools/designer/designer/about.ui
@@ -136,7 +136,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -167,7 +167,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -198,7 +198,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp b/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp
index 509e743..d52fad4 100644
--- a/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp
@@ -170,7 +170,7 @@ void TQDesignerToolBarSeparator::styleChange( TQStyle& )
setOrientation( orient );
}
-TQSize TQDesignerToolBarSeparator::sizeHint() const
+TQSize TQDesignerToolBarSeparator::tqsizeHint() const
{
int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
this );
diff --git a/tqtinterface/qt4/tools/designer/designer/actiondnd.h b/tqtinterface/qt4/tools/designer/designer/actiondnd.h
index 6aeb7f4..adde1b4 100644
--- a/tqtinterface/qt4/tools/designer/designer/actiondnd.h
+++ b/tqtinterface/qt4/tools/designer/designer/actiondnd.h
@@ -154,7 +154,7 @@ class TQDesignerToolBarSeparator : public TQWidget
public:
TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 );
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
Qt::Orientation orientation() const { return orient; }
public Q_SLOTS:
void setOrientation( Qt::Orientation );
diff --git a/tqtinterface/qt4/tools/designer/designer/actioneditor.ui b/tqtinterface/qt4/tools/designer/designer/actioneditor.ui
index 4ce7983..ce3f105 100644
--- a/tqtinterface/qt4/tools/designer/designer/actioneditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/actioneditor.ui
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui b/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui
index 9b9eedc..e3911bd 100644
--- a/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui
+++ b/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui
@@ -69,7 +69,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>342</width>
<height>0</height>
@@ -126,7 +126,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>111</width>
<height>0</height>
@@ -222,7 +222,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>41</width>
<height>0</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui b/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui
index b16c791..8497775 100644
--- a/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui
+++ b/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/createtemplate.ui b/tqtinterface/qt4/tools/designer/designer/createtemplate.ui
index 4ad9259..322fabc 100644
--- a/tqtinterface/qt4/tools/designer/designer/createtemplate.ui
+++ b/tqtinterface/qt4/tools/designer/designer/createtemplate.ui
@@ -138,7 +138,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>sizeHint</name>
+ <name>tqsizeHint</name>
<size>
<width>20</width>
<height>20</height>
@@ -210,7 +210,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>sizeHint</name>
+ <name>tqsizeHint</name>
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui b/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui
index 2044d3a..f5d5a01 100644
--- a/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui
@@ -134,7 +134,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -167,7 +167,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -534,7 +534,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -607,7 +607,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -821,7 +821,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -907,7 +907,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp
index c5d9d94..91531c3 100644
--- a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp
@@ -202,8 +202,8 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i )
previewPixmap->setPixmap( *w->pixmap );
else
previewPixmap->setText( "" );
- spinWidth->setValue( w->sizeHint.width() );
- spinHeight->setValue( w->sizeHint.height() );
+ spinWidth->setValue( w->tqsizeHint.width() );
+ spinHeight->setValue( w->tqsizeHint.height() );
sizeHor->setCurrentItem( size_type_to_int( w->sizePolicy.horData() ) );
sizeVer->setCurrentItem( size_type_to_int( w->sizePolicy.verData() ) );
checkContainer->setChecked( w->isContainer );
@@ -313,7 +313,7 @@ void CustomWidgetEditor::heightChanged( int h )
if ( !i || !w )
return;
- w->sizeHint.setHeight( h );
+ w->tqsizeHint.setHeight( h );
updateCustomWidgetSizes();
}
@@ -357,7 +357,7 @@ void CustomWidgetEditor::widthChanged( int wid )
if ( !i || !w )
return;
- w->sizeHint.setWidth( wid );
+ w->tqsizeHint.setWidth( wid );
updateCustomWidgetSizes();
}
@@ -713,8 +713,8 @@ void CustomWidgetEditor::saveDescription()
<< "\">" << w->includeFile << "</header>" << endl;
ts << makeIndent2( indent ) << "<sizehint>" << endl;
indent++;
- ts << makeIndent2( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
- ts << makeIndent2( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
+ ts << makeIndent2( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
+ ts << makeIndent2( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
indent--;
ts << makeIndent2( indent ) << "</sizehint>" << endl;
ts << makeIndent2( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
diff --git a/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui b/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui
index bb16593..9e12f4e 100644
--- a/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/dbconnectioneditor.ui
@@ -86,7 +86,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -120,7 +120,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/dbconnections.ui b/tqtinterface/qt4/tools/designer/designer/dbconnections.ui
index a1ff91b..1bf7426 100644
--- a/tqtinterface/qt4/tools/designer/designer/dbconnections.ui
+++ b/tqtinterface/qt4/tools/designer/designer/dbconnections.ui
@@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -149,7 +149,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -183,7 +183,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -216,7 +216,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -244,7 +244,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -263,7 +263,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/defs.h b/tqtinterface/qt4/tools/designer/designer/defs.h
index fb06317..b6560d1 100644
--- a/tqtinterface/qt4/tools/designer/designer/defs.h
+++ b/tqtinterface/qt4/tools/designer/designer/defs.h
@@ -34,7 +34,7 @@
#ifndef DEFS_H
#define DEFS_H
-#include <sizepolicy.h>
+#include <tqsizepolicy.h>
#include <tqstring.h>
#define POINTER_TOOL 32000
diff --git a/tqtinterface/qt4/tools/designer/designer/editfunctions.ui b/tqtinterface/qt4/tools/designer/designer/editfunctions.ui
index 5250f54..5d95587 100644
--- a/tqtinterface/qt4/tools/designer/designer/editfunctions.ui
+++ b/tqtinterface/qt4/tools/designer/designer/editfunctions.ui
@@ -196,7 +196,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -361,7 +361,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -525,7 +525,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -573,7 +573,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/finddialog.ui b/tqtinterface/qt4/tools/designer/designer/finddialog.ui
index 44b4435..1c0f39f 100644
--- a/tqtinterface/qt4/tools/designer/designer/finddialog.ui
+++ b/tqtinterface/qt4/tools/designer/designer/finddialog.ui
@@ -124,7 +124,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/formwindow.cpp b/tqtinterface/qt4/tools/designer/designer/formwindow.cpp
index e19d0ca..0b102e9 100644
--- a/tqtinterface/qt4/tools/designer/designer/formwindow.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/formwindow.cpp
@@ -65,7 +65,7 @@
#include <tqpalette.h>
#include <tqmessagebox.h>
#include <tqpopupmenu.h>
-#include <sizegrip.h>
+#include <tqsizegrip.h>
#include <tqpushbutton.h>
#include <tqwhatsthis.h>
#include <tqmetaobject.h>
@@ -414,8 +414,8 @@ void FormWindow::insertWidget()
r.setHeight( 20 );
}
} else {
- r.setWidth( w->sizeHint().width() );
- r.setHeight( w->sizeHint().height() );
+ r.setWidth( w->tqsizeHint().width() );
+ r.setHeight( w->tqsizeHint().height() );
}
}
diff --git a/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui b/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui
index 50700e9..329ca8f 100644
--- a/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui
+++ b/tqtinterface/qt4/tools/designer/designer/gotolinedialog.ui
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -146,7 +146,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui b/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui
index 8c9119e..325678d 100644
--- a/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/iconvieweditor.ui
@@ -137,7 +137,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -316,7 +316,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/layout.cpp b/tqtinterface/qt4/tools/designer/designer/layout.cpp
index e8266c3..acb6766 100644
--- a/tqtinterface/qt4/tools/designer/designer/layout.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/layout.cpp
@@ -950,8 +950,8 @@ void Spacer::setSizeType( SizeType t )
Spacer::SizeType Spacer::sizeType() const
{
if ( orient == Qt::Vertical )
- return (SizeType)sizePolicy().verData();
- return (SizeType)sizePolicy().horData();
+ return (SizeType)tqsizePolicy().verData();
+ return (SizeType)tqsizePolicy().horData();
}
int Spacer::tqalignment() const
@@ -972,7 +972,7 @@ TQSize Spacer::tqminimumSize() const
return s;
}
-TQSize Spacer::sizeHint() const
+TQSize Spacer::tqsizeHint() const
{
return sh;
}
@@ -982,7 +982,7 @@ void Spacer::setSizeHint( const TQSize &s )
{
sh = s;
if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
- resize( sizeHint() );
+ resize( tqsizeHint() );
updateGeometry();
}
diff --git a/tqtinterface/qt4/tools/designer/designer/layout.h b/tqtinterface/qt4/tools/designer/designer/layout.h
index 1b6821d..3b07fcc 100644
--- a/tqtinterface/qt4/tools/designer/designer/layout.h
+++ b/tqtinterface/qt4/tools/designer/designer/layout.h
@@ -132,7 +132,7 @@ class Spacer : public TQWidget
Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
TQ_ENUMS( SizeType )
Q_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
- Q_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
+ Q_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true )
TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false )
private:
@@ -150,7 +150,7 @@ public:
Spacer( TQWidget *tqparent, const char *name );
TQSize tqminimumSize() const;
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
void setSizeType( SizeType t );
SizeType sizeType() const;
int tqalignment() const;
diff --git a/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui b/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui
index 714d7da..78e06c5 100644
--- a/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/listboxeditor.ui
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -310,7 +310,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/listeditor.ui b/tqtinterface/qt4/tools/designer/designer/listeditor.ui
index baa6b0c..f1e3d2a 100644
--- a/tqtinterface/qt4/tools/designer/designer/listeditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/listeditor.ui
@@ -121,7 +121,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui b/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui
index 75b912e..049d7c7 100644
--- a/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/listvieweditor.ui
@@ -299,7 +299,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -604,7 +604,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -649,7 +649,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp b/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp
index 5a78cce..def15eb 100644
--- a/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp
@@ -115,7 +115,7 @@
#include <tqsettings.h>
#include <tqaccel.h>
#include <tqtooltip.h>
-#include <sizegrip.h>
+#include <tqsizegrip.h>
#include <tqtextview.h>
#include <tqassistantclient.h>
#include <stdlib.h>
@@ -2216,8 +2216,8 @@ void MainWindow::writeConfig()
l << w->className;
l << w->includeFile;
l << TQString::number( (int)w->includePolicy );
- l << TQString::number( w->sizeHint.width() );
- l << TQString::number( w->sizeHint.height() );
+ l << TQString::number( w->tqsizeHint.width() );
+ l << TQString::number( w->tqsizeHint.height() );
l << TQString::number( w->lstSignals.count() );
for ( TQValueList<TQCString>::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it )
l << TQString( fixArgs( *it ) );
@@ -2356,8 +2356,8 @@ void MainWindow::readConfig()
w->className = l[ 0 ];
w->includeFile = l[ 1 ];
w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt();
- w->sizeHint.setWidth( l[ 3 ].toInt() );
- w->sizeHint.setHeight( l[ 4 ].toInt() );
+ w->tqsizeHint.setWidth( l[ 3 ].toInt() );
+ w->tqsizeHint.setHeight( l[ 4 ].toInt() );
uint c = 5;
if ( l.count() > c ) {
int numSignals = l[ c ].toInt();
diff --git a/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp b/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp
index 5993636..1bfc825 100644
--- a/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp
@@ -507,7 +507,7 @@ void MenuBarEditor::deleteItem( int index )
}
}
-TQSize MenuBarEditor::sizeHint() const
+TQSize MenuBarEditor::tqsizeHint() const
{
return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) );
}
@@ -581,7 +581,7 @@ bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e )
lineEdit->hide();
update();
} else if ( e->type() == TQEvent::LayoutHint ) {
- resize( sizeHint() );
+ resize( tqsizeHint() );
}
return TQMenuBar::eventFilter( o, e );
}
diff --git a/tqtinterface/qt4/tools/designer/designer/menubareditor.h b/tqtinterface/qt4/tools/designer/designer/menubareditor.h
index c6e63f1..913f0a8 100644
--- a/tqtinterface/qt4/tools/designer/designer/menubareditor.h
+++ b/tqtinterface/qt4/tools/designer/designer/menubareditor.h
@@ -127,9 +127,9 @@ public:
void focusItem( int index = -1 );
void deleteItem( int index = -1 );
- TQSize sizeHint() const;
- TQSize tqminimumSize() const { return sizeHint(); }
- TQSize tqminimumSizeHint() const { return sizeHint(); }
+ TQSize tqsizeHint() const;
+ TQSize tqminimumSize() const { return tqsizeHint(); }
+ TQSize tqminimumSizeHint() const { return tqsizeHint(); }
int heightForWidth( int max_width ) const;
void show();
diff --git a/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp b/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp
index 5bb9b30..501e6cc 100644
--- a/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp
@@ -1278,7 +1278,7 @@ MetaDataBase::CustomWidget::CustomWidget()
className = "MyCustomWidget";
includeFile = "mywidget.h";
includePolicy = Local;
- sizeHint = TQSize( -1, -1 );
+ tqsizeHint = TQSize( -1, -1 );
pixmap = new TQPixmap( TQPixmap::fromMimeSource( "designer_customwidget.png" ) );
id = -1;
sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
@@ -1290,7 +1290,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
className = w.className;
includeFile = w.includeFile;
includePolicy = w.includePolicy;
- sizeHint = w.sizeHint;
+ tqsizeHint = w.tqsizeHint;
if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap );
else
@@ -1341,7 +1341,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
className = w.className;
includeFile = w.includeFile;
includePolicy = w.includePolicy;
- sizeHint = w.sizeHint;
+ tqsizeHint = w.tqsizeHint;
if ( w.pixmap )
pixmap = new TQPixmap( *w.pixmap );
else
diff --git a/tqtinterface/qt4/tools/designer/designer/metadatabase.h b/tqtinterface/qt4/tools/designer/designer/metadatabase.h
index 4f12bac..08e01f5 100644
--- a/tqtinterface/qt4/tools/designer/designer/metadatabase.h
+++ b/tqtinterface/qt4/tools/designer/designer/metadatabase.h
@@ -39,7 +39,7 @@
#include <tqstringlist.h>
#include <tqmap.h>
#include <tqptrlist.h>
-#include <sizepolicy.h>
+#include <tqsizepolicy.h>
#include <tqsize.h>
#include <tqwidgetlist.h>
#include <tqcursor.h>
@@ -109,7 +109,7 @@ public:
TQString className;
TQString includeFile;
IncludePolicy includePolicy;
- TQSize sizeHint;
+ TQSize tqsizeHint;
TQSizePolicy sizePolicy;
TQPixmap *pixmap;
TQValueList<TQCString> lstSignals;
diff --git a/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui b/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui
index 9e7aa1d..87d4603 100644
--- a/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/multilineeditor.ui
@@ -131,7 +131,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/newform.ui b/tqtinterface/qt4/tools/designer/designer/newform.ui
index 4b33a96..ea28f3c 100644
--- a/tqtinterface/qt4/tools/designer/designer/newform.ui
+++ b/tqtinterface/qt4/tools/designer/designer/newform.ui
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -184,7 +184,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui b/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui
index 41cfd9e..36dbd59 100644
--- a/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/paletteeditor.ui
@@ -215,7 +215,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -350,7 +350,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui b/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui
index 5cdf667..c869d97 100644
--- a/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui
+++ b/tqtinterface/qt4/tools/designer/designer/paletteeditoradvanced.ui
@@ -273,7 +273,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -480,7 +480,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -572,7 +572,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui b/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui
index 1f2195c..59c50b9 100644
--- a/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui b/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui
index b46b689..c456633 100644
--- a/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui
+++ b/tqtinterface/qt4/tools/designer/designer/pixmapfunction.ui
@@ -824,7 +824,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>sizeHint</name>
+ <name>tqsizeHint</name>
<size>
<width>20</width>
<height>20</height>
@@ -875,7 +875,7 @@
<enum>Expanding</enum>
</property>
<property>
- <name>sizeHint</name>
+ <name>tqsizeHint</name>
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/preferences.ui b/tqtinterface/qt4/tools/designer/designer/preferences.ui
index 81cf37b..51f17b3 100644
--- a/tqtinterface/qt4/tools/designer/designer/preferences.ui
+++ b/tqtinterface/qt4/tools/designer/designer/preferences.ui
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -541,7 +541,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/previewwidget.ui b/tqtinterface/qt4/tools/designer/designer/previewwidget.ui
index 5ad8ed0..6ecba7b 100644
--- a/tqtinterface/qt4/tools/designer/designer/previewwidget.ui
+++ b/tqtinterface/qt4/tools/designer/designer/previewwidget.ui
@@ -295,7 +295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/projectsettings.ui b/tqtinterface/qt4/tools/designer/designer/projectsettings.ui
index 7ca6718..284f554 100644
--- a/tqtinterface/qt4/tools/designer/designer/projectsettings.ui
+++ b/tqtinterface/qt4/tools/designer/designer/projectsettings.ui
@@ -168,7 +168,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>21</width>
<height>71</height>
@@ -213,7 +213,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp
index a425e06..c74d2a3 100644
--- a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp
@@ -71,7 +71,7 @@
#include <tqcolordialog.h>
#include <tqlabel.h>
#include <tqlayout.h>
-#include <sizepolicy.h>
+#include <tqsizepolicy.h>
#include <tqbitmap.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -411,7 +411,7 @@ void PropertyItem::createResetButton()
resetButton = new TQPushButton( hbox );
setupStyle( resetButton );
resetButton->setPixmap( TQPixmap::fromMimeSource( "designer_resetproperty.png" ) );
- resetButton->setFixedWidth( resetButton->sizeHint().width() );
+ resetButton->setFixedWidth( resetButton->tqsizeHint().width() );
hbox->tqlayout()->tqsetAlignment( TQt::AlignRight );
listview->addChild( hbox );
hbox->hide();
@@ -453,7 +453,7 @@ void PropertyItem::placeEditor( TQWidget *w )
r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() );
w->resize( r.size() );
listview->moveChild( w, r.x(), r.y() );
- resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() );
+ resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) );
}
diff --git a/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp b/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp
index 130fe9c..6c19964 100644
--- a/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp
@@ -33,7 +33,7 @@
#include "qcompletionedit.h"
#include <tqlistbox.h>
-#include <sizegrip.h>
+#include <tqsizegrip.h>
#include <tqapplication.h>
#include <tqvbox.h>
@@ -95,8 +95,8 @@ void TQCompletionEdit::placeListBox()
return;
}
- popup->resize( TQMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
- listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
+ popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
+ listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) );
if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() )
diff --git a/tqtinterface/qt4/tools/designer/designer/replacedialog.ui b/tqtinterface/qt4/tools/designer/designer/replacedialog.ui
index 68404e6..a2a33af 100644
--- a/tqtinterface/qt4/tools/designer/designer/replacedialog.ui
+++ b/tqtinterface/qt4/tools/designer/designer/replacedialog.ui
@@ -151,7 +151,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/resource.cpp b/tqtinterface/qt4/tools/designer/designer/resource.cpp
index 2978c10..053c155 100644
--- a/tqtinterface/qt4/tools/designer/designer/resource.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/resource.cpp
@@ -629,7 +629,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize().
expandedTo( formwindow->tqminimumSizeHint() ) ) );
else
- formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) );
+ formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) );
}
return TRUE;
@@ -1424,8 +1424,8 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t
changed = MetaDataBase::changedProperties( w );
if ( w->isWidgetType() ) {
if ( ::tqqt_cast<Spacer*>(w) ) {
- if ( !changed.tqcontains( "sizeHint" ) )
- changed << "sizeHint";
+ if ( !changed.tqcontains( "tqsizeHint" ) )
+ changed << "tqsizeHint";
if ( !changed.tqcontains( "geometry" ) )
changed << "geometry";
} else {
@@ -2630,8 +2630,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent )
<< "\">" << w->includeFile << "</header>" << endl;
ts << makeIndent( indent ) << "<sizehint>" << endl;
indent++;
- ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
- ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
+ ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
+ ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
indent--;
ts << makeIndent( indent ) << "</sizehint>" << endl;
ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@@ -2687,9 +2687,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r )
TQDomElement n3 = n2.firstChild().toElement();
while ( !n3.isNull() ) {
if ( n3.tagName() == "width" )
- w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() );
+ w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() );
else if ( n3.tagName() == "height" )
- w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() );
+ w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() );
n3 = n3.nextSibling().toElement();
}
} else if ( n2.tagName() == "sizepolicy" ) {
diff --git a/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui b/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui
index b0edaeb..bfa704b 100644
--- a/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui
+++ b/tqtinterface/qt4/tools/designer/designer/richtextfontdialog.ui
@@ -116,7 +116,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -234,7 +234,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
@@ -279,7 +279,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp b/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp
index 76743d6..f0c6ef3 100644
--- a/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/sizehandle.cpp
@@ -64,28 +64,28 @@ void SizeHandle::updateCursor()
switch ( dir ) {
case LeftTop:
- setCursor( sizeFDiagCursor );
+ setCursor( tqsizeFDiagCursor );
break;
case Top:
- setCursor( sizeVerCursor );
+ setCursor( tqsizeVerCursor );
break;
case RightTop:
- setCursor( sizeBDiagCursor );
+ setCursor( tqsizeBDiagCursor );
break;
case Right:
- setCursor( sizeHorCursor );
+ setCursor( tqsizeHorCursor );
break;
case RightBottom:
- setCursor( sizeFDiagCursor );
+ setCursor( tqsizeFDiagCursor );
break;
case Bottom:
- setCursor( sizeVerCursor );
+ setCursor( tqsizeVerCursor );
break;
case LeftBottom:
- setCursor( sizeBDiagCursor );
+ setCursor( tqsizeBDiagCursor );
break;
case Left:
- setCursor( sizeHorCursor );
+ setCursor( tqsizeHorCursor );
break;
}
}
diff --git a/tqtinterface/qt4/tools/designer/designer/startdialog.ui b/tqtinterface/qt4/tools/designer/designer/startdialog.ui
index 5c8b9df..531e7ac 100644
--- a/tqtinterface/qt4/tools/designer/designer/startdialog.ui
+++ b/tqtinterface/qt4/tools/designer/designer/startdialog.ui
@@ -223,7 +223,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp b/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp
index 90e672c..c2419c3 100644
--- a/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/styledbutton.cpp
@@ -124,7 +124,7 @@ void StyledButton::setScale( bool on )
scalePixmap();
}
-TQSize StyledButton::sizeHint() const
+TQSize StyledButton::tqsizeHint() const
{
return TQSize( 50, 25 );
}
diff --git a/tqtinterface/qt4/tools/designer/designer/styledbutton.h b/tqtinterface/qt4/tools/designer/designer/styledbutton.h
index f624aad..68a4adc 100644
--- a/tqtinterface/qt4/tools/designer/designer/styledbutton.h
+++ b/tqtinterface/qt4/tools/designer/designer/styledbutton.h
@@ -72,7 +72,7 @@ public:
void setScale( bool );
bool scale() const;
- TQSize sizeHint() const;
+ TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const;
void setFormWindow( FormWindow *fw ) { formWindow = fw; }
diff --git a/tqtinterface/qt4/tools/designer/designer/tableeditor.ui b/tqtinterface/qt4/tools/designer/designer/tableeditor.ui
index 9d60116..fea785a 100644
--- a/tqtinterface/qt4/tools/designer/designer/tableeditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/tableeditor.ui
@@ -109,7 +109,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -194,7 +194,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -216,7 +216,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -447,7 +447,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -503,7 +503,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/variabledialog.ui b/tqtinterface/qt4/tools/designer/designer/variabledialog.ui
index 644c15c..6ea81ff 100644
--- a/tqtinterface/qt4/tools/designer/designer/variabledialog.ui
+++ b/tqtinterface/qt4/tools/designer/designer/variabledialog.ui
@@ -188,7 +188,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>21</height>
@@ -221,7 +221,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>21</height>
diff --git a/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp b/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp
index ab1fbc6..84ccb85 100644
--- a/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp
+++ b/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp
@@ -94,7 +94,7 @@
#include <tqapplication.h>
#include <tqsplitter.h>
#include <tqtoolbox.h>
-#include <sizegrip.h>
+#include <tqsizegrip.h>
#ifndef TQT_NO_SQL
#include "database.h"
#endif
@@ -1621,7 +1621,7 @@ bool TQLayoutWidget::event( TQEvent *e )
void TQLayoutWidget::updateSizePolicy()
{
if ( childrenListObject().isEmpty() || childrenListObject().count() == 0 ) {
- sp = TQWidget::sizePolicy();
+ sp = TQWidget::tqsizePolicy();
return;
}
@@ -1666,13 +1666,13 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( !w->sizePolicy().mayGrowHorizontally() )
+ if ( !w->tqsizePolicy().mayGrowHorizontally() )
ht &= ~TQSizePolicy::Minimum;
- if ( !w->sizePolicy().mayShrinkHorizontally() )
+ if ( !w->tqsizePolicy().mayShrinkHorizontally() )
ht &= ~TQSizePolicy::Maximum;
- if ( w->sizePolicy().mayGrowVertically() )
+ if ( w->tqsizePolicy().mayGrowVertically() )
vt |= TQSizePolicy::Minimum;
- if ( w->sizePolicy().mayShrinkVertically() )
+ if ( w->tqsizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum;
}
} else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) {
@@ -1687,13 +1687,13 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( w->sizePolicy().mayGrowHorizontally() )
+ if ( w->tqsizePolicy().mayGrowHorizontally() )
ht |= TQSizePolicy::Minimum;
- if ( w->sizePolicy().mayShrinkHorizontally() )
+ if ( w->tqsizePolicy().mayShrinkHorizontally() )
ht |= TQSizePolicy::Maximum;
- if ( !w->sizePolicy().mayGrowVertically() )
+ if ( !w->tqsizePolicy().mayGrowVertically() )
vt &= ~TQSizePolicy::Minimum;
- if ( !w->sizePolicy().mayShrinkVertically() )
+ if ( !w->tqsizePolicy().mayShrinkVertically() )
vt &= ~TQSizePolicy::Maximum;
}
} else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) {
@@ -1712,13 +1712,13 @@ void TQLayoutWidget::updateSizePolicy()
continue;
TQWidget *w = (TQWidget*)o;
- if ( w->sizePolicy().mayGrowHorizontally() )
+ if ( w->tqsizePolicy().mayGrowHorizontally() )
ht |= TQSizePolicy::Minimum;
- if ( w->sizePolicy().mayShrinkHorizontally() )
+ if ( w->tqsizePolicy().mayShrinkHorizontally() )
ht |= TQSizePolicy::Maximum;
- if ( w->sizePolicy().mayGrowVertically() )
+ if ( w->tqsizePolicy().mayGrowVertically() )
vt |= TQSizePolicy::Minimum;
- if ( w->sizePolicy().mayShrinkVertically() )
+ if ( w->tqsizePolicy().mayShrinkVertically() )
vt |= TQSizePolicy::Maximum;
}
}
diff --git a/tqtinterface/qt4/tools/designer/designer/widgetfactory.h b/tqtinterface/qt4/tools/designer/designer/widgetfactory.h
index dbd8d3c..77c0574 100644
--- a/tqtinterface/qt4/tools/designer/designer/widgetfactory.h
+++ b/tqtinterface/qt4/tools/designer/designer/widgetfactory.h
@@ -249,7 +249,7 @@ class TQLayoutWidget : public TQWidget
TQ_OBJECT
public:
- TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( TQWidget::sizePolicy() ) {}
+ TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( TQWidget::tqsizePolicy() ) {}
TQSizePolicy sizePolicy() const;
void updateSizePolicy();
@@ -276,11 +276,11 @@ public:
setBackgroundMode( TQt::PaletteDark );
}
- TQSize sizeHint() const {
- TQSize sh = cusw->sizeHint;
+ TQSize tqsizeHint() const {
+ TQSize sh = cusw->tqsizeHint;
if ( sh.isValid() )
return sh;
- return TQWidget::sizeHint();
+ return TQWidget::tqsizeHint();
}
TQString realClassName() { return cusw->className; }
diff --git a/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui b/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui
index 9c758c8..6a2a14a 100644
--- a/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui
+++ b/tqtinterface/qt4/tools/designer/designer/wizardeditor.ui
@@ -140,7 +140,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -208,7 +208,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/editor/completion.cpp b/tqtinterface/qt4/tools/designer/editor/completion.cpp
index 1ca2f89..1b42cb0 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 <sizegrip.h>
+#include <tqsizegrip.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->sizeHint() +
+ completionPopup->resize( completionListBox->tqsizeHint() +
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->sizeHint() +
+ completionPopup->resize( completionListBox->tqsizeHint() +
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 739baee..9b65ef2 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="sizeHint">
+ <property name="tqsizeHint">
<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 cf4a28a..46963e6 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="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -173,7 +173,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/examples/addressbook/search.ui b/tqtinterface/qt4/tools/designer/examples/addressbook/search.ui
index 047066b..4dd1386 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="sizeHint">
+ <property name="tqsizeHint">
<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 86cc17e..6a5a1f1 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="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -108,7 +108,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<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 fb205e6..2863f02 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="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -80,7 +80,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<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 bb4682f..2e8a4c2 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="sizeHint">
+ <property name="tqsizeHint">
<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 b7bab2a..00aa9a0 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="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -146,7 +146,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/examples/metric/metric.ui b/tqtinterface/qt4/tools/designer/examples/metric/metric.ui
index 580f54f..8ff4427 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="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>20</height>
@@ -224,7 +224,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -268,7 +268,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>0</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui b/tqtinterface/qt4/tools/designer/examples/multiclip/multiclip.ui
index 47cf042..5e78a47 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="sizeHint">
+ <property name="tqsizeHint">
<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 ea98fb6..468525f 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="sizeHint">
+ <property name="tqsizeHint">
<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 55b335e..b6d8642 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="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -249,7 +249,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp
index 770d3e9..cb71661 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 sizeHint;
+ TQSize tqsizeHint;
TQString sizeType = TQString( "Fixed" );
if ( yyBoxKind == TQString("hbox") ) {
orientationStr = TQString( "Horizontal" );
- sizeHint = TQSize( spacing, 20 );
+ tqsizeHint = TQSize( spacing, 20 );
} else {
orientationStr = TQString( "Vertical" );
- sizeHint = TQSize( 20, spacing );
+ tqsizeHint = 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("sizeHint"), sizeHint, TQString("qsize") );
+ emitProperty( TQString("tqsizeHint"), tqsizeHint, 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 4931878..4571cf5 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 <sizepolicy.h>
+#include <tqsizepolicy.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 365d960..7e8dada 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="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -166,7 +166,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -243,7 +243,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -344,7 +344,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -528,7 +528,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -545,7 +545,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -562,7 +562,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -625,7 +625,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -642,7 +642,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizard.ui
index 6137629..c08c829 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="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -253,7 +253,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -304,7 +304,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -338,7 +338,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -665,7 +665,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -722,7 +722,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -930,7 +930,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -974,7 +974,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1074,7 +1074,7 @@ name like "qt%"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1125,7 +1125,7 @@ name like "qt%"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1176,7 +1176,7 @@ name like "qt%"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1282,7 +1282,7 @@ name like "qt%"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1365,7 +1365,7 @@ name like "qt%"
<property name="sizeType">
<enum>Maximum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1382,7 +1382,7 @@ name like "qt%"
<property name="sizeType">
<enum>Maximum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -1488,7 +1488,7 @@ name like "qt%"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1551,7 +1551,7 @@ name like "qt%"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1568,7 +1568,7 @@ name like "qt%"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1585,7 +1585,7 @@ name like "qt%"
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/designer/shared/domtool.cpp b/tqtinterface/qt4/tools/designer/shared/domtool.cpp
index 8175b2a..0c50fbf 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 <sizepolicy.h>
+#include <tqsizepolicy.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 b49537e..bf6335d 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 <sizepolicy.h>
+#include <tqsizepolicy.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 12a0b29..9ae02fe 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="sizeHint">
+ <property name="tqsizeHint">
<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 0d153bd..24ecc7f 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="sizeHint">
+ <property name="tqsizeHint">
<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 6874935..dd354f0 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="sizeHint">
+ <property name="tqsizeHint">
<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 5ef82c0..64a2ed3 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="sizeHint">
+ <property name="tqsizeHint">
<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 a0bc77c..4a5b8ae 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->sizeHint().width() << "</width>" << endl;
- ts << makeIndent( indent ) << "<height>" << w.w->sizeHint().height() << "</height>" << endl;
+ ts << makeIndent( indent ) << "<width>" << w.w->tqsizeHint().width() << "</width>" << endl;
+ ts << makeIndent( indent ) << "<height>" << w.w->tqsizeHint().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 a489e22..1ce89b8 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 <sizepolicy.h>
+#include <tqsizepolicy.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 488813b..5eed175 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, "sizeHint", TQSize( 0, 0 ) ).toSize();
+ TQSize size = DomTool::readProperty( e, "tqsizeHint", 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 7b6168d..57ea838 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 == "sizeHint" ) {
+ } else if ( name == "tqsizeHint" ) {
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 == "sizeHint" ) {
+ } else if ( prop == "tqsizeHint" ) {
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 875b854..4d57398 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/about.ui
+++ b/tqtinterface/qt4/tools/linguist/linguist/about.ui
@@ -133,7 +133,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -164,7 +164,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -195,7 +195,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp b/tqtinterface/qt4/tools/linguist/linguist/phraselv.cpp
index b0907ea..15177c0 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::sizeHint() const
+TQSize PhraseLV::tqsizeHint() const
{
- return TQSize( TQListView::sizeHint().width(), 50 );
+ return TQSize( TQListView::tqsizeHint().width(), 50 );
}
diff --git a/tqtinterface/qt4/tools/linguist/linguist/phraselv.h b/tqtinterface/qt4/tools/linguist/linguist/phraselv.h
index 0317b53..e6fedd6 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 sizeHint() const;
+ virtual TQSize tqsizeHint() const;
private:
TQWhatsThis *what;
diff --git a/tqtinterface/qt4/tools/linguist/linguist/statistics.ui b/tqtinterface/qt4/tools/linguist/linguist/statistics.ui
index 59c7570..1d304d7 100644
--- a/tqtinterface/qt4/tools/linguist/linguist/statistics.ui
+++ b/tqtinterface/qt4/tools/linguist/linguist/statistics.ui
@@ -69,7 +69,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
@@ -94,7 +94,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>40</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h b/tqtinterface/qt4/tools/linguist/linguist/statistics.ui.h
index 8860273..0207d0a 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( sizeHint().height() );
+ setFixedHeight( tqsizeHint().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 57eaa31..22b6a8b 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->sizeHint().width());
+ lv->setFixedWidth(lv->tqsizeHint().width());
#endif
}
@@ -727,7 +727,7 @@ int main(int argc, char** argv)
}
m.loadFeatures(qfeatures);
m.loadConfig(qconfig);
- m.resize(m.sizeHint()+TQSize(500,300));
+ m.resize(m.tqsizeHint()+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 a5f0271..4dd152f 100644
--- a/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp
+++ b/tqtinterface/qt4/tools/qtconfig/colorbutton.cpp
@@ -76,7 +76,7 @@ void ColorButton::changeColor()
}
-TQSize ColorButton::sizeHint() const
+TQSize ColorButton::tqsizeHint() const
{
return TQSize(40, 25);
}
diff --git a/tqtinterface/qt4/tools/qtconfig/colorbutton.h b/tqtinterface/qt4/tools/qtconfig/colorbutton.h
index c052ff8..451c6df 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 sizeHint() const;
+ TQSize tqsizeHint() const;
TQSize tqminimumSizeHint() const;
void mousePressEvent(TQMouseEvent *);
diff --git a/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui b/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui
index 5b8d004..fb56464 100644
--- a/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui
+++ b/tqtinterface/qt4/tools/qtconfig/mainwindowbase.ui
@@ -227,7 +227,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>70</width>
<height>20</height>
@@ -1039,7 +1039,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>40</height>
@@ -1157,7 +1157,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1321,7 +1321,7 @@
<property name="sizeType">
<enum>Minimum</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui b/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui
index 7f108ea..8daf961 100644
--- a/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui
+++ b/tqtinterface/qt4/tools/qtconfig/paletteeditoradvancedbase.ui
@@ -273,7 +273,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -437,7 +437,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -515,7 +515,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui b/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui
index 5860223..a01b57c 100644
--- a/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui
+++ b/tqtinterface/qt4/tools/qtconfig/previewwidgetbase.ui
@@ -295,7 +295,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/qvfb/config.ui b/tqtinterface/qt4/tools/qvfb/config.ui
index 22245a0..f7a8b6c 100644
--- a/tqtinterface/qt4/tools/qvfb/config.ui
+++ b/tqtinterface/qt4/tools/qvfb/config.ui
@@ -191,7 +191,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -540,7 +540,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1397,7 +1397,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1414,7 +1414,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -1444,7 +1444,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/tqtinterface/qt4/tools/qvfb/qvfb.cpp b/tqtinterface/qt4/tools/qvfb/qvfb.cpp
index 1e01c51..8fb4cb1 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( sizeHint() );
+ resize( tqsizeHint() );
view->show();
}
diff --git a/tqtinterface/qt4/tools/qvfb/qvfbview.cpp b/tqtinterface/qt4/tools/qvfb/qvfbview.cpp
index 163c41d..f7d0669 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::sizeHint() const
+TQSize TQVFbView::tqsizeHint() 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 af85f54..df5adcc 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 sizeHint() const;
+ TQSize tqsizeHint() const;
public Q_SLOTS:
void setTouchscreenEmulation( bool );