diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
| commit | 929d7ae4f69d62b8f1f6d3506adf75f017753935 (patch) | |
| tree | 21652db5723e70ded94f724015e77d96e42c83b9 /kommander | |
| parent | a40b0e89b6b20ba9039d3f79e73afbeac6954ccb (diff) | |
| download | tdewebdev-929d7ae4f69d62b8f1f6d3506adf75f017753935.tar.gz tdewebdev-929d7ae4f69d62b8f1f6d3506adf75f017753935.zip | |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kommander')
103 files changed, 519 insertions, 519 deletions
diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno index d21460b5..d90ec71b 100644 --- a/kommander/Kommander-TODO.kno +++ b/kommander/Kommander-TODO.kno @@ -238,7 +238,7 @@ <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif"> <p><span style="font-weight:600">Executing Kommander scripts</span></p> <ul type="disc"><li>detect and handle missing plugin widgets</li> -<li>cache @pid, @dcopid, @tqparentPid, perhaps calculate and cache @tqparentdcopid</li> +<li>cache @pid, @dcopid, @parentPid, perhaps calculate and cache @parentdcopid</li> <li>handle multiple dialogs: they could be packaged in single *.tgz file, unpacked and executed internally</li> <div></div> <div><br /></div></ul> @@ -284,7 +284,7 @@ <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Georgia"> <li type="disc"><span style="font-weight:600">ChangeLog of Kommander</span></li> <li type="disc"><span style="font-style:italic">See ChangeLog file for details and dates</span></li> -<ul type="disc"><li>added @tqparentPid evaluated to tqparent process pid</li> +<ul type="disc"><li>added @parentPid evaluated to tqparent process pid</li> <li>added @pid evaluated to current process pid</li> <li>added @dcopid evaluated to current process DCOP id</li> <li>significantly improved Kommander Text editor usability</li> diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index 58cdb4a3..54a5e0f9 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -194,7 +194,7 @@ void QDesignerToolBar::findFormWindow() while ( w ) { if ( w->inherits( "FormWindow" ) ) formWindow = (FormWindow*)w; - w = w->tqparentWidget(); + w = w->parentWidget(); } } @@ -720,7 +720,7 @@ void QDesignerMenuBar::findFormWindow() while ( w ) { if ( w->inherits( "FormWindow" ) ) formWindow = (FormWindow*)w; - w = w->tqparentWidget(); + w = w->parentWidget(); } } @@ -741,14 +741,14 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e ) TQMenuItem *item = tqfindItem( idAt( itm ) ); RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).tqarg( item->text() ), formWindow, - (TQMainWindow*)tqparentWidget(), this, + (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 - tqparentWidget()->tqlayout()->tqinvalidate(); - tqparentWidget()->tqlayout()->activate(); + parentWidget()->tqlayout()->tqinvalidate(); + parentWidget()->tqlayout()->activate(); } else if ( res == 2 ) { bool ok; TQString old = text( idAt( itm ) ); @@ -1044,8 +1044,8 @@ void QDesignerPopupMenu::createPopupMenu() formWindow, a, this, insertAt ); formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - ( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->hidePopups(); - ( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->activateItemAt( -1 ); + ( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->hidePopups(); + ( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->activateItemAt( -1 ); popup( p ); } // set this back to zero so we know a popup (will soon) not exist. @@ -1169,8 +1169,8 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e ) formWindow->commandHistory()->addCommand( cmd ); cmd->execute(); - ( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->hidePopups(); - ( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->activateItemAt( -1 ); + ( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->hidePopups(); + ( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->activateItemAt( -1 ); indicator->hide(); popup( p ); } @@ -1239,7 +1239,7 @@ void QDesignerPopupMenu::findFormWindow() while ( w ) { if ( w->inherits( "FormWindow" ) ) formWindow = (FormWindow*)w; - w = w->tqparentWidget(); + w = w->parentWidget(); } } diff --git a/kommander/editor/actioneditor.ui b/kommander/editor/actioneditor.ui index 794849cd..056b46cf 100644 --- a/kommander/editor/actioneditor.ui +++ b/kommander/editor/actioneditor.ui @@ -2,7 +2,7 @@ <class>ActionEditorBase</class> <include location="local" implDecl="in declaration">actioneditor.ui.h</include> <forward>class QListViewItem;</forward> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <widget class="TQWidget"> <property name="name"> <cstring>ActionEditorBase</cstring> @@ -18,7 +18,7 @@ <property name="caption"> <string>Edit Actions</string> </property> - <property name="tqlayoutMargin" stdset="0"> + <property name="layoutMargin" stdset="0"> </property> <vbox> <property name="name"> diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui index c7af592a..d3565506 100644 --- a/kommander/editor/assoctexteditor.ui +++ b/kommander/editor/assoctexteditor.ui @@ -218,5 +218,5 @@ <Q_SLOTS> <slot>AssocTextEditorBase_destroyed(QObject*)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui index 19c728f9..fc9887c9 100644 --- a/kommander/editor/choosewidget.ui +++ b/kommander/editor/choosewidget.ui @@ -143,7 +143,7 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index e20ba086..df4568fb 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -236,7 +236,7 @@ void ResizeCommand::execute() widget->setGeometry( newRect ); formWindow()->updateSelection( widget ); formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) ); - if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout ) + if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout ) formWindow()->updateChildSelections( widget ); } @@ -245,7 +245,7 @@ void ResizeCommand::unexecute() widget->setGeometry( oldRect ); formWindow()->updateSelection( widget ); formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) ); - if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout ) + if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout ) formWindow()->updateChildSelections( widget ); } @@ -312,7 +312,7 @@ bool MoveCommand::canMerge( Command *c ) void MoveCommand::execute() { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) { + if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) { if ( newParent && oldParent && newParent != oldParent ) { TQPoint pos = newParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) ); w->reparent( newParent, pos, true ); @@ -333,7 +333,7 @@ void MoveCommand::execute() void MoveCommand::unexecute() { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) { + if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) { if ( newParent && oldParent && newParent != oldParent ) { TQPoint pos = oldParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) ); w->reparent( oldParent, pos, true ); @@ -517,7 +517,7 @@ bool SetPropertyCommand::checkProperty() } if ( widget->tqparent() && widget->tqparent()->inherits( "FormWindow" ) ) - formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->tqparentWidget() ); + formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->parentWidget() ); } return true; } @@ -552,9 +552,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( v.toBool() ) align |= WordBreak; widget->setProperty( "tqalignment", TQVariant( align ) ); - } else if ( propName == "tqlayoutSpacing" ) { + } else if ( propName == "layoutSpacing" ) { MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() ); - } else if ( propName == "tqlayoutMargin" ) { + } else if ( propName == "layoutMargin" ) { MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() ); } else if ( propName == "toolTip" || propName == "whatsThis" || propName == "database" || propName == "frameworkCode" ) { MetaDataBase::setFakeProperty( editor->widget(), propName, v ); @@ -628,9 +628,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ // ------------------------------------------------------------ LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *tqlayoutBase, + TQWidget *tqparent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase ) + : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase ) { } @@ -651,9 +651,9 @@ void LayoutHorizontalCommand::unexecute() // ------------------------------------------------------------ LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *tqlayoutBase, + TQWidget *tqparent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, true, true ) + : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, true, true ) { } @@ -674,9 +674,9 @@ void LayoutHorizontalSplitCommand::unexecute() // ------------------------------------------------------------ LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *tqlayoutBase, + TQWidget *tqparent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase ) + : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase ) { } @@ -697,9 +697,9 @@ void LayoutVerticalCommand::unexecute() // ------------------------------------------------------------ LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *tqlayoutBase, + TQWidget *tqparent, TQWidget *layoutBase, const TQWidgetList &wl ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, true, true ) + : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, true, true ) { } @@ -720,9 +720,9 @@ void LayoutVerticalSplitCommand::unexecute() // ------------------------------------------------------------ LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *tqlayoutBase, + TQWidget *tqparent, TQWidget *layoutBase, const TQWidgetList &wl, int xres, int yres ) - : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) + : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) ) { } @@ -743,19 +743,19 @@ void LayoutGridCommand::unexecute() // ------------------------------------------------------------ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw, - TQWidget *tqlayoutBase, const TQWidgetList &wl ) - : Command( n, fw ), lb( tqlayoutBase ), widgets( wl ) + TQWidget *layoutBase, const TQWidgetList &wl ) + : Command( n, fw ), lb( layoutBase ), widgets( wl ) { - WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( tqlayoutBase ); - spacing = MetaDataBase::spacing( TQT_TQOBJECT(tqlayoutBase) ); - margin = MetaDataBase::margin( TQT_TQOBJECT(tqlayoutBase) ); + WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase ); + spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) ); + margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) ); tqlayout = 0; if ( lay == WidgetFactory::HBox ) - tqlayout = new HorizontalLayout( wl, tqlayoutBase, fw, tqlayoutBase, false, tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); + tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); else if ( lay == WidgetFactory::VBox ) - tqlayout = new VerticalLayout( wl, tqlayoutBase, fw, tqlayoutBase, false, tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); + tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ); else if ( lay == WidgetFactory::Grid ) - tqlayout = new GridLayout( wl, tqlayoutBase, fw, tqlayoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false ); + tqlayout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false ); } void BreakLayoutCommand::execute() diff --git a/kommander/editor/command.h b/kommander/editor/command.h index f56e21a6..d288564e 100644 --- a/kommander/editor/command.h +++ b/kommander/editor/command.h @@ -255,7 +255,7 @@ class LayoutHorizontalCommand : public Command { public: LayoutHorizontalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *tqlayoutBase, + TQWidget *tqparent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -271,7 +271,7 @@ class LayoutHorizontalSplitCommand : public Command { public: LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *tqlayoutBase, + TQWidget *tqparent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -287,7 +287,7 @@ class LayoutVerticalCommand : public Command { public: LayoutVerticalCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *tqlayoutBase, + TQWidget *tqparent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -303,7 +303,7 @@ class LayoutVerticalSplitCommand : public Command { public: LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *tqlayoutBase, + TQWidget *tqparent, TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); @@ -319,7 +319,7 @@ class LayoutGridCommand : public Command { public: LayoutGridCommand( const TQString &n, FormWindow *fw, - TQWidget *tqparent, TQWidget *tqlayoutBase, + TQWidget *tqparent, TQWidget *layoutBase, const TQWidgetList &wl, int xres, int yres ); void execute(); @@ -335,7 +335,7 @@ class BreakLayoutCommand : public Command { public: BreakLayoutCommand( const TQString &n, FormWindow *fw, - TQWidget *tqlayoutBase, const TQWidgetList &wl ); + TQWidget *layoutBase, const TQWidgetList &wl ); void execute(); void unexecute(); diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui index 5eed9c1e..63d59f49 100644 --- a/kommander/editor/connectioneditor.ui +++ b/kommander/editor/connectioneditor.ui @@ -403,7 +403,7 @@ <slot access="protected">Q_SLOTSChanged()</slot> <slot access="protected">cancelClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> <includehint>klistbox.h</includehint> diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui index 6e391265..02ff5699 100644 --- a/kommander/editor/formsettings.ui +++ b/kommander/editor/formsettings.ui @@ -329,7 +329,7 @@ <Q_SLOTS> <slot>okClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kommander/editor/formsettingsimpl.cpp b/kommander/editor/formsettingsimpl.cpp index 9912634f..dc292102 100644 --- a/kommander/editor/formsettingsimpl.cpp +++ b/kommander/editor/formsettingsimpl.cpp @@ -35,8 +35,8 @@ FormSettings::FormSettings( TQWidget *tqparent, FormWindow *fw ) editVersion->setText(info.version); editLicense->setText(info.license); editComment->setText(info.comment); - spinSpacing->setValue(formwindow->tqlayoutDefaultSpacing()); - spinMargin->setValue(formwindow->tqlayoutDefaultMargin()); + spinSpacing->setValue(formwindow->layoutDefaultSpacing()); + spinMargin->setValue(formwindow->layoutDefaultMargin()); } void FormSettings::okClicked() diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index e6088172..590d1c47 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -460,9 +460,9 @@ void FormWindow::handleContextMenu(TQContextMenuEvent *e, TQWidget *w) selectWidget(TQT_TQOBJECT(w)); // if widget is laid out, find the first non-laid out super-widget TQWidget *realWidget = w; // but store the original one - while (w->tqparentWidget() && (WidgetFactory::tqlayoutType(w->tqparentWidget()) != + while (w->parentWidget() && (WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w))) - w = w->tqparentWidget(); + w = w->parentWidget(); if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget) { @@ -503,7 +503,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) 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 (!w->tqparentWidget() || WidgetFactory::tqlayoutType(w->tqparentWidget()) == WidgetFactory::NoLayout) + if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout) w->raise(); if ((e->state() & ControlButton)) { // with control pressed, always start rubber band selection @@ -522,7 +522,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) { // ...widget selected // only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!), // unselect its childs - if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout) + if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout) { TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING); setPropertyShowingBlocked(true); @@ -550,10 +550,10 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) selectWidget(TQT_TQOBJECT(w)); // if widget is laid out, find the first non-laid out super-widget - while (w->tqparentWidget() && - (WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout + while (w->parentWidget() && + (WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w))) - w = w->tqparentWidget(); + w = w->parentWidget(); if (e->button() == Qt::LeftButton) { // left button: store original tqgeometry and more as the widget might start moving @@ -563,12 +563,12 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) origPressPos = oldPressPos; checkedSelectionsForMove = false; moving.clear(); - if (w->tqparentWidget() && !isMainContainer(TQT_TQOBJECT(w->tqparentWidget())) && - !isCentralWidget(TQT_TQOBJECT(w->tqparentWidget()))) + if (w->parentWidget() && !isMainContainer(TQT_TQOBJECT(w->parentWidget())) && + !isCentralWidget(TQT_TQOBJECT(w->parentWidget()))) { - targetContainer = w->tqparentWidget(); - hadOwnPalette = w->tqparentWidget()->ownPalette(); - restorePalette = w->tqparentWidget()->palette(); + targetContainer = w->parentWidget(); + hadOwnPalette = w->parentWidget()->ownPalette(); + restorePalette = w->parentWidget()->palette(); } } } @@ -643,7 +643,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) } else { - wid = wid->tqparentWidget(); + wid = wid->parentWidget(); if (!wid) break; } @@ -695,9 +695,9 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) if (widgetPressed && allowMove(w)) { // we are prepated for a move // if widget is laid out, find the first non-laid out super-widget - while (w->tqparentWidget() && (WidgetFactory::tqlayoutType(w->tqparentWidget()) != + while (w->parentWidget() && (WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w))) - w = w->tqparentWidget(); + w = w->parentWidget(); // calc correct position TQPoint pos = w->mapFromGlobal(e->globalPos()); // calc move distance and store it @@ -807,7 +807,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) arg(connectReceiver->name())); tqApp->processEvents(); if (drawRecRect) - restoreRect(TQRect(mapToForm(((TQWidget*)oldReceiver)->tqparentWidget(), + restoreRect(TQRect(mapToForm(((TQWidget*)oldReceiver)->parentWidget(), ((TQWidget*)oldReceiver)->pos()), ((TQWidget*)oldReceiver)->size())); drawConnectLine(); break; @@ -848,7 +848,7 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) emitUpdateProperties(propertyWidget); TQMapConstIterator < ulong, TQPoint > it = moving.begin(); - TQWidget *oldParent = ((TQWidget *) it.key())->tqparentWidget(); + TQWidget *oldParent = ((TQWidget *) it.key())->parentWidget(); TQWidget *newParent = oldParent; // check whether we have to reparent the selection TQWidget *wa = containerAt(e->globalPos(), ((TQWidget *) it.key())); @@ -857,12 +857,12 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) wa = WidgetFactory::containerOfWidget(wa); // ok, looks like we moved onto a container - // check whether we really have different tqparents. - if (wa == ((TQWidget *) it.key())->tqparentWidget()) + // check whether we really have different parents. + if (wa == ((TQWidget *) it.key())->parentWidget()) goto make_move_command; // break tqlayout if necessary - if (WidgetFactory::tqlayoutType(wa) != WidgetFactory::NoLayout) + if (WidgetFactory::layoutType(wa) != WidgetFactory::NoLayout) { if (KMessageBox::questionYesNo(mainWindow(), i18n("You tried to insert a widget into the " @@ -883,14 +883,14 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) TQWidget *i = (TQWidget *) it.key(); if (!emitSelChanged && i->inherits(TQBUTTON_OBJECT_NAME_STRING)) { - if (i->tqparentWidget() && i->tqparentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) || + if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) || wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) emitSelChanged = true; if (!wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) { MetaDataBase::setPropertyChanged(TQT_TQOBJECT(i), "buttonGroupId", false); - if (i->tqparentWidget() && i->tqparentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) - ((TQButtonGroup *) i->tqparentWidget())->remove((TQButton *) i); + if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING)) + ((TQButtonGroup *) i->parentWidget())->remove((TQButton *) i); } } TQPoint pos = wa->mapFromGlobal(i->mapToGlobal(TQPoint(0, 0))); @@ -935,10 +935,10 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) case CONNECT_TOOL: restoreConnectionLine(); if (connectSender) - restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->tqparentWidget(), + restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->parentWidget(), ((TQWidget *) connectSender)->pos()), ((TQWidget *) connectSender)->size())); if (connectReceiver) - restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->tqparentWidget(), + restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->parentWidget(), ((TQWidget *) connectReceiver)->pos()), ((TQWidget *) connectReceiver)->size())); endUnclippedPainter(); tqApp->processEvents(); @@ -951,7 +951,7 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) if (insertParent) { // we should insert the new widget now endRectDraw(); - if (WidgetFactory::tqlayoutType(insertParent) != WidgetFactory::NoLayout) + if (WidgetFactory::layoutType(insertParent) != WidgetFactory::NoLayout) { if (KMessageBox::questionYesNo(mainWindow(), i18n("You tried to insert a widget into the " @@ -1314,8 +1314,8 @@ void FormWindow::moveSelectedWidgets(int dx, int dy) { WidgetSelection *s = it.current(); TQWidget *w = s->widget(); - if (w->tqparentWidget() - && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) + if (w->parentWidget() + && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) continue; w->move(w->x() + dx, w->y() + dy); s->updateGeometry(); @@ -1374,7 +1374,7 @@ void FormWindow::checkSelectionsForMove(TQWidget * w) { checkedSelectionsForMove = true; - TQObjectList *l = w->tqparentWidget()->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false); + TQObjectList *l = w->parentWidget()->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false); moving.clear(); if (l) { @@ -1387,11 +1387,11 @@ void FormWindow::checkSelectionsForMove(TQWidget * w) ++it; if (l->tqfind(TQT_TQOBJECT(sel->widget())) == -1) { - if (WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout) + if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) sel->setWidget(0); } else { - if (WidgetFactory::tqlayoutType(sel->widget()->tqparentWidget()) == WidgetFactory::NoLayout) + if (WidgetFactory::layoutType(sel->widget()->parentWidget()) == WidgetFactory::NoLayout) { moving.insert((ulong) sel->widget(), sel->widget()->pos()); sel->widget()->raise(); @@ -1447,8 +1447,8 @@ void FormWindow::editAdjustSize() } for (TQWidget * w = widgets.first(); w; w = widgets.next()) { - if (w->tqparentWidget() - && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) + if (w->parentWidget() + && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) continue; TQRect oldr = w->tqgeometry(); w->adjustSize(); @@ -1618,10 +1618,10 @@ void FormWindow::currentToolChanged() case CONNECT_TOOL: restoreConnectionLine(); if (connectSender) - restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->tqparentWidget(), + restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->parentWidget(), ((TQWidget *) connectSender)->pos()), ((TQWidget *) connectSender)->size())); if (connectReceiver) - restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->tqparentWidget(), + restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->parentWidget(), ((TQWidget *) connectReceiver)->pos()), ((TQWidget *) connectReceiver)->size())); endUnclippedPainter(); break; @@ -1694,7 +1694,7 @@ void FormWindow::showOrderIndicators() for (TQObject * o = l->first(); o; o = l->next()) { TQWidget *w = (TQWidget *) o; - if (w->isVisibleTo(w->tqparentWidget()) && + if (w->isVisibleTo(w->parentWidget()) && insertedWidgets[(void *) w] && w->focusPolicy() != TQ_NoFocus) { OrderIndicator *ind = new OrderIndicator(order++, w, this); @@ -1903,7 +1903,7 @@ void FormWindow::selectAll() emitSelectionChanged(); } -void FormWindow::tqlayoutHorizontal() +void FormWindow::layoutHorizontal() { TQWidgetList widgets(selectedWidgets()); LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand(i18n("Lay OutQt::Horizontally"), @@ -1913,7 +1913,7 @@ void FormWindow::tqlayoutHorizontal() cmd->execute(); } -void FormWindow::tqlayoutVertical() +void FormWindow::layoutVertical() { TQWidgetList widgets(selectedWidgets()); LayoutVerticalCommand *cmd = new LayoutVerticalCommand(i18n("Lay OutQt::Vertically"), @@ -1923,7 +1923,7 @@ void FormWindow::tqlayoutVertical() cmd->execute(); } -void FormWindow::tqlayoutHorizontalSplit() +void FormWindow::layoutHorizontalSplit() { TQWidgetList widgets(selectedWidgets()); LayoutHorizontalSplitCommand *cmd = @@ -1934,7 +1934,7 @@ void FormWindow::tqlayoutHorizontalSplit() cmd->execute(); } -void FormWindow::tqlayoutVerticalSplit() +void FormWindow::layoutVerticalSplit() { TQWidgetList widgets(selectedWidgets()); LayoutVerticalSplitCommand *cmd = @@ -1945,7 +1945,7 @@ void FormWindow::tqlayoutVerticalSplit() cmd->execute(); } -void FormWindow::tqlayoutGrid() +void FormWindow::layoutGrid() { int xres = grid().x(); int yres = grid().y(); @@ -1958,7 +1958,7 @@ void FormWindow::tqlayoutGrid() cmd->execute(); } -void FormWindow::tqlayoutHorizontalContainer(TQWidget * w) +void FormWindow::layoutHorizontalContainer(TQWidget * w) { if (w == this) w = mainContainer(); @@ -1979,7 +1979,7 @@ void FormWindow::tqlayoutHorizontalContainer(TQWidget * w) cmd->execute(); } -void FormWindow::tqlayoutVerticalContainer(TQWidget * w) +void FormWindow::layoutVerticalContainer(TQWidget * w) { if (w == this) w = mainContainer(); @@ -2000,7 +2000,7 @@ void FormWindow::tqlayoutVerticalContainer(TQWidget * w) cmd->execute(); } -void FormWindow::tqlayoutGridContainer(TQWidget * w) +void FormWindow::layoutGridContainer(TQWidget * w) { if (w == this) w = mainContainer(); @@ -2035,7 +2035,7 @@ void FormWindow::breakLayout(TQWidget * w) { if (!w || w == this) break; - if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout && + if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout && WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) { Command *cmd = breakLayoutCommand(w); @@ -2044,7 +2044,7 @@ void FormWindow::breakLayout(TQWidget * w) if (!w->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !w->inherits(TQSPLITTER_OBJECT_NAME_STRING)) break; } - w = w->tqparentWidget(); + w = w->parentWidget(); } if (commands.isEmpty()) @@ -2113,13 +2113,13 @@ bool FormWindow::hasInsertedChildren(TQWidget *w) const bool FormWindow::allowMove(TQWidget *w) { - w = w->tqparentWidget(); + w = w->parentWidget(); while (w) { - if ((isMainContainer(TQT_TQOBJECT(w)) || insertedWidgets.tqfind(w)) && WidgetFactory::tqlayoutType(w) == + if ((isMainContainer(TQT_TQOBJECT(w)) || insertedWidgets.tqfind(w)) && WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) return true; - w = w->tqparentWidget(); + w = w->parentWidget(); } return false; } @@ -2410,7 +2410,7 @@ TQPoint FormWindow::mapToForm(const TQWidget* w, const TQPoint& pos) const while (i && !i->isTopLevel() && !isMainContainer(TQT_TQOBJECT(const_cast<TQWidget*>(i)))) { p = i->mapToParent(p); - i = i->tqparentWidget(); + i = i->parentWidget(); } return mapFromGlobal(w->mapToGlobal(pos)); } @@ -2421,7 +2421,7 @@ static int widgetDepth(TQWidget *w) while (w && !w->isTopLevel()) { d++; - w = w->tqparentWidget(); + w = w->parentWidget(); } return d; @@ -2433,7 +2433,7 @@ static bool isChildOf(TQWidget *c, TQWidget *p) { if (c == p) return true; - c = c->tqparentWidget(); + c = c->parentWidget(); } return false; } @@ -2469,14 +2469,14 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) { if (!TQT_TQRECT_OBJECT(w->rect()).tqcontains((w->mapFromGlobal(pos)))) break; - w = w->tqparentWidget(); + w = w->parentWidget(); } if (w && !w->isTopLevel()) continue; // we did not get through the full while loop int wd = widgetDepth(it.current()); - if (wd == depth && container && (it.current()->tqparentWidget()-> + if (wd == depth && container && (it.current()->parentWidget()-> childrenListObject()).tqfind(TQT_TQOBJECT(it.current())) > - (container->tqparentWidget()->childrenListObject()).tqfind(TQT_TQOBJECT(container))) + (container->parentWidget()->childrenListObject()).tqfind(TQT_TQOBJECT(container))) wd++; if (wd > depth && !isChildOf(it.current(), notParentOf)) { depth = wd; @@ -2575,12 +2575,12 @@ TQObject *FormWindow::connectableObject(TQObject *w, TQObject *) return w; } -int FormWindow::tqlayoutDefaultSpacing() const +int FormWindow::layoutDefaultSpacing() const { return defSpacing; } -int FormWindow::tqlayoutDefaultMargin() const +int FormWindow::layoutDefaultMargin() const { return defMargin; } diff --git a/kommander/editor/formwindow.h b/kommander/editor/formwindow.h index 30500a87..5674c46d 100644 --- a/kommander/editor/formwindow.h +++ b/kommander/editor/formwindow.h @@ -85,15 +85,15 @@ public: virtual void raiseWidgets(); virtual void checkAccels(); - virtual void tqlayoutHorizontal(); - virtual void tqlayoutVertical(); - virtual void tqlayoutHorizontalSplit(); - virtual void tqlayoutVerticalSplit(); - virtual void tqlayoutGrid(); + virtual void layoutHorizontal(); + virtual void layoutVertical(); + virtual void layoutHorizontalSplit(); + virtual void layoutVerticalSplit(); + virtual void layoutGrid(); - virtual void tqlayoutHorizontalContainer( TQWidget *w ); - virtual void tqlayoutVerticalContainer( TQWidget *w ); - virtual void tqlayoutGridContainer( TQWidget *w ); + virtual void layoutHorizontalContainer( TQWidget *w ); + virtual void layoutVerticalContainer( TQWidget *w ); + virtual void layoutGridContainer( TQWidget *w ); virtual void breakLayout( TQWidget *w ); @@ -178,8 +178,8 @@ public: void killAccels( TQObject *top ); - int tqlayoutDefaultSpacing() const; - int tqlayoutDefaultMargin() const; + int layoutDefaultSpacing() const; + int layoutDefaultMargin() const; void setLayoutDefaultSpacing( int s ); void setLayoutDefaultMargin( int s ); diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui index 35d53c2c..ca35e191 100644 --- a/kommander/editor/functions.ui +++ b/kommander/editor/functions.ui @@ -695,7 +695,7 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextbrowser.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index 03c6385e..318a17a2 100644 --- a/kommander/editor/hierarchyview.cpp +++ b/kommander/editor/hierarchyview.cpp @@ -366,7 +366,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent ) TQListViewItem *item = 0; TQString className = WidgetFactory::classNameOf( o ); if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) { - switch ( WidgetFactory::tqlayoutType( (TQWidget*)o ) ) { + switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) { case WidgetFactory::HBox: className = "HBox"; break; diff --git a/kommander/editor/kommander-new.xml b/kommander/editor/kommander-new.xml index 8cfe86e2..7fe9f7dc 100644 --- a/kommander/editor/kommander-new.xml +++ b/kommander/editor/kommander-new.xml @@ -76,7 +76,7 @@ <item>null</item> <item>pid</item> <item>dcopid</item> - <item>tqparentPid</item> + <item>parentPid</item> <item>debug</item> <item>echo</item> <item>env</item> @@ -260,7 +260,7 @@ <!-- FindCommands matches many items that can be expected outside strings, substitutions etc. --> <context attribute="Normal Text" lineEndContext="#stay" name="FindCommands"> - <!-- start expression in double tqparentheses --> + <!-- start expression in double parentheses --> <Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" /> <!-- start expression in double brackets --> <RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression" column="0"/> @@ -524,7 +524,7 @@ </context> <!-- Case is called after the case keyword is encoutered. We handle this because of - the lonely closing tqparentheses that would otherwise disturb the expr matching --> + the lonely closing parentheses that would otherwise disturb the expr matching --> <context attribute="Normal Text" lineEndContext="#stay" name="Case"> <RegExpr attribute="Keyword" context="CaseIn" String="\sin\b" /> <IncludeRules context="FindAll" /> diff --git a/kommander/editor/kommander.xml b/kommander/editor/kommander.xml index cfa64c8a..b88bd6d7 100644 --- a/kommander/editor/kommander.xml +++ b/kommander/editor/kommander.xml @@ -69,7 +69,7 @@ <item>null</item> <item>pid</item> <item>dcopid</item> - <item>tqparentPid</item> + <item>parentPid</item> <item>debug</item> <item>echo</item> <item>env</item> @@ -598,7 +598,7 @@ <IncludeRules context="##Alerts" /> </context> - <!-- FindCommentsParen consumes shell comments till EOL or a closing tqparenthese --> + <!-- FindCommentsParen consumes shell comments till EOL or a closing parenthese --> <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsParen"> <DetectChar attribute="Comment" context="CommentParen" char="#" firstNonSpace="true"/> <RegExpr attribute="Normal Text" context="CommentParen" String="[\s;](?=#)" /> @@ -621,7 +621,7 @@ <!-- FindCommands matches many items that can be expected outside strings, substitutions etc. --> <context attribute="Normal Text" lineEndContext="#stay" name="FindCommands"> - <!-- start expression in double tqparentheses --> + <!-- start expression in double parentheses --> <Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" /> <!-- start expression in double brackets --> <RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression" column="0"/> @@ -900,7 +900,7 @@ </context> <!-- Case is called after the case keyword is encoutered. We handle this because of - the lonely closing tqparentheses that would otherwise disturb the expr matching --> + the lonely closing parentheses that would otherwise disturb the expr matching --> <context attribute="Normal Text" lineEndContext="#stay" name="Case"> <RegExpr attribute="Keyword" context="CaseIn" String="\sin\b" /> <IncludeRules context="FindMost" /> diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index 1b55de9c..8d7d3d50 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -37,18 +37,18 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> & /*! \class Layout tqlayout.h - \brief Baseclass for tqlayouting widgets in the Designer + \brief Baseclass for layouting widgets in the Designer - Classes derived from this abstract base class are used for tqlayouting + Classes derived from this abstract base class are used for layouting operations in the Designer. */ -/*! \a p specifies the tqparent of the tqlayoutBase \a lb. The tqparent - might be changed in setup(). If the tqlayoutBase is a - container, the tqparent and the tqlayoutBase are the same. Also they +/*! \a p specifies the tqparent of the layoutBase \a lb. The tqparent + might be changed in setup(). If the layoutBase is a + container, the tqparent and the layoutBase are the same. Also they always have to be a widget known to the designer (e.g. in the case - of the tabwidget tqparent and tqlayoutBase are the tabwidget and not the + of the tabwidget tqparent and layoutBase are the tabwidget and not the page which actually gets laid out. For actual usage the correct widget is found later by Layout.) */ @@ -57,13 +57,13 @@ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *l : widgets( wl ), tqparent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter ) { widgets.setAutoDelete( false ); - tqlayoutBase = lb; - if ( !doSetup && tqlayoutBase ) - oldGeometry = tqlayoutBase->tqgeometry(); + layoutBase = lb; + if ( !doSetup && layoutBase ) + oldGeometry = layoutBase->tqgeometry(); } /*! The widget list we got in the constructor might contain too much - widgets (like widgets with different tqparents, already laid out + widgets (like widgets with different parents, already laid out widgets, etc.). Here we set up the list and so the only the "best" widgets get laid out. */ @@ -83,14 +83,14 @@ void Layout::setup() // childs which has the most entries. // Widgets which are already laid out are thrown away here too for ( w = widgets.first(); w; w = widgets.next() ) { - if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout ) + if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) continue; - if ( lastParent != w->tqparentWidget() ) { + if ( lastParent != w->parentWidget() ) { lastList = 0; - lastParent = w->tqparentWidget(); + lastParent = w->parentWidget(); TQValueList<TQWidgetList>::Iterator it = lists.begin(); for ( ; it != lists.end(); ++it ) { - if ( ( *it ).first()->tqparentWidget() == w->tqparentWidget() ) + if ( ( *it ).first()->parentWidget() == w->parentWidget() ) lastList = &( *it ); } if ( !lastList ) { @@ -115,9 +115,9 @@ void Layout::setup() // best list has only one entry and we do not tqlayout a container, // we leave here. if ( !lastList || ( lastList->count() < 2 && - ( !tqlayoutBase || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( tqlayoutBase )) ) ) && - tqlayoutBase != formWindow->mainContainer() ) ) + ( !layoutBase || + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) && + layoutBase != formWindow->mainContainer() ) ) ) ) { widgets.clear(); startPoint = TQPoint( 0, 0 ); @@ -128,7 +128,7 @@ void Layout::setup() // to tqlayout widgets = *lastList; // Also use the only correct tqparent later, so store it - tqparent = WidgetFactory::widgetOfContainer( widgets.first()->tqparentWidget() ); + tqparent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() ); // Now calculate the position where the tqlayout-meta-widget should // be placed and connect to widgetDestroyed() signals of the // widgets to get informed if one gets deleted to be able to @@ -158,17 +158,17 @@ bool Layout::prepareLayout( bool &needMove, bool &needRetqparent ) return false; for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) w->raise(); - needMove = !tqlayoutBase; - needRetqparent = needMove || tqlayoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ); - if ( !tqlayoutBase ) { + needMove = !layoutBase; + needRetqparent = needMove || layoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ); + if ( !layoutBase ) { if ( !useSplitter ) - tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ), WidgetFactory::containerOfWidget( tqparent ) ); else - tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ), + layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ), WidgetFactory::containerOfWidget( tqparent ) ); } else { - WidgetFactory::deleteLayout( tqlayoutBase ); + WidgetFactory::deleteLayout( layoutBase ); } return true; @@ -177,21 +177,21 @@ bool Layout::prepareLayout( bool &needMove, bool &needRetqparent ) void Layout::finishLayout( bool needMove, TQLayout *tqlayout ) { if ( needMove ) - tqlayoutBase->move( startPoint ); - TQRect g( TQRect( tqlayoutBase->pos(), tqlayoutBase->size() ) ); - if ( WidgetFactory::tqlayoutType( tqlayoutBase->tqparentWidget() ) == WidgetFactory::NoLayout && !isBreak ) - tqlayoutBase->adjustSize(); + layoutBase->move( startPoint ); + TQRect g( TQRect( layoutBase->pos(), layoutBase->size() ) ); + if ( WidgetFactory::layoutType( layoutBase->parentWidget() ) == WidgetFactory::NoLayout && !isBreak ) + layoutBase->adjustSize(); else if ( isBreak ) - tqlayoutBase->setGeometry( oldGeometry ); + layoutBase->setGeometry( oldGeometry ); oldGeometry = g; - tqlayoutBase->show(); + layoutBase->show(); tqlayout->activate(); - formWindow->insertWidget( tqlayoutBase ); - formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase) ); - TQString n = tqlayoutBase->name(); + formWindow->insertWidget( layoutBase ); + formWindow->selectWidget( TQT_TQOBJECT(layoutBase) ); + TQString n = layoutBase->name(); if ( n.tqfind( "qt_dead_widget_" ) != -1 ) { n.remove( 0, TQString( "qt_dead_widget_" ).length() ); - tqlayoutBase->setName( n ); + layoutBase->setName( n ); } } @@ -206,15 +206,15 @@ void Layout::undoLayout() it.key()->reparent( WidgetFactory::containerOfWidget( tqparent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) ); it.key()->resize( ( *it ).size() ); } - formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase), false ); - WidgetFactory::deleteLayout( tqlayoutBase ); - if ( tqparent != tqlayoutBase && !tqlayoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { - tqlayoutBase->hide(); - TQString n = tqlayoutBase->name(); + formWindow->selectWidget( TQT_TQOBJECT(layoutBase), false ); + WidgetFactory::deleteLayout( layoutBase ); + if ( tqparent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) { + layoutBase->hide(); + TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); - tqlayoutBase->setName( n ); + layoutBase->setName( n ); } else { - tqlayoutBase->setGeometry( oldGeometry ); + layoutBase->setGeometry( oldGeometry ); } if ( widgets.first() ) formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); @@ -230,33 +230,33 @@ void Layout::breakLayout() for ( w = widgets.first(); w; w = widgets.next() ) rects.insert( w, w->tqgeometry() ); } - WidgetFactory::deleteLayout( tqlayoutBase ); - bool needRetqparent = qstrcmp( tqlayoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || - qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( tqlayoutBase )) ) ) && - tqlayoutBase != formWindow->mainContainer() ); - bool needResize = qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0; + WidgetFactory::deleteLayout( layoutBase ); + bool needRetqparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 || + qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 || + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) && + layoutBase != formWindow->mainContainer() ); + bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0; bool add = geometries.isEmpty(); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { if ( needRetqparent ) - w->reparent( tqlayoutBase->tqparentWidget(), 0, - tqlayoutBase->pos() + w->pos(), true ); + w->reparent( layoutBase->parentWidget(), 0, + layoutBase->pos() + w->pos(), true ); if ( needResize ) { TQMap<TQWidget*, TQRect>::Iterator it = rects.tqfind( w ); if ( it != rects.end() ) - w->setGeometry( TQRect( tqlayoutBase->pos() + (*it).topLeft(), (*it).size() ) ); + w->setGeometry( TQRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) ); } if ( add ) geometries.insert( w, TQRect( w->pos(), w->size() ) ); } if ( needRetqparent ) { - tqlayoutBase->hide(); - tqparent = tqlayoutBase->tqparentWidget(); - TQString n = tqlayoutBase->name(); + layoutBase->hide(); + tqparent = layoutBase->parentWidget(); + TQString n = layoutBase->name(); n.prepend( "qt_dead_widget_" ); - tqlayoutBase->setName( n ); + layoutBase->setName( n ); } else { - tqparent = tqlayoutBase; + tqparent = layoutBase; } if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) ) formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); @@ -303,11 +303,11 @@ void HorizontalLayout::doLayout() if ( !prepareLayout( needMove, needRetqparent ) ) return; - TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::HBox ); + TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) ) - w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), false ); + if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != 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() ); @@ -319,8 +319,8 @@ void HorizontalLayout::doLayout() w->show(); } - if ( tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) - ( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Horizontal ); + if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) + ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); finishLayout( needMove, tqlayout ); } @@ -367,11 +367,11 @@ void VerticalLayout::doLayout() if ( !prepareLayout( needMove, needRetqparent ) ) return; - TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::VBox ); + TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) ) - w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), false ); + if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != 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() ); @@ -383,8 +383,8 @@ void VerticalLayout::doLayout() w->show(); } - if ( tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) - ( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Vertical ); + if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) ) + ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); finishLayout( needMove, tqlayout ); } @@ -733,7 +733,7 @@ void GridLayout::doLayout() if ( !prepareLayout( needMove, needRetqparent ) ) return; - QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::Grid ); + QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid ); if ( !grid ) buildGrid(); @@ -742,8 +742,8 @@ void GridLayout::doLayout() int r, c, rs, cs; for ( w = widgets.first(); w; w = widgets.next() ) { if ( grid->locateWidget( w, r, c, rs, cs) ) { - if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) ) - w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), false ); + if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != 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 ); } else { @@ -846,7 +846,7 @@ void Spacer::paintEvent( TQPaintEvent * ) void Spacer::resizeEvent( TQResizeEvent* e) { TQWidget::resizeEvent( e ); - if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout ) + if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout ) sh = size(); } @@ -912,7 +912,7 @@ TQSize Spacer::tqsizeHint() const void Spacer::setSizeHint( const TQSize &s ) { sh = s; - if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout ) + if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout ) resize( tqsizeHint() ); updateGeometry(); } @@ -932,7 +932,7 @@ void Spacer::setOrientation( Qt::Orientation o ) setSizeType( st ); if ( interactive ) { sh = TQSize( sh.height(), sh.width() ); - if (!tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout ) + if (!parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout ) resize( height(), width() ); } updateMask(); diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h index 831ce507..cd89ba41 100644 --- a/kommander/editor/layout.h +++ b/kommander/editor/layout.h @@ -51,7 +51,7 @@ protected: TQWidget *tqparent; TQPoint startPoint; TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries; - TQWidget *tqlayoutBase; + TQWidget *layoutBase; FormWindow *formWindow; TQRect oldGeometry; bool isBreak; @@ -160,7 +160,7 @@ class QDesignerGridLayout : public TQGridLayout TQ_OBJECT public: QDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){}; - QDesignerGridLayout( TQLayout *tqparentLayout ) : TQGridLayout( tqparentLayout ){}; + QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){}; void addWidget( TQWidget *, int row, int col, int align = 0 ); void addMultiCellWidget( TQWidget *, int fromRow, int toRow, diff --git a/kommander/editor/listeditor.ui b/kommander/editor/listeditor.ui index 66efc1ae..8fe16f53 100644 --- a/kommander/editor/listeditor.ui +++ b/kommander/editor/listeditor.ui @@ -143,5 +143,5 @@ <slot>renameItem()</slot> </Q_SLOTS> <pixmapinproject/> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 7a47b852..8a30d812 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -143,9 +143,9 @@ MainWindow::MainWindow(bool asClient) setupMDI(); setupFileActions(); setupEditActions(); - tqlayoutToolBar = new KToolBar(this, "Layout"); - ((KToolBar *) tqlayoutToolBar)->setFullSize(false); - addToolBar(tqlayoutToolBar, i18n("Layout")); + layoutToolBar = new KToolBar(this, "Layout"); + ((KToolBar *) layoutToolBar)->setFullSize(false); + addToolBar(layoutToolBar, i18n("Layout")); setupToolActions(); setupLayoutActions(); setupWorkspace(); @@ -171,8 +171,8 @@ MainWindow::MainWindow(bool asClient) connect(kapp->clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); clipboardChanged(); - tqlayoutChilds = false; - tqlayoutSelected = false; + layoutChilds = false; + layoutSelected = false; breakLayout = false; backPix = true; @@ -274,7 +274,7 @@ void MainWindow::setupHierarchyView() "<p>The Object Explorer provides an overview of the relationships " "between the widgets in a form. You can use the clipboard functions using " "a context menu for each item in the view. It is also useful for selecting widgets " - "in forms that have complex tqlayouts.</p>" + "in forms that have complex layouts.</p>" "<p>The columns can be resized by dragging the separator in the list's header.</p>" "<p>The second tab shows all the form's slots, class variables, includes, etc.</p>")); } @@ -596,7 +596,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) while (w) { if (w->inherits("PropertyList")) break; - w = w->tqparentWidget(true); + w = w->parentWidget(true); } if (w) { propertyEditor->propertyList()->showCurrentWhatsThis(); @@ -634,8 +634,8 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) o->tqparent() && o->tqparent()->inherits("QDesignerToolBar"))) { TQWidget *w = (TQWidget*)o; if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator")) - w = w->tqparentWidget(); - TQWidget *pw = w->tqparentWidget(); + w = w->parentWidget(); + TQWidget *pw = w->parentWidget(); while (pw) { if (pw->inherits("FormWindow")) { ((FormWindow*)pw)->emitShowProperties(TQT_TQOBJECT(w)); @@ -643,7 +643,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) return !o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) && !o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("QDesignerToolBarSeparator"); } - pw = pw->tqparentWidget(); + pw = pw->parentWidget(); } } if (o && (o->inherits("QDesignerToolBar") || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING)) @@ -752,7 +752,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Move: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; - if (WidgetFactory::tqlayoutType((TQWidget*)o->tqparent()) != WidgetFactory::NoLayout) { + if (WidgetFactory::layoutType((TQWidget*)o->tqparent()) != WidgetFactory::NoLayout) { ((FormWindow*)w)->updateSelection((TQWidget*)o); if (e->type() != TQEvent::Resize) ((FormWindow*)w)->updateChildSelections((TQWidget*)o); @@ -1320,8 +1320,8 @@ void MainWindow::clipboardChanged() void MainWindow::selectionChanged() { - tqlayoutChilds = false; - tqlayoutSelected = false; + layoutChilds = false; + layoutSelected = false; breakLayout = false; if (!formWindow()) { actionEditCut->setEnabled(false); @@ -1358,7 +1358,7 @@ void MainWindow::selectionChanged() int unlaidout = 0; int laidout = 0; for (TQWidget *w = widgets.first(); w; w = widgets.next()) { - if (!w->tqparentWidget() || WidgetFactory::tqlayoutType(w->tqparentWidget()) == WidgetFactory::NoLayout) + if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout) unlaidout++; else laidout++; @@ -1370,27 +1370,27 @@ void MainWindow::selectionChanged() actionEditGridLayout->setEnabled(unlaidout > 1); actionEditBreakLayout->setEnabled(laidout > 0); actionEditAdjustSize->setEnabled(laidout > 0); - tqlayoutSelected = unlaidout > 1; + layoutSelected = unlaidout > 1; breakLayout = laidout > 0; } else if (selectedWidgets == 1) { TQWidget *w = widgets.first(); bool isContainer = WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w)))) || w == formWindow()->mainContainer(); - actionEditAdjustSize->setEnabled(!w->tqparentWidget() || - WidgetFactory::tqlayoutType(w->tqparentWidget()) == WidgetFactory::NoLayout); + actionEditAdjustSize->setEnabled(!w->parentWidget() || + WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout); if (!isContainer) { actionEditHLayout->setEnabled(false); actionEditVLayout->setEnabled(false); actionEditGridLayout->setEnabled(false); - if (w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) { + if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w))); breakLayout = true; } else { actionEditBreakLayout->setEnabled(false); } } else { - if (WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout) { + if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) { if (!formWindow()->hasInsertedChildren(w)) { actionEditHLayout->setEnabled(false); actionEditVLayout->setEnabled(false); @@ -1401,9 +1401,9 @@ void MainWindow::selectionChanged() actionEditVLayout->setEnabled(true); actionEditGridLayout->setEnabled(true); actionEditBreakLayout->setEnabled(false); - tqlayoutChilds = true; + layoutChilds = true; } - if (w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) { + if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w))); breakLayout = true; } @@ -1418,7 +1418,7 @@ void MainWindow::selectionChanged() } else if (selectedWidgets == 0 && formWindow()) { actionEditAdjustSize->setEnabled(true); TQWidget *w = formWindow()->mainContainer(); - if (WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout) { + if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) { if (!formWindow()->hasInsertedChildren(w)) { actionEditHLayout->setEnabled(false); actionEditVLayout->setEnabled(false); @@ -1429,7 +1429,7 @@ void MainWindow::selectionChanged() actionEditVLayout->setEnabled(true); actionEditGridLayout->setEnabled(true); actionEditBreakLayout->setEnabled(false); - tqlayoutChilds = true; + layoutChilds = true; } } else { actionEditHLayout->setEnabled(false); @@ -1836,13 +1836,13 @@ void MainWindow::setModified(bool b, TQWidget *window) ((FormWindow *) w)->modificationChanged(b); return; } - w = w->tqparentWidget(true); + w = w->parentWidget(true); if (w->inherits("FormWindow")) { ((FormWindow *) w)->modificationChanged(b); return; } - w = w->tqparentWidget(true); + w = w->parentWidget(true); } } @@ -1869,14 +1869,14 @@ void MainWindow::formNameChanged(FormWindow*) int MainWindow::currentLayoutDefaultSpacing() const { if (((MainWindow*)this)->formWindow()) - return ((MainWindow*)this)->formWindow()->tqlayoutDefaultSpacing(); + return ((MainWindow*)this)->formWindow()->layoutDefaultSpacing(); return BOXLAYOUT_DEFAULT_SPACING; } int MainWindow::currentLayoutDefaultMargin() const { if (((MainWindow*)this)->formWindow()) - return ((MainWindow*)this)->formWindow()->tqlayoutDefaultMargin(); + return ((MainWindow*)this)->formWindow()->layoutDefaultMargin(); return BOXLAYOUT_DEFAULT_MARGIN; } diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h index a8ac770e..1e0d3b79 100644 --- a/kommander/editor/mainwindow.h +++ b/kommander/editor/mainwindow.h @@ -256,7 +256,7 @@ private: TQWorkspace *qworkspace; KMenuBar *menubar; FormWindow *lastActiveFormWindow; - bool breakLayout, tqlayoutChilds, tqlayoutSelected; + bool breakLayout, layoutChilds, layoutSelected; TQPoint grd; bool sGrid, snGrid; bool restoreConfig; @@ -280,7 +280,7 @@ private: TQPopupMenu *rmbFormWindow; TQPopupMenu *windowMenu, *fileMenu; - TQToolBar *tqlayoutToolBar; + TQToolBar *layoutToolBar; KToolBar *fileTb; Preferences *prefDia; diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index f57afd72..9ed36f59 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -225,14 +225,14 @@ void MainWindow::setupLayoutActions() actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid")); actionEditGridLayout->setEnabled(false); - actionEditSplitHorizontal = new KAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvtqlayoutsplit.xpm"), + actionEditSplitHorizontal = new KAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"), KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(), "edit_split_h"); actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter")); actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally in Splitter")); actionEditSplitHorizontal->setEnabled(false); - actionEditSplitVertical = new KAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithtqlayoutsplit.xpm"), + actionEditSplitVertical = new KAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"), KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutVerticalSplit()), actionCollection(), "edit_split_v"); actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter")); @@ -255,17 +255,17 @@ void MainWindow::setupLayoutActions() "or double click to keep the tool selected.").tqarg(WidgetDatabase::toolTip(id)). tqarg(WidgetDatabase::whatsThis(id)).tqarg(WidgetDatabase::toolTip(id))); - TQWhatsThis::add(tqlayoutToolBar, i18n("<b>The Layout toolbar</b>%1").tqarg(toolbarHelp)); - actionEditAdjustSize->plug(tqlayoutToolBar); - tqlayoutToolBar->addSeparator(); - actionEditHLayout->plug(tqlayoutToolBar); - actionEditVLayout->plug(tqlayoutToolBar); - actionEditGridLayout->plug(tqlayoutToolBar); - actionEditSplitHorizontal->plug(tqlayoutToolBar); - actionEditSplitVertical->plug(tqlayoutToolBar); - actionEditBreakLayout->plug(tqlayoutToolBar); - tqlayoutToolBar->addSeparator(); - a->plug(tqlayoutToolBar); + TQWhatsThis::add(layoutToolBar, i18n("<b>The Layout toolbar</b>%1").tqarg(toolbarHelp)); + actionEditAdjustSize->plug(layoutToolBar); + layoutToolBar->addSeparator(); + actionEditHLayout->plug(layoutToolBar); + actionEditVLayout->plug(layoutToolBar); + actionEditGridLayout->plug(layoutToolBar); + actionEditSplitHorizontal->plug(layoutToolBar); + actionEditSplitVertical->plug(layoutToolBar); + actionEditBreakLayout->plug(layoutToolBar); + layoutToolBar->addSeparator(); + a->plug(layoutToolBar); TQPopupMenu *menu = new TQPopupMenu(this, "Layout"); menuBar()->insertItem(i18n("&Layout"), menu); @@ -893,13 +893,13 @@ void MainWindow::editPaste() if (l.count() == 1) { w = l.first(); - if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout || + if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout || (!WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory:: classNameOf(TQT_TQOBJECT(w)))) && w != formWindow()->mainContainer())) w = formWindow()->mainContainer(); } - if (w && WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout) + if (w && WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) { formWindow()->paste(tqApp->clipboard()->text(), WidgetFactory::containerOfWidget(w)); hierarchyView->widgetInserted(0); @@ -945,42 +945,42 @@ void MainWindow::editAdjustSize() void MainWindow::editLayoutHorizontal() { - if (tqlayoutChilds) + if (layoutChilds) editLayoutContainerHorizontal(); - else if (tqlayoutSelected && formWindow()) - formWindow()->tqlayoutHorizontal(); + else if (layoutSelected && formWindow()) + formWindow()->layoutHorizontal(); } void MainWindow::editLayoutVertical() { - if (tqlayoutChilds) + if (layoutChilds) editLayoutContainerVertical(); - else if (tqlayoutSelected && formWindow()) - formWindow()->tqlayoutVertical(); + else if (layoutSelected && formWindow()) + formWindow()->layoutVertical(); } void MainWindow::editLayoutHorizontalSplit() { - if (tqlayoutChilds) + if (layoutChilds) ; // no way to do that - else if (tqlayoutSelected && formWindow()) - formWindow()->tqlayoutHorizontalSplit(); + else if (layoutSelected && formWindow()) + formWindow()->layoutHorizontalSplit(); } void MainWindow::editLayoutVerticalSplit() { - if (tqlayoutChilds) + if (layoutChilds) ; // no way to do that - else if (tqlayoutSelected && formWindow()) - formWindow()->tqlayoutVerticalSplit(); + else if (layoutSelected && formWindow()) + formWindow()->layoutVerticalSplit(); } void MainWindow::editLayoutGrid() { - if (tqlayoutChilds) + if (layoutChilds) editLayoutContainerGrid(); - else if (tqlayoutSelected && formWindow()) - formWindow()->tqlayoutGrid(); + else if (layoutSelected && formWindow()) + formWindow()->layoutGrid(); } void MainWindow::editLayoutContainerVertical() @@ -992,7 +992,7 @@ void MainWindow::editLayoutContainerVertical() if (l.count() == 1) w = l.first(); if (w) - formWindow()->tqlayoutVerticalContainer(w); + formWindow()->layoutVerticalContainer(w); } void MainWindow::editLayoutContainerHorizontal() @@ -1004,7 +1004,7 @@ void MainWindow::editLayoutContainerHorizontal() if (l.count() == 1) w = l.first(); if (w) - formWindow()->tqlayoutHorizontalContainer(w); + formWindow()->layoutHorizontalContainer(w); } void MainWindow::editLayoutContainerGrid() @@ -1016,7 +1016,7 @@ void MainWindow::editLayoutContainerGrid() if (l.count() == 1) w = l.first(); if (w) - formWindow()->tqlayoutGridContainer(w); + formWindow()->layoutGridContainer(w); } @@ -1029,8 +1029,8 @@ void MainWindow::editBreakLayout() TQWidget *w = formWindow()->mainContainer(); if (formWindow()->currentWidget()) w = formWindow()->currentWidget(); - if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout || - w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) + if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout || + w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { formWindow()->breakLayout(w); return; @@ -1040,9 +1040,9 @@ void MainWindow::editBreakLayout() TQWidgetList widgets = formWindow()->selectedWidgets(); for (w = widgets.first(); w; w = widgets.next()) { - if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout || - w->tqparentWidget() - && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) + if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout || + w->parentWidget() + && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) break; } if (w) @@ -1053,8 +1053,8 @@ void MainWindow::editBreakLayout() } w = formWindow()->mainContainer(); - if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout || - w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) + if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout || + w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { formWindow()->breakLayout(w); } diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp index 2e0064f0..72f63de5 100644 --- a/kommander/editor/metadatabase.cpp +++ b/kommander/editor/metadatabase.cpp @@ -270,7 +270,7 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing ) r->spacing = spacing; TQLayout * tqlayout = 0; - WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout ); + WidgetFactory::layoutType( (TQWidget*)o, tqlayout ); if ( tqlayout ) tqlayout->setSpacing( spacing ); } @@ -306,7 +306,7 @@ void MetaDataBase::setMargin( TQObject *o, int margin ) r->margin = margin; TQLayout * tqlayout = 0; - WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout ); + WidgetFactory::layoutType( (TQWidget*)o, tqlayout ); if ( margin < 1 ) margin = 1; if ( tqlayout ) diff --git a/kommander/editor/newform.ui b/kommander/editor/newform.ui index c1e14bd6..fe2f5e42 100644 --- a/kommander/editor/newform.ui +++ b/kommander/editor/newform.ui @@ -206,5 +206,5 @@ <slot access="protected">itemChanged( TQIconViewItem * )</slot> <slot access="protected">projectChanged( const QString & )</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/orderindicator.cpp b/kommander/editor/orderindicator.cpp index 056601b8..24108c2f 100644 --- a/kommander/editor/orderindicator.cpp +++ b/kommander/editor/orderindicator.cpp @@ -72,7 +72,7 @@ void OrderIndicator::setOrder( int i, TQWidget* wid ) void OrderIndicator::reposition() { - TQPoint p =tqparentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) ); + TQPoint p =parentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) ); move( p - TQPoint( width()/3, height()/3 ) ); } diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui index 814785dd..eeead240 100644 --- a/kommander/editor/paletteeditor.ui +++ b/kommander/editor/paletteeditor.ui @@ -509,7 +509,7 @@ <slot access="protected">onChooseMainColor()</slot> <slot access="protected">paletteSelected(int)</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>styledbutton.h</includehint> <includehint>styledbutton.h</includehint> diff --git a/kommander/editor/paletteeditoradvanced.ui b/kommander/editor/paletteeditoradvanced.ui index 5d2c41af..001a39f3 100644 --- a/kommander/editor/paletteeditoradvanced.ui +++ b/kommander/editor/paletteeditoradvanced.ui @@ -41,7 +41,7 @@ <bool>true</bool> </property> <property name="whatsThis" stdset="0"> - <string><b>Edit Palette</b><p>Change the current widget or form's palette.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget tqlayouts in the preview section.</p></string> + <string><b>Edit Palette</b><p>Change the current widget or form's palette.</p><p>Use a generated palette or select colors for each color group and each color role.</p><p>The palette can be tested with different widget layouts in the preview section.</p></string> </property> <vbox> <property name="name"> @@ -757,7 +757,7 @@ <slot access="protected">paletteSelected(int)</slot> <slot>showHelp()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>styledbutton.h</includehint> <includehint>styledbutton.h</includehint> diff --git a/kommander/editor/pics/images.h b/kommander/editor/pics/images.h index 5850acd1..4b14e2ac 100644 --- a/kommander/editor/pics/images.h +++ b/kommander/editor/pics/images.h @@ -4717,8 +4717,8 @@ static const unsigned char small_editgrid_png_data[] = { 0x60,0x82 }; -static const unsigned int small_edithtqlayout_png_len = 706; -static const unsigned char small_edithtqlayout_png_data[] = { +static const unsigned int small_edithlayout_png_len = 706; +static const unsigned char small_edithlayout_png_data[] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48, 0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00, 0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00, @@ -4772,8 +4772,8 @@ static const unsigned char small_edithtqlayout_png_data[] = { 0x4e,0x44,0xae,0x42,0x60,0x82 }; -static const unsigned int small_edithtqlayoutsplit_png_len = 809; -static const unsigned char small_edithtqlayoutsplit_png_data[] = { +static const unsigned int small_edithlayoutsplit_png_len = 809; +static const unsigned char small_edithlayoutsplit_png_data[] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48, 0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00, 0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00, @@ -4957,8 +4957,8 @@ static const unsigned char small_editslots_png_data[] = { 0xae,0x42,0x60,0x82 }; -static const unsigned int small_editvtqlayout_png_len = 289; -static const unsigned char small_editvtqlayout_png_data[] = { +static const unsigned int small_editvlayout_png_len = 289; +static const unsigned char small_editvlayout_png_data[] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48, 0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00, 0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00, @@ -4982,8 +4982,8 @@ static const unsigned char small_editvtqlayout_png_data[] = { 0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82 }; -static const unsigned int small_editvtqlayoutsplit_png_len = 355; -static const unsigned char small_editvtqlayoutsplit_png_data[] = { +static const unsigned int small_editvlayoutsplit_png_len = 355; +static const unsigned char small_editvlayoutsplit_png_data[] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48, 0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00, 0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00, @@ -7784,8 +7784,8 @@ static const unsigned char small_disabled_editgrid_png_data[] = { 0x45,0x4e,0x44,0xae,0x42,0x60,0x82 }; -static const unsigned int small_disabled_edithtqlayout_png_len = 601; -static const unsigned char small_disabled_edithtqlayout_png_data[] = { +static const unsigned int small_disabled_edithlayout_png_len = 601; +static const unsigned char small_disabled_edithlayout_png_data[] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48, 0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00, 0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00, @@ -7831,8 +7831,8 @@ static const unsigned char small_disabled_edithtqlayout_png_data[] = { 0x35,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82 }; -static const unsigned int small_disabled_edithtqlayoutsplit_png_len = 754; -static const unsigned char small_disabled_edithtqlayoutsplit_png_data[] = { +static const unsigned int small_disabled_edithlayoutsplit_png_len = 754; +static const unsigned char small_disabled_edithlayoutsplit_png_data[] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48, 0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00, 0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00, @@ -7958,8 +7958,8 @@ static const unsigned char small_disabled_editpaste_png_data[] = { 0x44,0xae,0x42,0x60,0x82 }; -static const unsigned int small_disabled_editvtqlayout_png_len = 617; -static const unsigned char small_disabled_editvtqlayout_png_data[] = { +static const unsigned int small_disabled_editvlayout_png_len = 617; +static const unsigned char small_disabled_editvlayout_png_data[] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48, 0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00, 0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00, @@ -8007,8 +8007,8 @@ static const unsigned char small_disabled_editvtqlayout_png_data[] = { 0x82 }; -static const unsigned int small_disabled_editvtqlayoutsplit_png_len = 752; -static const unsigned char small_disabled_editvtqlayoutsplit_png_data[] = { +static const unsigned int small_disabled_editvlayoutsplit_png_len = 752; +static const unsigned char small_disabled_editvlayoutsplit_png_data[] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48, 0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00, 0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00, @@ -10877,12 +10877,12 @@ 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_edithtqlayout_png_data, "small/edithtqlayout.png" }, - { 809, small_edithtqlayoutsplit_png_data, "small/edithtqlayoutsplit.png" }, + { 706, small_edithlayout_png_data, "small/edithtqlayout.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_editvtqlayout_png_data, "small/editvtqlayout.png" }, - { 355, small_editvtqlayoutsplit_png_data, "small/editvtqlayoutsplit.png" }, + { 289, small_editvlayout_png_data, "small/editvtqlayout.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" }, { 681, small_fileopen_png_data, "small/fileopen.png" }, @@ -10933,11 +10933,11 @@ 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_edithtqlayout_png_data, "small/disabled/edithtqlayout.png" }, - { 754, small_disabled_edithtqlayoutsplit_png_data, "small/disabled/edithtqlayoutsplit.png" }, + { 601, small_disabled_edithlayout_png_data, "small/disabled/edithtqlayout.png" }, + { 754, small_disabled_edithlayoutsplit_png_data, "small/disabled/edithlayoutsplit.png" }, { 901, small_disabled_editpaste_png_data, "small/disabled/editpaste.png" }, - { 617, small_disabled_editvtqlayout_png_data, "small/disabled/editvtqlayout.png" }, - { 752, small_disabled_editvtqlayoutsplit_png_data, "small/disabled/editvtqlayoutsplit.png" }, + { 617, small_disabled_editvlayout_png_data, "small/disabled/editvtqlayout.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" }, { 1013, small_disabled_searchfind_png_data, "small/disabled/searchfind.png" }, diff --git a/kommander/editor/pixmapfunction.ui b/kommander/editor/pixmapfunction.ui index fb2043d2..cb34cbcc 100644 --- a/kommander/editor/pixmapfunction.ui +++ b/kommander/editor/pixmapfunction.ui @@ -84,10 +84,10 @@ <number>2</number> </property> <property> - <name>tqlayoutMargin</name> + <name>layoutMargin</name> </property> <property> - <name>tqlayoutSpacing</name> + <name>layoutSpacing</name> </property> <hbox> <property stdset="1"> diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index 220613f5..d579c3b6 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -172,7 +172,7 @@ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem * PropertyItem::~PropertyItem() { if ( resetButton ) - delete resetButton->tqparentWidget(); + delete resetButton->parentWidget(); resetButton = 0; } @@ -337,7 +337,7 @@ void PropertyItem::setOpen( bool b ) void PropertyItem::showEditor() { createResetButton(); - resetButton->tqparentWidget()->show(); + resetButton->parentWidget()->show(); } /*! Subclasses have to hide the editor of the item here @@ -346,7 +346,7 @@ void PropertyItem::showEditor() void PropertyItem::hideEditor() { createResetButton(); - resetButton->tqparentWidget()->hide(); + resetButton->parentWidget()->hide(); } /*! This is called to init the value of the item. Reimplement in @@ -389,7 +389,7 @@ TQString PropertyItem::name() const void PropertyItem::createResetButton() { if ( resetButton ) { - resetButton->tqparentWidget()->lower(); + resetButton->parentWidget()->lower(); return; } TQHBox *hbox = new TQHBox( listview->viewport() ); @@ -439,8 +439,8 @@ 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->tqparentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() ); - listview->moveChild( resetButton->tqparentWidget(), r.x() + r.width() - 8, r.y() ); + resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() ); + listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() ); resetButton->setFixedHeight( r.height() - 3 ); } @@ -2498,16 +2498,16 @@ static TQVariant::Type type_to_variant( const TQString &s ) } #ifndef TQT_NO_SQL -static bool tqparent_is_data_aware( TQObject *o ) +static bool parent_is_data_aware( TQObject *o ) { if ( !o->inherits( TQWIDGET_OBJECT_NAME_STRING ) ) return false; TQWidget *w = (TQWidget*)o; - TQWidget *p = w->tqparentWidget(); + TQWidget *p = w->parentWidget(); while ( p && !p->isTopLevel() ) { if ( p->inherits( "QDesignerDataBrowser" ) || p->inherits( "QDesignerDataView" ) ) return true; - p = p->tqparentWidget(); + p = p->parentWidget(); } return false; } @@ -2527,10 +2527,10 @@ void PropertyList::setupProperties() TQMap<TQString, bool> unique; TQObject *w = editor->widget(); TQStringList valueSet; - bool tqparentHasLayout = + bool parentHasLayout = w->isWidgetType() && - !editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)w) ) && ( (TQWidget*)w )->tqparentWidget() && - WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout; + !editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)w) ) && ( (TQWidget*)w )->parentWidget() && + WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { const TQMetaProperty* p = editor->widget()->tqmetaObject()-> @@ -2573,7 +2573,7 @@ void PropertyList::setupProperties() continue; if ( qstrcmp( p->name(), "baseSize" ) == 0 ) continue; - if ( tqparentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 ) + if ( parentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 ) continue; if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || w->inherits( "Spacer" ) ) { if ( qstrcmp( p->name(), "sizePolicy" ) == 0 ) @@ -2679,7 +2679,7 @@ void PropertyList::setupProperties() TQStringList lst; for ( uint i = 0; i < l.count(); ++i ) { TQString k = l.at( i ); - // filter out enum-tqmasks + // filter out enum-masks if ( k[0] == 'M' && k[1].category() == TQChar::Letter_Uppercase ) continue; lst << l.at( i ); @@ -2703,11 +2703,11 @@ void PropertyList::setupProperties() } if ( !w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) && - w->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) { - item = new PropertyIntItem( this, item, 0, "tqlayoutSpacing", true ); + w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) { + item = new PropertyIntItem( this, item, 0, "layoutSpacing", true ); setPropertyValue( item ); item->setChanged( true ); - item = new PropertyIntItem( this, item, 0, "tqlayoutMargin", true ); + item = new PropertyIntItem( this, item, 0, "layoutMargin", true ); setPropertyValue( item ); item->setChanged( true ); } @@ -2727,7 +2727,7 @@ void PropertyList::setupProperties() #ifndef TQT_NO_SQL if ( !editor->widget()->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) && - !editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && tqparent_is_data_aware( editor->widget() ) ) { + !editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && parent_is_data_aware( editor->widget() ) ) { item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w ); setPropertyValue( item ); if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) ) @@ -3084,9 +3084,9 @@ void PropertyList::setPropertyValue( PropertyItem *i ) i->setValue( TQVariant( true, 0 ) ); else i->setValue( TQVariant( false, 0 ) ); - } else if ( i->name() == "tqlayoutSpacing" ) { + } else if ( i->name() == "layoutSpacing" ) { ( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) ); - } else if ( i->name() == "tqlayoutMargin" ) { + } else if ( i->name() == "layoutMargin" ) { ( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) ); } else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) { i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) ); @@ -3563,11 +3563,11 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw ) #endif if ( w && w == wid ) { bool ret = true; - if ( wid->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) { + if ( wid->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) { TQListViewItemIterator it( listview ); ret = false; while ( it.current() ) { - if ( it.current()->text( 0 ) == "tqlayoutSpacing" || it.current()->text( 0 ) == "tqlayoutMargin" ) { + if ( it.current()->text( 0 ) == "layoutSpacing" || it.current()->text( 0 ) == "layoutMargin" ) { ret = true; break; } diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index 09768081..f55c963c 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -290,9 +290,9 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) metaInfo.license = e.firstChild().toText().data(); } else if ( e.tagName() == "exportmacro" ) { exportMacro = e.firstChild().toText().data(); - } else if ( e.tagName() == "tqlayoutdefaults" ) { - formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->tqlayoutDefaultSpacing() ) ).toInt() ); - formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->tqlayoutDefaultMargin() ) ).toInt() ); + } else if ( e.tagName() == "layoutdefaults" ) { + formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->layoutDefaultSpacing() ) ).toInt() ); + formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->layoutDefaultMargin() ) ).toInt() ); } e = e.nextSibling().toElement(); @@ -473,14 +473,14 @@ TQString Resource::copy() TQWidgetList widgets = formwindow->selectedWidgets(); TQWidgetList tmp( widgets ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - TQWidget *p = w->tqparentWidget(); + TQWidget *p = w->parentWidget(); bool save = true; while ( p ) { if ( tmp.tqfindRef( p ) != -1 ) { save = false; break; } - p = p->tqparentWidget(); + p = p->parentWidget(); } if ( save ) saveObject( TQT_TQOBJECT(w), 0, ts, 0 ); @@ -940,8 +940,8 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) if ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) && obj->isWidgetType() && - WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) { - WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout ); + WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) { + WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ); switch ( lay ) { case WidgetFactory::HBox: closeTag = makeIndent( indent ) + "</hbox>"; @@ -1003,8 +1003,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) if ( changed.isEmpty() ) return; - bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->tqparentWidget() && - WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout; + 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" ) ); for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { @@ -1085,7 +1085,7 @@ void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::T void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent ) { - if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" || name == "tqlayoutMargin" || name =="tqlayoutSpacing" ) + if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" || name == "layoutMargin" || name =="layoutSpacing" ) return; int num, unum; double dob; @@ -1108,9 +1108,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant num = value.toInt(); if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); + num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); else if ( name == "margin" ) - num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); + num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); } ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl; break; @@ -1126,9 +1126,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant unum = value.toUInt(); if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); + num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); else if ( name == "margin" ) - num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); + num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); } ts << makeIndent( indent ) << "<number>" << TQString::number( unum ) << "</number>" << endl; break; @@ -1173,8 +1173,8 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant TQVariant v( value ); ts << makeIndent( indent ) << "<font>" << endl; TQFont f( tqApp->font() ); - if ( w && w->isWidgetType() && ((TQWidget*)w)->tqparentWidget() ) - f = ((TQWidget*)w)->tqparentWidget()->font(); + if ( w && w->isWidgetType() && ((TQWidget*)w)->parentWidget() ) + f = ((TQWidget*)w)->parentWidget()->font(); TQFont f2( v.toFont() ); indent++; if ( f.family() != f2.family() ) @@ -1347,7 +1347,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( tqlayout ) { - switch ( WidgetFactory::tqlayoutType( tqlayout ) ) { + switch ( WidgetFactory::layoutType( tqlayout ) ) { case WidgetFactory::HBox: ( (TQHBoxLayout*)tqlayout )->addWidget( w ); break; @@ -1646,7 +1646,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD { const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, true ), true ); - if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no tqlayouts in metadatabase... (RS) + if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget(); if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" ) @@ -1658,8 +1658,8 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD TQVariant defVarient; if ( e.tagName() == "font" ) { TQFont f( tqApp->font() ); - if ( obj->isWidgetType() && ( (TQWidget*)obj )->tqparentWidget() ) - f = ( (TQWidget*)obj )->tqparentWidget()->font(); + if ( obj->isWidgetType() && ( (TQWidget*)obj )->parentWidget() ) + f = ( (TQWidget*)obj )->parentWidget()->font(); defVarient = TQVariant( f ); } @@ -1756,11 +1756,11 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) { if ( prop == "spacing" ) { - MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)obj ) )), v.toInt() ); + MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) )), v.toInt() ); return; } if ( prop == "margin" ) { - MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)obj ) )), v.toInt() ); + MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) )), v.toInt() ); return; } } @@ -2342,8 +2342,8 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) if ( !( exportMacro = MetaDataBase::exportMacro( TQT_TQOBJECT(formwindow->mainContainer()) ) ).isEmpty() ) ts << makeIndent( indent ) << "<exportmacro>" << exportMacro << "</exportmacro>" << endl; if ( formwindow ) - ts << makeIndent( indent ) << "<tqlayoutdefaults spacing=\"" << formwindow->tqlayoutDefaultSpacing() - << "\" margin=\"" << formwindow->tqlayoutDefaultMargin() << "\"/>" << endl; + ts << makeIndent( indent ) << "<layoutdefaults spacing=\"" << formwindow->layoutDefaultSpacing() + << "\" margin=\"" << formwindow->layoutDefaultMargin() << "\"/>" << endl; } TQColorGroup Resource::loadColorGroup( const TQDomElement &e ) diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp index af5efea9..9a29cb31 100644 --- a/kommander/editor/sizehandle.cpp +++ b/kommander/editor/sizehandle.cpp @@ -93,7 +93,7 @@ void SizeHandle::setWidget( TQWidget *w ) void SizeHandle::paintEvent( TQPaintEvent * ) { - if ( ( (FormWindow*)tqparentWidget() )->currentWidget() != widget ) + if ( ( (FormWindow*)parentWidget() )->currentWidget() != widget ) return; TQPainter p( this ); p.setPen( blue ); @@ -115,8 +115,8 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) TQPoint rp = mapFromGlobal( e->globalPos() ); TQPoint d = oldPressPos - rp; oldPressPos = rp; - TQPoint checkPos = widget->tqparentWidget()->mapFromGlobal( e->globalPos() ); - TQRect pr = widget->tqparentWidget()->rect(); + TQPoint checkPos = widget->parentWidget()->mapFromGlobal( e->globalPos() ); + TQRect pr = widget->parentWidget()->rect(); // ##### move code around a bit to reduce duplicated code here switch ( dir ) { @@ -216,7 +216,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) formWindow->sizePreview()->setGeometry( lg ); formWindow->sizePreview()->show(); formWindow->sizePreview()->raise(); - if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout ) + if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout ) formWindow->updateChildSelections( widget ); } @@ -282,7 +282,7 @@ void WidgetSelection::setWidget( TQWidget *w, bool updateDict ) } wid = w; - bool active = !wid->tqparentWidget() || WidgetFactory::tqlayoutType( wid->tqparentWidget() ) == WidgetFactory::NoLayout; + bool active = !wid->parentWidget() || WidgetFactory::layoutType( wid->parentWidget() ) == WidgetFactory::NoLayout; for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) { SizeHandle *h = handles[ i ]; if ( h ) { @@ -306,7 +306,7 @@ void WidgetSelection::updateGeometry() if ( !wid ) return; - TQPoint p = wid->tqparentWidget()->mapToGlobal( wid->pos() ); + TQPoint p = wid->parentWidget()->mapToGlobal( wid->pos() ); p = formWindow->mapFromGlobal( p ); TQRect r( p, wid->size() ); diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp index 95f57d39..e09fd1e8 100644 --- a/kommander/editor/styledbutton.cpp +++ b/kommander/editor/styledbutton.cpp @@ -252,7 +252,7 @@ void StyledButton::dragEnterEvent( TQDragEnterEvent *e ) void StyledButton::dragLeaveEvent( TQDragLeaveEvent * ) { if ( hasFocus() ) - tqparentWidget()->setFocus(); + parentWidget()->setFocus(); } void StyledButton::dragMoveEvent( TQDragMoveEvent *e ) diff --git a/kommander/editor/templates/Configuration_Dialog.ui b/kommander/editor/templates/Configuration_Dialog.ui index 4724398b..8d792741 100644 --- a/kommander/editor/templates/Configuration_Dialog.ui +++ b/kommander/editor/templates/Configuration_Dialog.ui @@ -152,5 +152,5 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui index 6d9edca0..6278ab75 100644 --- a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui +++ b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui @@ -110,5 +110,5 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui index 93650a87..2158eabd 100644 --- a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui +++ b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui @@ -110,5 +110,5 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/templates/Tab_Dialog.ui b/kommander/editor/templates/Tab_Dialog.ui index 4e0a7124..c85b3e8f 100644 --- a/kommander/editor/templates/Tab_Dialog.ui +++ b/kommander/editor/templates/Tab_Dialog.ui @@ -134,5 +134,5 @@ <slot>reject()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp index cb12834e..63f5c2d8 100644 --- a/kommander/editor/widgetdatabase.cpp +++ b/kommander/editor/widgetdatabase.cpp @@ -89,7 +89,7 @@ WidgetDatabaseRecord::~WidgetDatabaseRecord() one application doesn't make sense anyway and so you don't need more than an instance of the widgetdatabase. - For creating widgets, tqlayouts, etc. see WidgetFactory. + For creating widgets, layouts, etc. see WidgetFactory. */ /*! @@ -355,7 +355,7 @@ void WidgetDatabase::setupDataBase( int id ) r->group = widgetGroup("Temp"); r->toolTip = i18n("Spacer"); r->whatsThis = - i18n("The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of tqlayouts."); + i18n("The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of layouts."); append(r); r = new WidgetDatabaseRecord; diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index b908f8e9..43011071 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -123,9 +123,9 @@ FormWindow *find_formwindow( TQWidget *w ) for (;;) { if ( w->inherits( "FormWindow" ) ) return (FormWindow*)w; - if ( !w->tqparentWidget() ) + if ( !w->parentWidget() ) return 0; - w = w->tqparentWidget(); + w = w->parentWidget(); } } @@ -387,10 +387,10 @@ TQMap< int, TQStringList > *changedProperties = 0; /*! \class WidgetFactory widgetfactory.h - \brief Set of static functions for creating widgets, tqlayouts and do other stuff + \brief Set of static functions for creating widgets, layouts and do other stuff The widget factory offers functions to create widgets, create and - delete tqlayouts find out other details - all based on the + delete layouts find out other details - all based on the WidgetDatabase's data. So the functions that use ids use the same ids as in the WidgetDatabase. */ @@ -679,7 +679,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay if ( widget && !widget->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) && ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) || - widget && widget->tqparentWidget() && widget->tqparentWidget()->inherits( "FormWindow" ) ) ) + widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) ) margin = MainWindow::self->currentLayoutDefaultMargin(); if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) @@ -1262,7 +1262,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa TQWidget::tqlayout() of \a w or to 0 after the function call. */ -WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&tqlayout ) +WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tqlayout ) { tqlayout = 0; @@ -1304,7 +1304,7 @@ WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&t /*! \overload */ -WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout ) +WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout ) { if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) return HBox; @@ -1318,14 +1318,14 @@ WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout ) /*! \overload */ -WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w ) +WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w ) { TQLayout *l = 0; - return tqlayoutType( w, l ); + return layoutType( w, l ); } -TQWidget *WidgetFactory::tqlayoutParent( TQLayout *tqlayout ) +TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout ) { TQObject *o = TQT_TQOBJECT(tqlayout); while ( o ) { @@ -1365,20 +1365,20 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) /*! Returns the actual designer widget of the container \a w. This is normally \a w itself, but might be a tqparent or grand tqparent of \a w (e.g. when working with a tabwidget and \a w is the container which - contains and tqlayouts childs, but the actual widget known to the + contains and layouts childs, but the actual widget known to the designer is the tabwidget which is the tqparent of \a w. So this function returns the tabwidget then.) */ TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w ) { - if ( w->tqparentWidget() && w->tqparentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) - w = w->tqparentWidget(); + if ( w->parentWidget() && w->parentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) + w = w->parentWidget(); while ( w ) { if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) || - w && w->tqparentWidget() && w->tqparentWidget()->inherits( "FormWindow" ) ) + w && w->parentWidget() && w->parentWidget()->inherits( "FormWindow" ) ) return w; - w = w->tqparentWidget(); + w = w->parentWidget(); } return w; } @@ -1686,14 +1686,14 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName ) return TQVariant(); } else if ( propName == "frameworkCode" ) { return TQVariant( true, 0 ); - } else if ( propName == "tqlayoutMargin" ) { + } else if ( propName == "layoutMargin" ) { if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) return TQVariant( 0 ); else if ( MainWindow::self->formWindow() ) - return TQVariant( MainWindow::self->formWindow()->tqlayoutDefaultMargin() ); - } else if ( propName == "tqlayoutSpacing" ) { + return TQVariant( MainWindow::self->formWindow()->layoutDefaultMargin() ); + } else if ( propName == "layoutSpacing" ) { if ( MainWindow::self->formWindow() ) - return TQVariant( MainWindow::self->formWindow()->tqlayoutDefaultSpacing() ); + return TQVariant( MainWindow::self->formWindow()->layoutDefaultSpacing() ); } return *( *defaultProperties->tqfind( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).tqfind( propName ); @@ -1794,7 +1794,7 @@ bool TQLayoutWidget::event( TQEvent *e ) /* This function must be called on TQLayoutWidget creation and whenever the TQLayoutWidget's tqparent tqlayout changes (e.g., from a TQHBoxLayout - to a TQVBoxLayout), because of the (illogical) way tqlayouting works. + to a TQVBoxLayout), because of the (illogical) way layouting works. */ void TQLayoutWidget::updateSizePolicy() { @@ -1819,21 +1819,21 @@ void TQLayoutWidget::updateSizePolicy() if ( tqlayout() ) { /* - tqparentLayout is set to the tqparent tqlayout if there is one and if it is - top level, in which case tqlayouting is illogical. + parentLayout is set to the tqparent tqlayout if there is one and if it is + top level, in which case layouting is illogical. */ - TQLayout *tqparentLayout = 0; + TQLayout *parentLayout = 0; if ( tqparent() && tqparent()->isWidgetType() ) { - tqparentLayout = ((TQWidget *)tqparent())->tqlayout(); - if ( tqparentLayout && tqparentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) - tqparentLayout = 0; + parentLayout = ((TQWidget *)tqparent())->tqlayout(); + if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) ) + parentLayout = 0; } TQObjectListIt it( childrenListObject() ); TQObject *o; if ( tqlayout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) { - if ( tqparentLayout && tqparentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) + if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) vt = TQSizePolicy::Minimum; else vt = TQSizePolicy::Fixed; @@ -1854,7 +1854,7 @@ void TQLayoutWidget::updateSizePolicy() vt |= TQSizePolicy::Maximum; } } else if ( tqlayout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) { - if ( tqparentLayout && tqparentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) + if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) ht = TQSizePolicy::Minimum; else ht = TQSizePolicy::Fixed; @@ -1877,10 +1877,10 @@ void TQLayoutWidget::updateSizePolicy() } else if ( tqlayout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) { ht = TQSizePolicy::Fixed; vt = TQSizePolicy::Fixed; - if ( tqparentLayout ) { - if ( tqparentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) + if ( parentLayout ) { + if ( parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) ht = TQSizePolicy::Minimum; - else if ( tqparentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) + else if ( parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) vt = TQSizePolicy::Minimum; } @@ -1921,8 +1921,8 @@ void TQLayoutWidget::updateSizePolicy() void CustomWidget::paintEvent( TQPaintEvent *e ) { - if ( tqparentWidget() && tqparentWidget()->inherits( "FormWindow" ) ) { - ( (FormWindow*)tqparentWidget() )->paintGrid( this, e ); + if ( parentWidget() && parentWidget()->inherits( "FormWindow" ) ) { + ( (FormWindow*)parentWidget() )->paintGrid( this, e ); } else { TQPainter p( this ); p.fillRect( rect(), tqcolorGroup().dark() ); diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index ab73cd5c..9ad4ce6c 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -75,10 +75,10 @@ public: static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type ); static void deleteLayout( TQWidget *widget ); - static LayoutType tqlayoutType( TQWidget *w ); - static LayoutType tqlayoutType( TQWidget *w, TQLayout *&tqlayout ); - static LayoutType tqlayoutType( TQLayout *tqlayout ); - static TQWidget *tqlayoutParent( TQLayout *tqlayout ); + static LayoutType layoutType( TQWidget *w ); + static LayoutType layoutType( TQWidget *w, TQLayout *&tqlayout ); + static LayoutType layoutType( TQLayout *tqlayout ); + static TQWidget *layoutParent( TQLayout *tqlayout ); static TQWidget* containerOfWidget( TQWidget *w ); static TQWidget* widgetOfContainer( TQWidget *w ); @@ -251,7 +251,7 @@ class CustomWidget : public TQWidget public: CustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *cw ) : TQWidget( tqparent, name ), cusw( cw ) { - alwaysExpand = tqparentWidget() && tqparentWidget()->inherits( "FormWindow" ); + alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" ); tqsetSizePolicy( cw->sizePolicy ); if ( !alwaysExpand ) setBackgroundMode( PaletteDark ); @@ -381,15 +381,15 @@ public: : TQToolButton( tqparent, name ) {} bool isInButtonGroup() const { - return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); } int buttonGroupId() const { - return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { - ( (TQButtonGroup*)tqparentWidget() )->remove( this ); - ( (TQButtonGroup*)tqparentWidget() )->insert( this, id ); + if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + ( (TQButtonGroup*)parentWidget() )->remove( this ); + ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } } }; @@ -405,15 +405,15 @@ public: : TQRadioButton( tqparent, name ) {} bool isInButtonGroup() const { - return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); } int buttonGroupId() const { - return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { - ( (TQButtonGroup*)tqparentWidget() )->remove( this ); - ( (TQButtonGroup*)tqparentWidget() )->insert( this, id ); + if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + ( (TQButtonGroup*)parentWidget() )->remove( this ); + ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } } @@ -430,15 +430,15 @@ public: : TQPushButton( tqparent, name ) {} bool isInButtonGroup() const { - return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); } int buttonGroupId() const { - return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { - ( (TQButtonGroup*)tqparentWidget() )->remove( this ); - ( (TQButtonGroup*)tqparentWidget() )->insert( this, id ); + if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + ( (TQButtonGroup*)parentWidget() )->remove( this ); + ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } } @@ -455,15 +455,15 @@ public: : TQCheckBox( tqparent, name ) {} bool isInButtonGroup() const { - return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ); } int buttonGroupId() const { - return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1; + return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1; } void setButtonGroupId( int id ) { - if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { - ( (TQButtonGroup*)tqparentWidget() )->remove( this ); - ( (TQButtonGroup*)tqparentWidget() )->insert( this, id ); + if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) { + ( (TQButtonGroup*)parentWidget() )->remove( this ); + ( (TQButtonGroup*)parentWidget() )->insert( this, id ); } } diff --git a/kommander/editor/wizardeditor.ui b/kommander/editor/wizardeditor.ui index f575a13a..31c64505 100644 --- a/kommander/editor/wizardeditor.ui +++ b/kommander/editor/wizardeditor.ui @@ -316,5 +316,5 @@ <slot access="protected">removeClicked()</slot> <slot access="protected">upClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/current/a1.kmdr b/kommander/examples/current/a1.kmdr index 7399bc73..bf11dc78 100755 --- a/kommander/examples/current/a1.kmdr +++ b/kommander/examples/current/a1.kmdr @@ -254,5 +254,5 @@ StatusBar8.setText("Returned: "+b)</string> </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/current/b1.kmdr b/kommander/examples/current/b1.kmdr index bc02ab80..aac4943d 100755 --- a/kommander/examples/current/b1.kmdr +++ b/kommander/examples/current/b1.kmdr @@ -26,7 +26,7 @@ else StatusBar9.insertItem("ARG1="+_ARG1, 1) StatusBar9.insertItem("ARG2="+_ARG2, 2) endif -//message_info(tqparentPid)</string> +//message_info(parentPid)</string> <string></string> </stringlist> </property> @@ -120,8 +120,8 @@ endif </property> <property name="associations" stdset="0"> <stringlist> - <string>//message_info("tqparentPid = "+tqparentPid+"\npid = "+pid) -dcop("kmdr-executor-"+tqparentPid, "KommanderIf", "setText(QString,QString)", "StatusBar8", "Hello") + <string>//message_info("parentPid = "+parentPid+"\npid = "+pid) +dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(QString,QString)", "StatusBar8", "Hello") </string> </stringlist> </property> @@ -131,5 +131,5 @@ dcop("kmdr-executor-"+tqparentPid, "KommanderIf", "setText(QString,QString)", "S </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr index 6a084397..4c678ca8 100755 --- a/kommander/examples/current/editor-poc.kmdr +++ b/kommander/examples/current/editor-poc.kmdr @@ -428,7 +428,7 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1)) <slot>execute()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> </string> </property> @@ -1064,5 +1064,5 @@ TextEdit5.setColor(color)</string> <slot>setChecked(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/current/keyvaluecombo.kmdr b/kommander/examples/current/keyvaluecombo.kmdr index b4a35126..489c4f6d 100644 --- a/kommander/examples/current/keyvaluecombo.kmdr +++ b/kommander/examples/current/keyvaluecombo.kmdr @@ -384,5 +384,5 @@ endif</string> <tabstop>ComboBox10</tabstop> <tabstop>ListBox1</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/current/kpartmwframe.kmdr b/kommander/examples/current/kpartmwframe.kmdr index 6e334aa6..cdd17f53 100755 --- a/kommander/examples/current/kpartmwframe.kmdr +++ b/kommander/examples/current/kpartmwframe.kmdr @@ -614,5 +614,5 @@ endif</string> <slot>execute()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/current/kpartpart.kmdr b/kommander/examples/current/kpartpart.kmdr index 0763fada..11b6a806 100755 --- a/kommander/examples/current/kpartpart.kmdr +++ b/kommander/examples/current/kpartpart.kmdr @@ -167,5 +167,5 @@ endif </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/current/passvariables.kmdr b/kommander/examples/current/passvariables.kmdr index 95270a83..c8162eda 100644 --- a/kommander/examples/current/passvariables.kmdr +++ b/kommander/examples/current/passvariables.kmdr @@ -412,5 +412,5 @@ echo round(@Self.Item(1)/@Self.Item(2),5) <slot>popup(int,int)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/current/tableselect.kmdr b/kommander/examples/current/tableselect.kmdr index a8617103..3284f0c5 100755 --- a/kommander/examples/current/tableselect.kmdr +++ b/kommander/examples/current/tableselect.kmdr @@ -498,5 +498,5 @@ end <slot>popup(int,int)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/checkmail.kmdr b/kommander/examples/old/checkmail.kmdr index 75aff6d0..d4fda432 100644 --- a/kommander/examples/old/checkmail.kmdr +++ b/kommander/examples/old/checkmail.kmdr @@ -40,5 +40,5 @@ </property> </widget> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/ex1.kmdr b/kommander/examples/old/ex1.kmdr index f2c53005..a916ee22 100644 --- a/kommander/examples/old/ex1.kmdr +++ b/kommander/examples/old/ex1.kmdr @@ -101,5 +101,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/execprogram.kmdr b/kommander/examples/old/execprogram.kmdr index 7dc9a07b..252b80d9 100644 --- a/kommander/examples/old/execprogram.kmdr +++ b/kommander/examples/old/execprogram.kmdr @@ -100,5 +100,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/firstform.kmdr.kmdr b/kommander/examples/old/firstform.kmdr.kmdr index e01c228e..df90066e 100644 --- a/kommander/examples/old/firstform.kmdr.kmdr +++ b/kommander/examples/old/firstform.kmdr.kmdr @@ -84,5 +84,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/form1.kmdr b/kommander/examples/old/form1.kmdr index 1d75334d..e44b1e14 100644 --- a/kommander/examples/old/form1.kmdr +++ b/kommander/examples/old/form1.kmdr @@ -92,5 +92,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/form2.kmdr b/kommander/examples/old/form2.kmdr index fa488f56..23e8e372 100644 --- a/kommander/examples/old/form2.kmdr +++ b/kommander/examples/old/form2.kmdr @@ -114,5 +114,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/form3.kmdr b/kommander/examples/old/form3.kmdr index 18eb8bae..2b1ffbb2 100644 --- a/kommander/examples/old/form3.kmdr +++ b/kommander/examples/old/form3.kmdr @@ -58,5 +58,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/form4.kmdr b/kommander/examples/old/form4.kmdr index 672dbb51..7a5abe1a 100644 --- a/kommander/examples/old/form4.kmdr +++ b/kommander/examples/old/form4.kmdr @@ -84,5 +84,5 @@ <slot>setWidgetText(const QString&)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/form5.kmdr b/kommander/examples/old/form5.kmdr index fd71919e..ceba4883 100644 --- a/kommander/examples/old/form5.kmdr +++ b/kommander/examples/old/form5.kmdr @@ -342,5 +342,5 @@ Ha ha. We got it all with Kommander!</string> <slot>setText(const QString&)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/newfile.kmdr b/kommander/examples/old/newfile.kmdr index e753c6c0..d74528a0 100644 --- a/kommander/examples/old/newfile.kmdr +++ b/kommander/examples/old/newfile.kmdr @@ -930,5 +930,5 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/populate.kmdr b/kommander/examples/old/populate.kmdr index 71b9cd3d..644faadc 100644 --- a/kommander/examples/old/populate.kmdr +++ b/kommander/examples/old/populate.kmdr @@ -107,5 +107,5 @@ <slot>populate()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/resize.kmdr b/kommander/examples/old/resize.kmdr index 869cce3b..828d45f2 100644 --- a/kommander/examples/old/resize.kmdr +++ b/kommander/examples/old/resize.kmdr @@ -213,5 +213,5 @@ done </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/selectedwidgettext.kmdr b/kommander/examples/old/selectedwidgettext.kmdr index 60711066..01f3023c 100644 --- a/kommander/examples/old/selectedwidgettext.kmdr +++ b/kommander/examples/old/selectedwidgettext.kmdr @@ -101,5 +101,5 @@ </widget> </hbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/settings.kmdr b/kommander/examples/old/settings.kmdr index f336d645..e299bced 100644 --- a/kommander/examples/old/settings.kmdr +++ b/kommander/examples/old/settings.kmdr @@ -260,5 +260,5 @@ Items") <slot>populate()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/simplelist.kmdr b/kommander/examples/old/simplelist.kmdr index 2bb27af7..6435f181 100644 --- a/kommander/examples/old/simplelist.kmdr +++ b/kommander/examples/old/simplelist.kmdr @@ -210,5 +210,5 @@ </property> </widget> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/tar.kmdr b/kommander/examples/old/tar.kmdr index 35922292..b374200a 100644 --- a/kommander/examples/old/tar.kmdr +++ b/kommander/examples/old/tar.kmdr @@ -475,5 +475,5 @@ </widget> </vbox> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/tidy.kmdr b/kommander/examples/old/tidy.kmdr index a96f5119..26e05120 100644 --- a/kommander/examples/old/tidy.kmdr +++ b/kommander/examples/old/tidy.kmdr @@ -1155,5 +1155,5 @@ fi <slot>setWidgetText(const QString&)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr index 0c8da2e6..f9551a9d 100644 --- a/kommander/examples/old/widgetgenerator.kmdr +++ b/kommander/examples/old/widgetgenerator.kmdr @@ -434,5 +434,5 @@ echo "$cppContent" > @directory/$classNameLower.cpp</string> </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/old/wizard.kmdr b/kommander/examples/old/wizard.kmdr index 052cfc3a..ed07ab03 100755 --- a/kommander/examples/old/wizard.kmdr +++ b/kommander/examples/old/wizard.kmdr @@ -297,5 +297,5 @@ <slot>execute()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/append.kmdr b/kommander/examples/tutorial/append.kmdr index 51b24cde..c5fcb41f 100644 --- a/kommander/examples/tutorial/append.kmdr +++ b/kommander/examples/tutorial/append.kmdr @@ -111,5 +111,5 @@ dcop @dcopid KommanderIf changeWidgetText TextEdit1 "$TEXT" </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/arrays.kmdr b/kommander/examples/tutorial/arrays.kmdr index b884affc..4b9e9968 100644 --- a/kommander/examples/tutorial/arrays.kmdr +++ b/kommander/examples/tutorial/arrays.kmdr @@ -200,5 +200,5 @@ <slot>populate()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/calc.kmdr b/kommander/examples/tutorial/calc.kmdr index 21bddb4e..a476c254 100644 --- a/kommander/examples/tutorial/calc.kmdr +++ b/kommander/examples/tutorial/calc.kmdr @@ -267,5 +267,5 @@ <tabstop>ExecButton2</tabstop> <tabstop>ListBox1</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/cmdline.kmdr b/kommander/examples/tutorial/cmdline.kmdr index 6d0cbbe1..fa140832 100644 --- a/kommander/examples/tutorial/cmdline.kmdr +++ b/kommander/examples/tutorial/cmdline.kmdr @@ -104,5 +104,5 @@ fi</string> </spacer> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/dcop.kmdr b/kommander/examples/tutorial/dcop.kmdr index 739bdae6..a39dcf24 100644 --- a/kommander/examples/tutorial/dcop.kmdr +++ b/kommander/examples/tutorial/dcop.kmdr @@ -135,5 +135,5 @@ dcop kmail KMailIface checkAccount @AccountListBox</string> </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/dialogs.kmdr b/kommander/examples/tutorial/dialogs.kmdr index 421f0607..cb3c81e2 100644 --- a/kommander/examples/tutorial/dialogs.kmdr +++ b/kommander/examples/tutorial/dialogs.kmdr @@ -194,5 +194,5 @@ ListBox1.setText(a) </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/globals.kmdr b/kommander/examples/tutorial/globals.kmdr index 131c3a2a..33d5dd40 100644 --- a/kommander/examples/tutorial/globals.kmdr +++ b/kommander/examples/tutorial/globals.kmdr @@ -92,5 +92,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/initialize.kmdr b/kommander/examples/tutorial/initialize.kmdr index 5ca6bbc9..62e74b93 100644 --- a/kommander/examples/tutorial/initialize.kmdr +++ b/kommander/examples/tutorial/initialize.kmdr @@ -116,5 +116,5 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE" </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/loop.kmdr b/kommander/examples/tutorial/loop.kmdr index 998fe1d0..a415a103 100644 --- a/kommander/examples/tutorial/loop.kmdr +++ b/kommander/examples/tutorial/loop.kmdr @@ -110,5 +110,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/picview.kmdr b/kommander/examples/tutorial/picview.kmdr index bc1f923a..495edaaa 100644 --- a/kommander/examples/tutorial/picview.kmdr +++ b/kommander/examples/tutorial/picview.kmdr @@ -144,5 +144,5 @@ <slot>populate()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/progressbar.kmdr b/kommander/examples/tutorial/progressbar.kmdr index 9e624b78..c5b929dc 100644 --- a/kommander/examples/tutorial/progressbar.kmdr +++ b/kommander/examples/tutorial/progressbar.kmdr @@ -188,5 +188,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/settings.kmdr b/kommander/examples/tutorial/settings.kmdr index a280dff2..24fb90e5 100644 --- a/kommander/examples/tutorial/settings.kmdr +++ b/kommander/examples/tutorial/settings.kmdr @@ -173,5 +173,5 @@ <slot>populate()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/slots.kmdr b/kommander/examples/tutorial/slots.kmdr index ce54a3ba..46d0a6b1 100644 --- a/kommander/examples/tutorial/slots.kmdr +++ b/kommander/examples/tutorial/slots.kmdr @@ -196,5 +196,5 @@ fi <slot>startProcess()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/statusbar.kmdr b/kommander/examples/tutorial/statusbar.kmdr index 8dd2b897..d4f96e05 100644 --- a/kommander/examples/tutorial/statusbar.kmdr +++ b/kommander/examples/tutorial/statusbar.kmdr @@ -95,5 +95,5 @@ <slot>populate()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/strings.kmdr b/kommander/examples/tutorial/strings.kmdr index 464f84ae..ce0b469b 100644 --- a/kommander/examples/tutorial/strings.kmdr +++ b/kommander/examples/tutorial/strings.kmdr @@ -202,5 +202,5 @@ fi <tabstop>ExecButton1</tabstop> <tabstop>TextEdit1</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/table.kmdr b/kommander/examples/tutorial/table.kmdr index d7ed3461..0c79cb66 100644 --- a/kommander/examples/tutorial/table.kmdr +++ b/kommander/examples/tutorial/table.kmdr @@ -254,5 +254,5 @@ </hbox> </widget> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/tree.kmdr b/kommander/examples/tutorial/tree.kmdr index fcde8a28..dc1bc996 100644 --- a/kommander/examples/tutorial/tree.kmdr +++ b/kommander/examples/tutorial/tree.kmdr @@ -166,5 +166,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/examples/tutorial/widgets.kmdr b/kommander/examples/tutorial/widgets.kmdr index 912cded0..3cdd5e1c 100644 --- a/kommander/examples/tutorial/widgets.kmdr +++ b/kommander/examples/tutorial/widgets.kmdr @@ -129,5 +129,5 @@ <slot>populate()</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/executor/register.cpp b/kommander/executor/register.cpp index f3d33799..5a442326 100644 --- a/kommander/executor/register.cpp +++ b/kommander/executor/register.cpp @@ -49,7 +49,7 @@ void Instance::registerSpecials() SpecialInformation::insert("null", 0, 0); SpecialInformation::insert("pid", 0, 0); SpecialInformation::insert("dcopid", 0, 0); - SpecialInformation::insert("tqparentPid", 0, 0); + SpecialInformation::insert("parentPid", 0, 0); SpecialInformation::insert("execBegin", 0, 1); SpecialInformation::insert("env", 1, 1); SpecialInformation::insert("exec", 1, 1); diff --git a/kommander/factory/domtool.cpp b/kommander/factory/domtool.cpp index e532dc10..40190ff1 100644 --- a/kommander/factory/domtool.cpp +++ b/kommander/factory/domtool.cpp @@ -360,9 +360,9 @@ void DomTool::fixDocument( TQDomDocument& doc ) bool stdset = toBool( e.attribute( "stdset" ) ); if ( stdset || name == "toolTip" || name == "whatsThis" || name == "buddy" || - e.tqparentNode().toElement().tagName() == "item" || - e.tqparentNode().toElement().tagName() == "spacer" || - e.tqparentNode().toElement().tagName() == "column" + e.parentNode().toElement().tagName() == "item" || + e.parentNode().toElement().tagName() == "spacer" || + e.parentNode().toElement().tagName() == "column" ) e.removeAttribute( "stdset" ); else diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 11ac1cf3..504af6f9 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -207,7 +207,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg widgetFactory->variables << e.firstChild().toText().data(); } else if ( e.tagName() == "pixmapinproject" ) { widgetFactory->usePixmapCollection = true; - } else if ( e.tagName() == "tqlayoutdefaults" ) { + } else if ( e.tagName() == "layoutdefaults" ) { widgetFactory->defSpacing = e.attribute( "spacing", TQString::number( widgetFactory->defSpacing ) ).toInt(); widgetFactory->defMargin = e.attribute( "margin", TQString::number( widgetFactory->defMargin ) ).toInt(); } @@ -532,7 +532,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( tqlayout ) { - switch( tqlayoutType( tqlayout ) ) { + switch( layoutType( tqlayout ) ) { case HBox: ( (TQHBoxLayout*)tqlayout )->addWidget( w ); break; @@ -562,37 +562,37 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge createWidgetInternal( n, w, tqlayout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); dbControls = oldDbControls; } else if ( n.tagName() == "hbox" ) { - TQLayout *tqparentLayout = tqlayout; + TQLayout *parentLayout = tqlayout; if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) tqlayout = createLayout( 0, 0, KommanderFactory::HBox ); else tqlayout = createLayout( w, tqlayout, KommanderFactory::HBox ); obj = TQT_TQOBJECT(tqlayout); n = n.firstChild().toElement(); - if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); + if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "grid" ) { - TQLayout *tqparentLayout = tqlayout; + TQLayout *parentLayout = tqlayout; if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) tqlayout = createLayout( 0, 0, KommanderFactory::Grid ); else tqlayout = createLayout( w, tqlayout, KommanderFactory::Grid ); obj = TQT_TQOBJECT(tqlayout); n = n.firstChild().toElement(); - if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); + if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "vbox" ) { - TQLayout *tqparentLayout = tqlayout; + TQLayout *parentLayout = tqlayout; if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) tqlayout = createLayout( 0, 0, KommanderFactory::VBox ); else tqlayout = createLayout( w, tqlayout, KommanderFactory::VBox ); obj = TQT_TQOBJECT(tqlayout); n = n.firstChild().toElement(); - if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); + if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "property" && obj ) { setProperty( obj, n.attribute( "name" ), n.firstChild().toElement() ); @@ -715,7 +715,7 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* tqlayout, } } -KommanderFactory::LayoutType KommanderFactory::tqlayoutType( TQLayout *tqlayout ) const +KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *tqlayout ) const { if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) return HBox; @@ -733,8 +733,8 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T TQVariant defVariant; if ( e.tagName() == "font" ) { TQFont f( tqApp->font() ); - if ( obj->isWidgetType() && ( (TQWidget*)obj )->tqparentWidget() ) - f = ( (TQWidget*)obj )->tqparentWidget()->font(); + if ( obj->isWidgetType() && ( (TQWidget*)obj )->parentWidget() ) + f = ( (TQWidget*)obj )->parentWidget()->font(); defVariant = TQVariant( f ); } diff --git a/kommander/factory/kommanderfactory.h b/kommander/factory/kommanderfactory.h index 147749c2..8098f877 100644 --- a/kommander/factory/kommanderfactory.h +++ b/kommander/factory/kommanderfactory.h @@ -76,7 +76,7 @@ private: void loadTabOrder( const TQDomElement &e ); TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg ); TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type ); - LayoutType tqlayoutType( TQLayout *l ) const; + LayoutType layoutType( TQLayout *l ) const; void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e ); void createSpacer( const TQDomElement &e, TQLayout *tqlayout ); TQImage loadFromCollection( const TQString &name ); diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr index 0cbf0f5d..26b2d0c2 100755 --- a/kommander/kmdrtools/dcoptool-oldparser.kmdr +++ b/kommander/kmdrtools/dcoptool-oldparser.kmdr @@ -594,7 +594,7 @@ fi </item> <item> <property name="text"> - <string>"kmdr-executor-"+tqparentPid</string> + <string>"kmdr-executor-"+parentPid</string> </property> </item> <property name="name"> @@ -1117,13 +1117,13 @@ fi @setGlobal(PARM4,"") @setGlobal(short,dcopid) @setGlobal(DESC,"Returns DCOP identifier of current process. This is shorthand for <i>kmdr-executor-&#064;pid</i>.") -@case(Kommander::tqparentPid(QString,bool)) +@case(Kommander::parentPid(QString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @setGlobal(PARM3,"") @setGlobal(PARM4,"") - @setGlobal(short,tqparentPid) + @setGlobal(short,parentPid) @setGlobal(DESC,"Returns the pid of the tqparent Kommander window.") @case(Kommander::debug(QString)) @setGlobal(enWidget,0) @@ -2121,5 +2121,5 @@ setColumnCaption(QString,int,QString)") <tabstop>window</tabstop> <tabstop>widgetName</tabstop> </tabstops> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/kmdrtools/examples.kmdr b/kommander/kmdrtools/examples.kmdr index 5d32d858..472f1646 100755 --- a/kommander/kmdrtools/examples.kmdr +++ b/kommander/kmdrtools/examples.kmdr @@ -150,5 +150,5 @@ endif</string> <data format="XPM.GZ" length="6350">789ca598d94f1fc911c7dff7af40db6faba877a667baa747511e8c01e3030c06cc11e5a1aa7a86cbdc603051fef734f5ad9fed5d2952a4f521fba3beeaae1a7eff6de9606b63e9b7df7fb9bba7fb53599213ba5dfaad3c5c5c7cfbe7bffef1ef5f7e0d61a9fee9425e0abffeed975fb7ef976469f3ea727a013f56708dfe7a61597069b372068729f6cabbe0dcc8acbc622c4599c1a10dad72f1ca5d1370bfc77d5dcb01e70770176252de51eebb1c21df96720c6d87f51edcd3202fec5e29a7c01dee3b541e43dfa9b2ee4699dbd88e2a0f2997861a5d97040ed441dfa83c776d8ff5a3176e9b466cff6be5b6ded7aabe07ca5d37f6f4c2f400ee1bc84f1f95fb2859d7654f39a6766495c729a7b66d3a5dc77d431fa2ca2b9f9573ecb2ae975999dafa80ae5f1a0f0df6ef83fb79507bf927701e65d0f39372b507cef3837102fb2be3a1d1fd1efb4b65f87f193c3454f4fcaaf294a3e8ba6b5e3834ed88f3a528b72d352a0fef1b33e4f5df9443655d776aefd02d582e94fb568c3be3b9813ddf2a577b6695df6d1bf3a8f662514eed64fa7c521e6a38ea79867c39b48dfa9f8e95c705fb1f0c79d55f8142d7a8feee1a9cbaacfafb013c24d8c7df29f398912fee8db2c431e17d562ea137ff41be52eda9f2ca15784c05f10e7da7ba5fe5e3afc6b1d1789333f0200cff6e2acf21415f4fc643837cd5f8ace99971de6bfe756d65bc770aee52d0f8e77be550d7555efe0c4e09f1e95ae52e8c382fe7e0ae4680aeef832345e4eb2a788cd08f351fbb18b8d1fc70deb858bee1be983bc67b9aef55ba453c6d1b4b8b7a73094e7d823d37c15944f575b7ca43985ae4f7163813d6f98b71417c7bd82b6766c8ff9d8bbe479a9fdd1826e8ef173c9bfc199c02e4f167e09c08f1fb4e9916e749c0718c6a0f817e9ce70279b5fe75656c0bce6bfdeea6b1401e79569ec750903fa7c65dd1f749fdd7b75d84bd68cf3899bc1d38ce51f7b3c64f1f6a81837f37c0fdd4e9fb45e3b9efbb01f6a457c6638bf7efc07966c4eb9a721c09fef7e0347403de3b048f52501fd51ffdd091f94beb479fc75c50bfb5fef463c7886f5f8ca5457d5a07f78dc973021e479ca76cccd6dfde1897a2f92cd7df19f9f200e66e02639d3a8b57ff15cc11eb1c94b9ea83fc1fc1d4a27ffa4730e709f9a9fda697b117f873dd7886bd44fb5b5f16e759e3a79faa01105ff7604eb8af683cf573df427fd27c8c4ddfc05ea2fe8b6dead0cfbcde17bb61863fc4836998d05fb53ebdb4e309f5f69371467cb1d6c318fb8c7940b41fc594ad3e8bda230ebdc59fc3f9816982fce7606967f85bf329e6aa2fcedf1a0f93dadbad19cf13f255e3258e6326f81ffa513fb6e89fc7600a45f38b5be3cee23119cf13ea9dc67be47a5edff747e034637e21cdafda0c09eb0c798426d88b36c1dc9a7c9067ea6dde7207e03a5ea01fdc1bd714d3f31a4f351bfb80fe7e011ed3a8f672cf606a102facf1949a7ec67d740fe61efef26aff3a8d7419f553e33d853a70a1bf6b7ca5eaff84fa7c09e63a10eafe689c2dbe351f534fc4e87f9b6066cb8ff7c613e291d4be29d6fc80fe97c684fda4fd28a52a0fe6870b70951ff1a5f99e061a11ffe2c0dfe5db302e33fa81ceaf29c7087bf30c1e53863c03b8ca83fa087dc6d8e37dbf0c669970df0765926646bdd478484c05eb0c7b72f537e261c738435fdf8317e77d671c26d85ffb7d7a891f5d27e823d59ee8075a8f53a9fae2fd2be31efa5334a609fd17f217e9cc7eda4fd2944a07be06d7fbd0efcf8c05e7a9372e789fb51ea5991bab072acfd04446fcc83b6369e1ff67e3a9457e9d825313109f5bc66d40fdd1fe31b4291beb7b43a8e7f57eeac0d2c05e148c5bc48fcbc619f6259d67872ece013c82ebf8827ab307ce92d45fa4fd63e853ead01fb51e0fb1be8f7e7108ce39a1be607fa49170ff07f0c29feec27898314f6bbd1952b4fc746aef614813be47dc399832a17edc81a5b7fcb9361e511f59fd33e4dabe21df93710c88e7b7e0fa3ee4d37a338ca9833dbc185bbde1c9389abd9e8d5340fdb835ce01f322de1f47ca8807cdf781d380fa4f2b0b0e88cf2fe03aeec1deb65fac5f11e247aaffd01fb4df0ea59e473eed826b3d417d867da6349a7c37c6847ac94fc605eb04f9a76a3fdc8ff89917e769d7d8ced3155826f88f35bf7293d8d64f8ca780786fc143d3a17e1b2fdea31b63863f44e325b7f53eb59fc77dede2bc4ce04c09f6d57a9043ae21a8f2ec81ab3de0ff75b0c80c7be1fe2e31fce1ee8d05f9e4eec0436bf1cee05a2f50ff347e725fc73bc4db7be301f2b947b044f467a7f37dfd9a317b91379e218f837e491af45fa7f3681eaaff11af3a0fe43c04c4179f82c5fa0d69bdafd3fae23eed8f99eb38827eb40c9638213ebf804b67fb35de6b3a0c01f543f3af0e2f09f586b51ee56960e4a3877c53e94d9fcbef8cefd7c138ce9897609f3a3d05f8e7192cd6df58e51fdb41ccde6b6059f40fad7f6390d1ea19f6f7b9ef313fbc06978cf748eb6ffd5a0ce66f9d6fea746cf313a93feab8dbf69837b57fd66c8df6f31331ce3df245fd33723d8ff96ad378b07eba62cc33ea95c6d72839a19ed2b231c11f74042ec9eedb3266c8ef57bf33ecadf5b54ebb56df48e38b9a2c3de637adb7d48e8dfdfca50117abaf7edf58709f68fda0900bf4753be0ba8efea7f580fa3ce1e73f746e3cf78897042ec5f455fd292e5834fe285579b05ffb130d63077fc9a371847d49e7833abd14bcef3e1acf33fa81e63351b507f24feb35f1d4d8bafabf7eac36789f35bfa88cf58341d7b57ed15426bb7f024f2dce93f6a33add2e58e781fa315d2750dd1fc153b0f7745eaa5f3b61c63ca1f5f4659a34d678abd3d382757eaa5f1fc6dbf7ffffefbfb6df3b4ffa2f7bf1c54ff57fb33ffe5ffbfdb13ff1a7fecc9ffb2ffec25ffa2b7fed6ffcadbff3f7fec17ff58ffee90ffbbff967ffca2ffbd77ec5affa35ffc6affbb7fe9d7fef3ff80dbfe93ffaadc57ebfed3ff91dbfebf7fc67bfef0ffca13ff28d6f7df09def7df4c90f3efb11fb9d77ce916327aeb8c9cdeed89db85377e6cedd1777e12edd95bb76377e5cc8ef6edd9dbb770feeab7b744fee5bfdfbec5eb965f7daadb855b7e6deb875f7f6677ddd3bf7de7d701b6eb3defed16db96df7c9edb85db7e73ebb7d77e00eddd18ffdae71ad0bae73bd8b2eb9c1e55a1e3cd5982426a15207cb998e7feca7133aa5333aa72f7441977445d77443b77447f7f4405fe9919ee81b3dd3abeffb97e935add02aadd11b5aa7b7f48eded307daa04dfa485bb44d9f68877669effbfecfb44f07744847d4504b813aea2952a297196964cf8e8999e587beb5384d3cf3319ff0299ff1397fe10bbee42bbee61bbee53bbee7871ff2f3577ee427fec6cffc8a97f935aff02aaff11b5ee7b7fc8edff307dee0cd9ff67fe42ddee64fbcc3bbbcc79f799f0ff8908fea44d372e08e7bae9f873fdb9f07ae9fbfe2c509098b4891496639961339953339972f72f1f37eb9942bb9961bb9953bb99707f92a8ff224dfe4595ed513cbf2fa8ff12c2bb22a6bf246d6e52d277927efe5836cc8a67c942dd9964fb2f3a7fdbbb2279f655f0ee4508ea491568274527bb8241924cbf8e77cf1a31f8b2faed40c2b5c84e652eaffa632ffa5fcfdcfdf7ff92f64b3cec5</data> </image> </images> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp index 58912dd9..1d9a1393 100644 --- a/kommander/part/kommander_part.cpp +++ b/kommander/part/kommander_part.cpp @@ -33,13 +33,13 @@ typedef KParts::GenericFactory<KommanderPart> KommanderPartFactory; K_EXPORT_COMPONENT_FACTORY( libkommander_part, KommanderPartFactory ) -KommanderPart::KommanderPart( TQWidget *tqparentWidget, const char * /*widgetName*/, +KommanderPart::KommanderPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) : KParts::ReadOnlyPart(tqparent, name) { setInstance( KommanderPartFactory::instance() ); m_instance = 0L; - m_widget = new TQWidget(tqparentWidget); + m_widget = new TQWidget(parentWidget); setWidget(m_widget); m_layout = new TQGridLayout(m_widget); } diff --git a/kommander/part/kommander_part.h b/kommander/part/kommander_part.h index 5e9fc4f5..9000195c 100644 --- a/kommander/part/kommander_part.h +++ b/kommander/part/kommander_part.h @@ -26,7 +26,7 @@ class KommanderPart : public KParts::ReadOnlyPart Q_OBJECT TQ_OBJECT public: - KommanderPart(TQWidget *tqparentWidget, const char *widgetName, + KommanderPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList &args); virtual ~KommanderPart(); diff --git a/kommander/plugin/specialinformation.cpp b/kommander/plugin/specialinformation.cpp index bbfe308e..75faf9e0 100644 --- a/kommander/plugin/specialinformation.cpp +++ b/kommander/plugin/specialinformation.cpp @@ -400,7 +400,7 @@ void SpecialInformation::registerSpecials() insert(Kommander::dcopid, "dcopid", i18n("Returns DCOP identifier of current process. This is shorthand for <i>kmdr-executor-@pid</i>."), 0); - insert(Kommander::tqparentPid, "tqparentPid", + insert(Kommander::parentPid, "parentPid", i18n("Returns the pid of the tqparent Kommander window."), 0); insert(Kommander::debug, "debug(TQString text)", i18n("Writes <i>text</i> on stderr."), 1); diff --git a/kommander/plugin/specials.h b/kommander/plugin/specials.h index f7db7b6d..e6e9cf94 100644 --- a/kommander/plugin/specials.h +++ b/kommander/plugin/specials.h @@ -38,7 +38,7 @@ namespace DCOP namespace Kommander { - enum {widgetText, selectedWidgetText, null, pid, dcopid, tqparentPid, debug, + enum {widgetText, selectedWidgetText, null, pid, dcopid, parentPid, debug, echo, env, exec, expr, global, i18n, dialog, readSetting, setGlobal, writeSetting, dcop, switchBlock, execBegin, forBlock, forEachBlock, ifBlock, comment, createWidget, connect, disconnect, widgetExists, exit, Break, Continue, Return, execBackground, switchInternal}; //, tqfocusWidget}; } diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index 81613785..90a8ef28 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -407,8 +407,8 @@ static ParseNode f_createWidget(Parser* p, const ParameterList& params) { TQString widgetName = params[0].toString(); TQString widgetType = params[1].toString(); - TQString tqparentName = params[2].toString(); - KommanderWidget *widget = p->currentWidget()->widgetByName(tqparentName); + TQString parentName = params[2].toString(); + KommanderWidget *widget = p->currentWidget()->widgetByName(parentName); if (!widget) return ParseNode::error("unknown widget"); TQWidget *tqparent = dynamic_cast<TQWidget*>(widget->object()); @@ -944,7 +944,7 @@ void ParserData::registerStandardFunctions() registerFunction("dcop", Function(&f_dcop, ValueString, ValueString, ValueString, 3, 100)); registerFunction("dcopid", Function(&f_dcopid, ValueString, ValueNone, 0, 0)); registerFunction("pid", Function(&f_pid, ValueString, ValueNone, 0, 0)); - registerFunction("tqparentPid", Function(&f_parentPid, ValueString, ValueNone, 0, 0)); + registerFunction("parentPid", Function(&f_parentPid, ValueString, ValueNone, 0, 0)); registerFunction("dialog", Function(&f_dialog, ValueString, ValueString, ValueString, 1, 2)); registerFunction("exec", Function(&f_exec, ValueString, ValueString, ValueString, 1, 2)); registerFunction("execBackground", Function(&f_execBackground, ValueString, ValueString, ValueString, 1, 2)); diff --git a/kommander/widget/kommanderfunctions.cpp b/kommander/widget/kommanderfunctions.cpp index 7efe5b27..0ddcb951 100644 --- a/kommander/widget/kommanderfunctions.cpp +++ b/kommander/widget/kommanderfunctions.cpp @@ -52,7 +52,7 @@ TQString KommanderWidget::evalFunction(const TQString& function, const TQStringL return execCommand(args[0]); case Kommander::dcop: return DCOPQuery(args); - case Kommander::tqparentPid: + case Kommander::parentPid: return global("_PARENTPID").isEmpty() ? TQString().setNum(getppid()) : global("_PARENTPID"); case Kommander::env: return TQString(getenv(args[0].latin1())); diff --git a/kommander/widget/kommanderwidget.cpp b/kommander/widget/kommanderwidget.cpp index 2fc867f7..6c9540be 100644 --- a/kommander/widget/kommanderwidget.cpp +++ b/kommander/widget/kommanderwidget.cpp @@ -271,7 +271,7 @@ TQString KommanderWidget::DCOPQuery(const TQStringList& a_query) } if (!ok) { - printError(i18n("Unmatched tqparenthesis in DCOP call \'%1\'.").tqarg(a_query[2])); + printError(i18n("Unmatched parenthesis in DCOP call \'%1\'.").tqarg(a_query[2])); return TQString(); } const TQStringList argTypes = parseArgs(pTypes, ok); @@ -413,12 +413,12 @@ void KommanderWidget::printError(const TQString& a_error) const case KDialogBase::Yes: break; case KDialogBase::Cancel: - if (tqparentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING)) + if (parentDialog()->inherits(TQDIALOG_OBJECT_NAME_STRING)) { - tqparentDialog()->close(); + parentDialog()->close(); exit(-1); } - else if (tqparentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) + else if (parentDialog()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) kapp->quit(); } } @@ -557,16 +557,16 @@ KommanderWidget* KommanderWidget::widgetByName(const TQString& a_name) const KommanderWidget* KommanderWidget::parseWidget(const TQString& widgetName) const { - if (TQString(tqparentDialog()->name()) == widgetName) - return dynamic_cast <KommanderWidget*>(tqparentDialog()); + if (TQString(parentDialog()->name()) == widgetName) + return dynamic_cast <KommanderWidget*>(parentDialog()); TQCString s = widgetName.lower() == "self" ? m_thisObject->name() : widgetName.latin1(); - TQObject* childObj = tqparentDialog()->child(s); + TQObject* childObj = parentDialog()->child(s); /* if (!childObj) { Parser parser(internalParserData()); TQString variableValue = parser.variable(widgetName).toString(); s = variableValue.lower() == "self" ? m_thisObject->name() : variableValue.latin1(); - childObj = tqparentDialog()->child(s); + childObj = parentDialog()->child(s); }*/ return dynamic_cast <KommanderWidget*>(childObj); } @@ -579,7 +579,7 @@ TQStringList KommanderWidget::parseFunction(const TQString& group, const TQStrin TQString arg = parseBrackets(s, from, ok); if (!ok) { - printError(i18n("Unmatched tqparenthesis after \'%1\'.").tqarg(function)); + printError(i18n("Unmatched parenthesis after \'%1\'.").tqarg(function)); return TQString(); } const TQStringList args = parseArgs(arg, ok); @@ -649,7 +649,7 @@ TQString KommanderWidget::substituteVariable(TQString text, TQString variable, T -TQWidget* KommanderWidget::tqparentDialog() const +TQWidget* KommanderWidget::parentDialog() const { TQObject *superParent = m_thisObject; while (superParent->tqparent()) @@ -722,7 +722,7 @@ ParserData* KommanderWidget::internalParserData() const TQString KommanderWidget::fileName() { - KommanderWindow* window = dynamic_cast<KommanderWindow*>(tqparentDialog()); + KommanderWindow* window = dynamic_cast<KommanderWindow*>(parentDialog()); if (window) return TQString(window->fileName()); else diff --git a/kommander/widget/kommanderwidget.h b/kommander/widget/kommanderwidget.h index 2087d086..bb223f3d 100644 --- a/kommander/widget/kommanderwidget.h +++ b/kommander/widget/kommanderwidget.h @@ -141,7 +141,7 @@ protected: // Parse given identifier as widget name KommanderWidget* parseWidget(const TQString& name) const; // Return tqparent dialog of this widget - TQWidget* tqparentDialog() const; + TQWidget* parentDialog() const; TQString substituteVariable(TQString text, TQString variable, TQString value) const; ParserData* internalParserData() const; diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp index e5de817b..fb3c7697 100644 --- a/kommander/widgets/richtexteditor.cpp +++ b/kommander/widgets/richtexteditor.cpp @@ -106,7 +106,7 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) connect(m_alignGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(textAlign(int))); connect(m_textedit, TQT_SIGNAL(currentFontChanged(const TQFont &)), this, TQT_SLOT(fontChanged(const TQFont &))); - connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(tqalignmentChanged(int))); + connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(alignmentChanged(int))); connect(m_textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); @@ -196,7 +196,7 @@ void RichTextEditor::fontChanged(const TQFont &a_font) m_buttonTextUnder->setOn(a_font.underline()); } -void RichTextEditor::tqalignmentChanged(int a_tqalignment) +void RichTextEditor::alignmentChanged(int a_tqalignment) { if((a_tqalignment == AlignAuto) || (a_tqalignment & AlignLeft)) m_buttonTextLeft->setOn(true); diff --git a/kommander/widgets/richtexteditor.h b/kommander/widgets/richtexteditor.h index 31347e96..bb55741e 100644 --- a/kommander/widgets/richtexteditor.h +++ b/kommander/widgets/richtexteditor.h @@ -63,7 +63,7 @@ public slots: void textUnder(bool); void textItalic(bool); void fontChanged(const TQFont &); - void tqalignmentChanged(int); + void alignmentChanged(int); virtual void populate(); signals: void widgetOpened(); diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp index 4056431e..f4d21629 100644 --- a/kommander/widgets/table.cpp +++ b/kommander/widgets/table.cpp @@ -167,7 +167,7 @@ void Table::setCellText(int row, int col, const TQString& text) { KommanderWidget *w = widgetByName(widget->name()); if (w) - widget->reparent(tqparentDialog(), TQPoint(0,0)); + widget->reparent(parentDialog(), TQPoint(0,0)); } setText(row, col, text); endEdit(row, col, false, false); |