diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | e7366c97c998679efa80cf61c88e64a11a3d3c33 (patch) | |
| tree | a161d2940165f6cc47c05f0271ad8e5f64ffe6e8 /kpovmodeler | |
| parent | da4be7880ff1de6415ab6256afd2514e64f5fa2e (diff) | |
| download | tdegraphics-e7366c97c998679efa80cf61c88e64a11a3d3c33.tar.gz tdegraphics-e7366c97c998679efa80cf61c88e64a11a3d3c33.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kpovmodeler')
389 files changed, 1109 insertions, 1109 deletions
diff --git a/kpovmodeler/baseinsertrules.xml b/kpovmodeler/baseinsertrules.xml index ad1917d9..24aa7dd5 100644 --- a/kpovmodeler/baseinsertrules.xml +++ b/kpovmodeler/baseinsertrules.xml @@ -166,7 +166,7 @@ </rule> <rule> <group name="ObjectModifier"/> - <not><tqparent><class name="Mesh"/></tqparent></not> + <not><parent><class name="Mesh"/></parent></not> </rule> </targetclass> diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp index d13ddf06..18af4c37 100644 --- a/kpovmodeler/pmactions.cpp +++ b/kpovmodeler/pmactions.cpp @@ -34,8 +34,8 @@ class PMComboBox : public TQComboBox { public: - PMComboBox( TQWidget* tqparent, const char* name = 0 ) - : TQComboBox( tqparent, name ) + PMComboBox( TQWidget* parent, const char* name = 0 ) + : TQComboBox( parent, name ) { } @@ -52,8 +52,8 @@ public: }; PMComboAction::PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member, - TQObject* tqparent, const char* name ) - : KAction( text, accel, tqparent, name ) + TQObject* parent, const char* name ) + : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; @@ -120,8 +120,8 @@ void PMComboAction::unplug( TQWidget *w ) class PMToolBarLabel : public TQToolButton { public: - PMToolBarLabel( const TQString& text, TQWidget* tqparent = 0, const char* name = 0 ) - : TQToolButton( tqparent, name ) + PMToolBarLabel( const TQString& text, TQWidget* parent = 0, const char* name = 0 ) + : TQToolButton( parent, name ) { setText( text ); } @@ -143,8 +143,8 @@ protected: } }; -PMLabelAction::PMLabelAction( const TQString &text, TQObject *tqparent, const char *name ) - : KAction( text, 0, tqparent, name ) +PMLabelAction::PMLabelAction( const TQString &text, TQObject *parent, const char *name ) + : KAction( text, 0, parent, name ) { m_button = 0; } @@ -193,8 +193,8 @@ void PMLabelAction::unplug( TQWidget *widget ) PMSpinBoxAction::PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member, - TQObject* tqparent, const char* name ) - : KAction( text, accel, tqparent, name ) + TQObject* parent, const char* name ) + : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; diff --git a/kpovmodeler/pmactions.h b/kpovmodeler/pmactions.h index 4e058273..bd397015 100644 --- a/kpovmodeler/pmactions.h +++ b/kpovmodeler/pmactions.h @@ -38,7 +38,7 @@ class PMComboAction : public KAction Q_OBJECT TQ_OBJECT public: - PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* tqparent, const char* name ); + PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* parent, const char* name ); ~PMComboAction( ); virtual int plug( TQWidget* w, int index = -1 ); @@ -70,7 +70,7 @@ class PMLabelAction : public KAction Q_OBJECT TQ_OBJECT public: - PMLabelAction( const TQString &text, TQObject *tqparent = 0, const char *name = 0 ); + PMLabelAction( const TQString &text, TQObject *parent = 0, const char *name = 0 ); virtual int plug( TQWidget *widget, int index = -1 ); virtual void unplug( TQWidget *widget ); @@ -88,7 +88,7 @@ class PMSpinBoxAction : public KAction Q_OBJECT TQ_OBJECT public: - PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* tqparent, const char* name ); + PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* parent, const char* name ); ~PMSpinBoxAction( ); virtual int plug( TQWidget* w, int index = -1 ); diff --git a/kpovmodeler/pmaddcommand.cpp b/kpovmodeler/pmaddcommand.cpp index 5b258312..2eb78126 100644 --- a/kpovmodeler/pmaddcommand.cpp +++ b/kpovmodeler/pmaddcommand.cpp @@ -26,11 +26,11 @@ #include <klocale.h> -PMAddCommand::PMAddCommand( PMObject* obj, PMObject* tqparent, PMObject* after ) +PMAddCommand::PMAddCommand( PMObject* obj, PMObject* parent, PMObject* after ) : PMCommand( i18n( "Add New %1" ).tqarg( obj->description( ) ) ) { m_objects.append( obj ); - m_pParent = tqparent; + m_pParent = parent; m_pAfter = after; m_executed = false; m_firstExecution = true; @@ -38,12 +38,12 @@ PMAddCommand::PMAddCommand( PMObject* obj, PMObject* tqparent, PMObject* after ) m_pParentChangeMemento = 0; } -PMAddCommand::PMAddCommand( const PMObjectList& list, PMObject* tqparent, +PMAddCommand::PMAddCommand( const PMObjectList& list, PMObject* parent, PMObject* after ) : PMCommand( i18n( "Add Objects" ) ) { m_objects = list; - m_pParent = tqparent; + m_pParent = parent; m_pAfter = after; m_executed = false; m_firstExecution = true; @@ -116,8 +116,8 @@ void PMAddCommand::execute( PMCommandManager* theManager ) for( ; links.current( ); ++links ) { PMObject* l = links.current( ); - if( l->tqparent( ) ) - l->tqparent( )->takeChild( l ); + if( l->parent( ) ) + l->parent( )->takeChild( l ); else m_objects.removeRef( l ); m_insertErrors.append( l ); @@ -204,8 +204,8 @@ void PMAddCommand::undo( PMCommandManager* theManager ) // signal has to be emitted before the item is removed theManager->cmdObjectChanged( obj, PMCRemove ); - if( obj->tqparent( ) ) - obj->tqparent( )->takeChild( obj ); + if( obj->parent( ) ) + obj->parent( )->takeChild( obj ); } if( m_pParentChangeMemento ) diff --git a/kpovmodeler/pmaddcommand.h b/kpovmodeler/pmaddcommand.h index a5759ea8..51beec31 100644 --- a/kpovmodeler/pmaddcommand.h +++ b/kpovmodeler/pmaddcommand.h @@ -38,22 +38,22 @@ public: /** * Command that adds a new PMObject. * - * The object obj will be inserted as child of tqparent after + * The object obj will be inserted as child of parent after * the object after. * * If after is 0, the object becomes the first child. */ - PMAddCommand( PMObject* obj, PMObject* tqparent, PMObject* after ); + PMAddCommand( PMObject* obj, PMObject* parent, PMObject* after ); /** * Command that adds a list of new PMObjects. * - * The object in the list will be inserted as tqchildren of tqparent after + * The object in the list will be inserted as tqchildren of parent after * the object after. * * If after is 0, the objects will be inserted as first tqchildren. */ - PMAddCommand( const PMObjectList& list, PMObject* tqparent, PMObject* after ); + PMAddCommand( const PMObjectList& list, PMObject* parent, PMObject* after ); /** * Deletes the command. The inserted object will be deleted, if the command was not executed (or undo-ed) */ diff --git a/kpovmodeler/pmbicubicpatch.cpp b/kpovmodeler/pmbicubicpatch.cpp index df66ec52..dd281ceb 100644 --- a/kpovmodeler/pmbicubicpatch.cpp +++ b/kpovmodeler/pmbicubicpatch.cpp @@ -365,9 +365,9 @@ PMVector PMBicubicPatch::uvVector( int i ) const return PMVector( 0.0, 0.0 ); } -PMDialogEditBase* PMBicubicPatch::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMBicubicPatch::editWidget( TQWidget* parent ) const { - return new PMBicubicPatchEdit( tqparent ); + return new PMBicubicPatchEdit( parent ); } void PMBicubicPatch::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmbicubicpatch.h b/kpovmodeler/pmbicubicpatch.h index 2c1a623b..54baae43 100644 --- a/kpovmodeler/pmbicubicpatch.h +++ b/kpovmodeler/pmbicubicpatch.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMBicubicPatchEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmbicubicpatchedit.cpp b/kpovmodeler/pmbicubicpatchedit.cpp index 64cb3db8..fe91f1e0 100644 --- a/kpovmodeler/pmbicubicpatchedit.cpp +++ b/kpovmodeler/pmbicubicpatchedit.cpp @@ -29,8 +29,8 @@ #include <tqcheckbox.h> #include <klocale.h> -PMBicubicPatchEdit::PMBicubicPatchEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBicubicPatchEdit::PMBicubicPatchEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmbicubicpatchedit.h b/kpovmodeler/pmbicubicpatchedit.h index cb27810f..bdf2a971 100644 --- a/kpovmodeler/pmbicubicpatchedit.h +++ b/kpovmodeler/pmbicubicpatchedit.h @@ -43,9 +43,9 @@ class PMBicubicPatchEdit : public PMGraphicalObjectEdit typedef PMGraphicalObjectEdit Base; public: /** - * Creates a PMBicubicPatchEdit with tqparent and name + * Creates a PMBicubicPatchEdit with parent and name */ - PMBicubicPatchEdit( TQWidget* tqparent, const char* name = 0 ); + PMBicubicPatchEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmblendmapmodifiers.cpp b/kpovmodeler/pmblendmapmodifiers.cpp index 22511200..e28fa7fb 100644 --- a/kpovmodeler/pmblendmapmodifiers.cpp +++ b/kpovmodeler/pmblendmapmodifiers.cpp @@ -236,9 +236,9 @@ void PMBlendMapModifiers::setWaveFormType( PMWaveFormType c ) } } -PMDialogEditBase* PMBlendMapModifiers::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMBlendMapModifiers::editWidget( TQWidget* parent ) const { - return new PMBlendMapModifiersEdit( tqparent ); + return new PMBlendMapModifiersEdit( parent ); } void PMBlendMapModifiers::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmblendmapmodifiers.h b/kpovmodeler/pmblendmapmodifiers.h index fb7d2623..be5a863e 100644 --- a/kpovmodeler/pmblendmapmodifiers.h +++ b/kpovmodeler/pmblendmapmodifiers.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMBlendMapModifiersEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmblendmapmodifiers" ); } diff --git a/kpovmodeler/pmblendmapmodifiersedit.cpp b/kpovmodeler/pmblendmapmodifiersedit.cpp index b18f3eed..fd443623 100644 --- a/kpovmodeler/pmblendmapmodifiersedit.cpp +++ b/kpovmodeler/pmblendmapmodifiersedit.cpp @@ -37,8 +37,8 @@ #include <kdialog.h> #include <kfiledialog.h> -PMBlendMapModifiersEdit::PMBlendMapModifiersEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBlendMapModifiersEdit::PMBlendMapModifiersEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmblendmapmodifiersedit.h b/kpovmodeler/pmblendmapmodifiersedit.h index db3c764e..69ec17dd 100644 --- a/kpovmodeler/pmblendmapmodifiersedit.h +++ b/kpovmodeler/pmblendmapmodifiersedit.h @@ -47,9 +47,9 @@ class PMBlendMapModifiersEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMBlendMapModifiersEdit with tqparent and name + * Creates a PMBlendMapModifiersEdit with parent and name */ - PMBlendMapModifiersEdit( TQWidget* tqparent, const char* name = 0 ); + PMBlendMapModifiersEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmblob.cpp b/kpovmodeler/pmblob.cpp index 5dc5bb6c..317c18d7 100644 --- a/kpovmodeler/pmblob.cpp +++ b/kpovmodeler/pmblob.cpp @@ -139,9 +139,9 @@ void PMBlob::setHierarchy( bool h ) } } -PMDialogEditBase* PMBlob::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMBlob::editWidget( TQWidget* parent ) const { - return new PMBlobEdit( tqparent ); + return new PMBlobEdit( parent ); } void PMBlob::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmblob.h b/kpovmodeler/pmblob.h index 801e5338..6bdbef31 100644 --- a/kpovmodeler/pmblob.h +++ b/kpovmodeler/pmblob.h @@ -63,7 +63,7 @@ public: /** * Returns a new @ref PMBlobEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmblobcylinder.cpp b/kpovmodeler/pmblobcylinder.cpp index 217a5743..114f4fa0 100644 --- a/kpovmodeler/pmblobcylinder.cpp +++ b/kpovmodeler/pmblobcylinder.cpp @@ -160,9 +160,9 @@ void PMBlobCylinder::setStrength( double s ) } } -PMDialogEditBase* PMBlobCylinder::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMBlobCylinder::editWidget( TQWidget* parent ) const { - return new PMBlobCylinderEdit( tqparent ); + return new PMBlobCylinderEdit( parent ); } void PMBlobCylinder::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmblobcylinder.h b/kpovmodeler/pmblobcylinder.h index 8959cee9..a07df1f6 100644 --- a/kpovmodeler/pmblobcylinder.h +++ b/kpovmodeler/pmblobcylinder.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMBlobCylinderEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view and dialog view */ diff --git a/kpovmodeler/pmblobcylinderedit.cpp b/kpovmodeler/pmblobcylinderedit.cpp index f3e702d0..836d7d72 100644 --- a/kpovmodeler/pmblobcylinderedit.cpp +++ b/kpovmodeler/pmblobcylinderedit.cpp @@ -26,8 +26,8 @@ #include <klocale.h> #include <tqcheckbox.h> -PMBlobCylinderEdit::PMBlobCylinderEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBlobCylinderEdit::PMBlobCylinderEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmblobcylinderedit.h b/kpovmodeler/pmblobcylinderedit.h index dbe24134..103d5a4f 100644 --- a/kpovmodeler/pmblobcylinderedit.h +++ b/kpovmodeler/pmblobcylinderedit.h @@ -37,9 +37,9 @@ class PMBlobCylinderEdit : public PMDetailObjectEdit typedef PMDetailObjectEdit Base; public: /** - * Creates a PMBlobCylinderEdit with tqparent and name + * Creates a PMBlobCylinderEdit with parent and name */ - PMBlobCylinderEdit( TQWidget* tqparent, const char* name = 0 ); + PMBlobCylinderEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmblobedit.cpp b/kpovmodeler/pmblobedit.cpp index b7dc2034..a38d9639 100644 --- a/kpovmodeler/pmblobedit.cpp +++ b/kpovmodeler/pmblobedit.cpp @@ -25,8 +25,8 @@ #include <tqcheckbox.h> #include <klocale.h> -PMBlobEdit::PMBlobEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBlobEdit::PMBlobEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmblobedit.h b/kpovmodeler/pmblobedit.h index bada56da..9e389964 100644 --- a/kpovmodeler/pmblobedit.h +++ b/kpovmodeler/pmblobedit.h @@ -40,9 +40,9 @@ class PMBlobEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMBlobEdit with tqparent and name + * Creates a PMBlobEdit with parent and name */ - PMBlobEdit( TQWidget* tqparent, const char* name = 0 ); + PMBlobEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmblobsphere.cpp b/kpovmodeler/pmblobsphere.cpp index fc8af594..70dcf06c 100644 --- a/kpovmodeler/pmblobsphere.cpp +++ b/kpovmodeler/pmblobsphere.cpp @@ -107,9 +107,9 @@ void PMBlobSphere::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMBlobSphere::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMBlobSphere::editWidget( TQWidget* parent ) const { - return new PMBlobSphereEdit( tqparent ); + return new PMBlobSphereEdit( parent ); } void PMBlobSphere::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmblobsphere.h b/kpovmodeler/pmblobsphere.h index 4ae57e5c..e734e399 100644 --- a/kpovmodeler/pmblobsphere.h +++ b/kpovmodeler/pmblobsphere.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMBlobSphereEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmblobsphereedit.cpp b/kpovmodeler/pmblobsphereedit.cpp index 6b569b93..6bf37b26 100644 --- a/kpovmodeler/pmblobsphereedit.cpp +++ b/kpovmodeler/pmblobsphereedit.cpp @@ -24,8 +24,8 @@ #include <tqlabel.h> #include <klocale.h> -PMBlobSphereEdit::PMBlobSphereEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBlobSphereEdit::PMBlobSphereEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmblobsphereedit.h b/kpovmodeler/pmblobsphereedit.h index d4f18058..2e58bb06 100644 --- a/kpovmodeler/pmblobsphereedit.h +++ b/kpovmodeler/pmblobsphereedit.h @@ -38,9 +38,9 @@ class PMBlobSphereEdit : public PMDetailObjectEdit typedef PMDetailObjectEdit Base; public: /** - * Creates a PMBlobSphereEdit with tqparent and name + * Creates a PMBlobSphereEdit with parent and name */ - PMBlobSphereEdit( TQWidget* tqparent, const char* name = 0 ); + PMBlobSphereEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmboundedby.cpp b/kpovmodeler/pmboundedby.cpp index 3e123d29..467129e8 100644 --- a/kpovmodeler/pmboundedby.cpp +++ b/kpovmodeler/pmboundedby.cpp @@ -91,9 +91,9 @@ void PMBoundedBy::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMBoundedBy::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMBoundedBy::editWidget( TQWidget* parent ) const { - return new PMBoundedByEdit( tqparent ); + return new PMBoundedByEdit( parent ); } void PMBoundedBy::childRemoved( PMObject* o ) diff --git a/kpovmodeler/pmboundedby.h b/kpovmodeler/pmboundedby.h index 997cef0f..256dc5f5 100644 --- a/kpovmodeler/pmboundedby.h +++ b/kpovmodeler/pmboundedby.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMBoundedByEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmboundedbyedit.cpp b/kpovmodeler/pmboundedbyedit.cpp index db0b7b01..8a41fa52 100644 --- a/kpovmodeler/pmboundedbyedit.cpp +++ b/kpovmodeler/pmboundedbyedit.cpp @@ -23,8 +23,8 @@ #include <tqlabel.h> #include <klocale.h> -PMBoundedByEdit::PMBoundedByEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBoundedByEdit::PMBoundedByEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmboundedbyedit.h b/kpovmodeler/pmboundedbyedit.h index f575fbb8..ce01d98d 100644 --- a/kpovmodeler/pmboundedbyedit.h +++ b/kpovmodeler/pmboundedbyedit.h @@ -39,9 +39,9 @@ class PMBoundedByEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMBoundedByEdit with tqparent and name + * Creates a PMBoundedByEdit with parent and name */ - PMBoundedByEdit( TQWidget* tqparent, const char* name = 0 ); + PMBoundedByEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmbox.cpp b/kpovmodeler/pmbox.cpp index 0f2bedb3..6ecc2c3c 100644 --- a/kpovmodeler/pmbox.cpp +++ b/kpovmodeler/pmbox.cpp @@ -114,9 +114,9 @@ void PMBox::setCorner2( const PMVector& p ) } } -PMDialogEditBase* PMBox::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMBox::editWidget( TQWidget* parent ) const { - return new PMBoxEdit( tqparent ); + return new PMBoxEdit( parent ); } void PMBox::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmbox.h b/kpovmodeler/pmbox.h index bf499042..7896b779 100644 --- a/kpovmodeler/pmbox.h +++ b/kpovmodeler/pmbox.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMBoxEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmboxedit.cpp b/kpovmodeler/pmboxedit.cpp index c13da80d..6b6a2f2a 100644 --- a/kpovmodeler/pmboxedit.cpp +++ b/kpovmodeler/pmboxedit.cpp @@ -24,8 +24,8 @@ #include <tqlabel.h> #include <klocale.h> -PMBoxEdit::PMBoxEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBoxEdit::PMBoxEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmboxedit.h b/kpovmodeler/pmboxedit.h index f9f0bf6d..9368bfbd 100644 --- a/kpovmodeler/pmboxedit.h +++ b/kpovmodeler/pmboxedit.h @@ -39,9 +39,9 @@ class PMBoxEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMBoxEdit with tqparent and name + * Creates a PMBoxEdit with parent and name */ - PMBoxEdit( TQWidget* tqparent, const char* name = 0 ); + PMBoxEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmbumpmap.cpp b/kpovmodeler/pmbumpmap.cpp index ebdabab5..5c08040f 100644 --- a/kpovmodeler/pmbumpmap.cpp +++ b/kpovmodeler/pmbumpmap.cpp @@ -336,9 +336,9 @@ void PMBumpMap::setBumpSize( double c ) } } -PMDialogEditBase* PMBumpMap::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMBumpMap::editWidget( TQWidget* parent ) const { - return new PMBumpMapEdit( tqparent ); + return new PMBumpMapEdit( parent ); } void PMBumpMap::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmbumpmap.h b/kpovmodeler/pmbumpmap.h index 64fb632f..ade1c1cd 100644 --- a/kpovmodeler/pmbumpmap.h +++ b/kpovmodeler/pmbumpmap.h @@ -87,7 +87,7 @@ public: /** * Returns a new @ref PMBumpMapEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Gets the bitmap type diff --git a/kpovmodeler/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp index 011e9873..5a4bf298 100644 --- a/kpovmodeler/pmbumpmapedit.cpp +++ b/kpovmodeler/pmbumpmapedit.cpp @@ -38,8 +38,8 @@ #include <kfiledialog.h> #include <kiconloader.h> -PMBumpMapEdit::PMBumpMapEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBumpMapEdit::PMBumpMapEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmbumpmapedit.h b/kpovmodeler/pmbumpmapedit.h index 8404229b..0c29ca67 100644 --- a/kpovmodeler/pmbumpmapedit.h +++ b/kpovmodeler/pmbumpmapedit.h @@ -49,9 +49,9 @@ class PMBumpMapEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMBumpMapEdit with tqparent and name + * Creates a PMBumpMapEdit with parent and name */ - PMBumpMapEdit( TQWidget* tqparent, const char* name = 0 ); + PMBumpMapEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); /** */ diff --git a/kpovmodeler/pmcamera.cpp b/kpovmodeler/pmcamera.cpp index 697628a4..e65b8341 100644 --- a/kpovmodeler/pmcamera.cpp +++ b/kpovmodeler/pmcamera.cpp @@ -443,9 +443,9 @@ void PMCamera::setExportPovray( bool ex ) } } -PMDialogEditBase* PMCamera::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMCamera::editWidget( TQWidget* parent ) const { - return new PMCameraEdit( tqparent ); + return new PMCameraEdit( parent ); } void PMCamera::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmcamera.h b/kpovmodeler/pmcamera.h index 1c93c718..e0d1206e 100644 --- a/kpovmodeler/pmcamera.h +++ b/kpovmodeler/pmcamera.h @@ -70,7 +70,7 @@ public: /** * Returns a new @ref PMCameraEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmcamera" ); } diff --git a/kpovmodeler/pmcameraedit.cpp b/kpovmodeler/pmcameraedit.cpp index 1376efb9..23db4104 100644 --- a/kpovmodeler/pmcameraedit.cpp +++ b/kpovmodeler/pmcameraedit.cpp @@ -30,8 +30,8 @@ #include <kmessagebox.h> -PMCameraEdit::PMCameraEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMCameraEdit::PMCameraEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmcameraedit.h b/kpovmodeler/pmcameraedit.h index 33b9c39b..1ca18eb7 100644 --- a/kpovmodeler/pmcameraedit.h +++ b/kpovmodeler/pmcameraedit.h @@ -45,9 +45,9 @@ class PMCameraEdit : public PMNamedObjectEdit typedef PMNamedObjectEdit Base; public: /** - * Creates a PMCameraEdit with tqparent and name + * Creates a PMCameraEdit with parent and name */ - PMCameraEdit( TQWidget* tqparent, const char* name = 0 ); + PMCameraEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmclippedby.cpp b/kpovmodeler/pmclippedby.cpp index 529e0962..b1499d0c 100644 --- a/kpovmodeler/pmclippedby.cpp +++ b/kpovmodeler/pmclippedby.cpp @@ -91,9 +91,9 @@ void PMClippedBy::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMClippedBy::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMClippedBy::editWidget( TQWidget* parent ) const { - return new PMClippedByEdit( tqparent ); + return new PMClippedByEdit( parent ); } void PMClippedBy::childRemoved( PMObject* o ) diff --git a/kpovmodeler/pmclippedby.h b/kpovmodeler/pmclippedby.h index 6c9d21a1..252a7db2 100644 --- a/kpovmodeler/pmclippedby.h +++ b/kpovmodeler/pmclippedby.h @@ -63,7 +63,7 @@ public: /** * Returns a new @ref PMClippedByEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmclippedbyedit.cpp b/kpovmodeler/pmclippedbyedit.cpp index 486b58f2..8afa0285 100644 --- a/kpovmodeler/pmclippedbyedit.cpp +++ b/kpovmodeler/pmclippedbyedit.cpp @@ -23,8 +23,8 @@ #include <tqlabel.h> #include <klocale.h> -PMClippedByEdit::PMClippedByEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMClippedByEdit::PMClippedByEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmclippedbyedit.h b/kpovmodeler/pmclippedbyedit.h index 9050f406..53eef1d8 100644 --- a/kpovmodeler/pmclippedbyedit.h +++ b/kpovmodeler/pmclippedbyedit.h @@ -39,9 +39,9 @@ class PMClippedByEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMClippedByEdit with tqparent and name + * Creates a PMClippedByEdit with parent and name */ - PMClippedByEdit( TQWidget* tqparent, const char* name = 0 ); + PMClippedByEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmcoloredit.cpp b/kpovmodeler/pmcoloredit.cpp index 1c282f78..f34ee47d 100644 --- a/kpovmodeler/pmcoloredit.cpp +++ b/kpovmodeler/pmcoloredit.cpp @@ -24,8 +24,8 @@ #include <tqcolor.h> #include <kdialog.h> -PMColorEdit::PMColorEdit( bool filterAndTransmit, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMColorEdit::PMColorEdit( bool filterAndTransmit, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_bFilterAndTransmit = filterAndTransmit; diff --git a/kpovmodeler/pmcoloredit.h b/kpovmodeler/pmcoloredit.h index 4ef27e00..3be1e347 100644 --- a/kpovmodeler/pmcoloredit.h +++ b/kpovmodeler/pmcoloredit.h @@ -42,7 +42,7 @@ public: /** * Creates an edit widget for rgbft colors. */ - PMColorEdit( bool filterAndTransmit, TQWidget* tqparent, const char* name = 0 ); + PMColorEdit( bool filterAndTransmit, TQWidget* parent, const char* name = 0 ); /** * Sets the displayed color diff --git a/kpovmodeler/pmcolorsettings.cpp b/kpovmodeler/pmcolorsettings.cpp index fbcb2066..e8518312 100644 --- a/kpovmodeler/pmcolorsettings.cpp +++ b/kpovmodeler/pmcolorsettings.cpp @@ -25,8 +25,8 @@ #include <kcolorbutton.h> #include <klocale.h> -PMColorSettings::PMColorSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMColorSettings::PMColorSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQHBoxLayout* htqlayout; TQVBoxLayout* vtqlayout; diff --git a/kpovmodeler/pmcolorsettings.h b/kpovmodeler/pmcolorsettings.h index 703bf6cf..7ceb2ce7 100644 --- a/kpovmodeler/pmcolorsettings.h +++ b/kpovmodeler/pmcolorsettings.h @@ -37,7 +37,7 @@ public: /** * Default constructor */ - PMColorSettings( TQWidget* tqparent, const char* name = 0 ); + PMColorSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmcomment.cpp b/kpovmodeler/pmcomment.cpp index 7d12dfbc..3f659682 100644 --- a/kpovmodeler/pmcomment.cpp +++ b/kpovmodeler/pmcomment.cpp @@ -143,9 +143,9 @@ void PMComment::readAttributes( const PMXMLHelper& h ) m_text = e.toText( ).data( ); } -PMDialogEditBase* PMComment::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMComment::editWidget( TQWidget* parent ) const { - return new PMCommentEdit( tqparent ); + return new PMCommentEdit( parent ); } void PMComment::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmcomment.h b/kpovmodeler/pmcomment.h index 64514452..832863bc 100644 --- a/kpovmodeler/pmcomment.h +++ b/kpovmodeler/pmcomment.h @@ -75,7 +75,7 @@ public: virtual void readAttributes( const PMXMLHelper& h ); /** */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmcomment" ); } /** */ diff --git a/kpovmodeler/pmcommentedit.cpp b/kpovmodeler/pmcommentedit.cpp index b9f5daac..92cdbfa3 100644 --- a/kpovmodeler/pmcommentedit.cpp +++ b/kpovmodeler/pmcommentedit.cpp @@ -23,8 +23,8 @@ #include <tqmultilineedit.h> #include <kglobalsettings.h> -PMCommentEdit::PMCommentEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMCommentEdit::PMCommentEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmcommentedit.h b/kpovmodeler/pmcommentedit.h index da44246b..4b5bedf9 100644 --- a/kpovmodeler/pmcommentedit.h +++ b/kpovmodeler/pmcommentedit.h @@ -39,9 +39,9 @@ class PMCommentEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMCommentEdit with tqparent and name + * Creates a PMCommentEdit with parent and name */ - PMCommentEdit( TQWidget* tqparent, const char* name = 0 ); + PMCommentEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmcompositeobject.cpp b/kpovmodeler/pmcompositeobject.cpp index e9369ea4..3699e716 100644 --- a/kpovmodeler/pmcompositeobject.cpp +++ b/kpovmodeler/pmcompositeobject.cpp @@ -96,7 +96,7 @@ PMObject* PMCompositeObject::tqchildAt( uint index ) const int PMCompositeObject::findChild( PMObject* o ) { - if( o->tqparent( ) != this ) + if( o->parent( ) != this ) return -1; PMObject* tmp; diff --git a/kpovmodeler/pmcompositeobject.h b/kpovmodeler/pmcompositeobject.h index 0d7ae6df..50298236 100644 --- a/kpovmodeler/pmcompositeobject.h +++ b/kpovmodeler/pmcompositeobject.h @@ -71,7 +71,7 @@ public: * Returns true if the object contains the child object o */ virtual bool containsChild( PMObject* o ) const - { return ( ( PMObject* )this == o->tqparent( ) ); } + { return ( ( PMObject* )this == o->parent( ) ); } /** * Returns the index of the object or -1 if not found */ @@ -135,7 +135,7 @@ public: protected: /** * Adds num to the number of selected objects in this object and all - * tqparent objects. num can be negative. + * parent objects. num can be negative. */ virtual void adjustSelectedChildren( int num ); diff --git a/kpovmodeler/pmcone.cpp b/kpovmodeler/pmcone.cpp index 3a90d131..014fbc0f 100644 --- a/kpovmodeler/pmcone.cpp +++ b/kpovmodeler/pmcone.cpp @@ -176,9 +176,9 @@ void PMCone::setOpen( bool op ) } } -PMDialogEditBase* PMCone::editWidget( TQWidget * tqparent ) const +PMDialogEditBase* PMCone::editWidget( TQWidget * parent ) const { - return new PMConeEdit( tqparent ); + return new PMConeEdit( parent ); } void PMCone::restoreMemento( PMMemento * s ) diff --git a/kpovmodeler/pmcone.h b/kpovmodeler/pmcone.h index aa452b64..25dacfd5 100644 --- a/kpovmodeler/pmcone.h +++ b/kpovmodeler/pmcone.h @@ -71,7 +71,7 @@ public: /** * Returns a new @ref PMConeEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view and dialog view */ diff --git a/kpovmodeler/pmconeedit.cpp b/kpovmodeler/pmconeedit.cpp index 006add43..75a07855 100644 --- a/kpovmodeler/pmconeedit.cpp +++ b/kpovmodeler/pmconeedit.cpp @@ -26,8 +26,8 @@ #include <klocale.h> #include <tqcheckbox.h> -PMConeEdit::PMConeEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMConeEdit::PMConeEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmconeedit.h b/kpovmodeler/pmconeedit.h index d5210124..88c2601a 100644 --- a/kpovmodeler/pmconeedit.h +++ b/kpovmodeler/pmconeedit.h @@ -39,9 +39,9 @@ class PMConeEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMConeEdit with tqparent and name + * Creates a PMConeEdit with parent and name */ - PMConeEdit( TQWidget* tqparent, const char* name = 0 ); + PMConeEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmcsg.cpp b/kpovmodeler/pmcsg.cpp index c8316a53..66532ac6 100644 --- a/kpovmodeler/pmcsg.cpp +++ b/kpovmodeler/pmcsg.cpp @@ -169,9 +169,9 @@ void PMCSG::setCSGType( const PMCSGType t ) } } -PMDialogEditBase* PMCSG::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMCSG::editWidget( TQWidget* parent ) const { - return new PMCSGEdit( tqparent ); + return new PMCSGEdit( parent ); } void PMCSG::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmcsg.h b/kpovmodeler/pmcsg.h index 3424a6c7..36184883 100644 --- a/kpovmodeler/pmcsg.h +++ b/kpovmodeler/pmcsg.h @@ -74,7 +74,7 @@ public: /** * Returns a new @ref PMCSGEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmcsgedit.cpp b/kpovmodeler/pmcsgedit.cpp index bdbbe3da..014eb09b 100644 --- a/kpovmodeler/pmcsgedit.cpp +++ b/kpovmodeler/pmcsgedit.cpp @@ -24,8 +24,8 @@ #include <tqcombobox.h> #include <klocale.h> -PMCSGEdit::PMCSGEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMCSGEdit::PMCSGEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmcsgedit.h b/kpovmodeler/pmcsgedit.h index 1ec5d205..9e371a40 100644 --- a/kpovmodeler/pmcsgedit.h +++ b/kpovmodeler/pmcsgedit.h @@ -39,9 +39,9 @@ class PMCSGEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMCSGEdit with tqparent and name + * Creates a PMCSGEdit with parent and name */ - PMCSGEdit( TQWidget* tqparent, const char* name = 0 ); + PMCSGEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmcylinder.cpp b/kpovmodeler/pmcylinder.cpp index b595d6e1..c449189d 100644 --- a/kpovmodeler/pmcylinder.cpp +++ b/kpovmodeler/pmcylinder.cpp @@ -160,9 +160,9 @@ void PMCylinder::setOpen( bool op ) } } -PMDialogEditBase* PMCylinder::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMCylinder::editWidget( TQWidget* parent ) const { - return new PMCylinderEdit( tqparent ); + return new PMCylinderEdit( parent ); } void PMCylinder::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmcylinder.h b/kpovmodeler/pmcylinder.h index 66174d59..cae308fe 100644 --- a/kpovmodeler/pmcylinder.h +++ b/kpovmodeler/pmcylinder.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMCylinderEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view and dialog view */ diff --git a/kpovmodeler/pmcylinderedit.cpp b/kpovmodeler/pmcylinderedit.cpp index b471cb29..b8741ae7 100644 --- a/kpovmodeler/pmcylinderedit.cpp +++ b/kpovmodeler/pmcylinderedit.cpp @@ -26,8 +26,8 @@ #include <klocale.h> #include <tqcheckbox.h> -PMCylinderEdit::PMCylinderEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMCylinderEdit::PMCylinderEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmcylinderedit.h b/kpovmodeler/pmcylinderedit.h index 9b25ec2a..0444c120 100644 --- a/kpovmodeler/pmcylinderedit.h +++ b/kpovmodeler/pmcylinderedit.h @@ -38,9 +38,9 @@ class PMCylinderEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMCylinderEdit with tqparent and name + * Creates a PMCylinderEdit with parent and name */ - PMCylinderEdit( TQWidget* tqparent, const char* name = 0 ); + PMCylinderEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmdeclare.cpp b/kpovmodeler/pmdeclare.cpp index 0fd7d115..089447bc 100644 --- a/kpovmodeler/pmdeclare.cpp +++ b/kpovmodeler/pmdeclare.cpp @@ -131,9 +131,9 @@ void PMDeclare::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMDeclare::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMDeclare::editWidget( TQWidget* parent ) const { - return new PMDeclareEdit( tqparent ); + return new PMDeclareEdit( parent ); } void PMDeclare::setID( const TQString& newID ) diff --git a/kpovmodeler/pmdeclare.h b/kpovmodeler/pmdeclare.h index 05782866..69915218 100644 --- a/kpovmodeler/pmdeclare.h +++ b/kpovmodeler/pmdeclare.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMDeclareEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the id of the declare */ diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp index 3693bf6d..60446a53 100644 --- a/kpovmodeler/pmdeclareedit.cpp +++ b/kpovmodeler/pmdeclareedit.cpp @@ -33,8 +33,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMDeclareEdit::PMDeclareEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMDeclareEdit::PMDeclareEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; m_pSelectedObject = 0; diff --git a/kpovmodeler/pmdeclareedit.h b/kpovmodeler/pmdeclareedit.h index 0b40eb2a..b6d6afe9 100644 --- a/kpovmodeler/pmdeclareedit.h +++ b/kpovmodeler/pmdeclareedit.h @@ -42,9 +42,9 @@ class PMDeclareEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMDeclareEdit with tqparent and name + * Creates a PMDeclareEdit with parent and name */ - PMDeclareEdit( TQWidget* tqparent, const char* name = 0 ); + PMDeclareEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmdeletecommand.cpp b/kpovmodeler/pmdeletecommand.cpp index aa7497b2..1afb81fa 100644 --- a/kpovmodeler/pmdeletecommand.cpp +++ b/kpovmodeler/pmdeletecommand.cpp @@ -30,11 +30,11 @@ PMDeleteCommand::PMDeleteCommand( PMObject* obj ) : PMCommand( i18n( "Delete %1" ).tqarg( obj->name( ) ) ) { // the scene can not be deleted! - if( obj->tqparent( ) ) + if( obj->parent( ) ) m_infoList.append( new PMDeleteInfo( obj ) ); else { - // object has no tqparent! + // object has no parent! // top level objects can't be moved, move all child items PMObject* tmp; for( tmp = obj->firstChild( ); tmp; tmp = tmp->nextSibling( ) ) @@ -55,11 +55,11 @@ PMDeleteCommand::PMDeleteCommand( const PMObjectList& list ) { obj = it.current( ); - if( obj->tqparent( ) ) + if( obj->parent( ) ) m_infoList.append( new PMDeleteInfo( obj ) ); else { - // object has no tqparent! + // object has no parent! // top level objects can't be moved, move all child items PMObject* tmp; for( tmp = obj->firstChild( ); tmp; tmp = tmp->nextSibling( ) ) @@ -91,7 +91,7 @@ void PMDeleteCommand::execute( PMCommandManager* theManager ) { PMDeleteInfoListIterator it( m_infoList ); PMDeleteInfo* info = 0; - PMObject* tqparent; + PMObject* parent; if( !m_linksCreated ) { @@ -120,23 +120,23 @@ void PMDeleteCommand::execute( PMCommandManager* theManager ) for( it.toLast( ); it.current( ); --it ) { info = it.current( ); - tqparent = info->tqparent( ); + parent = info->parent( ); // signal has to be emitted before the item is removed theManager->cmdObjectChanged( info->deletedObject( ), PMCRemove ); if( m_firstExecution ) - if( tqparent->dataChangeOnInsertRemove( ) - && !tqparent->mementoCreated( ) ) - tqparent->createMemento( ); - tqparent->takeChild( info->deletedObject( ) ); + if( parent->dataChangeOnInsertRemove( ) + && !parent->mementoCreated( ) ) + parent->createMemento( ); + parent->takeChild( info->deletedObject( ) ); } if( m_firstExecution ) { for( it.toLast( ); it.current( ); --it ) { - tqparent = it.current( )->tqparent( ); - if( tqparent->mementoCreated( ) ) - m_dataChanges.append( tqparent->takeMemento( ) ); + parent = it.current( )->parent( ); + if( parent->mementoCreated( ) ) + m_dataChanges.append( parent->takeMemento( ) ); } } @@ -166,11 +166,11 @@ void PMDeleteCommand::undo( PMCommandManager* theManager ) for( ; it.current( ); ++it ) { if( it.current( )->prevSibling( ) ) - it.current( )->tqparent( ) + it.current( )->parent( ) ->insertChildAfter( it.current( )->deletedObject( ), it.current( )->prevSibling( ) ); else - it.current( )->tqparent( ) + it.current( )->parent( ) ->insertChild( it.current( )->deletedObject( ), 0 ); theManager->cmdObjectChanged( it.current( )->deletedObject( ), PMCAdd ); } @@ -230,7 +230,7 @@ int PMDeleteCommand::errorFlags( PMPart* ) { insideSelection = false; for( obj = links.current( ); obj && !insideSelection; - obj = obj->tqparent( ) ) + obj = obj->parent( ) ) { if( m_deletedObjects.find( obj ) ) insideSelection = true; @@ -239,7 +239,7 @@ int PMDeleteCommand::errorFlags( PMPart* ) if( insideSelection ) { bool stop = false; - for( obj = links.current( ); obj && !stop; obj = obj->tqparent( ) ) + for( obj = links.current( ); obj && !stop; obj = obj->parent( ) ) { if( m_deletedObjects.find( obj ) ) stop = true; diff --git a/kpovmodeler/pmdeletecommand.h b/kpovmodeler/pmdeletecommand.h index 4c384e1f..d11cf348 100644 --- a/kpovmodeler/pmdeletecommand.h +++ b/kpovmodeler/pmdeletecommand.h @@ -39,12 +39,12 @@ class PMDeleteInfo public: /** * Creates undo information for the object deletedObject. - * The object has to have a tqparent! + * The object has to have a parent! */ PMDeleteInfo( PMObject* deletedObject ) { m_pDeletedObject = deletedObject; - m_pParent = deletedObject->tqparent( ); + m_pParent = deletedObject->parent( ); m_pPrevSibling = deletedObject->prevSibling( ); m_insertError = false; } @@ -57,9 +57,9 @@ public: */ PMObject* deletedObject( ) const { return m_pDeletedObject; } /** - * Returns a pointer to the tqparent of the deleted object + * Returns a pointer to the parent of the deleted object */ - PMObject* tqparent( ) const { return m_pParent; } + PMObject* parent( ) const { return m_pParent; } /** * Returns the previous sibling of the deleted object */ diff --git a/kpovmodeler/pmdensity.cpp b/kpovmodeler/pmdensity.cpp index 5743a5b4..a742d514 100644 --- a/kpovmodeler/pmdensity.cpp +++ b/kpovmodeler/pmdensity.cpp @@ -69,8 +69,8 @@ TQString PMDensity::description( ) const } -PMDialogEditBase* PMDensity::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMDensity::editWidget( TQWidget* parent ) const { - return new PMDensityEdit( tqparent ); + return new PMDensityEdit( parent ); } diff --git a/kpovmodeler/pmdensity.h b/kpovmodeler/pmdensity.h index ca32ac99..c194f846 100644 --- a/kpovmodeler/pmdensity.h +++ b/kpovmodeler/pmdensity.h @@ -59,7 +59,7 @@ public: /** * Returns a new @ref PMDensityEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmdensity" ); } diff --git a/kpovmodeler/pmdensityedit.cpp b/kpovmodeler/pmdensityedit.cpp index 8213d27c..407a4f80 100644 --- a/kpovmodeler/pmdensityedit.cpp +++ b/kpovmodeler/pmdensityedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMDensityEdit::PMDensityEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMDensityEdit::PMDensityEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmdensityedit.h b/kpovmodeler/pmdensityedit.h index a8241117..514ccaf9 100644 --- a/kpovmodeler/pmdensityedit.h +++ b/kpovmodeler/pmdensityedit.h @@ -38,9 +38,9 @@ class PMDensityEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMDensityEdit with tqparent and name + * Creates a PMDensityEdit with parent and name */ - PMDensityEdit( TQWidget* tqparent, const char* name = 0 ); + PMDensityEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmdetailobjectedit.cpp b/kpovmodeler/pmdetailobjectedit.cpp index 0fbd3a8a..09b53cbd 100644 --- a/kpovmodeler/pmdetailobjectedit.cpp +++ b/kpovmodeler/pmdetailobjectedit.cpp @@ -23,8 +23,8 @@ #include <tqcombobox.h> #include <klocale.h> -PMDetailObjectEdit::PMDetailObjectEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMDetailObjectEdit::PMDetailObjectEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmdetailobjectedit.h b/kpovmodeler/pmdetailobjectedit.h index e6224d59..d270c446 100644 --- a/kpovmodeler/pmdetailobjectedit.h +++ b/kpovmodeler/pmdetailobjectedit.h @@ -39,9 +39,9 @@ class PMDetailObjectEdit : public PMNamedObjectEdit typedef PMNamedObjectEdit Base; public: /** - * Creates a PMNamedObjectEdit with tqparent and name + * Creates a PMNamedObjectEdit with parent and name */ - PMDetailObjectEdit( TQWidget* tqparent, const char* name = 0 ); + PMDetailObjectEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp index 542d3e20..9b575fd8 100644 --- a/kpovmodeler/pmdialogeditbase.cpp +++ b/kpovmodeler/pmdialogeditbase.cpp @@ -95,8 +95,8 @@ const TQString c_boxCode = TQString( const TQString c_globalSettingsCode = TQString( "global_settings { assumed_gamma %1 }\n" ); -PMDialogEditBase::PMDialogEditBase( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMDialogEditBase::PMDialogEditBase( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_pDisplayedObject = 0; m_pPart = 0; @@ -318,7 +318,7 @@ void PMDialogEditBase::findTextures( PMObject*& global, PMObject*& local ) const global = 0; local = 0; - for( o = m_pDisplayedObject; o; o = o->tqparent( ) ) + for( o = m_pDisplayedObject; o; o = o->parent( ) ) { if( o->type( ) == "Material" || o->type( ) == "Interior" || o->type( ) == "Texture" || o->type( ) == "Pigment" || @@ -427,7 +427,7 @@ void PMDialogEditBase::slotTexturePreview( ) PMObject* otr = o; // find the scene - while( otr->tqparent( ) ) otr = otr->tqparent( ); + while( otr->parent( ) ) otr = otr->parent( ); for( otr = otr->firstChild( ); otr && ( numDeclares > 0 ); otr = otr->nextSibling( ) ) diff --git a/kpovmodeler/pmdialogeditbase.h b/kpovmodeler/pmdialogeditbase.h index 04a3dad7..77c37409 100644 --- a/kpovmodeler/pmdialogeditbase.h +++ b/kpovmodeler/pmdialogeditbase.h @@ -63,7 +63,7 @@ public: * No widgets are created within the constructor! You have to call * @ref createWidgets after creating a new edit widget. */ - PMDialogEditBase( TQWidget* tqparent, const char* name = 0 ); + PMDialogEditBase( TQWidget* parent, const char* name = 0 ); /** * Destructor */ diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp index 1df22c26..0a7f372e 100644 --- a/kpovmodeler/pmdialogview.cpp +++ b/kpovmodeler/pmdialogview.cpp @@ -39,8 +39,8 @@ #include <tqscrollview.h> #include <tqlabel.h> -PMDialogEditContent::PMDialogEditContent( TQWidget* tqparent, const char* name ) - : TQScrollView( tqparent, name ) +PMDialogEditContent::PMDialogEditContent( TQWidget* parent, const char* name ) + : TQScrollView( parent, name ) { m_pContents = 0; setVScrollBarMode( AlwaysOff ); @@ -111,8 +111,8 @@ void PMDialogEditContent::resizeEvent( TQResizeEvent* /* ev */ ) calculateSize( ); } -PMDialogView::PMDialogView( PMPart* part, TQWidget* tqparent, const char* name ) - : PMViewBase( tqparent, name ) +PMDialogView::PMDialogView( PMPart* part, TQWidget* parent, const char* name ) + : PMViewBase( parent, name ) { m_pDisplayedWidget = 0; m_unsavedData = false; diff --git a/kpovmodeler/pmdialogview.h b/kpovmodeler/pmdialogview.h index 0b6209c3..d4e2f47a 100644 --- a/kpovmodeler/pmdialogview.h +++ b/kpovmodeler/pmdialogview.h @@ -45,7 +45,7 @@ class PMDialogEditContent : public TQScrollView Q_OBJECT TQ_OBJECT public: - PMDialogEditContent( TQWidget* tqparent, const char* name = 0 ); + PMDialogEditContent( TQWidget* parent, const char* name = 0 ); void setContents( TQWidget* wid ); void calculateSize( ); protected: @@ -69,7 +69,7 @@ public: /** * Creates a new PMDialogView widget */ - PMDialogView( PMPart* part, TQWidget* tqparent, const char* name = 0 ); + PMDialogView( PMPart* part, TQWidget* parent, const char* name = 0 ); /** * Deletes the widget */ @@ -156,9 +156,9 @@ public: virtual TQString viewType( ) const { return TQString( "dialogview" ); } virtual TQString description( ) const; virtual TQString iconName( ) const { return TQString( "pmdialogview" ); } - virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const + virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const { - return new PMDialogView( part, tqparent ); + return new PMDialogView( part, parent ); } }; diff --git a/kpovmodeler/pmdisc.cpp b/kpovmodeler/pmdisc.cpp index 4a526288..6f7bac55 100644 --- a/kpovmodeler/pmdisc.cpp +++ b/kpovmodeler/pmdisc.cpp @@ -176,9 +176,9 @@ void PMDisc::setHoleRadius( double hradius ) } } -PMDialogEditBase* PMDisc::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMDisc::editWidget( TQWidget* parent ) const { - return new PMDiscEdit( tqparent ); + return new PMDiscEdit( parent ); } void PMDisc::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmdisc.h b/kpovmodeler/pmdisc.h index 482e5e1d..b56e2175 100644 --- a/kpovmodeler/pmdisc.h +++ b/kpovmodeler/pmdisc.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMDiscEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view and dialog view */ diff --git a/kpovmodeler/pmdiscedit.cpp b/kpovmodeler/pmdiscedit.cpp index 6b06207d..e960f869 100644 --- a/kpovmodeler/pmdiscedit.cpp +++ b/kpovmodeler/pmdiscedit.cpp @@ -27,8 +27,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMDiscEdit::PMDiscEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMDiscEdit::PMDiscEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmdiscedit.h b/kpovmodeler/pmdiscedit.h index 73466f32..2741c1df 100644 --- a/kpovmodeler/pmdiscedit.h +++ b/kpovmodeler/pmdiscedit.h @@ -37,9 +37,9 @@ class PMDiscEdit : public PMGraphicalObjectEdit typedef PMGraphicalObjectEdit Base; public: /** - * Creates a PMPlaneEdit with tqparent and name + * Creates a PMPlaneEdit with parent and name */ - PMDiscEdit( TQWidget* tqparent, const char* name = 0 ); + PMDiscEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index b964f671..575e0af0 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -134,8 +134,8 @@ public: * * @author Max Judin. */ -PMDockMainWindow::PMDockMainWindow( TQWidget* tqparent, const char *name, WFlags f) -:KMainWindow( tqparent, name, f ) +PMDockMainWindow::PMDockMainWindow( TQWidget* parent, const char *name, WFlags f) +:KMainWindow( parent, name, f ) { TQString new_name = TQString(name) + TQString("_DockManager"); dockManager = new PMDockManager( this, new_name.latin1() ); @@ -256,7 +256,7 @@ void PMDockMainWindow::setMainDockWidget( PMDockWidget* mdw ) void PMDockMainWindow::setView( TQWidget *view ) { if ( view->isA("PMDockWidget") ){ - if ( TQT_BASE_OBJECT(view->tqparent()) != TQT_BASE_OBJECT(this) ) ((PMDockWidget*)view)->applyToWidget( this ); + if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((PMDockWidget*)view)->applyToWidget( this ); } #ifndef NO_KDE2 @@ -266,9 +266,9 @@ void PMDockMainWindow::setView( TQWidget *view ) #endif } -PMDockWidget* PMDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel) +PMDockWidget* PMDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel) { - return new PMDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel ); + return new PMDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel ); } void PMDockMainWindow::makeDockVisible( PMDockWidget* dock ) @@ -319,15 +319,15 @@ void PMDockMainWindow::slotDockWidgetUndocked() } /*************************************************************************/ -PMDockWidgetAbstractHeaderDrag::PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock, const char* name ) -:TQFrame( tqparent, name ) +PMDockWidgetAbstractHeaderDrag::PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name ) +:TQFrame( parent, name ) { dw = dock; installEventFilter( dock->dockManager() ); } /*************************************************************************/ -PMDockWidgetHeaderDrag::PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock, const char* name ) -:PMDockWidgetAbstractHeaderDrag( tqparent, dock, name ) +PMDockWidgetHeaderDrag::PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name ) +:PMDockWidgetAbstractHeaderDrag( parent, dock, name ) { } @@ -342,28 +342,28 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.end(); } /*************************************************************************/ -PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* tqparent, const char* name ) -:TQFrame( tqparent, name ) +PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* parent, const char* name ) +:TQFrame( parent, name ) { } /*************************************************************************/ -PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name ) -:PMDockWidgetAbstractHeader( tqparent, name ) +PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name ) +:PMDockWidgetAbstractHeader( parent, name ) { tqlayout = new TQHBoxLayout( this ); tqlayout->setResizeMode( TQLayout::Minimum ); - drag = new PMDockWidgetHeaderDrag( this, tqparent ); + drag = new PMDockWidgetHeaderDrag( this, parent ); closeButton = new PMDockButton_Private( this, "DockCloseButton" ); closeButton->setPixmap( const_cast< const char** >(close_xpm) ); int buttonWidth = 9, buttonHeight = 9; closeButton->setFixedSize(buttonWidth,buttonHeight); - connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerCloseButtonClicked())); + connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); // MODIFICATION (zehender) // The shell will delete the widget // undock is unnecessary - // connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(undock())); + // connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); stayButton = new PMDockButton_Private( this, "DockStayButton" ); stayButton->setToggleButton( true ); @@ -375,8 +375,8 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name dockbackButton = new PMDockButton_Private( this, "DockbackButton" ); dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm)); dockbackButton->setFixedSize(buttonWidth,buttonHeight); - connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerDockbackButtonClicked())); - connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(dockBack())); + connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked())); + connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack())); // MODIFICATION (zehender) // Add a button to undock the widget and dock it as top level @@ -384,7 +384,7 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name toDesktopButton = new PMDockButton_Private( this, "ToDesktopButton" ); toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm)); toDesktopButton->setFixedSize(buttonWidth,buttonHeight); - connect( toDesktopButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(toDesktop())); + connect( toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop())); tqlayout->addWidget( drag ); tqlayout->addWidget( dockbackButton ); @@ -398,7 +398,7 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name void PMDockWidgetHeader::setTopLevel( bool isTopLevel ) { if ( isTopLevel ){ - PMDockWidget* par = (PMDockWidget*)tqparent(); + PMDockWidget* par = (PMDockWidget*)parent(); if( par) { if( par->isDockBackPossible()) dockbackButton->show(); @@ -459,18 +459,18 @@ void PMDockWidgetHeader::setDragEnabled(bool b) #ifndef NO_KDE2 void PMDockWidgetHeader::saveConfig( KConfig* c ) { - c->writeEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), stayButton->isOn() ); + c->writeEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), stayButton->isOn() ); } void PMDockWidgetHeader::loadConfig( KConfig* c ) { - setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), false ) ); + setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), false ) ); } #endif /*************************************************************************/ -PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f) -: TQWidget( tqparent, name, f ) +PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f) +: TQWidget( parent, name, f ) ,formerBrotherDockWidget(0L) ,currentDockPos(DockNone) ,formerDockPos(DockNone) @@ -479,7 +479,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const { d = new PMDockWidgetPrivate(); // create private data - d->_parent = tqparent; + d->_parent = parent; tqlayout = new TQVBoxLayout( this ); tqlayout->setResizeMode( TQLayout::Minimum ); @@ -510,7 +510,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const widget = 0L; TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) ); - applyToWidget( tqparent, TQPoint(0,0) ); + applyToWidget( parent, TQPoint(0,0) ); } void PMDockWidget::slotSetCaption( const TQString& str ) @@ -558,8 +558,8 @@ void PMDockWidget::setEnableDocking( int pos ) void PMDockWidget::updateHeader() { - if ( tqparent() ){ - if ( (TQT_BASE_OBJECT(tqparent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == PMDockWidget::DockNone) ){ + if ( parent() ){ + if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == PMDockWidget::DockNone) ){ header->hide(); } else { header->setTopLevel( false ); @@ -573,7 +573,7 @@ void PMDockWidget::updateHeader() void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) { - if ( TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(s) ) + if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) ) { hide(); reparent(s, 0, TQPoint(0,0), false); @@ -608,11 +608,11 @@ void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) void PMDockWidget::show() { - if ( tqparent() || manager->main->isVisible() ) - if ( !tqparent() ){ + if ( parent() || manager->main->isVisible() ) + if ( !parent() ){ emit manager->setDockDefaultPos( this ); emit setDockDefaultPos(); - if ( tqparent() ){ + if ( parent() ){ makeDockVisible(); } else { TQWidget::show(); @@ -632,9 +632,9 @@ void PMDockWidget::setDockWindowType (NET::WindowType windowType) #endif -void PMDockWidget::setDockWindowTransient (TQWidget *tqparent, bool transientEnabled) +void PMDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnabled) { - d->_parent = tqparent; + d->_parent = parent; d->transient = transientEnabled; applyToWidget( parentWidget(), TQPoint(0,0) ); } @@ -664,8 +664,8 @@ bool PMDockWidget::event( TQEvent* pevent ) break; case TQEvent::CaptionChange: if ( parentWidget() ){ - if ( tqparent()->inherits("PMDockSplitter") ){ - ((PMDockSplitter*)(tqparent()))->updateName(); + if ( parent()->inherits("PMDockSplitter") ){ + ((PMDockSplitter*)(parent()))->updateName(); } if ( parentDockTabGroup() ){ setDockTabName( parentDockTabGroup() ); @@ -686,7 +686,7 @@ bool PMDockWidget::event( TQEvent* pevent ) } #undef KeyPress bool processed = TQWidget::event( pevent ); - if( pevent->type( ) == TQEvent::AccelOverride && !processed && !tqparent( ) ){ + if( pevent->type( ) == TQEvent::AccelOverride && !processed && !parent( ) ){ // MODIFICATION (zehender) // floating widget, post event to main window processed = tqApp->sendEvent( manager->dockMainWidget( ), pevent ); @@ -702,7 +702,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP bool succes = true; // tested flag // do not dock into a floating widget - if( target && !target->tqparent( ) ) + if( target && !target->parent( ) ) target = 0; // check allowed this dock submit this operations @@ -715,18 +715,18 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP succes = false; } - if ( tqparent() && !tqparent()->inherits("PMDockSplitter") && !parentDockTabGroup() ){ + if ( parent() && !parent()->inherits("PMDockSplitter") && !parentDockTabGroup() ){ succes = false; } // if docking to a tab group, and position is not center - // dock to the tqparent of the tab group + // dock to the parent of the tab group if( target && ( dockPos != PMDockWidget::DockCenter ) && ( dockPos != PMDockWidget::DockNone ) ) { TQWidget* pdt = target->parentDockTabGroup( ); if( pdt ) - return manualDock( ( PMDockWidget* ) ( pdt->tqparent( ) ), + return manualDock( ( PMDockWidget* ) ( pdt->parent( ) ), dockPos, spliPos, pos, check, tabIndex ); } @@ -771,7 +771,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP currentDockPos = PMDockWidget::DockCenter; emit manager->change(); - return (PMDockWidget*)parentTab->tqparent(); + return (PMDockWidget*)parentTab->parent(); } // MODIFICATION (Zehender): @@ -930,7 +930,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP PMDockTabGroup* PMDockWidget::parentDockTabGroup() const { - if ( !tqparent() ) return 0L; + if ( !parent() ) return 0L; TQWidget* candidate = parentWidget()->parentWidget(); if ( candidate && candidate->inherits("PMDockTabGroup") ) return (PMDockTabGroup*)candidate; return 0L; @@ -980,8 +980,8 @@ void PMDockWidget::undock() lastTab->applyToWidget( 0L ); lastTab->move( parentTab->mapToGlobal(parentTab->frameGeometry().topLeft()) ); - // PMDockTabGroup always have a tqparent that is a PMDockWidget - PMDockWidget* parentOfTab = (PMDockWidget*)parentTab->tqparent(); + // PMDockTabGroup always have a parent that is a PMDockWidget + PMDockWidget* parentOfTab = (PMDockWidget*)parentTab->parent(); delete parentTab; // PMDockTabGroup TQWidget* parentOfDockWidget = parentOfTab->parentWidget(); @@ -994,13 +994,13 @@ void PMDockWidget::undock() split->deactivate(); if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); - if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical ) + if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockLeft ); else emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockTop ); } else { split->activate( 0L, lastTab ); - if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical ) + if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockRight ); else emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockBottom ); @@ -1081,7 +1081,7 @@ void PMDockWidget::setWidget( TQWidget* mw ) { if ( !mw ) return; - if ( TQT_BASE_OBJECT(mw->tqparent()) != TQT_BASE_OBJECT(this) ){ + if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){ mw->reparent(this, 0, TQPoint(0,0), false); } @@ -1111,20 +1111,20 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab ) tab->parentWidget()->setCaption( listOfCaption ); tab->parentWidget()->tqrepaint( false ); // PMDockWidget->tqrepaint - if ( tab->parentWidget()->tqparent() ) - if ( tab->parentWidget()->tqparent()->inherits("PMDockSplitter") ) - ((PMDockSplitter*)(tab->parentWidget()->tqparent()))->updateName(); + if ( tab->parentWidget()->parent() ) + if ( tab->parentWidget()->parent()->inherits("PMDockSplitter") ) + ((PMDockSplitter*)(tab->parentWidget()->parent()))->updateName(); } bool PMDockWidget::mayBeHide() const { - bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)PMDockWidget::DockNone ) ); } bool PMDockWidget::mayBeShow() const { - bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); return ( !isGroup && !isTabGroup && f && !isVisible() ); } @@ -1157,7 +1157,7 @@ void PMDockWidget::makeDockVisible() p->show(); p = p->parentWidget(); } - if( tqparent() == 0L) // is undocked + if( parent() == 0L) // is undocked dockBack(); show(); } @@ -1199,7 +1199,7 @@ void PMDockWidget::dockBack() // else dockback to the dockmainwindow (default behaviour) manualDock( ((PMDockMainWindow*)manager->main)->getMainDockWidget(), formerDockPos, d->splitPosInPercent, TQPoint(0,0), false, d->index); formerBrotherDockWidget = 0L; - if (tqparent()) + if (parent()) makeDockVisible(); } @@ -1549,7 +1549,7 @@ void PMDockManager::findFloatingWidgets( TQPtrList<PMDockWidget>& l ) TQObjectListIt it( *childDock ); for( ; it.current( ); ++it ) if( it.current( )->inherits( "PMDockWidget" ) && - !it.current( )->tqparent( ) ) + !it.current( )->parent( ) ) l.append( ( PMDockWidget* ) it.current( ) ); } @@ -1588,7 +1588,7 @@ void PMDockManager::dragMove( PMDockWidget* dw, TQPoint pos ) int w = r.width() / 3; int h = r.height() / 3; - PMDockMainWindow* mw = ( PMDockMainWindow* ) tqparent( ); + PMDockMainWindow* mw = ( PMDockMainWindow* ) parent( ); TQWidget* cw = mw->centralWidget( ); TQPoint cwp = cw->mapToGlobal( TQPoint( 0, 0 ) ); int cwh = cw->height( ); @@ -1660,7 +1660,7 @@ void PMDockManager::drop() drawDragRectangle(); // only the old rect will be deleted return; } - if ( !currentMoveWidget && !currentDragWidget->tqparent() ) { + if ( !currentMoveWidget && !currentDragWidget->parent() ) { currentDragWidget->move( TQCursor::pos() - d->dragOffset ); } else { @@ -1800,7 +1800,7 @@ void PMDockManager::writeConfig(TQDomElement &base) TQObjectListIt it(*childDock); PMDockWidget *obj1; while ( (obj1=(PMDockWidget*)it.current()) ) { - if ( TQT_BASE_OBJECT(obj1->tqparent()) == TQT_BASE_OBJECT(main) ) + if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) ) mainWidgetStr = TQString::tqfromLatin1(obj1->name()); nList.append(obj1->name()); ++it; @@ -1842,8 +1842,8 @@ void PMDockManager::writeConfig(TQDomElement &base) } groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name()))); - groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->tqparent())); - if ( !obj->tqparent() ) { + groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent())); + if ( !obj->parent() ) { groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size()))); groupEl.appendChild(createBoolEntry(doc, "visible", obj->isVisible())); } @@ -1891,7 +1891,7 @@ void PMDockManager::readConfig(TQDomElement &base) PMDockWidget *obj1; while ( (obj1=(PMDockWidget*)it.current()) ) { if ( !obj1->isGroup && !obj1->isTabGroup ) { - if ( obj1->tqparent() ) + if ( obj1->parent() ) obj1->undock(); else obj1->hide(); @@ -2020,7 +2020,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) ++it; //debug(" +Add subdock %s", obj->name()); nList.append( obj->name() ); - if ( TQT_BASE_OBJECT(obj->tqparent()) == TQT_BASE_OBJECT(main) ) + if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) ) c->writeEntry( "Main:view", obj->name() ); } @@ -2037,12 +2037,12 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) if ( findList.find( obj->firstName.latin1() ) != -1 && findList.find( obj->lastName.latin1() ) != -1 ){ c->writeEntry( cname+":type", "GROUP"); - if ( !obj->tqparent() ){ - c->writeEntry( cname+":tqparent", "___null___"); + if ( !obj->parent() ){ + c->writeEntry( cname+":parent", "___null___"); c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); } else { - c->writeEntry( cname+":tqparent", "yes"); + c->writeEntry( cname+":parent", "yes"); } c->writeEntry( cname+":first_name", obj->firstName ); c->writeEntry( cname+":last_name", obj->lastName ); @@ -2068,12 +2068,12 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) /*************************************************************************************************/ if ( obj->isTabGroup){ c->writeEntry( cname+":type", "TAB_GROUP"); - if ( !obj->tqparent() ){ - c->writeEntry( cname+":tqparent", "___null___"); + if ( !obj->parent() ){ + c->writeEntry( cname+":parent", "___null___"); c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); } else { - c->writeEntry( cname+":tqparent", "yes"); + c->writeEntry( cname+":parent", "yes"); } TQStrList list; for ( int i = 0; i < ((PMDockTabGroup*)obj->widget)->count(); ++i ) @@ -2088,7 +2088,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) nList.first(); } else { /*************************************************************************************************/ - if ( !obj->tqparent() ){ + if ( !obj->parent() ){ c->writeEntry( cname+":type", "NULL_DOCK"); c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); @@ -2149,7 +2149,7 @@ void PMDockManager::readConfig( KConfig* c, TQString group ) ++it; if ( !obj->isGroup && !obj->isTabGroup ) { - if ( obj->tqparent() ) obj->undock(); else obj->hide(); + if ( obj->parent() ) obj->undock(); else obj->hide(); } } @@ -2199,7 +2199,7 @@ void PMDockManager::readConfig( KConfig* c, TQString group ) obj = tabDockGroup; } - if ( type == "NULL_DOCK" || c->readEntry( oname + ":tqparent") == "___null___" ){ + if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){ TQRect r = c->readRectEntry( oname + ":tqgeometry" ); obj = getDockWidgetFromName( oname ); obj->applyToWidget( 0L ); @@ -2408,8 +2408,8 @@ void PMDockManager::drawDragRectangle() #ifdef _JOWENN_EXPERIMENTAL_ -PMDockArea::PMDockArea( TQWidget* tqparent, const char *name) -:TQWidget( tqparent, name) +PMDockArea::PMDockArea( TQWidget* parent, const char *name) +:TQWidget( parent, name) { TQString new_name = TQString(name) + TQString("_DockManager"); dockManager = new PMDockManager( this, new_name.latin1() ); @@ -2421,9 +2421,9 @@ PMDockArea::~PMDockArea() delete dockManager; } -PMDockWidget* PMDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel) +PMDockWidget* PMDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel) { - return new PMDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel ); + return new PMDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel ); } void PMDockArea::makeDockVisible( PMDockWidget* dock ) diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h index 8639e6b0..0dc5ac99 100644 --- a/kpovmodeler/pmdockwidget.h +++ b/kpovmodeler/pmdockwidget.h @@ -115,10 +115,10 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget) + * @param parent the parent widget (usually a dockwidget) * @param name the object instance name */ - PMDockWidgetAbstractHeader( PMDockWidget* tqparent, const char* name = 0L ); + PMDockWidgetAbstractHeader( PMDockWidget* parent, const char* name = 0L ); /** * Destructs this. @@ -165,11 +165,11 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget header) + * @param parent the parent widget (usually a dockwidget header) * @param dock the dockwidget where it belongs to * @param name the object instance name */ - PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* tqparent, + PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name = 0L ); /** @@ -211,11 +211,11 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget header) + * @param parent the parent widget (usually a dockwidget header) * @param dock the dockwidget where it belongs to * @param name the object instance name */ - PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock, + PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name = 0L ); /** @@ -253,10 +253,10 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget) + * @param parent the parent widget (usually a dockwidget) * @param name the object instance name */ - PMDockWidgetHeader( PMDockWidget* tqparent, const char* name = 0L ); + PMDockWidgetHeader( PMDockWidget* parent, const char* name = 0L ); /** * Destructs this. @@ -358,8 +358,8 @@ public: /** * Constructs this. It just calls the method of the base class. */ - PMDockTabGroup( TQWidget *tqparent = 0, const char *name = 0 ) - :TQTabWidget( tqparent, name ){}; + PMDockTabGroup( TQWidget *parent = 0, const char *name = 0 ) + :TQTabWidget( parent, name ){}; /** * Destructs a PMDockTabGroup. @@ -378,7 +378,7 @@ private: * encapsulate the actual widgets (and member of the dockwidget class * set). * - * You just grip the double-lined panel, tear it off its tqparent + * You just grip the double-lined panel, tear it off its parent * widget, drag it somewhere and let it loose. Depending on the * position where you leave it, the dockwidget becomes a toplevel * window on the desktop (floating mode) or docks to a new widget @@ -397,7 +397,7 @@ private: * PMDockMainWindow* mainWidget; * ... * PMDockWidget* dock = 0L; - * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no tqparent + * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no parent * TQWidget* actualWidget = new TQWidget( dock); * dock->setWidget( actualWidget); // embed it * dock->setToolTipString(i18n("That's me")); // available when appearing as tab page @@ -429,12 +429,12 @@ public: * @param dockManager The responsible manager (dock helper) * @param name Object instance name * @param pixmap An icon (for instance shown when docked centered) - * @param tqparent Parent widget + * @param parent Parent widget * @param strCaption Title of the dockwidget window (shown when toplevel) * @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption */ PMDockWidget( PMDockManager* dockManager, const char* name, - const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L, + const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ", WFlags f = 0); /** @@ -468,8 +468,8 @@ public: * * If the target is null, it will become a toplevel dockwidget at position pos; * Note: Docking to another dockwidget means exactly: - * A new tqparent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner) - * which contains both dockwidgets, this and the target dockwidget. So consider tqparent<->child relationships change completely during such actions. + * A new parent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner) + * which contains both dockwidgets, this and the target dockwidget. So consider parent<->child relationships change completely during such actions. * * @param target The dockwidget to dock to * @param dockPos One of the DockPositions this is going to dock to @@ -477,7 +477,7 @@ public: * @param pos The dock position, mainly of interest for docking to the desktop (as toplevel dockwidget) * @param check Only for internal use; * @param tabIndex The position index of the tab widget (when in tab page mode), -1 (default) means append - * @return result The group dockwidget that replaces the target dockwidget and will be grandtqparent of target and @p this. + * @return result The group dockwidget that replaces the target dockwidget and will be grandparent of target and @p this. */ PMDockWidget* manualDock( PMDockWidget* target, DockPosition dockPos, int spliPos = 50, TQPoint pos = TQPoint(0,0), bool check = false, int tabIndex = -1); @@ -506,7 +506,7 @@ public: int dockSite() const { // no docking if a floating dock widget - if( !tqparent( ) ) + if( !parent( ) ) return 0; return sDocking; } @@ -550,7 +550,7 @@ public: * There are reasons that it's impossible: * @li It is a (tab) group. * @li It is already invisible ;-) - * @li The tqparent of this is the @ref PMDockMainWindow. + * @li The parent of this is the @ref PMDockMainWindow. * @li It isn't able to dock to another widget. */ bool mayBeHide() const; @@ -560,7 +560,7 @@ public: * There are reasons that it's impossible: * @li It is a (tab) group. * @li It is already visible ;-) - * @li The tqparent of this is the @p PMDockMainWindow. + * @li The parent of this is the @p PMDockMainWindow. */ bool mayBeShow() const; @@ -612,7 +612,7 @@ public: */ virtual void show(); /** - * @return the tqparent widget of this if it inherits class PMDockTabGroup + * @return the parent widget of this if it inherits class PMDockTabGroup */ PMDockTabGroup* parentDockTabGroup() const; @@ -632,7 +632,7 @@ public: * * @param windowType is type of dock window */ - void setDockWindowTransient (TQWidget *tqparent, bool transientEnabled); + void setDockWindowTransient (TQWidget *parent, bool transientEnabled); // MODIFICATION (lpassos) /** @@ -675,7 +675,7 @@ protected: /** * Checks some conditions and shows or hides the dockwidget header (drag panel). * The header is hidden if: - * @li the tqparent widget is the PMDockMainWindow + * @li the parent widget is the PMDockMainWindow * @li this is a (tab) group dockwidget * @li it is not able to dock to another dockwidget */ @@ -754,7 +754,7 @@ private: void setDockTabName( PMDockTabGroup* g); /** - * Retqparent to s or set this to the PMDockMainWindow's view if s is that dockmainwindow. + * Reparent to s or set this to the PMDockMainWindow's view if s is that dockmainwindow. * If s is O, simply move the widget. * * @param s the target widget to reparent to @@ -894,7 +894,7 @@ public: /** * Shows all encapsulated widgets of all controlled dockwidgets and shows all dockwidgets which are - * tqparent of a dockwidget tab group. + * parent of a dockwidget tab group. */ void activate(); @@ -989,7 +989,7 @@ signals: void replaceDock( PMDockWidget* oldDock, PMDockWidget* newDock ); /** - * Signals a dockwidget without tqparent (toplevel) is shown. + * Signals a dockwidget without parent (toplevel) is shown. */ void setDockDefaultPos( PMDockWidget* ); @@ -1043,7 +1043,7 @@ private: * Finds the TQWidget recursively at the position given as parameter * * @param w a variable where the method puts the TQWidget at that position (instead of a return value) - * @param p the tqparent widget where the recursive search should start from + * @param p the parent widget where the recursive search should start from * @param pos global (desktop) position of the wanted dockwidget */ void findChildDockWidget( TQWidget*& w, const TQWidget* p, const TQPoint& pos ); @@ -1053,7 +1053,7 @@ public: /** * Finds all dockwidgets which are child, grandchild and so on of p. * - * @param p the tqparent widget where the recursive search starts from + * @param p the parent widget where the recursive search starts from * @param l the widget list that contains the search result after the return of this method */ void findChildDockWidget( const TQWidget* p, TQWidgetList& l); @@ -1231,7 +1231,7 @@ public: * * @param name object name */ - PMDockMainWindow( TQWidget* tqparent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); + PMDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); /** * Destructs a dockmainwindow. @@ -1266,12 +1266,12 @@ public: * * @param name TQObject name (default dockwidget caption) * @param pixmap window icon (for instance shown when docked as tabwidget entry) - * @param tqparent tqparent widget for the new dockwidget + * @param parent parent widget for the new dockwidget * @param strCaption window title (shown when toplevel) * @param strTabPageLabel title of the tab page (visible when in tab page mode), if it is "", only the icon will be shown; if it is 0L, the label is set to strCaption * @return a pointer to the new created dockwidget */ - PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " "); + PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " "); /** * Saves the current dock window tqlayout into a DOM tree below the given element. @@ -1427,7 +1427,7 @@ friend class PMDockManager; public: - PMDockArea( TQWidget* tqparent = 0L, const char *name = 0L); + PMDockArea( TQWidget* parent = 0L, const char *name = 0L); virtual ~PMDockArea(); @@ -1437,7 +1437,7 @@ public: void setMainDockWidget( PMDockWidget* ); PMDockWidget* getMainDockWidget(){ return mainDockWidget; } - PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " "); + PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " "); void writeDockConfig(TQDomElement &base); void readDockConfig(TQDomElement &base); diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp index 3dd59456..9c97888f 100644 --- a/kpovmodeler/pmdockwidget_private.cpp +++ b/kpovmodeler/pmdockwidget_private.cpp @@ -22,8 +22,8 @@ #include <tqpainter.h> #include <tqcursor.h> -PMDockSplitter::PMDockSplitter(TQWidget *tqparent, const char *name, Qt::Orientation orient, int pos, bool highResolution) -: TQWidget(tqparent, name) +PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution) +: TQWidget(parent, name) { divider = 0L; child0 = 0L; @@ -288,8 +288,8 @@ bool PMDockSplitter::highResolution() const /*************************************************************************/ -PMDockButton_Private::PMDockButton_Private( TQWidget *tqparent, const char * name ) -:TQPushButton( tqparent, name ) +PMDockButton_Private::PMDockButton_Private( TQWidget *parent, const char * name ) +:TQPushButton( parent, name ) { moveMouse = false; setFocusPolicy( TQ_NoFocus ); diff --git a/kpovmodeler/pmdockwidget_private.h b/kpovmodeler/pmdockwidget_private.h index a2111a90..59b4516c 100644 --- a/kpovmodeler/pmdockwidget_private.h +++ b/kpovmodeler/pmdockwidget_private.h @@ -44,7 +44,7 @@ class PMDockSplitter : public TQWidget Q_OBJECT TQ_OBJECT public: - PMDockSplitter(TQWidget *tqparent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false); + PMDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false); virtual ~PMDockSplitter(){}; void activate(TQWidget *c0, TQWidget *c1 = 0L); @@ -99,7 +99,7 @@ class PMDockButton_Private : public TQPushButton Q_OBJECT TQ_OBJECT public: - PMDockButton_Private( TQWidget *tqparent=0, const char *name=0 ); + PMDockButton_Private( TQWidget *parent=0, const char *name=0 ); ~PMDockButton_Private(); protected: diff --git a/kpovmodeler/pmdragwidget.cpp b/kpovmodeler/pmdragwidget.cpp index 7e800f72..bc097c46 100644 --- a/kpovmodeler/pmdragwidget.cpp +++ b/kpovmodeler/pmdragwidget.cpp @@ -17,8 +17,8 @@ #include "pmdragwidget.h" -PMDragWidget::PMDragWidget( TQWidget* tqparent, const char* name, WFlags f ) - : TQWidget( tqparent, name, f ) +PMDragWidget::PMDragWidget( TQWidget* parent, const char* name, WFlags f ) + : TQWidget( parent, name, f ) { dragging = false; } diff --git a/kpovmodeler/pmdragwidget.h b/kpovmodeler/pmdragwidget.h index 79efb3f6..d4e15f36 100644 --- a/kpovmodeler/pmdragwidget.h +++ b/kpovmodeler/pmdragwidget.h @@ -36,7 +36,7 @@ class PMDragWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - PMDragWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 ); + PMDragWidget( TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); virtual void startDrag( ); diff --git a/kpovmodeler/pmerrordialog.cpp b/kpovmodeler/pmerrordialog.cpp index 2ff5994f..eb920fb0 100644 --- a/kpovmodeler/pmerrordialog.cpp +++ b/kpovmodeler/pmerrordialog.cpp @@ -29,8 +29,8 @@ TQSize PMErrorDialog::s_size = TQSize( 150, 200 ); PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags, - TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "Messages" ), + TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n( "Messages" ), Ok | Cancel, Cancel ) { TQVBox* page = makeVBoxMainWidget( ); @@ -51,7 +51,7 @@ PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags, for( ; pit.current( ); ++pit ) { PMObject* obj = pit.current( )->linkedObject( ); - for( ; obj; obj = obj->tqparent( ) ) + for( ; obj; obj = obj->parent( ) ) { TQPtrList<PMMessage>* pList = m_messageDict.find( obj ); if( !pList ) @@ -60,7 +60,7 @@ PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags, m_messageDict.insert( obj, pList ); } pList->append( pit.current( ) ); - if( !obj->tqparent( ) ) + if( !obj->parent( ) ) { if( obj->type( ) != "scene" ) { diff --git a/kpovmodeler/pmerrordialog.h b/kpovmodeler/pmerrordialog.h index 8310b3ad..06982e69 100644 --- a/kpovmodeler/pmerrordialog.h +++ b/kpovmodeler/pmerrordialog.h @@ -45,7 +45,7 @@ class PMErrorDialog : public KDialogBase TQ_OBJECT public: /** - * Creates a modal PMErrorDialog with tqparent and name. + * Creates a modal PMErrorDialog with parent and name. * * messages is the message list. If the list contains a message of type * FatalError, the 'Proceed" button will not be shown. @@ -54,7 +54,7 @@ public: * should be continued. */ PMErrorDialog( const PMMessageList& messages, int errorFlags, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); static void saveConfig( KConfig* cfg ); static void restoreConfig( KConfig* cfg ); diff --git a/kpovmodeler/pmfactory.cpp b/kpovmodeler/pmfactory.cpp index 57881593..488db1ce 100644 --- a/kpovmodeler/pmfactory.cpp +++ b/kpovmodeler/pmfactory.cpp @@ -56,7 +56,7 @@ PMFactory::~PMFactory( ) KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, const char* name, + TQObject* parent, const char* name, const char* classname, const TQStringList& /*args*/ ) { @@ -66,7 +66,7 @@ KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget, || ( strcmp( classname, "KParts::ReadOnlyPart" ) == 0 ) ); KParts::ReadWritePart *part = new PMPart( parentWidget, widgetName, - tqparent, name, readwrite ); + parent, name, readwrite ); return part; } diff --git a/kpovmodeler/pmfactory.h b/kpovmodeler/pmfactory.h index dac51e7b..be5efe9c 100644 --- a/kpovmodeler/pmfactory.h +++ b/kpovmodeler/pmfactory.h @@ -35,7 +35,7 @@ public: virtual KParts::Part* createPartObject( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, const char* name, + TQObject* parent, const char* name, const char* classname, const TQStringList& args ); diff --git a/kpovmodeler/pmfiledialog.cpp b/kpovmodeler/pmfiledialog.cpp index 65ad11c8..96085f19 100644 --- a/kpovmodeler/pmfiledialog.cpp +++ b/kpovmodeler/pmfiledialog.cpp @@ -22,13 +22,13 @@ #include <kfilefiltercombo.h> -PMFileDialog::PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* tqparent, const char* name, bool modal ) - : KFileDialog( startDir, filter, tqparent, name, modal ) +PMFileDialog::PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* parent, const char* name, bool modal ) + : KFileDialog( startDir, filter, parent, name, modal ) { } -TQString PMFileDialog::getImportFileName( TQWidget* tqparent, PMPart* part, +TQString PMFileDialog::getImportFileName( TQWidget* parent, PMPart* part, PMIOFormat*& format ) { PMIOManager* manager = part->ioManager( ); @@ -52,7 +52,7 @@ TQString PMFileDialog::getImportFileName( TQWidget* tqparent, PMPart* part, } } - PMFileDialog dlg( TQString(), filter, tqparent, "import file dialog", true ); + PMFileDialog dlg( TQString(), filter, parent, "import file dialog", true ); dlg.setOperationMode( Opening ); dlg.setMode( KFile::File | KFile::LocalOnly ); dlg.setCaption( i18n( "Import" ) ); @@ -64,7 +64,7 @@ TQString PMFileDialog::getImportFileName( TQWidget* tqparent, PMPart* part, return dlg.selectedFile( ); } -TQString PMFileDialog::getExportFileName( TQWidget* tqparent, PMPart* part, +TQString PMFileDialog::getExportFileName( TQWidget* parent, PMPart* part, PMIOFormat*& format, TQString& selectedFilter ) { PMIOManager* manager = part->ioManager( ); @@ -88,7 +88,7 @@ TQString PMFileDialog::getExportFileName( TQWidget* tqparent, PMPart* part, } } - PMFileDialog dlg( TQString(), filter, tqparent, "export file dialog", true ); + PMFileDialog dlg( TQString(), filter, parent, "export file dialog", true ); dlg.setOperationMode( Saving ); dlg.setMode( KFile::File | KFile::LocalOnly ); dlg.setCaption( i18n( "Export" ) ); diff --git a/kpovmodeler/pmfiledialog.h b/kpovmodeler/pmfiledialog.h index 7aa69b70..16ed6944 100644 --- a/kpovmodeler/pmfiledialog.h +++ b/kpovmodeler/pmfiledialog.h @@ -44,17 +44,17 @@ public: * Default constructor, use the static methods * @ref getImportFileName or @ref getExportFileName instead */ - PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* tqparent, const char* name, bool modal ); + PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* parent, const char* name, bool modal ); /** * Opens a modal file dialog and returns a selected file and the chosen * file format. */ - static TQString getImportFileName( TQWidget* tqparent, PMPart* part, PMIOFormat*& format ); + static TQString getImportFileName( TQWidget* parent, PMPart* part, PMIOFormat*& format ); /** * Opens a modal file dialog and returns a selected file and the chosen * file format and filter. */ - static TQString getExportFileName( TQWidget* tqparent, PMPart* part, + static TQString getExportFileName( TQWidget* parent, PMPart* part, PMIOFormat*& format, TQString& filter ); }; diff --git a/kpovmodeler/pmfinish.cpp b/kpovmodeler/pmfinish.cpp index 190925fb..80898d97 100644 --- a/kpovmodeler/pmfinish.cpp +++ b/kpovmodeler/pmfinish.cpp @@ -637,9 +637,9 @@ void PMFinish::setIridTurbulence( double c ) } } -PMDialogEditBase* PMFinish::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMFinish::editWidget( TQWidget* parent ) const { - return new PMFinishEdit( tqparent ); + return new PMFinishEdit( parent ); } void PMFinish::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmfinish.h b/kpovmodeler/pmfinish.h index a33f9d40..2a7fda19 100644 --- a/kpovmodeler/pmfinish.h +++ b/kpovmodeler/pmfinish.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMFinishEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmfinish" ); } diff --git a/kpovmodeler/pmfinishedit.cpp b/kpovmodeler/pmfinishedit.cpp index 997fe901..e3513a5d 100644 --- a/kpovmodeler/pmfinishedit.cpp +++ b/kpovmodeler/pmfinishedit.cpp @@ -29,8 +29,8 @@ #include <kdialog.h> -PMFinishEdit::PMFinishEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMFinishEdit::PMFinishEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmfinishedit.h b/kpovmodeler/pmfinishedit.h index 9d37ce14..f7f5cafd 100644 --- a/kpovmodeler/pmfinishedit.h +++ b/kpovmodeler/pmfinishedit.h @@ -43,9 +43,9 @@ class PMFinishEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMFinishEdit with tqparent and name + * Creates a PMFinishEdit with parent and name */ - PMFinishEdit( TQWidget* tqparent, const char* name = 0 ); + PMFinishEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmfog.cpp b/kpovmodeler/pmfog.cpp index 1ece2757..36f39a30 100644 --- a/kpovmodeler/pmfog.cpp +++ b/kpovmodeler/pmfog.cpp @@ -284,9 +284,9 @@ void PMFog::setUp( const PMVector& c ) } } -PMDialogEditBase* PMFog::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMFog::editWidget( TQWidget* parent ) const { - return new PMFogEdit( tqparent ); + return new PMFogEdit( parent ); } void PMFog::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmfog.h b/kpovmodeler/pmfog.h index 2eac23a8..cfdfa539 100644 --- a/kpovmodeler/pmfog.h +++ b/kpovmodeler/pmfog.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMFogEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmfog" ); } diff --git a/kpovmodeler/pmfogedit.cpp b/kpovmodeler/pmfogedit.cpp index d993ad3f..ec9880c1 100644 --- a/kpovmodeler/pmfogedit.cpp +++ b/kpovmodeler/pmfogedit.cpp @@ -30,8 +30,8 @@ #include <kmessagebox.h> #include <kdialog.h> -PMFogEdit::PMFogEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMFogEdit::PMFogEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmfogedit.h b/kpovmodeler/pmfogedit.h index 3331f167..5dc1d301 100644 --- a/kpovmodeler/pmfogedit.h +++ b/kpovmodeler/pmfogedit.h @@ -46,9 +46,9 @@ class PMFogEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMFogEdit with tqparent and name + * Creates a PMFogEdit with parent and name */ - PMFogEdit( TQWidget* tqparent, const char* name = 0 ); + PMFogEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmformulalabel.cpp b/kpovmodeler/pmformulalabel.cpp index 1f1ffbf9..51b5e13f 100644 --- a/kpovmodeler/pmformulalabel.cpp +++ b/kpovmodeler/pmformulalabel.cpp @@ -46,8 +46,8 @@ TQString PMFormulaLabel::s_digit[10] = TQString PMFormulaLabel::s_nullString = TQString( "= 0" ); -PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_exponents[0] = exp.exponent( 0 ); m_exponents[1] = exp.exponent( 1 ); @@ -56,8 +56,8 @@ PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* tqparen calculateSizeHint( ); } -PMFormulaLabel::PMFormulaLabel( int x, int y, int z, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMFormulaLabel::PMFormulaLabel( int x, int y, int z, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_exponents[0] = x; m_exponents[1] = y; diff --git a/kpovmodeler/pmformulalabel.h b/kpovmodeler/pmformulalabel.h index bac843d2..00d75ed8 100644 --- a/kpovmodeler/pmformulalabel.h +++ b/kpovmodeler/pmformulalabel.h @@ -37,11 +37,11 @@ public: /** * Displays the exponents of the @ref PMPolynomExponents */ - PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* tqparent, const char* name = 0 ); + PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* parent, const char* name = 0 ); /** * Displays the given exponents */ - PMFormulaLabel( int x, int y, int z, TQWidget* tqparent, const char* name = 0 ); + PMFormulaLabel( int x, int y, int z, TQWidget* parent, const char* name = 0 ); /** * Destructor */ diff --git a/kpovmodeler/pmglobalphotons.cpp b/kpovmodeler/pmglobalphotons.cpp index 78834bf0..5d5835be 100644 --- a/kpovmodeler/pmglobalphotons.cpp +++ b/kpovmodeler/pmglobalphotons.cpp @@ -437,9 +437,9 @@ void PMGlobalPhotons::setRadiusMediaMulti( double rmm ) } } -PMDialogEditBase* PMGlobalPhotons::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMGlobalPhotons::editWidget( TQWidget* parent ) const { - return new PMGlobalPhotonsEdit( tqparent ); + return new PMGlobalPhotonsEdit( parent ); } void PMGlobalPhotons::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmglobalphotons.h b/kpovmodeler/pmglobalphotons.h index ad50b5a9..7a32b14e 100644 --- a/kpovmodeler/pmglobalphotons.h +++ b/kpovmodeler/pmglobalphotons.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMGlobalPhotonsEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmglobalphotonsedit.cpp b/kpovmodeler/pmglobalphotonsedit.cpp index 01c6479e..5a4a5572 100644 --- a/kpovmodeler/pmglobalphotonsedit.cpp +++ b/kpovmodeler/pmglobalphotonsedit.cpp @@ -29,8 +29,8 @@ #include <kmessagebox.h> -PMGlobalPhotonsEdit::PMGlobalPhotonsEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMGlobalPhotonsEdit::PMGlobalPhotonsEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmglobalphotonsedit.h b/kpovmodeler/pmglobalphotonsedit.h index 61db154f..4e963091 100644 --- a/kpovmodeler/pmglobalphotonsedit.h +++ b/kpovmodeler/pmglobalphotonsedit.h @@ -42,9 +42,9 @@ class PMGlobalPhotonsEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMGlobalPhotonsEdit with tqparent and name + * Creates a PMGlobalPhotonsEdit with parent and name */ - PMGlobalPhotonsEdit( TQWidget* tqparent, const char* name = 0 ); + PMGlobalPhotonsEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmglobalsettings.cpp b/kpovmodeler/pmglobalsettings.cpp index 739c45ff..1c75b40a 100644 --- a/kpovmodeler/pmglobalsettings.cpp +++ b/kpovmodeler/pmglobalsettings.cpp @@ -432,9 +432,9 @@ void PMGlobalSettings::setRecursionLimit( int c ) } } -PMDialogEditBase* PMGlobalSettings::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMGlobalSettings::editWidget( TQWidget* parent ) const { - return new PMGlobalSettingsEdit( tqparent ); + return new PMGlobalSettingsEdit( parent ); } void PMGlobalSettings::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmglobalsettings.h b/kpovmodeler/pmglobalsettings.h index b254afe0..fad60d92 100644 --- a/kpovmodeler/pmglobalsettings.h +++ b/kpovmodeler/pmglobalsettings.h @@ -68,7 +68,7 @@ public: /** * Returns a new @ref PMGlobalSettingsEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmglobalsettingsedit.cpp b/kpovmodeler/pmglobalsettingsedit.cpp index 8e47e845..027152e6 100644 --- a/kpovmodeler/pmglobalsettingsedit.cpp +++ b/kpovmodeler/pmglobalsettingsedit.cpp @@ -29,8 +29,8 @@ #include <kdialog.h> #include <kmessagebox.h> -PMGlobalSettingsEdit::PMGlobalSettingsEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMGlobalSettingsEdit::PMGlobalSettingsEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmglobalsettingsedit.h b/kpovmodeler/pmglobalsettingsedit.h index fbe8623d..07b9d96e 100644 --- a/kpovmodeler/pmglobalsettingsedit.h +++ b/kpovmodeler/pmglobalsettingsedit.h @@ -43,9 +43,9 @@ class PMGlobalSettingsEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMGlobalSettingsEdit with tqparent and name + * Creates a PMGlobalSettingsEdit with parent and name */ - PMGlobalSettingsEdit( TQWidget* tqparent, const char* name = 0 ); + PMGlobalSettingsEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp index 9b7779ae..2bd819c4 100644 --- a/kpovmodeler/pmglview.cpp +++ b/kpovmodeler/pmglview.cpp @@ -106,8 +106,8 @@ bool PMGLView::s_bDirect = true; PMGLView::PMGLView( PMPart* part, PMViewType t, - TQWidget* tqparent, const char* name, WFlags f ) - : PMViewBase( tqparent, name, f | TQt::WWinOwnDC | TQt::WRepaintNoErase ) + TQWidget* parent, const char* name, WFlags f ) + : PMViewBase( parent, name, f | TQt::WWinOwnDC | TQt::WRepaintNoErase ) { m_pPart = part; m_type = t; @@ -1178,9 +1178,9 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode, if( m_pCamera == ( PMCamera* ) obj ) invalidateProjection( ); - if( obj->tqparent( ) ) - if( obj->tqparent( )->type( ) == "Camera" ) - if( m_pCamera == ( PMCamera* ) obj->tqparent( ) ) + if( obj->parent( ) ) + if( obj->parent( )->type( ) == "Camera" ) + if( m_pCamera == ( PMCamera* ) obj->parent( ) ) if( obj->hasTransformationMatrix( ) ) invalidateProjection( ); } @@ -1209,9 +1209,9 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode, if( obj->type( ) == "Camera" ) if( !m_pCamera ) setCamera( ( PMCamera* ) obj ); - if( obj->tqparent( ) ) - if( obj->tqparent( )->type( ) == "Camera" ) - if( m_pCamera == ( PMCamera* ) obj->tqparent( ) ) + if( obj->parent( ) ) + if( obj->parent( )->type( ) == "Camera" ) + if( m_pCamera == ( PMCamera* ) obj->parent( ) ) if( obj->hasTransformationMatrix( ) ) invalidateProjection( ); } @@ -1225,9 +1225,9 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode, setCamera( 0 ); if( m_type == PMGLView::PMViewCamera ) - if( obj->tqparent( ) ) - if( obj->tqparent( )->type( ) == "Camera" ) - if( m_pCamera == ( PMCamera* ) obj->tqparent( ) ) + if( obj->parent( ) ) + if( obj->parent( )->type( ) == "Camera" ) + if( m_pCamera == ( PMCamera* ) obj->parent( ) ) if( obj->hasTransformationMatrix( ) ) invalidateProjection( ); @@ -1296,7 +1296,7 @@ PMObject* PMGLView::topLevelRenderingObject( PMObject* o ) const else if( obj->isA( "Scene" ) || obj->isA( "Declare" ) ) stop = true; else - obj = obj->tqparent( ); + obj = obj->parent( ); } while( !stop ); } @@ -1760,10 +1760,10 @@ TQString PMGLViewFactory::description( PMViewOptions* vo ) const return description( ); } -PMViewOptionsWidget* PMGLViewFactory::newOptionsWidget( TQWidget* tqparent, +PMViewOptionsWidget* PMGLViewFactory::newOptionsWidget( TQWidget* parent, PMViewOptions* o ) { - return new PMGLViewOptionsWidget( tqparent, o ); + return new PMGLViewOptionsWidget( parent, o ); } PMViewOptions* PMGLViewFactory::newOptionsInstance( ) const @@ -1772,9 +1772,9 @@ PMViewOptions* PMGLViewFactory::newOptionsInstance( ) const return o; } -PMGLViewOptionsWidget::PMGLViewOptionsWidget( TQWidget* tqparent, +PMGLViewOptionsWidget::PMGLViewOptionsWidget( TQWidget* parent, PMViewOptions* o ) - : PMViewOptionsWidget( tqparent ) + : PMViewOptionsWidget( parent ) { m_pOptions = ( PMGLViewOptions* ) o; diff --git a/kpovmodeler/pmglview.h b/kpovmodeler/pmglview.h index e6954370..9f1035af 100644 --- a/kpovmodeler/pmglview.h +++ b/kpovmodeler/pmglview.h @@ -62,7 +62,7 @@ public: * Constructor */ PMGLView( PMPart* part, PMViewType t, - TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 ); + TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); /** * Destructor */ @@ -559,9 +559,9 @@ public: virtual TQString description( ) const; virtual TQString description( PMViewOptions* ) const; virtual TQString iconName( ) const { return TQString( "pmglview" ); } - virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const + virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const { - return new PMGLView( part, PMGLView::PMViewPosX, tqparent ); + return new PMGLView( part, PMGLView::PMViewPosX, parent ); } virtual PMViewOptions* newOptionsInstance( ) const; virtual PMViewOptionsWidget* newOptionsWidget( TQWidget*, PMViewOptions* ); @@ -578,7 +578,7 @@ public: /** * Default constructor */ - PMGLViewOptionsWidget( TQWidget* tqparent, PMViewOptions* o ); + PMGLViewOptionsWidget( TQWidget* parent, PMViewOptions* o ); protected slots: void slotGLViewTypeChanged( int ); diff --git a/kpovmodeler/pmgraphicalobject.h b/kpovmodeler/pmgraphicalobject.h index 662f7682..19ea826d 100644 --- a/kpovmodeler/pmgraphicalobject.h +++ b/kpovmodeler/pmgraphicalobject.h @@ -101,7 +101,7 @@ public: */ void setVisibilityLevel( int level ); /** - * Returns true if the visibility level is relative to the objects tqparent + * Returns true if the visibility level is relative to the objects parent */ bool isVisibilityLevelRelative( ) const { return m_relativeVisibility; } /** diff --git a/kpovmodeler/pmgraphicalobjectedit.cpp b/kpovmodeler/pmgraphicalobjectedit.cpp index 106fbc2a..1429d75f 100644 --- a/kpovmodeler/pmgraphicalobjectedit.cpp +++ b/kpovmodeler/pmgraphicalobjectedit.cpp @@ -28,8 +28,8 @@ const int c_minValue = -1000; const int c_maxValue = 1000; -PMGraphicalObjectEdit::PMGraphicalObjectEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMGraphicalObjectEdit::PMGraphicalObjectEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } @@ -143,7 +143,7 @@ void PMGraphicalObjectEdit::slotLevelChanged( int ) void PMGraphicalObjectEdit::recalculateResultingVisibility( ) { - PMObject* o = m_pDisplayedObject->tqparent( ); + PMObject* o = m_pDisplayedObject->parent( ); PMGraphicalObject* go = 0; int level = 0; bool absoluteFound = false; @@ -152,7 +152,7 @@ void PMGraphicalObjectEdit::recalculateResultingVisibility( ) if( !m_pRelativeVisibility->isChecked( ) ) absoluteFound = true; - for( ; o && !absoluteFound; o = o->tqparent( ) ) + for( ; o && !absoluteFound; o = o->parent( ) ) { if( o->isA( "GraphicalObject" ) ) { diff --git a/kpovmodeler/pmgraphicalobjectedit.h b/kpovmodeler/pmgraphicalobjectedit.h index 36758f63..7564edae 100644 --- a/kpovmodeler/pmgraphicalobjectedit.h +++ b/kpovmodeler/pmgraphicalobjectedit.h @@ -41,9 +41,9 @@ class PMGraphicalObjectEdit : public PMDetailObjectEdit typedef PMDetailObjectEdit Base; public: /** - * Creates a PMGraphicalObjectEdit with tqparent and name + * Creates a PMGraphicalObjectEdit with parent and name */ - PMGraphicalObjectEdit( TQWidget* tqparent, const char* name = 0 ); + PMGraphicalObjectEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmgridsettings.cpp b/kpovmodeler/pmgridsettings.cpp index e13e303f..69319187 100644 --- a/kpovmodeler/pmgridsettings.cpp +++ b/kpovmodeler/pmgridsettings.cpp @@ -28,8 +28,8 @@ #include <kcolorbutton.h> #include <klocale.h> -PMGridSettings::PMGridSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMGridSettings::PMGridSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQHBoxLayout* htqlayout; TQVBoxLayout* vtqlayout; diff --git a/kpovmodeler/pmgridsettings.h b/kpovmodeler/pmgridsettings.h index 20b4f01e..01eb7b37 100644 --- a/kpovmodeler/pmgridsettings.h +++ b/kpovmodeler/pmgridsettings.h @@ -39,7 +39,7 @@ public: /** * Default constructor */ - PMGridSettings( TQWidget* tqparent, const char* name = 0 ); + PMGridSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmheightfield.cpp b/kpovmodeler/pmheightfield.cpp index 654cd43c..154c6f57 100644 --- a/kpovmodeler/pmheightfield.cpp +++ b/kpovmodeler/pmheightfield.cpp @@ -200,9 +200,9 @@ void PMHeightField::setWaterLevel( double wl ) } } -PMDialogEditBase* PMHeightField::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMHeightField::editWidget( TQWidget* parent ) const { - return new PMHeightFieldEdit( tqparent ); + return new PMHeightFieldEdit( parent ); } void PMHeightField::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmheightfield.h b/kpovmodeler/pmheightfield.h index 62afe95b..92d9724b 100644 --- a/kpovmodeler/pmheightfield.h +++ b/kpovmodeler/pmheightfield.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMHeightFieldEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmheightfieldedit.cpp b/kpovmodeler/pmheightfieldedit.cpp index b3de59fa..cc413acf 100644 --- a/kpovmodeler/pmheightfieldedit.cpp +++ b/kpovmodeler/pmheightfieldedit.cpp @@ -31,8 +31,8 @@ #include <kiconloader.h> #include <kfiledialog.h> -PMHeightFieldEdit::PMHeightFieldEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMHeightFieldEdit::PMHeightFieldEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmheightfieldedit.h b/kpovmodeler/pmheightfieldedit.h index 2b97b03a..a04e21b3 100644 --- a/kpovmodeler/pmheightfieldedit.h +++ b/kpovmodeler/pmheightfieldedit.h @@ -43,9 +43,9 @@ class PMHeightFieldEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMHeightFieldEdit with tqparent and name + * Creates a PMHeightFieldEdit with parent and name */ - PMHeightFieldEdit( TQWidget* tqparent, const char* name = 0 ); + PMHeightFieldEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmimagemap.cpp b/kpovmodeler/pmimagemap.cpp index 2040de46..e867f72e 100644 --- a/kpovmodeler/pmimagemap.cpp +++ b/kpovmodeler/pmimagemap.cpp @@ -459,9 +459,9 @@ void PMImageMap::setTransmits( const TQValueList<PMPaletteValue>& c ) } } -PMDialogEditBase* PMImageMap::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMImageMap::editWidget( TQWidget* parent ) const { - return new PMImageMapEdit( tqparent ); + return new PMImageMapEdit( parent ); } void PMImageMap::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmimagemap.h b/kpovmodeler/pmimagemap.h index 859fb5f3..4ee38233 100644 --- a/kpovmodeler/pmimagemap.h +++ b/kpovmodeler/pmimagemap.h @@ -86,7 +86,7 @@ public: /** * Returns a new @ref PMImageMapEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Gets the bitmap type diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp index 3804d89d..7f52442e 100644 --- a/kpovmodeler/pmimagemapedit.cpp +++ b/kpovmodeler/pmimagemapedit.cpp @@ -38,8 +38,8 @@ #include <kfiledialog.h> #include <kiconloader.h> -PMImageMapEdit::PMImageMapEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMImageMapEdit::PMImageMapEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmimagemapedit.h b/kpovmodeler/pmimagemapedit.h index 4b5d4b2e..3754bbf2 100644 --- a/kpovmodeler/pmimagemapedit.h +++ b/kpovmodeler/pmimagemapedit.h @@ -49,9 +49,9 @@ class PMImageMapEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMImageMapEdit with tqparent and name + * Creates a PMImageMapEdit with parent and name */ - PMImageMapEdit( TQWidget* tqparent, const char* name = 0 ); + PMImageMapEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pminserterrordialog.cpp b/kpovmodeler/pminserterrordialog.cpp index 65d1c66d..c0203984 100644 --- a/kpovmodeler/pminserterrordialog.cpp +++ b/kpovmodeler/pminserterrordialog.cpp @@ -25,8 +25,8 @@ PMInsertErrorDialog::PMInsertErrorDialog( int numObj, int numErrors, const TQStringList& details, - TQWidget* tqparent /*= 0*/, const char* name /*= 0*/ ) - : KDialogBase( tqparent, name, true, i18n( "Insert Errors" ), + TQWidget* parent /*= 0*/, const char* name /*= 0*/ ) + : KDialogBase( parent, name, true, i18n( "Insert Errors" ), Help | Ok | User1, Ok, false, i18n( "Details" ) ) { TQVBox* page = makeVBoxMainWidget( ); diff --git a/kpovmodeler/pminserterrordialog.h b/kpovmodeler/pminserterrordialog.h index 09eb32dd..fe4a48fe 100644 --- a/kpovmodeler/pminserterrordialog.h +++ b/kpovmodeler/pminserterrordialog.h @@ -39,11 +39,11 @@ class PMInsertErrorDialog : public KDialogBase TQ_OBJECT public: /** - * Creates a modal PMInsertErrorDialog with tqparent and name. + * Creates a modal PMInsertErrorDialog with parent and name. */ PMInsertErrorDialog( int NumberOfObjects, int NumberOfInsertErrors, const TQStringList& details, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); protected slots: void slotUser1( ); diff --git a/kpovmodeler/pminsertpopup.cpp b/kpovmodeler/pminsertpopup.cpp index addab3cf..0f8ffb23 100644 --- a/kpovmodeler/pminsertpopup.cpp +++ b/kpovmodeler/pminsertpopup.cpp @@ -21,11 +21,11 @@ #include <kiconloader.h> #include <tqcursor.h> -PMInsertPopup::PMInsertPopup( TQWidget* tqparent, bool multipleObjects, +PMInsertPopup::PMInsertPopup( TQWidget* parent, bool multipleObjects, int items, bool canInsertAllAsFirstChildren, bool canInsertAllAsLastChildren, bool canInsertAllAsSiblings, const char* name ) - : KPopupMenu( tqparent, name ) + : KPopupMenu( parent, name ) { TQString itemText; if( multipleObjects ) @@ -71,13 +71,13 @@ PMInsertPopup::PMInsertPopup( TQWidget* tqparent, bool multipleObjects, } } -int PMInsertPopup::choosePlace( TQWidget* tqparent, bool multipleObjects, +int PMInsertPopup::choosePlace( TQWidget* parent, bool multipleObjects, int items, bool canInsertAllAsFirstChildren, bool canInsertAllAsLastChildren, bool canInsertAllAsSiblings ) { int result; - PMInsertPopup* popup = new PMInsertPopup( tqparent, multipleObjects, items, + PMInsertPopup* popup = new PMInsertPopup( parent, multipleObjects, items, canInsertAllAsFirstChildren, canInsertAllAsLastChildren, canInsertAllAsSiblings ); diff --git a/kpovmodeler/pminsertpopup.h b/kpovmodeler/pminsertpopup.h index 3ec3ecd3..09aa796a 100644 --- a/kpovmodeler/pminsertpopup.h +++ b/kpovmodeler/pminsertpopup.h @@ -39,13 +39,13 @@ public: /** * Creates a popup menu * - * @param tqparent The tqparent widget + * @param parent The parent widget * @param multipleObjects True if more than one object will be inserted * @param items Which items to display. Can be a bitwise combination * of PMIFirstChild, PMILastChild, PMISibling. * @param name Internal name of the popup menu */ - PMInsertPopup( TQWidget* tqparent, bool multipleObjects, + PMInsertPopup( TQWidget* parent, bool multipleObjects, int items = PMIFirstChild | PMILastChild | PMISibling, bool canInsertAllAsFirstChildren = true, bool canInsertAllAsLastChildren = true, @@ -59,7 +59,7 @@ public: /** * Popups a PMInsertPopup menu * - * @param tqparent The tqparent widget + * @param parent The parent widget * @param multipleObjects True if more than one object will be inserted * @param items Which items to display. Can be a bitwise combination * of PMIFirstChild, PMILastChild, PMISibling. @@ -70,7 +70,7 @@ public: * * Returns the selected item or 0 if no item was selected. */ - static int choosePlace( TQWidget* tqparent, bool multipleObjects, + static int choosePlace( TQWidget* parent, bool multipleObjects, int items = PMIFirstChild | PMILastChild | PMISibling, bool canInsertAllAsFirstChildren = true, diff --git a/kpovmodeler/pminsertrulesystem.cpp b/kpovmodeler/pminsertrulesystem.cpp index 0cd2a4d0..7bd9e95a 100644 --- a/kpovmodeler/pminsertrulesystem.cpp +++ b/kpovmodeler/pminsertrulesystem.cpp @@ -767,12 +767,12 @@ bool PMRule::matches( const TQString& className ) return m; } -bool PMRule::evaluate( const PMObject* tqparent ) +bool PMRule::evaluate( const PMObject* parent ) { if( !m_pCondition ) return true; else - return m_pCondition->evaluate( tqparent ); + return m_pCondition->evaluate( parent ); } PMRuleTargetClass::PMRuleTargetClass( TQDomElement& e, diff --git a/kpovmodeler/pminsertrulesystem.h b/kpovmodeler/pminsertrulesystem.h index 2559fdba..e8d30039 100644 --- a/kpovmodeler/pminsertrulesystem.h +++ b/kpovmodeler/pminsertrulesystem.h @@ -535,7 +535,7 @@ public: /** * Returns the conditions value. */ - bool evaluate( const PMObject* tqparent ); + bool evaluate( const PMObject* parent ); private: TQPtrList<PMRuleCategory> m_categories; diff --git a/kpovmodeler/pminterior.cpp b/kpovmodeler/pminterior.cpp index b435ff29..7cc2d87c 100644 --- a/kpovmodeler/pminterior.cpp +++ b/kpovmodeler/pminterior.cpp @@ -281,9 +281,9 @@ void PMInterior::enableFadePower( bool c ) } } -PMDialogEditBase* PMInterior::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMInterior::editWidget( TQWidget* parent ) const { - return new PMInteriorEdit( tqparent ); + return new PMInteriorEdit( parent ); } void PMInterior::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pminterior.h b/kpovmodeler/pminterior.h index 234ad932..4f08ff80 100644 --- a/kpovmodeler/pminterior.h +++ b/kpovmodeler/pminterior.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMInteriorEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pminterior" ); } diff --git a/kpovmodeler/pminterioredit.cpp b/kpovmodeler/pminterioredit.cpp index 0149b01a..d9b427e7 100644 --- a/kpovmodeler/pminterioredit.cpp +++ b/kpovmodeler/pminterioredit.cpp @@ -27,8 +27,8 @@ #include <klocale.h> -PMInteriorEdit::PMInteriorEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMInteriorEdit::PMInteriorEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pminterioredit.h b/kpovmodeler/pminterioredit.h index 9c4c438a..e68a52d5 100644 --- a/kpovmodeler/pminterioredit.h +++ b/kpovmodeler/pminterioredit.h @@ -43,9 +43,9 @@ class PMInteriorEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMInteriorEdit with tqparent and name + * Creates a PMInteriorEdit with parent and name */ - PMInteriorEdit( TQWidget* tqparent, const char* name = 0 ); + PMInteriorEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pminteriortexture.cpp b/kpovmodeler/pminteriortexture.cpp index 3633b2a8..191c3c9b 100644 --- a/kpovmodeler/pminteriortexture.cpp +++ b/kpovmodeler/pminteriortexture.cpp @@ -68,8 +68,8 @@ TQString PMInteriorTexture::description( ) const return i18n( "interior texture" ); } -PMDialogEditBase* PMInteriorTexture::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMInteriorTexture::editWidget( TQWidget* parent ) const { - return new PMInteriorTextureEdit( tqparent ); + return new PMInteriorTextureEdit( parent ); } diff --git a/kpovmodeler/pminteriortexture.h b/kpovmodeler/pminteriortexture.h index 1f84b512..59f37af7 100644 --- a/kpovmodeler/pminteriortexture.h +++ b/kpovmodeler/pminteriortexture.h @@ -59,7 +59,7 @@ public: /** * Returns a new @ref PMTextureEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pminteriortexture" ); } diff --git a/kpovmodeler/pminteriortextureedit.cpp b/kpovmodeler/pminteriortextureedit.cpp index b13d3f7d..73f1e7e9 100644 --- a/kpovmodeler/pminteriortextureedit.cpp +++ b/kpovmodeler/pminteriortextureedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMInteriorTextureEdit::PMInteriorTextureEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMInteriorTextureEdit::PMInteriorTextureEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pminteriortextureedit.h b/kpovmodeler/pminteriortextureedit.h index a576c926..5f17b2e5 100644 --- a/kpovmodeler/pminteriortextureedit.h +++ b/kpovmodeler/pminteriortextureedit.h @@ -38,9 +38,9 @@ class PMInteriorTextureEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMTextureEdit with tqparent and name + * Creates a PMTextureEdit with parent and name */ - PMInteriorTextureEdit( TQWidget* tqparent, const char* name = 0 ); + PMInteriorTextureEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmisosurface.cpp b/kpovmodeler/pmisosurface.cpp index 94c28886..c47373f8 100644 --- a/kpovmodeler/pmisosurface.cpp +++ b/kpovmodeler/pmisosurface.cpp @@ -333,9 +333,9 @@ void PMIsoSurface::setAllIntersections( bool yes ) } } -PMDialogEditBase* PMIsoSurface::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMIsoSurface::editWidget( TQWidget* parent ) const { - return new PMIsoSurfaceEdit( tqparent ); + return new PMIsoSurfaceEdit( parent ); } void PMIsoSurface::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmisosurface.h b/kpovmodeler/pmisosurface.h index 298f7b26..b9b799a0 100644 --- a/kpovmodeler/pmisosurface.h +++ b/kpovmodeler/pmisosurface.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMIsoSurfaceEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmisosurfaceedit.cpp b/kpovmodeler/pmisosurfaceedit.cpp index 69338bcb..6b775fe4 100644 --- a/kpovmodeler/pmisosurfaceedit.cpp +++ b/kpovmodeler/pmisosurfaceedit.cpp @@ -28,8 +28,8 @@ #include <tqcheckbox.h> #include <klocale.h> -PMIsoSurfaceEdit::PMIsoSurfaceEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMIsoSurfaceEdit::PMIsoSurfaceEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmisosurfaceedit.h b/kpovmodeler/pmisosurfaceedit.h index c0a1dda4..6e6216cc 100644 --- a/kpovmodeler/pmisosurfaceedit.h +++ b/kpovmodeler/pmisosurfaceedit.h @@ -45,9 +45,9 @@ class PMIsoSurfaceEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMIsoSurfaceEdit with tqparent and name + * Creates a PMIsoSurfaceEdit with parent and name */ - PMIsoSurfaceEdit( TQWidget* tqparent, const char* name = 0 ); + PMIsoSurfaceEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmjuliafractal.cpp b/kpovmodeler/pmjuliafractal.cpp index 5a665606..04aaead7 100644 --- a/kpovmodeler/pmjuliafractal.cpp +++ b/kpovmodeler/pmjuliafractal.cpp @@ -272,9 +272,9 @@ void PMJuliaFractal::setExponent( const PMVector& e ) } } -PMDialogEditBase* PMJuliaFractal::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMJuliaFractal::editWidget( TQWidget* parent ) const { - return new PMJuliaFractalEdit( tqparent ); + return new PMJuliaFractalEdit( parent ); } void PMJuliaFractal::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmjuliafractal.h b/kpovmodeler/pmjuliafractal.h index c57df549..1e68a2d3 100644 --- a/kpovmodeler/pmjuliafractal.h +++ b/kpovmodeler/pmjuliafractal.h @@ -72,7 +72,7 @@ public: /** * Returns a new @ref PMJuliaFractalEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmjuliafractaledit.cpp b/kpovmodeler/pmjuliafractaledit.cpp index d0b79e59..4f595b0e 100644 --- a/kpovmodeler/pmjuliafractaledit.cpp +++ b/kpovmodeler/pmjuliafractaledit.cpp @@ -27,8 +27,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMJuliaFractalEdit::PMJuliaFractalEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMJuliaFractalEdit::PMJuliaFractalEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmjuliafractaledit.h b/kpovmodeler/pmjuliafractaledit.h index 21be7989..2beb3e3c 100644 --- a/kpovmodeler/pmjuliafractaledit.h +++ b/kpovmodeler/pmjuliafractaledit.h @@ -43,9 +43,9 @@ class PMJuliaFractalEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMJuliaFractalEdit with tqparent and name + * Creates a PMJuliaFractalEdit with parent and name */ - PMJuliaFractalEdit( TQWidget* tqparent, const char* name = 0 ); + PMJuliaFractalEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmlathe.cpp b/kpovmodeler/pmlathe.cpp index 4418559a..8e058a9b 100644 --- a/kpovmodeler/pmlathe.cpp +++ b/kpovmodeler/pmlathe.cpp @@ -261,9 +261,9 @@ void PMLathe::setPoints( const TQValueList<PMVector>& points ) } } -PMDialogEditBase* PMLathe::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMLathe::editWidget( TQWidget* parent ) const { - return new PMLatheEdit( tqparent ); + return new PMLatheEdit( parent ); } void PMLathe::createMemento( ) diff --git a/kpovmodeler/pmlathe.h b/kpovmodeler/pmlathe.h index d2e0648f..b059b8a8 100644 --- a/kpovmodeler/pmlathe.h +++ b/kpovmodeler/pmlathe.h @@ -74,7 +74,7 @@ public: /** * Returns a new @ref PMLatheEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmlatheedit.cpp b/kpovmodeler/pmlatheedit.cpp index c048d095..e90a4397 100644 --- a/kpovmodeler/pmlatheedit.cpp +++ b/kpovmodeler/pmlatheedit.cpp @@ -33,8 +33,8 @@ #include <kiconloader.h> #include <kmessagebox.h> -PMLatheEdit::PMLatheEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMLatheEdit::PMLatheEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmlatheedit.h b/kpovmodeler/pmlatheedit.h index c33a9711..83a0a4ec 100644 --- a/kpovmodeler/pmlatheedit.h +++ b/kpovmodeler/pmlatheedit.h @@ -47,9 +47,9 @@ class PMLatheEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMLatheEdit with tqparent and name + * Creates a PMLatheEdit with parent and name */ - PMLatheEdit( TQWidget* tqparent, const char* name = 0 ); + PMLatheEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp index 578391c8..df3c13d3 100644 --- a/kpovmodeler/pmlayoutsettings.cpp +++ b/kpovmodeler/pmlayoutsettings.cpp @@ -31,8 +31,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMLayoutSettings::PMLayoutSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQHBoxLayout* htqlayout; TQVBoxLayout* vtqlayout; diff --git a/kpovmodeler/pmlayoutsettings.h b/kpovmodeler/pmlayoutsettings.h index a7c8401c..856b423d 100644 --- a/kpovmodeler/pmlayoutsettings.h +++ b/kpovmodeler/pmlayoutsettings.h @@ -45,7 +45,7 @@ public: /** * Default constructor */ - PMLayoutSettings( TQWidget* tqparent, const char* name = 0 ); + PMLayoutSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmlibrarybrowser.cpp b/kpovmodeler/pmlibrarybrowser.cpp index 6ccfb077..bc7e1af7 100644 --- a/kpovmodeler/pmlibrarybrowser.cpp +++ b/kpovmodeler/pmlibrarybrowser.cpp @@ -47,9 +47,9 @@ // ************** PMLibraryBrowser ************************** -PMLibraryBrowserView::PMLibraryBrowserView( PMPart* /*part*/, TQWidget* tqparent /*= 0*/, +PMLibraryBrowserView::PMLibraryBrowserView( PMPart* /*part*/, TQWidget* parent /*= 0*/, const char* name /*=0*/ ) - : PMViewBase( tqparent, name ) + : PMViewBase( parent, name ) { TQHBoxLayout* hl = new TQHBoxLayout( this ); PMLibraryBrowserViewWidget* tv = new PMLibraryBrowserViewWidget( this ); @@ -61,8 +61,8 @@ TQString PMLibraryBrowserView::description( ) const return i18n( "Library View" ); } -PMLibraryBrowserViewWidget::PMLibraryBrowserViewWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMLibraryBrowserViewWidget::PMLibraryBrowserViewWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { setCaption( i18n( "Library Objects" ) ); diff --git a/kpovmodeler/pmlibrarybrowser.h b/kpovmodeler/pmlibrarybrowser.h index 7c8a1899..a094d199 100644 --- a/kpovmodeler/pmlibrarybrowser.h +++ b/kpovmodeler/pmlibrarybrowser.h @@ -53,7 +53,7 @@ public: /** * Default constructor */ - PMLibraryBrowserView( PMPart* part, TQWidget* tqparent, const char* name = 0 ); + PMLibraryBrowserView( PMPart* part, TQWidget* parent, const char* name = 0 ); /** */ virtual TQString viewType( ) const { return TQString( "librarybrowserview" ); } @@ -69,7 +69,7 @@ class PMLibraryBrowserViewWidget: public TQWidget Q_OBJECT TQ_OBJECT public: - PMLibraryBrowserViewWidget( TQWidget *tqparent, const char* name = NULL ); + PMLibraryBrowserViewWidget( TQWidget *parent, const char* name = NULL ); private slots: void resizeEvent( TQResizeEvent* ev ); @@ -112,9 +112,9 @@ public: virtual TQString viewType( ) const { return TQString( "librarybrowserview" ); } virtual TQString description( ) const; virtual TQString iconName( ) const { return TQString( "pmlibrarybrowserview" ); } - virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const + virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const { - return new PMLibraryBrowserView( part, tqparent ); + return new PMLibraryBrowserView( part, parent ); } }; diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp index c2d90cdd..a1ea53a1 100644 --- a/kpovmodeler/pmlibraryentrypreview.cpp +++ b/kpovmodeler/pmlibraryentrypreview.cpp @@ -39,8 +39,8 @@ #include <kmessagebox.h> #include <kfiledialog.h> -PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* tqparent ) : - TQWidget( tqparent ) +PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) : + TQWidget( parent ) { setAcceptDrops( true ); m_pPart = new PMPart( this, "treeview", NULL, "part", false, true ); diff --git a/kpovmodeler/pmlibraryentrypreview.h b/kpovmodeler/pmlibraryentrypreview.h index 35ef5d52..c269a2c1 100644 --- a/kpovmodeler/pmlibraryentrypreview.h +++ b/kpovmodeler/pmlibraryentrypreview.h @@ -45,7 +45,7 @@ class PMLibraryEntryPreview: public TQWidget TQ_OBJECT public: /** Constructor */ - PMLibraryEntryPreview( TQWidget *tqparent ); + PMLibraryEntryPreview( TQWidget *parent ); /** Destructor */ ~PMLibraryEntryPreview( ); diff --git a/kpovmodeler/pmlibraryhandle.h b/kpovmodeler/pmlibraryhandle.h index e20d6368..353b7b53 100644 --- a/kpovmodeler/pmlibraryhandle.h +++ b/kpovmodeler/pmlibraryhandle.h @@ -180,8 +180,8 @@ public: bool isSubLibrary( ) const { return m_subLibrary; } /** - * Changes the tqparent library if this is a sub library - * @param parentPath The new tqparent path for this library + * Changes the parent library if this is a sub library + * @param parentPath The new parent path for this library * @return PMLibraryHandle::Ok if successful or the reason for failure */ PMLibraryHandle::PMResult changeParentLibrary( const TQString& parentPath ); diff --git a/kpovmodeler/pmlibraryhandleedit.cpp b/kpovmodeler/pmlibraryhandleedit.cpp index d29c1c1f..e991af6e 100644 --- a/kpovmodeler/pmlibraryhandleedit.cpp +++ b/kpovmodeler/pmlibraryhandleedit.cpp @@ -36,8 +36,8 @@ TQSize PMLibraryHandleEdit::s_size = TQSize( 600, 400 ); -PMLibraryHandleEdit::PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "Create Library" ), +PMLibraryHandleEdit::PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n( "Create Library" ), Ok | Cancel, Ok ) { m_pLibrary = lib; diff --git a/kpovmodeler/pmlibraryhandleedit.h b/kpovmodeler/pmlibraryhandleedit.h index 77e3f0bd..88c7ed2c 100644 --- a/kpovmodeler/pmlibraryhandleedit.h +++ b/kpovmodeler/pmlibraryhandleedit.h @@ -43,7 +43,7 @@ public: * Construct a dialog to edit the properties of lib. The library will be * modified only if Ok is pressed. */ - PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget *tqparent = NULL, const char* name = NULL ); + PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget *parent = NULL, const char* name = NULL ); static void saveConfig( KConfig* cfg ); static void restoreConfig( KConfig* cfg ); diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp index 16778e76..39714cf8 100644 --- a/kpovmodeler/pmlibraryiconview.cpp +++ b/kpovmodeler/pmlibraryiconview.cpp @@ -104,8 +104,8 @@ void PMLibraryIconDrag::append( const TQIconDragItem &item, const TQRect &pr, m_subLibs.append( isSubLibrary ); } -PMLibraryIconView::PMLibraryIconView( TQWidget* tqparent, const char* name ) - : KIconView( tqparent, name ) +PMLibraryIconView::PMLibraryIconView( TQWidget* parent, const char* name ) + : KIconView( parent, name ) { m_pLibrary = NULL; m_pCurrentLibrary = NULL; @@ -192,15 +192,15 @@ TQDragObject* PMLibraryIconView::dragObject( ) return drag; } -PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *tqparent, const TQString &text, const TQString& path, bool isSubLibrary ) - : KIconViewItem( tqparent, text ) +PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *parent, const TQString &text, const TQString& path, bool isSubLibrary ) + : KIconViewItem( parent, text ) { m_path = path; m_isSubLibrary = isSubLibrary; } -PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *tqparent, const TQString &text, const TQImage& image, const TQString& path, bool isSubLibrary ) - : KIconViewItem( tqparent, text, image ) +PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *parent, const TQString &text, const TQImage& image, const TQString& path, bool isSubLibrary ) + : KIconViewItem( parent, text, image ) { m_path = path; m_isSubLibrary = isSubLibrary; diff --git a/kpovmodeler/pmlibraryiconview.h b/kpovmodeler/pmlibraryiconview.h index 84d4f5b0..dc297c26 100644 --- a/kpovmodeler/pmlibraryiconview.h +++ b/kpovmodeler/pmlibraryiconview.h @@ -65,7 +65,7 @@ class PMLibraryIconView: public KIconView Q_OBJECT TQ_OBJECT public: - PMLibraryIconView( TQWidget *tqparent, const char* name = NULL ); + PMLibraryIconView( TQWidget *parent, const char* name = NULL ); /** * Set the library base path @@ -101,8 +101,8 @@ private: class PMLibraryIconViewItem: public KIconViewItem { public: - PMLibraryIconViewItem( TQIconView *tqparent, const TQString& text, const TQString& path, bool isSubLibrary ); - PMLibraryIconViewItem( TQIconView *tqparent, const TQString& text, const TQImage& image, const TQString& path, bool isSubLibrary ); + PMLibraryIconViewItem( TQIconView *parent, const TQString& text, const TQString& path, bool isSubLibrary ); + PMLibraryIconViewItem( TQIconView *parent, const TQString& text, const TQImage& image, const TQString& path, bool isSubLibrary ); /** Get the path of the entry */ TQString path( ) const { return m_path; } diff --git a/kpovmodeler/pmlibraryobjectsearch.cpp b/kpovmodeler/pmlibraryobjectsearch.cpp index 9df12dac..30e5be5c 100644 --- a/kpovmodeler/pmlibraryobjectsearch.cpp +++ b/kpovmodeler/pmlibraryobjectsearch.cpp @@ -34,8 +34,8 @@ #include <kdialog.h> #include <klistview.h> -PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* tqparent ) : - TQWidget( tqparent, "" ) +PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* parent ) : + TQWidget( parent, "" ) { setMinimumSize( 780, 300 ); setMaximumSize( 800, 400 ); diff --git a/kpovmodeler/pmlibraryobjectsearch.h b/kpovmodeler/pmlibraryobjectsearch.h index 318735e4..bc9ac714 100644 --- a/kpovmodeler/pmlibraryobjectsearch.h +++ b/kpovmodeler/pmlibraryobjectsearch.h @@ -41,7 +41,7 @@ class PMLibraryObjectSearch: public TQWidget Q_OBJECT TQ_OBJECT public: - PMLibraryObjectSearch( TQWidget *tqparent ); + PMLibraryObjectSearch( TQWidget *parent ); private slots: void slotSearchButtonPressed( ); diff --git a/kpovmodeler/pmlight.cpp b/kpovmodeler/pmlight.cpp index 0bf2f005..22f1862d 100644 --- a/kpovmodeler/pmlight.cpp +++ b/kpovmodeler/pmlight.cpp @@ -564,9 +564,9 @@ void PMLight::setMediaAttenuation( bool y ) } } -PMDialogEditBase* PMLight::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMLight::editWidget( TQWidget* parent ) const { - return new PMLightEdit( tqparent ); + return new PMLightEdit( parent ); } void PMLight::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmlight.h b/kpovmodeler/pmlight.h index 4ceb0268..59053ab8 100644 --- a/kpovmodeler/pmlight.h +++ b/kpovmodeler/pmlight.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMLightEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmlightedit.cpp b/kpovmodeler/pmlightedit.cpp index 70625c00..e652d0a2 100644 --- a/kpovmodeler/pmlightedit.cpp +++ b/kpovmodeler/pmlightedit.cpp @@ -29,8 +29,8 @@ #include <klocale.h> -PMLightEdit::PMLightEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMLightEdit::PMLightEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmlightedit.h b/kpovmodeler/pmlightedit.h index 75b56530..d3a595c5 100644 --- a/kpovmodeler/pmlightedit.h +++ b/kpovmodeler/pmlightedit.h @@ -45,9 +45,9 @@ class PMLightEdit : public PMNamedObjectEdit typedef PMNamedObjectEdit Base; public: /** - * Creates a PMLightEdit with tqparent and name + * Creates a PMLightEdit with parent and name */ - PMLightEdit( TQWidget* tqparent, const char* name = 0 ); + PMLightEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmlightgroup.cpp b/kpovmodeler/pmlightgroup.cpp index af46e823..36f8d17a 100644 --- a/kpovmodeler/pmlightgroup.cpp +++ b/kpovmodeler/pmlightgroup.cpp @@ -103,9 +103,9 @@ void PMLightGroup::setGlobalLights( bool gl ) } } -PMDialogEditBase* PMLightGroup::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMLightGroup::editWidget( TQWidget* parent ) const { - return new PMLightGroupEdit( tqparent ); + return new PMLightGroupEdit( parent ); } void PMLightGroup::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmlightgroup.h b/kpovmodeler/pmlightgroup.h index 9c9de8b3..11762efa 100644 --- a/kpovmodeler/pmlightgroup.h +++ b/kpovmodeler/pmlightgroup.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMLightGroupEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmlightgroupedit.cpp b/kpovmodeler/pmlightgroupedit.cpp index 87f35ff0..73a75c6d 100644 --- a/kpovmodeler/pmlightgroupedit.cpp +++ b/kpovmodeler/pmlightgroupedit.cpp @@ -24,8 +24,8 @@ #include <tqcheckbox.h> #include <klocale.h> -PMLightGroupEdit::PMLightGroupEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMLightGroupEdit::PMLightGroupEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmlightgroupedit.h b/kpovmodeler/pmlightgroupedit.h index 8b1216fd..6a418bee 100644 --- a/kpovmodeler/pmlightgroupedit.h +++ b/kpovmodeler/pmlightgroupedit.h @@ -39,9 +39,9 @@ class PMLightGroupEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMLightGroupEdit with tqparent and name + * Creates a PMLightGroupEdit with parent and name */ - PMLightGroupEdit( TQWidget* tqparent, const char* name = 0 ); + PMLightGroupEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmlineedits.cpp b/kpovmodeler/pmlineedits.cpp index e6e350b6..7546894e 100644 --- a/kpovmodeler/pmlineedits.cpp +++ b/kpovmodeler/pmlineedits.cpp @@ -19,8 +19,8 @@ #include <kmessagebox.h> #include <klocale.h> -PMFloatEdit::PMFloatEdit( TQWidget* tqparent, const char* name /*= 0*/ ) - : TQLineEdit( tqparent, name ) +PMFloatEdit::PMFloatEdit( TQWidget* parent, const char* name /*= 0*/ ) + : TQLineEdit( parent, name ) { m_bCheckLower = false; m_bCheckUpper = false; @@ -129,8 +129,8 @@ void PMFloatEdit::slotEditTextChanged( const TQString& /*t*/ ) -PMIntEdit::PMIntEdit( TQWidget* tqparent, const char* name /*= 0*/ ) - : TQLineEdit( tqparent, name ) +PMIntEdit::PMIntEdit( TQWidget* parent, const char* name /*= 0*/ ) + : TQLineEdit( parent, name ) { m_bCheckLower = false; m_bCheckUpper = false; diff --git a/kpovmodeler/pmlineedits.h b/kpovmodeler/pmlineedits.h index 0db5619e..87cafaa7 100644 --- a/kpovmodeler/pmlineedits.h +++ b/kpovmodeler/pmlineedits.h @@ -39,7 +39,7 @@ public: /** * Simple constructor */ - PMFloatEdit( TQWidget* tqparent, const char* name = 0 ); + PMFloatEdit( TQWidget* parent, const char* name = 0 ); /** * Sets the validation for the lineedit. * @@ -96,7 +96,7 @@ public: /** * Simple constructor */ - PMIntEdit( TQWidget* tqparent, const char* name = 0 ); + PMIntEdit( TQWidget* parent, const char* name = 0 ); /** * Sets the validation for the lineedit. * diff --git a/kpovmodeler/pmlinkedit.cpp b/kpovmodeler/pmlinkedit.cpp index 2114c5fa..87f6203c 100644 --- a/kpovmodeler/pmlinkedit.cpp +++ b/kpovmodeler/pmlinkedit.cpp @@ -28,23 +28,23 @@ #include "pmobjectselect.h" PMLinkEdit::PMLinkEdit( const TQString& declareType, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) + TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_declareTypes.append( declareType ); init( ); } PMLinkEdit::PMLinkEdit( const TQStringList& declareTypes, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) + TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_declareTypes = declareTypes; init( ); } -PMLinkEdit::PMLinkEdit( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMLinkEdit::PMLinkEdit( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { init( ); } diff --git a/kpovmodeler/pmlinkedit.h b/kpovmodeler/pmlinkedit.h index 935d8940..7c0b7451 100644 --- a/kpovmodeler/pmlinkedit.h +++ b/kpovmodeler/pmlinkedit.h @@ -37,21 +37,21 @@ class PMLinkEdit : public TQWidget TQ_OBJECT public: /** - * Creates a link edit widget with tqparent and name. + * Creates a link edit widget with parent and name. * * Allows the selection of declares of type declareType. */ - PMLinkEdit( const TQString& declareType, TQWidget* tqparent, const char* name = 0 ); + PMLinkEdit( const TQString& declareType, TQWidget* parent, const char* name = 0 ); /** - * Creates a link edit widget with tqparent and name. + * Creates a link edit widget with parent and name. * * Allows the selection of declares of type declares. */ - PMLinkEdit( const TQStringList& declares, TQWidget* tqparent, const char* name = 0 ); + PMLinkEdit( const TQStringList& declares, TQWidget* parent, const char* name = 0 ); /** - * Creates a link edit widget with tqparent and name. + * Creates a link edit widget with parent and name. */ - PMLinkEdit( TQWidget* tqparent, const char* name = 0 ); + PMLinkEdit( TQWidget* parent, const char* name = 0 ); /** * Sets the displayed object and displays the link diff --git a/kpovmodeler/pmlistpattern.cpp b/kpovmodeler/pmlistpattern.cpp index 5a7a3f1f..3d368209 100644 --- a/kpovmodeler/pmlistpattern.cpp +++ b/kpovmodeler/pmlistpattern.cpp @@ -178,9 +178,9 @@ void PMListPattern::setMortar( double n ) } } -PMDialogEditBase* PMListPattern::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMListPattern::editWidget( TQWidget* parent ) const { - return new PMListPatternEdit( tqparent ); + return new PMListPatternEdit( parent ); } void PMListPattern::restoreMemento( PMMemento* s ) @@ -462,8 +462,8 @@ void PMNormalList::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMNormalList::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMNormalList::editWidget( TQWidget* parent ) const { - return new PMListPatternEdit( tqparent ); + return new PMListPatternEdit( parent ); } diff --git a/kpovmodeler/pmlistpattern.h b/kpovmodeler/pmlistpattern.h index 6c8a26a1..876c8c15 100644 --- a/kpovmodeler/pmlistpattern.h +++ b/kpovmodeler/pmlistpattern.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMListPatternEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the color list type @@ -313,7 +313,7 @@ public: /** * Returns a new @ref PMListPatternEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmnormallist" ); } diff --git a/kpovmodeler/pmlistpatternedit.cpp b/kpovmodeler/pmlistpatternedit.cpp index 240d87d2..bc897c61 100644 --- a/kpovmodeler/pmlistpatternedit.cpp +++ b/kpovmodeler/pmlistpatternedit.cpp @@ -31,8 +31,8 @@ #include <kmessagebox.h> -PMListPatternEdit::PMListPatternEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMListPatternEdit::PMListPatternEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmlistpatternedit.h b/kpovmodeler/pmlistpatternedit.h index 4e80e4d8..4b34ee93 100644 --- a/kpovmodeler/pmlistpatternedit.h +++ b/kpovmodeler/pmlistpatternedit.h @@ -42,9 +42,9 @@ class PMListPatternEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMListPatternEdit with tqparent and name + * Creates a PMListPatternEdit with parent and name */ - PMListPatternEdit( TQWidget* tqparent, const char* name = 0 ); + PMListPatternEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmlookslike.cpp b/kpovmodeler/pmlookslike.cpp index 2717c531..f6cd5d29 100644 --- a/kpovmodeler/pmlookslike.cpp +++ b/kpovmodeler/pmlookslike.cpp @@ -80,9 +80,9 @@ void PMLooksLike::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMLooksLike::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMLooksLike::editWidget( TQWidget* parent ) const { - return new PMNamedObjectEdit( tqparent ); + return new PMNamedObjectEdit( parent ); } void PMLooksLike::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmlookslike.h b/kpovmodeler/pmlookslike.h index 30127a6a..9e9c9d92 100644 --- a/kpovmodeler/pmlookslike.h +++ b/kpovmodeler/pmlookslike.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMLooksLikeEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmmaterial.cpp b/kpovmodeler/pmmaterial.cpp index 8eb8866f..b37d98bb 100644 --- a/kpovmodeler/pmmaterial.cpp +++ b/kpovmodeler/pmmaterial.cpp @@ -68,8 +68,8 @@ TQString PMMaterial::description( ) const return i18n( "material" ); } -PMDialogEditBase* PMMaterial::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMMaterial::editWidget( TQWidget* parent ) const { - return new PMMaterialEdit( tqparent ); + return new PMMaterialEdit( parent ); } diff --git a/kpovmodeler/pmmaterial.h b/kpovmodeler/pmmaterial.h index 6e092aed..955e4515 100644 --- a/kpovmodeler/pmmaterial.h +++ b/kpovmodeler/pmmaterial.h @@ -59,7 +59,7 @@ public: /** * Returns a new @ref PMMaterialEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmmaterial" ); } diff --git a/kpovmodeler/pmmaterialedit.cpp b/kpovmodeler/pmmaterialedit.cpp index 4500e947..f03fcd43 100644 --- a/kpovmodeler/pmmaterialedit.cpp +++ b/kpovmodeler/pmmaterialedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMMaterialEdit::PMMaterialEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMMaterialEdit::PMMaterialEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmmaterialedit.h b/kpovmodeler/pmmaterialedit.h index 0671d3a7..fa9ee842 100644 --- a/kpovmodeler/pmmaterialedit.h +++ b/kpovmodeler/pmmaterialedit.h @@ -38,9 +38,9 @@ class PMMaterialEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMMaterialEdit with tqparent and name + * Creates a PMMaterialEdit with parent and name */ - PMMaterialEdit( TQWidget* tqparent, const char* name = 0 ); + PMMaterialEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmmaterialmap.cpp b/kpovmodeler/pmmaterialmap.cpp index faffd857..8ef5dc93 100644 --- a/kpovmodeler/pmmaterialmap.cpp +++ b/kpovmodeler/pmmaterialmap.cpp @@ -296,9 +296,9 @@ void PMMaterialMap::enableOnce( bool c ) } } -PMDialogEditBase* PMMaterialMap::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMMaterialMap::editWidget( TQWidget* parent ) const { - return new PMMaterialMapEdit( tqparent ); + return new PMMaterialMapEdit( parent ); } void PMMaterialMap::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmmaterialmap.h b/kpovmodeler/pmmaterialmap.h index 6f810274..f5cc3ca9 100644 --- a/kpovmodeler/pmmaterialmap.h +++ b/kpovmodeler/pmmaterialmap.h @@ -87,7 +87,7 @@ public: /** * Returns a new @ref PMMaterialMapEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Gets the bitmap type diff --git a/kpovmodeler/pmmaterialmapedit.cpp b/kpovmodeler/pmmaterialmapedit.cpp index 93c61405..491f9d76 100644 --- a/kpovmodeler/pmmaterialmapedit.cpp +++ b/kpovmodeler/pmmaterialmapedit.cpp @@ -38,8 +38,8 @@ #include <kfiledialog.h> #include <kiconloader.h> -PMMaterialMapEdit::PMMaterialMapEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMMaterialMapEdit::PMMaterialMapEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmmaterialmapedit.h b/kpovmodeler/pmmaterialmapedit.h index e1d4e9f3..c1cb3bec 100644 --- a/kpovmodeler/pmmaterialmapedit.h +++ b/kpovmodeler/pmmaterialmapedit.h @@ -46,9 +46,9 @@ class PMMaterialMapEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMMaterialMapEdit with tqparent and name + * Creates a PMMaterialMapEdit with parent and name */ - PMMaterialMapEdit( TQWidget* tqparent, const char* name = 0 ); + PMMaterialMapEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); /** */ diff --git a/kpovmodeler/pmmedia.cpp b/kpovmodeler/pmmedia.cpp index b149b84d..e487d6e9 100644 --- a/kpovmodeler/pmmedia.cpp +++ b/kpovmodeler/pmmedia.cpp @@ -399,9 +399,9 @@ void PMMedia::enableScattering( bool c ) } } -PMDialogEditBase* PMMedia::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMMedia::editWidget( TQWidget* parent ) const { - return new PMMediaEdit( tqparent ); + return new PMMediaEdit( parent ); } void PMMedia::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmmedia.h b/kpovmodeler/pmmedia.h index e984bebd..78adc338 100644 --- a/kpovmodeler/pmmedia.h +++ b/kpovmodeler/pmmedia.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMMediaEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmmedia" ); } diff --git a/kpovmodeler/pmmediaedit.cpp b/kpovmodeler/pmmediaedit.cpp index 0f63b009..f89f7d10 100644 --- a/kpovmodeler/pmmediaedit.cpp +++ b/kpovmodeler/pmmediaedit.cpp @@ -29,8 +29,8 @@ #include <kmessagebox.h> #include <kdialog.h> -PMMediaEdit::PMMediaEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMMediaEdit::PMMediaEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmmediaedit.h b/kpovmodeler/pmmediaedit.h index 021a5b77..275d7029 100644 --- a/kpovmodeler/pmmediaedit.h +++ b/kpovmodeler/pmmediaedit.h @@ -44,9 +44,9 @@ class PMMediaEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMMediaEdit with tqparent and name + * Creates a PMMediaEdit with parent and name */ - PMMediaEdit( TQWidget* tqparent, const char* name = 0 ); + PMMediaEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmmesh.cpp b/kpovmodeler/pmmesh.cpp index a56ea635..fc1791bf 100644 --- a/kpovmodeler/pmmesh.cpp +++ b/kpovmodeler/pmmesh.cpp @@ -189,9 +189,9 @@ void PMMesh::setInsideVector( const PMVector& iv ) } } -PMDialogEditBase* PMMesh::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMMesh::editWidget( TQWidget* parent ) const { - return new PMMeshEdit( tqparent ); + return new PMMeshEdit( parent ); } void PMMesh::createMemento( ) diff --git a/kpovmodeler/pmmesh.h b/kpovmodeler/pmmesh.h index 74155060..6c1c6054 100644 --- a/kpovmodeler/pmmesh.h +++ b/kpovmodeler/pmmesh.h @@ -68,7 +68,7 @@ public: /** * Returns a new @ref PMMeshEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmmeshedit.cpp b/kpovmodeler/pmmeshedit.cpp index 09285268..61bea7a1 100644 --- a/kpovmodeler/pmmeshedit.cpp +++ b/kpovmodeler/pmmeshedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMMeshEdit::PMMeshEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMMeshEdit::PMMeshEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmmeshedit.h b/kpovmodeler/pmmeshedit.h index e9d71054..83b9d161 100644 --- a/kpovmodeler/pmmeshedit.h +++ b/kpovmodeler/pmmeshedit.h @@ -40,9 +40,9 @@ class PMMeshEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMMeshEdit with tqparent and name + * Creates a PMMeshEdit with parent and name */ - PMMeshEdit( TQWidget* tqparent, const char* name = 0 ); + PMMeshEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmmovecommand.cpp b/kpovmodeler/pmmovecommand.cpp index 124de7a3..7f14e871 100644 --- a/kpovmodeler/pmmovecommand.cpp +++ b/kpovmodeler/pmmovecommand.cpp @@ -29,19 +29,19 @@ #include <klocale.h> #include <tqptrdict.h> -PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* tqparent, PMObject* after ) +PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* parent, PMObject* after ) : PMCommand( i18n( "Move %1" ).tqarg( obj->description( ) ) ) { - m_pParent = tqparent; + m_pParent = parent; m_pAfter = after; - if( obj->tqparent( ) ) + if( obj->parent( ) ) { m_infoList.append( new PMDeleteInfo( obj ) ); } else { - // object has no tqparent! + // object has no parent! // top level objects can't be moved, move all child items PMObject* tmp; for( tmp = obj->firstChild( ); tmp; tmp = tmp->nextSibling( ) ) @@ -52,7 +52,7 @@ PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* tqparent, PMObject* after m_firstExecution = true; } -PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* tqparent, +PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* parent, PMObject* after ) : PMCommand( i18n( "Move Objects" ) ) { @@ -60,11 +60,11 @@ PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* tqparent, for( ; it.current( ); ++it ) { - if( it.current( )->tqparent( ) ) + if( it.current( )->parent( ) ) m_infoList.append( new PMDeleteInfo( it.current( ) ) ); else { - // object has no tqparent! + // object has no parent! // top level objects can't be moved, move all child items PMObject* tmp; for( tmp = it.current( )->firstChild( ); tmp; tmp = tmp->nextSibling( ) ) @@ -72,7 +72,7 @@ PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* tqparent, } } - m_pParent = tqparent; + m_pParent = parent; m_pAfter = after; m_executed = false; m_firstExecution = true; @@ -97,19 +97,19 @@ void PMMoveCommand::execute( PMCommandManager* theManager ) PMObject* obj; bool error = false; PMDeleteInfo* info = 0; - PMObject* tqparent; + PMObject* parent; for( it.toLast( ); it.current( ); --it ) { info = it.current( ); - tqparent = info->tqparent( ); + parent = info->parent( ); // signal has to be emitted before the item is removed theManager->cmdObjectChanged( info->deletedObject( ), PMCRemove ); if( m_firstExecution ) - if( tqparent->dataChangeOnInsertRemove( ) - && !tqparent->mementoCreated( ) ) - tqparent->createMemento( ); - tqparent->takeChild( info->deletedObject( ) ); + if( parent->dataChangeOnInsertRemove( ) + && !parent->mementoCreated( ) ) + parent->createMemento( ); + parent->takeChild( info->deletedObject( ) ); } // insert at new position @@ -165,10 +165,10 @@ void PMMoveCommand::execute( PMCommandManager* theManager ) for( it.toLast( ); it.current( ); --it ) { info = it.current( ); - tqparent = info->tqparent( ); + parent = info->parent( ); - if( tqparent->mementoCreated( ) ) - m_dataChanges.append( tqparent->takeMemento( ) ); + if( parent->mementoCreated( ) ) + m_dataChanges.append( parent->takeMemento( ) ); } } @@ -197,18 +197,18 @@ void PMMoveCommand::undo( PMCommandManager* theManager ) // signal has to be emitted before the item is removed obj = it.current( )->deletedObject( ); theManager->cmdObjectChanged( obj, PMCRemove ); - if( obj->tqparent( ) ) - obj->tqparent( )->takeChild( obj ); + if( obj->parent( ) ) + obj->parent( )->takeChild( obj ); } for( it.toFirst( ); it.current( ); ++it ) { obj = it.current( )->deletedObject( ); if( it.current( )->prevSibling( ) ) - it.current( )->tqparent( ) + it.current( )->parent( ) ->insertChildAfter( obj, it.current( )->prevSibling( ) ); else - it.current( )->tqparent( )->insertChild( obj, 0 ); + it.current( )->parent( )->insertChild( obj, 0 ); theManager->cmdObjectChanged( obj, PMCAdd ); } @@ -279,7 +279,7 @@ int PMMoveCommand::errorFlags( PMPart* ) { insideSelection = false; for( obj = links.current( ); obj && !insideSelection; - obj = obj->tqparent( ) ) + obj = obj->parent( ) ) { if( deletedObjects.find( obj ) ) insideSelection = true; @@ -288,7 +288,7 @@ int PMMoveCommand::errorFlags( PMPart* ) if( insideSelection ) { bool stop = false; - for( obj = links.current( ); obj && !stop; obj = obj->tqparent( ) ) + for( obj = links.current( ); obj && !stop; obj = obj->parent( ) ) { if( deletedObjects.find( obj ) ) stop = true; @@ -305,17 +305,17 @@ int PMMoveCommand::errorFlags( PMPart* ) if( m_pAfter ) { // insert point is not the first item - // find the top level tqparent item + // find the top level parent item stop = false; obj = links.current( ); do { - if( obj->tqparent( ) ) + if( obj->parent( ) ) { - if( obj->tqparent( )->type( ) == "Scene" ) + if( obj->parent( )->type( ) == "Scene" ) stop = true; else - obj = obj->tqparent( ); + obj = obj->parent( ); } else stop = true; // error @@ -325,7 +325,7 @@ int PMMoveCommand::errorFlags( PMPart* ) PMObject* topParent = obj; // check if insert point is before the top level - // tqparent object + // parent object if( !objectsAfterInsertPosition.find( obj ) ) { @@ -383,12 +383,12 @@ int PMMoveCommand::errorFlags( PMPart* ) obj = m_pParent; do { - if( obj->tqparent( ) ) + if( obj->parent( ) ) { - if( obj->tqparent( )->type( ) == "Scene" ) + if( obj->parent( )->type( ) == "Scene" ) stop = true; else - obj = obj->tqparent( ); + obj = obj->parent( ); } else stop = true; // error diff --git a/kpovmodeler/pmmovecommand.h b/kpovmodeler/pmmovecommand.h index 188d721c..934f7fa4 100644 --- a/kpovmodeler/pmmovecommand.h +++ b/kpovmodeler/pmmovecommand.h @@ -39,23 +39,23 @@ public: /** * Command that moves one PMObject. * - * The object obj will be inserted as child of tqparent after + * The object obj will be inserted as child of parent after * the object after. * * If after is 0, the object becomes the first child. */ - PMMoveCommand( PMObject* obj, PMObject* tqparent, PMObject* after ); + PMMoveCommand( PMObject* obj, PMObject* parent, PMObject* after ); /** * Command that moves a list of new PMObjects. * The objects don't have to be siblings of each other. * - * The object in the list will be inserted as tqchildren of tqparent after + * The object in the list will be inserted as tqchildren of parent after * the object after. * * If after is 0, the objects will be inserted as first tqchildren. */ - PMMoveCommand( const PMObjectList& list, PMObject* tqparent, PMObject* after ); + PMMoveCommand( const PMObjectList& list, PMObject* parent, PMObject* after ); /** * Deletes the command. */ diff --git a/kpovmodeler/pmnamedobjectedit.cpp b/kpovmodeler/pmnamedobjectedit.cpp index afcbe0d6..f9179f74 100644 --- a/kpovmodeler/pmnamedobjectedit.cpp +++ b/kpovmodeler/pmnamedobjectedit.cpp @@ -24,8 +24,8 @@ #include <tqlabel.h> #include <klocale.h> -PMNamedObjectEdit::PMNamedObjectEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMNamedObjectEdit::PMNamedObjectEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmnamedobjectedit.h b/kpovmodeler/pmnamedobjectedit.h index ce7c8024..fe1def5b 100644 --- a/kpovmodeler/pmnamedobjectedit.h +++ b/kpovmodeler/pmnamedobjectedit.h @@ -39,9 +39,9 @@ class PMNamedObjectEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMNamedObjectEdit with tqparent and name + * Creates a PMNamedObjectEdit with parent and name */ - PMNamedObjectEdit( TQWidget* tqparent, const char* name = 0 ); + PMNamedObjectEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmnormal.cpp b/kpovmodeler/pmnormal.cpp index c2afe835..b6e7bb07 100644 --- a/kpovmodeler/pmnormal.cpp +++ b/kpovmodeler/pmnormal.cpp @@ -109,9 +109,9 @@ void PMNormal::readAttributes( const PMXMLHelper& h ) m_uvMapping = h.boolAttribute( "uv_mapping", false ); } -PMDialogEditBase* PMNormal::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMNormal::editWidget( TQWidget* parent ) const { - return new PMNormalEdit( tqparent ); + return new PMNormalEdit( parent ); } void PMNormal::enableBumpSize( bool c ) diff --git a/kpovmodeler/pmnormal.h b/kpovmodeler/pmnormal.h index 2294b1fc..a179a3ed 100644 --- a/kpovmodeler/pmnormal.h +++ b/kpovmodeler/pmnormal.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMNormalEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmnormal" ); } diff --git a/kpovmodeler/pmnormaledit.cpp b/kpovmodeler/pmnormaledit.cpp index 5d5c6eee..68d6f1f3 100644 --- a/kpovmodeler/pmnormaledit.cpp +++ b/kpovmodeler/pmnormaledit.cpp @@ -27,8 +27,8 @@ #include <klocale.h> -PMNormalEdit::PMNormalEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMNormalEdit::PMNormalEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmnormaledit.h b/kpovmodeler/pmnormaledit.h index f3fa45b7..1f12a45f 100644 --- a/kpovmodeler/pmnormaledit.h +++ b/kpovmodeler/pmnormaledit.h @@ -40,9 +40,9 @@ class PMNormalEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMNormalEdit with tqparent and name + * Creates a PMNormalEdit with parent and name */ - PMNormalEdit( TQWidget* tqparent, const char* name = 0 ); + PMNormalEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmobject.cpp b/kpovmodeler/pmobject.cpp index 71424eaf..579bd00b 100644 --- a/kpovmodeler/pmobject.cpp +++ b/kpovmodeler/pmobject.cpp @@ -142,9 +142,9 @@ bool PMObject::takeChild( uint ) return false; } -PMDialogEditBase* PMObject::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMObject::editWidget( TQWidget* parent ) const { - return new PMDialogEditBase( tqparent ); + return new PMDialogEditBase( parent ); // return 0; } @@ -177,7 +177,7 @@ PMMatrix PMObject::transformedWith( ) const else if( o->nextSibling( ) ) o = o->nextSibling( ); else - o = o->tqparent( ); + o = o->parent( ); while( o ) { @@ -187,7 +187,7 @@ PMMatrix PMObject::transformedWith( ) const if( o->nextSibling( ) ) o = o->nextSibling( ); else - o = o->tqparent( ); + o = o->parent( ); } return result; diff --git a/kpovmodeler/pmobject.h b/kpovmodeler/pmobject.h index 1275f3d9..3bffb7d3 100644 --- a/kpovmodeler/pmobject.h +++ b/kpovmodeler/pmobject.h @@ -61,11 +61,11 @@ class PMObject friend class PMCompositeObject; public: /** - * Creates an empty PMObject without tqparent. + * Creates an empty PMObject without parent. */ PMObject( PMPart* part ); /** - * Copy constructor. All object pointers (tqparent, siblings) are set to 0! + * Copy constructor. All object pointers (parent, siblings) are set to 0! */ PMObject( const PMObject& o ); /** @@ -121,9 +121,9 @@ public: virtual bool exportPovray( ) const { return true; } /** - * Returns a pointer to the tqparent object. + * Returns a pointer to the parent object. */ - PMObject* tqparent( ) const { return m_pParent; } + PMObject* parent( ) const { return m_pParent; } /** * Returns a pointer to the corresponding part */ @@ -385,7 +385,7 @@ public: void setSelected( bool s ); /** * Returns true if this item can be selected. An item cannot be selected - * if a tqparent object is selected + * if a parent object is selected */ bool isSelectable( ); /** @@ -411,9 +411,9 @@ public: * Creates a new edit widget that can display this object and * returns a pointer to it. * - * The widget will be created as a child of tqparent. + * The widget will be created as a child of parent. */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view @@ -470,7 +470,7 @@ public: protected: /** * Adds num to the number of selected objects in this object and all - * tqparent objects. num can be negative. + * parent objects. num can be negative. */ virtual void adjustSelectedChildren( int /*num*/ ) { }; /** @@ -479,7 +479,7 @@ protected: PMMemento* m_pMemento; private: /** - * Pointer to the tqparent object. 0 if the object has no tqparent. + * Pointer to the parent object. 0 if the object has no parent. */ PMObject* m_pParent; /** diff --git a/kpovmodeler/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp index d57e5949..93f9f419 100644 --- a/kpovmodeler/pmobjectlibrarysettings.cpp +++ b/kpovmodeler/pmobjectlibrarysettings.cpp @@ -33,8 +33,8 @@ #include <kmessagebox.h> #include <kstandarddirs.h> -PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); diff --git a/kpovmodeler/pmobjectlibrarysettings.h b/kpovmodeler/pmobjectlibrarysettings.h index dd9d30ce..be921d26 100644 --- a/kpovmodeler/pmobjectlibrarysettings.h +++ b/kpovmodeler/pmobjectlibrarysettings.h @@ -40,7 +40,7 @@ public: /** * Default constructor */ - PMObjectLibrarySettings( TQWidget* tqparent, const char* name = 0 ); + PMObjectLibrarySettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmobjectlink.cpp b/kpovmodeler/pmobjectlink.cpp index b6add85b..f99bb92b 100644 --- a/kpovmodeler/pmobjectlink.cpp +++ b/kpovmodeler/pmobjectlink.cpp @@ -167,9 +167,9 @@ void PMObjectLink::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMObjectLink::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMObjectLink::editWidget( TQWidget* parent ) const { - return new PMObjectLinkEdit( tqparent ); + return new PMObjectLinkEdit( parent ); } void PMObjectLink::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmobjectlink.h b/kpovmodeler/pmobjectlink.h index dce54498..7bc55b59 100644 --- a/kpovmodeler/pmobjectlink.h +++ b/kpovmodeler/pmobjectlink.h @@ -80,7 +80,7 @@ public: /** * Returns a new @ref PMObjectLinkEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmobjectlink" ); } diff --git a/kpovmodeler/pmobjectlinkedit.cpp b/kpovmodeler/pmobjectlinkedit.cpp index c2ddf61b..98aead0c 100644 --- a/kpovmodeler/pmobjectlinkedit.cpp +++ b/kpovmodeler/pmobjectlinkedit.cpp @@ -24,8 +24,8 @@ #include <tqlayout.h> -PMObjectLinkEdit::PMObjectLinkEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMObjectLinkEdit::PMObjectLinkEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmobjectlinkedit.h b/kpovmodeler/pmobjectlinkedit.h index 82ed645d..58313c26 100644 --- a/kpovmodeler/pmobjectlinkedit.h +++ b/kpovmodeler/pmobjectlinkedit.h @@ -39,9 +39,9 @@ class PMObjectLinkEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMObjectLinkEdit with tqparent and name + * Creates a PMObjectLinkEdit with parent and name */ - PMObjectLinkEdit( TQWidget* tqparent, const char* name = 0 ); + PMObjectLinkEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmobjectselect.cpp b/kpovmodeler/pmobjectselect.cpp index e234921a..fcfbb3f5 100644 --- a/kpovmodeler/pmobjectselect.cpp +++ b/kpovmodeler/pmobjectselect.cpp @@ -84,8 +84,8 @@ PMListBoxObject::~PMListBoxObject( ) TQSize PMObjectSelect::s_size = TQSize( 200, 300 ); -PMObjectSelect::PMObjectSelect( TQWidget* tqparent, const char* name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n( "Choose Object" ), Ok | Cancel ) +PMObjectSelect::PMObjectSelect( TQWidget* parent, const char* name, bool modal ) + : KDialogBase( parent, name, modal, i18n( "Choose Object" ), Ok | Cancel ) { m_pSelectedObject = 0; m_pListBox = new TQListBox( this ); @@ -110,7 +110,7 @@ void PMObjectSelect::addObject( PMObject* obj ) } int PMObjectSelect::selectObject( PMObject* link, const TQString& t, - PMObject* & obj, TQWidget* tqparent ) + PMObject* & obj, TQWidget* parent ) { PMObject* last = link; PMObject* scene; @@ -119,7 +119,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t, do { - scene = last->tqparent( ); + scene = last->parent( ); if( scene ) { if( scene->type( ) == "Scene" ) @@ -129,7 +129,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t, found = true; } else - last = last->tqparent( ); + last = last->parent( ); } else stop = true; @@ -138,7 +138,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t, if( found ) { - PMObjectSelect s( tqparent ); + PMObjectSelect s( parent ); PMObject* o = scene->firstChild( ); bool l = false; @@ -167,7 +167,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t, int PMObjectSelect::selectObject( PMObject* link, const TQStringList& t, - PMObject* & obj, TQWidget* tqparent ) + PMObject* & obj, TQWidget* parent ) { PMObject* last = link; PMObject* scene; @@ -176,7 +176,7 @@ int PMObjectSelect::selectObject( PMObject* link, do { - scene = last->tqparent( ); + scene = last->parent( ); if( scene ) { if( scene->type( ) == "Scene" ) @@ -186,7 +186,7 @@ int PMObjectSelect::selectObject( PMObject* link, found = true; } else - last = last->tqparent( ); + last = last->parent( ); } else stop = true; @@ -195,7 +195,7 @@ int PMObjectSelect::selectObject( PMObject* link, if( found ) { - PMObjectSelect s( tqparent ); + PMObjectSelect s( parent ); PMObject* o = scene->firstChild( ); bool l = false; @@ -223,7 +223,7 @@ int PMObjectSelect::selectObject( PMObject* link, } int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType, - PMObject* & obj, TQWidget* tqparent ) + PMObject* & obj, TQWidget* parent ) { PMObject* last = link; PMObject* scene; @@ -232,7 +232,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType, do { - scene = last->tqparent( ); + scene = last->parent( ); if( scene ) { if( scene->type( ) == "Scene" ) @@ -242,7 +242,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType, found = true; } else - last = last->tqparent( ); + last = last->parent( ); } else stop = true; @@ -251,7 +251,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType, if( found ) { - PMObjectSelect s( tqparent ); + PMObjectSelect s( parent ); PMObject* o = scene->firstChild( ); PMDeclare* decl; @@ -285,7 +285,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType, } int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTypes, - PMObject* & obj, TQWidget* tqparent ) + PMObject* & obj, TQWidget* parent ) { PMObject* last = link; PMObject* scene; @@ -294,7 +294,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy do { - scene = last->tqparent( ); + scene = last->parent( ); if( scene ) { if( scene->type( ) == "Scene" ) @@ -304,7 +304,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy found = true; } else - last = last->tqparent( ); + last = last->parent( ); } else stop = true; @@ -313,7 +313,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy if( found ) { - PMObjectSelect s( tqparent ); + PMObjectSelect s( parent ); PMObject* o = scene->firstChild( ); PMDeclare* decl; diff --git a/kpovmodeler/pmobjectselect.h b/kpovmodeler/pmobjectselect.h index c8604eb4..8ef83583 100644 --- a/kpovmodeler/pmobjectselect.h +++ b/kpovmodeler/pmobjectselect.h @@ -87,9 +87,9 @@ class PMObjectSelect : public KDialogBase TQ_OBJECT public: /** - * Creates a selection widget with tqparent and name + * Creates a selection widget with parent and name */ - PMObjectSelect( TQWidget* tqparent = 0, const char* name = 0, + PMObjectSelect( TQWidget* parent = 0, const char* name = 0, bool modal = true ); /** * Deletes the dialog @@ -113,13 +113,13 @@ public: * Only objects above the object link are listed. */ static int selectObject( PMObject* link, const TQString& t, PMObject* & obj, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); static int selectObject( PMObject* link, const TQStringList& t, - PMObject* & obj, TQWidget* tqparent = 0 ); + PMObject* & obj, TQWidget* parent = 0 ); static int selectDeclare( PMObject* link, const TQString& declareType, - PMObject* & obj, TQWidget* tqparent = 0 ); + PMObject* & obj, TQWidget* parent = 0 ); static int selectDeclare( PMObject* link, const TQStringList& dt, - PMObject* & obj, TQWidget* tqparent = 0 ); + PMObject* & obj, TQWidget* parent = 0 ); protected slots: void slotHighlighted( TQListBoxItem* lbi ); diff --git a/kpovmodeler/pmobjectsettings.cpp b/kpovmodeler/pmobjectsettings.cpp index b02efbb8..77e7f0f5 100644 --- a/kpovmodeler/pmobjectsettings.cpp +++ b/kpovmodeler/pmobjectsettings.cpp @@ -44,8 +44,8 @@ #include <klocale.h> -PMObjectSettings::PMObjectSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMObjectSettings::PMObjectSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQHBoxLayout* htqlayout; TQVBoxLayout* vtqlayout; diff --git a/kpovmodeler/pmobjectsettings.h b/kpovmodeler/pmobjectsettings.h index 216b2c2f..1fcbc95e 100644 --- a/kpovmodeler/pmobjectsettings.h +++ b/kpovmodeler/pmobjectsettings.h @@ -39,7 +39,7 @@ public: /** * Default constructor */ - PMObjectSettings( TQWidget* tqparent, const char* name = 0 ); + PMObjectSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmopenglsettings.cpp b/kpovmodeler/pmopenglsettings.cpp index 0b76abdc..07376933 100644 --- a/kpovmodeler/pmopenglsettings.cpp +++ b/kpovmodeler/pmopenglsettings.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <klocale.h> -PMOpenGLSettings::PMOpenGLSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMOpenGLSettings::PMOpenGLSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); diff --git a/kpovmodeler/pmopenglsettings.h b/kpovmodeler/pmopenglsettings.h index 265cc056..5f05edcd 100644 --- a/kpovmodeler/pmopenglsettings.h +++ b/kpovmodeler/pmopenglsettings.h @@ -37,7 +37,7 @@ public: /** * Default constructor */ - PMOpenGLSettings( TQWidget* tqparent, const char* name = 0 ); + PMOpenGLSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp index b81caa78..25e1ac64 100644 --- a/kpovmodeler/pmpalettevalueedit.cpp +++ b/kpovmodeler/pmpalettevalueedit.cpp @@ -35,8 +35,8 @@ #include <kdialog.h> #include <kfiledialog.h> -PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { TQLabel* lbl; TQHBoxLayout* tqlayout; diff --git a/kpovmodeler/pmpalettevalueedit.h b/kpovmodeler/pmpalettevalueedit.h index 86e7cc0c..a0ea00dc 100644 --- a/kpovmodeler/pmpalettevalueedit.h +++ b/kpovmodeler/pmpalettevalueedit.h @@ -38,7 +38,7 @@ class PMPaletteValueEdit: public TQWidget TQ_OBJECT public: /** */ - PMPaletteValueEdit( TQWidget* tqparent, const char* name = 0 ); + PMPaletteValueEdit( TQWidget* parent, const char* name = 0 ); /** */ void setIndex( int idx ); /** */ diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp index 99398ce7..52a64acc 100644 --- a/kpovmodeler/pmparser.cpp +++ b/kpovmodeler/pmparser.cpp @@ -177,18 +177,18 @@ int PMParser::errorFlags( ) const } -void PMParser::parse( PMObjectList* list, PMObject* tqparent, +void PMParser::parse( PMObjectList* list, PMObject* parent, PMObject* after ) { m_pResultList = list; - m_pTopParent = tqparent; + m_pTopParent = parent; m_pAfter = after; // find first item, that can be a declare and can be used as link // for parsed objects. - if( tqparent ) + if( parent ) { - if( tqparent->type( ) == "Scene" ) + if( parent->type( ) == "Scene" ) { if( after ) m_pNextCheckDeclare = after; @@ -197,19 +197,19 @@ void PMParser::parse( PMObjectList* list, PMObject* tqparent, } else { - PMObject* obj = tqparent; + PMObject* obj = parent; bool stop = false; - // go to parents, until the tqparent is the scene + // go to parents, until the parent is the scene // (declares can only be inserted as top level objects) do { - if( obj->tqparent( ) ) + if( obj->parent( ) ) { - if( obj->tqparent( )->type( ) == "Scene" ) + if( obj->parent( )->type( ) == "Scene" ) stop = true; else - obj = obj->tqparent( ); + obj = obj->parent( ); } else { @@ -219,7 +219,7 @@ void PMParser::parse( PMObjectList* list, PMObject* tqparent, } while( obj && !stop ); - // now obj is the top level tqparent of the object, where parsed objects + // now obj is the top level parent of the object, where parsed objects // will be inserted if( obj ) m_pNextCheckDeclare = obj->prevSibling( ); @@ -240,22 +240,22 @@ void PMParser::parse( PMObjectList* list, PMObject* tqparent, setFatalError( ); } -bool PMParser::insertChild( PMObject* child, PMObject* tqparent ) +bool PMParser::insertChild( PMObject* child, PMObject* parent ) { bool inserted = false; - if( tqparent ) + if( parent ) { - if( tqparent->canInsert( child, tqparent->lastChild( ) ) ) + if( parent->canInsert( child, parent->lastChild( ) ) ) { - tqparent->appendChild( child ); + parent->appendChild( child ); inserted = true; } else { printError( i18n( "Can't insert %1 into %2." ) .tqarg( child->description( ) ) - .tqarg( tqparent->description( ) ) ); + .tqarg( parent->description( ) ) ); } } else diff --git a/kpovmodeler/pmparser.h b/kpovmodeler/pmparser.h index 3c48bb49..07a28ab6 100644 --- a/kpovmodeler/pmparser.h +++ b/kpovmodeler/pmparser.h @@ -81,13 +81,13 @@ public: * * Appends all parsed objects to the list. * - * tqparent is the object where the parsed objects will be inserted as + * parent is the object where the parsed objects will be inserted as * tqchildren behind the object after. These parameters are used to check * the consistency of declares and links. * - * Set tqparent and after to 0 if and only if a document is parsed/opened. + * Set parent and after to 0 if and only if a document is parsed/opened. */ - void parse( PMObjectList* list, PMObject* tqparent, + void parse( PMObjectList* list, PMObject* parent, PMObject* after ); /** @@ -196,12 +196,12 @@ public: */ PMSymbol* getSymbol( const TQString& id ) const; /** - * Tries to insert obj as child of tqparent. If tqparent is 0, the object + * Tries to insert obj as child of parent. If parent is 0, the object * will be inserted in the list of top level objects. * * Returns true if the object could be inserted. */ - bool insertChild( PMObject* obj, PMObject* tqparent ); + bool insertChild( PMObject* obj, PMObject* parent ); protected: /** @@ -217,7 +217,7 @@ protected: */ PMPart* m_pPart; /** - * tqparent object where the parsed top level objects + * parent object where the parsed top level objects * will be inserted _later_ (not from the parser) as tqchildren */ const PMObject* m_pTopParent; diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp index 01b36deb..b9105b29 100644 --- a/kpovmodeler/pmpart.cpp +++ b/kpovmodeler/pmpart.cpp @@ -100,10 +100,10 @@ TQTime PMDebugTime; //#define KPM_WITH_OBJECT_LIBRARY PMPart::PMPart( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, const char* name, bool readwrite, + TQObject* parent, const char* name, bool readwrite, PMShell* shell ) : DCOPObject( "PMPartIface" ), - KParts::ReadWritePart( tqparent, name ), + KParts::ReadWritePart( parent, name ), m_commandManager( this ) { setPluginLoadingMode( LoadPlugins ); @@ -162,10 +162,10 @@ PMPart::PMPart( TQWidget* parentWidget, const char* widgetName, } PMPart::PMPart( TQWidget* /*parentWidget*/, const char* /*widgetName*/, - TQObject* tqparent, const char* name, bool readwrite, + TQObject* parent, const char* name, bool readwrite, bool /*onlyCutPaste*/, PMShell* shell ) : DCOPObject( "LibraryBrowserIface" ), - KParts::ReadWritePart( tqparent, name ), + KParts::ReadWritePart( parent, name ), m_commandManager( this ) { setPluginLoadingMode( LoadPlugins ); @@ -662,8 +662,8 @@ void PMPart::updateNewObjectActions( ) bool readWriteParent = false; if( m_pActiveObject ) - if( m_pActiveObject->tqparent( ) ) - if( !m_pActiveObject->tqparent( )->isReadOnly( ) ) + if( m_pActiveObject->parent( ) ) + if( !m_pActiveObject->parent( )->isReadOnly( ) ) readWriteParent = true; for( ; it.current( ); ++it ) @@ -685,7 +685,7 @@ void PMPart::updateNewObjectActions( ) enable = m_pActiveObject->canInsert( insertName, m_pActiveObject->lastChild( ) ); if( !enable ) if( readWriteParent ) - enable |= m_pActiveObject->tqparent( )->canInsert( insertName, m_pActiveObject ); + enable |= m_pActiveObject->parent( )->canInsert( insertName, m_pActiveObject ); } else enable = false; @@ -701,7 +701,7 @@ void PMPart::updateNewObjectActions( ) enable = m_pActiveObject->canInsert( TQString( "CSG" ), m_pActiveObject->lastChild( ) ); if( !enable ) if( readWriteParent ) - enable = m_pActiveObject->tqparent( )->canInsert( TQString( "CSG" ), m_pActiveObject ); + enable = m_pActiveObject->parent( )->canInsert( TQString( "CSG" ), m_pActiveObject ); } else enable = false; @@ -725,13 +725,13 @@ void PMPart::initDocument( ) newDocument( ); } -void PMPart::initView( TQWidget* tqparent, const char* name ) +void PMPart::initView( TQWidget* parent, const char* name ) { if( !m_pShell ) { // a part inside konqueror // simple tqlayout - m_pView = new PMView( this, tqparent, name ); + m_pView = new PMView( this, parent, name ); m_pView->show( ); setWidget( m_pView ); } @@ -995,7 +995,7 @@ TQString PMPart::activeObjectName( ) result = tmpObj->type( ) + "/" + result; // go up in the scene - tmpObj = tmpObj->tqparent( ); + tmpObj = tmpObj->parent( ); idx = 0; } @@ -1240,9 +1240,9 @@ int PMPart::whereToInsert( PMObject* obj, const PMObjectList& list ) } } - if( obj->tqparent( ) ) + if( obj->parent( ) ) { - PMObject* p = obj->tqparent( ); + PMObject* p = obj->parent( ); if( !p->isReadOnly( ) ) { canInsertAsSibling = p->canInsert( list, obj ); @@ -1301,9 +1301,9 @@ int PMPart::whereToInsert( PMObject* obj, const TQStringList& list ) } } - if( obj->tqparent( ) ) + if( obj->parent( ) ) { - PMObject* p = obj->tqparent( ); + PMObject* p = obj->parent( ); if( !p->isReadOnly( ) ) { canInsertAsSibling = p->canInsert( list, obj ); @@ -1336,7 +1336,7 @@ int PMPart::whereToInsert( PMObject* obj ) int insertAs = 0; int insertPossibilities = 0; - if( obj->tqparent( ) ) + if( obj->parent( ) ) { insertAs |= PMInsertPopup::PMISibling; insertPossibilities++; @@ -1513,7 +1513,7 @@ bool PMPart::dragMoveSelectionTo( PMObject* obj ) command = new PMMoveCommand( sortedList, obj, hlp ); break; case PMInsertPopup::PMISibling: - command = new PMMoveCommand( sortedList, obj->tqparent( ), obj ); + command = new PMMoveCommand( sortedList, obj->parent( ), obj ); break; } } @@ -1600,30 +1600,30 @@ bool PMPart::insertFromParser( const TQString& type, PMParser* parser, if( success && insertAs ) { - PMObject* tqparent = 0; + PMObject* parent = 0; PMObject* after = 0; switch( insertAs ) { case PMInsertPopup::PMIFirstChild: - tqparent = obj; + parent = obj; after = 0; break; case PMInsertPopup::PMILastChild: - tqparent = obj; + parent = obj; after = obj->lastChild( ); break; case PMInsertPopup::PMISibling: - tqparent = obj->tqparent( ); + parent = obj->parent( ); after = obj; break; default: - tqparent = obj; + parent = obj; after = 0; break; } - parser->parse( &list, tqparent, after ); + parser->parse( &list, parent, after ); success = !( parser->warnings( ) || parser->errors( ) ); if( !success ) @@ -1639,7 +1639,7 @@ bool PMPart::insertFromParser( const TQString& type, PMParser* parser, if( success ) { // parsing was successful - command = new PMAddCommand( list, tqparent, after ); + command = new PMAddCommand( list, parent, after ); command->setText( type ); success = executeCommand( command ); @@ -1850,8 +1850,8 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m, if( mode & PMCRemove ) { - if( obj->tqparent( ) ) - if( obj->tqparent( ) == m_pActiveObject ) + if( obj->parent( ) ) + if( obj->parent( ) == m_pActiveObject ) m_updateNewObjectActions = true; if( m_pNewSelection == obj ) { @@ -1859,8 +1859,8 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m, m_pNewSelection = obj->nextSibling( ); else if( obj->prevSibling( ) ) m_pNewSelection = obj->nextSibling( ); - else if( obj->tqparent( ) ) - m_pNewSelection = obj->tqparent( ); + else if( obj->parent( ) ) + m_pNewSelection = obj->parent( ); else m_pNewSelection = 0; } @@ -1873,8 +1873,8 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m, m_pNewSelection = obj->nextSibling( ); else if( obj->prevSibling( ) ) m_pNewSelection = obj->prevSibling( ); - else if( obj->tqparent( ) ) - m_pNewSelection = obj->tqparent( ); + else if( obj->parent( ) ) + m_pNewSelection = obj->parent( ); else m_pNewSelection = 0; } @@ -1911,8 +1911,8 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m, if( obj->type( ) == "Camera" ) m_bCameraListUpToDate = false; } - if( obj->tqparent( ) ) - if( obj->tqparent( ) == m_pActiveObject ) + if( obj->parent( ) ) + if( obj->parent( ) == m_pActiveObject ) m_updateNewObjectActions = true; m_numAddedObjects++; } @@ -2028,7 +2028,7 @@ void PMPart::slotNewObject( PMObject* newObject, int insertAs ) break; case PMInsertPopup::PMISibling: command = new PMAddCommand( list, - m_pActiveObject->tqparent( ), + m_pActiveObject->parent( ), m_pActiveObject ); break; default: @@ -2525,8 +2525,8 @@ void PMPart::clearSelection( ) m_pNewSelection = it.current( )->nextSibling( ); else if( it.current( )->prevSibling( ) ) m_pNewSelection = it.current( )->prevSibling( ); - else if( it.current( )->tqparent( ) ) - m_pNewSelection = it.current( )->tqparent( ); + else if( it.current( )->parent( ) ) + m_pNewSelection = it.current( )->parent( ); for( ; it.current( ); ++it ) { @@ -2537,8 +2537,8 @@ void PMPart::clearSelection( ) m_pNewSelection = it.current( )->nextSibling( ); else if( it.current( )->prevSibling( ) ) m_pNewSelection = it.current( )->prevSibling( ); - else if( it.current( )->tqparent( ) ) - m_pNewSelection = it.current( )->tqparent( ); + else if( it.current( )->parent( ) ) + m_pNewSelection = it.current( )->parent( ); } } } diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h index 30a60d41..d5a507b4 100644 --- a/kpovmodeler/pmpart.h +++ b/kpovmodeler/pmpart.h @@ -77,7 +77,7 @@ public: * application. */ PMPart( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, const char* name, bool readWrite, + TQObject* parent, const char* name, bool readWrite, PMShell* shell = 0 ); /** @@ -85,7 +85,7 @@ public: * application. It does not create the main widget. */ PMPart( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, const char* name, bool readWrite, + TQObject* parent, const char* name, bool readWrite, bool onlyCutPaste, PMShell* shell = 0 ); /** @@ -771,7 +771,7 @@ protected: * creates the widget of the part instance and sets * it as the view */ - void initView( TQWidget* tqparent, const char* name ); + void initView( TQWidget* parent, const char* name ); /** * initializes the documents contents */ @@ -1029,8 +1029,8 @@ class PMBrowserExtension : public KParts::BrowserExtension TQ_OBJECT friend class PMPart; public: - PMBrowserExtension( PMPart* tqparent ) - : KParts::BrowserExtension( tqparent, "PMBrowserExtension" ) + PMBrowserExtension( PMPart* parent ) + : KParts::BrowserExtension( parent, "PMBrowserExtension" ) { KGlobal::locale()->insertCatalogue("kpovmodeler"); } diff --git a/kpovmodeler/pmpattern.cpp b/kpovmodeler/pmpattern.cpp index bafbedda..95a975fc 100644 --- a/kpovmodeler/pmpattern.cpp +++ b/kpovmodeler/pmpattern.cpp @@ -982,9 +982,9 @@ void PMPattern::setDepth( const double c ) } } -PMDialogEditBase* PMPattern::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPattern::editWidget( TQWidget* parent ) const { - return new PMPatternEdit( tqparent ); + return new PMPatternEdit( parent ); } void PMPattern::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmpattern.h b/kpovmodeler/pmpattern.h index 8b742280..ff184e15 100644 --- a/kpovmodeler/pmpattern.h +++ b/kpovmodeler/pmpattern.h @@ -88,7 +88,7 @@ public: /** * Returns a new @ref PMPatternEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Gets the pattern type diff --git a/kpovmodeler/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp index 87f5c987..c8d815a8 100644 --- a/kpovmodeler/pmpatternedit.cpp +++ b/kpovmodeler/pmpatternedit.cpp @@ -38,8 +38,8 @@ #include <kfiledialog.h> #include <kiconloader.h> -PMPatternEdit::PMPatternEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPatternEdit::PMPatternEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } @@ -510,7 +510,7 @@ void PMPatternEdit::displayObject( PMObject* o ) m_pLambdaEdit->setValue( m_pDisplayedObject->lambda( ) ); m_pLambdaEdit->setReadOnly( readOnly ); - if( o->tqparent( ) && ( o->tqparent( )->type( ) == "Normal" ) ) + if( o->parent( ) && ( o->parent( )->type( ) == "Normal" ) ) { m_pDepthEdit->setValue( m_pDisplayedObject->depth( ) ); m_pDepthEdit->setReadOnly( readOnly ); @@ -685,8 +685,8 @@ void PMPatternEdit::saveContents( ) m_pDisplayedObject->setOmega( m_pOmegaEdit->value( ) ); m_pDisplayedObject->setLambda( m_pLambdaEdit->value( ) ); - if( m_pDisplayedObject->tqparent( ) && - ( m_pDisplayedObject->tqparent( )->type( ) == "Normal" ) ) + if( m_pDisplayedObject->parent( ) && + ( m_pDisplayedObject->parent( )->type( ) == "Normal" ) ) m_pDisplayedObject->setDepth( m_pDepthEdit->value( ) ); } } @@ -740,8 +740,8 @@ bool PMPatternEdit::isDataValid( ) if( !m_pOmegaEdit->isDataValid( ) ) return false; if( !m_pLambdaEdit->isDataValid( ) ) return false; } - if( m_pDisplayedObject->tqparent( ) && - m_pDisplayedObject->tqparent( )->type( ) == "Normal" && + if( m_pDisplayedObject->parent( ) && + m_pDisplayedObject->parent( )->type( ) == "Normal" && !m_pDepthEdit->isDataValid( ) ) return false; diff --git a/kpovmodeler/pmpatternedit.h b/kpovmodeler/pmpatternedit.h index fea9f140..18c250db 100644 --- a/kpovmodeler/pmpatternedit.h +++ b/kpovmodeler/pmpatternedit.h @@ -49,9 +49,9 @@ class PMPatternEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMPatternEdit with tqparent and name + * Creates a PMPatternEdit with parent and name */ - PMPatternEdit( TQWidget* tqparent, const char* name = 0 ); + PMPatternEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmphotons.cpp b/kpovmodeler/pmphotons.cpp index 129fc28f..8a904f86 100644 --- a/kpovmodeler/pmphotons.cpp +++ b/kpovmodeler/pmphotons.cpp @@ -192,9 +192,9 @@ void PMPhotons::setAreaLight( bool al ) } } -PMDialogEditBase* PMPhotons::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPhotons::editWidget( TQWidget* parent ) const { - return new PMPhotonsEdit( tqparent ); + return new PMPhotonsEdit( parent ); } void PMPhotons::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmphotons.h b/kpovmodeler/pmphotons.h index 6fa8ad3c..34ecf25a 100644 --- a/kpovmodeler/pmphotons.h +++ b/kpovmodeler/pmphotons.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMPhotonsEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmphotonsedit.cpp b/kpovmodeler/pmphotonsedit.cpp index 0dbf8871..a2fde9a2 100644 --- a/kpovmodeler/pmphotonsedit.cpp +++ b/kpovmodeler/pmphotonsedit.cpp @@ -28,8 +28,8 @@ #include <kmessagebox.h> -PMPhotonsEdit::PMPhotonsEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPhotonsEdit::PMPhotonsEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } @@ -84,7 +84,7 @@ void PMPhotonsEdit::displayObject( PMObject* o ) bool readOnly = o->isReadOnly( ); m_pDisplayedObject = ( PMPhotons* ) o; - if ( o->tqparent( ) && ( o->tqparent( )->isA( "Light" ) ) ) + if ( o->parent( ) && ( o->parent( )->isA( "Light" ) ) ) { m_pLayoutWidget->hide( ); m_pCollect->hide( ); diff --git a/kpovmodeler/pmphotonsedit.h b/kpovmodeler/pmphotonsedit.h index c5950eb1..3f6d5971 100644 --- a/kpovmodeler/pmphotonsedit.h +++ b/kpovmodeler/pmphotonsedit.h @@ -41,9 +41,9 @@ class PMPhotonsEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMPhotonsEdit with tqparent and name + * Creates a PMPhotonsEdit with parent and name */ - PMPhotonsEdit( TQWidget* tqparent, const char* name = 0 ); + PMPhotonsEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmpigment.cpp b/kpovmodeler/pmpigment.cpp index 697ac24f..d6f611b3 100644 --- a/kpovmodeler/pmpigment.cpp +++ b/kpovmodeler/pmpigment.cpp @@ -72,9 +72,9 @@ TQString PMPigment::description( ) const return i18n( "pigment" ); } -PMDialogEditBase* PMPigment::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPigment::editWidget( TQWidget* parent ) const { - return new PMPigmentEdit( tqparent ); + return new PMPigmentEdit( parent ); } void PMPigment::serialize( TQDomElement& e, TQDomDocument& doc ) const diff --git a/kpovmodeler/pmpigment.h b/kpovmodeler/pmpigment.h index 4a1e6322..3f88d3ad 100644 --- a/kpovmodeler/pmpigment.h +++ b/kpovmodeler/pmpigment.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMPigmentEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmpigment" ); } diff --git a/kpovmodeler/pmpigmentedit.cpp b/kpovmodeler/pmpigmentedit.cpp index 761cb1bb..16bfab2c 100644 --- a/kpovmodeler/pmpigmentedit.cpp +++ b/kpovmodeler/pmpigmentedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMPigmentEdit::PMPigmentEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPigmentEdit::PMPigmentEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmpigmentedit.h b/kpovmodeler/pmpigmentedit.h index 578bdb46..82ca91e1 100644 --- a/kpovmodeler/pmpigmentedit.h +++ b/kpovmodeler/pmpigmentedit.h @@ -39,9 +39,9 @@ class PMPigmentEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMPigmentEdit with tqparent and name + * Creates a PMPigmentEdit with parent and name */ - PMPigmentEdit( TQWidget* tqparent, const char* name = 0 ); + PMPigmentEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmplane.cpp b/kpovmodeler/pmplane.cpp index 8c6dbf30..12574211 100644 --- a/kpovmodeler/pmplane.cpp +++ b/kpovmodeler/pmplane.cpp @@ -126,9 +126,9 @@ void PMPlane::setDistance( double distance ) } } -PMDialogEditBase* PMPlane::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPlane::editWidget( TQWidget* parent ) const { - return new PMPlaneEdit( tqparent ); + return new PMPlaneEdit( parent ); } void PMPlane::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmplane.h b/kpovmodeler/pmplane.h index 32b25724..52fb9d4c 100644 --- a/kpovmodeler/pmplane.h +++ b/kpovmodeler/pmplane.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMPlaneEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view and dialog view */ diff --git a/kpovmodeler/pmplaneedit.cpp b/kpovmodeler/pmplaneedit.cpp index 6f6306bf..5f90b008 100644 --- a/kpovmodeler/pmplaneedit.cpp +++ b/kpovmodeler/pmplaneedit.cpp @@ -28,8 +28,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMPlaneEdit::PMPlaneEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPlaneEdit::PMPlaneEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmplaneedit.h b/kpovmodeler/pmplaneedit.h index 0b4c3f3f..33d01e64 100644 --- a/kpovmodeler/pmplaneedit.h +++ b/kpovmodeler/pmplaneedit.h @@ -38,9 +38,9 @@ class PMPlaneEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMPlaneEdit with tqparent and name + * Creates a PMPlaneEdit with parent and name */ - PMPlaneEdit( TQWidget* tqparent, const char* name = 0 ); + PMPlaneEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmpluginsettings.cpp b/kpovmodeler/pmpluginsettings.cpp index 95f75e72..a788bc24 100644 --- a/kpovmodeler/pmpluginsettings.cpp +++ b/kpovmodeler/pmpluginsettings.cpp @@ -28,8 +28,8 @@ class PMPluginListViewItem : public TQListViewItem { public: - PMPluginListViewItem( TQListView* tqparent, PMPluginInfo* info ) - : TQListViewItem( tqparent, info->name( ), info->description( ) ) + PMPluginListViewItem( TQListView* parent, PMPluginInfo* info ) + : TQListViewItem( parent, info->name( ), info->description( ) ) { m_info = info; m_enabled = info->enabled( ); @@ -51,8 +51,8 @@ public: bool m_enabled; }; -PMPluginSettings::PMPluginSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); diff --git a/kpovmodeler/pmpluginsettings.h b/kpovmodeler/pmpluginsettings.h index 42aa872d..f8cbb9a1 100644 --- a/kpovmodeler/pmpluginsettings.h +++ b/kpovmodeler/pmpluginsettings.h @@ -39,7 +39,7 @@ public: /** * Default constructor */ - PMPluginSettings( TQWidget* tqparent, const char* name = 0 ); + PMPluginSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmpolynom.cpp b/kpovmodeler/pmpolynom.cpp index a281e947..b9d75a13 100644 --- a/kpovmodeler/pmpolynom.cpp +++ b/kpovmodeler/pmpolynom.cpp @@ -158,9 +158,9 @@ void PMPolynom::cleanUp( ) const Base::cleanUp( ); } -PMDialogEditBase* PMPolynom::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPolynom::editWidget( TQWidget* parent ) const { - return new PMPolynomEdit( tqparent ); + return new PMPolynomEdit( parent ); } void PMPolynom::setPolynomOrder( int o ) diff --git a/kpovmodeler/pmpolynom.h b/kpovmodeler/pmpolynom.h index cd0338f0..dc2e9c21 100644 --- a/kpovmodeler/pmpolynom.h +++ b/kpovmodeler/pmpolynom.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMPolynomEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual void restoreMemento( PMMemento* s ); diff --git a/kpovmodeler/pmpolynomedit.cpp b/kpovmodeler/pmpolynomedit.cpp index 7da978a1..ec3176d0 100644 --- a/kpovmodeler/pmpolynomedit.cpp +++ b/kpovmodeler/pmpolynomedit.cpp @@ -29,8 +29,8 @@ #include <klocale.h> #include <kdialog.h> -PMPolynomEdit::PMPolynomEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPolynomEdit::PMPolynomEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; m_currentOrder = 0; diff --git a/kpovmodeler/pmpolynomedit.h b/kpovmodeler/pmpolynomedit.h index 2a1e5898..17ef6e11 100644 --- a/kpovmodeler/pmpolynomedit.h +++ b/kpovmodeler/pmpolynomedit.h @@ -43,9 +43,9 @@ class PMPolynomEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMPolynomEdit with tqparent and name + * Creates a PMPolynomEdit with parent and name */ - PMPolynomEdit( TQWidget* tqparent, const char* name = 0 ); + PMPolynomEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmpovray31serialization.cpp b/kpovmodeler/pmpovray31serialization.cpp index 9e057c56..543fec5b 100644 --- a/kpovmodeler/pmpovray31serialization.cpp +++ b/kpovmodeler/pmpovray31serialization.cpp @@ -410,8 +410,8 @@ void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* tqmetaObject void PMPov31SerDensity( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) { bool bObject = true; - if( object->tqparent( ) ) - if( object->tqparent( )->type( ) == "DensityMap" ) + if( object->parent( ) ) + if( object->parent( )->type( ) == "DensityMap" ) bObject = false; if( bObject ) @@ -1260,8 +1260,8 @@ void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, TQString str1; bool bObject = true; - if( o->tqparent( ) ) - if( o->tqparent( )->type( ) == "NormalMap" ) + if( o->parent( ) ) + if( o->parent( )->type( ) == "NormalMap" ) bObject = false; if( bObject ) @@ -1404,9 +1404,9 @@ void PMPov31SerPattern( const PMObject* object, const PMMetaObject*, PMOutputDev break; } // depth - if( o->tqparent( ) ) + if( o->parent( ) ) { - if( o->depth( ) && o->tqparent( )->type( ) == "Normal" ) + if( o->depth( ) && o->parent( )->type( ) == "Normal" ) { str.setNum( o->depth( ) ); dev->writeLine( str ); @@ -1458,8 +1458,8 @@ void PMPov31SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject PMPigment* o = ( PMPigment* ) object; bool bObject = true; - if( o->tqparent( ) ) - if( o->tqparent( )->type( ) == "PigmentMap" ) + if( o->parent( ) ) + if( o->parent( )->type( ) == "PigmentMap" ) bObject = false; if( bObject ) @@ -1892,8 +1892,8 @@ void PMPov31SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject PMTexture* o = ( PMTexture* ) object; bool bObject = true; - if( o->tqparent( ) ) - if( o->tqparent( )->type( ) == "TextureMap" ) + if( o->parent( ) ) + if( o->parent( )->type( ) == "TextureMap" ) bObject = false; if( bObject ) diff --git a/kpovmodeler/pmpovray35serialization.cpp b/kpovmodeler/pmpovray35serialization.cpp index d3f4ec95..a012c646 100644 --- a/kpovmodeler/pmpovray35serialization.cpp +++ b/kpovmodeler/pmpovray35serialization.cpp @@ -526,7 +526,7 @@ void PMPov35SerPhotons( const PMObject* object, const PMMetaObject*, PMOutputDev dev->objectBegin( "photons" ); - if( o->tqparent( ) && ( o->tqparent( )->type( ) == "Light" ) ) + if( o->parent( ) && ( o->parent( )->type( ) == "Light" ) ) { if( o->refraction( ) ) dev->writeLine( TQString( "refraction on" ) ); @@ -779,9 +779,9 @@ void PMPov35SerPattern( const PMObject* object, const PMMetaObject*, PMOutputDev break; } // depth - if( o->tqparent( ) ) + if( o->parent( ) ) { - if( o->depth( ) && o->tqparent( )->type( ) == "Normal" ) + if( o->depth( ) && o->parent( )->type( ) == "Normal" ) { str.setNum( o->depth( ) ); dev->writeLine( str ); @@ -894,9 +894,9 @@ void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, TQString str1; bool bObject = true; - if( o->tqparent( ) ) + if( o->parent( ) ) { - if( o->tqparent( )->type( ) == "NormalMap" ) + if( o->parent( )->type( ) == "NormalMap" ) bObject = false; } @@ -1356,8 +1356,8 @@ void PMPov35SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject PMPigment* o = ( PMPigment* ) object; bool bObject = true; - if( o->tqparent( ) ) - if( o->tqparent( )->type( ) == "PigmentMap" ) + if( o->parent( ) ) + if( o->parent( )->type( ) == "PigmentMap" ) bObject = false; if( bObject ) @@ -1376,8 +1376,8 @@ void PMPov35SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject PMTexture* o = ( PMTexture* ) object; bool bObject = true; - if( o->tqparent( ) ) - if( o->tqparent( )->type( ) == "TextureMap" ) + if( o->parent( ) ) + if( o->parent( )->type( ) == "TextureMap" ) bObject = false; if( bObject ) diff --git a/kpovmodeler/pmpovraymatrix.cpp b/kpovmodeler/pmpovraymatrix.cpp index 3a12f1eb..fd90ad92 100644 --- a/kpovmodeler/pmpovraymatrix.cpp +++ b/kpovmodeler/pmpovraymatrix.cpp @@ -108,9 +108,9 @@ void PMPovrayMatrix::setValues( const PMVector& v ) } } -PMDialogEditBase* PMPovrayMatrix::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPovrayMatrix::editWidget( TQWidget* parent ) const { - return new PMPovrayMatrixEdit( tqparent ); + return new PMPovrayMatrixEdit( parent ); } void PMPovrayMatrix::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmpovraymatrix.h b/kpovmodeler/pmpovraymatrix.h index 4bdc2eee..d42e5f22 100644 --- a/kpovmodeler/pmpovraymatrix.h +++ b/kpovmodeler/pmpovraymatrix.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMPovrayMatrixEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmmatrix" ); } diff --git a/kpovmodeler/pmpovraymatrixedit.cpp b/kpovmodeler/pmpovraymatrixedit.cpp index 8bc4f9a5..1e0f7833 100644 --- a/kpovmodeler/pmpovraymatrixedit.cpp +++ b/kpovmodeler/pmpovraymatrixedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMPovrayMatrixEdit::PMPovrayMatrixEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPovrayMatrixEdit::PMPovrayMatrixEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmpovraymatrixedit.h b/kpovmodeler/pmpovraymatrixedit.h index 7b5a52ea..16c4ccac 100644 --- a/kpovmodeler/pmpovraymatrixedit.h +++ b/kpovmodeler/pmpovraymatrixedit.h @@ -39,9 +39,9 @@ class PMPovrayMatrixEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMPovrayMatrixEdit with tqparent and name + * Creates a PMPovrayMatrixEdit with parent and name */ - PMPovrayMatrixEdit( TQWidget* tqparent, const char* name = 0 ); + PMPovrayMatrixEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmpovrayoutputwidget.cpp b/kpovmodeler/pmpovrayoutputwidget.cpp index af56b62f..b2230272 100644 --- a/kpovmodeler/pmpovrayoutputwidget.cpp +++ b/kpovmodeler/pmpovrayoutputwidget.cpp @@ -30,8 +30,8 @@ TQSize PMPovrayOutputWidget::s_size = TQSize( 400, 400 ); -PMPovrayOutputWidget::PMPovrayOutputWidget( TQWidget* tqparent, const char* name ) - : KDialog( tqparent, name ) +PMPovrayOutputWidget::PMPovrayOutputWidget( TQWidget* parent, const char* name ) + : KDialog( parent, name ) { TQVBoxLayout* topLayout = new TQVBoxLayout( this, KDialog::marginHint( ), KDialog::spacingHint( ) ); diff --git a/kpovmodeler/pmpovrayoutputwidget.h b/kpovmodeler/pmpovrayoutputwidget.h index a5fbe883..f83ac9b1 100644 --- a/kpovmodeler/pmpovrayoutputwidget.h +++ b/kpovmodeler/pmpovrayoutputwidget.h @@ -39,7 +39,7 @@ public: /** * Standard constructor */ - PMPovrayOutputWidget( TQWidget* tqparent = 0, const char* name = 0 ); + PMPovrayOutputWidget( TQWidget* parent = 0, const char* name = 0 ); /** * Destructor */ diff --git a/kpovmodeler/pmpovrayparser.cpp b/kpovmodeler/pmpovrayparser.cpp index ad19c67f..c4fa41ce 100644 --- a/kpovmodeler/pmpovrayparser.cpp +++ b/kpovmodeler/pmpovrayparser.cpp @@ -191,7 +191,7 @@ bool PMPovrayParser::parseBool( ) return true; } -bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, +bool PMPovrayParser::parseChildObjects( PMCompositeObject* parent, int max /* = -1 */ ) { PMObject* child = 0; @@ -202,10 +202,10 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, do { - if( !m_bLastPMCommentEmpty && tqparent ) + if( !m_bLastPMCommentEmpty && parent ) { - if( tqparent->isA( "NamedObject" ) ) - ( ( PMNamedObject* ) tqparent )->setName( m_lastPMComment ); + if( parent->isA( "NamedObject" ) ) + ( ( PMNamedObject* ) parent )->setName( m_lastPMComment ); m_bLastPMCommentEmpty = true; } if( m_skippedComments.count( ) > 0 ) @@ -230,8 +230,8 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, error = !parseBox( ( PMBox* ) child ); break; case SPHERE_TOK: - if( ( tqparent && ( tqparent->type( ) == "Blob" ) ) - || ( !tqparent && m_pTopParent + if( ( parent && ( parent->type( ) == "Blob" ) ) + || ( !parent && m_pTopParent && ( m_pTopParent->type( ) == "Blob" ) ) ) { child = new PMBlobSphere( m_pPart ); @@ -244,8 +244,8 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, } break; case CYLINDER_TOK: - if( ( tqparent && ( tqparent->type( ) == "Blob" ) ) - || ( !tqparent && m_pTopParent + if( ( parent && ( parent->type( ) == "Blob" ) ) + || ( !parent && m_pTopParent && ( m_pTopParent->type( ) == "Blob" ) ) ) { child = new PMBlobCylinder( m_pPart ); @@ -378,14 +378,14 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, child = new PMPattern( m_pPart ); { bool normal = true; - if( tqparent && ( tqparent->type( ) != "Normal" ) ) + if( parent && ( parent->type( ) != "Normal" ) ) normal = false; error = !parsePattern( ( PMPattern* ) child, normal ); } break; case TURBULENCE_TOK: // Search for a PMPattern in the object's tqchildren - child = tqparent->firstChild( ); + child = parent->firstChild( ); while( child && !child->isA( "Pattern" ) ) child = child->nextSibling( ); if( child ) @@ -409,7 +409,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, case CUBIC_WAVE_TOK: case POLY_WAVE_TOK: // Search for a PMBlendMapModifiers in the object's tqchildren - child = tqparent->firstChild( ); + child = parent->firstChild( ); while( child && !child->isA( "BlendMapModifiers" ) ) child = child->nextSibling( ); if( child ) @@ -478,7 +478,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, int expect = 0; PMListPattern::PMListType type = PMListPattern::ListPatternChecker; - if( tqparent && tqparent->type( ) == "Normal" ) + if( parent && parent->type( ) == "Normal" ) normal = true; else if( m_pTopParent && m_pTopParent->type( ) == "Normal" ) normal = true; @@ -640,7 +640,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, error = !parseMatrix( ( PMPovrayMatrix* ) child ); break; case BOUNDED_BY_TOK: - if( tqparent && ( tqparent->type( ) == "ClippedBy" ) ) + if( parent && ( parent->type( ) == "ClippedBy" ) ) finished = true; else { @@ -649,7 +649,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, } break; case CLIPPED_BY_TOK: - if( tqparent && ( tqparent->type( ) == "BoundedBy" ) ) + if( parent && ( parent->type( ) == "BoundedBy" ) ) finished = true; else { @@ -666,7 +666,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, error = !parseRadiosity( ( PMRadiosity* ) child ); break; case PHOTONS_TOK: - if ( tqparent && ( tqparent->type( ) == "GlobalSettings" ) ) + if ( parent && ( parent->type( ) == "GlobalSettings" ) ) { child = new PMGlobalPhotons( m_pPart ); error = !parseGlobalPhotons( ( PMGlobalPhotons* ) child ); @@ -791,7 +791,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, printExpected( i18n( "identifier" ), m_pScanner->sValue( ) ); break; case OBJECT_TOK: - error = !parseObject( tqparent ); + error = !parseObject( parent ); noChild = true; break; case RAW_POVRAY_TOK: @@ -808,7 +808,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, error = true; if( child ) { - if( !insertChild( child, tqparent ) ) + if( !insertChild( child, parent ) ) { delete child; child = 0; @@ -6572,7 +6572,7 @@ bool PMPovrayParser::parseDeclare( PMDeclare* decl ) return !error; } -bool PMPovrayParser::parseObject( PMCompositeObject* tqparent ) +bool PMPovrayParser::parseObject( PMCompositeObject* parent ) { PMObject* child; bool error = false; @@ -6586,23 +6586,23 @@ bool PMPovrayParser::parseObject( PMCompositeObject* tqparent ) case ID_TOK: child = new PMObjectLink( m_pPart ); error = !parseObjectLink( ( PMObjectLink* ) child ); - if( !insertChild( child, tqparent ) ) + if( !insertChild( child, parent ) ) delete child; break; default: { PMObject* lastChild = 0; - if( tqparent ) - lastChild = tqparent->lastChild( ); + if( parent ) + lastChild = parent->lastChild( ); else lastChild = m_pResultList->last( ); - error = !parseChildObjects( tqparent, 1 ); + error = !parseChildObjects( parent, 1 ); if( !error ) { PMObject* newLast = 0; - if( tqparent ) - newLast = tqparent->lastChild( ); + if( parent ) + newLast = parent->lastChild( ); else newLast = m_pResultList->last( ); diff --git a/kpovmodeler/pmpovrayparser.h b/kpovmodeler/pmpovrayparser.h index c00bdfbe..9ad714d2 100644 --- a/kpovmodeler/pmpovrayparser.h +++ b/kpovmodeler/pmpovrayparser.h @@ -160,14 +160,14 @@ private: /** - * Looks for child objects, parses them and appends them to the tqparent - * object. If tqparent is 0, all objects are appended to the result list. + * Looks for child objects, parses them and appends them to the parent + * object. If parent is 0, all objects are appended to the result list. * * If max is > 0, then the maximum number of parsed objects is max. * * Returns true if there where no objects or parsing was successful. */ - bool parseChildObjects( PMCompositeObject* tqparent, int max = -1 ); + bool parseChildObjects( PMCompositeObject* parent, int max = -1 ); /** @@ -491,7 +491,7 @@ private: /** * Parse function for object keywords */ - bool parseObject( PMCompositeObject* tqparent ); + bool parseObject( PMCompositeObject* parent ); // POV-Ray 3.5 objects bool parseIsoSurface( PMIsoSurface* iso ); diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp index fb3cbf67..aae9c137 100644 --- a/kpovmodeler/pmpovrayrenderwidget.cpp +++ b/kpovmodeler/pmpovrayrenderwidget.cpp @@ -40,8 +40,8 @@ TQString PMPovrayRenderWidget::s_povrayCommand = c_defaultPovrayCommand; TQStringList PMPovrayRenderWidget::s_libraryPaths; -PMPovrayRenderWidget::PMPovrayRenderWidget( TQWidget* tqparent, const char* name ) - : PMDragWidget( tqparent, name ) +PMPovrayRenderWidget::PMPovrayRenderWidget( TQWidget* parent, const char* name ) + : PMDragWidget( parent, name ) { m_pProcess = 0; m_bSuspended = false; diff --git a/kpovmodeler/pmpovrayrenderwidget.h b/kpovmodeler/pmpovrayrenderwidget.h index 1fbd891a..8f9d0533 100644 --- a/kpovmodeler/pmpovrayrenderwidget.h +++ b/kpovmodeler/pmpovrayrenderwidget.h @@ -48,7 +48,7 @@ public: /** * Standard constructor */ - PMPovrayRenderWidget( TQWidget* tqparent = 0, const char* name = 0 ); + PMPovrayRenderWidget( TQWidget* parent = 0, const char* name = 0 ); /** * destructor */ diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp index 4f6b8474..eac93134 100644 --- a/kpovmodeler/pmpovraysettings.cpp +++ b/kpovmodeler/pmpovraysettings.cpp @@ -35,8 +35,8 @@ #include <kmessagebox.h> #include <kfiledialog.h> -PMPovraySettings::PMPovraySettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { m_selectionIndex = 0; diff --git a/kpovmodeler/pmpovraysettings.h b/kpovmodeler/pmpovraysettings.h index 5b267880..467b95c5 100644 --- a/kpovmodeler/pmpovraysettings.h +++ b/kpovmodeler/pmpovraysettings.h @@ -40,7 +40,7 @@ public: /** * Default constructor */ - PMPovraySettings( TQWidget* tqparent, const char* name = 0 ); + PMPovraySettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp index c86eabe1..086ced61 100644 --- a/kpovmodeler/pmpovraywidget.cpp +++ b/kpovmodeler/pmpovraywidget.cpp @@ -40,8 +40,8 @@ const int timerIntervall = 1000; bool PMPovrayWidget::s_imageFormatsRegistered = false; -PMPovrayWidget::PMPovrayWidget( TQWidget* tqparent, const char* name ) - : KDialog( tqparent, name ) +PMPovrayWidget::PMPovrayWidget( TQWidget* parent, const char* name ) + : KDialog( parent, name ) { TQVBoxLayout* topLayout = new TQVBoxLayout( this, KDialog::marginHint( ), KDialog::spacingHint( ) ); topLayout->addStretch( ); diff --git a/kpovmodeler/pmpovraywidget.h b/kpovmodeler/pmpovraywidget.h index fe910a88..c21cdc7b 100644 --- a/kpovmodeler/pmpovraywidget.h +++ b/kpovmodeler/pmpovraywidget.h @@ -47,7 +47,7 @@ public: /** * Standard constructor */ - PMPovrayWidget( TQWidget* tqparent = 0, const char* name = 0 ); + PMPovrayWidget( TQWidget* parent = 0, const char* name = 0 ); /** * Destructor */ diff --git a/kpovmodeler/pmpreviewsettings.cpp b/kpovmodeler/pmpreviewsettings.cpp index 54afb0dd..a08ff1fe 100644 --- a/kpovmodeler/pmpreviewsettings.cpp +++ b/kpovmodeler/pmpreviewsettings.cpp @@ -29,8 +29,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMPreviewSettings::PMPreviewSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQHBoxLayout* htqlayout; TQVBoxLayout* vtqlayout; diff --git a/kpovmodeler/pmpreviewsettings.h b/kpovmodeler/pmpreviewsettings.h index 4818fb3b..4e4275f2 100644 --- a/kpovmodeler/pmpreviewsettings.h +++ b/kpovmodeler/pmpreviewsettings.h @@ -40,7 +40,7 @@ public: /** * Default constructor */ - PMPreviewSettings( TQWidget* tqparent, const char* name = 0 ); + PMPreviewSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmprism.cpp b/kpovmodeler/pmprism.cpp index a1beddca..a7c5c8f7 100644 --- a/kpovmodeler/pmprism.cpp +++ b/kpovmodeler/pmprism.cpp @@ -392,9 +392,9 @@ void PMPrism::setPoints( const TQValueList< TQValueList<PMVector> >& points ) } } -PMDialogEditBase* PMPrism::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPrism::editWidget( TQWidget* parent ) const { - return new PMPrismEdit( tqparent ); + return new PMPrismEdit( parent ); } void PMPrism::createMemento( ) diff --git a/kpovmodeler/pmprism.h b/kpovmodeler/pmprism.h index 4b0196e6..facce467 100644 --- a/kpovmodeler/pmprism.h +++ b/kpovmodeler/pmprism.h @@ -78,7 +78,7 @@ public: /** * Returns a new @ref PMPrismEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp index 5ce7910d..78960007 100644 --- a/kpovmodeler/pmprismedit.cpp +++ b/kpovmodeler/pmprismedit.cpp @@ -34,8 +34,8 @@ #include <kiconloader.h> #include <kmessagebox.h> -PMPrismEdit::PMPrismEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPrismEdit::PMPrismEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; m_lastSplineType = 0; diff --git a/kpovmodeler/pmprismedit.h b/kpovmodeler/pmprismedit.h index 6a9c03e5..2b9c2bd2 100644 --- a/kpovmodeler/pmprismedit.h +++ b/kpovmodeler/pmprismedit.h @@ -49,9 +49,9 @@ class PMPrismEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMPrismEdit with tqparent and name + * Creates a PMPrismEdit with parent and name */ - PMPrismEdit( TQWidget* tqparent, const char* name = 0 ); + PMPrismEdit( TQWidget* parent, const char* name = 0 ); /** * Destructor */ diff --git a/kpovmodeler/pmprojectedthrough.cpp b/kpovmodeler/pmprojectedthrough.cpp index 9458a19d..71710395 100644 --- a/kpovmodeler/pmprojectedthrough.cpp +++ b/kpovmodeler/pmprojectedthrough.cpp @@ -80,9 +80,9 @@ void PMProjectedThrough::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMProjectedThrough::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMProjectedThrough::editWidget( TQWidget* parent ) const { - return new PMNamedObjectEdit( tqparent ); + return new PMNamedObjectEdit( parent ); } void PMProjectedThrough::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmprojectedthrough.h b/kpovmodeler/pmprojectedthrough.h index e1dc200a..606aa972 100644 --- a/kpovmodeler/pmprojectedthrough.h +++ b/kpovmodeler/pmprojectedthrough.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMProjectedThroughEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmquickcolor.cpp b/kpovmodeler/pmquickcolor.cpp index ac025a62..d1bcf100 100644 --- a/kpovmodeler/pmquickcolor.cpp +++ b/kpovmodeler/pmquickcolor.cpp @@ -102,9 +102,9 @@ void PMQuickColor::setColor( const PMColor& c ) } } -PMDialogEditBase* PMQuickColor::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMQuickColor::editWidget( TQWidget* parent ) const { - return new PMQuickColorEdit( tqparent ); + return new PMQuickColorEdit( parent ); } void PMQuickColor::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmquickcolor.h b/kpovmodeler/pmquickcolor.h index 80f5ee4b..0fe9ccbe 100644 --- a/kpovmodeler/pmquickcolor.h +++ b/kpovmodeler/pmquickcolor.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMQuickColorEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmquickcoloredit.cpp b/kpovmodeler/pmquickcoloredit.cpp index 1a48c873..9e0a2d29 100644 --- a/kpovmodeler/pmquickcoloredit.cpp +++ b/kpovmodeler/pmquickcoloredit.cpp @@ -26,8 +26,8 @@ #include <klocale.h> -PMQuickColorEdit::PMQuickColorEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMQuickColorEdit::PMQuickColorEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmquickcoloredit.h b/kpovmodeler/pmquickcoloredit.h index 456b9660..f3e6d9df 100644 --- a/kpovmodeler/pmquickcoloredit.h +++ b/kpovmodeler/pmquickcoloredit.h @@ -41,9 +41,9 @@ class PMQuickColorEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMQuickColorEdit with tqparent and name + * Creates a PMQuickColorEdit with parent and name */ - PMQuickColorEdit( TQWidget* tqparent, const char* name = 0 ); + PMQuickColorEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmradiosity.cpp b/kpovmodeler/pmradiosity.cpp index 6f6a6811..39d61342 100644 --- a/kpovmodeler/pmradiosity.cpp +++ b/kpovmodeler/pmradiosity.cpp @@ -356,9 +356,9 @@ void PMRadiosity::setRecursionLimit( int c ) } } -PMDialogEditBase* PMRadiosity::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMRadiosity::editWidget( TQWidget* parent ) const { - return new PMRadiosityEdit( tqparent ); + return new PMRadiosityEdit( parent ); } void PMRadiosity::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmradiosity.h b/kpovmodeler/pmradiosity.h index 7eb34498..4a1c1ad1 100644 --- a/kpovmodeler/pmradiosity.h +++ b/kpovmodeler/pmradiosity.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMRadiosityEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmradiosityedit.cpp b/kpovmodeler/pmradiosityedit.cpp index 968227fb..97494ff8 100644 --- a/kpovmodeler/pmradiosityedit.cpp +++ b/kpovmodeler/pmradiosityedit.cpp @@ -28,8 +28,8 @@ #include <kmessagebox.h> -PMRadiosityEdit::PMRadiosityEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMRadiosityEdit::PMRadiosityEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmradiosityedit.h b/kpovmodeler/pmradiosityedit.h index ae4586ce..9a272869 100644 --- a/kpovmodeler/pmradiosityedit.h +++ b/kpovmodeler/pmradiosityedit.h @@ -41,9 +41,9 @@ class PMRadiosityEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMRadiosityEdit with tqparent and name + * Creates a PMRadiosityEdit with parent and name */ - PMRadiosityEdit( TQWidget* tqparent, const char* name = 0 ); + PMRadiosityEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmrainbow.cpp b/kpovmodeler/pmrainbow.cpp index fe5ea8f9..62def615 100644 --- a/kpovmodeler/pmrainbow.cpp +++ b/kpovmodeler/pmrainbow.cpp @@ -347,9 +347,9 @@ void PMRainbow::enableFalloffAngle( bool c ) } } -PMDialogEditBase* PMRainbow::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMRainbow::editWidget( TQWidget* parent ) const { - return new PMRainbowEdit( tqparent ); + return new PMRainbowEdit( parent ); } void PMRainbow::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmrainbow.h b/kpovmodeler/pmrainbow.h index b9c2915b..1b631ed1 100644 --- a/kpovmodeler/pmrainbow.h +++ b/kpovmodeler/pmrainbow.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMRainbowEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmrainbow" ); } diff --git a/kpovmodeler/pmrainbowedit.cpp b/kpovmodeler/pmrainbowedit.cpp index b2aa7cee..7765f720 100644 --- a/kpovmodeler/pmrainbowedit.cpp +++ b/kpovmodeler/pmrainbowedit.cpp @@ -30,8 +30,8 @@ #include <kmessagebox.h> -PMRainbowEdit::PMRainbowEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMRainbowEdit::PMRainbowEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmrainbowedit.h b/kpovmodeler/pmrainbowedit.h index e2c4698d..be91f895 100644 --- a/kpovmodeler/pmrainbowedit.h +++ b/kpovmodeler/pmrainbowedit.h @@ -42,9 +42,9 @@ class PMRainbowEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMRainbowEdit with tqparent and name + * Creates a PMRainbowEdit with parent and name */ - PMRainbowEdit( TQWidget* tqparent, const char* name = 0 ); + PMRainbowEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmraw.cpp b/kpovmodeler/pmraw.cpp index f1f2575b..4971433c 100644 --- a/kpovmodeler/pmraw.cpp +++ b/kpovmodeler/pmraw.cpp @@ -104,9 +104,9 @@ void PMRaw::readAttributes( const PMXMLHelper& h ) m_code = e.toText( ).data( ); } -PMDialogEditBase* PMRaw::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMRaw::editWidget( TQWidget* parent ) const { - return new PMRawEdit( tqparent ); + return new PMRawEdit( parent ); } void PMRaw::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmraw.h b/kpovmodeler/pmraw.h index 7d5673cb..541687c8 100644 --- a/kpovmodeler/pmraw.h +++ b/kpovmodeler/pmraw.h @@ -72,7 +72,7 @@ public: virtual void cleanUp( ) const; /** */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmraw" ); } /** */ diff --git a/kpovmodeler/pmrawedit.cpp b/kpovmodeler/pmrawedit.cpp index c43adadc..98cc5ec1 100644 --- a/kpovmodeler/pmrawedit.cpp +++ b/kpovmodeler/pmrawedit.cpp @@ -25,8 +25,8 @@ #include <kglobalsettings.h> #include <klocale.h> -PMRawEdit::PMRawEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMRawEdit::PMRawEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmrawedit.h b/kpovmodeler/pmrawedit.h index f3ba740d..620e6b09 100644 --- a/kpovmodeler/pmrawedit.h +++ b/kpovmodeler/pmrawedit.h @@ -39,9 +39,9 @@ class PMRawEdit : public PMNamedObjectEdit typedef PMNamedObjectEdit Base; public: /** - * Creates a PMRawEdit with tqparent and name + * Creates a PMRawEdit with parent and name */ - PMRawEdit( TQWidget* tqparent, const char* name = 0 ); + PMRawEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmrecursiveobjectiterator.cpp b/kpovmodeler/pmrecursiveobjectiterator.cpp index 423e0556..eeacfaa6 100644 --- a/kpovmodeler/pmrecursiveobjectiterator.cpp +++ b/kpovmodeler/pmrecursiveobjectiterator.cpp @@ -39,7 +39,7 @@ PMObject* PMRecursiveObjectIterator::operator++( ) bool stop = false; do { - m_pCurrent = m_pCurrent->tqparent( ); + m_pCurrent = m_pCurrent->parent( ); if( !m_pCurrent ) stop = true; else if( m_pCurrent == m_pObject ) diff --git a/kpovmodeler/pmrendermanager.cpp b/kpovmodeler/pmrendermanager.cpp index 5d6edbbb..6ba1fe99 100644 --- a/kpovmodeler/pmrendermanager.cpp +++ b/kpovmodeler/pmrendermanager.cpp @@ -416,8 +416,8 @@ void PMRenderManager::renderObject( PMObject* objectToRender ) m_selected = true; m_pDeselectObject = objectToRender; if( objectToRender->hasTransformationMatrix( ) ) - if( objectToRender->tqparent( ) ) - m_pDeselectObject = objectToRender->tqparent( ); + if( objectToRender->parent( ) ) + m_pDeselectObject = objectToRender->parent( ); } } diff --git a/kpovmodeler/pmrendermodesdialog.cpp b/kpovmodeler/pmrendermodesdialog.cpp index 55f969cf..4fa8f09f 100644 --- a/kpovmodeler/pmrendermodesdialog.cpp +++ b/kpovmodeler/pmrendermodesdialog.cpp @@ -37,8 +37,8 @@ TQSize PMRenderModesDialog::s_size = TQSize( 300, 200 ); -PMRenderModesDialog::PMRenderModesDialog( PMRenderModeList* modes, TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "Render Modes" ), +PMRenderModesDialog::PMRenderModesDialog( PMRenderModeList* modes, TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n( "Render Modes" ), Ok | Cancel, Ok ) { m_selectionIndex = modes->at( ); @@ -239,8 +239,8 @@ const char* qualityString[numQuality] = const int c_qualityToIndex[12] = { 0, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7, 8 }; const int c_indexToQuality[numQuality] = { 0, 2, 4, 5, 6, 8, 9, 10, 11 }; -PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "Render Modes" ), +PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n( "Render Modes" ), Ok | Cancel, Ok ) { m_pMode = mode; diff --git a/kpovmodeler/pmrendermodesdialog.h b/kpovmodeler/pmrendermodesdialog.h index 1494095e..b2d800bb 100644 --- a/kpovmodeler/pmrendermodesdialog.h +++ b/kpovmodeler/pmrendermodesdialog.h @@ -44,7 +44,7 @@ public: /** * Creates a dialog for the modes list */ - PMRenderModesDialog( PMRenderModeList* modes, TQWidget* tqparent = 0, const char* name = 0 ); + PMRenderModesDialog( PMRenderModeList* modes, TQWidget* parent = 0, const char* name = 0 ); static void saveConfig( KConfig* cfg ); static void restoreConfig( KConfig* cfg ); @@ -113,7 +113,7 @@ public: /** * Creates a dialog for the mode */ - PMRenderModeDialog( PMRenderMode* mode, TQWidget* tqparent = 0, const char* name = 0 ); + PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent = 0, const char* name = 0 ); static void saveConfig( KConfig* cfg ); static void restoreConfig( KConfig* cfg ); diff --git a/kpovmodeler/pmrotate.cpp b/kpovmodeler/pmrotate.cpp index 700c611c..feed0091 100644 --- a/kpovmodeler/pmrotate.cpp +++ b/kpovmodeler/pmrotate.cpp @@ -102,9 +102,9 @@ void PMRotate::setRotation( const PMVector& p ) } } -PMDialogEditBase* PMRotate::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMRotate::editWidget( TQWidget* parent ) const { - return new PMRotateEdit( tqparent ); + return new PMRotateEdit( parent ); } void PMRotate::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmrotate.h b/kpovmodeler/pmrotate.h index ad80f2b0..5090a933 100644 --- a/kpovmodeler/pmrotate.h +++ b/kpovmodeler/pmrotate.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMRotateEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmrotate" ); } diff --git a/kpovmodeler/pmrotateedit.cpp b/kpovmodeler/pmrotateedit.cpp index 6803b90c..2ad5f06e 100644 --- a/kpovmodeler/pmrotateedit.cpp +++ b/kpovmodeler/pmrotateedit.cpp @@ -24,8 +24,8 @@ #include <klocale.h> -PMRotateEdit::PMRotateEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMRotateEdit::PMRotateEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmrotateedit.h b/kpovmodeler/pmrotateedit.h index 147c4b1c..202af2b3 100644 --- a/kpovmodeler/pmrotateedit.h +++ b/kpovmodeler/pmrotateedit.h @@ -39,9 +39,9 @@ class PMRotateEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMRotateEdit with tqparent and name + * Creates a PMRotateEdit with parent and name */ - PMRotateEdit( TQWidget* tqparent, const char* name = 0 ); + PMRotateEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmscale.cpp b/kpovmodeler/pmscale.cpp index 9b78f7e3..5e1c4717 100644 --- a/kpovmodeler/pmscale.cpp +++ b/kpovmodeler/pmscale.cpp @@ -102,9 +102,9 @@ void PMScale::setScale( const PMVector& p ) } } -PMDialogEditBase* PMScale::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMScale::editWidget( TQWidget* parent ) const { - return new PMScaleEdit( tqparent ); + return new PMScaleEdit( parent ); } void PMScale::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmscale.h b/kpovmodeler/pmscale.h index b0b6a12d..55a40eaf 100644 --- a/kpovmodeler/pmscale.h +++ b/kpovmodeler/pmscale.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMScaleEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmscale" ); } diff --git a/kpovmodeler/pmscaleedit.cpp b/kpovmodeler/pmscaleedit.cpp index 9b96c496..24f3a471 100644 --- a/kpovmodeler/pmscaleedit.cpp +++ b/kpovmodeler/pmscaleedit.cpp @@ -24,8 +24,8 @@ #include <klocale.h> -PMScaleEdit::PMScaleEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMScaleEdit::PMScaleEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmscaleedit.h b/kpovmodeler/pmscaleedit.h index 19ca04ce..8b6fd8aa 100644 --- a/kpovmodeler/pmscaleedit.h +++ b/kpovmodeler/pmscaleedit.h @@ -39,9 +39,9 @@ class PMScaleEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMScaleEdit with tqparent and name + * Creates a PMScaleEdit with parent and name */ - PMScaleEdit( TQWidget* tqparent, const char* name = 0 ); + PMScaleEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmscene.h b/kpovmodeler/pmscene.h index cc1ec26a..3a93875f 100644 --- a/kpovmodeler/pmscene.h +++ b/kpovmodeler/pmscene.h @@ -31,7 +31,7 @@ * Class for povray scenes. * * A document has a PMScene object as top level object. A PMScene can't have - * a tqparent + * a parent */ class PMScene : public PMCompositeObject { diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp index bb747701..35324495 100644 --- a/kpovmodeler/pmsettingsdialog.cpp +++ b/kpovmodeler/pmsettingsdialog.cpp @@ -40,16 +40,16 @@ //#define KPM_WITH_OBJECT_LIBRARY -PMSettingsDialogPage::PMSettingsDialogPage( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMSettingsDialogPage::PMSettingsDialogPage( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { } TQSize PMSettingsDialog::s_size = TQSize( 640, 400 ); -PMSettingsDialog::PMSettingsDialog( PMPart* part, TQWidget* tqparent, const char* name ) +PMSettingsDialog::PMSettingsDialog( PMPart* part, TQWidget* parent, const char* name ) : KDialogBase( TreeList, i18n( "Configure" ), Ok | Apply | Cancel | Default, Ok, - tqparent, name ) + parent, name ) { TQStringList sl; TQWidget* w = 0; diff --git a/kpovmodeler/pmsettingsdialog.h b/kpovmodeler/pmsettingsdialog.h index fb862811..e30abf7b 100644 --- a/kpovmodeler/pmsettingsdialog.h +++ b/kpovmodeler/pmsettingsdialog.h @@ -57,7 +57,7 @@ public: /** * Constructor */ - PMSettingsDialogPage( TQWidget* tqparent, const char* name = 0 ); + PMSettingsDialogPage( TQWidget* parent, const char* name = 0 ); /** * Display the settings here. * @@ -132,7 +132,7 @@ public: /** * Standard constructor */ - PMSettingsDialog( PMPart* part, TQWidget* tqparent = 0, const char* name = 0 ); + PMSettingsDialog( PMPart* part, TQWidget* parent = 0, const char* name = 0 ); /** * Registers a new settings page. * diff --git a/kpovmodeler/pmskysphere.cpp b/kpovmodeler/pmskysphere.cpp index f44f2c55..39724548 100644 --- a/kpovmodeler/pmskysphere.cpp +++ b/kpovmodeler/pmskysphere.cpp @@ -69,8 +69,8 @@ TQString PMSkySphere::description( ) const return i18n( "skysphere" ); } -PMDialogEditBase* PMSkySphere::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSkySphere::editWidget( TQWidget* parent ) const { - return new PMSkySphereEdit( tqparent ); + return new PMSkySphereEdit( parent ); } diff --git a/kpovmodeler/pmskysphere.h b/kpovmodeler/pmskysphere.h index ef14cbd8..d466cb68 100644 --- a/kpovmodeler/pmskysphere.h +++ b/kpovmodeler/pmskysphere.h @@ -59,7 +59,7 @@ public: /** * Returns a new @ref PMSkySphereEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmskysphere" ); } diff --git a/kpovmodeler/pmskysphereedit.cpp b/kpovmodeler/pmskysphereedit.cpp index 4cab0157..4a1590b2 100644 --- a/kpovmodeler/pmskysphereedit.cpp +++ b/kpovmodeler/pmskysphereedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMSkySphereEdit::PMSkySphereEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSkySphereEdit::PMSkySphereEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmskysphereedit.h b/kpovmodeler/pmskysphereedit.h index 2f8c811e..1135e583 100644 --- a/kpovmodeler/pmskysphereedit.h +++ b/kpovmodeler/pmskysphereedit.h @@ -38,9 +38,9 @@ class PMSkySphereEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMSkySphereEdit with tqparent and name + * Creates a PMSkySphereEdit with parent and name */ - PMSkySphereEdit( TQWidget* tqparent, const char* name = 0 ); + PMSkySphereEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmslope.cpp b/kpovmodeler/pmslope.cpp index 4cabc973..663a19fe 100644 --- a/kpovmodeler/pmslope.cpp +++ b/kpovmodeler/pmslope.cpp @@ -113,9 +113,9 @@ void PMSlope::setSlope( const double c ) } } -PMDialogEditBase* PMSlope::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSlope::editWidget( TQWidget* parent ) const { - return new PMSlopeEdit( tqparent ); + return new PMSlopeEdit( parent ); } void PMSlope::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmslope.h b/kpovmodeler/pmslope.h index 12cc28b7..e32455c5 100644 --- a/kpovmodeler/pmslope.h +++ b/kpovmodeler/pmslope.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMSlopeEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmslopeedit.cpp b/kpovmodeler/pmslopeedit.cpp index 848565ee..63b0ee44 100644 --- a/kpovmodeler/pmslopeedit.cpp +++ b/kpovmodeler/pmslopeedit.cpp @@ -29,8 +29,8 @@ #include <kdialog.h> -PMSlopeEdit::PMSlopeEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSlopeEdit::PMSlopeEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmslopeedit.h b/kpovmodeler/pmslopeedit.h index a57816a1..cf262ab9 100644 --- a/kpovmodeler/pmslopeedit.h +++ b/kpovmodeler/pmslopeedit.h @@ -44,9 +44,9 @@ class PMSlopeEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMSlopeEdit with tqparent and name + * Creates a PMSlopeEdit with parent and name */ - PMSlopeEdit( TQWidget* tqparent, const char* name = 0 ); + PMSlopeEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmsolidcolor.cpp b/kpovmodeler/pmsolidcolor.cpp index 0c05f9c9..8ec9ba6d 100644 --- a/kpovmodeler/pmsolidcolor.cpp +++ b/kpovmodeler/pmsolidcolor.cpp @@ -97,9 +97,9 @@ void PMSolidColor::setColor( const PMColor& c ) } } -PMDialogEditBase* PMSolidColor::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSolidColor::editWidget( TQWidget* parent ) const { - return new PMSolidColorEdit( tqparent ); + return new PMSolidColorEdit( parent ); } void PMSolidColor::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmsolidcolor.h b/kpovmodeler/pmsolidcolor.h index 34e8dbff..8b8b36e9 100644 --- a/kpovmodeler/pmsolidcolor.h +++ b/kpovmodeler/pmsolidcolor.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMSolidColorEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmsolidcoloredit.cpp b/kpovmodeler/pmsolidcoloredit.cpp index 9b757d72..62ce6c9e 100644 --- a/kpovmodeler/pmsolidcoloredit.cpp +++ b/kpovmodeler/pmsolidcoloredit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMSolidColorEdit::PMSolidColorEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSolidColorEdit::PMSolidColorEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmsolidcoloredit.h b/kpovmodeler/pmsolidcoloredit.h index 46bcba07..24e9e82e 100644 --- a/kpovmodeler/pmsolidcoloredit.h +++ b/kpovmodeler/pmsolidcoloredit.h @@ -39,9 +39,9 @@ class PMSolidColorEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMSolidColorEdit with tqparent and name + * Creates a PMSolidColorEdit with parent and name */ - PMSolidColorEdit( TQWidget* tqparent, const char* name = 0 ); + PMSolidColorEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmsolidobjectedit.cpp b/kpovmodeler/pmsolidobjectedit.cpp index 848e7a64..4a1a2205 100644 --- a/kpovmodeler/pmsolidobjectedit.cpp +++ b/kpovmodeler/pmsolidobjectedit.cpp @@ -23,8 +23,8 @@ #include <tqlayout.h> #include <klocale.h> -PMSolidObjectEdit::PMSolidObjectEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSolidObjectEdit::PMSolidObjectEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmsolidobjectedit.h b/kpovmodeler/pmsolidobjectedit.h index c0a5f52d..21224da6 100644 --- a/kpovmodeler/pmsolidobjectedit.h +++ b/kpovmodeler/pmsolidobjectedit.h @@ -39,9 +39,9 @@ class PMSolidObjectEdit : public PMGraphicalObjectEdit typedef PMGraphicalObjectEdit Base; public: /** - * Creates a PMSolidObjectEdit with tqparent and name + * Creates a PMSolidObjectEdit with parent and name */ - PMSolidObjectEdit( TQWidget* tqparent, const char* name = 0 ); + PMSolidObjectEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmsor.cpp b/kpovmodeler/pmsor.cpp index ae5a34e4..997447c4 100644 --- a/kpovmodeler/pmsor.cpp +++ b/kpovmodeler/pmsor.cpp @@ -253,9 +253,9 @@ void PMSurfaceOfRevolution::setPoints( const TQValueList<PMVector>& points ) } } -PMDialogEditBase* PMSurfaceOfRevolution::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSurfaceOfRevolution::editWidget( TQWidget* parent ) const { - return new PMSurfaceOfRevolutionEdit( tqparent ); + return new PMSurfaceOfRevolutionEdit( parent ); } void PMSurfaceOfRevolution::createMemento( ) diff --git a/kpovmodeler/pmsor.h b/kpovmodeler/pmsor.h index 6256b280..720987fc 100644 --- a/kpovmodeler/pmsor.h +++ b/kpovmodeler/pmsor.h @@ -71,7 +71,7 @@ public: /** * Returns a new @ref PMSurfaceOfRevolutionEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmsoredit.cpp b/kpovmodeler/pmsoredit.cpp index 7bd7eb73..728aa20f 100644 --- a/kpovmodeler/pmsoredit.cpp +++ b/kpovmodeler/pmsoredit.cpp @@ -32,8 +32,8 @@ #include <kiconloader.h> #include <kmessagebox.h> -PMSurfaceOfRevolutionEdit::PMSurfaceOfRevolutionEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSurfaceOfRevolutionEdit::PMSurfaceOfRevolutionEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmsoredit.h b/kpovmodeler/pmsoredit.h index 3858dd11..41cadff1 100644 --- a/kpovmodeler/pmsoredit.h +++ b/kpovmodeler/pmsoredit.h @@ -47,9 +47,9 @@ class PMSurfaceOfRevolutionEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMSurfaceOfRevolutionEdit with tqparent and name + * Creates a PMSurfaceOfRevolutionEdit with parent and name */ - PMSurfaceOfRevolutionEdit( TQWidget* tqparent, const char* name = 0 ); + PMSurfaceOfRevolutionEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmsphere.cpp b/kpovmodeler/pmsphere.cpp index 8a419a3e..bbdd3b88 100644 --- a/kpovmodeler/pmsphere.cpp +++ b/kpovmodeler/pmsphere.cpp @@ -99,10 +99,10 @@ void PMSphere::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMSphere::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSphere::editWidget( TQWidget* parent ) const { - return new PMSphereEdit( tqparent ); + return new PMSphereEdit( parent ); } void PMSphere::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmsphere.h b/kpovmodeler/pmsphere.h index 9450572e..871b7375 100644 --- a/kpovmodeler/pmsphere.h +++ b/kpovmodeler/pmsphere.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMSphereEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmsphereedit.cpp b/kpovmodeler/pmsphereedit.cpp index 68d474f0..99bac3ea 100644 --- a/kpovmodeler/pmsphereedit.cpp +++ b/kpovmodeler/pmsphereedit.cpp @@ -26,8 +26,8 @@ #include <tqlabel.h> #include <klocale.h> -PMSphereEdit::PMSphereEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSphereEdit::PMSphereEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmsphereedit.h b/kpovmodeler/pmsphereedit.h index c5939767..c88b22a7 100644 --- a/kpovmodeler/pmsphereedit.h +++ b/kpovmodeler/pmsphereedit.h @@ -40,9 +40,9 @@ class PMSphereEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMSphereEdit with tqparent and name + * Creates a PMSphereEdit with parent and name */ - PMSphereEdit( TQWidget* tqparent, const char* name = 0 ); + PMSphereEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmspheresweep.cpp b/kpovmodeler/pmspheresweep.cpp index 19ff24b6..ff2e8e1a 100644 --- a/kpovmodeler/pmspheresweep.cpp +++ b/kpovmodeler/pmspheresweep.cpp @@ -290,9 +290,9 @@ void PMSphereSweep::setRadii( const TQValueList<double>& radii ) } } -PMDialogEditBase* PMSphereSweep::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSphereSweep::editWidget( TQWidget* parent ) const { - return new PMSphereSweepEdit( tqparent ); + return new PMSphereSweepEdit( parent ); } void PMSphereSweep::createMemento( ) diff --git a/kpovmodeler/pmspheresweep.h b/kpovmodeler/pmspheresweep.h index 23909bed..f4488e1b 100644 --- a/kpovmodeler/pmspheresweep.h +++ b/kpovmodeler/pmspheresweep.h @@ -74,7 +74,7 @@ public: /** * Returns a new @ref PMSphereSweepEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmspheresweepedit.cpp b/kpovmodeler/pmspheresweepedit.cpp index a10c8e62..9798a304 100644 --- a/kpovmodeler/pmspheresweepedit.cpp +++ b/kpovmodeler/pmspheresweepedit.cpp @@ -34,8 +34,8 @@ #include <kiconloader.h> #include <kmessagebox.h> -PMSphereSweepEdit::PMSphereSweepEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSphereSweepEdit::PMSphereSweepEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmspheresweepedit.h b/kpovmodeler/pmspheresweepedit.h index c6b8a9f1..753ccb12 100644 --- a/kpovmodeler/pmspheresweepedit.h +++ b/kpovmodeler/pmspheresweepedit.h @@ -48,9 +48,9 @@ class PMSphereSweepEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMSphereSweepEdit with tqparent and name + * Creates a PMSphereSweepEdit with parent and name */ - PMSphereSweepEdit( TQWidget* tqparent, const char* name = 0 ); + PMSphereSweepEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmsqe.cpp b/kpovmodeler/pmsqe.cpp index 4d79d218..8a0946fb 100644 --- a/kpovmodeler/pmsqe.cpp +++ b/kpovmodeler/pmsqe.cpp @@ -133,9 +133,9 @@ void PMSuperquadricEllipsoid::setNorthSouthExponent( double n ) } } -PMDialogEditBase* PMSuperquadricEllipsoid::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSuperquadricEllipsoid::editWidget( TQWidget* parent ) const { - return new PMSuperquadricEllipsoidEdit( tqparent ); + return new PMSuperquadricEllipsoidEdit( parent ); } void PMSuperquadricEllipsoid::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmsqe.h b/kpovmodeler/pmsqe.h index 17a2aded..835f52c0 100644 --- a/kpovmodeler/pmsqe.h +++ b/kpovmodeler/pmsqe.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMSuperquadricEllipsoidEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmsqeedit.cpp b/kpovmodeler/pmsqeedit.cpp index 1cb02f89..377b552b 100644 --- a/kpovmodeler/pmsqeedit.cpp +++ b/kpovmodeler/pmsqeedit.cpp @@ -24,8 +24,8 @@ #include <tqlabel.h> #include <klocale.h> -PMSuperquadricEllipsoidEdit::PMSuperquadricEllipsoidEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSuperquadricEllipsoidEdit::PMSuperquadricEllipsoidEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmsqeedit.h b/kpovmodeler/pmsqeedit.h index 6cde9fc4..4f870ced 100644 --- a/kpovmodeler/pmsqeedit.h +++ b/kpovmodeler/pmsqeedit.h @@ -39,9 +39,9 @@ class PMSuperquadricEllipsoidEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMSuperquadricEllipsoidEdit with tqparent and name + * Creates a PMSuperquadricEllipsoidEdit with parent and name */ - PMSuperquadricEllipsoidEdit( TQWidget* tqparent, const char* name = 0 ); + PMSuperquadricEllipsoidEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtext.cpp b/kpovmodeler/pmtext.cpp index d67edf2e..e4b7f0da 100644 --- a/kpovmodeler/pmtext.cpp +++ b/kpovmodeler/pmtext.cpp @@ -162,9 +162,9 @@ void PMText::setOffset( const PMVector& o ) } } -PMDialogEditBase* PMText::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMText::editWidget( TQWidget* parent ) const { - return new PMTextEdit( tqparent ); + return new PMTextEdit( parent ); } void PMText::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmtext.h b/kpovmodeler/pmtext.h index 3c7037ac..5b769dc7 100644 --- a/kpovmodeler/pmtext.h +++ b/kpovmodeler/pmtext.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMTextEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmtextedit.cpp b/kpovmodeler/pmtextedit.cpp index 84dcec3d..e1e4e038 100644 --- a/kpovmodeler/pmtextedit.cpp +++ b/kpovmodeler/pmtextedit.cpp @@ -29,8 +29,8 @@ #include <kiconloader.h> #include <kfiledialog.h> -PMTextEdit::PMTextEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTextEdit::PMTextEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtextedit.h b/kpovmodeler/pmtextedit.h index 96510257..9d90c68c 100644 --- a/kpovmodeler/pmtextedit.h +++ b/kpovmodeler/pmtextedit.h @@ -42,9 +42,9 @@ class PMTextEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMTextEdit with tqparent and name + * Creates a PMTextEdit with parent and name */ - PMTextEdit( TQWidget* tqparent, const char* name = 0 ); + PMTextEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtexture.cpp b/kpovmodeler/pmtexture.cpp index e7046834..3ae367dd 100644 --- a/kpovmodeler/pmtexture.cpp +++ b/kpovmodeler/pmtexture.cpp @@ -72,9 +72,9 @@ TQString PMTexture::description( ) const return i18n( "texture" ); } -PMDialogEditBase* PMTexture::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMTexture::editWidget( TQWidget* parent ) const { - return new PMTextureEdit( tqparent ); + return new PMTextureEdit( parent ); } void PMTexture::serialize( TQDomElement& e, TQDomDocument& doc ) const diff --git a/kpovmodeler/pmtexture.h b/kpovmodeler/pmtexture.h index f247d09a..daeaf427 100644 --- a/kpovmodeler/pmtexture.h +++ b/kpovmodeler/pmtexture.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMTextureEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmtexture" ); } diff --git a/kpovmodeler/pmtexturebaseedit.cpp b/kpovmodeler/pmtexturebaseedit.cpp index 7591538b..0768adc1 100644 --- a/kpovmodeler/pmtexturebaseedit.cpp +++ b/kpovmodeler/pmtexturebaseedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMTextureBaseEdit::PMTextureBaseEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTextureBaseEdit::PMTextureBaseEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtexturebaseedit.h b/kpovmodeler/pmtexturebaseedit.h index 8178b612..3969c7b0 100644 --- a/kpovmodeler/pmtexturebaseedit.h +++ b/kpovmodeler/pmtexturebaseedit.h @@ -39,9 +39,9 @@ class PMTextureBaseEdit : public PMNamedObjectEdit typedef PMNamedObjectEdit Base; public: /** - * Creates a PMTextureBaseEdit with tqparent and name + * Creates a PMTextureBaseEdit with parent and name */ - PMTextureBaseEdit( TQWidget* tqparent, const char* name = 0 ); + PMTextureBaseEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtextureedit.cpp b/kpovmodeler/pmtextureedit.cpp index a6bf2b94..768cc3cc 100644 --- a/kpovmodeler/pmtextureedit.cpp +++ b/kpovmodeler/pmtextureedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMTextureEdit::PMTextureEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTextureEdit::PMTextureEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtextureedit.h b/kpovmodeler/pmtextureedit.h index 21852ad9..a04b2d93 100644 --- a/kpovmodeler/pmtextureedit.h +++ b/kpovmodeler/pmtextureedit.h @@ -39,9 +39,9 @@ class PMTextureEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMTextureEdit with tqparent and name + * Creates a PMTextureEdit with parent and name */ - PMTextureEdit( TQWidget* tqparent, const char* name = 0 ); + PMTextureEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtexturemap.cpp b/kpovmodeler/pmtexturemap.cpp index 20287432..dc9f3b76 100644 --- a/kpovmodeler/pmtexturemap.cpp +++ b/kpovmodeler/pmtexturemap.cpp @@ -158,9 +158,9 @@ void PMTextureMapBase::cleanUp( ) const Base::cleanUp( ); } -PMDialogEditBase* PMTextureMapBase::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMTextureMapBase::editWidget( TQWidget* parent ) const { - return new PMTextureMapEdit( tqparent ); + return new PMTextureMapEdit( parent ); } void PMTextureMapBase::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmtexturemap.h b/kpovmodeler/pmtexturemap.h index b08a3770..26907ed3 100644 --- a/kpovmodeler/pmtexturemap.h +++ b/kpovmodeler/pmtexturemap.h @@ -76,7 +76,7 @@ public: /** * Returns a new @ref PMTextureMapEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual void createMemento( ); diff --git a/kpovmodeler/pmtexturemapedit.cpp b/kpovmodeler/pmtexturemapedit.cpp index efb77c15..2efa7708 100644 --- a/kpovmodeler/pmtexturemapedit.cpp +++ b/kpovmodeler/pmtexturemapedit.cpp @@ -26,8 +26,8 @@ #include <kmessagebox.h> -PMTextureMapEdit::PMTextureMapEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTextureMapEdit::PMTextureMapEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; m_numValues = 0; diff --git a/kpovmodeler/pmtexturemapedit.h b/kpovmodeler/pmtexturemapedit.h index 7ca57401..4a8f3c19 100644 --- a/kpovmodeler/pmtexturemapedit.h +++ b/kpovmodeler/pmtexturemapedit.h @@ -43,9 +43,9 @@ class PMTextureMapEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMTextureMapEdit with tqparent and name + * Creates a PMTextureMapEdit with parent and name */ - PMTextureMapEdit( TQWidget* tqparent, const char* name = 0 ); + PMTextureMapEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtorus.cpp b/kpovmodeler/pmtorus.cpp index 0039713b..a32d04e7 100644 --- a/kpovmodeler/pmtorus.cpp +++ b/kpovmodeler/pmtorus.cpp @@ -110,10 +110,10 @@ void PMTorus::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMTorus::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMTorus::editWidget( TQWidget* parent ) const { - return new PMTorusEdit( tqparent ); + return new PMTorusEdit( parent ); } void PMTorus::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmtorus.h b/kpovmodeler/pmtorus.h index 65f8458f..59b16e3c 100644 --- a/kpovmodeler/pmtorus.h +++ b/kpovmodeler/pmtorus.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMTrousEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmtorusedit.cpp b/kpovmodeler/pmtorusedit.cpp index f497018f..e47301b9 100644 --- a/kpovmodeler/pmtorusedit.cpp +++ b/kpovmodeler/pmtorusedit.cpp @@ -26,8 +26,8 @@ #include <tqcheckbox.h> -PMTorusEdit::PMTorusEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTorusEdit::PMTorusEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtorusedit.h b/kpovmodeler/pmtorusedit.h index 95870664..e60256e3 100644 --- a/kpovmodeler/pmtorusedit.h +++ b/kpovmodeler/pmtorusedit.h @@ -39,9 +39,9 @@ class PMTorusEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMSphereEdit with tqparent and name + * Creates a PMSphereEdit with parent and name */ - PMTorusEdit( TQWidget* tqparent, const char* name = 0 ); + PMTorusEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtranslate.cpp b/kpovmodeler/pmtranslate.cpp index 08611749..0cbfe58d 100644 --- a/kpovmodeler/pmtranslate.cpp +++ b/kpovmodeler/pmtranslate.cpp @@ -101,9 +101,9 @@ void PMTranslate::setTranslation( const PMVector& p ) } } -PMDialogEditBase* PMTranslate::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMTranslate::editWidget( TQWidget* parent ) const { - return new PMTranslateEdit( tqparent ); + return new PMTranslateEdit( parent ); } void PMTranslate::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmtranslate.h b/kpovmodeler/pmtranslate.h index 59b428a7..e121615d 100644 --- a/kpovmodeler/pmtranslate.h +++ b/kpovmodeler/pmtranslate.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMTranslateEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmtranslate" ); } diff --git a/kpovmodeler/pmtranslateedit.cpp b/kpovmodeler/pmtranslateedit.cpp index 4796714f..f98bcf00 100644 --- a/kpovmodeler/pmtranslateedit.cpp +++ b/kpovmodeler/pmtranslateedit.cpp @@ -24,8 +24,8 @@ #include <klocale.h> -PMTranslateEdit::PMTranslateEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTranslateEdit::PMTranslateEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtranslateedit.h b/kpovmodeler/pmtranslateedit.h index 955a6243..b15dbcec 100644 --- a/kpovmodeler/pmtranslateedit.h +++ b/kpovmodeler/pmtranslateedit.h @@ -39,9 +39,9 @@ class PMTranslateEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMTranslateEdit with tqparent and name + * Creates a PMTranslateEdit with parent and name */ - PMTranslateEdit( TQWidget* tqparent, const char* name = 0 ); + PMTranslateEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp index 03eb8f7b..8ec640d7 100644 --- a/kpovmodeler/pmtreeview.cpp +++ b/kpovmodeler/pmtreeview.cpp @@ -38,9 +38,9 @@ #include "pmobjectdrag.h" -PMTreeViewWidget::PMTreeViewWidget( PMPart* part, TQWidget* tqparent /*= 0*/, +PMTreeViewWidget::PMTreeViewWidget( PMPart* part, TQWidget* parent /*= 0*/, const char* name /*=0*/ ) - : PMViewBase( tqparent, name ) + : PMViewBase( parent, name ) { TQHBoxLayout* hl = new TQHBoxLayout( this ); PMTreeView* tv = new PMTreeView( part, this ); @@ -52,9 +52,9 @@ TQString PMTreeViewWidget::description( ) const return i18n( "Object Tree" ); } -PMTreeView::PMTreeView( PMPart* part, TQWidget* tqparent /*= 0*/, +PMTreeView::PMTreeView( PMPart* part, TQWidget* parent /*= 0*/, const char* name /*= 0*/ ) - : TQListView( tqparent, name ) + : TQListView( parent, name ) { addColumn( i18n( "Objects" ) ); header( )->hide( ); @@ -106,15 +106,15 @@ void PMTreeView::slotObjectChanged( PMObject* obj, const int mode, if( ( mode & PMCAdd ) && !( mode & PMCInsertError ) ) { // object was added - if( !obj->tqparent( ) ) + if( !obj->parent( ) ) { - // object has no tqparent, append it as top level item + // object has no parent, append it as top level item pTreeItem = new PMTreeViewItem( obj, this ); } else { - // find the tqparent in the listview - TQListViewItem* pParentTreeItem = findObject( obj->tqparent( ) ); + // find the parent in the listview + TQListViewItem* pParentTreeItem = findObject( obj->parent( ) ); if( pParentTreeItem ) { PMObject* hObj = obj->prevSibling( ); @@ -186,7 +186,7 @@ void PMTreeView::slotObjectChanged( PMObject* obj, const int mode, if( pTreeItem ) { PMTreeViewItem* p; - for( p = pTreeItem->tqparent( ); p; p = p->tqparent( ) ) + for( p = pTreeItem->parent( ); p; p = p->parent( ) ) p->setOpen( true ); pTreeItem->setSelected( true ); setCurrentItem( pTreeItem ); @@ -238,7 +238,7 @@ PMTreeViewItem* PMTreeView::findObject( const PMObject* obj ) { PMTreeViewItem* pTreeItem = 0; - if( !obj->tqparent( ) ) + if( !obj->parent( ) ) { // top level object pTreeItem = ( PMTreeViewItem* ) firstChild( ); @@ -248,7 +248,7 @@ PMTreeViewItem* PMTreeView::findObject( const PMObject* obj ) } else { - pTreeItem = findObject( obj->tqparent( ) ); + pTreeItem = findObject( obj->parent( ) ); if( pTreeItem ) { pTreeItem = ( PMTreeViewItem* ) pTreeItem->firstChild( ); @@ -269,7 +269,7 @@ void PMTreeView::selectItem( TQListViewItem* /*sitem*/ ) m_pSelectedObject = ( ( PMTreeViewItem* ) sitem )->object( ); - for( pItem = sitem->tqparent( ); pItem; pItem = pItem->tqparent( ) ) + for( pItem = sitem->parent( ); pItem; pItem = pItem->parent( ) ) pItem->setOpen( true ); ensureItemVisible( sitem ); setCurrentItem( sitem ); @@ -389,11 +389,11 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) else if( ( e->state( ) & ShiftButton ) && oldCurrent && m_pLastSelected ) { if( ( oldCurrent != m_pLastSelected ) && - ( oldCurrent->tqparent( ) == m_pLastSelected->tqparent( ) ) ) + ( oldCurrent->parent( ) == m_pLastSelected->parent( ) ) ) { specialAction = true; - // shift click, old current item has the same tqparent + // shift click, old current item has the same parent // as the new selection. Select all items between the two // items if( m_pLastSelected->object( )->isSelectable( ) ) @@ -628,8 +628,8 @@ void PMTreeView::viewportDragMoveEvent( TQDragMoveEvent *e ) accept = false; if( !obj->isReadOnly( ) ) accept = true; - if( obj->tqparent( ) ) - if( !obj->tqparent( )->isReadOnly( ) ) + if( obj->parent( ) ) + if( !obj->parent( )->isReadOnly( ) ) accept = true; } } @@ -733,7 +733,7 @@ void PMTreeView::keyPressEvent( TQKeyEvent* e ) accept = true; break; case TQt::Key_Left: - newSelection = current->tqparent( ); + newSelection = current->parent( ); accept = true; break; case TQt::Key_Right: diff --git a/kpovmodeler/pmtreeview.h b/kpovmodeler/pmtreeview.h index 445b53fd..7b9ea1d0 100644 --- a/kpovmodeler/pmtreeview.h +++ b/kpovmodeler/pmtreeview.h @@ -41,7 +41,7 @@ public: /** * Default constructor */ - PMTreeViewWidget( PMPart* pare, TQWidget* tqparent, const char* name = 0 ); + PMTreeViewWidget( PMPart* pare, TQWidget* parent, const char* name = 0 ); /** */ virtual TQString viewType( ) const { return TQString( "treeview" ); } @@ -59,10 +59,10 @@ class PMTreeView : public TQListView friend class PMTreeViewItem; public: /** - * Creates a PMTreeView with tqparent and name that displays the + * Creates a PMTreeView with parent and name that displays the * document doc */ - PMTreeView( PMPart* part, TQWidget* tqparent = 0, const char* name = 0 ); + PMTreeView( PMPart* part, TQWidget* parent = 0, const char* name = 0 ); /** * Deletes the PMTreeView */ @@ -174,9 +174,9 @@ public: virtual TQString viewType( ) const { return TQString( "treeview" ); } virtual TQString description( ) const; virtual TQString iconName( ) const { return TQString( "pmtreeview" ); } - virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const + virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const { - return new PMTreeViewWidget( part, tqparent ); + return new PMTreeViewWidget( part, parent ); } }; diff --git a/kpovmodeler/pmtreeviewitem.cpp b/kpovmodeler/pmtreeviewitem.cpp index e167e86b..e3017b40 100644 --- a/kpovmodeler/pmtreeviewitem.cpp +++ b/kpovmodeler/pmtreeviewitem.cpp @@ -24,34 +24,34 @@ #include "pmfactory.h" #include "pmtexturemap.h" -PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListView* tqparent ) - : TQListViewItem( tqparent ) +PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListView* parent ) + : TQListViewItem( parent ) { m_pObject = object; setDescriptions( ); initSelection( ); } -PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListViewItem* tqparent ) - : TQListViewItem( tqparent ) +PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListViewItem* parent ) + : TQListViewItem( parent ) { m_pObject = object; setDescriptions( ); initSelection( ); } -PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListView* tqparent, +PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListView* parent, TQListViewItem* after ) - : TQListViewItem( tqparent, after ) + : TQListViewItem( parent, after ) { m_pObject = object; setDescriptions( ); initSelection( ); } -PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListViewItem* tqparent, +PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListViewItem* parent, TQListViewItem* after ) - : TQListViewItem( tqparent, after ) + : TQListViewItem( parent, after ) { m_pObject = object; setDescriptions( ); @@ -72,11 +72,11 @@ void PMTreeViewItem::setDescriptions( ) else text = m_pObject->description( ); - if( m_pObject->tqparent( ) ) + if( m_pObject->parent( ) ) { - if( m_pObject->tqparent( )->isA( "TextureMapBase" ) ) + if( m_pObject->parent( )->isA( "TextureMapBase" ) ) { - PMTextureMapBase* tm = ( PMTextureMapBase* ) m_pObject->tqparent( ); + PMTextureMapBase* tm = ( PMTextureMapBase* ) m_pObject->parent( ); if( m_pObject->type( ) == tm->mapType( ) ) text = TQString( "[%1] " ).tqarg( tm->mapValue( m_pObject ), 4, 'f', 2 ) + text; } @@ -87,8 +87,8 @@ void PMTreeViewItem::setDescriptions( ) TQString PMTreeViewItem::key( int, bool ) const { TQString result; - if( m_pObject->tqparent( ) ) - result.sprintf( "%06i", m_pObject->tqparent( )->findChild( m_pObject ) ); + if( m_pObject->parent( ) ) + result.sprintf( "%06i", m_pObject->parent( )->findChild( m_pObject ) ); else result = "000000"; return result; diff --git a/kpovmodeler/pmtreeviewitem.h b/kpovmodeler/pmtreeviewitem.h index 81fdeb96..7792871a 100644 --- a/kpovmodeler/pmtreeviewitem.h +++ b/kpovmodeler/pmtreeviewitem.h @@ -36,24 +36,24 @@ class PMTreeViewItem : public TQListViewItem { public: /** - * Constructs a new top-level list view item in the TQListView tqparent. + * Constructs a new top-level list view item in the TQListView parent. */ - PMTreeViewItem( PMObject* object, TQListView* tqparent ); + PMTreeViewItem( PMObject* object, TQListView* parent ); /** - * Constructs a new list view item which is a child of tqparent and - * first in the tqparent's list of tqchildren. + * Constructs a new list view item which is a child of parent and + * first in the parent's list of tqchildren. */ - PMTreeViewItem( PMObject* object, TQListViewItem* tqparent ); + PMTreeViewItem( PMObject* object, TQListViewItem* parent ); /** - * Constructs a list view item which is a child of tqparent - * and is after after in the tqparent's list of tqchildren. + * Constructs a list view item which is a child of parent + * and is after after in the parent's list of tqchildren. */ - PMTreeViewItem( PMObject* object, TQListView* tqparent, TQListViewItem* after ); + PMTreeViewItem( PMObject* object, TQListView* parent, TQListViewItem* after ); /** - * Constructs a list view item which is a child of tqparent - * and is after after in the tqparent's list of tqchildren. + * Constructs a list view item which is a child of parent + * and is after after in the parent's list of tqchildren. */ - PMTreeViewItem( PMObject* object, TQListViewItem* tqparent, + PMTreeViewItem( PMObject* object, TQListViewItem* parent, TQListViewItem* after ); /** * Returns the connected @ref PMObject @@ -65,11 +65,11 @@ public: */ virtual TQString key( int column, bool ascending ) const; /** - * Returns a pointer to the tqparent item + * Returns a pointer to the parent item */ - PMTreeViewItem* tqparent( ) + PMTreeViewItem* parent( ) { - return ( PMTreeViewItem* ) TQListViewItem::tqparent( ); + return ( PMTreeViewItem* ) TQListViewItem::parent( ); } void setSelected( bool select ); diff --git a/kpovmodeler/pmtriangle.cpp b/kpovmodeler/pmtriangle.cpp index 362ae868..db88443e 100644 --- a/kpovmodeler/pmtriangle.cpp +++ b/kpovmodeler/pmtriangle.cpp @@ -345,9 +345,9 @@ void PMTriangle::enableUV( bool yes ) } } -PMDialogEditBase* PMTriangle::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMTriangle::editWidget( TQWidget* parent ) const { - return new PMTriangleEdit( tqparent ); + return new PMTriangleEdit( parent ); } void PMTriangle::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmtriangle.h b/kpovmodeler/pmtriangle.h index fbff523d..aeb590d2 100644 --- a/kpovmodeler/pmtriangle.h +++ b/kpovmodeler/pmtriangle.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMTriangleEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmtriangleedit.cpp b/kpovmodeler/pmtriangleedit.cpp index 0fde6e22..b6d544a0 100644 --- a/kpovmodeler/pmtriangleedit.cpp +++ b/kpovmodeler/pmtriangleedit.cpp @@ -27,8 +27,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMTriangleEdit::PMTriangleEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTriangleEdit::PMTriangleEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtriangleedit.h b/kpovmodeler/pmtriangleedit.h index b1982f57..58ecf8ee 100644 --- a/kpovmodeler/pmtriangleedit.h +++ b/kpovmodeler/pmtriangleedit.h @@ -42,9 +42,9 @@ class PMTriangleEdit : public PMGraphicalObjectEdit typedef PMGraphicalObjectEdit Base; public: /** - * Creates a PMTriangleEdit with tqparent and name + * Creates a PMTriangleEdit with parent and name */ - PMTriangleEdit( TQWidget* tqparent, const char* name = 0 ); + PMTriangleEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmunknownview.cpp b/kpovmodeler/pmunknownview.cpp index 60b65658..646aa619 100644 --- a/kpovmodeler/pmunknownview.cpp +++ b/kpovmodeler/pmunknownview.cpp @@ -20,8 +20,8 @@ #include <tqlayout.h> PMUnknownView::PMUnknownView( const TQString& viewType, - TQWidget* tqparent, const char* name ) - : PMViewBase( tqparent, name ) + TQWidget* parent, const char* name ) + : PMViewBase( parent, name ) { TQHBoxLayout* hl = new TQHBoxLayout( this ); TQLabel* l; diff --git a/kpovmodeler/pmunknownview.h b/kpovmodeler/pmunknownview.h index 8947b689..dbb5d042 100644 --- a/kpovmodeler/pmunknownview.h +++ b/kpovmodeler/pmunknownview.h @@ -34,7 +34,7 @@ public: /** * Default constructor */ - PMUnknownView( const TQString& viewType, TQWidget* tqparent, + PMUnknownView( const TQString& viewType, TQWidget* parent, const char* name = 0 ); /** */ virtual TQString viewType( ) const { return m_viewType; } diff --git a/kpovmodeler/pmvectoredit.cpp b/kpovmodeler/pmvectoredit.cpp index 5140f297..79075dc3 100644 --- a/kpovmodeler/pmvectoredit.cpp +++ b/kpovmodeler/pmvectoredit.cpp @@ -28,8 +28,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX, const TQString& descriptionY, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) + TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { unsigned int i; TQHBoxLayout* tqlayout; @@ -66,8 +66,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX, PMVectorEdit::PMVectorEdit( const TQString& descriptionX, const TQString& descriptionY, const TQString& descriptionZ, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) + TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { unsigned int i; TQHBoxLayout* tqlayout; @@ -114,8 +114,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionA, const TQString& descriptionB, const TQString& descriptionC, const TQString& descriptionD, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) + TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { unsigned int i; TQHBoxLayout* tqlayout; diff --git a/kpovmodeler/pmvectoredit.h b/kpovmodeler/pmvectoredit.h index 9f46a147..b73663c6 100644 --- a/kpovmodeler/pmvectoredit.h +++ b/kpovmodeler/pmvectoredit.h @@ -44,7 +44,7 @@ public: */ PMVectorEdit( const TQString& descriptionX, const TQString& descriptionY, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); /** * Creates an edit widget for 3D vectors. * @@ -52,7 +52,7 @@ public: */ PMVectorEdit( const TQString& descriptionX, const TQString& descriptionY, const TQString& descriptionZ, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); /** * Creates an edit widget for 4D vectors. * @@ -61,7 +61,7 @@ public: */ PMVectorEdit( const TQString& descriptionA, const TQString& descriptionB, const TQString& descriptionC, const TQString& descriptionD, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); /** * Sets the displayed vector diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp index e6d4385a..fed18026 100644 --- a/kpovmodeler/pmvectorlistedit.cpp +++ b/kpovmodeler/pmvectorlistedit.cpp @@ -57,8 +57,8 @@ void PMTableItem::paint( TQPainter* p, const TQColorGroup& cg, } */ -PMVectorListEdit::PMVectorListEdit( TQWidget* tqparent, const char* name ) - : TQTable( 1, 3, tqparent, name ) +PMVectorListEdit::PMVectorListEdit( TQWidget* parent, const char* name ) + : TQTable( 1, 3, parent, name ) { init( 3 ); @@ -70,8 +70,8 @@ PMVectorListEdit::PMVectorListEdit( TQWidget* tqparent, const char* name ) PMVectorListEdit::PMVectorListEdit( const TQString& c1, const TQString& c2, const TQString& c3, const TQString& c4, - TQWidget* tqparent, const char* name ) - : TQTable( 1, 4, tqparent, name ) + TQWidget* parent, const char* name ) + : TQTable( 1, 4, parent, name ) { init( 4 ); @@ -83,9 +83,9 @@ PMVectorListEdit::PMVectorListEdit( const TQString& c1, const TQString& c2, } PMVectorListEdit::PMVectorListEdit( const TQString& c1, const TQString& c2, - const TQString& c3, TQWidget* tqparent, + const TQString& c3, TQWidget* parent, const char* name ) - : TQTable( 1, 3, tqparent, name ) + : TQTable( 1, 3, parent, name ) { init( 3 ); @@ -96,8 +96,8 @@ PMVectorListEdit::PMVectorListEdit( const TQString& c1, const TQString& c2, } PMVectorListEdit::PMVectorListEdit( const TQString& c1, const TQString& c2, - TQWidget* tqparent, const char* name ) - : TQTable( 1, 2, tqparent, name ) + TQWidget* parent, const char* name ) + : TQTable( 1, 2, parent, name ) { init( 2 ); @@ -342,8 +342,8 @@ void PMVectorListEdit::blockSelectionUpdates( bool block ) bool PMVectorListEdit::eventFilter( TQObject* o, TQEvent* e ) { - if( e->type( ) == TQEvent::Wheel && tqparent( ) ) - return TQApplication::sendEvent( tqparent( ), e ); + if( e->type( ) == TQEvent::Wheel && parent( ) ) + return TQApplication::sendEvent( parent( ), e ); if( e->type( ) == TQEvent::MouseButtonPress && ( ( TQMouseEvent* ) e )->button( ) == Qt::RightButton ) { diff --git a/kpovmodeler/pmvectorlistedit.h b/kpovmodeler/pmvectorlistedit.h index e00190f8..d415e9a9 100644 --- a/kpovmodeler/pmvectorlistedit.h +++ b/kpovmodeler/pmvectorlistedit.h @@ -62,23 +62,23 @@ public: /** * Constructor for 3d vectors (x, y, z) */ - PMVectorListEdit( TQWidget* tqparent, const char* name = 0 ); + PMVectorListEdit( TQWidget* parent, const char* name = 0 ); /** * Constructor for 3d vectors */ PMVectorListEdit( const TQString& c1, const TQString& c2, const TQString& c3, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); /** * Constructor for 2d vectors */ PMVectorListEdit( const TQString& c1, const TQString& c2, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); /** * Constructor for 4d vectors */ PMVectorListEdit( const TQString& c1, const TQString& c2, const TQString& c3, - const TQString& c4, TQWidget* tqparent, const char* name = 0 ); + const TQString& c4, TQWidget* parent, const char* name = 0 ); /** * Sets and displays the vectors. The widget will automatically * resize if no link is set and resize is true. diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp index 2fab58d9..98fb2f61 100644 --- a/kpovmodeler/pmview.cpp +++ b/kpovmodeler/pmview.cpp @@ -34,8 +34,8 @@ #include "pmdialogview.h" #include "pmglview.h" -PMView::PMView( PMPart* part, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMView::PMView( PMPart* part, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { setBackgroundMode( PaletteBase ); diff --git a/kpovmodeler/pmview.h b/kpovmodeler/pmview.h index 9ad1c7b9..3a4d9f2a 100644 --- a/kpovmodeler/pmview.h +++ b/kpovmodeler/pmview.h @@ -44,7 +44,7 @@ public: /** * Constructor for the main view */ - PMView( PMPart* part, TQWidget* tqparent = 0, const char* name = 0 ); + PMView( PMPart* part, TQWidget* parent = 0, const char* name = 0 ); /** * Destructor for the main view */ diff --git a/kpovmodeler/pmviewbase.h b/kpovmodeler/pmviewbase.h index 1268694f..68febcf4 100644 --- a/kpovmodeler/pmviewbase.h +++ b/kpovmodeler/pmviewbase.h @@ -70,8 +70,8 @@ public: /** * Default constructor */ - PMViewOptionsWidget( TQWidget* tqparent, const char* name = 0 ) - : TQWidget( tqparent, name ) + PMViewOptionsWidget( TQWidget* parent, const char* name = 0 ) + : TQWidget( parent, name ) { } @@ -96,8 +96,8 @@ public: /** * Default constructor */ - PMViewBase( TQWidget* tqparent, const char* name = 0, WFlags f = 0 ) - : TQWidget( tqparent, name, f ) + PMViewBase( TQWidget* parent, const char* name = 0, WFlags f = 0 ) + : TQWidget( parent, name, f ) { } /** diff --git a/kpovmodeler/pmviewfactory.cpp b/kpovmodeler/pmviewfactory.cpp index ac4704b6..804c787c 100644 --- a/kpovmodeler/pmviewfactory.cpp +++ b/kpovmodeler/pmviewfactory.cpp @@ -62,11 +62,11 @@ void PMViewFactory::addViewType( PMViewTypeFactory* vt ) } PMViewBase* PMViewFactory::newViewInstance( const TQString& viewType, - TQWidget* tqparent, PMPart* part ) const + TQWidget* parent, PMPart* part ) const { PMViewTypeFactory* f = m_dict.find( viewType ); if( f ) - return f->newInstance( tqparent, part ); + return f->newInstance( parent, part ); kdError( PMArea ) << "Unknown view type \"" << viewType << "\"" << endl; return 0; diff --git a/kpovmodeler/pmviewfactory.h b/kpovmodeler/pmviewfactory.h index 78f8981f..5fd42c1a 100644 --- a/kpovmodeler/pmviewfactory.h +++ b/kpovmodeler/pmviewfactory.h @@ -72,7 +72,7 @@ public: /** * Returns a new view instance */ - virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const = 0; + virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const = 0; /** * Creates a config object for the view type. * If the view doesn't have special attributes, the function returns 0; @@ -116,7 +116,7 @@ public: * Returns a new view of type viewType if available */ PMViewBase* newViewInstance( const TQString& viewType, - TQWidget* tqparent, PMPart* part ) const; + TQWidget* parent, PMPart* part ) const; /** * Returns a new view option instance for the given view type */ diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp index 4b57d728..e6f9148c 100644 --- a/kpovmodeler/pmviewlayoutmanager.cpp +++ b/kpovmodeler/pmviewlayoutmanager.cpp @@ -866,12 +866,12 @@ void PMViewLayoutManager::removeLayout( const TQString& name ) } -PMSaveViewLayoutDialog::PMSaveViewLayoutDialog( PMShell* tqparent, +PMSaveViewLayoutDialog::PMSaveViewLayoutDialog( PMShell* parent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "Save View Layout" ), + : KDialogBase( parent, name, true, i18n( "Save View Layout" ), KDialogBase::Ok | KDialogBase::Cancel ) { - m_pShell = tqparent; + m_pShell = parent; setButtonOK( KStdGuiItem::save() ); enableButtonOK( false ); diff --git a/kpovmodeler/pmviewlayoutmanager.h b/kpovmodeler/pmviewlayoutmanager.h index 1ef04eba..c84147fb 100644 --- a/kpovmodeler/pmviewlayoutmanager.h +++ b/kpovmodeler/pmviewlayoutmanager.h @@ -293,7 +293,7 @@ class PMSaveViewLayoutDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - PMSaveViewLayoutDialog( PMShell* tqparent, const char* name = 0 ); + PMSaveViewLayoutDialog( PMShell* parent, const char* name = 0 ); ~PMSaveViewLayoutDialog( ); protected slots: virtual void slotOk( ); diff --git a/kpovmodeler/pmwarp.cpp b/kpovmodeler/pmwarp.cpp index b9e8682b..e97817bb 100644 --- a/kpovmodeler/pmwarp.cpp +++ b/kpovmodeler/pmwarp.cpp @@ -467,9 +467,9 @@ void PMWarp::setMajorRadius( const double c ) } } -PMDialogEditBase* PMWarp::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMWarp::editWidget( TQWidget* parent ) const { - return new PMWarpEdit( tqparent ); + return new PMWarpEdit( parent ); } void PMWarp::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmwarp.h b/kpovmodeler/pmwarp.h index d58fab8f..15e86b65 100644 --- a/kpovmodeler/pmwarp.h +++ b/kpovmodeler/pmwarp.h @@ -68,7 +68,7 @@ public: /** * Returns a new @ref PMWarpEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmwarpedit.cpp b/kpovmodeler/pmwarpedit.cpp index f7afa539..64e327f2 100644 --- a/kpovmodeler/pmwarpedit.cpp +++ b/kpovmodeler/pmwarpedit.cpp @@ -29,8 +29,8 @@ #include <kdialog.h> -PMWarpEdit::PMWarpEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMWarpEdit::PMWarpEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmwarpedit.h b/kpovmodeler/pmwarpedit.h index 653219b9..00becf67 100644 --- a/kpovmodeler/pmwarpedit.h +++ b/kpovmodeler/pmwarpedit.h @@ -44,9 +44,9 @@ class PMWarpEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMWarpEdit with tqparent and name + * Creates a PMWarpEdit with parent and name */ - PMWarpEdit( TQWidget* tqparent, const char* name = 0 ); + PMWarpEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmxmlparser.cpp b/kpovmodeler/pmxmlparser.cpp index c82b6f4c..eb5d0123 100644 --- a/kpovmodeler/pmxmlparser.cpp +++ b/kpovmodeler/pmxmlparser.cpp @@ -117,7 +117,7 @@ void PMXMLParser::topParse( ) } } -void PMXMLParser::parseChildObjects( TQDomElement& e, PMObject* tqparent ) +void PMXMLParser::parseChildObjects( TQDomElement& e, PMObject* parent ) { TQDomNode c = e.firstChild( ); while( !c.isNull( ) ) @@ -132,7 +132,7 @@ void PMXMLParser::parseChildObjects( TQDomElement& e, PMObject* tqparent ) PMXMLHelper hlp( ce, m_pPart, this, m_majorDocumentFormat, m_minorDocumentFormat ); obj->readAttributes( hlp ); - if( insertChild( obj, tqparent ) ) + if( insertChild( obj, parent ) ) { parseChildObjects( ce, obj ); diff --git a/kpovmodeler/pmxmlparser.h b/kpovmodeler/pmxmlparser.h index d33ff434..2ff8f351 100644 --- a/kpovmodeler/pmxmlparser.h +++ b/kpovmodeler/pmxmlparser.h @@ -70,10 +70,10 @@ private: bool initDocument( ); /** - * Looks for child objects, parses them and appends them to the tqparent - * object. If tqparent is 0, all objects are appended to the result list. + * Looks for child objects, parses them and appends them to the parent + * object. If parent is 0, all objects are appended to the result list. */ - void parseChildObjects( TQDomElement& e, PMObject* tqparent ); + void parseChildObjects( TQDomElement& e, PMObject* parent ); TQDomDocument* m_pDoc; int m_majorDocumentFormat; |