Rename old tq methods that no longer need a unique name

176 files changed, 632 insertions, 632 deletions

diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp
index 18af4c37..0229c518 100644
--- a/kpovmodeler/pmactions.cpp
+++ b/kpovmodeler/pmactions.cpp
@@ -29,7 +29,7 @@
 #include "pmdebug.h"
 
 // Fixed widths are calculated wrong in a toolbar.
-// Fixed tqsizeHint for the combo box to return
+// Fixed sizeHint for the combo box to return
 // at least the minimum size
 class PMComboBox : public TQComboBox
 {
@@ -39,15 +39,15 @@ public:
    {
    }
 
-   virtual TQSize tqminimumSizeHint( ) const
+   virtual TQSize minimumSizeHint( ) const
    {
-      TQSize s = TQComboBox::tqminimumSizeHint( );
-      return s.expandedTo( tqminimumSize( ) );
+      TQSize s = TQComboBox::minimumSizeHint( );
+      return s.expandedTo( minimumSize( ) );
    }
-   virtual TQSize tqsizeHint( ) const
+   virtual TQSize sizeHint( ) const
    {
-      TQSize s = TQComboBox::tqsizeHint( );
-      return s.expandedTo( tqminimumSize( ) );
+      TQSize s = TQComboBox::sizeHint( );
+      return s.expandedTo( minimumSize( ) );
    }
 };
 
@@ -126,7 +126,7 @@ public:
       setText( text );
    }
 protected:
-   TQSize tqsizeHint( ) const
+   TQSize sizeHint( ) const
    {
       int w = fontMetrics( ).width( text( ) );
       int h = fontMetrics( ).height( );
@@ -135,10 +135,10 @@ protected:
    void drawButton( TQPainter* p )
    {
       // Draw the background
-      tqstyle( ).tqdrawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), tqcolorGroup( ),
+      tqstyle( ).drawComplexControl( TQStyle::CC_ToolButton, p, this, rect( ), colorGroup( ),
                                    TQStyle::Style_Enabled, TQStyle::SC_ToolButton );
       // Draw the label
-      tqstyle( ).tqdrawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), tqcolorGroup( ),
+      tqstyle( ).drawControl( TQStyle::CE_ToolButtonLabel, p, this, rect( ), colorGroup( ),
                             TQStyle::Style_Enabled );
    }
 };
diff --git a/kpovmodeler/pmbicubicpatch.cpp b/kpovmodeler/pmbicubicpatch.cpp
index dd281ceb..b4c363d5 100644
--- a/kpovmodeler/pmbicubicpatch.cpp
+++ b/kpovmodeler/pmbicubicpatch.cpp
@@ -209,11 +209,11 @@ void PMBicubicPatch::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMBicubicPatch::tqmetaObject( ) const
+PMMetaObject* PMBicubicPatch::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BicubicPatch", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BicubicPatch", Base::metaObject( ),
                                         createNewBicubicPatch );
       s_pMetaObject->addProperty(
          new PMBicubicPatchProperty( "patchType", &PMBicubicPatch::setPatchType,
diff --git a/kpovmodeler/pmbicubicpatch.h b/kpovmodeler/pmbicubicpatch.h
index 54baae43..d14f7821 100644
--- a/kpovmodeler/pmbicubicpatch.h
+++ b/kpovmodeler/pmbicubicpatch.h
@@ -55,7 +55,7 @@ public:
    /** */
    virtual TQString description( ) const;
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmblendmapmodifiers.cpp b/kpovmodeler/pmblendmapmodifiers.cpp
index e28fa7fb..9d26419e 100644
--- a/kpovmodeler/pmblendmapmodifiers.cpp
+++ b/kpovmodeler/pmblendmapmodifiers.cpp
@@ -57,11 +57,11 @@ PMBlendMapModifiers::~PMBlendMapModifiers( )
 {
 }
 
-PMMetaObject* PMBlendMapModifiers::tqmetaObject( ) const
+PMMetaObject* PMBlendMapModifiers::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BlendMapModifiers", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BlendMapModifiers", Base::metaObject( ),
                                         createBlendMapModifiers );
       s_pMetaObject->addProperty(
          new PMBlendMapModifiersProperty( "frequencyEnabled", &PMBlendMapModifiers::enableFrequency,
diff --git a/kpovmodeler/pmblendmapmodifiers.h b/kpovmodeler/pmblendmapmodifiers.h
index be5a863e..ecf0bfed 100644
--- a/kpovmodeler/pmblendmapmodifiers.h
+++ b/kpovmodeler/pmblendmapmodifiers.h
@@ -57,7 +57,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmblob.cpp b/kpovmodeler/pmblob.cpp
index 317c18d7..6621cadf 100644
--- a/kpovmodeler/pmblob.cpp
+++ b/kpovmodeler/pmblob.cpp
@@ -77,11 +77,11 @@ void PMBlob::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMBlob::tqmetaObject( ) const
+PMMetaObject* PMBlob::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Blob", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Blob", Base::metaObject( ),
                                         createNewBlob );
       s_pMetaObject->addProperty(
          new PMBlobProperty( "threshold", &PMBlob::setThreshold, &PMBlob::threshold ) );
diff --git a/kpovmodeler/pmblob.h b/kpovmodeler/pmblob.h
index 6bdbef31..2c764590 100644
--- a/kpovmodeler/pmblob.h
+++ b/kpovmodeler/pmblob.h
@@ -52,7 +52,7 @@ public:
    /** */
    virtual TQString description( ) const;
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmblobcylinder.cpp b/kpovmodeler/pmblobcylinder.cpp
index 114f4fa0..d166a6a3 100644
--- a/kpovmodeler/pmblobcylinder.cpp
+++ b/kpovmodeler/pmblobcylinder.cpp
@@ -93,11 +93,11 @@ void PMBlobCylinder::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMBlobCylinder::tqmetaObject( ) const
+PMMetaObject* PMBlobCylinder::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BlobCylinder", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BlobCylinder", Base::metaObject( ),
                                         createNewBlobCylinder );
       s_pMetaObject->addProperty(
          new PMBlobCylinderProperty( "end1", &PMBlobCylinder::setEnd1,
diff --git a/kpovmodeler/pmblobcylinder.h b/kpovmodeler/pmblobcylinder.h
index a07df1f6..1e9a10f1 100644
--- a/kpovmodeler/pmblobcylinder.h
+++ b/kpovmodeler/pmblobcylinder.h
@@ -57,7 +57,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmblobsphere.cpp b/kpovmodeler/pmblobsphere.cpp
index 70dcf06c..cbcd33a4 100644
--- a/kpovmodeler/pmblobsphere.cpp
+++ b/kpovmodeler/pmblobsphere.cpp
@@ -72,11 +72,11 @@ TQString PMBlobSphere::description( ) const
    return i18n( "blob sphere" );
 }
 
-PMMetaObject* PMBlobSphere::tqmetaObject( ) const
+PMMetaObject* PMBlobSphere::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BlobSphere", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BlobSphere", Base::metaObject( ),
                                         createNewBlobSphere );
       s_pMetaObject->addProperty(
          new PMBlobSphereProperty( "center", &PMBlobSphere::setCentre,
diff --git a/kpovmodeler/pmblobsphere.h b/kpovmodeler/pmblobsphere.h
index e734e399..0abe983e 100644
--- a/kpovmodeler/pmblobsphere.h
+++ b/kpovmodeler/pmblobsphere.h
@@ -55,7 +55,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmboundedby.cpp b/kpovmodeler/pmboundedby.cpp
index 467129e8..5cc66e55 100644
--- a/kpovmodeler/pmboundedby.cpp
+++ b/kpovmodeler/pmboundedby.cpp
@@ -40,11 +40,11 @@ PMBoundedBy::~PMBoundedBy( )
 {
 }
 
-PMMetaObject* PMBoundedBy::tqmetaObject( ) const
+PMMetaObject* PMBoundedBy::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BoundedBy", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BoundedBy", Base::metaObject( ),
                                         createNewBoundedBy );
       s_pMetaObject->addProperty(
          new PMBoundedByProperty( "clippedBy", 0, &PMBoundedBy::clippedBy ) );
diff --git a/kpovmodeler/pmboundedby.h b/kpovmodeler/pmboundedby.h
index 256dc5f5..7c88a6aa 100644
--- a/kpovmodeler/pmboundedby.h
+++ b/kpovmodeler/pmboundedby.h
@@ -49,7 +49,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmbox.cpp b/kpovmodeler/pmbox.cpp
index 6ecc2c3c..155ebc68 100644
--- a/kpovmodeler/pmbox.cpp
+++ b/kpovmodeler/pmbox.cpp
@@ -76,11 +76,11 @@ void PMBox::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMBox::tqmetaObject( ) const
+PMMetaObject* PMBox::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Box", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Box", Base::metaObject( ),
                                         createNewBox );
       s_pMetaObject->addProperty(
          new PMBoxProperty( "corner1", &PMBox::setCorner1, &PMBox::corner1 ) );
diff --git a/kpovmodeler/pmbox.h b/kpovmodeler/pmbox.h
index 7896b779..e6abcf75 100644
--- a/kpovmodeler/pmbox.h
+++ b/kpovmodeler/pmbox.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmbumpmap.cpp b/kpovmodeler/pmbumpmap.cpp
index 5c08040f..21fb29a3 100644
--- a/kpovmodeler/pmbumpmap.cpp
+++ b/kpovmodeler/pmbumpmap.cpp
@@ -200,11 +200,11 @@ void PMBumpMap::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMBumpMap::tqmetaObject( ) const
+PMMetaObject* PMBumpMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "BumpMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "BumpMap", Base::metaObject( ),
                                         createNewBumpMap );
 
       PMBitmapTypeProperty* bp = new PMBitmapTypeProperty(
diff --git a/kpovmodeler/pmbumpmap.h b/kpovmodeler/pmbumpmap.h
index ade1c1cd..ccdf5b98 100644
--- a/kpovmodeler/pmbumpmap.h
+++ b/kpovmodeler/pmbumpmap.h
@@ -72,7 +72,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmcamera.cpp b/kpovmodeler/pmcamera.cpp
index e65b8341..ca37f751 100644
--- a/kpovmodeler/pmcamera.cpp
+++ b/kpovmodeler/pmcamera.cpp
@@ -165,11 +165,11 @@ void PMCamera::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMCamera::tqmetaObject( ) const
+PMMetaObject* PMCamera::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Camera", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Camera", Base::metaObject( ),
                                         createNewCamera );
       s_pMetaObject->addProperty(
          new PMCameraProperty( "location", &PMCamera::setLocation,
diff --git a/kpovmodeler/pmcamera.h b/kpovmodeler/pmcamera.h
index e0d1206e..7d385909 100644
--- a/kpovmodeler/pmcamera.h
+++ b/kpovmodeler/pmcamera.h
@@ -60,7 +60,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmclippedby.cpp b/kpovmodeler/pmclippedby.cpp
index b1499d0c..24ea4e46 100644
--- a/kpovmodeler/pmclippedby.cpp
+++ b/kpovmodeler/pmclippedby.cpp
@@ -40,11 +40,11 @@ PMClippedBy::~PMClippedBy( )
 {
 }
 
-PMMetaObject* PMClippedBy::tqmetaObject( ) const
+PMMetaObject* PMClippedBy::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ClippedBy", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ClippedBy", Base::metaObject( ),
                                         createNewClippedBy );
       s_pMetaObject->addProperty(
          new PMClippedByProperty( "boundedBy", 0, &PMClippedBy::boundedBy ) );
diff --git a/kpovmodeler/pmclippedby.h b/kpovmodeler/pmclippedby.h
index 252a7db2..0e76e2cf 100644
--- a/kpovmodeler/pmclippedby.h
+++ b/kpovmodeler/pmclippedby.h
@@ -48,7 +48,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmcomment.cpp b/kpovmodeler/pmcomment.cpp
index 3f659682..90c817fd 100644
--- a/kpovmodeler/pmcomment.cpp
+++ b/kpovmodeler/pmcomment.cpp
@@ -108,11 +108,11 @@ void PMComment::setText( const TQString& text )
    }
 }
 
-PMMetaObject* PMComment::tqmetaObject( ) const
+PMMetaObject* PMComment::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Comment", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Comment", Base::metaObject( ),
                                         createNewComment );
       s_pMetaObject->addProperty(
          new PMCommentProperty( "text", &PMComment::setText, &PMComment::text ) );
diff --git a/kpovmodeler/pmcomment.h b/kpovmodeler/pmcomment.h
index 832863bc..d435423d 100644
--- a/kpovmodeler/pmcomment.h
+++ b/kpovmodeler/pmcomment.h
@@ -62,7 +62,7 @@ public:
    virtual PMObject* copy( ) const { return new PMComment( *this ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmcompositeobject.cpp b/kpovmodeler/pmcompositeobject.cpp
index 3699e716..d8b61e8c 100644
--- a/kpovmodeler/pmcompositeobject.cpp
+++ b/kpovmodeler/pmcompositeobject.cpp
@@ -67,10 +67,10 @@ PMCompositeObject::~PMCompositeObject( )
       delete m_pViewStructure;
 }
 
-PMMetaObject* PMCompositeObject::tqmetaObject( ) const
+PMMetaObject* PMCompositeObject::metaObject( ) const
 {
    if( !s_pMetaObject )
-      s_pMetaObject = new PMMetaObject( "CompositeObject", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "CompositeObject", Base::metaObject( ) );
    return s_pMetaObject;
 }
 
@@ -84,7 +84,7 @@ void PMCompositeObject::cleanUp( ) const
    Base::cleanUp( );
 }
 
-PMObject* PMCompositeObject::tqchildAt( uint index ) const
+PMObject* PMCompositeObject::childAt( uint index ) const
 {
    PMObject* tmp;
    uint i = 0;
@@ -136,7 +136,7 @@ bool PMCompositeObject::insertChild( PMObject* o, int i )
       }
       else
       {
-         PMObject* tmp = tqchildAt( ( uint ) ( i - 1 ) );
+         PMObject* tmp = childAt( ( uint ) ( i - 1 ) );
          if( !tmp )
          {
             kdError( PMArea ) << "Index too big" << "\n";
@@ -272,7 +272,7 @@ bool PMCompositeObject::takeChild( PMObject* o )
 
 bool PMCompositeObject::takeChild( uint i )
 {
-   PMObject* tmp = tqchildAt( i );
+   PMObject* tmp = childAt( i );
    if( tmp )
       return takeChild( tmp );
    kdError( PMArea ) << "Index too big";
diff --git a/kpovmodeler/pmcompositeobject.h b/kpovmodeler/pmcompositeobject.h
index 50298236..b970faf1 100644
--- a/kpovmodeler/pmcompositeobject.h
+++ b/kpovmodeler/pmcompositeobject.h
@@ -49,7 +49,7 @@ public:
    virtual ~PMCompositeObject( );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -65,7 +65,7 @@ public:
     * Returns a pointer to the child object at position index,
     * or null if the index is out of range.
     */
-   virtual PMObject* tqchildAt( uint index ) const;
+   virtual PMObject* childAt( uint index ) const;
 
    /**
     * Returns true if the object contains the child object o
diff --git a/kpovmodeler/pmcone.cpp b/kpovmodeler/pmcone.cpp
index 014fbc0f..c6fd719e 100644
--- a/kpovmodeler/pmcone.cpp
+++ b/kpovmodeler/pmcone.cpp
@@ -100,11 +100,11 @@ void PMCone::readAttributes( const PMXMLHelper & h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMCone::tqmetaObject( ) const
+PMMetaObject* PMCone::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Cone", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Cone", Base::metaObject( ),
                                         createNewCone );
       s_pMetaObject->addProperty(
          new PMConeProperty( "end1", &PMCone::setEnd1, &PMCone::end1 ) );
diff --git a/kpovmodeler/pmcone.h b/kpovmodeler/pmcone.h
index 25dacfd5..c41f9325 100644
--- a/kpovmodeler/pmcone.h
+++ b/kpovmodeler/pmcone.h
@@ -62,7 +62,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmcsg.cpp b/kpovmodeler/pmcsg.cpp
index 66532ac6..0ac7e58a 100644
--- a/kpovmodeler/pmcsg.cpp
+++ b/kpovmodeler/pmcsg.cpp
@@ -130,11 +130,11 @@ void PMCSG::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMCSG::tqmetaObject( ) const
+PMMetaObject* PMCSG::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "CSG", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "CSG", Base::metaObject( ),
                                         createNewCSG );
       PMCSGTypeProperty* p = new PMCSGTypeProperty( "csgType", &PMCSG::setCSGType, &PMCSG::csgType );
       p->addEnumValue( "union", CSGUnion );
diff --git a/kpovmodeler/pmcsg.h b/kpovmodeler/pmcsg.h
index 36184883..380bf0ef 100644
--- a/kpovmodeler/pmcsg.h
+++ b/kpovmodeler/pmcsg.h
@@ -62,7 +62,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmcylinder.cpp b/kpovmodeler/pmcylinder.cpp
index c449189d..358cb542 100644
--- a/kpovmodeler/pmcylinder.cpp
+++ b/kpovmodeler/pmcylinder.cpp
@@ -97,11 +97,11 @@ void PMCylinder::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMCylinder::tqmetaObject( ) const
+PMMetaObject* PMCylinder::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Cylinder", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Cylinder", Base::metaObject( ),
                                         createNewCylinder );
       s_pMetaObject->addProperty(
          new PMCylinderProperty( "end1", &PMCylinder::setEnd1, &PMCylinder::end1 ) );
diff --git a/kpovmodeler/pmcylinder.h b/kpovmodeler/pmcylinder.h
index cae308fe..1bd10901 100644
--- a/kpovmodeler/pmcylinder.h
+++ b/kpovmodeler/pmcylinder.h
@@ -58,7 +58,7 @@ public:
    /** */
    virtual TQString description( ) const;
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmdeclare.cpp b/kpovmodeler/pmdeclare.cpp
index 089447bc..a5863582 100644
--- a/kpovmodeler/pmdeclare.cpp
+++ b/kpovmodeler/pmdeclare.cpp
@@ -47,11 +47,11 @@ PMDeclare::PMDeclare( const PMDeclare& d )
    // base constuctor when the tqchildren are copied
 }
 
-PMMetaObject* PMDeclare::tqmetaObject( ) const
+PMMetaObject* PMDeclare::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Declare", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Declare", Base::metaObject( ),
                                         createNewDeclare );
       s_pMetaObject->addProperty(
          new PMDeclareProperty( "id", &PMDeclare::setID, &PMDeclare::id ) );
@@ -180,9 +180,9 @@ void PMDeclare::updateDeclareType( )
    if( o )
    {
       if( o->isA( "GraphicalObject" ) )
-         type = m->tqmetaObject( "GraphicalObject" );
+         type = m->metaObject( "GraphicalObject" );
       else
-         type = o->tqmetaObject( );
+         type = o->metaObject( );
    }
    setDeclareType( type );
 }
