diff options
Diffstat (limited to 'kommander/editor')
50 files changed, 248 insertions, 248 deletions
diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index 7207da73..3fc26240 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -81,7 +81,7 @@ QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolB setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); - tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); + setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o ) @@ -94,9 +94,9 @@ void QDesignerToolBarSeparator::styleChange( TQStyle& ) setOrientation( orient ); } -TQSize QDesignerToolBarSeparator::tqsizeHint() const +TQSize QDesignerToolBarSeparator::sizeHint() const { - int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent, + int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); if ( orient ==Qt::Horizontal ) return TQSize( extent, 0 ); @@ -113,7 +113,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) flags |= TQStyle::Style_Horizontal; tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), - tqcolorGroup(), flags ); + colorGroup(), flags ); } @@ -511,11 +511,11 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e ) return; TQString s; if ( e->provides( "application/x-designer-actiongroup" ) ) - s = TQString( e->tqencodedData( "application/x-designer-actiongroup" ) ); + s = TQString( e->encodedData( "application/x-designer-actiongroup" ) ); else if ( e->provides( "application/x-designer-separator" ) ) - s = TQString( e->tqencodedData( "application/x-designer-separator" ) ); + s = TQString( e->encodedData( "application/x-designer-separator" ) ); else - s = TQString( e->tqencodedData( "application/x-designer-actions" ) ); + s = TQString( e->encodedData( "application/x-designer-actions" ) ); indicator->hide(); TQAction *a = 0; @@ -873,7 +873,7 @@ void QDesignerMenuBar::dropEvent( TQDropEvent *e ) if ( !e->provides( "application/x-designer-menuitem" ) ) return; e->accept(); - TQString s( e->tqencodedData( "application/x-designer-menuitem" ) ); + TQString s( e->encodedData( "application/x-designer-menuitem" ) ); TQString s1 = s.left( s.find( "/" ) ); TQString s2 = s.mid( s.find( "/" ) + 1 ); TQPopupMenu *popup = (TQPopupMenu*)s1.toLong(); // #### huha, that is evil @@ -895,7 +895,7 @@ TQPoint QDesignerMenuBar::calcIndicatorPos( const TQPoint &pos ) int w = frameWidth(); insertAt = count(); for ( int i = 0; i < (int)count(); ++i ) { - TQRect r = tqitemRect( i ); + TQRect r = itemRect( i ); if ( pos.x() < w + r.width() / 2 ) { insertAt = i; break; @@ -1142,15 +1142,15 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e ) TQPoint p = pos(); TQAction *a = 0; if ( e->provides( "application/x-designer-actiongroup" ) ) { - TQString s( e->tqencodedData( "application/x-designer-actiongroup" ) ); + TQString s( e->encodedData( "application/x-designer-actiongroup" ) ); a = (QDesignerActionGroup*)s.toLong(); } else { TQString s; if ( e->provides( "application/x-designer-separator" ) ) { - s = TQString( e->tqencodedData( "application/x-designer-separator" ) ); + s = TQString( e->encodedData( "application/x-designer-separator" ) ); a = (QSeparatorAction*)s.toLong(); } else { - s = TQString( e->tqencodedData( "application/x-designer-actions" ) ); + s = TQString( e->encodedData( "application/x-designer-actions" ) ); a = (QDesignerAction*)s.toLong(); } } diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h index a47992cd..74df7292 100644 --- a/kommander/editor/actiondnd.h +++ b/kommander/editor/actiondnd.h @@ -108,7 +108,7 @@ class QDesignerToolBarSeparator : public TQWidget public: QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 ); - TQSize tqsizeHint() const; + TQSize sizeHint() const; Qt::Orientation orientation() const { return orient; } public slots: void setOrientation( Qt::Orientation ); diff --git a/kommander/editor/actioneditor.ui b/kommander/editor/actioneditor.ui index 056b46cf..5d13edc7 100644 --- a/kommander/editor/actioneditor.ui +++ b/kommander/editor/actioneditor.ui @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui index d3565506..6ce23a0e 100644 --- a/kommander/editor/assoctexteditor.ui +++ b/kommander/editor/assoctexteditor.ui @@ -114,7 +114,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -152,7 +152,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index 106e0ab0..d0eaa69a 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -314,7 +314,7 @@ TQStringList AssocTextEditor::buildWidgetList() // There is a warning message with the property() function if it does not exist. // Verify the property exists with the meta information first */ bool pExists = false; - TQMetaObject *metaObj = it.current()->tqmetaObject(); + TQMetaObject *metaObj = it.current()->metaObject(); if(metaObj) { int id = metaObj->findProperty("KommanderWidget", true); diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui index fc9887c9..5966cdf7 100644 --- a/kommander/editor/choosewidget.ui +++ b/kommander/editor/choosewidget.ui @@ -40,7 +40,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp index e440a8fd..84951ff5 100644 --- a/kommander/editor/choosewidgetimpl.cpp +++ b/kommander/editor/choosewidgetimpl.cpp @@ -103,7 +103,7 @@ void ChooseWidget::textChanged(const TQString& text) bool ChooseWidget::isKommanderWidget(TQObject* w) { bool pExists = false; - TQMetaObject *metaObj = w->tqmetaObject(); + TQMetaObject *metaObj = w->metaObject(); if (metaObj) { int id = metaObj->findProperty("KommanderWidget", true); diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index c1b8db31..7e295285 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -263,8 +263,8 @@ void InsertCommand::execute() widget->move( tqgeometry.topLeft() ); widget->adjustSize(); } else { - TQSize s = tqgeometry.size().expandedTo( widget->tqminimumSize() ); - s = s.expandedTo( widget->tqminimumSizeHint() ); + TQSize s = tqgeometry.size().expandedTo( widget->minimumSize() ); + s = s.expandedTo( widget->minimumSizeHint() ); TQRect r( tqgeometry.topLeft(), s ); widget->setGeometry( r ); } @@ -461,7 +461,7 @@ bool SetPropertyCommand::canMerge( Command *c ) { SetPropertyCommand *cmd = (SetPropertyCommand*)c; const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, true ), true ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true ); if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) return true; @@ -532,16 +532,16 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ editor->propertyList()->setCurrentProperty( propName ); const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, true ), true ); + widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true ); if ( !p ) { if ( propName == "hAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", true ), true ); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", true ), true ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); align |= p->keyToValue( currentItemText ); widget->setProperty( "tqalignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", true ), true ); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "tqalignment", true ), true ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignVertical_Mask ); align |= p->keyToValue( currentItemText ); diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui index 63d59f49..8ff884a2 100644 --- a/kommander/editor/connectioneditor.ui +++ b/kommander/editor/connectioneditor.ui @@ -239,7 +239,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>21</height> @@ -293,7 +293,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>20</height> @@ -331,7 +331,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>231</width> <height>20</height> @@ -368,7 +368,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>211</width> <height>20</height> diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index c87b9d51..f8d8b9ff 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -274,7 +274,7 @@ void ConnectionEditor::senderChanged(const TQString& s) if (!p_object) return; m_sender = p_object; - TQStrList p_sigs = m_sender->tqmetaObject()->signalNames(true); + TQStrList p_sigs = m_sender->metaObject()->signalNames(true); signalBox->clear(); for (TQStrListIterator it(p_sigs); it.current(); ++it) if (!isSignalIgnored(it.current()) && !signalBox->findItem(it.current(), TQt::ExactMatch)) @@ -293,11 +293,11 @@ void ConnectionEditor::receiverChanged(const TQString& s) if (!p_object) return; m_receiver = p_object; - int n = m_receiver->tqmetaObject()->numSlots(true); + int n = m_receiver->metaObject()->numSlots(true); slotBox->clear(); for (int i = 0; i < n; ++i) { - const TQMetaData* md = m_receiver->tqmetaObject()->slot(i, true); + const TQMetaData* md = m_receiver->metaObject()->slot(i, true); if (!isSlotIgnored(md) && !slotBox->findItem(md->tqt_mo_ci_name, TQt::ExactMatch)) slotBox->insertItem(md->tqt_mo_ci_name); } diff --git a/kommander/editor/createtemplate.ui b/kommander/editor/createtemplate.ui index f97acfc6..e31865ef 100644 --- a/kommander/editor/createtemplate.ui +++ b/kommander/editor/createtemplate.ui @@ -124,7 +124,7 @@ <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> @@ -196,7 +196,7 @@ <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui index 02ff5699..e6f7fc15 100644 --- a/kommander/editor/formsettings.ui +++ b/kommander/editor/formsettings.ui @@ -74,7 +74,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -212,7 +212,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>130</height> diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 7e9a3b39..50be9f1d 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -212,7 +212,7 @@ void FormWindow::paintGrid(TQWidget *w, TQPaintEvent *e) grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y()); if(!TQPixmapCache::find(grid_name, grid)) { grid = TQPixmap(350 + (350 % mainWindow()->grid().x()), 350 + (350 % mainWindow()->grid().y())); - grid.fill(tqcolorGroup().color(TQColorGroup::Foreground)); + grid.fill(colorGroup().color(TQColorGroup::Foreground)); TQBitmap mask(grid.width(), grid.height()); mask.fill(color0); TQPainter p(&mask); @@ -267,7 +267,7 @@ TQPoint FormWindow::gridPoint(const TQPoint &p) void FormWindow::drawSizePreview(const TQPoint &pos, const TQString& text) { unclippedPainter->save(); - unclippedPainter->setPen(TQPen(tqcolorGroup().foreground(), 1 )); + unclippedPainter->setPen(TQPen(colorGroup().foreground(), 1 )); unclippedPainter->setRasterOp(CopyROP); if (!sizePreviewPixmap.isNull()) unclippedPainter->drawPixmap(sizePreviewPos, sizePreviewPixmap); @@ -345,8 +345,8 @@ void FormWindow::insertWidget() r = TQRect(p, r.size()); if (useSizeHint) { - r.setWidth(w->tqsizeHint().width()); - r.setHeight(w->tqsizeHint().height()); + r.setWidth(w->sizeHint().width()); + r.setHeight(w->sizeHint().height()); } if (r.width() < 2 * grid().x()) @@ -753,7 +753,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) targetContainer = wa; hadOwnPalette = wa->ownPalette(); restorePalette = wa->palette(); - wa->setPaletteBackgroundColor(wa->tqcolorGroup().midlight()); + wa->setPaletteBackgroundColor(wa->colorGroup().midlight()); } } else if (targetContainer) @@ -1820,11 +1820,11 @@ void FormWindow::checkAccels() { TQWidget *w = (TQWidget *) o; const TQMetaProperty *text = - w->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true); + w->metaObject()->property(w->metaObject()->findProperty("text", true), true); const TQMetaProperty *title = - w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), true); + w->metaObject()->property(w->metaObject()->findProperty("title", true), true); const TQMetaProperty *pageTitle = - w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pageTitle", true), true); + w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true); if (text) find_accel(w->property("text").toString(), accels, w); if (title) diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui index ca35e191..31068b7a 100644 --- a/kommander/editor/functions.ui +++ b/kommander/editor/functions.ui @@ -42,7 +42,7 @@ <property name="name"> <cstring>descriptionText</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -82,7 +82,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -119,7 +119,7 @@ <property name="name"> <cstring>groupBox1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>0</height> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -177,7 +177,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32</height> @@ -530,7 +530,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> @@ -578,7 +578,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> @@ -607,7 +607,7 @@ <property name="name"> <cstring>clearButton</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>20</height> diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index 9520360f..2649da52 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -147,7 +147,7 @@ void FunctionsDialog::groupChanged(int index) if (index == m_Slots) { KommanderWidget* a_atw = dynamic_cast<KommanderWidget *>(m_widgetList[widgetComboBox->currentText()]); - TQStringList pFunctions = TQStringList::fromStrList(a_atw->object()->tqmetaObject()->slotNames(true)); + TQStringList pFunctions = TQStringList::fromStrList(a_atw->object()->metaObject()->slotNames(true)); for (uint i=0; i<pFunctions.count(); i++) { TQString slot = pFunctions[i]; @@ -195,7 +195,7 @@ void FunctionsDialog::functionChanged(int) { KommanderWidget* w = dynamic_cast<KommanderWidget *>(m_widgetList[widgetComboBox->currentText()]); TQObject *o = w->object(); - TQString slotHelp = i18n("To learn more about the slot, look at the documentation of the base TQt/KDE class, most probably <i>%1</i>.").tqarg(o->tqmetaObject()->tqsuperClassName() ? TQString(o->tqmetaObject()->tqsuperClassName()) : TQString(o->className()) ); + TQString slotHelp = i18n("To learn more about the slot, look at the documentation of the base TQt/KDE class, most probably <i>%1</i>.").tqarg(o->metaObject()->superClassName() ? TQString(o->metaObject()->superClassName()) : TQString(o->className()) ); TQString slotName = functionListBox->currentText(); TQString slot = m_slotList[slotName]; descriptionText->clear(); diff --git a/kommander/editor/iconvieweditor.ui b/kommander/editor/iconvieweditor.ui index 26d1aa8b..90d70c4a 100644 --- a/kommander/editor/iconvieweditor.ui +++ b/kommander/editor/iconvieweditor.ui @@ -124,7 +124,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -171,7 +171,7 @@ <property name="name"> <cstring>itemText</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -221,7 +221,7 @@ <property name="name"> <cstring>itemDeletePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -244,7 +244,7 @@ <property name="name"> <cstring>itemChoosePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -301,7 +301,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index dca00c38..aadd2212 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -874,15 +874,15 @@ void Spacer::setSizeType( SizeType t ) sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t ); else sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum ); - tqsetSizePolicy( sizeP ); + setSizePolicy( sizeP ); } 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 @@ -892,12 +892,12 @@ int Spacer::tqalignment() const return AlignVCenter; } -TQSize Spacer::tqminimumSize() const +TQSize Spacer::minimumSize() const { return TQSize( 20, 20 ); } -TQSize Spacer::tqsizeHint() const +TQSize Spacer::sizeHint() const { TQSize s = sh.expandedTo( TQSize(0,0) ); if ( sizeType() == Expanding ) @@ -913,7 +913,7 @@ void Spacer::setSizeHint( const TQSize &s ) { sh = s; if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout ) - resize( tqsizeHint() ); + resize( sizeHint() ); updateGeometry(); } diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h index 14104bf7..2b33bb3b 100644 --- a/kommander/editor/layout.h +++ b/kommander/editor/layout.h @@ -118,7 +118,7 @@ class Spacer : public TQWidget TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) Q_ENUMS( SizeType ) TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType ) - TQ_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true ) + TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false ) private: @@ -135,8 +135,8 @@ public: Spacer( TQWidget *parent, const char *name ); - TQSize tqminimumSize() const; - TQSize tqsizeHint() const; + TQSize minimumSize() const; + TQSize sizeHint() const; void setSizeType( SizeType t ); SizeType sizeType() const; int tqalignment() const; diff --git a/kommander/editor/listboxeditor.ui b/kommander/editor/listboxeditor.ui index fc03fa8f..506e4e1f 100644 --- a/kommander/editor/listboxeditor.ui +++ b/kommander/editor/listboxeditor.ui @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -190,7 +190,7 @@ <property name="name"> <cstring>itemDeletePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -213,7 +213,7 @@ <property name="name"> <cstring>itemChoosePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -244,7 +244,7 @@ <property name="name"> <cstring>itemText</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -297,7 +297,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/listeditor.ui b/kommander/editor/listeditor.ui index 4d5b5957..f754e6c1 100644 --- a/kommander/editor/listeditor.ui +++ b/kommander/editor/listeditor.ui @@ -89,7 +89,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/listvieweditor.ui b/kommander/editor/listvieweditor.ui index 2ec9e9ba..ada4fa01 100644 --- a/kommander/editor/listvieweditor.ui +++ b/kommander/editor/listvieweditor.ui @@ -134,7 +134,7 @@ <property name="name"> <cstring>itemText</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -195,7 +195,7 @@ <property name="name"> <cstring>itemDeletePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -218,7 +218,7 @@ <property name="name"> <cstring>itemChoosePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -284,7 +284,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -418,7 +418,7 @@ <property name="name"> <cstring>colDeletePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -441,7 +441,7 @@ <property name="name"> <cstring>colChoosePixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -472,7 +472,7 @@ <property name="name"> <cstring>colText</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -589,7 +589,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -634,7 +634,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 601d98a8..d2bcff45 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -368,7 +368,7 @@ int MainWindow::currentTool() const { if (!actionCurrentTool) return POINTER_TOOL; - return TQString::tqfromLatin1(actionCurrentTool->name()).toInt(); + return TQString::fromLatin1(actionCurrentTool->name()).toInt(); } void MainWindow::slotCreateBackups() @@ -1012,18 +1012,18 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int> &props, TQWidget *w) { - const TQMetaProperty* text = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true); + const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true); if (text && qstrcmp(text->type(), TQSTRING_OBJECT_NAME_STRING) != 0) text = 0; - const TQMetaProperty* title = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), true); + const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true); if (title && qstrcmp(title->type(), TQSTRING_OBJECT_NAME_STRING) != 0) title = 0; const TQMetaProperty* pagetitle = - w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pageTitle", true), true); + w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true); if (pagetitle && qstrcmp(pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0) pagetitle = 0; const TQMetaProperty* pixmap = - w->tqmetaObject()->property(w->tqmetaObject()->findProperty("pixmap", true), true); + w->metaObject()->property(w->metaObject()->findProperty("pixmap", true), true); if (pixmap && qstrcmp(pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0) pixmap = 0; @@ -1627,8 +1627,8 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) return true; } - const TQMetaProperty* text = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("text", true), true); - const TQMetaProperty* title = w->tqmetaObject()->property(w->tqmetaObject()->findProperty("title", true), true); + const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true); + const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true); if (text && text->designable(w)) { bool ok = false; TQString text; @@ -1756,7 +1756,7 @@ void MainWindow::checkTempFiles() void MainWindow::showDialogHelp() { TQWidget *w = (TQWidget*)sender(); - w = w->tqtopLevelWidget(); + w = w->topLevelWidget(); TQString link = "designer-manual-12.html#"; diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp index acf64cb9..ff401fd3 100644 --- a/kommander/editor/metadatabase.cpp +++ b/kommander/editor/metadatabase.cpp @@ -469,8 +469,8 @@ void MetaDataBase::doConnections( TQObject *o ) TQString s2 = "1""%1"; s2 = s2.tqarg( conn.slot.data() ); - TQStrList signalList = sender->tqmetaObject()->signalNames( true ); - TQStrList slotList = receiver->tqmetaObject()->slotNames( true ); + TQStrList signalList = sender->metaObject()->signalNames( true ); + TQStrList slotList = receiver->metaObject()->slotNames( true ); // avoid warnings if ( signalList.find( conn.signal ) == -1 || @@ -647,13 +647,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom } if ( !onlyCustom ) { - TQStrList slotList = o->tqmetaObject()->slotNames( true ); + TQStrList slotList = o->metaObject()->slotNames( true ); if ( slotList.find( slot ) != -1 ) return true; if ( o->inherits( "FormWindow" ) ) { o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); - slotList = o->tqmetaObject()->slotNames( true ); + slotList = o->metaObject()->slotNames( true ); if ( slotList.find( slot ) != -1 ) return true; } @@ -934,7 +934,7 @@ MetaDataBase::CustomWidget::CustomWidget() className = "MyCustomWidget"; includeFile = "mywidget.h"; includePolicy = Local; - tqsizeHint = TQSize( -1, -1 ); + sizeHint = TQSize( -1, -1 ); pixmap = new TQPixmap( PixmapChooser::loadPixmap( "customwidget.xpm" ) ); id = -1; sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); @@ -946,7 +946,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 @@ -991,7 +991,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 @@ -1006,7 +1006,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const { - TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( true ); + TQStrList sigList = TQWidget::staticMetaObject()->signalNames( true ); if ( sigList.find( signal ) != -1 ) return true; for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) { @@ -1018,7 +1018,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { - TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( true ); + TQStrList slotList = TQWidget::staticMetaObject()->slotNames( true ); if ( slotList.find( normalizeSlot( slot ) ) != -1 ) return true; @@ -1031,7 +1031,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const { - TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( true ); + TQStrList propList = TQWidget::staticMetaObject()->propertyNames( true ); if ( propList.find( prop ) != -1 ) return true; diff --git a/kommander/editor/metadatabase.h b/kommander/editor/metadatabase.h index 5251e793..11254f0b 100644 --- a/kommander/editor/metadatabase.h +++ b/kommander/editor/metadatabase.h @@ -92,7 +92,7 @@ public: TQString className; TQString includeFile; IncludePolicy includePolicy; - TQSize tqsizeHint; + TQSize sizeHint; TQSizePolicy sizePolicy; TQPixmap *pixmap; TQValueList<TQCString> lstSignals; diff --git a/kommander/editor/multilineeditor.ui b/kommander/editor/multilineeditor.ui index 47ce1172..2c2c4f6d 100644 --- a/kommander/editor/multilineeditor.ui +++ b/kommander/editor/multilineeditor.ui @@ -128,7 +128,7 @@ <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp index 074a8471..ce5efe77 100644 --- a/kommander/editor/multilineeditorimpl.cpp +++ b/kommander/editor/multilineeditorimpl.cpp @@ -34,7 +34,7 @@ MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWi connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); mlined = (TQMultiLineEdit*)editWidget; // #### complete list of properties here - preview->tqsetAlignment( mlined->tqalignment() ); + preview->setAlignment( mlined->tqalignment() ); preview->setMaxLines( mlined->maxLines() ); preview->setWordWrap( mlined->wordWrap() ); preview->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() ); diff --git a/kommander/editor/newform.ui b/kommander/editor/newform.ui index fe2f5e42..860c1190 100644 --- a/kommander/editor/newform.ui +++ b/kommander/editor/newform.ui @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -155,7 +155,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui index eeead240..4c8f89ad 100644 --- a/kommander/editor/paletteeditor.ui +++ b/kommander/editor/paletteeditor.ui @@ -92,7 +92,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -154,7 +154,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -214,7 +214,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -353,7 +353,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/paletteeditoradvanced.ui b/kommander/editor/paletteeditoradvanced.ui index 001a39f3..78fcb222 100644 --- a/kommander/editor/paletteeditoradvanced.ui +++ b/kommander/editor/paletteeditoradvanced.ui @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -325,7 +325,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -477,7 +477,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -496,7 +496,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -573,7 +573,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/parser.cpp b/kommander/editor/parser.cpp index fa264796..85446fa0 100644 --- a/kommander/editor/parser.cpp +++ b/kommander/editor/parser.cpp @@ -62,5 +62,5 @@ TQString Parser::cleanArgs( const TQString &func ) } res += ")"; - return TQString::tqfromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); + return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) ); } diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp index e536242a..ef8636c0 100644 --- a/kommander/editor/pixmapchooser.cpp +++ b/kommander/editor/pixmapchooser.cpp @@ -891,7 +891,7 @@ void PixmapView::setPixmap( const TQPixmap &pix ) void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch ) { - p->fillRect( cx, cy, cw, ch, tqcolorGroup().brush( TQColorGroup::Base ) ); + p->fillRect( cx, cy, cw, ch, colorGroup().brush( TQColorGroup::Base ) ); p->drawPixmap( 0, 0, pixmap ); } diff --git a/kommander/editor/pixmapfunction.ui b/kommander/editor/pixmapfunction.ui index cb34cbcc..f4b241e3 100644 --- a/kommander/editor/pixmapfunction.ui +++ b/kommander/editor/pixmapfunction.ui @@ -810,7 +810,7 @@ <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> @@ -861,7 +861,7 @@ <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/preferences.ui b/kommander/editor/preferences.ui index 63ac1bb3..2cb673ed 100644 --- a/kommander/editor/preferences.ui +++ b/kommander/editor/preferences.ui @@ -317,7 +317,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -528,7 +528,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/previewframe.cpp b/kommander/editor/previewframe.cpp index b3afb58b..b54d6347 100644 --- a/kommander/editor/previewframe.cpp +++ b/kommander/editor/previewframe.cpp @@ -31,7 +31,7 @@ PreviewFrame::PreviewFrame( TQWidget *parent, const char *name ) setLineWidth(1); PreviewWorkspace * w = new PreviewWorkspace( this ); - w->setEraseColor(tqcolorGroup().dark()); + w->setEraseColor(colorGroup().dark()); previewWidget = new PreviewWidget( w ); previewWidget->move( 10, 10 ); } diff --git a/kommander/editor/previewwidget.ui b/kommander/editor/previewwidget.ui index 6c93d75d..33601c58 100644 --- a/kommander/editor/previewwidget.ui +++ b/kommander/editor/previewwidget.ui @@ -234,7 +234,7 @@ <property name="name"> <cstring>textView</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>50</height> @@ -263,7 +263,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index 50938a89..ad46f6ec 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -397,8 +397,8 @@ void PropertyItem::createResetButton() hbox->setLineWidth( 1 ); resetButton = new TQPushButton( hbox ); resetButton->setPixmap( PixmapChooser::loadPixmap( "resetproperty.xpm", PixmapChooser::Mini ) ); - resetButton->setFixedWidth( resetButton->tqsizeHint().width() ); - hbox->tqlayout()->tqsetAlignment( TQt::AlignRight ); + resetButton->setFixedWidth( resetButton->sizeHint().width() ); + hbox->tqlayout()->setAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); TQObject::connect( resetButton, TQT_SIGNAL( clicked() ), @@ -425,13 +425,13 @@ void PropertyItem::updateResetButtonState() void PropertyItem::placeEditor( TQWidget *w ) { createResetButton(); - TQRect r = listview->tqitemRect( this ); + TQRect r = listview->itemRect( this ); if ( !r.size().isValid() ) { listview->ensureItemVisible( this ); #if defined(TQ_WS_WIN) listview->repaintContents( false ); #endif - r = listview->tqitemRect( this ); + r = listview->itemRect( this ); } r.setX( listview->header()->sectionPos( 1 ) ); r.setWidth( listview->header()->sectionSize( 1 ) - 1 ); @@ -439,7 +439,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( r.height() - 3 ); } @@ -537,10 +537,10 @@ TQString PropertyItem::currentItemFromObject() const void PropertyItem::setFocus( TQWidget *w ) { - if ( !tqApp->tqfocusWidget() || + if ( !tqApp->focusWidget() || listview->propertyEditor()->formWindow() && - ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->tqfocusWidget()) ) && - !tqApp->tqfocusWidget()->inherits( "Editor" ) ) ) + ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) && + !tqApp->focusWidget()->inherits( "Editor" ) ) ) w->setFocus(); } @@ -1540,8 +1540,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr box = new TQHBox( listview->viewport() ); box->hide(); pixPrev = new TQLabel( box ); - pixPrev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); - pixPrev->setBackgroundColor( pixPrev->tqcolorGroup().color( TQColorGroup::Base ) ); + pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) ); + pixPrev->setBackgroundColor( pixPrev->colorGroup().color( TQColorGroup::Base ) ); button = new TQPushButton( "...", box ); button->setFixedWidth( 20 ); box->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); @@ -1605,8 +1605,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r ) TQPixmap pix( (!iconSet ? value().toPixmap() : value().toIconSet().pixmap()) ); if ( !pix.isNull() ) { p->save(); - p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()), - (int)(p->tqworldMatrix().dy() + r.y()) ), + p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()), + (int)(p->worldMatrix().dy() + r.y()) ), r.size() ) ); p->drawPixmap( r.x(), r.y() + ( r.height() - pix.height() ) / 2, pix ); p->restore(); @@ -2198,7 +2198,7 @@ void PropertyPaletteItem::getPalette() w = ( (TQScrollView*)w )->viewport(); TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), #if defined(TQT_NON_COMMERCIAL) - w->backgroundMode(), listview->tqtopLevelWidget(), + w->backgroundMode(), listview->topLevelWidget(), #else w->backgroundMode(), listview, #endif @@ -2218,8 +2218,8 @@ void PropertyPaletteItem::drawCustomContents( TQPainter *p, const TQRect &r ) { TQPalette pal( value().toPalette() ); p->save(); - p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()), - (int)(p->tqworldMatrix().dy() + r.y()) ), + p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()), + (int)(p->worldMatrix().dy() + r.y()) ), r.size() ) ); TQRect r2( r ); r2.setX( r2.x() + 2 ); @@ -2522,7 +2522,7 @@ void PropertyList::setupProperties() if ( !editor->widget() ) return; bool allProperties = !editor->widget()->inherits( "Spacer" ); - TQStrList lst = editor->widget()->tqmetaObject()->propertyNames( allProperties ); + TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties ); PropertyItem *item = 0; TQMap<TQString, bool> unique; TQObject *w = editor->widget(); @@ -2533,11 +2533,11 @@ void PropertyList::setupProperties() WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { const TQMetaProperty* p = - editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties ); + editor->widget()->metaObject()-> + property( editor->widget()->metaObject()->findProperty( it.current(), allProperties), allProperties ); if ( !p ) continue; - if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) ) + if ( unique.contains( TQString::fromLatin1( it.current() ) ) ) continue; if ( editor->widget()->inherits( "QDesignerToolBar" ) || editor->widget()->inherits( "QDesignerMenuBar" ) ) { if ( qstrcmp( p->name(), "minimumHeight" ) == 0 ) @@ -2552,12 +2552,12 @@ void PropertyList::setupProperties() continue; if ( qstrcmp( p->name(), "sizePolicy" ) == 0 ) continue; - if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 ) + if ( qstrcmp( p->name(), "minimumSize" ) == 0 ) continue; - if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 ) + if ( qstrcmp( p->name(), "maximumSize" ) == 0 ) continue; } - unique.insert( TQString::tqfromLatin1( it.current() ), true ); + unique.insert( TQString::fromLatin1( it.current() ), true ); if ( editor->widget()->isWidgetType() && editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)editor->widget()) ) ) { if ( qstrcmp( p->name(), "geometry" ) == 0 ) @@ -2588,9 +2588,9 @@ void PropertyList::setupProperties() continue; if ( qstrcmp( p->name(), "geometry" ) == 0 ) continue; - if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 ) + if ( qstrcmp( p->name(), "minimumSize" ) == 0 ) continue; - if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 ) + if ( qstrcmp( p->name(), "maximumSize" ) == 0 ) continue; if ( qstrcmp( p->name(), "enabled" ) == 0 ) continue; @@ -3061,21 +3061,21 @@ static void clearAlignList( TQStrList &l ) void PropertyList::setPropertyValue( PropertyItem *i ) { const TQMetaProperty *p = - editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->findProperty( i->name(), true), true ); + editor->widget()->metaObject()-> + property( editor->widget()->metaObject()->findProperty( i->name(), true), true ); if ( !p ) { if ( i->name() == "hAlign" ) { int align = editor->widget()->property( "tqalignment" ).toInt(); - p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", true ), true ); + p = editor->widget()->metaObject()-> + property( editor->widget()->metaObject()->findProperty( "tqalignment", true ), true ); align &= ~AlignVertical_Mask; TQStrList l = p->valueToKeys( align ); clearAlignList( l ); ( (PropertyListItem*)i )->setCurrentItem( l.last() ); } else if ( i->name() == "vAlign" ) { int align = editor->widget()->property( "tqalignment" ).toInt(); - p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", true ), true ); + p = editor->widget()->metaObject()-> + property( editor->widget()->metaObject()->findProperty( "tqalignment", true ), true ); align &= ~AlignHorizontal_Mask; ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() ); } else if ( i->name() == "wordwrap" ) { @@ -3229,7 +3229,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i ) if ( ( (PropertyItem*)i )->propertyParent() ) i = ( (PropertyItem*)i )->propertyParent(); - const TQMetaObject *mo = editor->widget()->tqmetaObject(); + const TQMetaObject *mo = editor->widget()->metaObject(); TQString prop = ( (PropertyItem*)i )->name(); while ( mo ) { TQString s; @@ -3238,7 +3238,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i ) if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) { return *it; } - mo = mo->tqsuperClass(); + mo = mo->superClass(); } return i18n("<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).tqarg( prop ); @@ -3327,7 +3327,7 @@ void EventList::setup() #endif } } else { - TQStrList sigs = editor->widget()->tqmetaObject()->signalNames( true ); + TQStrList sigs = editor->widget()->metaObject()->signalNames( true ); sigs.remove( "destroyed()" ); TQStrListIterator it( sigs ); while ( it.current() ) { @@ -3674,21 +3674,21 @@ TQString PropertyEditor::classOfCurrentProperty() const return TQString(); TQObject *o = wid; TQString curr = currentProperty(); - TQMetaObject *mo = o->tqmetaObject(); + TQMetaObject *mo = o->metaObject(); while ( mo ) { TQStrList props = mo->propertyNames( false ); if ( props.find( curr.latin1() ) != -1 ) return mo->className(); - mo = mo->tqsuperClass(); + mo = mo->superClass(); } return TQString(); } -TQMetaObject* PropertyEditor::tqmetaObjectOfCurrentProperty() const +TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const { if ( !wid ) return 0; - return wid->tqmetaObject(); + return wid->metaObject(); } void PropertyEditor::resetFocus() diff --git a/kommander/editor/propertyeditor.h b/kommander/editor/propertyeditor.h index 61d4e4dc..b49924e2 100644 --- a/kommander/editor/propertyeditor.h +++ b/kommander/editor/propertyeditor.h @@ -590,7 +590,7 @@ public: TQString currentProperty() const; TQString classOfCurrentProperty() const; - TQMetaObject* tqmetaObjectOfCurrentProperty() const; + TQMetaObject* metaObjectOfCurrentProperty() const; void resetFocus(); diff --git a/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp index 78523a95..6a7cb2a9 100644 --- a/kommander/editor/qcompletionedit.cpp +++ b/kommander/editor/qcompletionedit.cpp @@ -62,8 +62,8 @@ void QCompletionEdit::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/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index 93f6cc9b..c5450658 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -404,10 +404,10 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) if ( formwindow->tqlayout() ) formwindow->tqlayout()->activate(); if ( hadGeometry ) - formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize(). - expandedTo( formwindow->tqminimumSizeHint() ) ) ); + formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize(). + expandedTo( formwindow->minimumSizeHint() ) ) ); else - formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) ); + formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) ); } return true; @@ -984,8 +984,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( w->inherits( "Spacer" ) ) { - if ( !changed.contains( "tqsizeHint" ) ) - changed << "tqsizeHint"; + if ( !changed.contains( "sizeHint" ) ) + changed << "sizeHint"; if ( !changed.contains( "geometry" ) ) changed << "geometry"; } @@ -1006,15 +1006,15 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() && WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; - TQStrList lst = w->tqmetaObject()->propertyNames( !w->inherits( "Spacer" ) ); + TQStrList lst = w->metaObject()->propertyNames( !w->inherits( "Spacer" ) ); for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { - if ( changed.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() ) + if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() ) continue; - if ( saved.find( TQString::tqfromLatin1( it.current() ) ) != saved.end() ) + if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() ) continue; - saved << TQString::tqfromLatin1( it.current() ); - const TQMetaProperty* p = w->tqmetaObject()-> - property( w->tqmetaObject()->findProperty( it.current(), true ), true ); + saved << TQString::fromLatin1( it.current() ); + const TQMetaProperty* p = w->metaObject()-> + property( w->metaObject()->findProperty( it.current(), true ), true ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; if ( w->inherits( TQLABEL_OBJECT_NAME_STRING ) && qstrcmp( p->name(), "pixmap" ) == 0 && @@ -1066,7 +1066,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, true ), true ); + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true ); TQStrList l( p->valueToKeys( w->property( name ).toInt() ) ); TQString v; for ( uint i = 0; i < l.count(); ++i ) { @@ -1079,7 +1079,7 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, true ), true ); + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, true ), true ); ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl; } @@ -1644,7 +1644,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay */ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e ) { - const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, true ), true ); + const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true ); if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { @@ -2090,8 +2090,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) << "\">" << w->includeFile << "</header>" << endl; ts << makeIndent( indent ) << "<sizehint>" << endl; indent++; - ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl; - ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl; + ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl; + ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl; indent--; ts << makeIndent( indent ) << "</sizehint>" << endl; ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl; @@ -2147,9 +2147,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/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp index 72f7c38c..10b4efb3 100644 --- a/kommander/editor/sizehandle.cpp +++ b/kommander/editor/sizehandle.cpp @@ -236,9 +236,9 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height ) { - int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() ); + int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() ); minw = TQMAX( minw, 2 * formWindow->grid().x() ); - int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ); + int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() ); minh = TQMAX( minh, 2 * formWindow->grid().y() ); if ( TQMAX( minw, width ) > w->maximumWidth() || TQMAX( minh, height ) > w->maximumHeight() ) @@ -252,9 +252,9 @@ void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int heigh void SizeHandle::tryResize( TQWidget *w, int width, int height ) { - int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() ); + int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() ); minw = TQMAX( minw, 16 ); - int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ); + int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() ); minh = TQMAX( minh, 16 ); w->resize( TQMAX( minw, width ), TQMAX( minh, height ) ); } diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp index 37a28911..189a3ef2 100644 --- a/kommander/editor/styledbutton.cpp +++ b/kommander/editor/styledbutton.cpp @@ -35,7 +35,7 @@ StyledButton::StyledButton(TQWidget* parent, const char* name) : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( false ) { - setMinimumSize( tqminimumSizeHint() ); + setMinimumSize( minimumSizeHint() ); setAcceptDrops( true ); connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor())); @@ -48,7 +48,7 @@ StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name { col = b.color(); pix = b.pixmap(); - setMinimumSize( tqminimumSizeHint() ); + setMinimumSize( minimumSizeHint() ); } StyledButton::~StyledButton() @@ -111,12 +111,12 @@ void StyledButton::setScale( bool on ) scalePixmap(); } -TQSize StyledButton::tqsizeHint() const +TQSize StyledButton::sizeHint() const { return TQSize( 50, 25 ); } -TQSize StyledButton::tqminimumSizeHint() const +TQSize StyledButton::minimumSizeHint() const { return TQSize( 50, 25 ); } @@ -145,14 +145,14 @@ void StyledButton::resizeEvent( TQResizeEvent* e ) void StyledButton::drawButton( TQPainter *paint ) { - tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), tqcolorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(), isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised); drawButtonLabel(paint); if (hasFocus()) tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint, tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this), - tqcolorGroup(), TQStyle::Style_Default); + colorGroup(), TQStyle::Style_Default); } void StyledButton::drawButtonLabel( TQPainter *paint ) @@ -163,7 +163,7 @@ void StyledButton::drawButtonLabel( TQPainter *paint ) paint->setPen( pen ); if(!isEnabled()) { - paint->setBrush( TQBrush( tqcolorGroup().button() ) ); + paint->setBrush( TQBrush( colorGroup().button() ) ); } else if ( edit == PixmapEditor && spix ) { paint->setBrush( TQBrush( col, *spix ) ); diff --git a/kommander/editor/styledbutton.h b/kommander/editor/styledbutton.h index 883c95ad..3a8c2691 100644 --- a/kommander/editor/styledbutton.h +++ b/kommander/editor/styledbutton.h @@ -59,8 +59,8 @@ public: void setScale( bool ); bool scale() const; - TQSize tqsizeHint() const; - TQSize tqminimumSizeHint() const; + TQSize sizeHint() const; + TQSize minimumSizeHint() const; void setFormWindow( FormWindow *fw ) { formWindow = fw; } diff --git a/kommander/editor/tableeditor.ui b/kommander/editor/tableeditor.ui index b3331a98..8d503842 100644 --- a/kommander/editor/tableeditor.ui +++ b/kommander/editor/tableeditor.ui @@ -87,7 +87,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -299,7 +299,7 @@ <property name="name"> <cstring>buttonDeleteColPixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -322,7 +322,7 @@ <property name="name"> <cstring>buttonChooseColPixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -425,7 +425,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -481,7 +481,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -566,7 +566,7 @@ <property name="name"> <cstring>buttonDeleteRowPixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> @@ -589,7 +589,7 @@ <property name="name"> <cstring>buttonChooseRowPixmap</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>30</width> <height>22</height> diff --git a/kommander/editor/templates/Configuration_Dialog.ui b/kommander/editor/templates/Configuration_Dialog.ui index 8d792741..cdfbdfd4 100644 --- a/kommander/editor/templates/Configuration_Dialog.ui +++ b/kommander/editor/templates/Configuration_Dialog.ui @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui index 6278ab75..51669089 100644 --- a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui +++ b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui index 2158eabd..938590f3 100644 --- a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui +++ b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/templates/Tab_Dialog.ui b/kommander/editor/templates/Tab_Dialog.ui index c85b3e8f..64df4236 100644 --- a/kommander/editor/templates/Tab_Dialog.ui +++ b/kommander/editor/templates/Tab_Dialog.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index 9f619c79..585d720d 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -399,7 +399,7 @@ TQMap< int, TQStringList > *changedProperties = 0; void WidgetFactory::saveDefaultProperties( TQWidget *w, int id ) { TQMap< TQString, TQVariant> propMap; - TQStrList lst = w->tqmetaObject()->propertyNames( true ); + TQStrList lst = w->metaObject()->propertyNames( true ); for ( uint i = 0; i < lst.count(); ++i ) { TQVariant var = w->property( lst.at( i ) ); if ( !var.isValid() && qstrcmp( "pixmap", lst.at( i ) ) == 0 ) @@ -710,21 +710,21 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay l = new TQHBoxLayout( gb->tqlayout() ); MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); - l->tqsetAlignment( AlignTop ); + l->setAlignment( AlignTop ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); return l; case VBox: l = new TQVBoxLayout( gb->tqlayout(), spacing ); MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); - l->tqsetAlignment( AlignTop ); + l->setAlignment( AlignTop ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); return l; case Grid: l = new QDesignerGridLayout( gb->tqlayout() ); MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); - l->tqsetAlignment( AlignTop ); + l->setAlignment( AlignTop ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); return l; default: @@ -838,7 +838,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (init) { b = new QDesignerPushButton(parent, name); - b->setText(TQString::tqfromLatin1(name)); + b->setText(TQString::fromLatin1(name)); } else { b = new QDesignerPushButton(parent, name); @@ -860,7 +860,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (init) { QDesignerCheckBox *cb = new QDesignerCheckBox(parent, name); - cb->setText(TQString::tqfromLatin1(name)); + cb->setText(TQString::fromLatin1(name)); return cb; } return new QDesignerCheckBox(parent, name); @@ -869,19 +869,19 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (init) { QDesignerRadioButton *rb = new QDesignerRadioButton(parent, name); - rb->setText(TQString::tqfromLatin1(name)); + rb->setText(TQString::fromLatin1(name)); return rb; } return new QDesignerRadioButton(parent, name); } else if (className == TQGROUPBOX_OBJECT_NAME_STRING) { if (init) - return new TQGroupBox(TQString::tqfromLatin1(name), parent, name); + return new TQGroupBox(TQString::fromLatin1(name), parent, name); return new TQGroupBox(parent, name); } else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING) { if (init) - return new TQButtonGroup(TQString::tqfromLatin1(name), parent, name); + return new TQButtonGroup(TQString::fromLatin1(name), parent, name); return new TQButtonGroup(parent, name); } else if (className == TQICONVIEW_OBJECT_NAME_STRING) { @@ -950,7 +950,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare QDesignerLabel *l = new QDesignerLabel(parent, name); if (init) { - l->setText(TQString::tqfromLatin1(name)); + l->setText(TQString::fromLatin1(name)); MetaDataBase::addEntry(TQT_TQOBJECT(l)); MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "text", true); } @@ -1668,7 +1668,7 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName ) bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName ) { - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()-> + const TQMetaProperty *p = w->metaObject()->property( w->metaObject()-> findProperty( propName, true ), true ); if (!p ) return false; @@ -1681,7 +1681,7 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) int v = defaultValue( w, "tqalignment" ).toInt(); return TQVariant( ( v & WordBreak ) == WordBreak, 0 ); } else if ( propName == "toolTip" || propName == "whatsThis" ) { - return TQVariant( TQString::tqfromLatin1( "" ) ); + return TQVariant( TQString::fromLatin1( "" ) ); } else if ( w->inherits( "CustomWidget" ) ) { return TQVariant(); } else if ( propName == "frameworkCode" ) { @@ -1701,8 +1701,8 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName ) { - const TQMetaProperty *p = w->tqmetaObject()-> - property( w->tqmetaObject()->findProperty( propName, true ), true ); + const TQMetaProperty *p = w->metaObject()-> + property( w->metaObject()->findProperty( propName, true ), true ); if ( !p ) { int v = defaultValue( w, "tqalignment" ).toInt(); if ( propName == "hAlign" ) { @@ -1751,7 +1751,7 @@ void QDesignerLabel::updateBuddy() if ( myBuddy.isEmpty() ) return; - TQObjectList *l = tqtopLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, false, true ); + TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, false, true ); if ( !l || !l->first() ) { delete l; return; @@ -1800,7 +1800,7 @@ void TQLayoutWidget::updateSizePolicy() { TQObjectList clo = childrenListObject(); if ( clo.isEmpty() || clo.count() == 0 ) { - sp = TQWidget::tqsizePolicy(); + sp = TQWidget::sizePolicy(); return; } @@ -1844,13 +1844,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 ( tqlayout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) { @@ -1865,13 +1865,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 ( tqlayout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { @@ -1890,20 +1890,20 @@ 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; } } #ifdef USE_QT4 - if ( tqlayout()->expandingDirections() & TQSizePolicy::Horizontally ) + if ( tqlayout()->expanding() & TQSizePolicy::Horizontally ) ht = TQSizePolicy::Expanding; - if ( tqlayout()->expandingDirections() & TQSizePolicy::Vertically ) + if ( tqlayout()->expanding() & TQSizePolicy::Vertically ) vt = TQSizePolicy::Expanding; #else // USE_QT4 if ( tqlayout()->expanding() & TQSizePolicy::Horizontally ) @@ -1925,7 +1925,7 @@ void CustomWidget::paintEvent( TQPaintEvent *e ) ( (FormWindow*)parentWidget() )->paintGrid( this, e ); } else { TQPainter p( this ); - p.fillRect( rect(), tqcolorGroup().dark() ); + p.fillRect( rect(), colorGroup().dark() ); p.drawPixmap( ( width() - cusw->pixmap->width() ) / 2, ( height() - cusw->pixmap->height() ) / 2, *cusw->pixmap ); diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index 9ebce67c..0480e5ae 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -230,7 +230,7 @@ class TQLayoutWidget : public TQWidget TQ_OBJECT public: - TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::tqsizePolicy() ) {} + TQLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::sizePolicy() ) {} TQSizePolicy sizePolicy() const; void updateSizePolicy(); @@ -252,16 +252,16 @@ public: CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw ) : TQWidget( parent, name ), cusw( cw ) { alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" ); - tqsetSizePolicy( cw->sizePolicy ); + setSizePolicy( cw->sizePolicy ); if ( !alwaysExpand ) setBackgroundMode( 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/kommander/editor/wizardeditor.ui b/kommander/editor/wizardeditor.ui index 31c64505..2f5c16e4 100644 --- a/kommander/editor/wizardeditor.ui +++ b/kommander/editor/wizardeditor.ui @@ -108,7 +108,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -176,7 +176,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> |