From 2b0e1de2ffcca7bb93f1fd8ddd32f74041d0d076 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:51:43 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kommander/editor/actiondnd.cpp | 62 ++++---- kommander/editor/actiondnd.h | 2 +- kommander/editor/actioneditor.ui | 2 +- kommander/editor/assoctexteditor.ui | 8 +- kommander/editor/assoctexteditorimpl.cpp | 14 +- kommander/editor/choosewidget.ui | 8 +- kommander/editor/choosewidgetimpl.cpp | 6 +- kommander/editor/choosewidgetimpl.h | 2 +- kommander/editor/command.cpp | 80 +++++----- kommander/editor/command.h | 14 +- kommander/editor/connectioneditor.ui | 14 +- kommander/editor/connectioneditorimpl.cpp | 24 +-- kommander/editor/createtemplate.ui | 6 +- kommander/editor/filechooser.cpp | 10 +- kommander/editor/formfile.cpp | 8 +- kommander/editor/formsettings.ui | 4 +- kommander/editor/formwindow.cpp | 84 +++++------ kommander/editor/functions.ui | 38 ++--- kommander/editor/functionsimpl.cpp | 26 ++-- kommander/editor/hierarchyview.cpp | 12 +- kommander/editor/iconvieweditor.ui | 10 +- kommander/editor/iconvieweditorimpl.cpp | 2 +- kommander/editor/kommander-new.xml | 4 +- kommander/editor/kommander.xml | 8 +- kommander/editor/layout.cpp | 66 ++++----- kommander/editor/layout.h | 14 +- kommander/editor/listboxeditor.ui | 10 +- kommander/editor/listboxeditorimpl.cpp | 2 +- kommander/editor/listeditor.ui | 2 +- kommander/editor/listvieweditor.ui | 18 +-- kommander/editor/listvieweditorimpl.cpp | 2 +- kommander/editor/mainwindow.cpp | 70 ++++----- kommander/editor/mainwindowactions.cpp | 54 +++---- kommander/editor/messagelog.cpp | 12 +- kommander/editor/metadatabase.cpp | 48 +++--- kommander/editor/metadatabase.h | 2 +- kommander/editor/multilineeditor.ui | 4 +- kommander/editor/multilineeditorimpl.cpp | 4 +- kommander/editor/newform.ui | 4 +- kommander/editor/newformimpl.cpp | 2 +- kommander/editor/paletteeditor.ui | 14 +- kommander/editor/paletteeditoradvanced.ui | 10 +- kommander/editor/paletteeditoradvancedimpl.cpp | 12 +- kommander/editor/parser.cpp | 2 +- kommander/editor/pics/images.h | 12 +- kommander/editor/pixmapchooser.cpp | 4 +- kommander/editor/pixmapfunction.ui | 6 +- kommander/editor/preferences.ui | 4 +- kommander/editor/previewframe.cpp | 2 +- kommander/editor/previewwidget.ui | 4 +- kommander/editor/propertyeditor.cpp | 126 ++++++++-------- kommander/editor/propertyeditor.h | 6 +- kommander/editor/qcompletionedit.cpp | 4 +- kommander/editor/resource.cpp | 110 +++++++------- kommander/editor/resource.h | 6 +- kommander/editor/sizehandle.cpp | 14 +- kommander/editor/styledbutton.cpp | 22 +-- kommander/editor/styledbutton.h | 4 +- kommander/editor/tableeditor.ui | 18 +-- kommander/editor/tableeditorimpl.cpp | 2 +- kommander/editor/templates/Configuration_Dialog.ui | 2 +- .../templates/Dialog_with_Buttons_(Bottom).ui | 2 +- .../templates/Dialog_with_Buttons_(Right).ui | 2 +- kommander/editor/templates/Tab_Dialog.ui | 2 +- kommander/editor/widgetdatabase.cpp | 4 +- kommander/editor/widgetfactory.cpp | 162 ++++++++++----------- kommander/editor/widgetfactory.h | 18 +-- kommander/editor/wizardeditor.ui | 4 +- kommander/editor/wizardeditorimpl.cpp | 14 +- kommander/editor/workspace.cpp | 6 +- 70 files changed, 680 insertions(+), 680 deletions(-) (limited to 'kommander/editor') diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index 7207da73..0eac8348 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -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 ); } @@ -294,7 +294,7 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) menu.insertItem( i18n("Delete Toolbar" ), 1 ); int res = menu.exec( e->globalPos() ); if ( res != -1 ) { - RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n("Delete Toolbar '%1'" ).tqarg( name() ), + RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n("Delete Toolbar '%1'" ).arg( name() ), formWindow, 0, this ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -360,7 +360,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n("Delete Action '%1' From Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -380,7 +380,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject * formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } else if ( res == ID_DELTOOLBAR ) { - RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n("Delete Toolbar '%1'" ).tqarg( name() ), + RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n("Delete Toolbar '%1'" ).arg( name() ), formWindow, 0, this ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -420,7 +420,7 @@ void QDesignerToolBar::removeWidget( TQWidget *w ) int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n("Delete Action '%1' From Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -443,7 +443,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( i18n("Delete Action '%1' From Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -462,7 +462,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) } if ( !drag->drag() ) { AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n("Add Action '%1' to Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -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; @@ -543,7 +543,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e ) } AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n("Add Action '%1' to Toolbar '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -671,7 +671,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p ) if ( !insertAnchor ) index = 0; AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n("Add Widget '%1' to Toolbar '%2'" ). - tqarg( w->name() ).tqarg( caption() ), + arg( w->name() ).arg( caption() ), formWindow, a, this, index ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -739,16 +739,16 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e ) int res = menu.exec( e->globalPos() ); if ( res == 1 ) { TQMenuItem *item = findItem( idAt( itm ) ); - RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).tqarg( item->text() ), + RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).arg( item->text() ), formWindow, (TQMainWindow*)parentWidget(), this, (QDesignerPopupMenu*)item->popup(), idAt( itm ), itm, item->text() ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - // #### need to do a proper tqinvalidate and re-tqlayout - parentWidget()->tqlayout()->tqinvalidate(); - parentWidget()->tqlayout()->activate(); + // #### need to do a proper invalidate and re-layout + parentWidget()->layout()->invalidate(); + parentWidget()->layout()->activate(); } else if ( res == 2 ) { bool ok; TQString old = text( idAt( itm ) ); @@ -756,7 +756,7 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e ) text( idAt( itm ) ), &ok, 0 ); if ( ok ) { RenameMenuCommand *cmd = new RenameMenuCommand( - i18n("Rename Menu '%1' to '%2'" ).tqarg( old ).tqarg( txt ), + i18n("Rename Menu '%1' to '%2'" ).arg( old ).arg( txt ), formWindow, this, idAt( itm ), old, txt ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -873,14 +873,14 @@ 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 TQString txt = s2; insertItem( txt, popup, -1, insertAt ); - MoveMenuCommand *cmd = new MoveMenuCommand( i18n("Move Menu '%1'" ).tqarg( txt ), formWindow, + MoveMenuCommand *cmd = new MoveMenuCommand( i18n("Move Menu '%1'" ).arg( txt ), formWindow, this, (QDesignerPopupMenu*)popup, oldPos, insertAt, txt ); // do not execute, we did the work already formWindow->commandHistory()->addCommand( cmd ); @@ -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; @@ -1030,7 +1030,7 @@ void QDesignerPopupMenu::createPopupMenu() return; RemoveActionFromPopupCommand *cmd = new RemoveActionFromPopupCommand( i18n("Delete Action '%1' From Popup Menu '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, itm ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1069,7 +1069,7 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e ) if ( !a ) return; RemoveActionFromPopupCommand *cmd = new RemoveActionFromPopupCommand( i18n("Delete Action '%1' From Popup Menu '%2'" ). - tqarg( a->name() ).tqarg( caption() ), + arg( a->name() ).arg( caption() ), formWindow, a, this, itm ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1082,7 +1082,7 @@ void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e ) drag->setPixmap( a->iconSet().pixmap() ); if ( !drag->drag() ) { AddActionToPopupCommand *cmd = new AddActionToPopupCommand( i18n("Add Action '%1' to Popup Menu '%2'" ). - tqarg( a->name() ).tqarg( name() ), + arg( a->name() ).arg( name() ), formWindow, a, this, itm ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -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(); } } @@ -1164,7 +1164,7 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e ) } AddActionToPopupCommand *cmd = new AddActionToPopupCommand( i18n("Add Action '%1' to Popup Menu '%2'" ). - tqarg( a->name() ).tqarg( name() ), + arg( a->name() ).arg( name() ), formWindow, a, this, insertAt ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); 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 @@ Expanding - + 20 20 diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui index d3565506..9fa637c3 100644 --- a/kommander/editor/assoctexteditor.ui +++ b/kommander/editor/assoctexteditor.ui @@ -21,7 +21,7 @@ - tqlayout5 + layout5 @@ -114,7 +114,7 @@ Fixed - + 20 20 @@ -152,7 +152,7 @@ 0 - + 150 0 @@ -169,7 +169,7 @@ Fixed - + 20 20 diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index 1298db05..8498b96f 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -90,9 +90,9 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, } doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(a_parent), "KTextEditor::Document"); - TQGridLayout *tqlayout = new TQGridLayout(editorFrame, 1, 1); + TQGridLayout *layout = new TQGridLayout(editorFrame, 1, 1); view = doc->createView(editorFrame); - tqlayout->addWidget(view, 1,1); + layout->addWidget(view, 1,1); partManager->addPart(doc, true); //trick to import all the KatePart actions into the dialog @@ -268,7 +268,7 @@ void AssocTextEditor::save() const if (atw->associatedText() != associatedText()) { - TQString text = i18n("Set the \'text association\' of \'%1\'").tqarg(m_widget->name()); + TQString text = i18n("Set the \'text association\' of \'%1\'").arg(m_widget->name()); SetPropertyCommand *cmd = new SetPropertyCommand(text, m_formWindow, TQT_TQOBJECT(m_widget), m_propertyEditor, "associations", atw->associatedText(), associatedText(), TQString(), TQString(), false); @@ -278,7 +278,7 @@ void AssocTextEditor::save() const } if (atw->populationText() != populationText()) { - TQString text = i18n("Set the \'population text\' of \'%1\'").tqarg(m_widget->name()); + TQString text = i18n("Set the \'population text\' of \'%1\'").arg(m_widget->name()); SetPropertyCommand *cmd = new SetPropertyCommand(text, m_formWindow, TQT_TQOBJECT(m_widget), m_propertyEditor, "populationText", atw->populationText(), populationText(), TQString(), TQString(), false); @@ -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); @@ -427,7 +427,7 @@ void AssocTextEditor::insertFile() TQFile insertFile(fileName); if(!insertFile.open(IO_ReadOnly)) { - KMessageBox::error( this, i18n("Cannot open file
%1Cannot open file
%1name()).tqarg(widget->className()); + return TQString("%1 (%2)").arg(widget->name()).arg(widget->className()); else return widget->name(); } diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui index fc9887c9..64970e5a 100644 --- a/kommander/editor/choosewidget.ui +++ b/kommander/editor/choosewidget.ui @@ -24,7 +24,7 @@ - tqlayout2 + layout2 @@ -40,7 +40,7 @@ Expanding - + 20 20 @@ -88,7 +88,7 @@ Expanding - + 20 20 @@ -104,7 +104,7 @@ - tqlayout3 + layout3 diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp index c9a6642d..c5b1bbb7 100644 --- a/kommander/editor/choosewidgetimpl.cpp +++ b/kommander/editor/choosewidgetimpl.cpp @@ -55,7 +55,7 @@ void ChooseWidget::setWidget(TQWidget* w) TQPtrStack p_widgets; TQPtrStack p_items; - item = new TQListViewItem(widgetView, TQString("%1 (%2)").tqarg(w->name()).tqarg(w->className())); + item = new TQListViewItem(widgetView, TQString("%1 (%2)").arg(w->name()).arg(w->className())); item->setOpen(true); p_widgets.push(w); @@ -68,7 +68,7 @@ void ChooseWidget::setWidget(TQWidget* w) for (TQObjectListIt it(*objectList); it.current(); ++it) { TQListViewItem* newItem = item; if (isKommanderWidget(*it)) - newItem = new TQListViewItem(item, TQString("%1 (%2)").tqarg((*it)->name()).tqarg((*it)->className())); + newItem = new TQListViewItem(item, TQString("%1 (%2)").arg((*it)->name()).arg((*it)->className())); if (!(*it)->childrenListObject().isEmpty()) { p_widgets.push((TQWidget*)(*it)); p_items.push(newItem); @@ -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/choosewidgetimpl.h b/kommander/editor/choosewidgetimpl.h index 24e902ad..dec3fbd3 100644 --- a/kommander/editor/choosewidgetimpl.h +++ b/kommander/editor/choosewidgetimpl.h @@ -26,7 +26,7 @@ class ChooseWidget : public ChooseWidgetBase public: ChooseWidget(TQWidget*, const char* = 0, bool=true); ~ChooseWidget(); - // Put current widget and all of its tqchildren in a tree + // Put current widget and all of its children in a tree void setWidget(TQWidget *); // Return current widget TQString selection(); diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index c1b8db31..41ea2b23 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -253,19 +253,19 @@ void ResizeCommand::unexecute() InsertCommand::InsertCommand( const TQString &n, FormWindow *fw, TQWidget *w, const TQRect &g ) - : Command( n, fw ), widget( w ), tqgeometry( g ) + : Command( n, fw ), widget( w ), geometry( g ) { } void InsertCommand::execute() { - if ( tqgeometry.size() == TQSize( 0, 0 ) ) { - widget->move( tqgeometry.topLeft() ); + if ( geometry.size() == TQSize( 0, 0 ) ) { + widget->move( geometry.topLeft() ); widget->adjustSize(); } else { - TQSize s = tqgeometry.size().expandedTo( widget->tqminimumSize() ); - s = s.expandedTo( widget->tqminimumSizeHint() ); - TQRect r( tqgeometry.topLeft(), s ); + TQSize s = geometry.size().expandedTo( widget->minimumSize() ); + s = s.expandedTo( widget->minimumSizeHint() ); + TQRect r( geometry.topLeft(), s ); widget->setGeometry( r ); } widget->show(); @@ -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,26 +532,26 @@ 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 ); - int align = widget->property( "tqalignment" ).toInt(); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true ); + int align = widget->property( "alignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); align |= p->keyToValue( currentItemText ); - widget->setProperty( "tqalignment", TQVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", true ), true ); - int align = widget->property( "tqalignment" ).toInt(); + p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true ); + int align = widget->property( "alignment" ).toInt(); align &= ~( AlignVertical_Mask ); align |= p->keyToValue( currentItemText ); - widget->setProperty( "tqalignment", TQVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "wordwrap" ) { - int align = widget->property( "tqalignment" ).toInt(); + int align = widget->property( "alignment" ).toInt(); align &= ~WordBreak; if ( v.toBool() ) align |= WordBreak; - widget->setProperty( "tqalignment", TQVariant( align ) ); + widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "layoutSpacing" ) { MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() ); } else if ( propName == "layoutMargin" ) { @@ -630,21 +630,21 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase ) { } void LayoutHorizontalCommand::execute() { formWindow()->clearSelection( false ); - tqlayout.doLayout(); + layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutHorizontalCommand::unexecute() { formWindow()->clearSelection( false ); - tqlayout.undoLayout(); + layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -653,21 +653,21 @@ void LayoutHorizontalCommand::unexecute() LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, true, true ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase, true, true ) { } void LayoutHorizontalSplitCommand::execute() { formWindow()->clearSelection( false ); - tqlayout.doLayout(); + layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutHorizontalSplitCommand::unexecute() { formWindow()->clearSelection( false ); - tqlayout.undoLayout(); + layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -676,21 +676,21 @@ void LayoutHorizontalSplitCommand::unexecute() LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase ) { } void LayoutVerticalCommand::execute() { formWindow()->clearSelection( false ); - tqlayout.doLayout(); + layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutVerticalCommand::unexecute() { formWindow()->clearSelection( false ); - tqlayout.undoLayout(); + layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -699,21 +699,21 @@ void LayoutVerticalCommand::unexecute() LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, true, true ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase, true, true ) { } void LayoutVerticalSplitCommand::execute() { formWindow()->clearSelection( false ); - tqlayout.doLayout(); + layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutVerticalSplitCommand::unexecute() { formWindow()->clearSelection( false ); - tqlayout.undoLayout(); + layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -722,21 +722,21 @@ void LayoutVerticalSplitCommand::unexecute() LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw, TQWidget *parent, TQWidget *layoutBase, const TQWidgetList &wl, int xres, int yres ) - : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) + : Command( n, fw ), layout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) { } void LayoutGridCommand::execute() { formWindow()->clearSelection( false ); - tqlayout.doLayout(); + layout.doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } void LayoutGridCommand::unexecute() { formWindow()->clearSelection( false ); - tqlayout.undoLayout(); + layout.undoLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -749,21 +749,21 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw, WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase ); spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) ); margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) ); - tqlayout = 0; + layout = 0; if ( lay == WidgetFactory::HBox ) - tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); + layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); else if ( lay == WidgetFactory::VBox ) - tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); + layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); else if ( lay == WidgetFactory::Grid ) - tqlayout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false ); + layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false ); } void BreakLayoutCommand::execute() { - if ( !tqlayout ) + if ( !layout ) return; formWindow()->clearSelection( false ); - tqlayout->breakLayout(); + layout->breakLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->resize( TQMAX( 16, w->width() ), TQMAX( 16, w->height() ) ); @@ -771,10 +771,10 @@ void BreakLayoutCommand::execute() void BreakLayoutCommand::unexecute() { - if ( !tqlayout ) + if ( !layout ) return; formWindow()->clearSelection( false ); - tqlayout->doLayout(); + layout->doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing ); MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin ); diff --git a/kommander/editor/command.h b/kommander/editor/command.h index 4d1a3aa5..398e733d 100644 --- a/kommander/editor/command.h +++ b/kommander/editor/command.h @@ -181,7 +181,7 @@ public: private: TQWidget *widget; - TQRect tqgeometry; + TQRect geometry; }; @@ -263,7 +263,7 @@ public: Type type() const { return LayoutHorizontal; } private: - HorizontalLayout tqlayout; + HorizontalLayout layout; }; @@ -279,7 +279,7 @@ public: Type type() const { return LayoutHorizontalSplitter; } private: - HorizontalLayout tqlayout; + HorizontalLayout layout; }; @@ -295,7 +295,7 @@ public: Type type() const { return LayoutVertical; } private: - VerticalLayout tqlayout; + VerticalLayout layout; }; @@ -311,7 +311,7 @@ public: Type type() const { return LayoutVerticalSplitter; } private: - VerticalLayout tqlayout; + VerticalLayout layout; }; @@ -327,7 +327,7 @@ public: Type type() const { return LayoutGrid; } private: - GridLayout tqlayout; + GridLayout layout; }; @@ -342,7 +342,7 @@ public: Type type() const { return BreakLayout; } private: - Layout *tqlayout; + Layout *layout; int spacing; int margin; TQWidget *lb; diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui index 63d59f49..1fc5c679 100644 --- a/kommander/editor/connectioneditor.ui +++ b/kommander/editor/connectioneditor.ui @@ -129,7 +129,7 @@ - tqlayout3 + layout3 @@ -203,7 +203,7 @@ - tqlayout7 + layout7 @@ -239,7 +239,7 @@ Expanding - + 71 21 @@ -293,7 +293,7 @@ Expanding - + 230 20 @@ -304,7 +304,7 @@ - tqlayout8 + layout8 @@ -331,7 +331,7 @@ Expanding - + 231 20 @@ -368,7 +368,7 @@ Expanding - + 211 20 diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index 4613380b..0719716f 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -44,14 +44,14 @@ static const char *const ignore_slots[] = { "update()", "update(int,int,int,int)", "update(const TQRect&)", - "tqrepaint()", - "tqrepaint(bool)", - "tqrepaint(int,int,int,int,bool)", - "tqrepaint(const TQRect&,bool)", - "tqrepaint(const TQRegion&,bool)", - "tqrepaint(int,int,int,int)", - "tqrepaint(const TQRect&)", - "tqrepaint(const TQRegion&)", + "repaint()", + "repaint(bool)", + "repaint(int,int,int,int,bool)", + "repaint(const TQRect&,bool)", + "repaint(const TQRegion&,bool)", + "repaint(int,int,int,int)", + "repaint(const TQRect&)", + "repaint(const TQRegion&)", //"show()", //"hide()", "iconify()", @@ -226,7 +226,7 @@ void ConnectionEditor::disconnectClicked() void ConnectionEditor::okClicked() { MacroCommand* rmConn = 0, *addConn = 0; - TQString n = i18n("Connect/Disconnect the signals and slots of '%1' and '%2'").tqarg(m_sender->name()). + TQString n = i18n("Connect/Disconnect the signals and slots of '%1' and '%2'").arg(m_sender->name()). arg(m_receiver->name()); TQValueList ::Iterator cit; if (!m_oldConnections.isEmpty()) @@ -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..263d71c1 100644 --- a/kommander/editor/createtemplate.ui +++ b/kommander/editor/createtemplate.ui @@ -25,7 +25,7 @@ CreateTemplate - tqgeometry + geometry 0 0 @@ -124,7 +124,7 @@ Expanding - tqsizeHint + sizeHint 20 20 @@ -196,7 +196,7 @@ Expanding - tqsizeHint + sizeHint 20 20 diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp index 39b3d9ca..d5a68f7f 100644 --- a/kommander/editor/filechooser.cpp +++ b/kommander/editor/filechooser.cpp @@ -2,23 +2,23 @@ #include #include #include -#include +#include FileChooser::FileChooser( TQWidget *parent, const char *name ) : TQWidget( parent, name ), md( File ) { - TQHBoxLayout *tqlayout = new TQHBoxLayout( this ); - tqlayout->setMargin( 0 ); + TQHBoxLayout *layout = new TQHBoxLayout( this ); + layout->setMargin( 0 ); lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); - tqlayout->addWidget( lineEdit ); + layout->addWidget( lineEdit ); connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) ); button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); - tqlayout->addWidget( button ); + layout->addWidget( button ); connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( chooseFile() ) ); diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp index 493df215..fbb64d48 100644 --- a/kommander/editor/formfile.cpp +++ b/kommander/editor/formfile.cpp @@ -119,12 +119,12 @@ bool FormFile::save(bool withMsgBox) if (!resource.save(filename, false)) { if (KMessageBox::questionYesNo(MainWindow::self, i18n("Failed to save file '%1'.\n" - "Do you want to use another file name?").tqarg(filename), TQString(), i18n("Try Another"), i18n("Do Not Try")) == KMessageBox::Yes) + "Do you want to use another file name?").arg(filename), TQString(), i18n("Try Another"), i18n("Do Not Try")) == KMessageBox::Yes) return saveAs(); else return false; } - MainWindow::self->statusBar()->message(i18n("'%1' saved.").tqarg(filename), 3000); + MainWindow::self->statusBar()->message(i18n("'%1' saved.").arg(filename), 3000); ::chmod(filename.local8Bit(), S_IRWXU); setModified(false); return true; @@ -139,7 +139,7 @@ bool FormFile::saveAs() while (!saved) { TQString fn = KFileDialog::getSaveFileName(TQString(), i18n("*.kmdr|Kommander Files"), MainWindow::self, - i18n("Save Form '%1' As").tqarg(formWindow()->name())); + i18n("Save Form '%1' As").arg(formWindow()->name())); if (fn.isEmpty()) return false; TQFileInfo fi(fn); @@ -182,7 +182,7 @@ bool FormFile::closeEvent() } switch (KMessageBox::warningYesNoCancel(MainWindow::self, i18n("Dialog '%1' was modified." - "Do you want to save it?").tqarg(filename), i18n("Save File?"), KStdGuiItem::save(), KStdGuiItem::discard())) { + "Do you want to save it?").arg(filename), i18n("Save File?"), KStdGuiItem::save(), KStdGuiItem::discard())) { case KMessageBox::Yes: if (!save()) return false; 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 @@ Expanding - + 20 20 @@ -212,7 +212,7 @@ Expanding - + 20 130 diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 8dd01453..f5f57dbb 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -24,12 +24,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -54,7 +54,7 @@ #include "sizehandle.h" #include "metadatabase.h" #include "resource.h" -#include "tqlayout.h" +#include "layout.h" #include "connectioneditorimpl.h" #include "widgetdatabase.h" #include "pixmapchooser.h" @@ -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); @@ -320,15 +320,15 @@ void FormWindow::insertWidget() "properties as well as signals and slots to integrate custom widgets into " "TQt Designer, and provide a pixmap which will be used to represent " "the widget on the form.

") - .tqarg(WidgetDatabase::toolTip(id))); - TQToolTip::add(w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip(id))); + .arg(WidgetDatabase::toolTip(id))); + TQToolTip::add(w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip(id))); } else { TQString tt = WidgetDatabase::toolTip(id); TQString wt = WidgetDatabase::whatsThis(id); if (!wt.isEmpty() && !tt.isEmpty()) - TQWhatsThis::add(w, i18n("A %1

%2

").tqarg(tt).tqarg(wt)); + TQWhatsThis::add(w, i18n("A %1

%2

").arg(tt).arg(wt)); } TQString s = w->name(); @@ -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()) @@ -387,13 +387,13 @@ void FormWindow::insertWidget() else setCursorToAll(CrossCursor, w); - InsertCommand *cmd = new InsertCommand(i18n("Insert %1").tqarg(w->name()), this, w, r); + InsertCommand *cmd = new InsertCommand(i18n("Insert %1").arg(w->name()), this, w, r); TQPtrList commands; commands.append(mv); commands.append(cmd); - MacroCommand *mc = new MacroCommand(i18n("Insert %1").tqarg(w->name()), this, commands); + MacroCommand *mc = new MacroCommand(i18n("Insert %1").arg(w->name()), this, commands); commandHistory()->addCommand(mc); mc->execute(); } @@ -404,7 +404,7 @@ void FormWindow::insertWidget() else setCursorToAll(CrossCursor, w); - InsertCommand *cmd = new InsertCommand(i18n("Insert %1").tqarg(w->name()), this, w, r); + InsertCommand *cmd = new InsertCommand(i18n("Insert %1").arg(w->name()), this, w, r); commandHistory()->addCommand(cmd); cmd->execute(); } @@ -428,15 +428,15 @@ void FormWindow::insertWidget(TQWidget *w, bool checkName) "properties as well as signals and slots to integrate custom widgets into " "TQt Designer, and provide a pixmap which will be used to represent " "the widget on the form.

") - .tqarg(WidgetDatabase::toolTip(id))); - TQToolTip::add(w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip(id))); + .arg(WidgetDatabase::toolTip(id))); + TQToolTip::add(w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip(id))); } else { TQString tt = WidgetDatabase::toolTip(id); TQString wt = WidgetDatabase::whatsThis(id); if (!wt.isEmpty() && !tt.isEmpty()) - TQWhatsThis::add(w, i18n("A %1

%2

").tqarg(tt).tqarg(wt)); + TQWhatsThis::add(w, i18n("A %1

%2

").arg(tt).arg(wt)); } restoreCursors(w, this); @@ -502,7 +502,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) case POINTER_TOOL: if (!isMainContainer(TQT_TQOBJECT(w)) && qstrcmp(w->name(), "central widget") != 0) { // press on a child widget - // if the clicked widget is not in a tqlayout, raise it + // if the clicked widget is not in a layout, raise it if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout) w->raise(); if ((e->state() & ControlButton)) @@ -520,7 +520,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) clearSelection(false); else { // ...widget selected - // only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!), + // only if widget has a layout (it is a layout meta widget or a laid out container!), // unselect its childs if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout) { @@ -556,7 +556,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) w = w->parentWidget(); if (e->button() == Qt::LeftButton) - { // left button: store original tqgeometry and more as the widget might start moving + { // left button: store original geometry and more as the widget might start moving widgetPressed = true; widgetGeom = TQRect(w->pos(), w->size()); oldPressPos = w->mapFromGlobal(e->globalPos()); @@ -594,7 +594,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) if (e->button() != Qt::LeftButton) break; saveBackground(); - mainWindow()->statusBar()->message(i18n("Connect '%1' with...").tqarg(w->name())); + mainWindow()->statusBar()->message(i18n("Connect '%1' with...").arg(w->name())); connectStartPos = mapFromGlobal(e->globalPos()); currentConnectPos = mapFromGlobal(e->globalPos()); connectSender = TQT_TQOBJECT(designerWidget(TQT_TQOBJECT(w))); @@ -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) @@ -767,7 +767,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) // finally move the selected widgets and show/update preview label moveSelectedWidgets(x - p.x(), y - p.y()); - sizePreviewLabel->setText(TQString("%1/%2").tqarg(w->pos().x()).tqarg(w->pos().y())); + sizePreviewLabel->setText(TQString("%1/%2").arg(w->pos().x()).arg(w->pos().y())); sizePreviewLabel->adjustSize(); TQRect lg(mapFromGlobal(e->globalPos()) + TQPoint(16, 16), sizePreviewLabel->size()); checkPreviewGeometry(lg); @@ -803,7 +803,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) if (newReceiver && (isMainContainer(TQT_TQOBJECT(newReceiver)) || insertedWidgets.find(newReceiver)) && !isCentralWidget(TQT_TQOBJECT(newReceiver))) connectReceiver = connectableObject(TQT_TQOBJECT(newReceiver), TQT_TQOBJECT(connectReceiver)); - mainWindow()->statusBar()->message(i18n("Connect '%1' to '%2'").tqarg(connectSender->name()). + mainWindow()->statusBar()->message(i18n("Connect '%1' to '%2'").arg(connectSender->name()). arg(connectReceiver->name())); tqApp->processEvents(); if (drawRecRect) @@ -861,17 +861,17 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) if (wa == ((TQWidget *) it.key())->parentWidget()) goto make_move_command; - // break tqlayout if necessary + // break layout if necessary if (WidgetFactory::layoutType(wa) != WidgetFactory::NoLayout) { if (KMessageBox::questionYesNo(mainWindow(), i18n("You tried to insert a widget into the " - "tqlayout Container Widget '%1'.\n" + "layout Container Widget '%1'.\n" "This is not possible. " - "In order to insert the widget, the tqlayout of '%1'\n" + "In order to insert the widget, the layout of '%1'\n" "must first be broken.\n" - "Break the tqlayout or cancel the operation?"). - tqarg(wa->name()).tqarg(wa->name()), i18n("Inserting Widget"), + "Break the layout or cancel the operation?"). + arg(wa->name()).arg(wa->name()), i18n("Inserting Widget"), i18n("&Break Layout"), KStdGuiItem::cancel()) == KMessageBox::No) goto make_move_command; // cancel breakLayout(wa); @@ -955,11 +955,11 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) { if (KMessageBox::questionYesNo(mainWindow(), i18n("You tried to insert a widget into the " - "tqlayout Container Widget '%1'.\n" + "layout Container Widget '%1'.\n" "This is not possible. " - "In order to insert the widget, the tqlayout of '%1'\n" + "In order to insert the widget, the layout of '%1'\n" "must first be broken.\n" - "Break the tqlayout or cancel the operation?"). + "Break the layout or cancel the operation?"). arg(insertParent->name()). arg(insertParent->name()), i18n("Inserting Widget"), i18n("&Break Layout"), KStdGuiItem::cancel()) == KMessageBox::Yes) @@ -1239,7 +1239,7 @@ void FormWindow::continueRectDraw(const TQPoint & p, const TQPoint & global, TQW if (currRect == r) { TQString t("%1/%2"); - t = t.tqarg(r.width() - 1).tqarg(r.height() - 1); + t = t.arg(r.width() - 1).arg(r.height() - 1); drawSizePreview(pos, t); return; } @@ -1253,7 +1253,7 @@ void FormWindow::continueRectDraw(const TQPoint & p, const TQPoint & global, TQW if (t == Insert) { TQString t("%1/%2"); - t = t.tqarg(r.width() - 1).tqarg(r.height() - 1); + t = t.arg(r.width() - 1).arg(r.height() - 1); drawSizePreview(pos, t); } unclippedPainter->setClipRegion(TQRegion(rect()).subtract(TQRect(sizePreviewPos, @@ -1431,13 +1431,13 @@ void FormWindow::editAdjustSize() TQWidgetList widgets = selectedWidgets(); if (widgets.isEmpty()) { - TQRect oldr = tqgeometry(); + TQRect oldr = geometry(); mainContainer()->adjustSize(); resize(mainContainer()->size()); // check whether our own size constraint hit us if (size() != mainContainer()->size()) mainContainer()->resize(size()); - TQRect nr = tqgeometry(); + TQRect nr = geometry(); if (oldr != nr) { ResizeCommand *cmd = new ResizeCommand(i18n("Adjust Size"), this, this, oldr, nr); @@ -1450,9 +1450,9 @@ void FormWindow::editAdjustSize() if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) continue; - TQRect oldr = w->tqgeometry(); + TQRect oldr = w->geometry(); w->adjustSize(); - TQRect nr = w->tqgeometry(); + TQRect nr = w->geometry(); if (oldr != nr) commands.append(new ResizeCommand(i18n("Adjust Size"), this, w, oldr, nr)); } @@ -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) @@ -1844,7 +1844,7 @@ void FormWindow::checkAccels() { ok = false; if (KMessageBox::questionYesNo(mainWindow(), - i18n("Accelerator '%1' is used %2 times.").tqarg(it.key().upper()).tqarg((*it).count()), + i18n("Accelerator '%1' is used %2 times.").arg(it.key().upper()).arg((*it).count()), i18n("Check Accelerators"), i18n("&Select"), KStdGuiItem::cancel()) == KMessageBox::Yes) { clearSelection(false); @@ -2502,7 +2502,7 @@ void FormWindow::setMainContainer(TQWidget *w) delete mContainer; mContainer = w; insertedWidgets.insert(mContainer, mContainer); - delete tqlayout(); + delete layout(); TQHBoxLayout *l = new TQHBoxLayout(this); l->addWidget(w); if (resetPropertyWidget) diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui index ca35e191..5930b06b 100644 --- a/kommander/editor/functions.ui +++ b/kommander/editor/functions.ui @@ -24,7 +24,7 @@ - tqlayout7_2 + layout7_2 @@ -42,7 +42,7 @@ descriptionText - + 200 0 @@ -53,7 +53,7 @@ - tqlayout7 + layout7 @@ -82,7 +82,7 @@ 0 - + 150 0 @@ -119,7 +119,7 @@ groupBox1 - + 250 0 @@ -158,7 +158,7 @@ Expanding - + 20 16 @@ -177,7 +177,7 @@ 0 - + 32767 32 @@ -213,7 +213,7 @@ - tqlayout11 + layout11 @@ -265,7 +265,7 @@ - tqlayout12 + layout12 @@ -312,7 +312,7 @@ - tqlayout13 + layout13 @@ -364,7 +364,7 @@ - tqlayout14 + layout14 @@ -408,7 +408,7 @@ - tqlayout15 + layout15 @@ -452,7 +452,7 @@ - tqlayout16 + layout16 @@ -514,7 +514,7 @@ - tqlayout6 + layout6 @@ -530,7 +530,7 @@ Expanding - + 100 20 @@ -578,7 +578,7 @@ Expanding - + 100 20 @@ -589,7 +589,7 @@ - tqlayout12 + layout12 @@ -597,7 +597,7 @@ - tqlayout11 + layout11 @@ -607,7 +607,7 @@ clearButton - + 32767 20 diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index a898c49d..478d9d9c 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -130,13 +130,13 @@ TQString FunctionsDialog::currentFunctionText() function = s + "."; } if (groupComboBox->currentText() == "Kommander") - return TQString("%1%2%3").tqarg(prefix).tqarg(functionListBox->currentText()).tqarg(params()); + return TQString("%1%2%3").arg(prefix).arg(functionListBox->currentText()).arg(params()); else if (groupComboBox->currentItem() == m_DCOP || groupComboBox->currentItem() == m_Slots) - return TQString("%1%2.%3%4").tqarg(prefix).tqarg(widgetComboBox->currentText().section(' ', 0, 0)) - .tqarg(functionListBox->currentText().left(functionListBox->currentText().find('('))).tqarg(params()); + return TQString("%1%2.%3%4").arg(prefix).arg(widgetComboBox->currentText().section(' ', 0, 0)) + .arg(functionListBox->currentText().left(functionListBox->currentText().find('('))).arg(params()); else - return TQString("%1%2%3%4").tqarg(prefix).tqarg(function) - .tqarg(functionListBox->currentText()).tqarg(params()); + return TQString("%1%2%3%4").arg(prefix).arg(function) + .arg(functionListBox->currentText()).arg(params()); } void FunctionsDialog::groupChanged(int index) @@ -147,7 +147,7 @@ void FunctionsDialog::groupChanged(int index) if (index == m_Slots) { KommanderWidget* a_atw = dynamic_cast(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(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 %1.").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 %1.").arg(o->metaObject()->superClassName() ? TQString(o->metaObject()->superClassName()) : TQString(o->className()) ); TQString slotName = functionListBox->currentText(); TQString slot = m_slotList[slotName]; descriptionText->clear(); descriptionText->setText(i18n("

%1

" "

Description: %2\n

Syntax: %3%4") - .tqarg(slotName).tqarg(slotHelp).tqarg(slot).tqarg("")); + .arg(slotName).arg(slotHelp).arg(slot).arg("")); } else { int index = groupComboBox->currentItem(); @@ -224,8 +224,8 @@ void FunctionsDialog::functionChanged(int) descriptionText->clear(); descriptionText->setText(i18n("

%1

" "

Description: %2\n

Syntax: %3%4") - .tqarg(functionListBox->currentText()).tqarg(m_function.description()) - .tqarg(m_function.prototype(pflags)).tqarg(defArgs)); + .arg(functionListBox->currentText()).arg(m_function.description()) + .arg(m_function.prototype(pflags)).arg(defArgs)); } showParameters(); @@ -262,7 +262,7 @@ void FunctionsDialog::showParameters() if (i < argsCount) { type = slotArgs[i].remove(TQRegExp("\\*|\\&|const\\s")); - labels[i]->setText(TQString("%1:").tqarg(type)); + labels[i]->setText(TQString("%1:").arg(type)); } quotes[i]->setChecked(true); quotes[i]->setShown(false); @@ -303,7 +303,7 @@ void FunctionsDialog::showParameters() { labels[i]->setShown(i < argsCount); if (i < argsCount) - labels[i]->setText(TQString("%1:").tqarg(m_function.argumentName(i))); + labels[i]->setText(TQString("%1:").arg(m_function.argumentName(i))); quotes[i]->setChecked(true); quotes[i]->setShown(false); if (m_function.argumentType(i) == "bool") @@ -383,7 +383,7 @@ TQString FunctionsDialog::params() } TQString a_param = pars.join(", "); if (params) - return TQString("(%1)").tqarg(a_param); + return TQString("(%1)").arg(a_param); else return a_param; } diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index 9ec77020..55383e7a 100644 --- a/kommander/editor/hierarchyview.cpp +++ b/kommander/editor/hierarchyview.cpp @@ -29,7 +29,7 @@ #include "propertyeditor.h" #include "listeditor.h" -#include +#include #include #include #include @@ -413,7 +413,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) if ( !parent ) item->setPixmap( 0, PixmapChooser::loadPixmap( "form.xpm", PixmapChooser::Mini ) ); else if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) - item->setPixmap( 0, PixmapChooser::loadPixmap( "tqlayout.xpm", PixmapChooser::Small ) ); + item->setPixmap( 0, PixmapChooser::loadPixmap( "layout.xpm", PixmapChooser::Small ) ); else item->setPixmap( 0, WidgetDatabase::iconSet( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ). pixmap( TQIconSet::Small, TQIconSet::Normal ) ); @@ -516,13 +516,13 @@ void HierarchyList::addTabPage() return; if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) { TQTabWidget *tw = (TQTabWidget*)w; - AddTabPageCommand *cmd = new AddTabPageCommand( i18n("Add Page to %1" ).tqarg( tw->name() ), formWindow, + AddTabPageCommand *cmd = new AddTabPageCommand( i18n("Add Page to %1" ).arg( tw->name() ), formWindow, tw, "Tab" ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); } else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) { TQWizard *wiz = (TQWizard*)formWindow->mainContainer(); - AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).tqarg( wiz->name() ), formWindow, + AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).arg( wiz->name() ), formWindow, wiz, "Page" ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -539,7 +539,7 @@ void HierarchyList::removeTabPage() if ( tw->currentPage() ) { QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; DeleteTabPageCommand *cmd = new DeleteTabPageCommand( i18n("Delete Page %1 of %2" ). - tqarg( dtw->pageTitle() ).tqarg( tw->name() ), + arg( dtw->pageTitle() ).arg( tw->name() ), formWindow, tw, tw->currentPage() ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -549,7 +549,7 @@ void HierarchyList::removeTabPage() if ( wiz->currentPage() ) { QDesignerWizard *dw = (QDesignerWizard*)wiz; DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n("Delete Page %1 of %2" ). - tqarg( dw->pageTitle() ).tqarg( wiz->name() ), + arg( dw->pageTitle() ).arg( wiz->name() ), formWindow, wiz, wiz->indexOf( wiz->currentPage() ), true ); formWindow->commandHistory()->addCommand( cmd ); 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 @@ Expanding - + 20 20 @@ -171,7 +171,7 @@ itemText - + 0 0 @@ -221,7 +221,7 @@ itemDeletePixmap - + 30 22 @@ -244,7 +244,7 @@ itemChoosePixmap - + 30 22 @@ -301,7 +301,7 @@ Expanding - + 20 20 diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp index 911f6ec8..7ca5b989 100644 --- a/kommander/editor/iconvieweditorimpl.cpp +++ b/kommander/editor/iconvieweditorimpl.cpp @@ -121,7 +121,7 @@ void IconViewEditor::applyClicked() items.append( item ); } - PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n("Edit Items of '%1'" ).tqarg( iconview->name() ), + PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n("Edit Items of '%1'" ).arg( iconview->name() ), formwindow, iconview, items ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); diff --git a/kommander/editor/kommander-new.xml b/kommander/editor/kommander-new.xml index c6c11f9d..114a84ef 100644 --- a/kommander/editor/kommander-new.xml +++ b/kommander/editor/kommander-new.xml @@ -25,7 +25,7 @@ cellText clear checked - tqchildren + children columnCount count currentColumn @@ -33,7 +33,7 @@ currentRow execute findItem - tqgeometry + geometry global hasFocus insertColumn diff --git a/kommander/editor/kommander.xml b/kommander/editor/kommander.xml index a2716484..ee10455b 100644 --- a/kommander/editor/kommander.xml +++ b/kommander/editor/kommander.xml @@ -25,14 +25,14 @@ cellText clear checked - tqchildren + children count currentColumn currentItem currentRow execute findItem - tqgeometry + geometry global hasFocus insertColumn @@ -341,8 +341,8 @@ true umount uname - tqunicode_start - tqunicode_stop + unicode_start + unicode_stop unlink utmpdump uuidgen diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index dca00c38..5ba769db 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -19,7 +19,7 @@ **********************************************************************/ #include "formwindow.h" -#include "tqlayout.h" +#include "layout.h" #include "widgetdatabase.h" #include "widgetfactory.h" @@ -36,7 +36,7 @@ bool operator<( const TQGuardedPtr &p1, const TQGuardedPtr & } /*! - \class Layout tqlayout.h + \class Layout layout.h \brief Baseclass for layouting widgets in the Designer Classes derived from this abstract base class are used for layouting @@ -59,7 +59,7 @@ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *l widgets.setAutoDelete( false ); layoutBase = lb; if ( !doSetup && layoutBase ) - oldGeometry = layoutBase->tqgeometry(); + oldGeometry = layoutBase->geometry(); } /*! The widget list we got in the constructor might contain too much @@ -77,7 +77,7 @@ void Layout::setup() TQWidget *w = 0; // Go through all widgets of the list we got. As we can only - // tqlayout widgets which have the same parent, we first do some + // layout widgets which have the same parent, we first do some // sorting which means create a list for each parent containing // its child here. After that we keep working on the list of // childs which has the most entries. @@ -112,7 +112,7 @@ void Layout::setup() } // If we found no list (because no widget did fit at all) or the - // best list has only one entry and we do not tqlayout a container, + // best list has only one entry and we do not layout a container, // we leave here. if ( !lastList || ( lastList->count() < 2 && ( !layoutBase || @@ -125,11 +125,11 @@ void Layout::setup() } // Now we have a new and clean widget list, which makes sense - // to tqlayout + // to layout widgets = *lastList; // Also use the only correct parent later, so store it parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() ); - // Now calculate the position where the tqlayout-meta-widget should + // Now calculate the position where the layout-meta-widget should // be placed and connect to widgetDestroyed() signals of the // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case @@ -141,7 +141,7 @@ void Layout::setup() geometries.insert( w, TQRect( w->pos(), w->size() ) ); // Change the Z-order, as saving/loading uses the Z-order for // writing/creating widgets and this has to be the same as in - // the tqlayout. Else saving + loading will give different results + // the layout. Else saving + loading will give different results w->raise(); } } @@ -174,7 +174,7 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent ) return true; } -void Layout::finishLayout( bool needMove, TQLayout *tqlayout ) +void Layout::finishLayout( bool needMove, TQLayout *layout ) { if ( needMove ) layoutBase->move( startPoint ); @@ -185,7 +185,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout ) layoutBase->setGeometry( oldGeometry ); oldGeometry = g; layoutBase->show(); - tqlayout->activate(); + layout->activate(); formWindow->insertWidget( layoutBase ); formWindow->selectWidget( TQT_TQOBJECT(layoutBase) ); TQString n = layoutBase->name(); @@ -228,7 +228,7 @@ void Layout::breakLayout() if ( !widgets.isEmpty() ) { TQWidget *w; for ( w = widgets.first(); w; w = widgets.next() ) - rects.insert( w, w->tqgeometry() ); + rects.insert( w, w->geometry() ); } WidgetFactory::deleteLayout( layoutBase ); bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || @@ -303,16 +303,16 @@ void HorizontalLayout::doLayout() if ( !prepareLayout( needMove, needReparent ) ) return; - TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); + TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) - tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() ); + layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else - tqlayout->addWidget( w ); + layout->addWidget( w ); if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } @@ -322,7 +322,7 @@ void HorizontalLayout::doLayout() if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); - finishLayout( needMove, tqlayout ); + finishLayout( needMove, layout ); } @@ -367,16 +367,16 @@ void VerticalLayout::doLayout() if ( !prepareLayout( needMove, needReparent ) ) return; - TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); + TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) - tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() ); + layout->addWidget( w, 0, ( (Spacer*)w )->alignment() ); else - tqlayout->addWidget( w ); + layout->addWidget( w ); if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); } @@ -386,7 +386,7 @@ void VerticalLayout::doLayout() if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); - finishLayout( needMove, tqlayout ); + finishLayout( needMove, layout ); } @@ -733,7 +733,7 @@ void GridLayout::doLayout() if ( !prepareLayout( needMove, needReparent ) ) return; - QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid ); + QDesignerGridLayout *layout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid ); if ( !grid ) buildGrid(); @@ -745,18 +745,18 @@ void GridLayout::doLayout() if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( rs * cs == 1 ) { - tqlayout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 ); + layout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 ); } else { - tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 ); + layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 ); } if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) ( (TQLayoutWidget*)w )->updateSizePolicy(); w->show(); } else { - qWarning("ooops, widget '%s' does not fit in tqlayout", w->name() ); + qWarning("ooops, widget '%s' does not fit in layout", w->name() ); } } - finishLayout( needMove, tqlayout ); + finishLayout( needMove, layout ); } void GridLayout::setup() @@ -770,7 +770,7 @@ void GridLayout::buildGrid() TQWidget* w; TQRect br; for ( w = widgets.first(); w; w = widgets.next() ) - br = br.unite( w->tqgeometry() ); + br = br.unite( w->geometry() ); delete grid; grid = new Grid( br.height() / resolution.height() + 1, @@ -784,7 +784,7 @@ void GridLayout::buildGrid() TQRect cr( p, resolution ); for ( w = widgets.first(); w; w = widgets.next() ) { // check that the overlap is significant - TQRect intersect = cr.intersect( w->tqgeometry() ); + TQRect intersect = cr.intersect( w->geometry() ); if ( intersect.size().width() > resolution.width()/2 && intersect.size().height() > resolution.height()/2 ) { grid->setCell( r, c, w ); @@ -874,30 +874,30 @@ 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 +int Spacer::alignment() const { if ( orient ==Qt::Vertical ) return AlignHCenter; 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..88472958 100644 --- a/kommander/editor/layout.h +++ b/kommander/editor/layout.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include class FormWindow; @@ -44,7 +44,7 @@ public: virtual void undoLayout(); virtual void breakLayout(); virtual bool prepareLayout( bool &needMove, bool &needReparent ); - virtual void finishLayout( bool needMove, TQLayout *tqlayout ); + virtual void finishLayout( bool needMove, TQLayout *layout ); protected: TQWidgetList widgets; @@ -118,8 +118,8 @@ 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_OVERRIDE( TQRect tqgeometry DESIGNABLE false ) + TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) + TQ_OVERRIDE( TQRect geometry DESIGNABLE false ) private: enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize, @@ -135,11 +135,11 @@ 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; + int alignment() const; Qt::Orientation orientation() const; void setOrientation( Qt::Orientation o ); void setInteraciveMode( bool b ) { interactive = b; }; 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 @@ Expanding - + 20 20 @@ -190,7 +190,7 @@ itemDeletePixmap - + 30 22 @@ -213,7 +213,7 @@ itemChoosePixmap - + 30 22 @@ -244,7 +244,7 @@ itemText - + 0 0 @@ -297,7 +297,7 @@ Expanding - + 20 20 diff --git a/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp index b9ec7fee..22c07cea 100644 --- a/kommander/editor/listboxeditorimpl.cpp +++ b/kommander/editor/listboxeditorimpl.cpp @@ -131,7 +131,7 @@ void ListBoxEditor::applyClicked() items.append( item ); } - PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n("Edit Items of '%1'" ).tqarg( listbox->name() ), + PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n("Edit Items of '%1'" ).arg( listbox->name() ), formwindow, listbox, items ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); 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 @@ Expanding - + 20 20 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 @@ itemText - + 0 0 @@ -195,7 +195,7 @@ itemDeletePixmap - + 30 22 @@ -218,7 +218,7 @@ itemChoosePixmap - + 30 22 @@ -284,7 +284,7 @@ Expanding - + 20 20 @@ -418,7 +418,7 @@ colDeletePixmap - + 30 22 @@ -441,7 +441,7 @@ colChoosePixmap - + 30 22 @@ -472,7 +472,7 @@ colText - + 0 0 @@ -589,7 +589,7 @@ Expanding - + 20 20 @@ -634,7 +634,7 @@ Expanding - + 20 20 diff --git a/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp index d7baba57..c07e8334 100644 --- a/kommander/editor/listvieweditorimpl.cpp +++ b/kommander/editor/listvieweditorimpl.cpp @@ -63,7 +63,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw void ListViewEditor::applyClicked() { setupItems(); - PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n("Edit Items and Columns of '%1'" ).tqarg( listview->name() ), + PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n("Edit Items and Columns of '%1'" ).arg( listview->name() ), formwindow, listview, itemsPreview ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 22969a3b..67d1e311 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include #include @@ -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() @@ -392,7 +392,7 @@ void MainWindow::slotCreateBackups() form->formFile()->setModified(true); if (!form->formFile()->save(false)) { - KMessageBox::error(this, i18n("Cannot create backup file %1.").tqarg(backupName)); + KMessageBox::error(this, i18n("Cannot create backup file %1.").arg(backupName)); } form->formFile()->setFileName(fileName); form->formFile()->setModified(modified); @@ -436,7 +436,7 @@ void MainWindow::runForm() ::stat(m_fileName.local8Bit(), &statbuf); if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) { - KMessageBox::error(this, i18n("Cannot create temporary file %1.").tqarg(m_backupName)); + KMessageBox::error(this, i18n("Cannot create temporary file %1.").arg(m_backupName)); return; } form->formFile()->setFileName(m_fileName); @@ -446,12 +446,12 @@ void MainWindow::runForm() { if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) { - KMessageBox::error(this, i18n("Cannot create backup file %1.").tqarg(m_fileName + ".backup")); + KMessageBox::error(this, i18n("Cannot create backup file %1.").arg(m_fileName + ".backup")); } ::chmod(m_fileName.local8Bit(), S_IRWXU); KProcess* process = new KProcess; process->setUseShell(true); - (*process) << "kmdr-executor" << TQString("\"%1\"").tqarg(form->formFile()->fileName()); + (*process) << "kmdr-executor" << TQString("\"%1\"").arg(form->formFile()->fileName()); connect(process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), messageLog, TQT_SLOT(receivedStdout(KProcess*, char*, int))); connect(process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), messageLog, @@ -500,7 +500,7 @@ void MainWindow::runForm4() ::stat(m_fileName.local8Bit(), &statbuf); if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) { - KMessageBox::error(this, i18n("Cannot create temporary file %1.").tqarg(m_backupName)); + KMessageBox::error(this, i18n("Cannot create temporary file %1.").arg(m_backupName)); return; } form->formFile()->setFileName(m_fileName); @@ -510,12 +510,12 @@ void MainWindow::runForm4() { if (!readOnlyFile && !KIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) { - KMessageBox::error(this, i18n("Cannot create backup file %1.").tqarg(m_fileName + ".backup")); + KMessageBox::error(this, i18n("Cannot create backup file %1.").arg(m_fileName + ".backup")); } ::chmod(m_fileName.local8Bit(), S_IRWXU); KProcess* process = new KProcess; process->setUseShell(true); - (*process) << "kommander" << TQString("\"%1\"").tqarg(form->formFile()->fileName()); + (*process) << "kommander" << TQString("\"%1\"").arg(form->formFile()->fileName()); connect(process, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)), messageLog, TQT_SLOT(receivedStdout(KProcess*, char*, int))); connect(process, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)), messageLog, @@ -848,7 +848,7 @@ void MainWindow::insertFormWindow(FormWindow *fw) { if (fw) TQWhatsThis::add(fw, i18n("The Form Window" - "

Use the various tools to add widgets or to change the tqlayout " + "

Use the various tools to add widgets or to change the layout " "and behavior of the components in the form. Select one or multiple " "widgets to move them or lay them out. If a single widget is chosen it can " "be resized using the resize handles.

" @@ -952,11 +952,11 @@ void MainWindow::updateUndoRedo(bool undoAvailable, bool redoAvailable, actionEditUndo->setEnabled(undoAvailable); actionEditRedo->setEnabled(redoAvailable); if (!undoCmd.isEmpty()) - actionEditUndo->setText(i18n("&Undo: %1").tqarg(undoCmd)); + actionEditUndo->setText(i18n("&Undo: %1").arg(undoCmd)); else actionEditUndo->setText(i18n("&Undo: Not Available")); if (!redoCmd.isEmpty()) - actionEditRedo->setText(i18n("&Redo: %1").tqarg(redoCmd)); + actionEditRedo->setText(i18n("&Redo: %1").arg(redoCmd)); else actionEditRedo->setText(i18n("&Redo: Not Available")); @@ -1012,18 +1012,18 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge void MainWindow::setupRMBProperties(TQValueList &ids, TQMap &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; @@ -1153,7 +1153,7 @@ void MainWindow::handleRMBProperties(int id, TQMap &props, TQWidg text = KInputDialog::getText(i18n("Text"), i18n("New text:"), w->property("text").toString(), &ok, this); } if (ok) { - TQString pn(i18n("Set the 'text' of '%1'").tqarg(w->name())); + TQString pn(i18n("Set the 'text' of '%1'").arg(w->name())); SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "text", w->property("text"), text, TQString(), TQString()); @@ -1165,7 +1165,7 @@ void MainWindow::handleRMBProperties(int id, TQMap &props, TQWidg bool ok = false; TQString title = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this); if (ok) { - TQString pn(i18n("Set the 'title' of '%1'").tqarg(w->name())); + TQString pn(i18n("Set the 'title' of '%1'").arg(w->name())); SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "title", w->property("title"), title, TQString(), TQString()); @@ -1177,7 +1177,7 @@ void MainWindow::handleRMBProperties(int id, TQMap &props, TQWidg bool ok = false; TQString text = KInputDialog::getText(i18n("Page Title"), i18n("New page title:"), w->property("pageTitle").toString(), &ok, this); if (ok) { - TQString pn(i18n("Set the 'pageTitle' of '%1'").tqarg(w->name())); + TQString pn(i18n("Set the 'pageTitle' of '%1'").arg(w->name())); SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "pageTitle", w->property("pageTitle"), text, TQString(), TQString()); @@ -1189,7 +1189,7 @@ void MainWindow::handleRMBProperties(int id, TQMap &props, TQWidg TQPixmap oldPix = TQVariant(w->property("pixmap")).toPixmap(); TQPixmap pix = qChoosePixmap(this, formWindow(), oldPix); if (!pix.isNull()) { - TQString pn(i18n("Set the 'pixmap' of '%1'").tqarg(w->name())); + TQString pn(i18n("Set the 'pixmap' of '%1'").arg(w->name())); SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "pixmap", w->property("pixmap"), pix, TQString(), TQString()); @@ -1214,7 +1214,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) { TQTabWidget *tw = (TQTabWidget*)w; if (id == commands[ "add" ]) { - AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").tqarg(tw->name()), formWindow(), + AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(), tw, "Tab"); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); @@ -1222,7 +1222,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands if (tw->currentPage()) { QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw; DeleteTabPageCommand *cmd = new DeleteTabPageCommand(i18n("Delete Page %1 of %2"). - tqarg(dtw->pageTitle()).tqarg(tw->name()), + arg(dtw->pageTitle()).arg(tw->name()), formWindow(), tw, tw->currentPage()); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); @@ -1232,7 +1232,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) { TQToolBox *tw = (TQToolBox*)w; if (id == commands[ "add" ]) { - AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").tqarg(tw->name()), formWindow(), + AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(), tw, "Page"); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); @@ -1240,7 +1240,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands if (tw->currentItem()) { EditorToolBox *dtw = (EditorToolBox*)tw; DeleteToolBoxPageCommand *cmd = new DeleteToolBoxPageCommand(i18n("Delete Page %1 of %2"). - tqarg(dtw->pageTitle()).tqarg(tw->name()), + arg(dtw->pageTitle()).arg(tw->name()), formWindow(), tw, tw->currentItem()); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); @@ -1267,7 +1267,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) { TQWizard *wiz = (TQWizard*)fw->mainContainer(); if (id == commands[ "add" ]) { - AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").tqarg(wiz->name()), formWindow(), + AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").arg(wiz->name()), formWindow(), wiz, "Page"); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); @@ -1275,7 +1275,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands if (wiz->currentPage()) { QDesignerWizard *dw = (QDesignerWizard*)wiz; DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand(i18n("Delete Page %1 of %2"). - tqarg(dw->pageTitle()).tqarg(wiz->name()), + arg(dw->pageTitle()).arg(wiz->name()), formWindow(), wiz, wiz->indexOf(wiz->currentPage())); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); @@ -1290,7 +1290,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands QDesignerWizard *dw = (QDesignerWizard*)wiz; TQString text = KInputDialog::getText(i18n("Page Title"), i18n("New page title:"), dw->pageTitle(), &ok, this); if (ok) { - TQString pn(i18n("Rename page %1 of %2").tqarg(dw->pageTitle()).tqarg(wiz->name())); + TQString pn(i18n("Rename page %1 of %2").arg(dw->pageTitle()).arg(wiz->name())); RenameWizardPageCommand *cmd = new RenameWizardPageCommand(pn, formWindow() , wiz, wiz->indexOf(wiz->currentPage()), text); formWindow()->commandHistory()->addCommand(cmd); @@ -1300,11 +1300,11 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap &commands } else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) { TQMainWindow *mw = (TQMainWindow*)fw->mainContainer(); if (id == commands[ "add_toolbar" ]) { - AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").tqarg(formWindow()->name()), formWindow(), mw); + AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").arg(formWindow()->name()), formWindow(), mw); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); } else if (id == commands[ "add_menu_item" ]) { - AddMenuCommand *cmd = new AddMenuCommand(i18n("Add Menu to '%1'").tqarg(formWindow()->name()), formWindow(), mw); + AddMenuCommand *cmd = new AddMenuCommand(i18n("Add Menu to '%1'").arg(formWindow()->name()), formWindow(), mw); formWindow()->commandHistory()->addCommand(cmd); cmd->execute(); } @@ -1621,14 +1621,14 @@ ActionEditor *MainWindow::actioneditor() const bool MainWindow::openEditor(TQWidget* w, FormWindow*) { if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) { - statusBar()->message(i18n("Edit %1...").tqarg(w->className())); + statusBar()->message(i18n("Edit %1...").arg(w->className())); WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow()); statusBar()->clear(); 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; @@ -1639,7 +1639,7 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) text = KInputDialog::getText(i18n("Text"), i18n("New text:"), w->property("text").toString(), &ok, this); } if (ok) { - TQString pn(i18n("Set the 'text' of '%2'").tqarg(w->name())); + TQString pn(i18n("Set the 'text' of '%2'").arg(w->name())); SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "text", w->property("text"), text, TQString(), TQString()); @@ -1654,7 +1654,7 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) TQString text; text = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this); if (ok) { - TQString pn(i18n("Set the 'title' of '%2'").tqarg(w->name())); + TQString pn(i18n("Set the 'title' of '%2'").arg(w->name())); SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, "title", w->property("title"), text, TQString(), TQString()); @@ -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/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index 8f18cd6a..e3f5b592 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -24,7 +24,7 @@ #endif // QT_NO_SQL #include -#include +#include #include #include #include @@ -170,7 +170,7 @@ void MainWindow::setupEditActions() KToolBar *tb = new KToolBar(this, "Edit"); tb->setFullSize(false); - TQWhatsThis::add(tb, i18n("The Edit toolbar%1").tqarg(toolbarHelp)); + TQWhatsThis::add(tb, i18n("The Edit toolbar%1").arg(toolbarHelp)); addToolBar(tb, i18n("Edit")); actionEditUndo->plug(tb); actionEditRedo->plug(tb); @@ -207,13 +207,13 @@ void MainWindow::setupLayoutActions() actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size")); actionEditAdjustSize->setEnabled(false); - actionEditHLayout = new KAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithtqlayout.xpm"), + actionEditHLayout = new KAction(i18n("Lay OutQt::Horizontally"), createIconSet("edithlayout.xpm"), CTRL + Key_H, TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h"); actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally")); actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally")); actionEditHLayout->setEnabled(false); - actionEditVLayout = new KAction(i18n("Lay OutQt::Vertically"), createIconSet("editvtqlayout.xpm"), + actionEditVLayout = new KAction(i18n("Lay OutQt::Vertically"), createIconSet("editvlayout.xpm"), CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v"); actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically")); actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Vertically")); @@ -241,7 +241,7 @@ void MainWindow::setupLayoutActions() actionEditBreakLayout = new KAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"), CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout"); - actionEditBreakLayout->setToolTip(i18n("Breaks the selected tqlayout")); + actionEditBreakLayout->setToolTip(i18n("Breaks the selected layout")); actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout")); int id = WidgetDatabase::idFromClassName("Spacer"); @@ -249,13 +249,13 @@ void MainWindow::setupLayoutActions() actionCollection(), TQString::number(id).latin1()); a->setExclusiveGroup("tool"); a->setText(i18n("Add ") + WidgetDatabase::className(id)); - a->setToolTip(i18n("Insert a %1").tqarg(WidgetDatabase::toolTip(id))); + a->setToolTip(i18n("Insert a %1").arg(WidgetDatabase::toolTip(id))); a->setWhatsThis(i18n("A %1

%2

" "

Click to insert a single %3," - "or double click to keep the tool selected.").tqarg(WidgetDatabase::toolTip(id)). - tqarg(WidgetDatabase::whatsThis(id)).tqarg(WidgetDatabase::toolTip(id))); + "or double click to keep the tool selected.").arg(WidgetDatabase::toolTip(id)). + arg(WidgetDatabase::whatsThis(id)).arg(WidgetDatabase::toolTip(id))); - TQWhatsThis::add(layoutToolBar, i18n("The Layout toolbar%1").tqarg(toolbarHelp)); + TQWhatsThis::add(layoutToolBar, i18n("The Layout toolbar%1").arg(toolbarHelp)); actionEditAdjustSize->plug(layoutToolBar); layoutToolBar->addSeparator(); actionEditHLayout->plug(layoutToolBar); @@ -306,7 +306,7 @@ void MainWindow::setupToolActions() KToolBar *tb = new KToolBar(this, "Tools"); tb->setFullSize(false); - TQWhatsThis::add(tb, i18n("The Tools toolbar%1").tqarg(toolbarHelp)); + TQWhatsThis::add(tb, i18n("The Tools toolbar%1").arg(toolbarHelp)); addToolBar(tb, i18n("Tools"), TQMainWindow::DockTop, true); actionPointerTool->plug(tb); @@ -330,14 +330,14 @@ void MainWindow::setupToolActions() bool plural = grp[(int) grp.length() - 1] == 's'; if (plural) { - TQWhatsThis::add(tb, i18n("The %1%2").tqarg(grp).tqarg(toolbarHelp). - tqarg(i18n(" Click on a button to insert a single widget, " - "or double click to insert multiple %1.")).tqarg(grp)); + TQWhatsThis::add(tb, i18n("The %1%2").arg(grp).arg(toolbarHelp). + arg(i18n(" Click on a button to insert a single widget, " + "or double click to insert multiple %1.")).arg(grp)); } else { - TQWhatsThis::add(tb, i18n("The %1 Widgets%2").tqarg(grp).tqarg(toolbarHelp). - tqarg(i18n(" Click on a button to insert a single %1 widget, " - "or double click to insert multiple widgets.")).tqarg(grp)); + TQWhatsThis::add(tb, i18n("The %1 Widgets%2").arg(grp).arg(toolbarHelp). + arg(i18n(" Click on a button to insert a single %1 widget, " + "or double click to insert multiple widgets.")).arg(grp)); } addToolBar(tb, grp); TQPopupMenu *menu = new TQPopupMenu(this, grp.latin1()); @@ -363,11 +363,11 @@ void MainWindow::setupToolActions() a->setToolTip(ttip); if (!WidgetDatabase::isWhatsThisLoaded()) WidgetDatabase::loadWhatsThis(documentationPath()); - a->setToolTip(i18n("Insert a %1").tqarg(WidgetDatabase::className(i))); + a->setToolTip(i18n("Insert a %1").arg(WidgetDatabase::className(i))); - TQString whats = i18n("A %1").tqarg(WidgetDatabase::className(i)); + TQString whats = i18n("A %1").arg(WidgetDatabase::className(i)); if (!WidgetDatabase::whatsThis(i).isEmpty()) - whats += TQString("

%1

").tqarg(WidgetDatabase::whatsThis(i)); + whats += TQString("

%1

").arg(WidgetDatabase::whatsThis(i)); a->setWhatsThis(whats + i18n("

Double click on this tool to keep it selected.

")); if (grp != "KDE") @@ -409,7 +409,7 @@ void MainWindow::setupFileActions() fileTb = new KToolBar(this, "File"); fileTb->setFullSize(false); - TQWhatsThis::add(fileTb, i18n("The File toolbar%1").tqarg(toolbarHelp)); + TQWhatsThis::add(fileTb, i18n("The File toolbar%1").arg(toolbarHelp)); addToolBar(fileTb, i18n("File")); fileMenu = new TQPopupMenu(this, "File"); menuBar()->insertItem(i18n("&File"), fileMenu); @@ -560,7 +560,7 @@ void MainWindow::setupWindowActions() j++; TQString itemText; if (j < 10) - itemText = TQString("&%1 ").tqarg(j); + itemText = TQString("&%1 ").arg(j); if (w->inherits("FormWindow")) itemText += w->name(); else @@ -671,7 +671,7 @@ FormWindow *MainWindow::openFormWindow(const TQString &filename, bool validFileN } if (!makeNew) { - statusBar()->message(i18n("Reading file '%1'...").tqarg(filename)); + statusBar()->message(i18n("Reading file '%1'...").arg(filename)); if (TQFile::exists(filename)) { TQApplication::setOverrideCursor(WaitCursor); @@ -684,14 +684,14 @@ FormWindow *MainWindow::openFormWindow(const TQString &filename, bool validFileN TQApplication::restoreOverrideCursor(); if (b) { - statusBar()->message(i18n("Loaded file '%1'").tqarg(filename), 3000); + statusBar()->message(i18n("Loaded file '%1'").arg(filename), 3000); } else { emit removedFormFile(ff); ff->close(); delete ff; - statusBar()->message(i18n("Could not load file '%1'").tqarg(filename), 5000); - KMessageBox::information(this, i18n("Could not load file '%1'").tqarg(filename), i18n("Load File")); + statusBar()->message(i18n("Could not load file '%1'").arg(filename), 5000); + KMessageBox::information(this, i18n("Could not load file '%1'").arg(filename), i18n("Load File")); } return (FormWindow *) resource.widget(); } else @@ -845,7 +845,7 @@ void MainWindow::createNewTemplate() ts << " " << cn << "Form" << endl; ts << "" << endl; ts << "" << endl; - ts << " tqgeometry" << endl; + ts << " geometry" << endl; ts << " " << endl; ts << " 300" << endl; ts << " 400" << endl; @@ -907,7 +907,7 @@ void MainWindow::editPaste() } else { KMessageBox::information(this, i18n("Cannot paste widgets. Designer could not find a container\n" - "to paste into which does not contain a tqlayout. Break the tqlayout\n" + "to paste into which does not contain a layout. Break the layout\n" "of the container you want to paste into and select this container\n" "and then paste again."), i18n("Paste Error")); } diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp index 0968eafd..d294be84 100644 --- a/kommander/editor/messagelog.cpp +++ b/kommander/editor/messagelog.cpp @@ -24,9 +24,9 @@ #include #include -#include +#include #include -#include +#include MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent, name) { @@ -108,12 +108,12 @@ void MessageLog::clearContent() void MessageLog::copyLine() { if (m_lists[currentPageIndex()]->count()) - kapp->tqclipboard()->setText(m_lists[currentPageIndex()]->currentText(), TQClipboard::Clipboard); + kapp->clipboard()->setText(m_lists[currentPageIndex()]->currentText(), TQClipboard::Clipboard); } void MessageLog::copyContent() { - kapp->tqclipboard()->setText(content(), TQClipboard::Clipboard); + kapp->clipboard()->setText(content(), TQClipboard::Clipboard); } void MessageLog::saveToFile() @@ -125,12 +125,12 @@ void MessageLog::saveToFile() TQFileInfo fileinfo(url.path()); if (fileinfo.exists() && KMessageBox::warningContinueCancel(0, i18n("File
%1
already exists. Overwrite it?") - .tqarg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) + .arg(url.path()), TQString(), i18n("Overwrite")) == KMessageBox::Cancel) return; TQFile file(url.path()); if (!file.open(IO_WriteOnly)) { KMessageBox::error(0, i18n("Cannot save log file
%1") - .tqarg(url.url())); + .arg(url.url())); return; } TQTextStream textfile(&file); diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp index 839160da..93a998d0 100644 --- a/kommander/editor/metadatabase.cpp +++ b/kommander/editor/metadatabase.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include @@ -147,14 +147,14 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo if ( doUpdate && ( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) { doUpdate = false; - setPropertyChanged( o, "tqalignment", changed || + setPropertyChanged( o, "alignment", changed || isPropertyChanged( o, "hAlign" ) || isPropertyChanged( o, "vAlign" ) || isPropertyChanged( o, "wordwrap" ) ); doUpdate = true; } - if ( doUpdate && property == "tqalignment" ) { + if ( doUpdate && property == "alignment" ) { doUpdate = false; setPropertyChanged( o, "hAlign", changed ); setPropertyChanged( o, "vAlign", changed ); @@ -269,10 +269,10 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing ) } r->spacing = spacing; - TQLayout * tqlayout = 0; - WidgetFactory::layoutType( (TQWidget*)o, tqlayout ); - if ( tqlayout ) - tqlayout->setSpacing( spacing ); + TQLayout * layout = 0; + WidgetFactory::layoutType( (TQWidget*)o, layout ); + if ( layout ) + layout->setSpacing( spacing ); } int MetaDataBase::spacing( TQObject *o ) @@ -305,12 +305,12 @@ void MetaDataBase::setMargin( TQObject *o, int margin ) } r->margin = margin; - TQLayout * tqlayout = 0; - WidgetFactory::layoutType( (TQWidget*)o, tqlayout ); + TQLayout * layout = 0; + WidgetFactory::layoutType( (TQWidget*)o, layout ); if ( margin < 1 ) margin = 1; - if ( tqlayout ) - tqlayout->setMargin( margin ); + if ( layout ) + layout->setMargin( margin ); } int MetaDataBase::margin( TQObject *o ) @@ -465,12 +465,12 @@ void MetaDataBase::doConnections( TQObject *o ) delete l; } TQString s = "2""%1"; - s = s.tqarg( conn.signal.data() ); + s = s.arg( conn.signal.data() ); TQString s2 = "1""%1"; - s2 = s2.tqarg( conn.slot.data() ); + s2 = s2.arg( 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::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 lstSignals; diff --git a/kommander/editor/multilineeditor.ui b/kommander/editor/multilineeditor.ui index 47ce1172..e08dd943 100644 --- a/kommander/editor/multilineeditor.ui +++ b/kommander/editor/multilineeditor.ui @@ -25,7 +25,7 @@ MultiLineEditorBase - tqgeometry + geometry 0 0 @@ -128,7 +128,7 @@ Expanding - tqsizeHint + sizeHint 20 20 diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp index 074a8471..5a9c4f1b 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->alignment() ); preview->setMaxLines( mlined->maxLines() ); preview->setWordWrap( mlined->wordWrap() ); preview->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() ); @@ -53,7 +53,7 @@ void MultiLineEditor::okClicked() void MultiLineEditor::applyClicked() { - PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n("Set Text of '%1'" ).tqarg( mlined->name() ), + PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n("Set Text of '%1'" ).arg( mlined->name() ), formwindow, mlined, preview->text() ); cmd->execute(); formwindow->commandHistory()->addCommand( cmd ); 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 @@ Expanding - + 20 0 @@ -155,7 +155,7 @@ Expanding - + 20 0 diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp index 9644f2bf..abf2c2f7 100644 --- a/kommander/editor/newformimpl.cpp +++ b/kommander/editor/newformimpl.cpp @@ -121,7 +121,7 @@ void CustomFormItem::insert() if (!resource.load(ff)) { TQMessageBox::information(MainWindow::self, i18n("Load Template"), - i18n("Could not load form description from template '%1'").tqarg(filename)); + i18n("Could not load form description from template '%1'").arg(filename)); delete ff; return; } diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui index eeead240..cadcb3f5 100644 --- a/kommander/editor/paletteeditor.ui +++ b/kommander/editor/paletteeditor.ui @@ -67,7 +67,7 @@ Build Palette - + AlignAuto @@ -92,7 +92,7 @@ 0 - + 50 0 @@ -110,7 +110,7 @@ &3D effects: - + AlignVCenter @@ -154,7 +154,7 @@ 0 - + 50 0 @@ -172,7 +172,7 @@ Back&ground: - + AlignVCenter @@ -214,7 +214,7 @@ Expanding - + 20 20 @@ -353,7 +353,7 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 @@ -325,7 +325,7 @@ 0 - + 0 0 @@ -477,7 +477,7 @@ Expanding - + 20 20 @@ -496,7 +496,7 @@ 0 - + 0 0 @@ -573,7 +573,7 @@ Expanding - + 20 20 diff --git a/kommander/editor/paletteeditoradvancedimpl.cpp b/kommander/editor/paletteeditoradvancedimpl.cpp index e5480379..e7880b19 100644 --- a/kommander/editor/paletteeditoradvancedimpl.cpp +++ b/kommander/editor/paletteeditoradvancedimpl.cpp @@ -244,15 +244,15 @@ void PaletteEditorAdvanced::onCentral( int item ) case 0: default: c = editPalette.active().color( centralFromItem(item) ); - p = editPalette.active().tqbrush( centralFromItem(item) ).pixmap(); + p = editPalette.active().brush( centralFromItem(item) ).pixmap(); break; case 1: c = editPalette.inactive().color( centralFromItem(item) ); - p = editPalette.inactive().tqbrush( centralFromItem(item) ).pixmap(); + p = editPalette.inactive().brush( centralFromItem(item) ).pixmap(); break; case 2: c = editPalette.disabled().color( centralFromItem(item) ); - p = editPalette.disabled().tqbrush( centralFromItem(item) ).pixmap(); + p = editPalette.disabled().brush( centralFromItem(item) ).pixmap(); break; } @@ -508,17 +508,17 @@ void PaletteEditorAdvanced::updateStyledButtons() default: central = editPalette.active().color( centralFromItem( comboCentral->currentItem() ) ); effect = editPalette.active().color( effectFromItem( comboEffect->currentItem() ) ); - pm = editPalette.active().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); + pm = editPalette.active().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); break; case 1: central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) ); effect = editPalette.inactive().color( effectFromItem( comboEffect->currentItem() ) ); - pm = editPalette.inactive().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); + pm = editPalette.inactive().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); break; case 2: central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) ); effect = editPalette.disabled().color( effectFromItem( comboEffect->currentItem() ) ); - pm = editPalette.disabled().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); + pm = editPalette.disabled().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); break; } 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/pics/images.h b/kommander/editor/pics/images.h index 57997088..8a7bd3a2 100644 --- a/kommander/editor/pics/images.h +++ b/kommander/editor/pics/images.h @@ -10857,7 +10857,7 @@ static struct Embed { { 1483, small_form_xpm_data, "small/form.xpm" }, { 3981, small_home_xpm_data, "small/home.xpm" }, { 5406, small_image_xpm_data, "small/image.xpm" }, - { 3179, small_layout_xpm_data, "small/tqlayout.xpm" }, + { 3179, small_layout_xpm_data, "small/layout.xpm" }, { 3621, small_left_xpm_data, "small/left.xpm" }, { 1131, small_newform_xpm_data, "small/newform.xpm" }, { 2434, small_print_xpm_data, "small/print.xpm" }, @@ -10877,11 +10877,11 @@ static struct Embed { { 485, small_editcopy_png_data, "small/editcopy.png" }, { 649, small_editcut_png_data, "small/editcut.png" }, { 520, small_editgrid_png_data, "small/editgrid.png" }, - { 706, small_edithlayout_png_data, "small/edithtqlayout.png" }, + { 706, small_edithlayout_png_data, "small/edithlayout.png" }, { 809, small_edithlayoutsplit_png_data, "small/edithlayoutsplit.png" }, { 902, small_editpaste_png_data, "small/editpaste.png" }, { 690, small_editslots_png_data, "small/editslots.png" }, - { 289, small_editvlayout_png_data, "small/editvtqlayout.png" }, + { 289, small_editvlayout_png_data, "small/editvlayout.png" }, { 355, small_editvlayoutsplit_png_data, "small/editvlayoutsplit.png" }, { 1408, small_exec_png_data, "small/exec.png" }, { 313, small_filenew_png_data, "small/filenew.png" }, @@ -10925,7 +10925,7 @@ static struct Embed { { 572, small_undo_png_data, "small/undo.png" }, { 733, small_disabled_editcut_xpm_data, "small/disabled/editcut.xpm" }, { 899, small_disabled_editslots_xpm_data, "small/disabled/editslots.xpm" }, - { 931, small_disabled_layout_xpm_data, "small/disabled/tqlayout.xpm" }, + { 931, small_disabled_layout_xpm_data, "small/disabled/layout.xpm" }, { 733, small_disabled_left_xpm_data, "small/disabled/left.xpm" }, { 733, small_disabled_right_xpm_data, "small/disabled/right.xpm" }, { 659, small_disabled_adjustsize_png_data, "small/disabled/adjustsize.png" }, @@ -10933,10 +10933,10 @@ static struct Embed { { 1126, small_disabled_editbreaklayout_png_data, "small/disabled/editbreaklayout.png" }, { 931, small_disabled_editcopy_png_data, "small/disabled/editcopy.png" }, { 735, small_disabled_editgrid_png_data, "small/disabled/editgrid.png" }, - { 601, small_disabled_edithlayout_png_data, "small/disabled/edithtqlayout.png" }, + { 601, small_disabled_edithlayout_png_data, "small/disabled/edithlayout.png" }, { 754, small_disabled_edithlayoutsplit_png_data, "small/disabled/edithlayoutsplit.png" }, { 901, small_disabled_editpaste_png_data, "small/disabled/editpaste.png" }, - { 617, small_disabled_editvlayout_png_data, "small/disabled/editvtqlayout.png" }, + { 617, small_disabled_editvlayout_png_data, "small/disabled/editvlayout.png" }, { 752, small_disabled_editvlayoutsplit_png_data, "small/disabled/editvlayoutsplit.png" }, { 587, small_disabled_filesave_png_data, "small/disabled/filesave.png" }, { 531, small_disabled_redo_png_data, "small/disabled/redo.png" }, diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp index e536242a..a2f8356c 100644 --- a/kommander/editor/pixmapchooser.cpp +++ b/kommander/editor/pixmapchooser.cpp @@ -886,12 +886,12 @@ void PixmapView::setPixmap( const TQPixmap &pix ) { pixmap = pix; resizeContents( pixmap.size().width(), pixmap.size().height() ); - viewport()->tqrepaint( false ); + viewport()->repaint( false ); } 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..e93a94b5 100644 --- a/kommander/editor/pixmapfunction.ui +++ b/kommander/editor/pixmapfunction.ui @@ -25,7 +25,7 @@ PixmapFunction - tqgeometry + geometry 0 0 @@ -810,7 +810,7 @@ Expanding - tqsizeHint + sizeHint 20 20 @@ -861,7 +861,7 @@ Expanding - tqsizeHint + sizeHint 20 20 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 @@ Expanding - + 20 20 @@ -528,7 +528,7 @@ Expanding - + 20 20 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 @@ textView - + 32767 50 @@ -263,7 +263,7 @@ Expanding - + 20 20 diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index 50938a89..0007a415 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include #include @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include @@ -105,7 +105,7 @@ static TQStringList getFontList() fontDataBase = new TQFontDatabase; qAddPostRoutine( cleanupFontDatabase ); } - return fontDataBase->tqfamilies(); + return fontDataBase->families(); } @@ -317,9 +317,9 @@ void PropertyItem::setOpen( bool b ) open = b; if ( !open ) { - tqchildren.setAutoDelete( true ); - tqchildren.clear(); - tqchildren.setAutoDelete( false ); + children.setAutoDelete( true ); + children.clear(); + children.setAutoDelete( false ); tqApp->processEvents(); listview->updateEditorSize(); return; @@ -375,7 +375,7 @@ void PropertyItem::setChanged( bool b, bool updateDb ) if ( changed == b ) return; changed = b; - tqrepaint(); + repaint(); if ( updateDb ) MetaDataBase::setPropertyChanged( listview->propertyEditor()->widget(), name(), changed ); updateResetButtonState(); @@ -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->layout()->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 ); } @@ -475,18 +475,18 @@ void PropertyItem::childValueChanged( PropertyItem * ) void PropertyItem::addChild( PropertyItem *i ) { - tqchildren.append( i ); + children.append( i ); } int PropertyItem::childCount() const { - return tqchildren.count(); + return children.count(); } PropertyItem *PropertyItem::child( int i ) const { // ARRRRRRRRG - return ( (PropertyItem*)this )->tqchildren.at( i ); + return ( (PropertyItem*)this )->children.at( i ); } /*! If the contents of the item is not displayable with a text, but @@ -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 ); @@ -1580,7 +1580,7 @@ void PropertyPixmapItem::setValue( const TQVariant &v ) else pixPrev->setPixmap( v.toIconSet().pixmap() ); PropertyItem::setValue( v ); - tqrepaint(); + repaint(); } void PropertyPixmapItem::getPixmap() @@ -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(); @@ -1617,8 +1617,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r ) // -------------------------------------------------------------- PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const TQString &propName, bool tqchildren ) - : PropertyItem( l, after, prop, propName ), withChildren( tqchildren ) + const TQString &propName, bool children ) + : PropertyItem( l, after, prop, propName ), withChildren( children ) { box = new TQHBox( listview->viewport() ); box->hide(); @@ -2112,7 +2112,7 @@ void PropertySizePolicyItem::setValue( const TQVariant &v ) return; TQString s = TQString( "%1/%2/%2/%2" ); - s = s.tqarg( size_type_to_string( v.toSizePolicy().horData() ) ). + s = s.arg( size_type_to_string( v.toSizePolicy().horData() ) ). arg( size_type_to_string( v.toSizePolicy().verData() ) ). arg( v.toSizePolicy().horStretch() ). arg( v.toSizePolicy().verStretch() ); @@ -2185,7 +2185,7 @@ void PropertyPaletteItem::setValue( const TQVariant &v ) TQString s; palettePrev->setPalette( v.toPalette() ); PropertyItem::setValue( v ); - tqrepaint(); + repaint(); } void PropertyPaletteItem::getPalette() @@ -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 ); @@ -2325,7 +2325,7 @@ void PropertyCursorItem::showEditor() PropertyItem::showEditor(); if ( !comb ) { combo()->blockSignals( true ); - combo()->setCurrentItem( (int)value().toCursor().tqshape() ); + combo()->setCurrentItem( (int)value().toCursor().shape() ); combo()->blockSignals( false ); } placeEditor( combo() ); @@ -2348,7 +2348,7 @@ void PropertyCursorItem::setValue( const TQVariant &v ) return; combo()->blockSignals( true ); - combo()->setCurrentItem( (int)v.toCursor().tqshape() ); + combo()->setCurrentItem( (int)v.toCursor().shape() ); combo()->blockSignals( false ); setText( 1, combo()->currentText() ); PropertyItem::setValue( v ); @@ -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 unique; TQObject *w = editor->widget(); @@ -2533,11 +2533,11 @@ void PropertyList::setupProperties() WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; for ( TQPtrListIterator 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; @@ -2642,7 +2642,7 @@ void PropertyList::setupProperties() if ( p->designable(w) ) { if ( p->isSetType() ) { - if ( TQString( p->name() ) == "tqalignment" ) { + if ( TQString( p->name() ) == "alignment" ) { TQStringList lst; lst << p->valueToKey( AlignAuto ) << p->valueToKey( AlignLeft ) @@ -2672,7 +2672,7 @@ void PropertyList::setupProperties() item->setChanged( true, false ); } } else { - qWarning( "Sets except 'tqalignment' not supported yet.... %s.", p->name() ); + qWarning( "Sets except 'alignment' not supported yet.... %s.", p->name() ); } } else if ( p->isEnumType() ) { TQStrList l = p->enumKeys(); @@ -2882,7 +2882,7 @@ void PropertyList::valueChanged( PropertyItem *i ) { if ( !editor->widget() ) return; - TQString pn( i18n("Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) ); + TQString pn( i18n("Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, i->name(), WidgetFactory::property( editor->widget(), i->name() ), @@ -3061,25 +3061,25 @@ 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 ); + int align = editor->widget()->property( "alignment" ).toInt(); + p = editor->widget()->metaObject()-> + property( editor->widget()->metaObject()->findProperty( "alignment", 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 ); + int align = editor->widget()->property( "alignment" ).toInt(); + p = editor->widget()->metaObject()-> + property( editor->widget()->metaObject()->findProperty( "alignment", true ), true ); align &= ~AlignHorizontal_Mask; ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() ); } else if ( i->name() == "wordwrap" ) { - int align = editor->widget()->property( "tqalignment" ).toInt(); + int align = editor->widget()->property( "alignment" ).toInt(); if ( align & WordBreak ) i->setValue( TQVariant( true, 0 ) ); else @@ -3134,7 +3134,7 @@ void PropertyList::resetProperty() PropertyItem *i = (PropertyItem*)currentItem(); if ( !MetaDataBase::isPropertyChanged( editor->widget(), i->PropertyItem::name() ) ) return; - TQString pn( i18n("Reset '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) ); + TQString pn( i18n("Reset '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) ); SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(), editor->widget(), editor, i->name(), i->value(), @@ -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,10 +3238,10 @@ TQString PropertyList::whatsThisText( TQListViewItem *i ) if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) { return *it; } - mo = mo->tqsuperClass(); + mo = mo->superClass(); } - return i18n("

TQWidget::%1

There is no documentation available for this property.

" ).tqarg( prop ); + return i18n("

TQWidget::%1

There is no documentation available for this property.

" ).arg( prop ); } void PropertyList::readPropertyDocs() @@ -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() ) { @@ -3588,7 +3588,7 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw ) wid = w; formwindow = fw; - setCaption( i18n("Property Editor (%1)" ).tqarg( formwindow->name() ) ); + setCaption( i18n("Property Editor (%1)" ).arg( formwindow->name() ) ); listview->viewport()->setUpdatesEnabled( false ); listview->setUpdatesEnabled( false ); clear(); @@ -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..d0eb517b 100644 --- a/kommander/editor/propertyeditor.h +++ b/kommander/editor/propertyeditor.h @@ -118,7 +118,7 @@ private: bool open, changed; PropertyItem *property; TQString propertyName; - TQPtrList tqchildren; + TQPtrList children; TQColor backColor; TQPushButton *resetButton; @@ -340,7 +340,7 @@ class PropertyColorItem : public TQObject, public: PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, - const TQString &propName, bool tqchildren ); + const TQString &propName, bool children ); ~PropertyColorItem(); virtual void createChildren(); @@ -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..81824fc6 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -27,7 +27,7 @@ #include "tqdom.h" #include "widgetdatabase.h" #include "widgetfactory.h" -#include "tqlayout.h" +#include "layout.h" #include "domtool.h" #include "command.h" #include "pixmapchooser.h" @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include #include @@ -401,13 +401,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) if ( formwindow ) { formwindow->killAccels( TQT_TQOBJECT(formwindow) ); - if ( formwindow->tqlayout() ) - formwindow->tqlayout()->activate(); + if ( formwindow->layout() ) + formwindow->layout()->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; @@ -931,17 +931,17 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) { const TQObjectList l = obj->childrenListObject(); if ( l.isEmpty() ) - return; // no tqchildren to save + return; // no children to save TQString closeTag; - // if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer - TQLayout *tqlayout = 0; + // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer + TQLayout *layout = 0; QDesignerGridLayout* grid = 0; if ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) && obj->isWidgetType() && - WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) { - WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ); + WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) { + WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, layout ); switch ( lay ) { case WidgetFactory::HBox: closeTag = makeIndent( indent ) + ""; @@ -957,15 +957,15 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) closeTag = makeIndent( indent ) + ""; ts << makeIndent( indent ) << "" << endl; ++indent; - grid = (QDesignerGridLayout*) tqlayout; + grid = (QDesignerGridLayout*) layout; break; default: break; } - // save properties of tqlayout + // save properties of layout if ( lay != WidgetFactory::NoLayout ) - saveObjectProperties( TQT_TQOBJECT(tqlayout), ts, indent ); + saveObjectProperties( TQT_TQOBJECT(layout), ts, indent ); } @@ -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 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 ) << "" << p->valueToKey( w->property( name ).toInt() ) << "" << endl; } @@ -1240,7 +1240,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant ts << makeIndent( indent ) << "" << endl; } break; case TQVariant::Cursor: - ts << makeIndent( indent ) << "" << value.toCursor().tqshape() << "" << endl; + ts << makeIndent( indent ) << "" << value.toCursor().shape() << "" << endl; break; case TQVariant::StringList: { TQStringList lst = value.toStringList(); @@ -1303,7 +1303,7 @@ void Resource::saveColorGroup( TQTextStream &ts, int indent, const TQColorGroup saveColor( ts, indent, cg.color( (TQColorGroup::ColorRole)r ) ); indent--; ts << makeIndent( indent ) << "" << endl; - TQPixmap* pm = cg.tqbrush( (TQColorGroup::ColorRole)r ).pixmap(); + TQPixmap* pm = cg.brush( (TQColorGroup::ColorRole)r ).pixmap(); if ( pm && !pm->isNull() ) savePixmap( *pm, ts, indent ); } @@ -1316,7 +1316,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c ) ts << makeIndent( indent ) << "" << TQString::number( c.blue() ) << "" << endl; } -TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout ) +TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout ) { lastItem = 0; TQDomElement n = e.firstChild().toElement(); @@ -1346,16 +1346,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay w = (TQWidget*)obj; if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) w = ( (TQMainWindow*)w )->centralWidget(); - if ( tqlayout ) { - switch ( WidgetFactory::layoutType( tqlayout ) ) { + if ( layout ) { + switch ( WidgetFactory::layoutType( layout ) ) { case WidgetFactory::HBox: - ( (TQHBoxLayout*)tqlayout )->addWidget( w ); + ( (TQHBoxLayout*)layout )->addWidget( w ); break; case WidgetFactory::VBox: - ( (TQVBoxLayout*)tqlayout )->addWidget( w ); + ( (TQVBoxLayout*)layout )->addWidget( w ); break; case WidgetFactory::Grid: - ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1, + ( (QDesignerGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1, col, col + colspan - 1 ); break; default: @@ -1365,7 +1365,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( !toplevel ) toplevel = w; - tqlayout = 0; + layout = 0; if ( w && formwindow ) { if ( !parent || ( !parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) && !parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) @@ -1379,22 +1379,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay while ( !n.isNull() ) { if ( n.tagName() == "spacer" ) { - createSpacer( n, w, tqlayout, Qt::Horizontal ); + createSpacer( n, w, layout, Qt::Horizontal ); } else if ( n.tagName() == "widget" ) { - createObject( n, w, tqlayout ); + createObject( n, w, layout ); } else if ( n.tagName() == "hbox" ) { - tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::HBox ); - obj = TQT_TQOBJECT(tqlayout); + layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox ); + obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "grid" ) { - tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::Grid ); - obj = TQT_TQOBJECT(tqlayout); + layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid ); + obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "vbox" ) { - tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::VBox ); - obj = TQT_TQOBJECT(tqlayout); + layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox ); + obj = TQT_TQOBJECT(layout); n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "property" && obj ) { @@ -1605,7 +1605,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } } -TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ) +TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ) { TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); @@ -1629,12 +1629,12 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay spacer->setInteraciveMode( true ); if ( formwindow ) formwindow->insertWidget( spacer, pasting ); - if ( tqlayout ) { - if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->tqalignment() ); + if ( layout ) { + if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) ) + ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() ); else - ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, - spacer->tqalignment() ); + ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1, + spacer->alignment() ); } return spacer; } @@ -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 << "" << endl; ts << makeIndent( indent ) << "" << endl; indent++; - ts << makeIndent( indent ) << "" << w->tqsizeHint.width() << "" << endl; - ts << makeIndent( indent ) << "" << w->tqsizeHint.height() << "" << endl; + ts << makeIndent( indent ) << "" << w->sizeHint.width() << "" << endl; + ts << makeIndent( indent ) << "" << w->sizeHint.height() << "" << endl; indent--; ts << makeIndent( indent ) << "" << endl; ts << makeIndent( indent ) << "" << (int)w->isContainer << "" << endl; @@ -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/resource.h b/kommander/editor/resource.h index e35bd6b2..56081f85 100644 --- a/kommander/editor/resource.h +++ b/kommander/editor/resource.h @@ -22,7 +22,7 @@ #define RESOURCE_H #include -#include +#include #include #include #include @@ -103,8 +103,8 @@ private: // void saveFormCode(); #endif - TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout = 0 ); - TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *tqlayout, Qt::Orientation o ); + TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 ); + TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ); void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 ); void createColumn( const TQDomElement &e, TQWidget *widget ); void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e); diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp index 72f7c38c..7b0d4a97 100644 --- a/kommander/editor/sizehandle.cpp +++ b/kommander/editor/sizehandle.cpp @@ -208,7 +208,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) sel->updateGeometry(); oldPressPos += ( p - pos() ); - formWindow->sizePreview()->setText( TQString( "%1/%2" ).tqarg( widget->width() ).tqarg( widget->height() ) ); + formWindow->sizePreview()->setText( TQString( "%1/%2" ).arg( widget->width() ).arg( widget->height() ) ); formWindow->sizePreview()->adjustSize(); TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), formWindow->sizePreview()->size() ); @@ -226,19 +226,19 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) return; formWindow->sizePreview()->hide(); - if ( geom != widget->tqgeometry() ) + if ( geom != widget->geometry() ) formWindow->commandHistory()->addCommand( new ResizeCommand( i18n("Resize" ), formWindow, widget, origGeom, - widget->tqgeometry() ) ); + widget->geometry() ) ); formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) ); } 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..b807c0f1 100644 --- a/kommander/editor/styledbutton.cpp +++ b/kommander/editor/styledbutton.cpp @@ -23,7 +23,7 @@ #include "formwindow.h" #include "pixmapchooser.h" #include -#include +#include #include #include #include @@ -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,25 +145,25 @@ 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 ) { TQColor pen = isEnabled() ? - hasFocus() ? tqpalette().active().buttonText() : tqpalette().inactive().buttonText() - : tqpalette().disabled().buttonText(); + hasFocus() ? palette().active().buttonText() : palette().inactive().buttonText() + : palette().disabled().buttonText(); 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 ) ); @@ -178,7 +178,7 @@ void StyledButton::onEditor() { switch (edit) { case ColorEditor: { - TQColor c = tqpalette().active().background(); + TQColor c = palette().active().background(); if ( KColorDialog::getColor( c, this ) == TQDialog::Accepted ) { setColor( c ); emit changed(); 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 @@ Expanding - + 20 20 @@ -172,7 +172,7 @@ Expanding - + 20 20 @@ -194,7 +194,7 @@ Expanding - + 20 20 @@ -299,7 +299,7 @@ buttonDeleteColPixmap - + 30 22 @@ -322,7 +322,7 @@ buttonChooseColPixmap - + 30 22 @@ -425,7 +425,7 @@ Expanding - + 20 20 @@ -481,7 +481,7 @@ Expanding - + 20 20 @@ -566,7 +566,7 @@ buttonDeleteRowPixmap - + 30 22 @@ -589,7 +589,7 @@ buttonChooseRowPixmap - + 30 22 diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp index 5fc56f41..f54094b3 100644 --- a/kommander/editor/tableeditorimpl.cpp +++ b/kommander/editor/tableeditorimpl.cpp @@ -312,7 +312,7 @@ void TableEditor::applyClicked() row.pix = table->verticalHeader()->iconSet( i )->pixmap(); rows.append( row ); } - PopulateTableCommand *cmd = new PopulateTableCommand( i18n("Edit Rows and Columns of '%1' " ).tqarg( editTable->name() ), + PopulateTableCommand *cmd = new PopulateTableCommand( i18n("Edit Rows and Columns of '%1' " ).arg( editTable->name() ), formWindow, editTable, rows, cols ); cmd->execute(); formWindow->commandHistory()->addCommand( cmd ); 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 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 @@ Expanding - + 20 20 diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp index 37c9672d..7ebd4a02 100644 --- a/kommander/editor/widgetdatabase.cpp +++ b/kommander/editor/widgetdatabase.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include @@ -833,7 +833,7 @@ bool WidgetDatabase::isForm( int id ) return r->isForm; } -/*! Returns whether the widget registered as \a id can have tqchildren. +/*! Returns whether the widget registered as \a id can have children. */ bool WidgetDatabase::isContainer( int id ) diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index 9f619c79..d04d75d9 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -29,7 +29,7 @@ #include "mainwindow.h" #include "formwindow.h" #include "pixmapchooser.h" -#include "tqlayout.h" +#include "layout.h" #include "listboxeditorimpl.h" #include "listvieweditorimpl.h" #include "iconvieweditorimpl.h" @@ -56,9 +56,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -69,8 +69,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -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 ) @@ -668,11 +668,11 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo return w; } -/*! Creates a tqlayout on the widget \a widget of the type \a type +/*! Creates a layout on the widget \a widget of the type \a type which can be \c HBox, \c VBox or \c Grid. */ -TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, LayoutType type ) +TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, LayoutType type ) { int spacing = MainWindow::self->currentLayoutDefaultSpacing(); int margin = 0; @@ -682,74 +682,74 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) ) margin = MainWindow::self->currentLayoutDefaultMargin(); - if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) widget = ((TQTabWidget*)widget)->currentPage(); - if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) widget = ((TQToolBox*)widget)->currentItem(); - if ( !tqlayout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) widget = ((TQWizard*)widget)->currentPage(); - if ( !tqlayout && widget && widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) widget = ((TQMainWindow*)widget)->centralWidget(); - if ( !tqlayout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); MetaDataBase::addEntry( TQT_TQOBJECT(widget) ); - if ( !tqlayout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { + if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { TQGroupBox *gb = (TQGroupBox*)widget; gb->setColumnLayout( 0, Qt::Vertical ); - gb->tqlayout()->setMargin( 0 ); - gb->tqlayout()->setSpacing( 0 ); + gb->layout()->setMargin( 0 ); + gb->layout()->setSpacing( 0 ); TQLayout *l; switch ( type ) { case HBox: - l = new TQHBoxLayout( gb->tqlayout() ); + l = new TQHBoxLayout( gb->layout() ); 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 ); + l = new TQVBoxLayout( gb->layout(), 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() ); + l = new QDesignerGridLayout( gb->layout() ); 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: return 0; } } else { - if ( tqlayout ) { + if ( layout ) { TQLayout *l; switch ( type ) { case HBox: - l = new TQHBoxLayout( tqlayout ); + l = new TQHBoxLayout( layout ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); l->setSpacing( spacing ); l->setMargin( margin ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); return l; case VBox: - l = new TQVBoxLayout( tqlayout ); + l = new TQVBoxLayout( layout ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); l->setSpacing( spacing ); l->setMargin( margin ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); return l; case Grid: { - l = new QDesignerGridLayout( tqlayout ); + l = new QDesignerGridLayout( layout ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); l->setSpacing( spacing ); l->setMargin( margin ); @@ -819,7 +819,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) widget = ((TQMainWindow*)widget)->centralWidget(); if ( widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - delete widget->tqlayout(); + delete widget->layout(); } /*! Factory functions for creating a widget of the type \a className @@ -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); } @@ -1257,14 +1257,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare -/*! Find out which type the tqlayout of the widget is. Returns \c HBox, - \c VBox, \c Grid or \c NoLayout. \a tqlayout points to this - TQWidget::tqlayout() of \a w or to 0 after the function call. +/*! Find out which type the layout of the widget is. Returns \c HBox, + \c VBox, \c Grid or \c NoLayout. \a layout points to this + TQWidget::layout() of \a w or to 0 after the function call. */ -WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tqlayout ) +WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&layout ) { - tqlayout = 0; + layout = 0; if ( w && w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) w = ((TQTabWidget*)w)->currentPage(); @@ -1280,9 +1280,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql if ( w && w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox; - if ( !w || !w->tqlayout() ) + if ( !w || !w->layout() ) return NoLayout; - TQLayout *lay = w->tqlayout(); + TQLayout *lay = w->layout(); if ( w->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) { TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING ); @@ -1290,7 +1290,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql lay = (TQLayout*)l->first(); delete l; } - tqlayout = lay; + layout = lay; if ( lay->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) return HBox; @@ -1304,13 +1304,13 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tql /*! \overload */ -WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout ) +WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout ) { - if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) + if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) return HBox; - else if ( tqlayout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) ) return VBox; - else if ( tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) return Grid; return NoLayout; } @@ -1325,9 +1325,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w ) } -TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout ) +TQWidget *WidgetFactory::layoutParent( TQLayout *layout ) { - TQObject *o = TQT_TQOBJECT(tqlayout); + TQObject *o = TQT_TQOBJECT(layout); while ( o ) { if ( o->isWidgetType() ) return (TQWidget*)o; @@ -1336,7 +1336,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout ) return 0; } -/*! Returns the widget into which tqchildren should be inserted when \a +/*! Returns the widget into which children should be inserted when \a w is a container known to the designer. Usually that is \a w itself, sometimes it is different (e.g. a @@ -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; @@ -1678,10 +1678,10 @@ bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName ) TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) { if ( propName == "wordwrap" ) { - int v = defaultValue( w, "tqalignment" ).toInt(); + int v = defaultValue( w, "alignment" ).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,10 +1701,10 @@ 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(); + int v = defaultValue( w, "alignment" ).toInt(); if ( propName == "hAlign" ) { if ( ( v & AlignAuto ) == AlignAuto ) return "AlignAuto"; @@ -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; @@ -1793,14 +1793,14 @@ bool TQLayoutWidget::event( TQEvent *e ) /* This function must be called on TQLayoutWidget creation and whenever - the TQLayoutWidget's parent tqlayout changes (e.g., from a TQHBoxLayout + the TQLayoutWidget's parent layout changes (e.g., from a TQHBoxLayout to a TQVBoxLayout), because of the (illogical) way layouting works. */ void TQLayoutWidget::updateSizePolicy() { TQObjectList clo = childrenListObject(); if ( clo.isEmpty() || clo.count() == 0 ) { - sp = TQWidget::tqsizePolicy(); + sp = TQWidget::sizePolicy(); return; } @@ -1817,14 +1817,14 @@ void TQLayoutWidget::updateSizePolicy() int ht = (int) TQSizePolicy::Preferred; int vt = (int) TQSizePolicy::Preferred; - if ( tqlayout() ) { + if ( layout() ) { /* - parentLayout is set to the parent tqlayout if there is one and if it is + parentLayout is set to the parent layout if there is one and if it is top level, in which case layouting is illogical. */ TQLayout *parentLayout = 0; if ( parent() && parent()->isWidgetType() ) { - parentLayout = ((TQWidget *)parent())->tqlayout(); + parentLayout = ((TQWidget *)parent())->layout(); if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) parentLayout = 0; } @@ -1832,7 +1832,7 @@ void TQLayoutWidget::updateSizePolicy() TQObjectListIt it( childrenListObject() ); TQObject *o; - if ( tqlayout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) { + if ( layout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) { if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) vt = TQSizePolicy::Minimum; else @@ -1844,16 +1844,16 @@ 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) ) { + } else if ( layout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) { if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) ht = TQSizePolicy::Minimum; else @@ -1865,16 +1865,16 @@ 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) ) { + } else if ( layout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { ht = TQSizePolicy::Fixed; vt = TQSizePolicy::Fixed; if ( parentLayout ) { @@ -1890,29 +1890,29 @@ 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 ( layout()->expanding() & TQSizePolicy::Horizontally ) ht = TQSizePolicy::Expanding; - if ( tqlayout()->expandingDirections() & TQSizePolicy::Vertically ) + if ( layout()->expanding() & TQSizePolicy::Vertically ) vt = TQSizePolicy::Expanding; #else // USE_QT4 - if ( tqlayout()->expanding() & TQSizePolicy::Horizontally ) + if ( layout()->expanding() & TQSizePolicy::Horizontally ) ht = TQSizePolicy::Expanding; - if ( tqlayout()->expanding() & TQSizePolicy::Vertically ) + if ( layout()->expanding() & TQSizePolicy::Vertically ) vt = TQSizePolicy::Expanding; #endif // USE_QT4 - tqlayout()->tqinvalidate(); + layout()->invalidate(); } sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt ); @@ -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..90e88235 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -72,13 +72,13 @@ public: static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE, const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal ); - static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type ); + static TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type ); static void deleteLayout( TQWidget *widget ); static LayoutType layoutType( TQWidget *w ); - static LayoutType layoutType( TQWidget *w, TQLayout *&tqlayout ); - static LayoutType layoutType( TQLayout *tqlayout ); - static TQWidget *layoutParent( TQLayout *tqlayout ); + static LayoutType layoutType( TQWidget *w, TQLayout *&layout ); + static LayoutType layoutType( TQLayout *layout ); + static TQWidget *layoutParent( TQLayout *layout ); static TQWidget* containerOfWidget( TQWidget *w ); static TQWidget* widgetOfContainer( TQWidget *w ); @@ -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 @@ Expanding - + 20 20 @@ -176,7 +176,7 @@ Expanding - + 20 20 diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp index 56ff0028..129760d1 100644 --- a/kommander/editor/wizardeditorimpl.cpp +++ b/kommander/editor/wizardeditorimpl.cpp @@ -109,7 +109,7 @@ void WizardEditor::addClicked() listBox->insertItem( i18n( "Page" ), index ); // schedule add command - AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).tqarg( wizard->name() ), + AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).arg( wizard->name() ), formwindow, wizard, "Page", index, false); commands.append( cmd ); @@ -128,7 +128,7 @@ void WizardEditor::removeClicked() // schedule remove command DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n("Delete Page %1 of %2" ) - .tqarg( listBox->text( index ) ).tqarg( wizard->name() ), + .arg( listBox->text( index ) ).arg( wizard->name() ), formwindow, wizard, index, false ); commands.append( cmd ); @@ -148,8 +148,8 @@ void WizardEditor::upClicked() listBox->setCurrentItem( index2 ); // schedule swap command - SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n("Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 ) - .tqarg( wizard->name() ), formwindow, wizard, index1, index2); + SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n("Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 ) + .arg( wizard->name() ), formwindow, wizard, index1, index2); commands.append( cmd ); // update buttons @@ -168,8 +168,8 @@ void WizardEditor::downClicked() listBox->setCurrentItem( index2 ); // schedule swap command - SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n("Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 ) - .tqarg( wizard->name() ), formwindow, wizard, index2, index1); + SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n("Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 ) + .arg( wizard->name() ), formwindow, wizard, index2, index1); commands.append( cmd ); // update buttons @@ -199,7 +199,7 @@ void WizardEditor::itemSelected( int index ) bool ok = false; TQString text = KInputDialog::getText( i18n("Page Title"), i18n("New page title:" ), listBox->text( index ), &ok, this ); if ( ok ) { - TQString pn( i18n("Rename page %1 of %2" ).tqarg( listBox->text( index ) ).tqarg( wizard->name() ) ); + TQString pn( i18n("Rename page %1 of %2" ).arg( listBox->text( index ) ).arg( wizard->name() ) ); RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, text ); commands.append( cmd ); listBox->changeItem( text, index ); diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp index 99fcf474..576709a5 100644 --- a/kommander/editor/workspace.cpp +++ b/kommander/editor/workspace.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include "qcompletionedit.h" #include @@ -485,9 +485,9 @@ void Workspace::update( FormFile* ff ) { TQListViewItem* i = findItem( ff ); if ( i ) { - i->tqrepaint(); + i->repaint(); if ( (i = i->firstChild()) ) - i->tqrepaint(); + i->repaint(); } } -- cgit v1.2.1