diff --git a/kpovmodeler/pmdeclare.h b/kpovmodeler/pmdeclare.h
index 69915218..89468bf4 100644
--- a/kpovmodeler/pmdeclare.h
+++ b/kpovmodeler/pmdeclare.h
@@ -55,7 +55,7 @@ public:
    virtual TQString pixmap( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmdensity.cpp b/kpovmodeler/pmdensity.cpp
index a742d514..3935b6be 100644
--- a/kpovmodeler/pmdensity.cpp
+++ b/kpovmodeler/pmdensity.cpp
@@ -43,11 +43,11 @@ PMDensity::~PMDensity( )
 {
 }
 
-PMMetaObject* PMDensity::tqmetaObject( ) const
+PMMetaObject* PMDensity::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Density", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Density", Base::metaObject( ),
                                         createNewDensity );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pmdensity.h b/kpovmodeler/pmdensity.h
index c194f846..b1502fe2 100644
--- a/kpovmodeler/pmdensity.h
+++ b/kpovmodeler/pmdensity.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmdetailobject.cpp b/kpovmodeler/pmdetailobject.cpp
index 050729a4..5abc7e22 100644
--- a/kpovmodeler/pmdetailobject.cpp
+++ b/kpovmodeler/pmdetailobject.cpp
@@ -47,11 +47,11 @@ PMDetailObject::~PMDetailObject()
 {
 }
 
-PMMetaObject* PMDetailObject::tqmetaObject( ) const
+PMMetaObject* PMDetailObject::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "DetailObject", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "DetailObject", Base::metaObject( ) );
       s_pMetaObject->addProperty(
             new PMDetailObjectProperty( "globalDetail", &PMDetailObject::setGlobalDetail, &PMDetailObject::globalDetail ) );
       s_pMetaObject->addProperty(
diff --git a/kpovmodeler/pmdetailobject.h b/kpovmodeler/pmdetailobject.h
index 10efae07..846ef8c0 100644
--- a/kpovmodeler/pmdetailobject.h
+++ b/kpovmodeler/pmdetailobject.h
@@ -43,7 +43,7 @@ public:
    virtual ~PMDetailObject();
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp
index 0a7f372e..be91b48e 100644
--- a/kpovmodeler/pmdialogview.cpp
+++ b/kpovmodeler/pmdialogview.cpp
@@ -69,7 +69,7 @@ void PMDialogEditContent::calculateSize( )
    int fw = lineWidth( ) * 2;
    if( m_pContents )
    {
-      TQSize newSize = m_pContents->tqminimumSizeHint( );
+      TQSize newSize = m_pContents->minimumSizeHint( );
 
       setVScrollBarMode( AlwaysOff );
       setHScrollBarMode( AlwaysOff );
diff --git a/kpovmodeler/pmdisc.cpp b/kpovmodeler/pmdisc.cpp
index 6f7bac55..bda89579 100644
--- a/kpovmodeler/pmdisc.cpp
+++ b/kpovmodeler/pmdisc.cpp
@@ -96,11 +96,11 @@ void PMDisc::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMDisc::tqmetaObject( ) const
+PMMetaObject* PMDisc::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Disc", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Disc", Base::metaObject( ),
                                         createNewDisc );
       s_pMetaObject->addProperty(
          new PMDiscProperty( "center", &PMDisc::setCenter, &PMDisc::center ) );
diff --git a/kpovmodeler/pmdisc.h b/kpovmodeler/pmdisc.h
index b56e2175..62201bcf 100644
--- a/kpovmodeler/pmdisc.h
+++ b/kpovmodeler/pmdisc.h
@@ -58,7 +58,7 @@ public:
    /** */
    virtual TQString description( ) const;
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 87fc37ef..733922f2 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -337,7 +337,7 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
 
   paint.begin( this );
 
-  tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), tqcolorGroup());
+  tqstyle().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup());
 
   paint.end();
 }
@@ -392,7 +392,7 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
   tqlayout->addWidget( stayButton );
   tqlayout->addWidget( closeButton );
   tqlayout->activate();
-  drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+  drag->setFixedHeight( tqlayout->minimumSize().height() );
 }
 
 void PMDockWidgetHeader::setTopLevel( bool isTopLevel )
@@ -436,7 +436,7 @@ void PMDockWidgetHeader::setDragPanel( PMDockWidgetHeaderDrag* nd )
   tqlayout->addWidget( stayButton );
   tqlayout->addWidget( closeButton );
   tqlayout->activate();
-  drag->setFixedHeight( tqlayout->tqminimumSize().height() );
+  drag->setFixedHeight( tqlayout->minimumSize().height() );
 }
 
 void PMDockWidgetHeader::slotStayClicked()
@@ -1454,7 +1454,7 @@ PMDockWidget* PMDockManager::findDockWidgetAt( const TQPoint& pos )
     return 0L;
   }
 #if defined(_OS_WIN32_) || defined(Q_OS_WIN32)
-  p = p->tqtopLevelWidget();
+  p = p->topLevelWidget();
 #endif
   TQWidget* w = 0L;
   findChildDockWidget( w, p, p->mapFromGlobal(pos) );
@@ -1692,7 +1692,7 @@ static TQDomElement createStringEntry(TQDomDocument &doc, const TQString &tagNam
 
 static TQDomElement createBoolEntry(TQDomDocument &doc, const TQString &tagName, bool b)
 {
-    return createStringEntry(doc, tagName, TQString::tqfromLatin1(b? "true" : "false"));
+    return createStringEntry(doc, tagName, TQString::fromLatin1(b? "true" : "false"));
 }
 
 
@@ -1731,7 +1731,7 @@ static TQDomElement createListEntry(TQDomDocument &doc, const TQString &tagName,
     TQStrListIterator it(list);
     for (; it.current(); ++it) {
         TQDomElement subel = doc.createElement(subTagName);
-        subel.appendChild(doc.createTextNode(TQString::tqfromLatin1(it.current())));
+        subel.appendChild(doc.createTextNode(TQString::fromLatin1(it.current())));
         el.appendChild(subel);
     }
 
@@ -1801,7 +1801,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
     PMDockWidget *obj1;
     while ( (obj1=(PMDockWidget*)it.current()) ) {
         if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
-            mainWidgetStr = TQString::tqfromLatin1(obj1->name());
+            mainWidgetStr = TQString::fromLatin1(obj1->name());
         nList.append(obj1->name());
         ++it;
     }
@@ -1841,7 +1841,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
             groupEl = doc.createElement("dock");
         }
 
-        groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
+        groupEl.appendChild(createStringEntry(doc, "name", TQString::fromLatin1(obj->name())));
         groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
         if ( !obj->parent() ) {
             groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
@@ -2372,14 +2372,14 @@ void PMDockManager::drawDragRectangle()
     PMDockMainWindow* pMain = 0L;
     PMDockWidget* pTLDockWdg = 0L;
     TQWidget* topWdg;
-    if (pDockWdgAtRect->tqtopLevelWidget() == main) {
+    if (pDockWdgAtRect->topLevelWidget() == main) {
       isOverMainWdg = true;
       topWdg = pMain = (PMDockMainWindow*) main;
       unclipped = pMain->testWFlags( WPaintUnclipped );
       pMain->setWFlags( WPaintUnclipped );
     }
     else {
-      topWdg = pTLDockWdg = (PMDockWidget*) pDockWdgAtRect->tqtopLevelWidget();
+      topWdg = pTLDockWdg = (PMDockWidget*) pDockWdgAtRect->topLevelWidget();
       unclipped = pTLDockWdg->testWFlags( WPaintUnclipped );
       pTLDockWdg->setWFlags( WPaintUnclipped );
     }
diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp
index 9c97888f..c17b8c62 100644
--- a/kpovmodeler/pmdockwidget_private.cpp
+++ b/kpovmodeler/pmdockwidget_private.cpp
@@ -69,20 +69,20 @@ void PMDockSplitter::setupMinMaxSize()
   // Set the minimum and maximum sizes
   int minx, maxx, miny, maxy;
   if (orientation ==Qt::Horizontal) {
-    miny = child0->tqminimumSize().height() + child1->tqminimumSize().height()+4;
-    maxy = child0->tqmaximumSize().height() + child1->tqmaximumSize().height()+4;
-    minx = (child0->tqminimumSize().width() > child1->tqminimumSize().width()) ? child0->tqminimumSize().width() : child1->tqminimumSize().width();
-    maxx = (child0->tqmaximumSize().width() > child1->tqmaximumSize().width()) ? child0->tqmaximumSize().width() : child1->tqmaximumSize().width();
+    miny = child0->minimumSize().height() + child1->minimumSize().height()+4;
+    maxy = child0->maximumSize().height() + child1->maximumSize().height()+4;
+    minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width();
+    maxx = (child0->maximumSize().width() > child1->maximumSize().width()) ? child0->maximumSize().width() : child1->maximumSize().width();
 
     miny = (miny > 4) ? miny : 4;
     maxy = (maxy < 32000) ? maxy : 32000;
     minx = (minx > 2) ? minx : 2;
     maxx = (maxx < 32000) ? maxx : 32000;
   } else {
-    minx = child0->tqminimumSize().width() + child1->tqminimumSize().width()+4;
-    maxx = child0->tqmaximumSize().width() + child1->tqmaximumSize().width()+4;
-    miny = (child0->tqminimumSize().height() > child1->tqminimumSize().height()) ? child0->tqminimumSize().height() : child1->tqminimumSize().height();
-    maxy = (child0->tqmaximumSize().height() > child1->tqmaximumSize().height()) ? child0->tqmaximumSize().height() : child1->tqmaximumSize().height();
+    minx = child0->minimumSize().width() + child1->minimumSize().width()+4;
+    maxx = child0->maximumSize().width() + child1->maximumSize().width()+4;
+    miny = (child0->minimumSize().height() > child1->minimumSize().height()) ? child0->minimumSize().height() : child1->minimumSize().height();
+    maxy = (child0->maximumSize().height() > child1->maximumSize().height()) ? child0->maximumSize().height() : child1->maximumSize().height();
 
     minx = (minx > 4) ? minx : 4;
     maxx = (maxx < 32000) ? maxx : 32000;
@@ -143,15 +143,15 @@ int PMDockSplitter::checkValue( int position ) const
 {
   if (initialised){
     if (orientation ==Qt::Vertical){
-      if (position < (child0->tqminimumSize().width()))
-        position = child0->tqminimumSize().width();
-      if ((width()-4-position) < (child1->tqminimumSize().width()))
-        position = width() - (child1->tqminimumSize().width()) -4;
+      if (position < (child0->minimumSize().width()))
+        position = child0->minimumSize().width();
+      if ((width()-4-position) < (child1->minimumSize().width()))
+        position = width() - (child1->minimumSize().width()) -4;
     } else {
-      if (position < (child0->tqminimumSize().height()))
-        position = (child0->tqminimumSize().height());
-      if ((height()-4-position) < (child1->tqminimumSize().height()))
-        position = height() - (child1->tqminimumSize().height()) -4;
+      if (position < (child0->minimumSize().height()))
+        position = (child0->minimumSize().height());
+      if ((height()-4-position) < (child1->minimumSize().height()))
+        position = height() - (child1->minimumSize().height()) -4;
     }
   }
 
@@ -301,7 +301,7 @@ PMDockButton_Private::~PMDockButton_Private()
 
 void PMDockButton_Private::drawButton( TQPainter* p )
 {
-  p->fillRect( 0,0, width(), height(), TQBrush(tqcolorGroup().brush(TQColorGroup::Background)) );
+  p->fillRect( 0,0, width(), height(), TQBrush(colorGroup().brush(TQColorGroup::Background)) );
   p->drawPixmap( (width() - pixmap()->width()) / 2, (height() - pixmap()->height()) / 2, *pixmap() );
   if ( moveMouse && !isDown() ){
     p->setPen( white );
@@ -309,12 +309,12 @@ void PMDockButton_Private::drawButton( TQPainter* p )
     p->lineTo( 0, 0 );
     p->lineTo( width() - 1, 0 );
 
-    p->setPen( tqcolorGroup().dark() );
+    p->setPen( colorGroup().dark() );
     p->lineTo( width() - 1, height() - 1 );
     p->lineTo( 0, height() - 1 );
   }
   if ( isOn() || isDown() ){
-    p->setPen( tqcolorGroup().dark() );
+    p->setPen( colorGroup().dark() );
     p->moveTo( 0, height() - 1 );
     p->lineTo( 0, 0 );
     p->lineTo( width() - 1, 0 );
diff --git a/kpovmodeler/pmfinish.cpp b/kpovmodeler/pmfinish.cpp
index 80898d97..52bd92c8 100644
--- a/kpovmodeler/pmfinish.cpp
+++ b/kpovmodeler/pmfinish.cpp
@@ -130,11 +130,11 @@ PMFinish::~PMFinish( )
 {
 }
 
-PMMetaObject* PMFinish::tqmetaObject( ) const
+PMMetaObject* PMFinish::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Finish", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Finish", Base::metaObject( ),
                                         createNewFinish );
       s_pMetaObject->addProperty(
          new PMFinishProperty( "ambientColor", &PMFinish::setAmbientColor, &PMFinish::ambientColor ) );
diff --git a/kpovmodeler/pmfinish.h b/kpovmodeler/pmfinish.h
index 2a7fda19..c12f31b1 100644
--- a/kpovmodeler/pmfinish.h
+++ b/kpovmodeler/pmfinish.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmfog.cpp b/kpovmodeler/pmfog.cpp
index 36f39a30..6af4a2cb 100644
--- a/kpovmodeler/pmfog.cpp
+++ b/kpovmodeler/pmfog.cpp
@@ -81,11 +81,11 @@ PMFog::~PMFog( )
 {
 }
 
-PMMetaObject* PMFog::tqmetaObject( ) const
+PMMetaObject* PMFog::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Fog", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Fog", Base::metaObject( ),
                                         createNewFog );
       s_pMetaObject->addProperty(
          new PMFogProperty( "fogType", &PMFog::setFogType, &PMFog::fogType ) );
diff --git a/kpovmodeler/pmfog.h b/kpovmodeler/pmfog.h
index cfdfa539..fc6d7095 100644
--- a/kpovmodeler/pmfog.h
+++ b/kpovmodeler/pmfog.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmformulalabel.cpp b/kpovmodeler/pmformulalabel.cpp
index 51b5e13f..c6d9cd70 100644
--- a/kpovmodeler/pmformulalabel.cpp
+++ b/kpovmodeler/pmformulalabel.cpp
@@ -84,7 +84,7 @@ void PMFormulaLabel::drawContents( TQPainter* p )
       // draw dot
       int center = ( cr.top( ) + cr.bottom( ) ) / 2;
       int rad = c_dotSize / 2;
-      p->setBrush( TQBrush( tqcolorGroup( ).text( ) ) );
+      p->setBrush( TQBrush( colorGroup( ).text( ) ) );
       p->drawEllipse( cr.left( ), center - rad, c_dotSize, c_dotSize );
       cr.setLeft( cr.left( ) + c_dotSize + c_indent );
 
@@ -131,7 +131,7 @@ void PMFormulaLabel::calculateSizeHint( )
 
    TQFontMetrics m1( font( ) );
    if( sum == 0 )
-      m_tqsizeHint.setWidth( m1.width( s_nullString ) );
+      m_sizeHint.setWidth( m1.width( s_nullString ) );
    else
    {
       TQFontMetrics m2( exponentFont( ) );
@@ -146,19 +146,19 @@ void PMFormulaLabel::calculateSizeHint( )
                width += m2.width( s_digit[m_exponents[i]] ) + 1;
          }
       }
-      m_tqsizeHint.setWidth( width );
+      m_sizeHint.setWidth( width );
    }
-   m_tqsizeHint.setHeight( m1.height( ) + 7 );
+   m_sizeHint.setHeight( m1.height( ) + 7 );
 }
 
-TQSize PMFormulaLabel::tqsizeHint( ) const
+TQSize PMFormulaLabel::sizeHint( ) const
 {
-   return tqminimumSizeHint( );
+   return minimumSizeHint( );
 }
 
-TQSize PMFormulaLabel::tqminimumSizeHint( ) const
+TQSize PMFormulaLabel::minimumSizeHint( ) const
 {
-   return m_tqsizeHint;
+   return m_sizeHint;
 }
 
 void PMFormulaLabel::fontChange( const TQFont& )
diff --git a/kpovmodeler/pmformulalabel.h b/kpovmodeler/pmformulalabel.h
index 00d75ed8..f6b50897 100644
--- a/kpovmodeler/pmformulalabel.h
+++ b/kpovmodeler/pmformulalabel.h
@@ -46,8 +46,8 @@ public:
     * Destructor
     */
    ~PMFormulaLabel( );
-   virtual TQSize tqsizeHint( ) const;
-   virtual TQSize tqminimumSizeHint( ) const;
+   virtual TQSize sizeHint( ) const;
+   virtual TQSize minimumSizeHint( ) const;
    
 protected:
    virtual void drawContents( TQPainter* p );
@@ -58,7 +58,7 @@ private:
    TQFont exponentFont( ) const;
    void calculateSizeHint( );
    
-   TQSize m_tqsizeHint;
+   TQSize m_sizeHint;
    int m_exponents[3];
    
    static TQString s_xyz[3];
diff --git a/kpovmodeler/pmglobalphotons.cpp b/kpovmodeler/pmglobalphotons.cpp
index 5d5835be..ddf32258 100644
--- a/kpovmodeler/pmglobalphotons.cpp
+++ b/kpovmodeler/pmglobalphotons.cpp
@@ -101,11 +101,11 @@ PMGlobalPhotons::~PMGlobalPhotons( )
 {
 }
 
-PMMetaObject* PMGlobalPhotons::tqmetaObject( ) const
+PMMetaObject* PMGlobalPhotons::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "GlobalPhotons", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "GlobalPhotons", Base::metaObject( ),
                                         createNewGlobalPhotons );
 
       PMNumberProperty* p1 = new PMNumberProperty( "numberType",
diff --git a/kpovmodeler/pmglobalphotons.h b/kpovmodeler/pmglobalphotons.h
index 7a32b14e..549e6efc 100644
--- a/kpovmodeler/pmglobalphotons.h
+++ b/kpovmodeler/pmglobalphotons.h
@@ -55,7 +55,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmglobalsettings.cpp b/kpovmodeler/pmglobalsettings.cpp
index 1c75b40a..efa7db36 100644
--- a/kpovmodeler/pmglobalsettings.cpp
+++ b/kpovmodeler/pmglobalsettings.cpp
@@ -104,11 +104,11 @@ PMGlobalSettings::~PMGlobalSettings( )
 {
 }
 
-PMMetaObject* PMGlobalSettings::tqmetaObject( ) const
+PMMetaObject* PMGlobalSettings::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "GlobalSettings", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "GlobalSettings", Base::metaObject( ),
                                         createNewGlobalSettings );
       s_pMetaObject->addProperty(
          new PMGlobalSettingsProperty( "adcBailout", &PMGlobalSettings::setAdcBailout, &PMGlobalSettings::adcBailout ) );
diff --git a/kpovmodeler/pmglobalsettings.h b/kpovmodeler/pmglobalsettings.h
index fad60d92..a95f86d7 100644
--- a/kpovmodeler/pmglobalsettings.h
+++ b/kpovmodeler/pmglobalsettings.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 2bd819c4..41a748e0 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -326,7 +326,7 @@ void PMGLView::initializeGL( )
       Window* colorMapWindows = 0;
       Window* newWindows = 0;
       int num;
-      if( XGetWMColormapWindows( display, tqtopLevelWidget( )->winId( ),
+      if( XGetWMColormapWindows( display, topLevelWidget( )->winId( ),
                                  &colorMapWindows, &num ) )
       {
          // create a new list and append the new window
@@ -357,7 +357,7 @@ void PMGLView::initializeGL( )
       // tell TQt to use this window
       create( w );
 
-      XSetWMColormapWindows( display, tqtopLevelWidget( )->winId( ),
+      XSetWMColormapWindows( display, topLevelWidget( )->winId( ),
                              newWindows, num );
       delete[] newWindows;
 
@@ -367,7 +367,7 @@ void PMGLView::initializeGL( )
    {
       TQVBoxLayout* topLayout = new TQVBoxLayout( this );
       TQLabel* label = new TQLabel( i18n( "No OpenGL support" ), this );
-      label->tqsetAlignment( TQt::AlignCenter );
+      label->setAlignment( TQt::AlignCenter );
       topLayout->addWidget( label );
    }
 
diff --git a/kpovmodeler/pmgraphicalobject.cpp b/kpovmodeler/pmgraphicalobject.cpp
index 59ace7cf..c60c40cb 100644
--- a/kpovmodeler/pmgraphicalobject.cpp
+++ b/kpovmodeler/pmgraphicalobject.cpp
@@ -60,11 +60,11 @@ PMGraphicalObject::~PMGraphicalObject( )
 {
 }
 
-PMMetaObject* PMGraphicalObject::tqmetaObject( ) const
+PMMetaObject* PMGraphicalObject::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "GraphicalObject", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "GraphicalObject", Base::metaObject( ) );
       s_pMetaObject->addProperty(
          new PMGraphicalObjectProperty( "noShadow", &PMGraphicalObject::setNoShadow,
                          &PMGraphicalObject::noShadow ) );
diff --git a/kpovmodeler/pmgraphicalobject.h b/kpovmodeler/pmgraphicalobject.h
index 19ea826d..fd53e919 100644
--- a/kpovmodeler/pmgraphicalobject.h
+++ b/kpovmodeler/pmgraphicalobject.h
@@ -51,7 +51,7 @@ public:
    virtual ~PMGraphicalObject( );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmheightfield.cpp b/kpovmodeler/pmheightfield.cpp
index 154c6f57..6806437a 100644
--- a/kpovmodeler/pmheightfield.cpp
+++ b/kpovmodeler/pmheightfield.cpp
@@ -107,11 +107,11 @@ void PMHeightField::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMHeightField::tqmetaObject( ) const
+PMMetaObject* PMHeightField::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "HeightField", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "HeightField", Base::metaObject( ),
                                         createNewHeightField );
       s_pMetaObject->addProperty(
          new PMHeightFieldProperty( "fileName", &PMHeightField::setFileName, &PMHeightField::fileName ) );
diff --git a/kpovmodeler/pmheightfield.h b/kpovmodeler/pmheightfield.h
index 92d9724b..443226ba 100644
--- a/kpovmodeler/pmheightfield.h
+++ b/kpovmodeler/pmheightfield.h
@@ -60,7 +60,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmimagemap.cpp b/kpovmodeler/pmimagemap.cpp
index e867f72e..5f28c49a 100644
--- a/kpovmodeler/pmimagemap.cpp
+++ b/kpovmodeler/pmimagemap.cpp
@@ -275,11 +275,11 @@ void PMImageMap::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMImageMap::tqmetaObject( ) const
+PMMetaObject* PMImageMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ImageMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ImageMap", Base::metaObject( ),
                                         createNewImageMap );
 
       PMBitmapTypeProperty* bp = new PMBitmapTypeProperty(
diff --git a/kpovmodeler/pmimagemap.h b/kpovmodeler/pmimagemap.h
index 4ee38233..3a43d949 100644
--- a/kpovmodeler/pmimagemap.h
+++ b/kpovmodeler/pmimagemap.h
@@ -71,7 +71,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pminsertrulesystem.cpp b/kpovmodeler/pminsertrulesystem.cpp
index 7bd9e95a..af899947 100644
--- a/kpovmodeler/pminsertrulesystem.cpp
+++ b/kpovmodeler/pminsertrulesystem.cpp
@@ -905,7 +905,7 @@ bool PMInsertRuleSystem::canInsert( const PMObject* parentObject,
    bool possible = false;
 
    // find rules for target class
-   PMMetaObject* meta = parentObject->tqmetaObject( );
+   PMMetaObject* meta = parentObject->metaObject( );
    for( ; meta && !possible; meta = meta->superClass( ) )
    {
       PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) );
@@ -996,7 +996,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* parentObject,
 
    // find rules for target class
    TQPtrList<PMRuleTargetClass> targetClassList;
-   PMMetaObject* meta = parentObject->tqmetaObject( );
+   PMMetaObject* meta = parentObject->metaObject( );
    for( ; meta; meta = meta->superClass( ) )
    {
       PMRuleTargetClass* tc = m_rulesDict.find( meta->className( ) );
diff --git a/kpovmodeler/pminterior.cpp b/kpovmodeler/pminterior.cpp
index 7cc2d87c..53a69f79 100644
--- a/kpovmodeler/pminterior.cpp
+++ b/kpovmodeler/pminterior.cpp
@@ -76,11 +76,11 @@ PMInterior::~PMInterior( )
 {
 }
 
-PMMetaObject* PMInterior::tqmetaObject( ) const
+PMMetaObject* PMInterior::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Interior", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Interior", Base::metaObject( ),
                                         createNewInterior );
       s_pMetaObject->addProperty(
          new PMInteriorProperty( "ior", &PMInterior::setIor, &PMInterior::ior ) );
diff --git a/kpovmodeler/pminterior.h b/kpovmodeler/pminterior.h
index 4f08ff80..8e3c9172 100644
--- a/kpovmodeler/pminterior.h
+++ b/kpovmodeler/pminterior.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pminteriortexture.cpp b/kpovmodeler/pminteriortexture.cpp
index 191c3c9b..92950050 100644
--- a/kpovmodeler/pminteriortexture.cpp
+++ b/kpovmodeler/pminteriortexture.cpp
@@ -43,11 +43,11 @@ PMInteriorTexture::~PMInteriorTexture( )
 {
 }
 
-PMMetaObject* PMInteriorTexture::tqmetaObject( ) const
+PMMetaObject* PMInteriorTexture::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "InteriorTexture", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "InteriorTexture", Base::metaObject( ),
                                         createNewInteriorTexture );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pminteriortexture.h b/kpovmodeler/pminteriortexture.h
index 59f37af7..0711b5c9 100644
--- a/kpovmodeler/pminteriortexture.h
+++ b/kpovmodeler/pminteriortexture.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmisosurface.cpp b/kpovmodeler/pmisosurface.cpp
index c47373f8..c32c0683 100644
--- a/kpovmodeler/pmisosurface.cpp
+++ b/kpovmodeler/pmisosurface.cpp
@@ -157,11 +157,11 @@ void PMIsoSurface::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMIsoSurface::tqmetaObject( ) const
+PMMetaObject* PMIsoSurface::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "IsoSurface", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "IsoSurface", Base::metaObject( ),
                                         createNewIsoSurface );
       // TODO
       /*
diff --git a/kpovmodeler/pmisosurface.h b/kpovmodeler/pmisosurface.h
index b9b799a0..2a2fb358 100644
--- a/kpovmodeler/pmisosurface.h
+++ b/kpovmodeler/pmisosurface.h
@@ -60,7 +60,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmjuliafractal.cpp b/kpovmodeler/pmjuliafractal.cpp
index 04aaead7..5929a058 100644
--- a/kpovmodeler/pmjuliafractal.cpp
+++ b/kpovmodeler/pmjuliafractal.cpp
@@ -112,11 +112,11 @@ void PMJuliaFractal::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMJuliaFractal::tqmetaObject( ) const
+PMMetaObject* PMJuliaFractal::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "JuliaFractal", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "JuliaFractal", Base::metaObject( ),
                                         createNewJuliaFractal );
       s_pMetaObject->addProperty(
          new PMJuliaFractalProperty( "juliaParameter", &PMJuliaFractal::setJuliaParameter,
diff --git a/kpovmodeler/pmjuliafractal.h b/kpovmodeler/pmjuliafractal.h
index 1e68a2d3..1a113aa4 100644
--- a/kpovmodeler/pmjuliafractal.h
+++ b/kpovmodeler/pmjuliafractal.h
@@ -61,7 +61,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmlathe.cpp b/kpovmodeler/pmlathe.cpp
index 8e058a9b..c5021d28 100644
--- a/kpovmodeler/pmlathe.cpp
+++ b/kpovmodeler/pmlathe.cpp
@@ -198,11 +198,11 @@ void PMLathe::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMLathe::tqmetaObject( ) const
+PMMetaObject* PMLathe::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Lathe", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Lathe", Base::metaObject( ),
                                         createNewLathe );
       s_pMetaObject->addProperty(
          new PMLatheProperty( "sturm", &PMLathe::setSturm, &PMLathe::sturm ) );
diff --git a/kpovmodeler/pmlathe.h b/kpovmodeler/pmlathe.h
index b059b8a8..20fa55b3 100644
--- a/kpovmodeler/pmlathe.h
+++ b/kpovmodeler/pmlathe.h
@@ -63,7 +63,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp
index a1ea53a1..0ccfd5b4 100644
--- a/kpovmodeler/pmlibraryentrypreview.cpp
+++ b/kpovmodeler/pmlibraryentrypreview.cpp
@@ -59,24 +59,24 @@ PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) :
    gl->setColStretch( 1, 1 );
    TQLabel* lbl = new TQLabel( i18n( "Name: " ), this );
    m_pName = new TQLineEdit( this );
-   m_pName->tqsetAlignment( TQt::AlignLeft );
+   m_pName->setAlignment( TQt::AlignLeft );
    m_pName->setReadOnly( true );
    gl->addWidget( lbl, 0, 0 );
    gl->addWidget( m_pName, 0, 1 );
 
    lbl = new TQLabel( i18n( "Description:" ), this );
-   lbl->tqsetAlignment( TQt::AlignTop );
+   lbl->setAlignment( TQt::AlignTop );
    m_pDescription = new TQMultiLineEdit( this );
-   m_pDescription->tqsetAlignment( TQt::AlignTop  | TQt::AlignLeft |
+   m_pDescription->setAlignment( TQt::AlignTop  | TQt::AlignLeft |
                                  TQt::WordBreak | TQt::DontClip );
    m_pDescription->setReadOnly( true );
    gl->addWidget( lbl, 1, 0 );
    gl->addWidget( m_pDescription, 1, 1 );
 
    m_pKeywordsLabel = new TQLabel( i18n( "Keywords:" ), this );
-   m_pKeywordsLabel->tqsetAlignment( TQt::AlignTop );
+   m_pKeywordsLabel->setAlignment( TQt::AlignTop );
    m_pKeywords = new TQMultiLineEdit( this );
-   m_pKeywords->tqsetAlignment( TQt::AlignTop  | TQt::AlignLeft |
+   m_pKeywords->setAlignment( TQt::AlignTop  | TQt::AlignLeft |
                                  TQt::WordBreak | TQt::DontClip );
    m_pKeywords->setReadOnly( true );
    gl->addWidget( m_pKeywordsLabel, 2, 0 );
@@ -302,7 +302,7 @@ bool PMLibraryEntryPreview::saveIfNeeded( bool forceSave )
 
             // Add them to the object to save.
             PMObjectDrag drag( m_pPart, sortedList );
-            objToSave.setObjects( drag.tqencodedData( "application/x-kpovmodeler" ) );
+            objToSave.setObjects( drag.encodedData( "application/x-kpovmodeler" ) );
 
             // Add the preview image
             objToSave.setPreview( m_image.copy( ) );
diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp
index 39714cf8..976bfcbe 100644
--- a/kpovmodeler/pmlibraryiconview.cpp
+++ b/kpovmodeler/pmlibraryiconview.cpp
@@ -50,11 +50,11 @@ const char* PMLibraryIconDrag::format( int i ) const
    }
 }
 
-TQByteArray PMLibraryIconDrag::tqencodedData( const char* mime ) const
+TQByteArray PMLibraryIconDrag::encodedData( const char* mime ) const
 {
    TQByteArray a;
    if ( TQString( mime ) == "application/x-qiconlist" )
-      a = TQIconDrag::tqencodedData( mime );
+      a = TQIconDrag::encodedData( mime );
    else if ( TQString( mime ) == "text/sublib-list" )
    {
       TQString s , l;
@@ -80,7 +80,7 @@ bool PMLibraryIconDrag::canDecode( TQMimeSource* e )
 
 bool PMLibraryIconDrag::decode( TQMimeSource* e, TQStringList& strList, TQValueList<bool>& subLibList )
 {
-   TQByteArray a = e->tqencodedData( "text/sublib-list" );
+   TQByteArray a = e->encodedData( "text/sublib-list" );
    if( a.isEmpty( ) )
       return false;
 
diff --git a/kpovmodeler/pmlibraryiconview.h b/kpovmodeler/pmlibraryiconview.h
index dc297c26..963ba85d 100644
--- a/kpovmodeler/pmlibraryiconview.h
+++ b/kpovmodeler/pmlibraryiconview.h
@@ -41,7 +41,7 @@ public:
    /** @return The ith format, or NULL. */
    const char* format( int i ) const;
    /** @return The encoded payload of this object, in the specified MIME format. */
-   TQByteArray tqencodedData( const char* mime ) const;
+   TQByteArray encodedData( const char* mime ) const;
    /** @return True if the information in e can be decoded */
    static bool canDecode( TQMimeSource* e );
    /**
diff --git a/kpovmodeler/pmlight.cpp b/kpovmodeler/pmlight.cpp
index 22f1862d..554a09c2 100644
--- a/kpovmodeler/pmlight.cpp
+++ b/kpovmodeler/pmlight.cpp
@@ -268,11 +268,11 @@ void PMLight::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMLight::tqmetaObject( ) const
+PMMetaObject* PMLight::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Light", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Light", Base::metaObject( ),
                                         createNewLight );
       PMTypeProperty* p = new PMTypeProperty( "lightType", &PMLight::setLightType,
                                               &PMLight::lightType );
diff --git a/kpovmodeler/pmlight.h b/kpovmodeler/pmlight.h
index 59053ab8..4fafb2b0 100644
--- a/kpovmodeler/pmlight.h
+++ b/kpovmodeler/pmlight.h
@@ -59,7 +59,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmlightgroup.cpp b/kpovmodeler/pmlightgroup.cpp
index 36f8d17a..acf655e4 100644
--- a/kpovmodeler/pmlightgroup.cpp
+++ b/kpovmodeler/pmlightgroup.cpp
@@ -69,11 +69,11 @@ void PMLightGroup::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMLightGroup::tqmetaObject( ) const
+PMMetaObject* PMLightGroup::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "LightGroup", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "LightGroup", Base::metaObject( ),
                                         createNewLightGroup );
 
       s_pMetaObject->addProperty( new PMLightGroupProperty( "globalLights",
diff --git a/kpovmodeler/pmlightgroup.h b/kpovmodeler/pmlightgroup.h
index 11762efa..9fdf8d6b 100644
--- a/kpovmodeler/pmlightgroup.h
+++ b/kpovmodeler/pmlightgroup.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmlistpattern.cpp b/kpovmodeler/pmlistpattern.cpp
index 3d368209..721369d2 100644
--- a/kpovmodeler/pmlistpattern.cpp
+++ b/kpovmodeler/pmlistpattern.cpp
@@ -114,11 +114,11 @@ void PMListPattern::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMListPattern::tqmetaObject( ) const
+PMMetaObject* PMListPattern::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ListPattern", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "ListPattern", Base::metaObject( ) );
 
       PMListTypeProperty* p = new PMListTypeProperty(
          "listType", &PMListPattern::setListType,
@@ -228,11 +228,11 @@ PMTextureList::~PMTextureList( )
 {
 }
 
-PMMetaObject* PMTextureList::tqmetaObject( ) const
+PMMetaObject* PMTextureList::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "TextureList", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "TextureList", Base::metaObject( ),
                                         createNewTextureList );
    }
    return s_pMetaObject;
@@ -267,11 +267,11 @@ PMPigmentList::~PMPigmentList( )
 {
 }
 
-PMMetaObject* PMPigmentList::tqmetaObject( ) const
+PMMetaObject* PMPigmentList::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "PigmentList", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "PigmentList", Base::metaObject( ),
                                         createNewPigmentList );
    }
    return s_pMetaObject;
@@ -306,11 +306,11 @@ PMColorList::~PMColorList( )
 {
 }
 
-PMMetaObject* PMColorList::tqmetaObject( ) const
+PMMetaObject* PMColorList::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ColorList", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ColorList", Base::metaObject( ),
                                         createNewColorList );
    }
    return s_pMetaObject;
@@ -345,11 +345,11 @@ PMDensityList::~PMDensityList( )
 {
 }
 
-PMMetaObject* PMDensityList::tqmetaObject( ) const
+PMMetaObject* PMDensityList::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "DensityList", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "DensityList", Base::metaObject( ),
                                         createNewDensityList );
    }
    return s_pMetaObject;
@@ -388,11 +388,11 @@ PMNormalList::~PMNormalList( )
 {
 }
 
-PMMetaObject* PMNormalList::tqmetaObject( ) const
+PMMetaObject* PMNormalList::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "NormalList", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "NormalList", Base::metaObject( ),
                                         createNewNormalList );
       s_pMetaObject->addProperty(
          new PMNormalListProperty( "depth", &PMNormalList::setDepth,
diff --git a/kpovmodeler/pmlistpattern.h b/kpovmodeler/pmlistpattern.h
index 876c8c15..6716dadb 100644
--- a/kpovmodeler/pmlistpattern.h
+++ b/kpovmodeler/pmlistpattern.h
@@ -57,7 +57,7 @@ public:
     */
    virtual TQString listObjectType( ) const = 0;
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -150,7 +150,7 @@ public:
    virtual TQString listObjectType( ) const { return TQString( "Texture" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -189,7 +189,7 @@ public:
    virtual TQString listObjectType( ) const { return TQString( "Pigment" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -228,7 +228,7 @@ public:
    virtual TQString listObjectType( ) const { return TQString( "SolidColor" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -267,7 +267,7 @@ public:
    virtual TQString listObjectType( ) const { return TQString( "Density" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -306,7 +306,7 @@ public:
    virtual TQString listObjectType( ) const { return TQString( "Normal" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmlookslike.cpp b/kpovmodeler/pmlookslike.cpp
index f6cd5d29..270292e2 100644
--- a/kpovmodeler/pmlookslike.cpp
+++ b/kpovmodeler/pmlookslike.cpp
@@ -49,11 +49,11 @@ TQString PMLooksLike::description( ) const
    return i18n( "looks like" );
 }
 
-PMMetaObject* PMLooksLike::tqmetaObject( ) const
+PMMetaObject* PMLooksLike::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "LooksLike", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "LooksLike", Base::metaObject( ),
                                         createNewLooksLike );
       // no properties
    }
diff --git a/kpovmodeler/pmlookslike.h b/kpovmodeler/pmlookslike.h
index 9e9c9d92..4a191422 100644
--- a/kpovmodeler/pmlookslike.h
+++ b/kpovmodeler/pmlookslike.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmmaterial.cpp b/kpovmodeler/pmmaterial.cpp
index b37d98bb..66f11f94 100644
--- a/kpovmodeler/pmmaterial.cpp
+++ b/kpovmodeler/pmmaterial.cpp
@@ -43,11 +43,11 @@ PMMaterial::~PMMaterial( )
 {
 }
 
-PMMetaObject* PMMaterial::tqmetaObject( ) const
+PMMetaObject* PMMaterial::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Material", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Material", Base::metaObject( ),
                                         createNewMaterial );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pmmaterial.h b/kpovmodeler/pmmaterial.h
index 955e4515..7e790be4 100644
--- a/kpovmodeler/pmmaterial.h
+++ b/kpovmodeler/pmmaterial.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmmaterialmap.cpp b/kpovmodeler/pmmaterialmap.cpp
index 8ef5dc93..28b2c849 100644
--- a/kpovmodeler/pmmaterialmap.cpp
+++ b/kpovmodeler/pmmaterialmap.cpp
@@ -186,11 +186,11 @@ void PMMaterialMap::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMMaterialMap::tqmetaObject( ) const
+PMMetaObject* PMMaterialMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "MaterialMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "MaterialMap", Base::metaObject( ),
                                         createNewMaterialMap );
 
       PMBitmapTypeProperty* bp = new PMBitmapTypeProperty(
diff --git a/kpovmodeler/pmmaterialmap.h b/kpovmodeler/pmmaterialmap.h
index f5cc3ca9..6377c7bd 100644
--- a/kpovmodeler/pmmaterialmap.h
+++ b/kpovmodeler/pmmaterialmap.h
@@ -72,7 +72,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmmedia.cpp b/kpovmodeler/pmmedia.cpp
index e487d6e9..c5e32d6e 100644
--- a/kpovmodeler/pmmedia.cpp
+++ b/kpovmodeler/pmmedia.cpp
@@ -97,11 +97,11 @@ PMMedia::~PMMedia( )
 {
 }
 
-PMMetaObject* PMMedia::tqmetaObject( ) const
+PMMetaObject* PMMedia::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Media", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Media", Base::metaObject( ),
                                         createNewMedia );
       s_pMetaObject->addProperty(
          new PMMediaProperty( "method", &PMMedia::setMethod, &PMMedia::method ) );
diff --git a/kpovmodeler/pmmedia.h b/kpovmodeler/pmmedia.h
index 78adc338..4836bf37 100644
--- a/kpovmodeler/pmmedia.h
+++ b/kpovmodeler/pmmedia.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmmesh.cpp b/kpovmodeler/pmmesh.cpp
index fc1791bf..d143edf4 100644
--- a/kpovmodeler/pmmesh.cpp
+++ b/kpovmodeler/pmmesh.cpp
@@ -133,11 +133,11 @@ void PMMesh::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMMesh::tqmetaObject( ) const
+PMMetaObject* PMMesh::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Mesh", Base::tqmetaObject( ), createNewMesh );
+      s_pMetaObject = new PMMetaObject( "Mesh", Base::metaObject( ), createNewMesh );
 
       s_pMetaObject->addProperty(
          new PMMeshProperty( "hierarchy", &PMMesh::setHierarchy, &PMMesh::hierarchy ) );
@@ -236,7 +236,7 @@ void PMMesh::restoreMemento( PMMemento* s )
       TQPtrList<PMMemento> list = m->triangleMementos( );
       TQPtrListIterator<PMMemento> Itr( list );
       for ( int i = 0; i < numChildren && ( tm = Itr.current( ) ) != 0; ++i, ++Itr )
-         tqchildAt( i )->restoreMemento( tm );
+         childAt( i )->restoreMemento( tm );
    }
 
    Base::restoreMemento( s );
@@ -259,10 +259,10 @@ void PMMesh::controlPoints( PMControlPointList& list )
    m_pointToPointList.clear( );
    for ( unsigned i = 0; i < numChildren; ++i )
    {
-      if ( tqchildAt( i )->isA( "Triangle" ) )
+      if ( childAt( i )->isA( "Triangle" ) )
       {
 
-         obj = ( PMTriangle * ) tqchildAt( i );
+         obj = ( PMTriangle * ) childAt( i );
          ptp.object = obj;
          for ( unsigned j = 0; j < 3; ++j )
          {
@@ -353,9 +353,9 @@ void PMMesh::controlPointsChangedList( PMControlPointList& list, PMObjectList& o
 
    for ( int i = 0; i < numChildren && validTriangles; ++i )
    {
-      if ( tqchildAt( i )->isA( "Triangle" ) )
+      if ( childAt( i )->isA( "Triangle" ) )
       {
-         obj = ( PMTriangle* )tqchildAt( i );
+         obj = ( PMTriangle* )childAt( i );
          obj->createMemento( );
          objList.append( obj );
          validNormal = false;
@@ -538,7 +538,7 @@ void PMMesh::controlPointsChangedList( PMControlPointList& list, PMObjectList& o
             {
                if ( ( tm = mementoList.getLast( ) ) )
                {
-                  tqchildAt( j )->restoreMemento( tm );
+                  childAt( j )->restoreMemento( tm );
                   delete tm;
                   mementoList.removeLast( );
                }
diff --git a/kpovmodeler/pmmesh.h b/kpovmodeler/pmmesh.h
index 6c1c6054..a6fe0089 100644
--- a/kpovmodeler/pmmesh.h
+++ b/kpovmodeler/pmmesh.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmnamedobject.cpp b/kpovmodeler/pmnamedobject.cpp
index 70f2bc5a..72553cd4 100644
--- a/kpovmodeler/pmnamedobject.cpp
+++ b/kpovmodeler/pmnamedobject.cpp
@@ -39,11 +39,11 @@ PMNamedObject::~PMNamedObject( )
 {
 }
 
-PMMetaObject* PMNamedObject::tqmetaObject( ) const
+PMMetaObject* PMNamedObject::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "NamedObject", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "NamedObject", Base::metaObject( ) );
       s_pMetaObject->addProperty(
          new PMNamedObjectProperty( "name", &PMNamedObject::setName, &PMNamedObject::name ) );
    }
diff --git a/kpovmodeler/pmnamedobject.h b/kpovmodeler/pmnamedobject.h
index 02ee7eb4..8b7b0b62 100644
--- a/kpovmodeler/pmnamedobject.h
+++ b/kpovmodeler/pmnamedobject.h
@@ -48,7 +48,7 @@ public:
    ~PMNamedObject( );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmnormal.cpp b/kpovmodeler/pmnormal.cpp
index b6e7bb07..722a8fc4 100644
--- a/kpovmodeler/pmnormal.cpp
+++ b/kpovmodeler/pmnormal.cpp
@@ -58,11 +58,11 @@ PMNormal::~PMNormal( )
 {
 }
 
-PMMetaObject* PMNormal::tqmetaObject( ) const
+PMMetaObject* PMNormal::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Normal", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Normal", Base::metaObject( ),
                                         createNewNormal );
       s_pMetaObject->addProperty(
          new PMNormProperty( "bumpSize", &PMNormal::setBumpSize, &PMNormal::bumpSize ) );
diff --git a/kpovmodeler/pmnormal.h b/kpovmodeler/pmnormal.h
index a179a3ed..c798d039 100644
--- a/kpovmodeler/pmnormal.h
+++ b/kpovmodeler/pmnormal.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmobject.cpp b/kpovmodeler/pmobject.cpp
index 579bd00b..94907482 100644
--- a/kpovmodeler/pmobject.cpp
+++ b/kpovmodeler/pmobject.cpp
@@ -57,7 +57,7 @@ PMObject::~PMObject( )
 {
 }
 
-PMMetaObject* PMObject::tqmetaObject( ) const
+PMMetaObject* PMObject::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
@@ -72,7 +72,7 @@ PMMetaObject* PMObject::tqmetaObject( ) const
 
 PMObject* PMObject::newObject( ) const
 {
-   return tqmetaObject( )->newObject( m_pPart );
+   return metaObject( )->newObject( m_pPart );
 }
 
 bool PMObject::insertChildAfter( PMObject*, PMObject* )
@@ -215,7 +215,7 @@ void PMObject::cleanUp( ) const
 
 bool PMObject::setProperty( const TQString& name, const PMVariant& v )
 {
-   PMPropertyBase* p = tqmetaObject( )->property( name );
+   PMPropertyBase* p = metaObject( )->property( name );
    if( !p )
       return false;
    return p->setProperty( this, v );
@@ -224,7 +224,7 @@ bool PMObject::setProperty( const TQString& name, const PMVariant& v )
 TQStringList PMObject::properties( ) const
 {
    TQStringList lst;
-   PMPropertyIterator it = tqmetaObject( )->properties( );
+   PMPropertyIterator it = metaObject( )->properties( );
    
    for( ; it.current( ); ++it )
       lst.append( it.current( )->name( ) );
@@ -234,7 +234,7 @@ TQStringList PMObject::properties( ) const
 
 PMVariant PMObject::property( const TQString& name ) const
 {
-   PMPropertyBase* p = tqmetaObject( )->property( name );
+   PMPropertyBase* p = metaObject( )->property( name );
    if( !p )
       return PMVariant( );
    return p->getProperty( this );
@@ -244,12 +244,12 @@ bool PMObject::isA( const TQString& className ) const
 {
    if( !m_pPart )
       return false;
-   return m_pPart->prototypeManager( )->isA( tqmetaObject( ), className );
+   return m_pPart->prototypeManager( )->isA( metaObject( ), className );
 }
 
 TQString PMObject::type( ) const
 {
-   return tqmetaObject( )->className( );
+   return metaObject( )->className( );
 }
 
 bool PMObject::canInsert( const TQString& className, const PMObject* after,
diff --git a/kpovmodeler/pmobject.h b/kpovmodeler/pmobject.h
index 3bffb7d3..4a48e450 100644
--- a/kpovmodeler/pmobject.h
+++ b/kpovmodeler/pmobject.h
@@ -85,7 +85,7 @@ public:
    /**
     * Returns the meta object for the class
     */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /**
     * Returns true if the object is of type t or inherits the object
@@ -174,7 +174,7 @@ public:
     * Returns a pointer to the child object at position index,
     * or null if the index is out of range.
     */
-   virtual PMObject* tqchildAt( uint ) const { return 0; }
+   virtual PMObject* childAt( uint ) const { return 0; }
    /**
     * Returns the next sibling of that item
     */
diff --git a/kpovmodeler/pmobjectdrag.cpp b/kpovmodeler/pmobjectdrag.cpp
index 879bbc1c..23631df0 100644
--- a/kpovmodeler/pmobjectdrag.cpp
+++ b/kpovmodeler/pmobjectdrag.cpp
@@ -170,7 +170,7 @@ PMObjectDrag::~PMObjectDrag( )
 {
 }
 
-TQByteArray PMObjectDrag::tqencodedData( const char* format ) const
+TQByteArray PMObjectDrag::encodedData( const char* format ) const
 {
    TQValueList<TQByteArray>::ConstIterator dit;
    TQStringList::ConstIterator sit;
@@ -211,7 +211,7 @@ bool PMObjectDrag::canDecode( const TQMimeSource* e, PMPart* part )
 PMParser* PMObjectDrag::newParser( const TQMimeSource* e, PMPart* part )
 {
    if( e->provides( c_kpmDocumentMimeFormat ) )
-      return new PMXMLParser( part, e->tqencodedData( c_kpmDocumentMimeFormat ) );
+      return new PMXMLParser( part, e->encodedData( c_kpmDocumentMimeFormat ) );
 
    const TQPtrList<PMIOFormat>& formats = part->ioManager( )->formats( );
    TQPtrListIterator<PMIOFormat> fit( formats );
@@ -221,7 +221,7 @@ PMParser* PMObjectDrag::newParser( const TQMimeSource* e, PMPart* part )
       TQString str = f->mimeType( );
       const char* lat = str.latin1( );
       if( f->services( ) & PMIOFormat::Import && e->provides( lat ) )
-         return f->newParser( part, e->tqencodedData( lat ) );
+         return f->newParser( part, e->encodedData( lat ) );
    }
 
    return 0;
diff --git a/kpovmodeler/pmobjectdrag.h b/kpovmodeler/pmobjectdrag.h
index a02b4401..4a6db4b9 100644
--- a/kpovmodeler/pmobjectdrag.h
+++ b/kpovmodeler/pmobjectdrag.h
@@ -56,7 +56,7 @@ public:
     * Returns the encoded payload of this object, in the
     * specified MIME format.
     */
-   virtual TQByteArray tqencodedData( const char* ) const;
+   virtual TQByteArray encodedData( const char* ) const;
    /**
     * Returns the ith format, or NULL.
     */
diff --git a/kpovmodeler/pmobjectlink.cpp b/kpovmodeler/pmobjectlink.cpp
index f99bb92b..0eec53c7 100644
--- a/kpovmodeler/pmobjectlink.cpp
+++ b/kpovmodeler/pmobjectlink.cpp
@@ -58,11 +58,11 @@ TQString PMObjectLink::description( ) const
    return i18n( "object link" );
 }
 
-PMMetaObject* PMObjectLink::tqmetaObject( ) const
+PMMetaObject* PMObjectLink::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ObjectLink", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ObjectLink", Base::metaObject( ),
                                         createNewObjectLink );
       s_pMetaObject->addProperty(
          new PMObjectLinkProperty( "linkedObject", &PMObjectLink::setLinkedObjectProperty,
diff --git a/kpovmodeler/pmobjectlink.h b/kpovmodeler/pmobjectlink.h
index 7bc55b59..8ec7b474 100644
--- a/kpovmodeler/pmobjectlink.h
+++ b/kpovmodeler/pmobjectlink.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmoutputdevice.cpp b/kpovmodeler/pmoutputdevice.cpp
index 1ee91b52..8e6333f2 100644
--- a/kpovmodeler/pmoutputdevice.cpp
+++ b/kpovmodeler/pmoutputdevice.cpp
@@ -55,7 +55,7 @@ void PMOutputDevice::callSerialization( const PMObject* o, const PMMetaObject* m
       info->call( o, mo, this );
    else
    {
-      if( mo == o->tqmetaObject( ) )
+      if( mo == o->metaObject( ) )
       {
          printError( i18n( "The object \"%1\" doesn't support %2." )
                      .tqarg( o->description( ) ).tqarg( description( ) ) );
@@ -70,7 +70,7 @@ void PMOutputDevice::callSerialization( const PMObject* o, const PMMetaObject* m
 
 void PMOutputDevice::serialize( PMObject* o )
 {
-   callSerialization( o, o->tqmetaObject( ) );
+   callSerialization( o, o->metaObject( ) );
 }
 
 void PMOutputDevice::close( )
diff --git a/kpovmodeler/pmpattern.cpp b/kpovmodeler/pmpattern.cpp
index 95a975fc..2d60e9ce 100644
--- a/kpovmodeler/pmpattern.cpp
+++ b/kpovmodeler/pmpattern.cpp
@@ -453,11 +453,11 @@ void PMPattern::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMPattern::tqmetaObject( ) const
+PMMetaObject* PMPattern::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Pattern", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Pattern", Base::metaObject( ),
                                         createNewPattern );
       s_pMetaObject->addProperty(
          new PMPatternProperty( "agateTurbulence", &PMPattern::setAgateTurbulence, &PMPattern::agateTurbulence ) );
diff --git a/kpovmodeler/pmpattern.h b/kpovmodeler/pmpattern.h
index ff184e15..7dcf9cff 100644
--- a/kpovmodeler/pmpattern.h
+++ b/kpovmodeler/pmpattern.h
@@ -76,7 +76,7 @@ public:
    virtual TQString pixmap( ) const { return TQString( "pmpattern" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmphotons.cpp b/kpovmodeler/pmphotons.cpp
index 8a904f86..cce7665b 100644
--- a/kpovmodeler/pmphotons.cpp
+++ b/kpovmodeler/pmphotons.cpp
@@ -60,11 +60,11 @@ PMPhotons::~PMPhotons( )
 {
 }
 
-PMMetaObject* PMPhotons::tqmetaObject( ) const
+PMMetaObject* PMPhotons::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Photons", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Photons", Base::metaObject( ),
                                        createNewPhotons );
 
       s_pMetaObject->addProperty( new PMPhotonsProperty( "target",
diff --git a/kpovmodeler/pmphotons.h b/kpovmodeler/pmphotons.h
index 34ecf25a..a28041f5 100644
--- a/kpovmodeler/pmphotons.h
+++ b/kpovmodeler/pmphotons.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmpigment.cpp b/kpovmodeler/pmpigment.cpp
index d6f611b3..be37cfb1 100644
--- a/kpovmodeler/pmpigment.cpp
+++ b/kpovmodeler/pmpigment.cpp
@@ -45,11 +45,11 @@ PMPigment::~PMPigment( )
 {
 }
 
-PMMetaObject* PMPigment::tqmetaObject( ) const
+PMMetaObject* PMPigment::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Pigment", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Pigment", Base::metaObject( ),
                                         createNewPigment );
       s_pMetaObject->addProperty(
          new PMPigmentProperty( "uvMapping", &PMPigment::setUVMapping, &PMPigment::uvMapping ) );
diff --git a/kpovmodeler/pmpigment.h b/kpovmodeler/pmpigment.h
index 3f88d3ad..b520ad27 100644
--- a/kpovmodeler/pmpigment.h
+++ b/kpovmodeler/pmpigment.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmplane.cpp b/kpovmodeler/pmplane.cpp
index 12574211..db7af35a 100644
--- a/kpovmodeler/pmplane.cpp
+++ b/kpovmodeler/pmplane.cpp
@@ -82,11 +82,11 @@ void PMPlane::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMPlane::tqmetaObject( ) const
+PMMetaObject* PMPlane::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Plane", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Plane", Base::metaObject( ),
                                         createNewPlane );
       s_pMetaObject->addProperty(
          new PMPlaneProperty( "normal", &PMPlane::setNormal, &PMPlane::normal ) );
diff --git a/kpovmodeler/pmplane.h b/kpovmodeler/pmplane.h
index 52fb9d4c..d5321dd8 100644
--- a/kpovmodeler/pmplane.h
+++ b/kpovmodeler/pmplane.h
@@ -57,7 +57,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmpluginsettings.cpp b/kpovmodeler/pmpluginsettings.cpp
index f53f9f96..c89d1e7e 100644
--- a/kpovmodeler/pmpluginsettings.cpp
+++ b/kpovmodeler/pmpluginsettings.cpp
@@ -33,14 +33,14 @@ public:
    {
       m_info = info;
       m_enabled = info->enabled( );
-      settqStatus( );
+      setStatus( );
    }
-   void toggletqStatus( )
+   void toggleStatus( )
    {
       m_enabled = !m_enabled;
-      settqStatus( );
+      setStatus( );
    }
-   void settqStatus( )
+   void setStatus( )
    {
       if( m_enabled )
          setText( 2, i18n( "loaded" ) );
@@ -122,7 +122,7 @@ void PMPluginSettings::slotToggle( )
       ( PMPluginListViewItem* ) m_pPluginsList->currentItem( );
    if( item )
    {
-      item->toggletqStatus( );
+      item->toggleStatus( );
    
       if( item->m_enabled )
          m_pToggle->setText( i18n( "Deactivate" ) );
diff --git a/kpovmodeler/pmpolynom.cpp b/kpovmodeler/pmpolynom.cpp
index b9d75a13..e44044c5 100644
--- a/kpovmodeler/pmpolynom.cpp
+++ b/kpovmodeler/pmpolynom.cpp
@@ -130,11 +130,11 @@ void PMPolynom::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMPolynom::tqmetaObject( ) const
+PMMetaObject* PMPolynom::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Polynom", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Polynom", Base::metaObject( ),
                                         createNewPolynom );
       s_pMetaObject->addProperty(
          new PMPolynomProperty( "polynomOrder", &PMPolynom::setPolynomOrder,
diff --git a/kpovmodeler/pmpolynom.h b/kpovmodeler/pmpolynom.h
index dc2e9c21..65a9ad20 100644
--- a/kpovmodeler/pmpolynom.h
+++ b/kpovmodeler/pmpolynom.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmpovray31serialization.cpp b/kpovmodeler/pmpovray31serialization.cpp
index 543fec5b..a31c46de 100644
--- a/kpovmodeler/pmpovray31serialization.cpp
+++ b/kpovmodeler/pmpovray31serialization.cpp
@@ -21,7 +21,7 @@
 
 const double c_defaultPatchFlatness = 0;
 
-void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBicubicPatch* o = ( PMBicubicPatch* ) object;
 
@@ -53,7 +53,7 @@ void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaO
       dev->writeLine( line );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -102,7 +102,7 @@ void PMPov31SerBlendMapModifiers( const PMObject* object, const PMMetaObject*, P
    }
 }
 
-void PMPov31SerBlob( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBlob( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBlob* o = ( PMBlob* ) object;
 
@@ -111,7 +111,7 @@ void PMPov31SerBlob( const PMObject* object, const PMMetaObject* tqmetaObject, P
    dev->writeName( object->name( ) );
    dev->writeLine( TQString( "threshold %1" ).tqarg( o->threshold( ) ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->sturm( ) )
       dev->writeLine( "sturm" );
@@ -121,7 +121,7 @@ void PMPov31SerBlob( const PMObject* object, const PMMetaObject* tqmetaObject, P
    dev->objectEnd( );
 }
 
-void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBlobCylinder* o = ( PMBlobCylinder* ) object;
 
@@ -134,11 +134,11 @@ void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* tqmetaO
                   + ", " + str1 + "," );
    dev->writeLine( TQString( "strength %1" ).tqarg( o->strength( ) ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBlobSphere* o = ( PMBlobSphere* ) object;
 
@@ -146,22 +146,22 @@ void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* tqmetaObj
    dev->writeName( object->name( ) );
    dev->writeLine( o->centre( ).serialize( ) + TQString( ", %1," ).tqarg( o->radius( ) ) );
    dev->writeLine( TQString( "strength %1" ).tqarg( o->strength( ) ) );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBoundedBy* o = ( PMBoundedBy* ) object;
 
    dev->objectBegin( "bounded_by" );
    if( o->clippedBy( ) )
       dev->writeLine( "clipped_by" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerBox( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerBox( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBox* o = ( PMBox* ) object;
 
@@ -170,7 +170,7 @@ void PMPov31SerBox( const PMObject* object, const PMMetaObject* tqmetaObject, PM
    dev->writeName( object->name( ) );
    dev->writeLine( o->corner1( ).serialize( ) + ", " + o->corner2( ).serialize( ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -257,7 +257,7 @@ void PMPov31SerBumpMap( const PMObject* object, const PMMetaObject*, PMOutputDev
    dev->objectEnd( );
 }
 
-void PMPov31SerCamera( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerCamera( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMCamera* o = ( PMCamera* ) object;
 
@@ -301,18 +301,18 @@ void PMPov31SerCamera( const PMObject* object, const PMMetaObject* tqmetaObject,
       dev->writeLine( "variance " + str );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMClippedBy* o = ( PMClippedBy* ) object;
 
    dev->objectBegin( "clipped_by" );
    if( o->boundedBy( ) )
       dev->writeLine( "bounded_by" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -334,7 +334,7 @@ void PMPov31SerCompositeObject( const PMObject* object, const PMMetaObject*, PMO
          dev->serialize( tmp );
 }
 
-void PMPov31SerCone( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerCone( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMCone* o = ( PMCone* ) object;
 
@@ -349,11 +349,11 @@ void PMPov31SerCone( const PMObject* object, const PMMetaObject* tqmetaObject, P
    if( o->open( ) )
       dev->writeLine( TQString( "open" ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerCSG( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerCSG( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMCSG* o = ( PMCSG* ) object;
 
@@ -374,11 +374,11 @@ void PMPov31SerCSG( const PMObject* object, const PMMetaObject* tqmetaObject, PM
    }
 
    dev->writeName( object->name( ) );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMCylinder* o = ( PMCylinder* ) object;
 
@@ -392,22 +392,22 @@ void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* tqmetaObjec
    if( o->open( ) )
       dev->writeLine( TQString( "open" ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMDeclare* o = ( PMDeclare* ) object;
 
    if( o->firstChild( ) )
    {
       dev->declareBegin( o->id( ) );
-      dev->callSerialization( object, tqmetaObject->superClass( ) );
+      dev->callSerialization( object, metaObject->superClass( ) );
    }
 }
 
-void PMPov31SerDensity( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDensity( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    bool bObject = true;
    if( object->parent( ) )
@@ -416,12 +416,12 @@ void PMPov31SerDensity( const PMObject* object, const PMMetaObject* tqmetaObject
 
    if( bObject )
       dev->objectBegin( "density" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( bObject )
       dev->objectEnd( );
 }
 
-void PMPov31SerDisc( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDisc( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMDisc* o = ( PMDisc* ) object;
 
@@ -439,11 +439,11 @@ void PMPov31SerDisc( const PMObject* object, const PMMetaObject* tqmetaObject, P
    {
       dev->writeLine( o->center( ).serialize( ) + ","  + o->normal( ).serialize( ) + ", "  + str1 );
    }
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMFinish* o = ( PMFinish* ) object;
 
@@ -451,7 +451,7 @@ void PMPov31SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject,
 
    dev->objectBegin( "finish" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isAmbientEnabled( ) )
       dev->writeLine( "ambient " + o->ambientColor( ).serialize( ) );
@@ -588,7 +588,7 @@ void PMPov31SerFog( const PMObject* object, const PMMetaObject*, PMOutputDevice*
       dev->writeLine( "up " + o->up( ).serialize( ) );
    }
    // Serialize the tqchildren of this object
-   dev->callSerialization( object, object->tqmetaObject( )->superClass( )->superClass( ) );
+   dev->callSerialization( object, object->metaObject( )->superClass( )->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -708,16 +708,16 @@ void PMPov31SerGlobalSettings( const PMObject* object, const PMMetaObject*, PMOu
    dev->objectEnd( );
 }
 
-void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMGraphicalObject* o = ( PMGraphicalObject* ) object;
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( o->noShadow( ) )
       dev->writeLine( "no_shadow" );
 }
 
-void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMHeightField* o = ( PMHeightField* ) object;
 
@@ -733,7 +733,7 @@ void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* tqmetaOb
    if( o->smooth( ) )
       dev->writeLine( "smooth" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -842,14 +842,14 @@ void PMPov31SerImageMap( const PMObject* object, const PMMetaObject*, PMOutputDe
    dev->objectEnd( );
 }
 
-void PMPov31SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMInterior* o = ( PMInterior* ) object;
 
    TQString str1;
 
    dev->objectBegin( "interior" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isIorEnabled( ) )
    {
@@ -874,7 +874,7 @@ void PMPov31SerInterior( const PMObject* object, const PMMetaObject* tqmetaObjec
    dev->objectEnd( );
 }
 
-void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMJuliaFractal* o = ( PMJuliaFractal* ) object;
 
@@ -896,11 +896,11 @@ void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* tqmetaO
                   .tqarg( o->sliceDistance( ) ) );
 
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerLathe( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerLathe( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMLathe* o = ( PMLathe* ) object;
 
@@ -942,14 +942,14 @@ void PMPov31SerLathe( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( o->sturm( ) )
       dev->writeLine( "sturm" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
 const double c_defaultLightTightness = 10;
 const int c_defaultLightAdaptive = 0;
 
-void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMLight* o = ( PMLight* ) object;
 
@@ -997,11 +997,11 @@ void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( !o->mediaAttenuation( ) )
       dev->writeLine( TQString( "media_attenuation off" ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMListPattern* o = ( PMListPattern* ) object;
 
@@ -1020,7 +1020,7 @@ void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaOb
          break;
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->listType( ) == PMListPattern::ListPatternBrick )
    {
@@ -1031,24 +1031,24 @@ void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaOb
    }
 }
 
-void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
-void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
-void PMPov31SerColorList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerColorList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
-void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
 void PMPov31SerNormalList( const PMObject* object, const PMMetaObject*, PMOutputDevice* dev )
@@ -1083,22 +1083,22 @@ void PMPov31SerNormalList( const PMObject* object, const PMMetaObject*, PMOutput
    }
 }
 
-void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "looks_like" );
    dev->writeName( object->name( ) );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "material" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMMaterialMap* o = ( PMMaterialMap* ) object;
 
@@ -1169,7 +1169,7 @@ void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* tqmetaOb
          break;
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    dev->objectEnd( );
 }
@@ -1183,7 +1183,7 @@ const double c_defaultMediaRatio = 0.9;
 const double c_defaultMediaScatteringEccentricity = 0;
 const double c_defaultMediaScatteringExtinction = 1.0;
 
-void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMMedia* o = ( PMMedia* ) object;
 
@@ -1191,7 +1191,7 @@ void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject,
    TQString str2;
 
    dev->objectBegin( "media" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( o->intervals( ) != c_defaultMediaIntervals )
    {
       str1.setNum( o->intervals( ) );
@@ -1248,12 +1248,12 @@ void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject,
    dev->objectEnd( );
 }
 
-void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
-void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMNormal* o = ( PMNormal* ) object;
 
@@ -1266,7 +1266,7 @@ void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject,
 
    if( bObject )
       dev->objectBegin( "normal" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( o->isBumpSizeEnabled( ) )
    {
       str1.setNum( o->bumpSize( ) );
@@ -1276,7 +1276,7 @@ void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject,
       dev->objectEnd( );
 }
 
-void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMObjectLink* o = ( PMObjectLink* ) object;
 
@@ -1289,7 +1289,7 @@ void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* tqmetaObj
 
          dev->writeName( object->name( ) );
          dev->writeLine( o->linkedObject( )->id( ) );
-         dev->callSerialization( object, tqmetaObject->superClass( ) );
+         dev->callSerialization( object, metaObject->superClass( ) );
          writeComment = false;
 
          dev->objectEnd( );
@@ -1453,7 +1453,7 @@ void PMPov31SerPattern( const PMObject* object, const PMMetaObject*, PMOutputDev
    }
 }
 
-void PMPov31SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMPigment* o = ( PMPigment* ) object;
 
@@ -1464,12 +1464,12 @@ void PMPov31SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject
 
    if( bObject )
       dev->objectBegin( "pigment" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( bObject )
       dev->objectEnd( );
 }
 
-void PMPov31SerPlane( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPlane( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMPlane* o = ( PMPlane* ) object;
 
@@ -1479,11 +1479,11 @@ void PMPov31SerPlane( const PMObject* object, const PMMetaObject* tqmetaObject,
    TQString str1;
    str1.setNum( o->distance( ) );
    dev->writeLine( o->normal( ).serialize( ) + ", "  + str1 );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMPolynom* o = ( PMPolynom* ) object;
    PMVector coefficients = o->coefficients( );
@@ -1537,7 +1537,7 @@ void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* tqmetaObject
          dev->writeLine( "sturm" );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -1555,7 +1555,7 @@ void PMPov31SerPovrayMatrix( const PMObject* object, const PMMetaObject*, PMOutp
                   .tqarg( o->values( )[10] ).tqarg( o->values( )[11] ) );
 }
 
-void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPrism( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMPrism* o = ( PMPrism* ) object;
 
@@ -1628,7 +1628,7 @@ void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( o->sturm( ) )
       dev->writeLine( "sturm" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -1639,14 +1639,14 @@ void PMPov31SerQuickColor( const PMObject* object, const PMMetaObject*, PMOutput
    dev->writeLine( "quick_color " + o->color( ).serialize( ) );
 }
 
-void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMRainbow* o = ( PMRainbow* ) object;
 
    TQString str1;
 
    dev->objectBegin( "rainbow" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isDirectionEnabled( ) )
       dev->writeLine( "direction " + o->direction( ).serialize( ) );
@@ -1761,15 +1761,15 @@ void PMPov31SerScale( const PMObject* object, const PMMetaObject* , PMOutputDevi
       dev->writeLine( "scale " + scale.serialize( ) );
 }
 
-void PMPov31SerScene( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerScene( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
-void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "sky_sphere" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -1792,11 +1792,11 @@ void PMPov31SerSolidColor( const PMObject* object, const PMMetaObject* , PMOutpu
    dev->writeLine( o->color( ).serialize( true ) );
 }
 
-void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMSolidObject* o = ( PMSolidObject* ) object;
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    switch( o->hollow( ) )
    {
       case PMTrue:
@@ -1812,7 +1812,7 @@ void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* tqmetaOb
       dev->writeLine( "inverse" );
 }
 
-void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMSurfaceOfRevolution* o = ( PMSurfaceOfRevolution* ) object;
 
@@ -1840,11 +1840,11 @@ void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject*
    if( o->sturm( ) )
       dev->writeLine( "sturm" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMSphere* o = ( PMSphere* ) object;
 
@@ -1853,11 +1853,11 @@ void PMPov31SerSphere( const PMObject* object, const PMMetaObject* tqmetaObject,
    TQString str;
    str.setNum( o->radius( ) );
    dev->writeLine( o->centre( ).serialize( ) + ", " + str );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMSuperquadricEllipsoid* o = ( PMSuperquadricEllipsoid* ) object;
 
@@ -1867,11 +1867,11 @@ void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject
    dev->writeLine( TQString( "<%1, %2>" ).tqarg( o->eastWestExponent( ) )
                   .tqarg( o->northSouthExponent( ) ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerText( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerText( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMText* o = ( PMText* ) object;
 
@@ -1883,11 +1883,11 @@ void PMPov31SerText( const PMObject* object, const PMMetaObject* tqmetaObject, P
    dev->writeLine( TQString( "%1, " ).tqarg( o->thickness( ) )
                   + o->offset( ).serialize( ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTexture* o = ( PMTexture* ) object;
 
@@ -1898,12 +1898,12 @@ void PMPov31SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject
 
    if( bObject )
       dev->objectBegin( "texture" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( bObject )
       dev->objectEnd( );
 }
 
-void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTextureBase* o = ( PMTextureBase* ) object;
 
@@ -1926,7 +1926,7 @@ void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* tqmetaOb
       }
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
 
 void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* , PMOutputDevice* dev )
@@ -1970,49 +1970,49 @@ void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* , PMO
    }
 }
 
-void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "texture_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "pigment_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "color_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "normal_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "slope_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "density_map" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov31SerTorus( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTorus( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTorus* o = ( PMTorus* ) object;
 
@@ -2027,7 +2027,7 @@ void PMPov31SerTorus( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( o->sturm( ) )
       dev->writeLine( TQString( "sturm" ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -2081,7 +2081,7 @@ void PMPov31SerTranslate( const PMObject* object, const PMMetaObject* , PMOutput
    dev->writeLine( "translate " + vector );
 }
 
-void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTriangle* o = ( PMTriangle* ) object;
 
@@ -2094,7 +2094,7 @@ void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObjec
       dev->writeLine( o->point( 1 ).serialize( ) + ", " + o->normal( 1 ).serialize( ) + "," );
       dev->writeLine( o->point( 2 ).serialize( ) + ", " + o->normal( 2 ).serialize( ) );
 
-      dev->callSerialization( object, tqmetaObject->superClass( ) );
+      dev->callSerialization( object, metaObject->superClass( ) );
       dev->objectEnd( );
    }
    else
@@ -2105,7 +2105,7 @@ void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObjec
       dev->writeLine( o->point( 0 ).serialize( ) + ", " + o->point( 1 ).serialize( )
                      + ", " + o->point( 2 ).serialize( ) );
 
-      dev->callSerialization( object, tqmetaObject->superClass( ) );
+      dev->callSerialization( object, metaObject->superClass( ) );
       dev->objectEnd( );
    }
 }
@@ -2193,7 +2193,7 @@ void PMPov31SerWarp( const PMObject* object, const PMMetaObject* , PMOutputDevic
    dev->objectEnd( );
 }
 
-void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 }
diff --git a/kpovmodeler/pmpovray31serialization.h b/kpovmodeler/pmpovray31serialization.h
index 397ae9e9..5c48c0cd 100644
--- a/kpovmodeler/pmpovray31serialization.h
+++ b/kpovmodeler/pmpovray31serialization.h
@@ -24,80 +24,80 @@ class PMOutputDevice;
 
 // serialization methods for POV-Ray 3.1
 
-void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBlendMapModifiers( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBlob( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBox( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerBumpMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerCamera( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerComment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerCompositeObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerCone( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerCSG( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDensity( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDisc( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerFog( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerImageMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerLathe( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerColorList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerNormalList( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPlane( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPovrayMatrix( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerQuickColor( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerRaw( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerRotate( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerScale( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerScene( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSlope( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSolidColor( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSphere( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerText( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTorus( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTranslate( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerWarp( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
+void PMPov31SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBlendMapModifiers( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBlob( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBoundedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBox( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerBumpMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerCamera( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerClippedBy( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerComment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerCompositeObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerCone( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerCSG( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerCylinder( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDensity( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDisc( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerFog( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerGlobalSettings( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerImageMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerLathe( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerListPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTextureList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPigmentList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerColorList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDensityList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerNormalList( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerLooksLike( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerMaterial( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerMaterialMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerNamedObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPlane( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPovrayMatrix( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPrism( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerQuickColor( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerRainbow( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerRaw( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerRotate( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerScale( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerScene( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSkySphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSlope( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSolidColor( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSolidObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSphere( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerText( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTextureMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerPigmentMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerColorMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerNormalMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerSlopeMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDensityMap( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTorus( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTranslate( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerWarp( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
 
 #endif
diff --git a/kpovmodeler/pmpovray35serialization.cpp b/kpovmodeler/pmpovray35serialization.cpp
index a012c646..457f51a4 100644
--- a/kpovmodeler/pmpovray35serialization.cpp
+++ b/kpovmodeler/pmpovray35serialization.cpp
@@ -58,7 +58,7 @@ const double c_defaultIsoOpen = false;
 const int c_defaultIsoMaxTrace = 1;
 const bool c_defaultIsoAllIntersections = false;
 
-void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMIsoSurface* o = ( PMIsoSurface* ) object;
    TQString str;
@@ -116,14 +116,14 @@ void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* tqmetaObj
    if( o->open( ) )
       dev->writeLine( "open" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
 const double c_defaultLightTightness = 10;
 const int c_defaultLightAdaptive = 0;
 
-void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMLight* o = ( PMLight* ) object;
 
@@ -178,15 +178,15 @@ void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject,
    if( !o->mediaAttenuation( ) )
       dev->writeLine( TQString( "media_attenuation off" ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "projected_through" );
    dev->writeName( object->name( ) );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -209,7 +209,7 @@ const double c_defaultGlobalSettingsMinimumReuse = 0.015;
 const int c_defaultGlobalSettingsNearestCount = 5;
 const int c_defaultGlobalSettingsRecursionLimit = 2;
 
-void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMGlobalSettings* o = ( PMGlobalSettings* ) object;
 
@@ -310,7 +310,7 @@ void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmet
       dev->objectEnd( );
    }
    else
-      dev->callSerialization( object, tqmetaObject->superClass( ) );
+      dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -559,14 +559,14 @@ void PMPov35SerPhotons( const PMObject* object, const PMMetaObject*, PMOutputDev
    dev->objectEnd( );
 }
 
-void PMPov35SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMInterior* o = ( PMInterior* ) object;
 
    TQString str1;
 
    dev->objectBegin( "interior" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isIorEnabled( ) )
    {
@@ -601,14 +601,14 @@ void PMPov35SerInterior( const PMObject* object, const PMMetaObject* tqmetaObjec
    dev->objectEnd( );
 }
 
-void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMLightGroup* o = ( PMLightGroup* ) object;
 
    dev->objectBegin( "light_group" );
 
    dev->writeName( object->name( ) );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if ( o->globalLights( ) )
       dev->writeLine( "global_lights on" );
@@ -887,7 +887,7 @@ void PMPov35SerPattern( const PMObject* object, const PMMetaObject*, PMOutputDev
 
 const double c_defaultNormalAccuracy = 0.02;
 
-void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMNormal* o = ( PMNormal* ) object;
 
@@ -907,7 +907,7 @@ void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject,
          dev->writeLine( "uv_mapping" );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isBumpSizeEnabled( ) )
    {
@@ -925,10 +925,10 @@ void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject,
       dev->objectEnd( );
 }
 
-void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    dev->objectBegin( "interior_texture" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
@@ -1057,7 +1057,7 @@ void PMPov35SerWarp( const PMObject* object, const PMMetaObject* , PMOutputDevic
 
 const double c_sphereSweepToleranceDefault = 1e-6;
 
-void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMSphereSweep* o = ( PMSphereSweep* ) object;
 
@@ -1099,11 +1099,11 @@ void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* tqmetaOb
       dev->writeLine( "tolerance " + str1 );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMFinish* o = ( PMFinish* ) object;
 
@@ -1111,7 +1111,7 @@ void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject,
 
    dev->objectBegin( "finish" );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->isAmbientEnabled( ) )
       dev->writeLine( "ambient " + o->ambientColor( ).serialize( ) );
@@ -1216,7 +1216,7 @@ void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject,
    dev->objectEnd( );
 }
 
-void PMPov35SerMesh( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerMesh( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMMesh* o = ( PMMesh* ) object;
 
@@ -1225,7 +1225,7 @@ void PMPov35SerMesh( const PMObject* object, const PMMetaObject* tqmetaObject, P
    if( o->isInsideVectorEnabled( ) )
       dev->writeLine( "inside_vector " + o->insideVector( ).serialize( ) );
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( !o->hierarchy( ) )
       dev->writeLine( "hierarchy off" );
@@ -1245,7 +1245,7 @@ const double c_defaultMediaAAThreshold = 0.1;
 const double c_defaultMediaScatteringEccentricity = 0;
 const double c_defaultMediaScatteringExtinction = 1.0;
 
-void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMMedia* o = ( PMMedia* ) object;
 
@@ -1253,7 +1253,7 @@ void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject,
    TQString str2;
 
    dev->objectBegin( "media" );
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->method( ) != c_defaultMediaMethod )
    {
@@ -1332,11 +1332,11 @@ void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject,
    dev->objectEnd( );
 }
 
-void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMGraphicalObject* o = ( PMGraphicalObject* ) object;
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
 
    if( o->noShadow( ) )
       dev->writeLine( "no_shadow" );
@@ -1351,7 +1351,7 @@ void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* tqme
       dev->writeLine( "double_illuminate" );
 }
 
-void PMPov35SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMPigment* o = ( PMPigment* ) object;
 
@@ -1366,12 +1366,12 @@ void PMPov35SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject
       if ( o->uvMapping() )
          dev->writeLine( "uv_mapping" );
    }
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( bObject )
       dev->objectEnd( );
 }
 
-void PMPov35SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTexture* o = ( PMTexture* ) object;
 
@@ -1386,14 +1386,14 @@ void PMPov35SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject
       if ( o->uvMapping() )
          dev->writeLine( "uv_mapping" );
    }
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    if( bObject )
       dev->objectEnd( );
 }
 
 const double c_defaultPatchFlatness = 0;
 
-void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMBicubicPatch* o = ( PMBicubicPatch* ) object;
 
@@ -1433,11 +1433,11 @@ void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaO
       dev->writeLine( line );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
 
-void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev )
+void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev )
 {
    PMTriangle* o = ( PMTriangle* ) object;
 
@@ -1466,6 +1466,6 @@ void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObjec
                       " " + o->uvVector( 2 ).serialize( ) );
    }
 
-   dev->callSerialization( object, tqmetaObject->superClass( ) );
+   dev->callSerialization( object, metaObject->superClass( ) );
    dev->objectEnd( );
 }
diff --git a/kpovmodeler/pmpovray35serialization.h b/kpovmodeler/pmpovray35serialization.h
index 507b941b..4e511d55 100644
--- a/kpovmodeler/pmpovray35serialization.h
+++ b/kpovmodeler/pmpovray35serialization.h
@@ -24,26 +24,26 @@ class PMOutputDevice;
 
 // serialization methods for POV-Ray 3.5
 
-void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerRadiosity( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerGlobalPhotons( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerPhotons( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerInterior( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerPattern( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerWarp( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerFinish( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerMesh( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerMedia( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
-void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev );
+void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerLight( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerProjectedThrough( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerGlobalSettings( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerRadiosity( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerGlobalPhotons( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerPhotons( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerInterior( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerLightGroup( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerPattern( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerNormal( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerInteriorTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerWarp( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerSphereSweep( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerFinish( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerMesh( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerMedia( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerGraphicalObject( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerPigment( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerTexture( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerBicubicPatch( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
+void PMPov35SerTriangle( const PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );
 #endif
diff --git a/kpovmodeler/pmpovraymatrix.cpp b/kpovmodeler/pmpovraymatrix.cpp
index fd90ad92..d51610f1 100644
--- a/kpovmodeler/pmpovraymatrix.cpp
+++ b/kpovmodeler/pmpovraymatrix.cpp
@@ -72,11 +72,11 @@ void PMPovrayMatrix::readAttributes( const PMXMLHelper& h )
    m_values.resize( 12 );
 }
 
-PMMetaObject* PMPovrayMatrix::tqmetaObject( ) const
+PMMetaObject* PMPovrayMatrix::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "PovrayMatrix", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "PovrayMatrix", Base::metaObject( ),
                                         createNewPovrayMatrix );
       s_pMetaObject->addProperty(
          new PMPovrayMatrixProperty( "values", &PMPovrayMatrix::setValues, &PMPovrayMatrix::values ) );
diff --git a/kpovmodeler/pmpovraymatrix.h b/kpovmodeler/pmpovraymatrix.h
index d42e5f22..c4e0d886 100644
--- a/kpovmodeler/pmpovraymatrix.h
+++ b/kpovmodeler/pmpovraymatrix.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp
index ac95309c..6e8b4ef2 100644
--- a/kpovmodeler/pmpovrayrenderwidget.cpp
+++ b/kpovmodeler/pmpovrayrenderwidget.cpp
@@ -393,7 +393,7 @@ void PMPovrayRenderWidget::cleanup( )
    m_pTempFile = 0;
 }
 
-TQSize PMPovrayRenderWidget::tqsizeHint( ) const
+TQSize PMPovrayRenderWidget::sizeHint( ) const
 {
    TQSize s;
    if( m_image.isNull( ) )
@@ -401,7 +401,7 @@ TQSize PMPovrayRenderWidget::tqsizeHint( ) const
    else
       s = m_image.size( );
 
-   return s.expandedTo( tqminimumSize( ) );
+   return s.expandedTo( minimumSize( ) );
 }
 
 void PMPovrayRenderWidget::saveConfig( KConfig* cfg )
diff --git a/kpovmodeler/pmpovrayrenderwidget.h b/kpovmodeler/pmpovrayrenderwidget.h
index 8f9d0533..7e295172 100644
--- a/kpovmodeler/pmpovrayrenderwidget.h
+++ b/kpovmodeler/pmpovrayrenderwidget.h
@@ -91,7 +91,7 @@ public:
     */
    static void setPovrayLibraryPaths( const TQStringList& slist )
    { s_libraryPaths = slist; }
-   virtual TQSize tqsizeHint( ) const;
+   virtual TQSize sizeHint( ) const;
 
    virtual void startDrag( );
 signals:
diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp
index c4ce83cb..0d9cea35 100644
--- a/kpovmodeler/pmpovraywidget.cpp
+++ b/kpovmodeler/pmpovraywidget.cpp
@@ -140,13 +140,13 @@ bool PMPovrayWidget::render( const TQByteArray& scene, const PMRenderMode& m,
       int w, h;
 
       w = maxSize.width( ) + KDialog::spacingHint( ) * 2;
-      h = maxSize.height( ) + m_pSaveButton->tqsizeHint( ).height( ) * 2
+      h = maxSize.height( ) + m_pSaveButton->sizeHint( ).height( ) * 2
          + KDialog::spacingHint( ) * 6;
-      if( m_pProgressLabel->tqsizeHint( ).height( )
-          > m_pProgressBar->tqsizeHint( ).height( ) )
-         h += m_pProgressLabel->tqsizeHint( ).height( );
+      if( m_pProgressLabel->sizeHint( ).height( )
+          > m_pProgressBar->sizeHint( ).height( ) )
+         h += m_pProgressLabel->sizeHint( ).height( );
       else
-         h += m_pProgressBar->tqsizeHint( ).height( );
+         h += m_pProgressBar->sizeHint( ).height( );
 
       w += 16;
       h += 16;
@@ -319,11 +319,11 @@ void PMPovrayWidget::slotPovrayOutput( )
    m_pPovrayOutputWidget->show( );
 }
 
-void PMPovrayWidget::slotRenderingFinished( int returntqStatus )
+void PMPovrayWidget::slotRenderingFinished( int returnStatus )
 {
-   kdDebug( PMArea ) << "Povray exited with status " << returntqStatus << endl;
+   kdDebug( PMArea ) << "Povray exited with status " << returnStatus << endl;
    m_bRunning = false;
-   if( returntqStatus == 0 )
+   if( returnStatus == 0 )
       m_pSaveButton->setEnabled( true );
    m_pStopButton->setEnabled( false );
    m_pSuspendButton->setEnabled( false );
@@ -331,11 +331,11 @@ void PMPovrayWidget::slotRenderingFinished( int returntqStatus )
    m_pProgressLabel->setText( i18n( "finished" ) );
    m_pProgressTimer->stop( );
 
-   if( ( returntqStatus != 0 ) && !m_stopped )
+   if( ( returnStatus != 0 ) && !m_stopped )
    {
       KMessageBox::error( this, i18n( "Povray exited abnormally.\n"
                                       "See the povray output for details." )
-                          .tqarg( returntqStatus ) );
+                          .tqarg( returnStatus ) );
    }
    else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) )
    {
diff --git a/kpovmodeler/pmpovraywidget.h b/kpovmodeler/pmpovraywidget.h
index c21cdc7b..27c37cb3 100644
--- a/kpovmodeler/pmpovraywidget.h
+++ b/kpovmodeler/pmpovraywidget.h
@@ -70,7 +70,7 @@ public slots:
    void slotPovrayOutput( );
 
 protected slots:
-   void slotRenderingFinished( int returntqStatus );
+   void slotRenderingFinished( int returnStatus );
    void slotProgress( int i );
    void slotLineFinished( int line );
    void slotUpdateSpeed( );
diff --git a/kpovmodeler/pmprism.cpp b/kpovmodeler/pmprism.cpp
index a7c5c8f7..5e627935 100644
--- a/kpovmodeler/pmprism.cpp
+++ b/kpovmodeler/pmprism.cpp
@@ -272,11 +272,11 @@ void PMPrism::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMPrism::tqmetaObject( ) const
+PMMetaObject* PMPrism::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Prism", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Prism", Base::metaObject( ),
                                         createNewPrism );
       s_pMetaObject->addProperty(
          new PMPrismProperty( "sturm", &PMPrism::setSturm, &PMPrism::sturm ) );
diff --git a/kpovmodeler/pmprism.h b/kpovmodeler/pmprism.h
index facce467..a22fb748 100644
--- a/kpovmodeler/pmprism.h
+++ b/kpovmodeler/pmprism.h
@@ -67,7 +67,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmprojectedthrough.cpp b/kpovmodeler/pmprojectedthrough.cpp
index 71710395..96c0c00a 100644
--- a/kpovmodeler/pmprojectedthrough.cpp
+++ b/kpovmodeler/pmprojectedthrough.cpp
@@ -49,11 +49,11 @@ TQString PMProjectedThrough::description( ) const
    return i18n( "projected through" );
 }
 
-PMMetaObject* PMProjectedThrough::tqmetaObject( ) const
+PMMetaObject* PMProjectedThrough::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ProjectedThrough", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ProjectedThrough", Base::metaObject( ),
                                         createNewProjectedThrough );
       // no properties
    }
diff --git a/kpovmodeler/pmprojectedthrough.h b/kpovmodeler/pmprojectedthrough.h
index 606aa972..4212097f 100644
--- a/kpovmodeler/pmprojectedthrough.h
+++ b/kpovmodeler/pmprojectedthrough.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmprototypemanager.cpp b/kpovmodeler/pmprototypemanager.cpp
index fd02e50b..ac8f5140 100644
--- a/kpovmodeler/pmprototypemanager.cpp
+++ b/kpovmodeler/pmprototypemanager.cpp
@@ -147,33 +147,33 @@ void PMPrototypeManager::addPrototype( PMObject* obj )
    if( !obj )
       return;
 
-   PMMetaObject* tqmetaObject = obj->tqmetaObject( );
-   PMMetaObject* m2 = m_metaDict.find( tqmetaObject->className( ) );
+   PMMetaObject* metaObject = obj->metaObject( );
+   PMMetaObject* m2 = m_metaDict.find( metaObject->className( ) );
    if( m2 )
    {
       kdError( PMArea ) << "PMPrototypeManager: Class '"
-                        << tqmetaObject->className( )
+                        << metaObject->className( )
                         << "' already registered." << endl;
    }
    else
    {
-      if( tqmetaObject->isAbstract( ) )
+      if( metaObject->isAbstract( ) )
          kdError( PMArea ) << "PMPrototypeManager: The meta object for the prototype "
-                           << tqmetaObject->className( )
+                           << metaObject->className( )
                            << " doesn't have a factory method" << endl;
 
-      m_prototypes.append( tqmetaObject );
-      m_lowerCaseDict[tqmetaObject->className( ).lower( )] = tqmetaObject->className( );
+      m_prototypes.append( metaObject );
+      m_lowerCaseDict[metaObject->className( ).lower( )] = metaObject->className( );
 
       // insert the meta object and all super classes into the hash table
-      while( tqmetaObject )
+      while( metaObject )
       {
-         if( m_metaDict.find( tqmetaObject->className( ) ) )
-            tqmetaObject = 0;
+         if( m_metaDict.find( metaObject->className( ) ) )
+            metaObject = 0;
          else
          {
-            m_metaDict.insert( tqmetaObject->className( ), tqmetaObject );
-            tqmetaObject = tqmetaObject->superClass( );
+            m_metaDict.insert( metaObject->className( ), metaObject );
+            metaObject = metaObject->superClass( );
          }
       }
    }
@@ -184,7 +184,7 @@ void PMPrototypeManager::addDeclarationType( const TQString& className,
                                              const TQString& description,
                                              const TQString& pixmap )
 {
-   PMMetaObject* m = tqmetaObject( className );
+   PMMetaObject* m = metaObject( className );
    if( !m )
       kdError( PMArea ) << "PMPrototypeManager::addDeclarationType: Unknown class " << className << endl;
    else
@@ -212,7 +212,7 @@ PMObject* PMPrototypeManager::newObject( const TQString& name ) const
    return meta->newObject( m_pPart );
 }
 
-PMMetaObject* PMPrototypeManager::tqmetaObject( const TQString& name ) const
+PMMetaObject* PMPrototypeManager::metaObject( const TQString& name ) const
 {
    if( name.isNull( ) )
       return 0;
@@ -222,13 +222,13 @@ PMMetaObject* PMPrototypeManager::tqmetaObject( const TQString& name ) const
 bool PMPrototypeManager::isA( const TQString& className,
                               const TQString& baseClass ) const
 {
-   return isA( tqmetaObject( className ), baseClass );
+   return isA( metaObject( className ), baseClass );
 }
 
 bool PMPrototypeManager::isA( PMMetaObject* c,
                               const TQString& baseClass ) const
 {
-   PMMetaObject* bc = tqmetaObject( baseClass );
+   PMMetaObject* bc = metaObject( baseClass );
    while( c && c != bc )
       c = c->superClass( );
    return( c && ( c == bc ) );
diff --git a/kpovmodeler/pmprototypemanager.h b/kpovmodeler/pmprototypemanager.h
index f37a5852..bade9e29 100644
--- a/kpovmodeler/pmprototypemanager.h
+++ b/kpovmodeler/pmprototypemanager.h
@@ -111,13 +111,13 @@ public:
     * not exist.
     * @see PMMetaObject
     */
-   PMMetaObject* tqmetaObject( const TQString& name ) const;
+   PMMetaObject* metaObject( const TQString& name ) const;
    /**
     * Returns true if the class exists
     */
    bool existsClass( const TQString& name ) const
    {
-      return tqmetaObject( name );
+      return metaObject( name );
    }
    /**
     * Returns true if the second class is a base class for
diff --git a/kpovmodeler/pmquickcolor.cpp b/kpovmodeler/pmquickcolor.cpp
index d1bcf100..25fc7aff 100644
--- a/kpovmodeler/pmquickcolor.cpp
+++ b/kpovmodeler/pmquickcolor.cpp
@@ -67,11 +67,11 @@ void PMQuickColor::readAttributes( const PMXMLHelper& h )
    m_color = h.colorAttribute( "quickcolor", colorDefault );
 }
 
-PMMetaObject* PMQuickColor::tqmetaObject( ) const
+PMMetaObject* PMQuickColor::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "QuickColor", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "QuickColor", Base::metaObject( ),
                                         createNewQuickColor );
       s_pMetaObject->addProperty(
          new PMQuickColorProperty( "color", &PMQuickColor::setColor, &PMQuickColor::color ) );
diff --git a/kpovmodeler/pmquickcolor.h b/kpovmodeler/pmquickcolor.h
index 0fe9ccbe..c64d363f 100644
--- a/kpovmodeler/pmquickcolor.h
+++ b/kpovmodeler/pmquickcolor.h
@@ -57,7 +57,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmradiosity.cpp b/kpovmodeler/pmradiosity.cpp
index 39d61342..86d36e74 100644
--- a/kpovmodeler/pmradiosity.cpp
+++ b/kpovmodeler/pmradiosity.cpp
@@ -86,11 +86,11 @@ PMRadiosity::~PMRadiosity( )
 {
 }
 
-PMMetaObject* PMRadiosity::tqmetaObject( ) const
+PMMetaObject* PMRadiosity::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Radiosity", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Radiosity", Base::metaObject( ),
                                         createNewRadiosity );
       s_pMetaObject->addProperty(
          new PMRadiosityProperty( "adcBailout", &PMRadiosity::setAdcBailout, &PMRadiosity::adcBailout ) );
diff --git a/kpovmodeler/pmradiosity.h b/kpovmodeler/pmradiosity.h
index 4a1c1ad1..c56ccec2 100644
--- a/kpovmodeler/pmradiosity.h
+++ b/kpovmodeler/pmradiosity.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmrainbow.cpp b/kpovmodeler/pmrainbow.cpp
index 62def615..1fd9e8ca 100644
--- a/kpovmodeler/pmrainbow.cpp
+++ b/kpovmodeler/pmrainbow.cpp
@@ -87,11 +87,11 @@ PMRainbow::~PMRainbow( )
 {
 }
 
-PMMetaObject* PMRainbow::tqmetaObject( ) const
+PMMetaObject* PMRainbow::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Rainbow", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Rainbow", Base::metaObject( ),
                                         createNewRainbow );
       s_pMetaObject->addProperty(
          new PMRainbowProperty( "direction", &PMRainbow::setDirection, &PMRainbow::direction ) );
diff --git a/kpovmodeler/pmrainbow.h b/kpovmodeler/pmrainbow.h
index 1b631ed1..64dae5d7 100644
--- a/kpovmodeler/pmrainbow.h
+++ b/kpovmodeler/pmrainbow.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmraw.cpp b/kpovmodeler/pmraw.cpp
index 4971433c..31d7ec1a 100644
--- a/kpovmodeler/pmraw.cpp
+++ b/kpovmodeler/pmraw.cpp
@@ -69,11 +69,11 @@ void PMRaw::setCode( const TQString& code )
    }
 }
 
-PMMetaObject* PMRaw::tqmetaObject( ) const
+PMMetaObject* PMRaw::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Raw", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Raw", Base::metaObject( ),
                                         createNewRaw );
       s_pMetaObject->addProperty(
          new PMRawProperty( "code", &PMRaw::setCode, &PMRaw::code ) );
diff --git a/kpovmodeler/pmraw.h b/kpovmodeler/pmraw.h
index 541687c8..11c28ad2 100644
--- a/kpovmodeler/pmraw.h
+++ b/kpovmodeler/pmraw.h
@@ -67,7 +67,7 @@ public:
    virtual void readAttributes( const PMXMLHelper& h );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmrotate.cpp b/kpovmodeler/pmrotate.cpp
index feed0091..5a432c91 100644
--- a/kpovmodeler/pmrotate.cpp
+++ b/kpovmodeler/pmrotate.cpp
@@ -66,11 +66,11 @@ void PMRotate::readAttributes( const PMXMLHelper& h )
    m_rotate = h.vectorAttribute( "value", rotateDefault );
 }
 
-PMMetaObject* PMRotate::tqmetaObject( ) const
+PMMetaObject* PMRotate::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Rotate", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Rotate", Base::metaObject( ),
                                         createNewRotate );
       s_pMetaObject->addProperty(
          new PMRotateProperty( "rotation", &PMRotate::setRotation, &PMRotate::rotation ) );
diff --git a/kpovmodeler/pmrotate.h b/kpovmodeler/pmrotate.h
index 5090a933..4ecc6d9a 100644
--- a/kpovmodeler/pmrotate.h
+++ b/kpovmodeler/pmrotate.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmscale.cpp b/kpovmodeler/pmscale.cpp
index 5e1c4717..af8245b8 100644
--- a/kpovmodeler/pmscale.cpp
+++ b/kpovmodeler/pmscale.cpp
@@ -66,11 +66,11 @@ void PMScale::readAttributes( const PMXMLHelper& h )
    m_scale = h.vectorAttribute( "value", scaleDefault );
 }
 
-PMMetaObject* PMScale::tqmetaObject( ) const
+PMMetaObject* PMScale::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Scale", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Scale", Base::metaObject( ),
                                         createNewScale );
       s_pMetaObject->addProperty(
          new PMScaleProperty( "scale", &PMScale::setScale, &PMScale::scale ) );
diff --git a/kpovmodeler/pmscale.h b/kpovmodeler/pmscale.h
index 55a40eaf..72821041 100644
--- a/kpovmodeler/pmscale.h
+++ b/kpovmodeler/pmscale.h
@@ -55,7 +55,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmscene.cpp b/kpovmodeler/pmscene.cpp
index 810fa84c..cd6593cd 100644
--- a/kpovmodeler/pmscene.cpp
+++ b/kpovmodeler/pmscene.cpp
@@ -52,11 +52,11 @@ TQString PMScene::description( ) const
    return i18n( "scene" );
 }
 
-PMMetaObject* PMScene::tqmetaObject( ) const
+PMMetaObject* PMScene::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Scene", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Scene", Base::metaObject( ),
                                         createNewScene );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pmscene.h b/kpovmodeler/pmscene.h
index 3a93875f..ed7cf227 100644
--- a/kpovmodeler/pmscene.h
+++ b/kpovmodeler/pmscene.h
@@ -51,7 +51,7 @@ public:
    virtual ~PMScene( );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmskysphere.cpp b/kpovmodeler/pmskysphere.cpp
index 39724548..a31cc475 100644
--- a/kpovmodeler/pmskysphere.cpp
+++ b/kpovmodeler/pmskysphere.cpp
@@ -44,11 +44,11 @@ PMSkySphere::~PMSkySphere( )
 {
 }
 
-PMMetaObject* PMSkySphere::tqmetaObject( ) const
+PMMetaObject* PMSkySphere::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SkySphere", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SkySphere", Base::metaObject( ),
                                         createNewSkySphere );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pmskysphere.h b/kpovmodeler/pmskysphere.h
index d466cb68..116af543 100644
--- a/kpovmodeler/pmskysphere.h
+++ b/kpovmodeler/pmskysphere.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmslope.cpp b/kpovmodeler/pmslope.cpp
index 663a19fe..1d2d2977 100644
--- a/kpovmodeler/pmslope.cpp
+++ b/kpovmodeler/pmslope.cpp
@@ -69,11 +69,11 @@ void PMSlope::readAttributes( const PMXMLHelper& h )
    m_slope = h.doubleAttribute( "slope", slopeDefault );
 }
 
-PMMetaObject* PMSlope::tqmetaObject( ) const
+PMMetaObject* PMSlope::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Slope", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Slope", Base::metaObject( ),
                                         createNewSlope );
       s_pMetaObject->addProperty(
          new PMSlopeProperty( "height", &PMSlope::setHeight, &PMSlope::height ) );
diff --git a/kpovmodeler/pmslope.h b/kpovmodeler/pmslope.h
index e32455c5..eb860373 100644
--- a/kpovmodeler/pmslope.h
+++ b/kpovmodeler/pmslope.h
@@ -53,7 +53,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmsolidcolor.cpp b/kpovmodeler/pmsolidcolor.cpp
index 8ec9ba6d..dd50d030 100644
--- a/kpovmodeler/pmsolidcolor.cpp
+++ b/kpovmodeler/pmsolidcolor.cpp
@@ -65,11 +65,11 @@ void PMSolidColor::readAttributes( const PMXMLHelper& h )
    m_color = h.colorAttribute( "color", colorDefault );
 }
 
-PMMetaObject* PMSolidColor::tqmetaObject( ) const
+PMMetaObject* PMSolidColor::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SolidColor", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SolidColor", Base::metaObject( ),
                                         createNewSolidColor );
       s_pMetaObject->addProperty(
          new PMSolidColorProperty( "color", &PMSolidColor::setColor, &PMSolidColor::color ) );
diff --git a/kpovmodeler/pmsolidcolor.h b/kpovmodeler/pmsolidcolor.h
index 8b8b36e9..225a3a5b 100644
--- a/kpovmodeler/pmsolidcolor.h
+++ b/kpovmodeler/pmsolidcolor.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmsolidobject.cpp b/kpovmodeler/pmsolidobject.cpp
index 0c98ded9..61ddd45c 100644
--- a/kpovmodeler/pmsolidobject.cpp
+++ b/kpovmodeler/pmsolidobject.cpp
@@ -43,11 +43,11 @@ PMSolidObject::~PMSolidObject( )
 {
 }
 
-PMMetaObject* PMSolidObject::tqmetaObject( ) const
+PMMetaObject* PMSolidObject::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SolidObject", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "SolidObject", Base::metaObject( ) );
       s_pMetaObject->addProperty(
          new PMSolidObjectProperty( "inverse", &PMSolidObject::setInverse, &PMSolidObject::inverse ) );
       s_pMetaObject->addProperty(
diff --git a/kpovmodeler/pmsolidobject.h b/kpovmodeler/pmsolidobject.h
index 9406aa0e..2a2990c0 100644
--- a/kpovmodeler/pmsolidobject.h
+++ b/kpovmodeler/pmsolidobject.h
@@ -48,7 +48,7 @@ public:
     */
    virtual ~PMSolidObject( );
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmsor.cpp b/kpovmodeler/pmsor.cpp
index 997447c4..f25669e6 100644
--- a/kpovmodeler/pmsor.cpp
+++ b/kpovmodeler/pmsor.cpp
@@ -194,11 +194,11 @@ void PMSurfaceOfRevolution::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMSurfaceOfRevolution::tqmetaObject( ) const
+PMMetaObject* PMSurfaceOfRevolution::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SurfaceOfRevolution", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SurfaceOfRevolution", Base::metaObject( ),
                                         createNewSurfaceOfRevolution );
       s_pMetaObject->addProperty(
          new PMSurfaceOfRevolutionProperty( "sturm", &PMSurfaceOfRevolution::setSturm,
diff --git a/kpovmodeler/pmsor.h b/kpovmodeler/pmsor.h
index 720987fc..46db677e 100644
--- a/kpovmodeler/pmsor.h
+++ b/kpovmodeler/pmsor.h
@@ -60,7 +60,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmsphere.cpp b/kpovmodeler/pmsphere.cpp
index bbdd3b88..cca385c9 100644
--- a/kpovmodeler/pmsphere.cpp
+++ b/kpovmodeler/pmsphere.cpp
@@ -71,11 +71,11 @@ TQString PMSphere::description( ) const
    return i18n( "sphere" );
 }
 
-PMMetaObject* PMSphere::tqmetaObject( ) const
+PMMetaObject* PMSphere::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Sphere", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Sphere", Base::metaObject( ),
                                         createNewSphere );
       s_pMetaObject->addProperty(
          new PMSphereProperty( "radius", &PMSphere::setRadius, &PMSphere::radius ) );
diff --git a/kpovmodeler/pmsphere.h b/kpovmodeler/pmsphere.h
index 871b7375..984bc6d6 100644
--- a/kpovmodeler/pmsphere.h
+++ b/kpovmodeler/pmsphere.h
@@ -57,7 +57,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmspheresweep.cpp b/kpovmodeler/pmspheresweep.cpp
index ff2e8e1a..40df90f3 100644
--- a/kpovmodeler/pmspheresweep.cpp
+++ b/kpovmodeler/pmspheresweep.cpp
@@ -216,11 +216,11 @@ void PMSphereSweep::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMSphereSweep::tqmetaObject( ) const
+PMMetaObject* PMSphereSweep::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SphereSweep", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SphereSweep", Base::metaObject( ),
                                         createNewSphereSweep );
       s_pMetaObject->addProperty(
          new PMSphereSweepProperty( "tolerance", &PMSphereSweep::setTolerance, &PMSphereSweep::tolerance ) );
diff --git a/kpovmodeler/pmspheresweep.h b/kpovmodeler/pmspheresweep.h
index f4488e1b..b28d69a5 100644
--- a/kpovmodeler/pmspheresweep.h
+++ b/kpovmodeler/pmspheresweep.h
@@ -63,7 +63,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmsqe.cpp b/kpovmodeler/pmsqe.cpp
index 8a0946fb..61279251 100644
--- a/kpovmodeler/pmsqe.cpp
+++ b/kpovmodeler/pmsqe.cpp
@@ -80,11 +80,11 @@ void PMSuperquadricEllipsoid::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMSuperquadricEllipsoid::tqmetaObject( ) const
+PMMetaObject* PMSuperquadricEllipsoid::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SuperquadricEllipsoid", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SuperquadricEllipsoid", Base::metaObject( ),
                                         createNewSuperquadricEllipsoid );
       s_pMetaObject->addProperty(
          new PMSuperquadricEllipsoidProperty( "eastWestExponent",
diff --git a/kpovmodeler/pmsqe.h b/kpovmodeler/pmsqe.h
index 835f52c0..acc4e030 100644
--- a/kpovmodeler/pmsqe.h
+++ b/kpovmodeler/pmsqe.h
@@ -58,7 +58,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmtext.cpp b/kpovmodeler/pmtext.cpp
index e4b7f0da..9410228d 100644
--- a/kpovmodeler/pmtext.cpp
+++ b/kpovmodeler/pmtext.cpp
@@ -89,11 +89,11 @@ void PMText::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMText::tqmetaObject( ) const
+PMMetaObject* PMText::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Text", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Text", Base::metaObject( ),
                                         createNewText );
       s_pMetaObject->addProperty(
          new PMTextProperty( "font", &PMText::setFont, &PMText::font ) );
diff --git a/kpovmodeler/pmtext.h b/kpovmodeler/pmtext.h
index 5b769dc7..7ab4aff7 100644
--- a/kpovmodeler/pmtext.h
+++ b/kpovmodeler/pmtext.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmtexture.cpp b/kpovmodeler/pmtexture.cpp
index 3ae367dd..a40da8cb 100644
--- a/kpovmodeler/pmtexture.cpp
+++ b/kpovmodeler/pmtexture.cpp
@@ -45,11 +45,11 @@ PMTexture::~PMTexture( )
 {
 }
 
-PMMetaObject* PMTexture::tqmetaObject( ) const
+PMMetaObject* PMTexture::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Texture", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Texture", Base::metaObject( ),
                                         createNewTexture );
       s_pMetaObject->addProperty(
          new PMTextureProperty( "uvMapping", &PMTexture::setUVMapping, &PMTexture::uvMapping ) );
diff --git a/kpovmodeler/pmtexture.h b/kpovmodeler/pmtexture.h
index daeaf427..b2675b11 100644
--- a/kpovmodeler/pmtexture.h
+++ b/kpovmodeler/pmtexture.h
@@ -52,7 +52,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmtexturebase.cpp b/kpovmodeler/pmtexturebase.cpp
index 93c3cdb3..0a8d087b 100644
--- a/kpovmodeler/pmtexturebase.cpp
+++ b/kpovmodeler/pmtexturebase.cpp
@@ -49,11 +49,11 @@ PMTextureBase::~PMTextureBase( )
 {
 }
 
-PMMetaObject* PMTextureBase::tqmetaObject( ) const
+PMMetaObject* PMTextureBase::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "TextureBase", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "TextureBase", Base::metaObject( ) );
       s_pMetaObject->addProperty(
          new PMTextureBaseProperty( "linkedObject", &PMTextureBase::setLinkedObjectProperty,
                          &PMTextureBase::linkedObjectProperty ) );
diff --git a/kpovmodeler/pmtexturebase.h b/kpovmodeler/pmtexturebase.h
index 3d57d70f..a3ecdc0a 100644
--- a/kpovmodeler/pmtexturebase.h
+++ b/kpovmodeler/pmtexturebase.h
@@ -55,7 +55,7 @@ public:
    virtual void readAttributes( const PMXMLHelper& h );
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmtexturemap.cpp b/kpovmodeler/pmtexturemap.cpp
index dc9f3b76..8602c9fc 100644
--- a/kpovmodeler/pmtexturemap.cpp
+++ b/kpovmodeler/pmtexturemap.cpp
@@ -138,11 +138,11 @@ void PMTextureMapBase::stringToValues( const TQString& str )
    }
 }
 
-PMMetaObject* PMTextureMapBase::tqmetaObject( ) const
+PMMetaObject* PMTextureMapBase::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "TextureMapBase", Base::tqmetaObject( ) );
+      s_pMetaObject = new PMMetaObject( "TextureMapBase", Base::metaObject( ) );
       s_pMetaObject->addProperty( new PMValueProperty( ) );
    }
    return s_pMetaObject;
@@ -342,11 +342,11 @@ PMTextureMap::~PMTextureMap( )
 {
 }
 
-PMMetaObject* PMTextureMap::tqmetaObject( ) const
+PMMetaObject* PMTextureMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "TextureMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "TextureMap", Base::metaObject( ),
                                         createNewTextureMap );
    }
    return s_pMetaObject;
@@ -388,11 +388,11 @@ PMPigmentMap::~PMPigmentMap( )
 {
 }
 
-PMMetaObject* PMPigmentMap::tqmetaObject( ) const
+PMMetaObject* PMPigmentMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "PigmentMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "PigmentMap", Base::metaObject( ),
                                         createNewPigmentMap );
    }
    return s_pMetaObject;
@@ -434,11 +434,11 @@ PMColorMap::~PMColorMap( )
 {
 }
 
-PMMetaObject* PMColorMap::tqmetaObject( ) const
+PMMetaObject* PMColorMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "ColorMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "ColorMap", Base::metaObject( ),
                                         createNewColorMap );
    }
    return s_pMetaObject;
@@ -480,11 +480,11 @@ PMNormalMap::~PMNormalMap( )
 {
 }
 
-PMMetaObject* PMNormalMap::tqmetaObject( ) const
+PMMetaObject* PMNormalMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "NormalMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "NormalMap", Base::metaObject( ),
                                         createNewNormalMap );
    }
    return s_pMetaObject;
@@ -526,11 +526,11 @@ PMSlopeMap::~PMSlopeMap( )
 {
 }
 
-PMMetaObject* PMSlopeMap::tqmetaObject( ) const
+PMMetaObject* PMSlopeMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "SlopeMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "SlopeMap", Base::metaObject( ),
                                         createNewSlopeMap );
    }
    return s_pMetaObject;
@@ -572,11 +572,11 @@ PMDensityMap::~PMDensityMap( )
 {
 }
 
-PMMetaObject* PMDensityMap::tqmetaObject( ) const
+PMMetaObject* PMDensityMap::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "DensityMap", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "DensityMap", Base::metaObject( ),
                                         createNewDensityMap );
    }
    return s_pMetaObject;
diff --git a/kpovmodeler/pmtexturemap.h b/kpovmodeler/pmtexturemap.h
index 26907ed3..6a7b020d 100644
--- a/kpovmodeler/pmtexturemap.h
+++ b/kpovmodeler/pmtexturemap.h
@@ -54,7 +54,7 @@ public:
    virtual bool dataChangeOnInsertRemove( ) const { return true; }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -153,7 +153,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "Texture" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -193,7 +193,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "Pigment" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -233,7 +233,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "SolidColor" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -274,7 +274,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "Normal" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -314,7 +314,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "Slope" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
@@ -354,7 +354,7 @@ public:
    virtual TQString mapType( ) const { return TQString( "Density" ); }
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmtorus.cpp b/kpovmodeler/pmtorus.cpp
index a32d04e7..5e5be5ea 100644
--- a/kpovmodeler/pmtorus.cpp
+++ b/kpovmodeler/pmtorus.cpp
@@ -74,11 +74,11 @@ TQString PMTorus::description( ) const
    return i18n( "torus" );
 }
 
-PMMetaObject* PMTorus::tqmetaObject( ) const
+PMMetaObject* PMTorus::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Torus", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Torus", Base::metaObject( ),
                                         createNewTorus );
       s_pMetaObject->addProperty(
          new PMTorusProperty( "minorRadius", &PMTorus::setMinorRadius,
diff --git a/kpovmodeler/pmtorus.h b/kpovmodeler/pmtorus.h
index 59b16e3c..a7f1ee6a 100644
--- a/kpovmodeler/pmtorus.h
+++ b/kpovmodeler/pmtorus.h
@@ -58,7 +58,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmtranslate.cpp b/kpovmodeler/pmtranslate.cpp
index 0cbfe58d..a0a09b7b 100644
--- a/kpovmodeler/pmtranslate.cpp
+++ b/kpovmodeler/pmtranslate.cpp
@@ -65,11 +65,11 @@ void PMTranslate::readAttributes( const PMXMLHelper& h )
    m_move = h.vectorAttribute( "value", moveDefault );
 }
 
-PMMetaObject* PMTranslate::tqmetaObject( ) const
+PMMetaObject* PMTranslate::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Translate", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Translate", Base::metaObject( ),
                                         createNewTranslate );
       s_pMetaObject->addProperty(
          new PMTranslateProperty( "translation", &PMTranslate::setTranslation, &PMTranslate::translation ) );
diff --git a/kpovmodeler/pmtranslate.h b/kpovmodeler/pmtranslate.h
index e121615d..d1272bf6 100644
--- a/kpovmodeler/pmtranslate.h
+++ b/kpovmodeler/pmtranslate.h
@@ -54,7 +54,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;
 
diff --git a/kpovmodeler/pmtriangle.cpp b/kpovmodeler/pmtriangle.cpp
index db88443e..ecf00f8c 100644
--- a/kpovmodeler/pmtriangle.cpp
+++ b/kpovmodeler/pmtriangle.cpp
@@ -228,11 +228,11 @@ void PMTriangle::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMMetaObject* PMTriangle::tqmetaObject( ) const
+PMMetaObject* PMTriangle::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Triangle", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Triangle", Base::metaObject( ),
                                         createNewTriangle );
       s_pMetaObject->addProperty(
          new PMTriangleProperty( "smooth", &PMTriangle::setSmoothTriangle,
diff --git a/kpovmodeler/pmtriangle.h b/kpovmodeler/pmtriangle.h
index aeb590d2..e2ef3026 100644
--- a/kpovmodeler/pmtriangle.h
+++ b/kpovmodeler/pmtriangle.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
 
    /** */
    virtual void serialize( TQDomElement& e, TQDomDocument& doc ) const;
diff --git a/kpovmodeler/pmunknownview.cpp b/kpovmodeler/pmunknownview.cpp
index 646aa619..7a1e6afb 100644
--- a/kpovmodeler/pmunknownview.cpp
+++ b/kpovmodeler/pmunknownview.cpp
@@ -26,7 +26,7 @@ PMUnknownView::PMUnknownView( const TQString& viewType,
    TQHBoxLayout* hl = new TQHBoxLayout( this );
    TQLabel* l;
    l = new TQLabel( i18n( "Unknown view type \"%1\"" ).tqarg( viewType ), this );
-   l->tqsetAlignment( TQt::AlignCenter );
+   l->setAlignment( TQt::AlignCenter );
    hl->addWidget( l );
    m_viewType = viewType;
 }
diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp
index fed18026..fb1fa482 100644
--- a/kpovmodeler/pmvectorlistedit.cpp
+++ b/kpovmodeler/pmvectorlistedit.cpp
@@ -121,7 +121,7 @@ void PMVectorListEdit::init( int dimensions )
       setColumnStretchable( i, true );
    connect( this, TQT_SIGNAL( valueChanged( int, int ) ),
             TQT_SLOT( slotTextChanged( int, int ) ) );
-   tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+   setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
 }
 
 void PMVectorListEdit::setVectors( const TQValueList<PMVector>& l,
@@ -315,11 +315,11 @@ bool PMVectorListEdit::isDataValid( )
    return valid;
 }
 
-TQSize PMVectorListEdit::tqsizeHint( ) const
+TQSize PMVectorListEdit::sizeHint( ) const
 {
    return TQSize( c_columnWidth * m_dimension + frameWidth( ) * 2,
                  frameWidth( ) * 2 + horizontalHeader( )->height( )
-                 + verticalHeader( )->tqsizeHint( ).height( ) );
+                 + verticalHeader( )->sizeHint( ).height( ) );
 }
 
 void PMVectorListEdit::slotTextChanged( int, int )
diff --git a/kpovmodeler/pmvectorlistedit.h b/kpovmodeler/pmvectorlistedit.h
index d415e9a9..a52be9db 100644
--- a/kpovmodeler/pmvectorlistedit.h
+++ b/kpovmodeler/pmvectorlistedit.h
@@ -147,7 +147,7 @@ public:
    bool isDataValid( );
 
    /** */
-   virtual TQSize tqsizeHint( ) const;
+   virtual TQSize sizeHint( ) const;
    /** */
    bool eventFilter( TQObject* o, TQEvent* e );
 
diff --git a/kpovmodeler/pmwarp.cpp b/kpovmodeler/pmwarp.cpp
index e97817bb..166777ce 100644
--- a/kpovmodeler/pmwarp.cpp
+++ b/kpovmodeler/pmwarp.cpp
@@ -221,11 +221,11 @@ void PMWarp::readAttributes( const PMXMLHelper& h )
    }
 }
 
-PMMetaObject* PMWarp::tqmetaObject( ) const
+PMMetaObject* PMWarp::metaObject( ) const
 {
    if( !s_pMetaObject )
    {
-      s_pMetaObject = new PMMetaObject( "Warp", Base::tqmetaObject( ),
+      s_pMetaObject = new PMMetaObject( "Warp", Base::metaObject( ),
                                         createNewWarp );
 
       PMWarpTypeProperty* p = new PMWarpTypeProperty(
diff --git a/kpovmodeler/pmwarp.h b/kpovmodeler/pmwarp.h
index 15e86b65..6b50f498 100644
--- a/kpovmodeler/pmwarp.h
+++ b/kpovmodeler/pmwarp.h
@@ -56,7 +56,7 @@ public:
    virtual TQString description( ) const;
 
    /** */
-   virtual PMMetaObject* tqmetaObject( ) const;
+   virtual PMMetaObject* metaObject( ) const;
    /** */
    virtual void cleanUp( ) const;