diff options
Diffstat (limited to 'kpovmodeler')
303 files changed, 1631 insertions, 1631 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/pmaddcommand.cpp b/kpovmodeler/pmaddcommand.cpp index 2eb78126..b8d4ea49 100644 --- a/kpovmodeler/pmaddcommand.cpp +++ b/kpovmodeler/pmaddcommand.cpp @@ -27,7 +27,7 @@ #include <klocale.h> PMAddCommand::PMAddCommand( PMObject* obj, PMObject* parent, PMObject* after ) - : PMCommand( i18n( "Add New %1" ).tqarg( obj->description( ) ) ) + : PMCommand( i18n( "Add New %1" ).arg( obj->description( ) ) ) { m_objects.append( obj ); m_pParent = parent; diff --git a/kpovmodeler/pmaddcommand.h b/kpovmodeler/pmaddcommand.h index 51beec31..97793d03 100644 --- a/kpovmodeler/pmaddcommand.h +++ b/kpovmodeler/pmaddcommand.h @@ -48,10 +48,10 @@ public: /** * Command that adds a list of new PMObjects. * - * The object in the list will be inserted as tqchildren of parent after + * The object in the list will be inserted as children of parent after * the object after. * - * If after is 0, the objects will be inserted as first tqchildren. + * If after is 0, the objects will be inserted as first children. */ PMAddCommand( const PMObjectList& list, PMObject* parent, PMObject* after ); /** diff --git a/kpovmodeler/pmbicubicpatch.cpp b/kpovmodeler/pmbicubicpatch.cpp index dd281ceb..2c1c99dd 100644 --- a/kpovmodeler/pmbicubicpatch.cpp +++ b/kpovmodeler/pmbicubicpatch.cpp @@ -177,10 +177,10 @@ void PMBicubicPatch::serialize( TQDomElement& e, TQDomDocument& doc ) const e.setAttribute( "uvEnabled", m_uvEnabled ); for( i = 0; i < 16; i++ ) - e.setAttribute( TQString( "cp%1" ).tqarg( i ), m_point[i].serializeXML( ) ); + e.setAttribute( TQString( "cp%1" ).arg( i ), m_point[i].serializeXML( ) ); for( i = 0; i < 4; ++i ) - e.setAttribute( TQString( "uv%1" ).tqarg( i ), m_uvVectors[i].serializeXML( ) ); + e.setAttribute( TQString( "uv%1" ).arg( i ), m_uvVectors[i].serializeXML( ) ); Base::serialize( e, doc ); } @@ -198,7 +198,7 @@ void PMBicubicPatch::readAttributes( const PMXMLHelper& h ) for( v = 0; v < 4; v++ ) for( u = 0; u < 4; u++ ) - m_point[u+v*4] = h.vectorAttribute( TQString( "cp%1" ).tqarg( u+v*4 ), + m_point[u+v*4] = h.vectorAttribute( TQString( "cp%1" ).arg( u+v*4 ), PMVector( o + s * u, 0, o + s * v ) ); m_uvVectors[0] = h.vectorAttribute( "uv0", c_defaultUVVector0 ); @@ -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, @@ -527,7 +527,7 @@ void PMBicubicPatch::controlPoints( PMControlPointList& list ) for( v = 0; v < 4; v++ ) for( u = 0; u < 4; u++ ) list.append( new PM3DControlPoint( m_point[u+v*4], u+v*4, - i18n( "Point (%1, %2)" ).tqarg( u ).tqarg( v ) ) ); + i18n( "Point (%1, %2)" ).arg( u ).arg( v ) ) ); } void PMBicubicPatch::controlPointsChanged( PMControlPointList& list ) 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/pmbicubicpatchedit.cpp b/kpovmodeler/pmbicubicpatchedit.cpp index fe91f1e0..b31bbf44 100644 --- a/kpovmodeler/pmbicubicpatchedit.cpp +++ b/kpovmodeler/pmbicubicpatchedit.cpp @@ -23,7 +23,7 @@ #include "pmvectorlistedit.h" #include "pmpart.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqcheckbox.h> @@ -39,32 +39,32 @@ void PMBicubicPatchEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; m_pType = new TQComboBox( false, this ); m_pType->insertItem( i18n( "Normal (type 0)" ) ); m_pType->insertItem( i18n( "Preprocessed (type 1)" ) ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( new TQLabel( i18n( "Type:" ), this ) ); - tqlayout->addWidget( m_pType ); - tqlayout->addStretch( 1 ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( new TQLabel( i18n( "Type:" ), this ) ); + layout->addWidget( m_pType ); + layout->addStretch( 1 ); m_pUSteps = new PMIntEdit( this ); m_pUSteps->setValidation( true, 0, false, 0 ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( new TQLabel( i18n( "Steps:" ) + " u", this ) ); - tqlayout->addWidget( m_pUSteps ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( new TQLabel( i18n( "Steps:" ) + " u", this ) ); + layout->addWidget( m_pUSteps ); m_pVSteps = new PMIntEdit( this ); m_pVSteps->setValidation( true, 0, false, 0 ); - tqlayout->addWidget( new TQLabel( "v", this ) ); - tqlayout->addWidget( m_pVSteps ); + layout->addWidget( new TQLabel( "v", this ) ); + layout->addWidget( m_pVSteps ); m_pFlatness = new PMFloatEdit( this ); m_pFlatness->setValidation( true, 0.0, false, 0.0 ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( new TQLabel( i18n( "Flatness:" ), this ) ); - tqlayout->addWidget( m_pFlatness ); - tqlayout->addStretch( 1 ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( new TQLabel( i18n( "Flatness:" ), this ) ); + layout->addWidget( m_pFlatness ); + layout->addStretch( 1 ); topLayout( )->addWidget( new TQLabel( i18n( "Points:" ), this ) ); 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/pmblendmapmodifiersedit.cpp b/kpovmodeler/pmblendmapmodifiersedit.cpp index fd443623..1c07bd0e 100644 --- a/kpovmodeler/pmblendmapmodifiersedit.cpp +++ b/kpovmodeler/pmblendmapmodifiersedit.cpp @@ -25,7 +25,7 @@ #include "pmvector.h" #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqlabel.h> #include <tqlineedit.h> 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/pmblobcylinderedit.cpp b/kpovmodeler/pmblobcylinderedit.cpp index 836d7d72..ab6fe32f 100644 --- a/kpovmodeler/pmblobcylinderedit.cpp +++ b/kpovmodeler/pmblobcylinderedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> #include <tqcheckbox.h> @@ -36,7 +36,7 @@ void PMBlobCylinderEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; TQGridLayout* gl; m_pEnd1 = new PMVectorEdit( "x", "y", "z", this ); @@ -50,13 +50,13 @@ void PMBlobCylinderEdit::createTopWidgets( ) gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 ); gl->addWidget( m_pEnd2, 1, 1 ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - gl = new TQGridLayout( tqlayout, 2, 2 ); + layout = new TQHBoxLayout( topLayout( ) ); + gl = new TQGridLayout( layout, 2, 2 ); gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 ); gl->addWidget( m_pRadius, 0, 1 ); gl->addWidget( new TQLabel( i18n( "Strength:" ), this ), 1, 0 ); gl->addWidget( m_pStrength, 1, 1 ); - tqlayout->addStretch( 1 ); + layout->addStretch( 1 ); connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); diff --git a/kpovmodeler/pmblobedit.cpp b/kpovmodeler/pmblobedit.cpp index a38d9639..2b682291 100644 --- a/kpovmodeler/pmblobedit.cpp +++ b/kpovmodeler/pmblobedit.cpp @@ -20,7 +20,7 @@ #include "pmblob.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <klocale.h> 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/pmblobsphereedit.cpp b/kpovmodeler/pmblobsphereedit.cpp index 6bf37b26..3e209769 100644 --- a/kpovmodeler/pmblobsphereedit.cpp +++ b/kpovmodeler/pmblobsphereedit.cpp @@ -20,7 +20,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> @@ -34,23 +34,23 @@ void PMBlobSphereEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; m_pCentre = new PMVectorEdit( "x", "y", "z", this ); m_pRadius = new PMFloatEdit( this ); m_pStrength = new PMFloatEdit( this ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( new TQLabel( i18n( "Center:" ), this ) ); - tqlayout->addWidget( m_pCentre ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( new TQLabel( i18n( "Center:" ), this ) ); + layout->addWidget( m_pCentre ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - TQGridLayout* gl = new TQGridLayout( tqlayout, 2, 2 ); + layout = new TQHBoxLayout( topLayout( ) ); + TQGridLayout* gl = new TQGridLayout( layout, 2, 2 ); gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 ); gl->addWidget( m_pRadius, 0, 1 ); gl->addWidget( new TQLabel( i18n( "Strength:" ), this ), 1, 0 ); gl->addWidget( m_pStrength, 1, 1 ); - tqlayout->addStretch( 1 ); + layout->addStretch( 1 ); connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); 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/pmboundedbyedit.cpp b/kpovmodeler/pmboundedbyedit.cpp index 8a41fa52..aa503006 100644 --- a/kpovmodeler/pmboundedbyedit.cpp +++ b/kpovmodeler/pmboundedbyedit.cpp @@ -19,7 +19,7 @@ #include "pmboundedbyedit.h" #include "pmboundedby.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> 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/pmboxedit.cpp b/kpovmodeler/pmboxedit.cpp index 6b6a2f2a..a4cad88d 100644 --- a/kpovmodeler/pmboxedit.cpp +++ b/kpovmodeler/pmboxedit.cpp @@ -20,7 +20,7 @@ #include "pmbox.h" #include "pmvectoredit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> 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/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp index 5a4bf298..30c1afb9 100644 --- a/kpovmodeler/pmbumpmapedit.cpp +++ b/kpovmodeler/pmbumpmapedit.cpp @@ -24,7 +24,7 @@ #include "pmvector.h" #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqlabel.h> #include <tqlineedit.h> 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/pmcameraedit.cpp b/kpovmodeler/pmcameraedit.cpp index 23db4104..3e501cf9 100644 --- a/kpovmodeler/pmcameraedit.cpp +++ b/kpovmodeler/pmcameraedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqcheckbox.h> @@ -40,7 +40,7 @@ void PMCameraEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQGridLayout* tqlayout; + TQGridLayout* layout; TQLabel* label; m_pCameraType = new TQComboBox( false, this ); @@ -75,28 +75,28 @@ void PMCameraEdit::createTopWidgets( ) hl->addWidget( m_pCylinderTypeLabel ); hl->addWidget( m_pCylinderType ); - tqlayout = new TQGridLayout( topLayout( ), 7, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 ); - tqlayout->addWidget( m_pLocation, 0, 1 ); + layout = new TQGridLayout( topLayout( ), 7, 2 ); + layout->addWidget( new TQLabel( i18n( "Location:" ), this ), 0, 0 ); + layout->addWidget( m_pLocation, 0, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "Sky:" ), this ), 1, 0 ); - tqlayout->addWidget( m_pSky, 1, 1 ); + layout->addWidget( new TQLabel( i18n( "Sky:" ), this ), 1, 0 ); + layout->addWidget( m_pSky, 1, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "Direction:" ), this ), 2, 0 ); - tqlayout->addWidget( m_pDirection, 2, 1 ); + layout->addWidget( new TQLabel( i18n( "Direction:" ), this ), 2, 0 ); + layout->addWidget( m_pDirection, 2, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "Right:" ), this ), 3, 0 ); - tqlayout->addWidget( m_pRight, 3, 1 ); + layout->addWidget( new TQLabel( i18n( "Right:" ), this ), 3, 0 ); + layout->addWidget( m_pRight, 3, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "Up:" ), this ), 4, 0 ); - tqlayout->addWidget( m_pUp, 4, 1 ); + layout->addWidget( new TQLabel( i18n( "Up:" ), this ), 4, 0 ); + layout->addWidget( m_pUp, 4, 1 ); - tqlayout->addWidget( new TQLabel( i18n( "Look at:" ), this ), 5, 0 ); - tqlayout->addWidget( m_pLookAt, 5, 1 ); + layout->addWidget( new TQLabel( i18n( "Look at:" ), this ), 5, 0 ); + layout->addWidget( m_pLookAt, 5, 1 ); m_pEnableAngle = new TQCheckBox( i18n( "Angle:" ), this ); - tqlayout->addWidget( m_pEnableAngle, 6, 0 ); - tqlayout->addWidget( m_pAngle, 6, 1, AlignLeft ); + layout->addWidget( m_pEnableAngle, 6, 0 ); + layout->addWidget( m_pAngle, 6, 1, AlignLeft ); m_pFocalBlur = new TQCheckBox( i18n( "Focal blur" ), this ); topLayout( )->addWidget( m_pFocalBlur ); @@ -116,27 +116,27 @@ void PMCameraEdit::createTopWidgets( ) m_pVariance->setValidation( true, 0, false, 0 ); m_focalWidgets.append( m_pVariance ); - tqlayout = new TQGridLayout( topLayout( ), 5, 2 ); + layout = new TQGridLayout( topLayout( ), 5, 2 ); label = new TQLabel( i18n( "Aperture:" ), this ); m_focalWidgets.append( label ); - tqlayout->addWidget( label, 0, 0 ); - tqlayout->addWidget( m_pAperture, 0, 1 ); + layout->addWidget( label, 0, 0 ); + layout->addWidget( m_pAperture, 0, 1 ); label = new TQLabel( i18n( "Blur samples:" ), this ); m_focalWidgets.append( label ); - tqlayout->addWidget( label, 1, 0 ); - tqlayout->addWidget( m_pBlurSamples, 1, 1 ); + layout->addWidget( label, 1, 0 ); + layout->addWidget( m_pBlurSamples, 1, 1 ); label = new TQLabel( i18n( "Focal point:" ), this ); m_focalWidgets.append( label ); - tqlayout->addWidget( label, 2, 0 ); - tqlayout->addWidget( m_pFocalPoint, 2, 1 ); + layout->addWidget( label, 2, 0 ); + layout->addWidget( m_pFocalPoint, 2, 1 ); label = new TQLabel( i18n( "Confidence:" ), this ); m_focalWidgets.append( label ); - tqlayout->addWidget( label, 3, 0 ); - tqlayout->addWidget( m_pConfidence, 3, 1 ); + layout->addWidget( label, 3, 0 ); + layout->addWidget( m_pConfidence, 3, 1 ); label = new TQLabel( i18n( "Variance:" ), this ); m_focalWidgets.append( label ); - tqlayout->addWidget( label, 4, 0 ); - tqlayout->addWidget( m_pVariance, 4, 1 ); + layout->addWidget( label, 4, 0 ); + layout->addWidget( m_pVariance, 4, 1 ); m_pExport = new TQCheckBox( i18n( "Export to renderer" ), this ); topLayout( )->addWidget( m_pExport ); 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/pmclippedbyedit.cpp b/kpovmodeler/pmclippedbyedit.cpp index 8afa0285..b207a5c9 100644 --- a/kpovmodeler/pmclippedbyedit.cpp +++ b/kpovmodeler/pmclippedbyedit.cpp @@ -19,7 +19,7 @@ #include "pmclippedbyedit.h" #include "pmclippedby.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> diff --git a/kpovmodeler/pmcolor.cpp b/kpovmodeler/pmcolor.cpp index 1f895861..5b279d30 100644 --- a/kpovmodeler/pmcolor.cpp +++ b/kpovmodeler/pmcolor.cpp @@ -22,7 +22,7 @@ #include "pmdebug.h" -#include <tqtextstream.h> +#include <textstream.h> #include <tqstring.h> PMColor::PMColor( ) diff --git a/kpovmodeler/pmcoloredit.cpp b/kpovmodeler/pmcoloredit.cpp index f34ee47d..5abf8a40 100644 --- a/kpovmodeler/pmcoloredit.cpp +++ b/kpovmodeler/pmcoloredit.cpp @@ -20,7 +20,7 @@ #include <kcolorbutton.h> #include <klocale.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcolor.h> #include <kdialog.h> diff --git a/kpovmodeler/pmcolorsettings.cpp b/kpovmodeler/pmcolorsettings.cpp index e8518312..d64ced5e 100644 --- a/kpovmodeler/pmcolorsettings.cpp +++ b/kpovmodeler/pmcolorsettings.cpp @@ -20,7 +20,7 @@ #include "pmrendermanager.h" #include "pmdefaults.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kcolorbutton.h> #include <klocale.h> @@ -28,60 +28,60 @@ PMColorSettings::PMColorSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) { - TQHBoxLayout* htqlayout; - TQVBoxLayout* vtqlayout; + TQHBoxLayout* hlayout; + TQVBoxLayout* vlayout; TQGridLayout* grid; - vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); - grid = new TQGridLayout( vtqlayout, 6, 3 ); + vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); + grid = new TQGridLayout( vlayout, 6, 3 ); grid->addWidget( new TQLabel( i18n( "Background:" ), this ), 0, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 0, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 0, 2 ); m_pBackgroundColor = new KColorButton( this ); - htqlayout->addWidget( m_pBackgroundColor ); - htqlayout->addStretch( 1 ); + hlayout->addWidget( m_pBackgroundColor ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Wire frame:" ), this ), 1, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 1, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 1, 2 ); m_pGraphicalObjectsColor[0] = new KColorButton( this ); - htqlayout->addWidget( m_pGraphicalObjectsColor[0] ); - htqlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) ); + hlayout->addWidget( m_pGraphicalObjectsColor[0] ); + hlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) ); m_pGraphicalObjectsColor[1] = new KColorButton( this ); - htqlayout->addWidget( m_pGraphicalObjectsColor[1] ); - htqlayout->addStretch( 1 ); + hlayout->addWidget( m_pGraphicalObjectsColor[1] ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Control points:" ), this ), 2, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 2, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 2, 2 ); m_pControlPointsColor[0] = new KColorButton( this ); - htqlayout->addWidget( m_pControlPointsColor[0] ); - htqlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) ); + hlayout->addWidget( m_pControlPointsColor[0] ); + hlayout->addWidget( new TQLabel( i18n( "Selected:" ), this ) ); m_pControlPointsColor[1] = new KColorButton( this ); - htqlayout->addWidget( m_pControlPointsColor[1] ); - htqlayout->addStretch( 1 ); + hlayout->addWidget( m_pControlPointsColor[1] ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Axes:" ), this ), 3, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 3, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 3, 2 ); grid->addWidget( new TQLabel( "x", this ), 3, 1 ); m_pAxesColor[0] = new KColorButton( this ); - htqlayout->addWidget( m_pAxesColor[0] ); - htqlayout->addWidget( new TQLabel( "y", this ) ); + hlayout->addWidget( m_pAxesColor[0] ); + hlayout->addWidget( new TQLabel( "y", this ) ); m_pAxesColor[1] = new KColorButton( this ); - htqlayout->addWidget( m_pAxesColor[1] ); - htqlayout->addWidget( new TQLabel( "z", this ) ); + hlayout->addWidget( m_pAxesColor[1] ); + hlayout->addWidget( new TQLabel( "z", this ) ); m_pAxesColor[2] = new KColorButton( this ); - htqlayout->addWidget( m_pAxesColor[2] ); - htqlayout->addStretch( 1 ); + hlayout->addWidget( m_pAxesColor[2] ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Field of view:" ), this ), 4, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 4, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 4, 2 ); m_pFieldOfViewColor = new KColorButton( this ); - htqlayout->addWidget( m_pFieldOfViewColor ); - htqlayout->addStretch( 1 ); + hlayout->addWidget( m_pFieldOfViewColor ); + hlayout->addStretch( 1 ); } void PMColorSettings::displaySettings( ) @@ -118,21 +118,21 @@ bool PMColorSettings::validateData( ) void PMColorSettings::applySettings( ) { - bool tqrepaint = false; + bool repaint = false; int i; PMRenderManager* rm = PMRenderManager::theManager( ); if( rm->backgroundColor( ) != m_pBackgroundColor->color( ) ) { rm->setBackgroundColor( m_pBackgroundColor->color( ) ); - tqrepaint = true; + repaint = true; } for( i = 0; i < 2; i++ ) { if( rm->graphicalObjectColor( i ) != m_pGraphicalObjectsColor[i]->color( ) ) { rm->setGraphicalObjectColor( i, m_pGraphicalObjectsColor[i]->color( ) ); - tqrepaint = true; + repaint = true; } } for( i = 0; i < 2; i++ ) @@ -140,7 +140,7 @@ void PMColorSettings::applySettings( ) if( rm->controlPointColor( i ) != m_pControlPointsColor[i]->color( ) ) { rm->setControlPointColor( i, m_pControlPointsColor[i]->color( ) ); - tqrepaint = true; + repaint = true; } } for( i = 0; i < 3; i++ ) @@ -148,15 +148,15 @@ void PMColorSettings::applySettings( ) if( rm->axesColor( i ) != m_pAxesColor[i]->color( ) ) { rm->setAxesColor( i, m_pAxesColor[i]->color( ) ); - tqrepaint = true; + repaint = true; } } if( rm->fieldOfViewColor( ) != m_pFieldOfViewColor->color( ) ) { rm->setFieldOfViewColor( m_pFieldOfViewColor->color( ) ); - tqrepaint = true; + repaint = true; } - if( tqrepaint ) + if( repaint ) emit repaintViews( ); } diff --git a/kpovmodeler/pmcommand.h b/kpovmodeler/pmcommand.h index d1e53c99..5d32b9d4 100644 --- a/kpovmodeler/pmcommand.h +++ b/kpovmodeler/pmcommand.h @@ -42,8 +42,8 @@ class PMPart; * PMCRemove: An object was removed. A signal with this constant has * to be emitted _before_ the object is removed. * - * PMCChildren: Some tqchildren are added or removed. Do not use. Use PMCAdd and - * PMCRemove for all tqchildrens. + * PMCChildren: Some children are added or removed. Do not use. Use PMCAdd and + * PMCRemove for all childrens. * * PMCData: Data (for dialog views) is changed * diff --git a/kpovmodeler/pmcomment.cpp b/kpovmodeler/pmcomment.cpp index 3f659682..b2256365 100644 --- a/kpovmodeler/pmcomment.cpp +++ b/kpovmodeler/pmcomment.cpp @@ -22,7 +22,7 @@ #include "pmcommentedit.h" #include "pmmemento.h" -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> PMDefinePropertyClass( PMComment, PMCommentProperty ); @@ -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/pmcommentedit.cpp b/kpovmodeler/pmcommentedit.cpp index 92cdbfa3..ff4247fe 100644 --- a/kpovmodeler/pmcommentedit.cpp +++ b/kpovmodeler/pmcommentedit.cpp @@ -19,7 +19,7 @@ #include "pmcommentedit.h" #include "pmcomment.h" -#include <tqlayout.h> +#include <layout.h> #include <tqmultilineedit.h> #include <kglobalsettings.h> 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..350180db 100644 --- a/kpovmodeler/pmcompositeobject.h +++ b/kpovmodeler/pmcompositeobject.h @@ -44,12 +44,12 @@ public: */ PMCompositeObject( const PMCompositeObject& o ); /** - * Deletes the object and all tqchildren. + * Deletes the object and all children. */ 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 @@ -96,7 +96,7 @@ public: */ virtual bool appendChild( PMObject* ); /** - * Returns the number of tqchildren. + * Returns the number of children. */ virtual int countChildren( ) const; /** 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/pmconeedit.cpp b/kpovmodeler/pmconeedit.cpp index 75a07855..401c7a4f 100644 --- a/kpovmodeler/pmconeedit.cpp +++ b/kpovmodeler/pmconeedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> #include <tqcheckbox.h> @@ -36,7 +36,7 @@ void PMConeEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; TQGridLayout* gl; m_pEnd1 = new PMVectorEdit( "x", "y", "z", this ); @@ -51,13 +51,13 @@ void PMConeEdit::createTopWidgets( ) gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 ); gl->addWidget( m_pEnd2, 1, 1 ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - gl = new TQGridLayout( tqlayout, 2, 2 ); + layout = new TQHBoxLayout( topLayout( ) ); + gl = new TQGridLayout( layout, 2, 2 ); gl->addWidget( new TQLabel( i18n( "Radius 1:" ), this ), 0, 0 ); gl->addWidget( m_pRadius1, 0, 1 ); gl->addWidget( new TQLabel( i18n( "Radius 2:" ), this ), 1, 0 ); gl->addWidget( m_pRadius2, 1, 1 ); - tqlayout->addStretch( 1 ); + layout->addStretch( 1 ); topLayout( )->addWidget( m_pOpen ); 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/pmcsgedit.cpp b/kpovmodeler/pmcsgedit.cpp index 014eb09b..3ec36a84 100644 --- a/kpovmodeler/pmcsgedit.cpp +++ b/kpovmodeler/pmcsgedit.cpp @@ -19,7 +19,7 @@ #include "pmcsgedit.h" #include "pmcsg.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <klocale.h> @@ -34,17 +34,17 @@ void PMCSGEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; m_pTypeCombo = new TQComboBox( false, this ); m_pTypeCombo->insertItem( i18n( "Union" ) ); m_pTypeCombo->insertItem( i18n( "Intersection" ) ); m_pTypeCombo->insertItem( i18n( "Difference" ) ); m_pTypeCombo->insertItem( i18n( "Merge" ) ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( new TQLabel( i18n( "Type:" ), this ) ); - tqlayout->addWidget( m_pTypeCombo ); - tqlayout->addStretch( 1 ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( new TQLabel( i18n( "Type:" ), this ) ); + layout->addWidget( m_pTypeCombo ); + layout->addStretch( 1 ); connect( m_pTypeCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotTypeSelected( int ) ) ); } 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/pmcylinderedit.cpp b/kpovmodeler/pmcylinderedit.cpp index b8741ae7..33da88fa 100644 --- a/kpovmodeler/pmcylinderedit.cpp +++ b/kpovmodeler/pmcylinderedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> #include <tqcheckbox.h> @@ -36,7 +36,7 @@ void PMCylinderEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; TQGridLayout* gl; m_pEnd1 = new PMVectorEdit( "x", "y", "z", this ); @@ -50,13 +50,13 @@ void PMCylinderEdit::createTopWidgets( ) gl->addWidget( new TQLabel( i18n( "End 2:" ), this ), 1, 0 ); gl->addWidget( m_pEnd2, 1, 1 ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( new TQLabel( i18n( "Radius:" ), this ) ); - tqlayout->addWidget( m_pRadius ); - tqlayout->addStretch( 1 ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( new TQLabel( i18n( "Radius:" ), this ) ); + layout->addWidget( m_pRadius ); + layout->addStretch( 1 ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( m_pOpen ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( m_pOpen ); connect( m_pEnd1, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); connect( m_pEnd2, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); diff --git a/kpovmodeler/pmdatachangecommand.cpp b/kpovmodeler/pmdatachangecommand.cpp index 4188d253..99ac75d3 100644 --- a/kpovmodeler/pmdatachangecommand.cpp +++ b/kpovmodeler/pmdatachangecommand.cpp @@ -28,7 +28,7 @@ PMDataChangeCommand::PMDataChangeCommand( PMMemento* memento ) TQString text = memento->originator( )->name( ); if( text.isEmpty( ) ) text = memento->originator( )->description( ); - setText( i18n( "Change %1" ).tqarg( text ) ); + setText( i18n( "Change %1" ).arg( text ) ); // the data is already changed when the command is created m_executed = true; diff --git a/kpovmodeler/pmdeclare.cpp b/kpovmodeler/pmdeclare.cpp index 089447bc..3f290e2f 100644 --- a/kpovmodeler/pmdeclare.cpp +++ b/kpovmodeler/pmdeclare.cpp @@ -44,14 +44,14 @@ PMDeclare::PMDeclare( const PMDeclare& d ) { m_id = d.m_id; // CAUTION! Duplication of the id which has to be unique m_pDeclareType = 0; // will be set automatically in the - // base constuctor when the tqchildren are copied + // base constuctor when the children 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/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp index 60446a53..7cf96d12 100644 --- a/kpovmodeler/pmdeclareedit.cpp +++ b/kpovmodeler/pmdeclareedit.cpp @@ -23,10 +23,10 @@ #include "pmscanner.h" #include "pmobjectselect.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqlabel.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqpushbutton.h> #include <tqlistbox.h> @@ -44,13 +44,13 @@ void PMDeclareEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) ); + TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) ); m_pNameEdit = new TQLineEdit( this ); m_pNameEdit->setMaxLength( 40 ); TQLabel* label = new TQLabel( i18n( "Identifier:" ), this ); - tqlayout->addWidget( label ); - tqlayout->addWidget( m_pNameEdit ); + layout->addWidget( label ); + layout->addWidget( m_pNameEdit ); connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotNameChanged( const TQString& ) ) ); @@ -67,13 +67,13 @@ void PMDeclareEdit::createBottomWidgets( ) TQT_SLOT( slotItemSelected( TQListBoxItem* ) ) ); topLayout( )->addWidget( m_pLinkedObjects, 1 ); - TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) ); + TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) ); m_pSelectButton = new TQPushButton( i18n( "Select..." ), this ); m_pSelectButton->setEnabled( false ); connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelect( ) ) ); - tqlayout->addStretch( ); - tqlayout->addWidget( m_pSelectButton ); + layout->addStretch( ); + layout->addWidget( m_pSelectButton ); Base::createBottomWidgets( ); } diff --git a/kpovmodeler/pmdeletecommand.cpp b/kpovmodeler/pmdeletecommand.cpp index 1afb81fa..2a8650f1 100644 --- a/kpovmodeler/pmdeletecommand.cpp +++ b/kpovmodeler/pmdeletecommand.cpp @@ -27,7 +27,7 @@ #include <tqptrdict.h> PMDeleteCommand::PMDeleteCommand( PMObject* obj ) - : PMCommand( i18n( "Delete %1" ).tqarg( obj->name( ) ) ) + : PMCommand( i18n( "Delete %1" ).arg( obj->name( ) ) ) { // the scene can not be deleted! if( obj->parent( ) ) @@ -256,7 +256,7 @@ int PMDeleteCommand::errorFlags( PMPart* ) { m_errors.prepend( i18n( "The declare \"%1\" can't be removed " "because of some remaining links." ) - .tqarg( decl->id( ) ) ); + .arg( decl->id( ) ) ); PMDeleteInfo* tmp = info; info = m_infoList.prev( ); 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/pmdensityedit.cpp b/kpovmodeler/pmdensityedit.cpp index 407a4f80..cb36fd67 100644 --- a/kpovmodeler/pmdensityedit.cpp +++ b/kpovmodeler/pmdensityedit.cpp @@ -20,7 +20,7 @@ #include "pmdensity.h" #include "pmlinkedit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> 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/pmdetailobjectedit.cpp b/kpovmodeler/pmdetailobjectedit.cpp index 09b53cbd..6baacac2 100644 --- a/kpovmodeler/pmdetailobjectedit.cpp +++ b/kpovmodeler/pmdetailobjectedit.cpp @@ -17,7 +17,7 @@ #include "pmdetailobjectedit.h" #include "pmdetailobject.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <tqcombobox.h> @@ -33,7 +33,7 @@ void PMDetailObjectEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) ); + TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) ); m_pGlobalDetail = new TQCheckBox( i18n( "Global detail" ), this ); m_pLocalDetailLevelLabel = new TQLabel( i18n( "Detail level:" ), this ); m_pLocalDetailLevel = new TQComboBox( this ); @@ -43,10 +43,10 @@ void PMDetailObjectEdit::createTopWidgets( ) m_pLocalDetailLevel->insertItem( i18n( "High" ) ); m_pLocalDetailLevel->insertItem( i18n( "Very High" ) ); - tqlayout->addWidget( m_pGlobalDetail ); - tqlayout->addWidget( m_pLocalDetailLevelLabel ); - tqlayout->addWidget( m_pLocalDetailLevel ); - tqlayout->addStretch( ); + layout->addWidget( m_pGlobalDetail ); + layout->addWidget( m_pLocalDetailLevelLabel ); + layout->addWidget( m_pLocalDetailLevel ); + layout->addStretch( ); connect( m_pGlobalDetail, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotGlobalDetailClicked( ) ) ); connect( m_pLocalDetailLevel, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( dataChanged( ) ) ); diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp index 9b575fd8..c84982bf 100644 --- a/kpovmodeler/pmdialogeditbase.cpp +++ b/kpovmodeler/pmdialogeditbase.cpp @@ -18,7 +18,7 @@ #include "pmdialogeditbase.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqpushbutton.h> #include <tqlabel.h> @@ -451,17 +451,17 @@ void PMDialogEditBase::slotTexturePreview( ) str << "union {\n"; if( s_showBox ) { - str << c_boxCode.tqarg( numObjects ); + str << c_boxCode.arg( numObjects ); numObjects++; } if( s_showCylinder ) { - str << c_cylinderCode.tqarg( numObjects ); + str << c_cylinderCode.arg( numObjects ); numObjects++; } if( s_showSphere ) { - str << c_sphereCode.tqarg( numObjects ); + str << c_sphereCode.arg( numObjects ); numObjects++; } @@ -495,18 +495,18 @@ void PMDialogEditBase::slotTexturePreview( ) { c1 = PMColor( s_wallColor1 ); c2 = PMColor( s_wallColor2 ); - str << c_wallCode.tqarg( c1.serialize( true ) ).tqarg( c2.serialize( true ) ); + str << c_wallCode.arg( c1.serialize( true ) ).arg( c2.serialize( true ) ); } if( s_showFloor ) { c1 = PMColor( s_floorColor1 ); c2 = PMColor( s_floorColor2 ); - str << c_floorCode.tqarg( c1.serialize( true ) ).tqarg( c2.serialize( true ) ); + str << c_floorCode.arg( c1.serialize( true ) ).arg( c2.serialize( true ) ); } str << c_lightCode; str << c_cameraCode[numObjects-1]; - str << c_globalSettingsCode.tqarg( s_previewGamma ); + str << c_globalSettingsCode.arg( s_previewGamma ); // Set the render mode mode.setHeight( s_previewSize ); @@ -519,7 +519,7 @@ void PMDialogEditBase::slotTexturePreview( ) m_pRenderFrame->setFixedSize( s_previewSize + m_pRenderFrame->frameWidth( ) * 2, s_previewSize + m_pRenderFrame->frameWidth( ) * 2 ); m_pRenderFrame->updateGeometry( ); - m_pTexturePreviewWidget->tqlayout( )->activate( ); + m_pTexturePreviewWidget->layout( )->activate( ); emit sizeChanged( ); m_pOutputWidget->slotClear( ); m_pRenderWidget->render( scene, mode, m_pPart->url( ) ); @@ -540,7 +540,7 @@ void PMDialogEditBase::slotPreviewFinished( int exitStatus ) KMessageBox::error( this, i18n( "Povray exited abnormally with " "exit code %1.\n" "See the povray output for details." ) - .tqarg( exitStatus ) ); + .arg( exitStatus ) ); } else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) ) { diff --git a/kpovmodeler/pmdialogeditbase.h b/kpovmodeler/pmdialogeditbase.h index 77c37409..e2ae701a 100644 --- a/kpovmodeler/pmdialogeditbase.h +++ b/kpovmodeler/pmdialogeditbase.h @@ -42,7 +42,7 @@ class PMPovrayOutputWidget; /** * Base class for all widgets for editing object attributes. * - * Ensures a consistent tqlayout for all widgets. Widgets should not + * Ensures a consistent layout for all widgets. Widgets should not * created within the constructor, but with the functions @ref createTopWidgets * and @ref createBottomWidgets. * @@ -276,7 +276,7 @@ protected: * of the sub class. * * First call the function of the base class, then create and append - * the widgets to the top tqlayout. + * the widgets to the top layout. */ virtual void createTopWidgets( ) { }; @@ -284,7 +284,7 @@ protected: * Create widgets here, that should be placed under the widgets * of the sub class. * - * First create and append the widgets to the top tqlayout, then + * First create and append the widgets to the top layout, then * call the function of the base class */ virtual void createBottomWidgets( ); @@ -296,7 +296,7 @@ protected: virtual void saveContents( ); /** - * Returns a pointer to the top tqlayout + * Returns a pointer to the top layout */ TQBoxLayout* topLayout( ) const { return m_pTopLayout; } diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp index 0a7f372e..caab8731 100644 --- a/kpovmodeler/pmdialogview.cpp +++ b/kpovmodeler/pmdialogview.cpp @@ -33,7 +33,7 @@ #include <krun.h> #include <kstdguiitem.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqgroupbox.h> #include <tqscrollview.h> @@ -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 ); @@ -314,10 +314,10 @@ void PMDialogView::slotDataChanged( ) void PMDialogView::slotSizeChanged( ) { - // force recalculating of the tqlayout + // force recalculating of the layout if( m_pDisplayedWidget ) - if( m_pDisplayedWidget->tqlayout( ) ) - m_pDisplayedWidget->tqlayout( )->activate( ); + if( m_pDisplayedWidget->layout( ) ) + m_pDisplayedWidget->layout( )->activate( ); m_pHelper->calculateSize( ); } 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/pmdiscedit.cpp b/kpovmodeler/pmdiscedit.cpp index e960f869..b7e0028a 100644 --- a/kpovmodeler/pmdiscedit.cpp +++ b/kpovmodeler/pmdiscedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <klocale.h> @@ -37,7 +37,7 @@ void PMDiscEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; TQGridLayout* gl; m_pCenter = new PMVectorEdit( "x", "y", "z", this ); @@ -53,18 +53,18 @@ void PMDiscEdit::createTopWidgets( ) gl->addWidget( new TQLabel( i18n( "Normal:" ), this ), 1, 0 ); gl->addWidget( m_pNormal, 1, 1 ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - gl = new TQGridLayout( tqlayout, 2, 2 ); + layout = new TQHBoxLayout( topLayout( ) ); + gl = new TQGridLayout( layout, 2, 2 ); gl->addWidget( new TQLabel( i18n( "Radius:" ), this ), 0, 0 ); gl->addWidget( m_pRadius, 0, 1 ); gl->addWidget( new TQLabel( i18n( "Hole radius:" ), this ), 1, 0 ); gl->addWidget( m_pHRadius, 1, 1 ); - tqlayout->addStretch( 1 ); + layout->addStretch( 1 ); TQPushButton* nb = new TQPushButton( i18n( "Normalize" ), this ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( nb ); - tqlayout->addStretch( 1 ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( nb ); + layout->addStretch( 1 ); connect( m_pCenter, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index 87fc37ef..8a691d1f 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -20,7 +20,7 @@ #include "pmdockwidget_private.h" #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpainter.h> #include <tqobjectlist.h> #include <tqstrlist.h> @@ -154,7 +154,7 @@ PMDockMainWindow::~PMDockMainWindow() // kparts/dockmainwindow stuff void PMDockMainWindow::createGUI( Part * part ) { - kdDebug(1000) << TQString("DockMainWindow::createGUI for %1").tqarg(part?part->name():"0L") << endl; + kdDebug(1000) << TQString("DockMainWindow::createGUI for %1").arg(part?part->name():"0L") << endl; KXMLGUIFactory *factory = guiFactory(); @@ -164,7 +164,7 @@ void PMDockMainWindow::createGUI( Part * part ) if ( d->m_activePart ) { - kdDebug(1000) << TQString("deactivating GUI for %1").tqarg(d->m_activePart->name()) << endl; + kdDebug(1000) << TQString("deactivating GUI for %1").arg(d->m_activePart->name()) << endl; GUIActivateEvent ev( false ); TQApplication::sendEvent( d->m_activePart, &ev ); @@ -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(); } @@ -350,8 +350,8 @@ PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* parent, co PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name ) :PMDockWidgetAbstractHeader( parent, name ) { - tqlayout = new TQHBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + layout = new TQHBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); drag = new PMDockWidgetHeaderDrag( this, parent ); @@ -386,13 +386,13 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name ) toDesktopButton->setFixedSize(buttonWidth,buttonHeight); connect( toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop())); - tqlayout->addWidget( drag ); - tqlayout->addWidget( dockbackButton ); - tqlayout->addWidget( toDesktopButton ); - tqlayout->addWidget( stayButton ); - tqlayout->addWidget( closeButton ); - tqlayout->activate(); - drag->setFixedHeight( tqlayout->tqminimumSize().height() ); + layout->addWidget( drag ); + layout->addWidget( dockbackButton ); + layout->addWidget( toDesktopButton ); + layout->addWidget( stayButton ); + layout->addWidget( closeButton ); + layout->activate(); + drag->setFixedHeight( layout->minimumSize().height() ); } void PMDockWidgetHeader::setTopLevel( bool isTopLevel ) @@ -415,7 +415,7 @@ void PMDockWidgetHeader::setTopLevel( bool isTopLevel ) closeButton->show(); toDesktopButton->show(); } - tqlayout->activate(); + layout->activate(); updateGeometry(); } @@ -423,20 +423,20 @@ void PMDockWidgetHeader::setDragPanel( PMDockWidgetHeaderDrag* nd ) { if ( !nd ) return; - delete tqlayout; - tqlayout = new TQHBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + delete layout; + layout = new TQHBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); delete drag; drag = nd; - tqlayout->addWidget( drag ); - tqlayout->addWidget( dockbackButton ); - tqlayout->addWidget( toDesktopButton ); - tqlayout->addWidget( stayButton ); - tqlayout->addWidget( closeButton ); - tqlayout->activate(); - drag->setFixedHeight( tqlayout->tqminimumSize().height() ); + layout->addWidget( drag ); + layout->addWidget( dockbackButton ); + layout->addWidget( toDesktopButton ); + layout->addWidget( stayButton ); + layout->addWidget( closeButton ); + layout->activate(); + drag->setFixedHeight( layout->minimumSize().height() ); } void PMDockWidgetHeader::slotStayClicked() @@ -459,12 +459,12 @@ void PMDockWidgetHeader::setDragEnabled(bool b) #ifndef NO_KDE2 void PMDockWidgetHeader::saveConfig( KConfig* c ) { - c->writeEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), stayButton->isOn() ); + c->writeEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), stayButton->isOn() ); } void PMDockWidgetHeader::loadConfig( KConfig* c ) { - setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), false ) ); + setDragEnabled( !c->readBoolEntry( TQString("%1%2").arg(parent()->name()).arg(":stayButton"), false ) ); } #endif @@ -481,8 +481,8 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const d->_parent = parent; - tqlayout = new TQVBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + layout = new TQVBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; manager->childDock->append( TQT_TQOBJECT(this) ); @@ -538,15 +538,15 @@ void PMDockWidget::setHeader( PMDockWidgetAbstractHeader* h ) if ( header ){ delete header; - delete tqlayout; + delete layout; header = h; - tqlayout = new TQVBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); - tqlayout->addWidget( header ); + layout = new TQVBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); + layout->addWidget( header ); setWidget( widget ); } else { header = h; - tqlayout->addWidget( header ); + layout->addWidget( header ); } } @@ -584,7 +584,7 @@ void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) } if ( s == manager->main ){ - setGeometry( TQRect(TQPoint(0,0), manager->main->tqgeometry().size()) ); + setGeometry( TQRect(TQPoint(0,0), manager->main->geometry().size()) ); } if ( !s ) @@ -777,7 +777,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP // MODIFICATION (Zehender): // If DockPosition is DockLeft or DockRight, add the widget // left or right of the target, so that a new vertical splitter - // (a splitter with horizontal widget tqlayout :-) is created + // (a splitter with horizontal widget layout :-) is created // that spawns the full height of the main view if( ( dockPos == PMDockWidget::DockLeft ) || @@ -829,7 +829,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP if ( !parentDock ){ // dock to a toplevel dockwidget means newDock is toplevel now newDock->move( target->frameGeometry().topLeft() ); - newDock->resize( target->tqgeometry().size() ); + newDock->resize( target->geometry().size() ); if ( target->isVisibleToTLW() ) newDock->show(); } @@ -1086,13 +1086,13 @@ void PMDockWidget::setWidget( TQWidget* mw ) } widget = mw; - delete tqlayout; + delete layout; - tqlayout = new TQVBoxLayout( this ); - tqlayout->setResizeMode( TQLayout::Minimum ); + layout = new TQVBoxLayout( this ); + layout->setResizeMode( TQLayout::Minimum ); - tqlayout->addWidget( header ); - tqlayout->addWidget( widget,1 ); + layout->addWidget( header ); + layout->addWidget( widget,1 ); } void PMDockWidget::setDockTabName( PMDockTabGroup* tab ) @@ -1110,7 +1110,7 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab ) tab->parentWidget()->setName( listOfName.utf8() ); tab->parentWidget()->setCaption( listOfCaption ); - tab->parentWidget()->tqrepaint( false ); // PMDockWidget->tqrepaint + tab->parentWidget()->repaint( false ); // PMDockWidget->repaint if ( tab->parentWidget()->parent() ) if ( tab->parentWidget()->parent()->inherits("PMDockSplitter") ) ((PMDockSplitter*)(tab->parentWidget()->parent()))->updateName(); @@ -1168,13 +1168,13 @@ void PMDockWidget::loseFormerBrotherDockWidget() TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), this, TQT_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; - tqrepaint(); + repaint(); } void PMDockWidget::dockBack() { if( formerBrotherDockWidget) { - // search all tqchildren if it tries to dock back to a child + // search all children if it tries to dock back to a child bool found = false; TQObjectList* cl = queryList("PMDockWidget"); TQObjectListIt it( *cl ); @@ -1316,21 +1316,21 @@ void PMDockManager::activate() bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) { /* This doesn't seem to fullfill any sense, other than breaking - TQMainWindow's tqlayout all over the place + TQMainWindow's layout all over the place The first child of the mainwindow is not necessarily a meaningful content widget but in TQt3's TQMainWindow it can easily be a TQToolBar. - In short: TQMainWindow knows how to tqlayout its tqchildren, no need to + In short: TQMainWindow knows how to layout its children, no need to mess that up. >>>>>I need this in the PMDockArea at the moment (JoWenn) - if ( obj == main && event->type() == TQEvent::Resize && dynamic_cast<PMDockArea*>(main) && main->tqchildren() ){ + if ( obj == main && event->type() == TQEvent::Resize && dynamic_cast<PMDockArea*>(main) && main->children() ){ #ifndef NO_KDE2 - kdDebug()<<"PMDockManager::eventFilter(): main is a PMDockArea and there are tqchildren"<<endl; + kdDebug()<<"PMDockManager::eventFilter(): main is a PMDockArea and there are children"<<endl; #endif - TQWidget* fc = (TQWidget*)main->tqchildren()->getFirst(); + TQWidget* fc = (TQWidget*)main->children()->getFirst(); if ( fc ) - fc->setGeometry( TQRect(TQPoint(0,0), main->tqgeometry().size()) ); + fc->setGeometry( TQRect(TQPoint(0,0), main->geometry().size()) ); } */ @@ -1356,7 +1356,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) findChildDockWidget( curdw, *childDockWidgetList ); d->oldDragRect = TQRect(); - d->dragRect = TQRect(curdw->tqgeometry()); + d->dragRect = TQRect(curdw->geometry()); TQPoint p = curdw->mapToGlobal(TQPoint(0,0)); d->dragRect.moveTopLeft(p); drawDragRectangle(); @@ -1377,7 +1377,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) if (d->readyToDrag) { d->readyToDrag = false; d->oldDragRect = TQRect(); - d->dragRect = TQRect(curdw->tqgeometry()); + d->dragRect = TQRect(curdw->geometry()); TQPoint p = curdw->mapToGlobal(TQPoint(0,0)); d->dragRect.moveTopLeft(p); drawDragRectangle(); @@ -1398,7 +1398,7 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event ) break; } else { if (dropCancel && curdw) { - d->dragRect = TQRect(curdw->tqgeometry()); + d->dragRect = TQRect(curdw->geometry()); TQPoint p = curdw->mapToGlobal(TQPoint(0,0)); d->dragRect.moveTopLeft(p); }else @@ -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) ); @@ -1511,7 +1511,7 @@ void PMDockManager::findChildDockWidget( TQWidget*& ww, const TQWidget* p, const while ( it.current() ) { if ( it.current()->isWidgetType() ) { w = (TQWidget*)it.current(); - if ( w->isVisible() && w->tqgeometry().contains(pos) ) { + if ( w->isVisible() && w->geometry().contains(pos) ) { if ( w->inherits("PMDockWidget") ) ww = w; findChildDockWidget( ww, w, w->mapFromParent(pos) ); return; @@ -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; } @@ -1811,7 +1811,7 @@ void PMDockManager::writeConfig(TQDomElement &base) PMDockWidget *obj = getDockWidgetFromName( nList.current() ); if (obj->isGroup && (nameList.find( obj->firstName.latin1() ) == -1 || nameList.find(obj->lastName.latin1()) == -1)) { - // Skip until tqchildren are saved (why?) + // Skip until children are saved (why?) nList.next(); if ( !nList.current() ) nList.first(); continue; @@ -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()))); @@ -2039,7 +2039,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) c->writeEntry( cname+":type", "GROUP"); if ( !obj->parent() ){ c->writeEntry( cname+":parent", "___null___"); - c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); + c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); } else { c->writeEntry( cname+":parent", "yes"); @@ -2070,7 +2070,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) c->writeEntry( cname+":type", "TAB_GROUP"); if ( !obj->parent() ){ c->writeEntry( cname+":parent", "___null___"); - c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); + c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); } else { c->writeEntry( cname+":parent", "yes"); @@ -2090,7 +2090,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) /*************************************************************************************************/ if ( !obj->parent() ){ c->writeEntry( cname+":type", "NULL_DOCK"); - c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); + c->writeEntry( cname+":geometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); } else { c->writeEntry( cname+":type", "DOCK"); @@ -2200,7 +2200,7 @@ void PMDockManager::readConfig( KConfig* c, TQString group ) } if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){ - TQRect r = c->readRectEntry( oname + ":tqgeometry" ); + TQRect r = c->readRectEntry( oname + ":geometry" ); obj = getDockWidgetFromName( oname ); obj->applyToWidget( 0L ); obj->setGeometry(r); @@ -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 ); } @@ -2481,11 +2481,11 @@ void PMDockArea::resizeEvent(TQResizeEvent *rsize) delete list; #if 0 PMDockSplitter *split; -// for (unsigned int i=0;i<tqchildren()->count();i++) +// for (unsigned int i=0;i<children()->count();i++) { -// TQPtrList<TQObject> list(tqchildren()); -// TQObject *obj=((TQPtrList<TQObject*>)tqchildren())->at(i); - TQObject *obj=tqchildren()->getFirst(); +// TQPtrList<TQObject> list(children()); +// TQObject *obj=((TQPtrList<TQObject*>)children())->at(i); + TQObject *obj=children()->getFirst(); if (split=dynamic_cast<PMDockSplitter*>(obj)) { split->setGeometry( TQRect(TQPoint(0,0), size() )); diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h index 93a323ca..ce7c7aa1 100644 --- a/kpovmodeler/pmdockwidget.h +++ b/kpovmodeler/pmdockwidget.h @@ -305,9 +305,9 @@ protected slots: protected: /** - * A tqlayout manager for placing the embedded buttons (close and stay) + * A layout manager for placing the embedded buttons (close and stay) */ - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; /** * a little button for closing (undocking and hiding) the dockwidget @@ -773,9 +773,9 @@ private: TQWidget* widget; /** - * the tqlayout manager that takes care about proper resizing and moving the embedded widget and the header + * the layout manager that takes care about proper resizing and moving the embedded widget and the header */ - TQVBoxLayout* tqlayout; + TQVBoxLayout* layout; /** * the responsible dockmanager @@ -855,7 +855,7 @@ public: #ifndef NO_KDE2 /** * Saves the current state of the dockmanager and of all controlled widgets. - * State means here to save the tqgeometry, visibility, parents, internal object names, orientation, + * State means here to save the geometry, visibility, parents, internal object names, orientation, * separator positions, dockwidget-group information, tab widget states (if it is a tab group) and * last but not least some necessary things for recovering the dockmainwindow state. * @@ -872,7 +872,7 @@ public: * (TQObject::name) in the childDock variable of * PMDockManager. This list in turn contains all * PMDockWidgets (according to the PMDockWidget constructor). - * So in principle, in order to restore a window tqlayout, + * So in principle, in order to restore a window layout, * one must first construct all widgets, put each of them in a * PMDockWidget and then call readConfig(). And for all that * to work, each widget must have a unique name. @@ -884,11 +884,11 @@ public: #endif /** - * Saves the current dock window tqlayout into a DOM tree below the given element. + * Saves the current dock window layout into a DOM tree below the given element. */ void writeConfig(TQDomElement &base); /** - * Reads the current dock window tqlayout from a DOM tree below the given element. + * Reads the current dock window layout from a DOM tree below the given element. */ void readConfig(TQDomElement &base); @@ -1224,7 +1224,7 @@ public: /** * Constructs a dockmainwindow. It calls its base class constructor and does additional things concerning * to the dock stuff: - * @li information about the dock state of this' tqchildren gets initialized + * @li information about the dock state of this' children gets initialized * @li a dockmanager is created... * @li ...and gets initialized * @li the main dockwidget is set to 0 @@ -1274,11 +1274,11 @@ public: PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " "); /** - * Saves the current dock window tqlayout into a DOM tree below the given element. + * Saves the current dock window layout into a DOM tree below the given element. */ void writeDockConfig(TQDomElement &base); /** - * Reads the current dock window tqlayout from a DOM tree below the given element. + * Reads the current dock window layout from a DOM tree below the given element. */ void readDockConfig(TQDomElement &base); diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp index 9c97888f..a7f45e50 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; } } @@ -183,7 +183,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e) } else { xpos = factor * checkValue( mapFromGlobal(mev->globalPos()).y() ) / height(); resizeEvent(0); - divider->tqrepaint(true); + divider->repaint(true); } } else { if (!mOpaqueResize) { @@ -192,7 +192,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e) } else { xpos = factor * checkValue( mapFromGlobal( mev->globalPos()).x() ) / width(); resizeEvent(0); - divider->tqrepaint(true); + divider->repaint(true); } } handled= true; @@ -204,11 +204,11 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e) if (orientation ==Qt::Horizontal){ xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).y() ) / height(); resizeEvent(0); - divider->tqrepaint(true); + divider->repaint(true); } else { xpos = factor* checkValue( mapFromGlobal(mev->globalPos()).x() ) / width(); resizeEvent(0); - divider->tqrepaint(true); + divider->repaint(true); } handled= true; break; @@ -221,7 +221,7 @@ bool PMDockSplitter::eventFilter(TQObject *o, TQEvent *e) bool PMDockSplitter::event( TQEvent* e ) { if ( e->type() == TQEvent::LayoutHint ){ - // change tqchildren min/max size + // change children min/max size setupMinMaxSize(); setSeparatorPos(xpos); } @@ -240,7 +240,7 @@ void PMDockSplitter::updateName() TQString new_name = TQString( child0->name() ) + "," + child1->name(); parentWidget()->setName( new_name.latin1() ); parentWidget()->setCaption( child0->caption() + "," + child1->caption() ); - parentWidget()->tqrepaint( false ); + parentWidget()->repaint( false ); ((PMDockWidget*)parentWidget())->firstName = child0->name(); ((PMDockWidget*)parentWidget())->lastName = child1->name(); @@ -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 ); @@ -328,13 +328,13 @@ void PMDockButton_Private::drawButton( TQPainter* p ) void PMDockButton_Private::enterEvent( TQEvent * ) { moveMouse = true; - tqrepaint(); + repaint(); } void PMDockButton_Private::leaveEvent( TQEvent * ) { moveMouse = false; - tqrepaint(); + repaint(); } /*************************************************************************/ diff --git a/kpovmodeler/pmerrordialog.cpp b/kpovmodeler/pmerrordialog.cpp index eb920fb0..b8cbf043 100644 --- a/kpovmodeler/pmerrordialog.cpp +++ b/kpovmodeler/pmerrordialog.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <tqlabel.h> -#include <tqtextedit.h> +#include <textedit.h> #include <kconfig.h> 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/pmfinishedit.cpp b/kpovmodeler/pmfinishedit.cpp index e3513a5d..6f0743e9 100644 --- a/kpovmodeler/pmfinishedit.cpp +++ b/kpovmodeler/pmfinishedit.cpp @@ -22,7 +22,7 @@ #include "pmcoloredit.h" #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <klocale.h> @@ -42,80 +42,80 @@ void PMFinishEdit::createTopWidgets( ) Base::createTopWidgets( ); hl = new TQHBoxLayout( topLayout( ) ); - TQGridLayout* tqlayout = new TQGridLayout( hl, 2, 2 ); + TQGridLayout* layout = new TQGridLayout( hl, 2, 2 ); m_pEnableAmbientEdit = new TQCheckBox( i18n( "Ambient color" ), this ); m_pAmbientColorLabel = new TQLabel( i18n( "Color:" ), this ); m_pAmbientColorEdit = new PMColorEdit( true, this ); - tqlayout->addMultiCellWidget( m_pEnableAmbientEdit, 0, 0, 0, 1 ); - tqlayout->addWidget( m_pAmbientColorLabel, 1, 0, AlignTop ); - tqlayout->addWidget( m_pAmbientColorEdit, 1, 1 ); + layout->addMultiCellWidget( m_pEnableAmbientEdit, 0, 0, 0, 1 ); + layout->addWidget( m_pAmbientColorLabel, 1, 0, AlignTop ); + layout->addWidget( m_pAmbientColorEdit, 1, 1 ); hl->addStretch( 1 ); hl = new TQHBoxLayout( topLayout( ) ); - tqlayout = new TQGridLayout( hl, 4, 2 ); + layout = new TQGridLayout( hl, 4, 2 ); m_pEnableDiffuseEdit = new TQCheckBox( i18n( "Diffuse:" ), this ); m_pDiffuseEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pEnableDiffuseEdit, 0, 0 ); - tqlayout->addWidget( m_pDiffuseEdit, 0, 1 ); + layout->addWidget( m_pEnableDiffuseEdit, 0, 0 ); + layout->addWidget( m_pDiffuseEdit, 0, 1 ); m_pEnableBrillianceEdit = new TQCheckBox( i18n( "Brilliance:" ), this ); m_pBrillianceEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pEnableBrillianceEdit, 1, 0 ); - tqlayout->addWidget( m_pBrillianceEdit, 1, 1 ); + layout->addWidget( m_pEnableBrillianceEdit, 1, 0 ); + layout->addWidget( m_pBrillianceEdit, 1, 1 ); m_pEnableCrandEdit = new TQCheckBox( i18n( "Crand:" ), this ); m_pCrandEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pEnableCrandEdit, 2, 0 ); - tqlayout->addWidget( m_pCrandEdit, 2, 1 ); + layout->addWidget( m_pEnableCrandEdit, 2, 0 ); + layout->addWidget( m_pCrandEdit, 2, 1 ); m_pConserveEnergyEdit = new TQCheckBox( i18n( "Conserve energy for reflection" ), this ); - tqlayout->addMultiCellWidget( m_pConserveEnergyEdit, 3, 3, 0, 1 ); + layout->addMultiCellWidget( m_pConserveEnergyEdit, 3, 3, 0, 1 ); hl->addStretch( 1 ); hl = new TQHBoxLayout( topLayout( ) ); - tqlayout = new TQGridLayout( hl, 2, 2 ); + layout = new TQGridLayout( hl, 2, 2 ); m_pEnablePhongEdit = new TQCheckBox( i18n( "Phong:" ), this ); m_pPhongEdit = new PMFloatEdit( this ); m_pEnablePhongSizeEdit = new TQCheckBox( i18n( "Phong size:" ), this ); m_pPhongSizeEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pEnablePhongEdit, 0, 0 ); - tqlayout->addWidget( m_pPhongEdit, 0, 1 ); - tqlayout->addWidget( m_pEnablePhongSizeEdit, 1, 0 ); - tqlayout->addWidget( m_pPhongSizeEdit, 1, 1 ); + layout->addWidget( m_pEnablePhongEdit, 0, 0 ); + layout->addWidget( m_pPhongEdit, 0, 1 ); + layout->addWidget( m_pEnablePhongSizeEdit, 1, 0 ); + layout->addWidget( m_pPhongSizeEdit, 1, 1 ); hl->addStretch( 1 ); hl = new TQHBoxLayout( topLayout( ) ); - tqlayout = new TQGridLayout( hl, 3, 2 ); + layout = new TQGridLayout( hl, 3, 2 ); m_pEnableSpecularEdit = new TQCheckBox( i18n( "Specular:" ), this ); m_pSpecularEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pEnableSpecularEdit, 0, 0 ); - tqlayout->addWidget( m_pSpecularEdit, 0, 1 ); + layout->addWidget( m_pEnableSpecularEdit, 0, 0 ); + layout->addWidget( m_pSpecularEdit, 0, 1 ); m_pEnableRoughnessEdit = new TQCheckBox( i18n( "Roughness:" ), this ); m_pRoughnessEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pEnableRoughnessEdit, 1, 0 ); - tqlayout->addWidget( m_pRoughnessEdit, 1, 1 ); + layout->addWidget( m_pEnableRoughnessEdit, 1, 0 ); + layout->addWidget( m_pRoughnessEdit, 1, 1 ); m_pEnableMetallicEdit = new TQCheckBox( i18n( "Metallic:" ), this ); m_pMetallicEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pEnableMetallicEdit, 2, 0 ); - tqlayout->addWidget( m_pMetallicEdit, 2, 1 ); + layout->addWidget( m_pEnableMetallicEdit, 2, 0 ); + layout->addWidget( m_pMetallicEdit, 2, 1 ); hl->addStretch( 1 ); hl = new TQHBoxLayout( topLayout( ) ); - tqlayout = new TQGridLayout( hl, 6, 2 ); + layout = new TQGridLayout( hl, 6, 2 ); m_pIridEdit = new TQCheckBox( i18n( "Iridiscence" ), this ); - tqlayout->addMultiCellWidget( m_pIridEdit, 0, 0, 0, 1 ); + layout->addMultiCellWidget( m_pIridEdit, 0, 0, 0, 1 ); m_pIridAmountLabel = new TQLabel( i18n( "Amount:" ), this ); m_pIridAmountEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pIridAmountLabel, 1, 0 ); - tqlayout->addWidget( m_pIridAmountEdit, 1, 1 ); + layout->addWidget( m_pIridAmountLabel, 1, 0 ); + layout->addWidget( m_pIridAmountEdit, 1, 1 ); m_pIridThicknessLabel = new TQLabel( i18n( "Thickness:" ), this ); m_pIridThicknessEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pIridThicknessLabel, 2, 0 ); - tqlayout->addWidget( m_pIridThicknessEdit, 2, 1 ); + layout->addWidget( m_pIridThicknessLabel, 2, 0 ); + layout->addWidget( m_pIridThicknessEdit, 2, 1 ); m_pIridTurbulenceEdit = new PMFloatEdit( this ); m_pIridTurbulenceLabel = new TQLabel( i18n( "Turbulence:" ), this ); - tqlayout->addWidget( m_pIridTurbulenceLabel, 3, 0 ); - tqlayout->addWidget( m_pIridTurbulenceEdit, 3, 1 ); + layout->addWidget( m_pIridTurbulenceLabel, 3, 0 ); + layout->addWidget( m_pIridTurbulenceEdit, 3, 1 ); m_pEnableReflectionEdit = new TQCheckBox( i18n( "Reflection" ), this ); - tqlayout->addMultiCellWidget( m_pEnableReflectionEdit, 4, 4, 0, 1 ); + layout->addMultiCellWidget( m_pEnableReflectionEdit, 4, 4, 0, 1 ); hl->addStretch( 1 ); m_pReflectionWidget = new TQWidget( this ); @@ -151,7 +151,7 @@ void PMFinishEdit::createTopWidgets( ) gl->addWidget( m_pEnableRefMetallicEdit, 3, 0 ); gl->addWidget( m_pReflectionMetallicEdit, 3, 1 ); vl->addStretch( 1 ); - tqlayout->addMultiCellWidget( m_pReflectionWidget, 5, 5, 0, 1 ); + layout->addMultiCellWidget( m_pReflectionWidget, 5, 5, 0, 1 ); connect( m_pAmbientColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); 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/pmfogedit.cpp b/kpovmodeler/pmfogedit.cpp index ec9880c1..067bc9dd 100644 --- a/kpovmodeler/pmfogedit.cpp +++ b/kpovmodeler/pmfogedit.cpp @@ -22,7 +22,7 @@ #include "pmvectoredit.h" #include "pmcoloredit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> 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/pmglobalphotonsedit.cpp b/kpovmodeler/pmglobalphotonsedit.cpp index 5a4a5572..fff33e7f 100644 --- a/kpovmodeler/pmglobalphotonsedit.cpp +++ b/kpovmodeler/pmglobalphotonsedit.cpp @@ -20,7 +20,7 @@ #include "pmglobalphotons.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> 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/pmglobalsettingsedit.cpp b/kpovmodeler/pmglobalsettingsedit.cpp index 027152e6..6655fd73 100644 --- a/kpovmodeler/pmglobalsettingsedit.cpp +++ b/kpovmodeler/pmglobalsettingsedit.cpp @@ -21,7 +21,7 @@ #include "pmlineedits.h" #include "pmcoloredit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> @@ -74,26 +74,26 @@ void PMGlobalSettingsEdit::createTopWidgets( ) hl->addStretch( 1 ); hl = new TQHBoxLayout( topLayout( ) ); - TQGridLayout* tqlayout = new TQGridLayout( hl, 4, 2 ); + TQGridLayout* layout = new TQGridLayout( hl, 4, 2 ); lbl = new TQLabel( i18n( "Maximum intersections:" ), this ); m_pMaxIntersectionsEdit = new PMIntEdit( this ); - tqlayout->addWidget( lbl, 0, 0 ); - tqlayout->addWidget( m_pMaxIntersectionsEdit, 0, 1 ); + layout->addWidget( lbl, 0, 0 ); + layout->addWidget( m_pMaxIntersectionsEdit, 0, 1 ); lbl = new TQLabel( i18n( "Maximum trace level:" ), this ); m_pMaxTraceLevelEdit = new PMIntEdit( this ); - tqlayout->addWidget( lbl, 1, 0 ); - tqlayout->addWidget( m_pMaxTraceLevelEdit, 1, 1 ); + layout->addWidget( lbl, 1, 0 ); + layout->addWidget( m_pMaxTraceLevelEdit, 1, 1 ); lbl = new TQLabel( i18n( "Number of waves:" ), this ); m_pNumberWavesEdit = new PMIntEdit( this ); - tqlayout->addWidget( lbl, 2, 0 ); - tqlayout->addWidget( m_pNumberWavesEdit, 2, 1 ); + layout->addWidget( lbl, 2, 0 ); + layout->addWidget( m_pNumberWavesEdit, 2, 1 ); lbl = new TQLabel( i18n( "Noise generator:" ), this ); m_pNoiseGeneratorEdit = new TQComboBox( false, this ); m_pNoiseGeneratorEdit->insertItem( i18n( "Original" ) ); m_pNoiseGeneratorEdit->insertItem( i18n( "Range Corrected" ) ); m_pNoiseGeneratorEdit->insertItem( i18n( "Perlin" ) ); - tqlayout->addWidget( lbl, 3, 0 ); - tqlayout->addWidget( m_pNoiseGeneratorEdit, 3, 1 ); + layout->addWidget( lbl, 3, 0 ); + layout->addWidget( m_pNoiseGeneratorEdit, 3, 1 ); hl->addStretch( 1 ); m_pRadiosityEdit = new TQCheckBox( i18n( "Radiosity (Povray 3.1)" ), this ); @@ -101,43 +101,43 @@ void PMGlobalSettingsEdit::createTopWidgets( ) m_pRadiosityWidget = new TQWidget( this ); hl = new TQHBoxLayout( m_pRadiosityWidget, 0, KDialog::spacingHint( ) ); - tqlayout = new TQGridLayout( hl, 7, 2 ); + layout = new TQGridLayout( hl, 7, 2 ); lbl = new TQLabel( i18n( "Brightness:" ), m_pRadiosityWidget ); m_pBrightnessEdit = new PMFloatEdit( m_pRadiosityWidget ); - tqlayout->addWidget( lbl, 0, 0 ); - tqlayout->addWidget( m_pBrightnessEdit, 0, 1 ); + layout->addWidget( lbl, 0, 0 ); + layout->addWidget( m_pBrightnessEdit, 0, 1 ); lbl = new TQLabel( i18n( "Count:" ), m_pRadiosityWidget ); m_pCountEdit = new PMIntEdit( m_pRadiosityWidget ); - tqlayout->addWidget( lbl, 1, 0 ); - tqlayout->addWidget( m_pCountEdit, 1, 1 ); + layout->addWidget( lbl, 1, 0 ); + layout->addWidget( m_pCountEdit, 1, 1 ); lbl = new TQLabel( i18n( "Maximum distance:" ), m_pRadiosityWidget ); m_pDistanceMaximumEdit = new PMFloatEdit( m_pRadiosityWidget ); - tqlayout->addWidget( lbl, 2, 0 ); - tqlayout->addWidget( m_pDistanceMaximumEdit, 2, 1 ); + layout->addWidget( lbl, 2, 0 ); + layout->addWidget( m_pDistanceMaximumEdit, 2, 1 ); lbl = new TQLabel( i18n( "Error boundary:" ), m_pRadiosityWidget ); m_pErrorBoundEdit = new PMFloatEdit( m_pRadiosityWidget ); - tqlayout->addWidget( lbl, 3, 0 ); - tqlayout->addWidget( m_pErrorBoundEdit, 3, 1 ); + layout->addWidget( lbl, 3, 0 ); + layout->addWidget( m_pErrorBoundEdit, 3, 1 ); lbl = new TQLabel( i18n( "Gray threshold:" ), m_pRadiosityWidget ); m_pGrayThresholdEdit = new PMFloatEdit( m_pRadiosityWidget ); - tqlayout->addWidget( lbl, 4, 0 ); - tqlayout->addWidget( m_pGrayThresholdEdit, 4, 1 ); + layout->addWidget( lbl, 4, 0 ); + layout->addWidget( m_pGrayThresholdEdit, 4, 1 ); lbl = new TQLabel( i18n( "Low error factor:" ), m_pRadiosityWidget ); m_pLowErrorFactorEdit = new PMFloatEdit( m_pRadiosityWidget ); - tqlayout->addWidget( lbl, 5, 0 ); - tqlayout->addWidget( m_pLowErrorFactorEdit, 5, 1 ); + layout->addWidget( lbl, 5, 0 ); + layout->addWidget( m_pLowErrorFactorEdit, 5, 1 ); lbl = new TQLabel( i18n( "Minimum reuse:" ), m_pRadiosityWidget ); m_pMinimumReuseEdit = new PMFloatEdit( m_pRadiosityWidget ); - tqlayout->addWidget( lbl, 6, 0 ); - tqlayout->addWidget( m_pMinimumReuseEdit, 6, 1 ); + layout->addWidget( lbl, 6, 0 ); + layout->addWidget( m_pMinimumReuseEdit, 6, 1 ); lbl = new TQLabel( i18n( "Nearest count:" ), m_pRadiosityWidget ); m_pNearestCountEdit = new PMIntEdit( m_pRadiosityWidget ); - tqlayout->addWidget( lbl, 7, 0 ); - tqlayout->addWidget( m_pNearestCountEdit, 7, 1 ); + layout->addWidget( lbl, 7, 0 ); + layout->addWidget( m_pNearestCountEdit, 7, 1 ); lbl = new TQLabel( i18n( "Recursion limit:" ), m_pRadiosityWidget ); m_pRecursionLimitEdit = new PMIntEdit( m_pRadiosityWidget ); - tqlayout->addWidget( lbl, 8, 0 ); - tqlayout->addWidget( m_pRecursionLimitEdit, 8, 1 ); + layout->addWidget( lbl, 8, 0 ); + layout->addWidget( m_pRecursionLimitEdit, 8, 1 ); hl->addStretch( 1 ); topLayout( )->addWidget( m_pRadiosityWidget ); diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp index 2bd819c4..178e195f 100644 --- a/kpovmodeler/pmglview.cpp +++ b/kpovmodeler/pmglview.cpp @@ -31,7 +31,7 @@ #include <tqcursor.h> #include <tqcolor.h> #include <tqglobal.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqdom.h> @@ -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 ); } @@ -431,7 +431,7 @@ void PMGLView::resizeEvent( TQResizeEvent* ) void PMGLView::paintEvent( TQPaintEvent* ) { - tqrepaint( ); + repaint( ); } void PMGLView::invalidateProjection( bool graphicalChange /*= true*/ ) @@ -480,7 +480,7 @@ void PMGLView::invalidateProjection( bool graphicalChange /*= true*/ ) recalculateControlPointPosition( ); } m_projectionUpToDate = false; - tqrepaint( graphicalChange ); + repaint( graphicalChange ); } void PMGLView::enableTranslateMode( bool yes ) @@ -900,7 +900,7 @@ void PMGLView::slotAutoScroll( ) if( m_bGraphicalChangeMode ) graphicalChange( mapFromGlobal( TQCursor::pos( ) ) ); else - tqrepaint( ); + repaint( ); m_lastAutoScrollUpdate = now; } @@ -1118,7 +1118,7 @@ void PMGLView::slotRefresh( ) if( !m_pCamera ) setCamera( m_pPart->firstCamera( ) ); - tqrepaint( ); + repaint( ); } void PMGLView::slotClear( ) @@ -1238,10 +1238,10 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode, redraw = true; if( redraw ) - tqrepaint( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) ); + repaint( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(this) ); } -void PMGLView::tqrepaint( bool graphicalChange ) +void PMGLView::repaint( bool graphicalChange ) { if( isValid( ) ) { @@ -1754,7 +1754,7 @@ TQString PMGLViewFactory::description( PMViewOptions* vo ) const if( vo && vo->viewType( ) == "glview" ) { PMGLViewOptions* o = ( PMGLViewOptions* ) vo; - return i18n( "3D View (%1)" ).tqarg( + return i18n( "3D View (%1)" ).arg( PMGLView::viewTypeAsString( o->glViewType( ) ) ); } return description( ); diff --git a/kpovmodeler/pmglview.h b/kpovmodeler/pmglview.h index 9f1035af..a330afba 100644 --- a/kpovmodeler/pmglview.h +++ b/kpovmodeler/pmglview.h @@ -336,7 +336,7 @@ private: /** * Repaints the view */ - void tqrepaint( bool graphicalChange = false ); + void repaint( bool graphicalChange = false ); /** * Starts a graphical change */ @@ -568,7 +568,7 @@ public: }; /** - * Configuration widget for the view tqlayout settings dialog + * Configuration widget for the view layout settings dialog */ class PMGLViewOptionsWidget : public PMViewOptionsWidget { 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..399e351d 100644 --- a/kpovmodeler/pmgraphicalobject.h +++ b/kpovmodeler/pmgraphicalobject.h @@ -46,12 +46,12 @@ public: */ PMGraphicalObject( const PMGraphicalObject& o ); /** - * Deletes the object and all tqchildren + * Deletes the object and all children */ virtual ~PMGraphicalObject( ); /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmgraphicalobjectedit.cpp b/kpovmodeler/pmgraphicalobjectedit.cpp index 1429d75f..13a024d2 100644 --- a/kpovmodeler/pmgraphicalobjectedit.cpp +++ b/kpovmodeler/pmgraphicalobjectedit.cpp @@ -20,7 +20,7 @@ #include "pmgraphicalobject.h" #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqspinbox.h> #include <klocale.h> @@ -162,7 +162,7 @@ void PMGraphicalObjectEdit::recalculateResultingVisibility( ) absoluteFound = true; } } - m_pResultingVisibility->setText( TQString( "(%1)" ).tqarg( level ) ); + m_pResultingVisibility->setText( TQString( "(%1)" ).arg( level ) ); } #include "pmgraphicalobjectedit.moc" diff --git a/kpovmodeler/pmgridsettings.cpp b/kpovmodeler/pmgridsettings.cpp index 69319187..604f0cb6 100644 --- a/kpovmodeler/pmgridsettings.cpp +++ b/kpovmodeler/pmgridsettings.cpp @@ -22,7 +22,7 @@ #include "pmcontrolpoint.h" #include "pmdefaults.h" -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqlabel.h> #include <kcolorbutton.h> @@ -31,38 +31,38 @@ PMGridSettings::PMGridSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) { - TQHBoxLayout* htqlayout; - TQVBoxLayout* vtqlayout; + TQHBoxLayout* hlayout; + TQVBoxLayout* vlayout; TQVBoxLayout* gvl; TQGridLayout* grid; TQGroupBox* gb; - vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); + vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); gb = new TQGroupBox( i18n( "Displayed Grid" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); - htqlayout = new TQHBoxLayout( gvl ); - htqlayout->addWidget( new TQLabel( i18n( "Color:" ), gb ) ); + hlayout = new TQHBoxLayout( gvl ); + hlayout->addWidget( new TQLabel( i18n( "Color:" ), gb ) ); m_pGridColor = new KColorButton( gb ); - htqlayout->addWidget( m_pGridColor ); - htqlayout->addStretch( 1 ); + hlayout->addWidget( m_pGridColor ); + hlayout->addStretch( 1 ); - htqlayout = new TQHBoxLayout( gvl ); - htqlayout->addWidget( new TQLabel( i18n( "Distance:" ), gb ) ); + hlayout = new TQHBoxLayout( gvl ); + hlayout->addWidget( new TQLabel( i18n( "Distance:" ), gb ) ); m_pGridDistance = new PMIntEdit( gb ); m_pGridDistance->setValidation( true, 20, false, 0 ); - htqlayout->addWidget( m_pGridDistance ); - htqlayout->addStretch( 1 ); + hlayout->addWidget( m_pGridDistance ); + hlayout->addStretch( 1 ); gb = new TQGroupBox( i18n( "Control Point Grid" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); - htqlayout = new TQHBoxLayout( gvl ); - grid = new TQGridLayout( htqlayout, 3, 2 ); + hlayout = new TQHBoxLayout( gvl ); + grid = new TQGridLayout( hlayout, 3, 2 ); grid->addWidget( new TQLabel( i18n( "2D/3D movement:" ), gb ), 0, 0 ); m_pMoveGrid = new PMFloatEdit( gb ); m_pMoveGrid->setValidation( true, 0.001, true, 100 ); @@ -78,9 +78,9 @@ PMGridSettings::PMGridSettings( TQWidget* parent, const char* name ) m_pRotateGrid->setValidation( true, 0.001, true, 180 ); grid->addWidget( m_pRotateGrid, 2, 1 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); - vtqlayout->addStretch( 1 ); + vlayout->addStretch( 1 ); } void PMGridSettings::displaySettings( ) @@ -133,22 +133,22 @@ bool PMGridSettings::validateData( ) void PMGridSettings::applySettings( ) { - bool tqrepaint = false; + bool repaint = false; PMRenderManager* rm = PMRenderManager::theManager( ); if( rm->gridColor( ) != m_pGridColor->color( ) ) { rm->setGridColor( m_pGridColor->color( ) ); - tqrepaint = true; + repaint = true; } if( rm->gridDistance( ) != m_pGridDistance->value( ) ) { rm->setGridDistance( m_pGridDistance->value( ) ); - tqrepaint = true; + repaint = true; } PMControlPoint::setMoveGrid( m_pMoveGrid->value( ) ); PMControlPoint::setScaleGrid( m_pScaleGrid->value( ) ); PMControlPoint::setRotateGrid( m_pRotateGrid->value( ) ); - if( tqrepaint ) + if( repaint ) emit repaintViews( ); } 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/pmheightfieldedit.cpp b/kpovmodeler/pmheightfieldedit.cpp index cc413acf..22e7712d 100644 --- a/kpovmodeler/pmheightfieldedit.cpp +++ b/kpovmodeler/pmheightfieldedit.cpp @@ -20,7 +20,7 @@ #include "pmheightfield.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> 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/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp index 7f52442e..bb854e8a 100644 --- a/kpovmodeler/pmimagemapedit.cpp +++ b/kpovmodeler/pmimagemapedit.cpp @@ -24,7 +24,7 @@ #include "pmvector.h" #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqlabel.h> #include <tqlineedit.h> @@ -247,8 +247,8 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f TQPixmap removeButtonPixmap = SmallIcon( "pmremovepoint" ); // First let's deal with the filter entries... - if( m_pFiltersWidget->tqlayout( ) ) - delete m_pFiltersWidget->tqlayout( ); + if( m_pFiltersWidget->layout( ) ) + delete m_pFiltersWidget->layout( ); m_filterEntries.setAutoDelete( true ); m_filterAddButtons.setAutoDelete( true ); @@ -313,8 +313,8 @@ void PMImageMapEdit::displayPaletteEntries( const TQValueList<PMPaletteValue>& f m_transmitRemoveButtons.setAutoDelete( false ); // recreate the entry edits - if( m_pTransmitsWidget->tqlayout( ) ) - delete m_pTransmitsWidget->tqlayout( ); + if( m_pTransmitsWidget->layout( ) ) + delete m_pTransmitsWidget->layout( ); gl = new TQGridLayout( m_pTransmitsWidget, ntransmits + 1, 3, 0, KDialog::spacingHint( ) ); diff --git a/kpovmodeler/pminserterrordialog.cpp b/kpovmodeler/pminserterrordialog.cpp index c0203984..9dd7867a 100644 --- a/kpovmodeler/pminserterrordialog.cpp +++ b/kpovmodeler/pminserterrordialog.cpp @@ -31,7 +31,7 @@ PMInsertErrorDialog::PMInsertErrorDialog( { TQVBox* page = makeVBoxMainWidget( ); new TQLabel( i18n( "%1 of %2 objects couldn't be inserted." ) - .tqarg( numErrors ).tqarg( numObj ), page ); + .arg( numErrors ).arg( numObj ), page ); m_pDetailsLabel = new TQLabel( i18n( "Objects not inserted:" ), page ); m_pDetailsLabel->hide( ); diff --git a/kpovmodeler/pminsertrulesystem.cpp b/kpovmodeler/pminsertrulesystem.cpp index 7bd9e95a..3c601df7 100644 --- a/kpovmodeler/pminsertrulesystem.cpp +++ b/kpovmodeler/pminsertrulesystem.cpp @@ -181,15 +181,15 @@ PMRuleCondition* newCondition( TQDomElement& e, PMRuleBase::~PMRuleBase( ) { - m_tqchildren.setAutoDelete( true ); - m_tqchildren.clear( ); + m_children.setAutoDelete( true ); + m_children.clear( ); } void PMRuleBase::countChild( const TQString& className, bool afterInsertPoint ) { countChildProtected( className, afterInsertPoint ); - TQPtrListIterator<PMRuleBase> it( m_tqchildren ); + TQPtrListIterator<PMRuleBase> it( m_children ); for( ; it.current( ); ++it ) it.current( )->countChild( className, afterInsertPoint ); } @@ -198,7 +198,7 @@ void PMRuleBase::reset( ) { resetProtected( ); - TQPtrListIterator<PMRuleBase> it( m_tqchildren ); + TQPtrListIterator<PMRuleBase> it( m_children ); for( ; it.current( ); ++it ) it.current( )->reset( ); } @@ -302,7 +302,7 @@ PMRuleNot::PMRuleNot( TQDomElement& e, if( isCondition( me ) ) { m_pChild = newCondition( me, globalGroups, localGroups ); - m_tqchildren.append( m_pChild ); + m_children.append( m_pChild ); } } m = m.nextSibling( ); @@ -330,7 +330,7 @@ PMRuleAnd::PMRuleAnd( TQDomElement& e, if( isCondition( me ) ) { PMRuleCondition* c = newCondition( me, globalGroups, localGroups ); - m_tqchildren.append( c ); + m_children.append( c ); m_conditions.append( c ); } } @@ -361,7 +361,7 @@ PMRuleOr::PMRuleOr( TQDomElement& e, if( isCondition( me ) ) { PMRuleCondition* c = newCondition( me, globalGroups, localGroups ); - m_tqchildren.append( c ); + m_children.append( c ); m_conditions.append( c ); } } @@ -533,7 +533,7 @@ PMRuleCompare::PMRuleCompare( TQDomElement& e, if( isValue( me ) ) { m_pValue[i] = newValue( me, globalGroups, localGroups ); - m_tqchildren.append( m_pValue[i] ); + m_children.append( m_pValue[i] ); i++; } } @@ -745,7 +745,7 @@ PMRule::PMRule( TQDomElement& e, else if( isCondition( me ) ) { m_pCondition = newCondition( me, globalGroups, localGroups ); - m_tqchildren.append( m_pCondition ); + m_children.append( m_pCondition ); } } m = m.nextSibling( ); @@ -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( ) ); @@ -1006,7 +1006,7 @@ int PMInsertRuleSystem::canInsert( const PMObject* parentObject, if( targetClassList.isEmpty( ) ) return 0; // not rules found - // count already inserted tqchildren + // count already inserted children TQPtrListIterator<PMRuleTargetClass> tit( targetClassList ); for( ; tit.current( ); ++tit ) // ... for all target classes { diff --git a/kpovmodeler/pminsertrulesystem.h b/kpovmodeler/pminsertrulesystem.h index e8d30039..80ecb525 100644 --- a/kpovmodeler/pminsertrulesystem.h +++ b/kpovmodeler/pminsertrulesystem.h @@ -154,7 +154,7 @@ public: */ TQPtrListIterator<PMRuleBase> childIterator( ) const { - return TQPtrListIterator<PMRuleBase>( m_tqchildren ); + return TQPtrListIterator<PMRuleBase>( m_children ); } protected: /** @@ -170,7 +170,7 @@ protected: /** * Add all child nodes to this list. */ - TQPtrList<PMRuleBase> m_tqchildren; + TQPtrList<PMRuleBase> m_children; }; /** 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/pminterioredit.cpp b/kpovmodeler/pminterioredit.cpp index d9b427e7..a25032d0 100644 --- a/kpovmodeler/pminterioredit.cpp +++ b/kpovmodeler/pminterioredit.cpp @@ -21,7 +21,7 @@ #include "pmlineedits.h" #include "pmcoloredit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <klocale.h> @@ -38,33 +38,33 @@ void PMInteriorEdit::createTopWidgets( ) Base::createTopWidgets( ); TQHBoxLayout* hl = new TQHBoxLayout( topLayout( ) ); - TQGridLayout* tqlayout = new TQGridLayout( hl ,17 ,6); + TQGridLayout* layout = new TQGridLayout( hl ,17 ,6); m_pEnableIorEdit = new TQCheckBox( i18n( "Refraction:" ), this ); m_pIorEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pEnableIorEdit, 0, 0 ); - tqlayout->addWidget( m_pIorEdit, 0, 1 ); + layout->addWidget( m_pEnableIorEdit, 0, 0 ); + layout->addWidget( m_pIorEdit, 0, 1 ); m_pEnableCausticsEdit = new TQCheckBox( i18n( "Caustics:" ), this ); m_pCausticsEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pEnableCausticsEdit, 1, 0 ); - tqlayout->addWidget( m_pCausticsEdit, 1, 1 ); + layout->addWidget( m_pEnableCausticsEdit, 1, 0 ); + layout->addWidget( m_pCausticsEdit, 1, 1 ); m_pEnableDispersionEdit = new TQCheckBox( i18n( "Dispersion:" ), this ); m_pDispersionEdit = new PMFloatEdit( this ); m_pDispersionEdit->setValidation( true, 0, false, 0 ); - tqlayout->addWidget( m_pEnableDispersionEdit, 2, 0 ); - tqlayout->addWidget( m_pDispersionEdit, 2, 1 ); + layout->addWidget( m_pEnableDispersionEdit, 2, 0 ); + layout->addWidget( m_pDispersionEdit, 2, 1 ); m_pEnableDispSamplesEdit = new TQCheckBox( i18n( "Dispersion samples:" ), this ); m_pDispSamplesEdit = new PMIntEdit( this ); m_pDispSamplesEdit->setValidation( true, 2, false, 0 ); - tqlayout->addWidget( m_pEnableDispSamplesEdit, 3, 0 ); - tqlayout->addWidget( m_pDispSamplesEdit, 3, 1 ); + layout->addWidget( m_pEnableDispSamplesEdit, 3, 0 ); + layout->addWidget( m_pDispSamplesEdit, 3, 1 ); m_pEnableFadeDistanceEdit = new TQCheckBox( i18n( "Fade distance:" ), this ); m_pFadeDistanceEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pEnableFadeDistanceEdit, 4, 0 ); - tqlayout->addWidget( m_pFadeDistanceEdit, 4, 1 ); + layout->addWidget( m_pEnableFadeDistanceEdit, 4, 0 ); + layout->addWidget( m_pFadeDistanceEdit, 4, 1 ); m_pEnableFadePowerEdit = new TQCheckBox( i18n( "Fade power:" ), this ); m_pFadePowerEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pEnableFadePowerEdit, 5, 0 ); - tqlayout->addWidget( m_pFadePowerEdit, 5, 1 ); + layout->addWidget( m_pEnableFadePowerEdit, 5, 0 ); + layout->addWidget( m_pFadePowerEdit, 5, 1 ); hl->addStretch( 1 ); connect( m_pIorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); 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/pminteriortextureedit.cpp b/kpovmodeler/pminteriortextureedit.cpp index 73f1e7e9..6b914e71 100644 --- a/kpovmodeler/pminteriortextureedit.cpp +++ b/kpovmodeler/pminteriortextureedit.cpp @@ -20,7 +20,7 @@ #include "pminteriortexture.h" #include "pmlinkedit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> 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/pmisosurfaceedit.cpp b/kpovmodeler/pmisosurfaceedit.cpp index 6b775fe4..c0b22932 100644 --- a/kpovmodeler/pmisosurfaceedit.cpp +++ b/kpovmodeler/pmisosurfaceedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqcombobox.h> @@ -96,7 +96,7 @@ void PMIsoSurfaceEdit::createTopWidgets( ) hl->addWidget( new TQLabel( i18n( "Values:" ), this ) ); for( i = 0; i < 3; i++ ) { - hl->addWidget( new TQLabel( TQString( "P%1" ).tqarg( i ), this ) ); + hl->addWidget( new TQLabel( TQString( "P%1" ).arg( i ), this ) ); hl->addWidget( m_pEvaluateValue[i] ); } 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/pmjuliafractaledit.cpp b/kpovmodeler/pmjuliafractaledit.cpp index 4f595b0e..b0c10b04 100644 --- a/kpovmodeler/pmjuliafractaledit.cpp +++ b/kpovmodeler/pmjuliafractaledit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <klocale.h> diff --git a/kpovmodeler/pmlathe.cpp b/kpovmodeler/pmlathe.cpp index 8e058a9b..9f6a00ff 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 ) ); @@ -549,10 +549,10 @@ void PMLathe::controlPoints( PMControlPointList& list ) lastPoint = cp; if( d == 0 ) cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DXY, i, - i18n( "Point %1 (xy)" ).tqarg( i + 1 ) ); + i18n( "Point %1 (xy)" ).arg( i + 1 ) ); else cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DZY, i, - i18n( "Point %1 (xy)" ).tqarg( i + 1 ) ); + i18n( "Point %1 (xy)" ).arg( i + 1 ) ); if( i == 0 ) firstPoint = cp; @@ -573,10 +573,10 @@ void PMLathe::controlPoints( PMControlPointList& list ) int imod4 = i % 4; if( d == 0 ) cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DXY, i, - i18n( "Point %1 (xy)" ).tqarg( i + 1 ) ); + i18n( "Point %1 (xy)" ).arg( i + 1 ) ); else cp = new PM2DControlPoint( *it, PM2DControlPoint::PM2DZY, i, - i18n( "Point %1 (xy)" ).tqarg( i + 1 ) ); + i18n( "Point %1 (xy)" ).arg( i + 1 ) ); switch( imod4 ) { case 0: 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/pmlatheedit.cpp b/kpovmodeler/pmlatheedit.cpp index e90a4397..6e4f8735 100644 --- a/kpovmodeler/pmlatheedit.cpp +++ b/kpovmodeler/pmlatheedit.cpp @@ -22,7 +22,7 @@ #include "pmvectorlistedit.h" #include "pmpart.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqtooltip.h> #include <tqcombobox.h> diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp index df3c13d3..590cbdda 100644 --- a/kpovmodeler/pmlayoutsettings.cpp +++ b/kpovmodeler/pmlayoutsettings.cpp @@ -21,7 +21,7 @@ #include "pmviewfactory.h" #include "pmdebug.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqlistbox.h> #include <tqlistview.h> @@ -34,8 +34,8 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) { - TQHBoxLayout* htqlayout; - TQVBoxLayout* vtqlayout; + TQHBoxLayout* hlayout; + TQVBoxLayout* vlayout; TQVBoxLayout* gvl; TQGridLayout* grid; TQGroupBox* gb; @@ -43,16 +43,16 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name ) TQHBoxLayout* ghe; TQVBoxLayout* gvle; - vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); + vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); - htqlayout = new TQHBoxLayout( vtqlayout ); - htqlayout->addWidget( new TQLabel( i18n( "Default view tqlayout:" ), this ) ); + hlayout = new TQHBoxLayout( vlayout ); + hlayout->addWidget( new TQLabel( i18n( "Default view layout:" ), this ) ); m_pDefaultLayout = new TQComboBox( this ); - htqlayout->addWidget( m_pDefaultLayout, 1 ); - htqlayout->addStretch( 1 ); + hlayout->addWidget( m_pDefaultLayout, 1 ); + hlayout->addStretch( 1 ); gb = new TQGroupBox( i18n( "Available View Layouts" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); @@ -180,7 +180,7 @@ PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name ) ghl->addStretch( 1 ); - vtqlayout->addStretch( 1 ); + vlayout->addStretch( 1 ); } void PMLayoutSettings::displaySettings( ) @@ -220,7 +220,7 @@ bool PMLayoutSettings::validateData( ) if( ( *eit ).dockPosition( ) != PMDockWidget::DockRight ) { emit showMe( ); - KMessageBox::error( this, i18n( "The docking position of the first view tqlayout entry has to be 'New Column'." ), + KMessageBox::error( this, i18n( "The docking position of the first view layout entry has to be 'New Column'." ), i18n( "Error" ) ); return false; } @@ -720,8 +720,8 @@ void PMLayoutSettings::slotMoveDownViewEntryClicked( ) void PMLayoutSettings::displayCustomOptions( ) { // delete an old widget - if( m_pCustomOptionsHolder->tqlayout( ) ) - delete m_pCustomOptionsHolder->tqlayout( ); + if( m_pCustomOptionsHolder->layout( ) ) + delete m_pCustomOptionsHolder->layout( ); if( m_pCustomOptionsWidget ) { delete m_pCustomOptionsWidget; diff --git a/kpovmodeler/pmlayoutsettings.h b/kpovmodeler/pmlayoutsettings.h index 856b423d..250758f7 100644 --- a/kpovmodeler/pmlayoutsettings.h +++ b/kpovmodeler/pmlayoutsettings.h @@ -35,7 +35,7 @@ class TQPushButton; class TQLabel; /** - * View tqlayout configuration dialog page + * View layout configuration dialog page */ class PMLayoutSettings : public PMSettingsDialogPage { @@ -57,19 +57,19 @@ public: protected slots: /** - * Called when the browse add tqlayout button is clicked + * Called when the browse add layout button is clicked */ void slotAddLayout( ); /** - * Called when the remove tqlayout button is clicked + * Called when the remove layout button is clicked */ void slotRemoveLayout( ); /** - * Called when the selected tqlayout changes + * Called when the selected layout changes */ void slotLayoutSelected( int i ); /** - * Called when the tqlayout name changes + * Called when the layout name changes */ void slotLayoutNameChanged( const TQString& text ); /** diff --git a/kpovmodeler/pmlibrarybrowser.cpp b/kpovmodeler/pmlibrarybrowser.cpp index bc7e1af7..aead0600 100644 --- a/kpovmodeler/pmlibrarybrowser.cpp +++ b/kpovmodeler/pmlibrarybrowser.cpp @@ -18,7 +18,7 @@ #include "pmlibrarybrowser.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqsplitter.h> diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp index a1ea53a1..d5565bb7 100644 --- a/kpovmodeler/pmlibraryentrypreview.cpp +++ b/kpovmodeler/pmlibraryentrypreview.cpp @@ -29,7 +29,7 @@ #include <tqlabel.h> #include <tqlineedit.h> #include <tqmultilineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqdragobject.h> @@ -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/pmlibraryhandle.cpp b/kpovmodeler/pmlibraryhandle.cpp index 8ba0f387..4b2bddf2 100644 --- a/kpovmodeler/pmlibraryhandle.cpp +++ b/kpovmodeler/pmlibraryhandle.cpp @@ -24,7 +24,7 @@ #include <tqdir.h> #include <tqfile.h> #include <tqdom.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqimage.h> #include <klocale.h> diff --git a/kpovmodeler/pmlibraryhandleedit.cpp b/kpovmodeler/pmlibraryhandleedit.cpp index e991af6e..120bde27 100644 --- a/kpovmodeler/pmlibraryhandleedit.cpp +++ b/kpovmodeler/pmlibraryhandleedit.cpp @@ -20,9 +20,9 @@ #include <tqpushbutton.h> #include <tqcheckbox.h> #include <tqlineedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp index 39714cf8..d2588dca 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; @@ -277,7 +277,7 @@ void PMLibraryIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDra if( !success ) { - KMessageBox::error( 0, i18n( "Error moving \"%1\" to \"%2\"" ).tqarg( path ).tqarg( m_path ) ); + KMessageBox::error( 0, i18n( "Error moving \"%1\" to \"%2\"" ).arg( path ).arg( m_path ) ); e->ignore( ); return; } 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/pmlibraryobjectsearch.cpp b/kpovmodeler/pmlibraryobjectsearch.cpp index 30e5be5c..3b57711c 100644 --- a/kpovmodeler/pmlibraryobjectsearch.cpp +++ b/kpovmodeler/pmlibraryobjectsearch.cpp @@ -24,7 +24,7 @@ #include <tqlabel.h> #include <tqlineedit.h> #include <tqpushbutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpixmap.h> #include <tqimage.h> #include <tqframe.h> 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/pmlightedit.cpp b/kpovmodeler/pmlightedit.cpp index e652d0a2..a5ef0c48 100644 --- a/kpovmodeler/pmlightedit.cpp +++ b/kpovmodeler/pmlightedit.cpp @@ -22,7 +22,7 @@ #include "pmlineedits.h" #include "pmcoloredit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqcheckbox.h> 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/pmlightgroupedit.cpp b/kpovmodeler/pmlightgroupedit.cpp index 73a75c6d..a0974c2c 100644 --- a/kpovmodeler/pmlightgroupedit.cpp +++ b/kpovmodeler/pmlightgroupedit.cpp @@ -19,7 +19,7 @@ #include "pmlightgroupedit.h" #include "pmlightgroup.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <klocale.h> @@ -34,12 +34,12 @@ void PMLightGroupEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; m_pGlobalLights = new TQCheckBox( i18n( "Global lights" ), this ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( m_pGlobalLights ); - tqlayout->addStretch( 1 ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( m_pGlobalLights ); + layout->addStretch( 1 ); connect( m_pGlobalLights, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); } diff --git a/kpovmodeler/pmlineedits.cpp b/kpovmodeler/pmlineedits.cpp index 7546894e..19391338 100644 --- a/kpovmodeler/pmlineedits.cpp +++ b/kpovmodeler/pmlineedits.cpp @@ -67,28 +67,28 @@ bool PMFloatEdit::isDataValid( ) if( m_bCheckLower && m_bCheckUpper ) KMessageBox::error( this, i18n( "Please enter a float value " "between %1 and %2" ) - .tqarg( m_lowerValue ).tqarg( m_upperValue ), + .arg( m_lowerValue ).arg( m_upperValue ), i18n( "Error" ) ); else if( m_bCheckLower ) { if( m_lowerOp == OpGreaterEqual ) KMessageBox::error( this, i18n( "Please enter a float value " - ">= %1" ).tqarg( m_lowerValue ), + ">= %1" ).arg( m_lowerValue ), i18n( "Error" ) ); else KMessageBox::error( this, i18n( "Please enter a float value " - "> %1" ).tqarg( m_lowerValue ), + "> %1" ).arg( m_lowerValue ), i18n( "Error" ) ); } else { if( m_upperOp == OpLessEqual ) KMessageBox::error( this, i18n( "Please enter a float value " - "<= %1" ).tqarg( m_upperValue ), + "<= %1" ).arg( m_upperValue ), i18n( "Error" ) ); else KMessageBox::error( this, i18n( "Please enter a float value " - "< %1" ).tqarg( m_upperValue ), + "< %1" ).arg( m_upperValue ), i18n( "Error" ) ); } } @@ -183,15 +183,15 @@ bool PMIntEdit::isDataValid( ) if( m_bCheckLower && m_bCheckUpper ) KMessageBox::error( this, i18n( "Please enter an integer value " "between %1 and %2" ) - .tqarg( m_lowerValue ).tqarg( m_upperValue ), + .arg( m_lowerValue ).arg( m_upperValue ), i18n( "Error" ) ); else if( m_bCheckLower ) KMessageBox::error( this, i18n( "Please enter an integer value " - ">= %1" ).tqarg( m_lowerValue ), + ">= %1" ).arg( m_lowerValue ), i18n( "Error" ) ); else KMessageBox::error( this, i18n( "Please enter an integer value " - "<= %1" ).tqarg( m_upperValue ), + "<= %1" ).arg( m_upperValue ), i18n( "Error" ) ); } } diff --git a/kpovmodeler/pmlinkedit.cpp b/kpovmodeler/pmlinkedit.cpp index 87f6203c..54efcf94 100644 --- a/kpovmodeler/pmlinkedit.cpp +++ b/kpovmodeler/pmlinkedit.cpp @@ -18,7 +18,7 @@ #include "pmlinkedit.h" #include <tqlineedit.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> #include <kdialog.h> #include <kpushbutton.h> @@ -64,12 +64,12 @@ void PMLinkEdit::init( ) m_pIDEdit->setReadOnly( true ); grid->addWidget( m_pIDEdit, 0, 1 ); - TQHBoxLayout* tqlayout = new TQHBoxLayout( ); - grid->addLayout( tqlayout, 1, 1 ); + TQHBoxLayout* layout = new TQHBoxLayout( ); + grid->addLayout( layout, 1, 1 ); m_pSelectButton = new TQPushButton( i18n( "Select..." ), this ); - tqlayout->addWidget( m_pSelectButton ); + layout->addWidget( m_pSelectButton ); m_pClearButton = new KPushButton( KStdGuiItem::clear(), this ); - tqlayout->addWidget( m_pClearButton ); + layout->addWidget( m_pClearButton ); connect( m_pSelectButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotSelectClicked( ) ) ); connect( m_pClearButton, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotClearClicked( ) ) ); 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/pmlistpatternedit.cpp b/kpovmodeler/pmlistpatternedit.cpp index bc897c61..5f2842de 100644 --- a/kpovmodeler/pmlistpatternedit.cpp +++ b/kpovmodeler/pmlistpatternedit.cpp @@ -22,7 +22,7 @@ #include "pmvector.h" #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqlabel.h> #include "pmlineedits.h" @@ -41,39 +41,39 @@ void PMListPatternEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQVBoxLayout* vtqlayout = new TQVBoxLayout( topLayout( ) ); + TQVBoxLayout* vlayout = new TQVBoxLayout( topLayout( ) ); /* Field for Pattern List type */ - TQHBoxLayout* tqlayout = new TQHBoxLayout( vtqlayout ); + TQHBoxLayout* layout = new TQHBoxLayout( vlayout ); TQLabel* label = new TQLabel( i18n( "Type:" ), this ); m_pTypeCombo = new TQComboBox( false, this ); m_pTypeCombo->insertItem( i18n( "Checkers" ) ); m_pTypeCombo->insertItem( i18n( "Brick" ) ); m_pTypeCombo->insertItem( i18n( "Hexagon" ) ); - tqlayout->addWidget( label, 0, AlignTop ); - tqlayout->addWidget( m_pTypeCombo ); - tqlayout->addStretch( 1 ); + layout->addWidget( label, 0, AlignTop ); + layout->addWidget( m_pTypeCombo ); + layout->addStretch( 1 ); /* The depth field */ - tqlayout = new TQHBoxLayout( vtqlayout ); + layout = new TQHBoxLayout( vlayout ); m_pDepthLabel = new TQLabel( i18n( "Depth:" ), this ); m_pDepth = new PMFloatEdit( this ); - tqlayout->addWidget( m_pDepthLabel ); - tqlayout->addWidget( m_pDepth ); - tqlayout->addStretch( 1 ); + layout->addWidget( m_pDepthLabel ); + layout->addWidget( m_pDepth ); + layout->addStretch( 1 ); /* The brick information */ - TQHBoxLayout* bricklayout = new TQHBoxLayout( vtqlayout ); + TQHBoxLayout* bricklayout = new TQHBoxLayout( vlayout ); m_pBrickSizeLabel = new TQLabel( i18n( "Brick size:" ), this ); m_pBrickSize = new PMVectorEdit( "x", "y", "z", this ); bricklayout->addWidget( m_pBrickSizeLabel ); bricklayout->addWidget( m_pBrickSize ); - tqlayout = new TQHBoxLayout( vtqlayout ); + layout = new TQHBoxLayout( vlayout ); m_pMortarLabel = new TQLabel( i18n( "Mortar:" ), this ); m_pMortar = new PMFloatEdit( this ); - tqlayout->addWidget( m_pMortarLabel ); - tqlayout->addWidget( m_pMortar ); - tqlayout->addStretch( 1 ); + layout->addWidget( m_pMortarLabel ); + layout->addWidget( m_pMortar ); + layout->addStretch( 1 ); /* connect all signals to slots/signals */ connect( m_pBrickSize, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); @@ -161,7 +161,7 @@ void PMListPatternEdit::saveContents( ) bool PMListPatternEdit::isDataValid( ) { - int tqchildren = 0; + int children = 0; PMObject* o; if( !m_pBrickSize->isDataValid( ) ) @@ -172,13 +172,13 @@ bool PMListPatternEdit::isDataValid( ) // count child objects for( o = m_pDisplayedObject->firstChild( ); o; o = o->nextSibling( ) ) if( o->type( ) == m_pDisplayedObject->listObjectType( ) ) - tqchildren++; + children++; switch( m_pTypeCombo->currentItem( ) ) { case 0: case 1: - if( tqchildren > 2 ) + if( children > 2 ) { KMessageBox::error( this, i18n( "You can have at most two child" " items for that list type!" ), 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/pmmaterialedit.cpp b/kpovmodeler/pmmaterialedit.cpp index f03fcd43..02320aa3 100644 --- a/kpovmodeler/pmmaterialedit.cpp +++ b/kpovmodeler/pmmaterialedit.cpp @@ -20,7 +20,7 @@ #include "pmmaterial.h" #include "pmlinkedit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> 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/pmmaterialmapedit.cpp b/kpovmodeler/pmmaterialmapedit.cpp index 491f9d76..57707d9a 100644 --- a/kpovmodeler/pmmaterialmapedit.cpp +++ b/kpovmodeler/pmmaterialmapedit.cpp @@ -24,7 +24,7 @@ #include "pmvector.h" #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqlabel.h> #include <tqlineedit.h> diff --git a/kpovmodeler/pmmatrix.cpp b/kpovmodeler/pmmatrix.cpp index bda58a28..977f48ed 100644 --- a/kpovmodeler/pmmatrix.cpp +++ b/kpovmodeler/pmmatrix.cpp @@ -22,7 +22,7 @@ #include "pmvector.h" #include "pmdebug.h" -#include <tqtextstream.h> +#include <textstream.h> PMMatrix::PMMatrix( ) { 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/pmmediaedit.cpp b/kpovmodeler/pmmediaedit.cpp index f89f7d10..ea23379b 100644 --- a/kpovmodeler/pmmediaedit.cpp +++ b/kpovmodeler/pmmediaedit.cpp @@ -21,7 +21,7 @@ #include "pmlineedits.h" #include "pmcoloredit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqcombobox.h> 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/pmmeshedit.cpp b/kpovmodeler/pmmeshedit.cpp index 61bea7a1..ff7aa825 100644 --- a/kpovmodeler/pmmeshedit.cpp +++ b/kpovmodeler/pmmeshedit.cpp @@ -20,7 +20,7 @@ #include "pmmesh.h" #include "pmvectoredit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> @@ -35,17 +35,17 @@ void PMMeshEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; m_pHierarchy = new TQCheckBox( i18n( "Hierarchy" ), this ); m_pEnableInsideVector = new TQCheckBox( i18n( "Inside vector:" ), this ); m_pInsideVector = new PMVectorEdit( "x", "y", "z", this ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( m_pHierarchy ); - tqlayout->addStretch( 1 ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( m_pEnableInsideVector ); - tqlayout->addWidget( m_pInsideVector ); - tqlayout->addStretch( 1 ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( m_pHierarchy ); + layout->addStretch( 1 ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( m_pEnableInsideVector ); + layout->addWidget( m_pInsideVector ); + layout->addStretch( 1 ); connect( m_pHierarchy, TQT_SIGNAL( clicked( ) ), TQT_SIGNAL( dataChanged( ) ) ); connect( m_pEnableInsideVector, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotInsideVectorClicked( ) ) ); diff --git a/kpovmodeler/pmmovecommand.cpp b/kpovmodeler/pmmovecommand.cpp index 7f14e871..bb75b0e4 100644 --- a/kpovmodeler/pmmovecommand.cpp +++ b/kpovmodeler/pmmovecommand.cpp @@ -30,7 +30,7 @@ #include <tqptrdict.h> PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* parent, PMObject* after ) - : PMCommand( i18n( "Move %1" ).tqarg( obj->description( ) ) ) + : PMCommand( i18n( "Move %1" ).arg( obj->description( ) ) ) { m_pParent = parent; m_pAfter = after; @@ -356,10 +356,10 @@ int PMMoveCommand::errorFlags( PMPart* ) { if( declareInsertError ) m_errors.prepend( i18n( "Can't insert the declare \"%1\" at that point." ) - .tqarg( decl->id( ) ) ); + .arg( decl->id( ) ) ); else m_errors.prepend( i18n( "The declare \"%1\" can't be moved behind linked objects." ) - .tqarg( decl->id( ) ) ); + .arg( decl->id( ) ) ); PMDeleteInfo* tmp = info; info = m_infoList.prev( ); @@ -450,8 +450,8 @@ int PMMoveCommand::errorFlags( PMPart* ) "contains a link to the declare \"%3\" " "and the insert point is not after " "the declare." ) - .tqarg( obj->description( ) ).tqarg( name ) - .tqarg( decl->id( ) ) ); + .arg( obj->description( ) ).arg( name ) + .arg( decl->id( ) ) ); } else kdError( PMArea ) << "linked is 0 in PMMoveCommand::errorFlags\n"; diff --git a/kpovmodeler/pmmovecommand.h b/kpovmodeler/pmmovecommand.h index 934f7fa4..5aac246d 100644 --- a/kpovmodeler/pmmovecommand.h +++ b/kpovmodeler/pmmovecommand.h @@ -50,10 +50,10 @@ public: * Command that moves a list of new PMObjects. * The objects don't have to be siblings of each other. * - * The object in the list will be inserted as tqchildren of parent after + * The object in the list will be inserted as children of parent after * the object after. * - * If after is 0, the objects will be inserted as first tqchildren. + * If after is 0, the objects will be inserted as first children. */ PMMoveCommand( const PMObjectList& list, PMObject* parent, PMObject* after ); /** 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/pmnamedobjectedit.cpp b/kpovmodeler/pmnamedobjectedit.cpp index f9179f74..ca057147 100644 --- a/kpovmodeler/pmnamedobjectedit.cpp +++ b/kpovmodeler/pmnamedobjectedit.cpp @@ -19,7 +19,7 @@ #include "pmnamedobjectedit.h" #include "pmnamedobject.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqlabel.h> #include <klocale.h> @@ -34,12 +34,12 @@ void PMNamedObjectEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) ); + TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) ); m_pNameEdit = new TQLineEdit( this ); TQLabel* label = new TQLabel( i18n( "Name:" ), this ); - tqlayout->addWidget( label ); - tqlayout->addWidget( m_pNameEdit ); + layout->addWidget( label ); + layout->addWidget( m_pNameEdit ); connect( m_pNameEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotNameChanged( const TQString& ) ) ); 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/pmnormaledit.cpp b/kpovmodeler/pmnormaledit.cpp index 68d6f1f3..1631a1dd 100644 --- a/kpovmodeler/pmnormaledit.cpp +++ b/kpovmodeler/pmnormaledit.cpp @@ -21,7 +21,7 @@ #include "pmlinkedit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <klocale.h> 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..3f454ab5 100644 --- a/kpovmodeler/pmobject.h +++ b/kpovmodeler/pmobject.h @@ -54,7 +54,7 @@ typedef TQPtrListIterator<PMObject> PMObjectListIterator; * Used pattern: Composite * * All list/child functionality is disabled in this class. Objects that - * can have tqchildren has to be inherited from @ref PMCompositeObject. + * can have children has to be inherited from @ref PMCompositeObject. */ class PMObject { @@ -69,7 +69,7 @@ public: */ PMObject( const PMObject& o ); /** - * Deletes the object and all tqchildren. + * Deletes the object and all children. */ virtual ~PMObject( ); @@ -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 @@ -157,7 +157,7 @@ public: int canInsert( const TQStringList& classes, const PMObject* after ) const; /** - * Returns true if an insert or remove operation of tqchildren will + * Returns true if an insert or remove operation of children will * change data inside this class */ virtual bool dataChangeOnInsertRemove( ) const { return false; } @@ -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 */ @@ -219,7 +219,7 @@ public: return false; } /** - * Returns the number of tqchildren. 0 in this class + * Returns the number of children. 0 in this class */ virtual int countChildren( ) const { return 0; } /** @@ -235,12 +235,12 @@ public: /** * Called when a child was removed. For classes that have to be informed - * when tqchildren are removed + * when children are removed */ virtual void childRemoved( PMObject* ) { }; /** * Called when a child was added. For classes that have to be informed - * when tqchildren are added + * when children are added */ virtual void childAdded( PMObject* ) { }; @@ -302,7 +302,7 @@ public: * not only this object. * * If you leave the list empty, only this object was changed. - * If you add tqchildren or other objects to the list, add this object + * If you add children or other objects to the list, add this object * to the list, too, if it was changed! * * IMPORTANT: When you change additional objects, make sure that @@ -402,7 +402,7 @@ public: */ bool isReadOnly( ) const; /** - * Makes this object read only, if yes == true. All tqchildren will + * Makes this object read only, if yes == true. All children will * be read only, too */ void setReadOnly( bool yes = true ) { m_readOnly = yes; } @@ -495,7 +495,7 @@ private: */ bool m_selected; /** - * true if this object is read only. All tqchildren will be read only, too + * true if this object is read only. All children will be read only, too */ bool m_readOnly; /** 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/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp index 93f9f419..4d94a7ea 100644 --- a/kpovmodeler/pmobjectlibrarysettings.cpp +++ b/kpovmodeler/pmobjectlibrarysettings.cpp @@ -24,7 +24,7 @@ #include "pmlibraryhandleedit.h" #include "pmdebug.h" -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqlabel.h> #include <tqpushbutton.h> @@ -36,16 +36,16 @@ PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) { - TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); + TQVBoxLayout* vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); TQGroupBox* gb = new TQGroupBox( i18n( "Libraries" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); - TQHBoxLayout* htqlayout = new TQHBoxLayout( gb, KDialog::marginHint( ) + 5, KDialog::spacingHint( ) ); + TQHBoxLayout* hlayout = new TQHBoxLayout( gb, KDialog::marginHint( ) + 5, KDialog::spacingHint( ) ); m_pObjectLibraries = new TQListBox( gb ); connect( m_pObjectLibraries, TQT_SIGNAL( selectionChanged( ) ), TQT_SLOT( slotObjectLibraryChanged( ) ) ); - htqlayout->addWidget( m_pObjectLibraries ); - TQVBoxLayout* gvl = new TQVBoxLayout( htqlayout ); + hlayout->addWidget( m_pObjectLibraries ); + TQVBoxLayout* gvl = new TQVBoxLayout( hlayout ); m_pCreateObjectLibrary = new TQPushButton( i18n( "Create..." ), gb ); connect( m_pCreateObjectLibrary, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotCreateObjectLibrary( ) ) ); gvl->addWidget( m_pCreateObjectLibrary ); @@ -77,9 +77,9 @@ PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char* grid->addWidget( m_pLibraryDescription, 2, 1 ); grid->addMultiCellWidget( m_pReadOnlyText, 3, 3, 0, 1 ); grid->setColStretch( 1, 1 ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); - vtqlayout->addStretch( 1 ); + vlayout->addStretch( 1 ); } void PMObjectLibrarySettings::displaySettings( ) diff --git a/kpovmodeler/pmobjectlink.cpp b/kpovmodeler/pmobjectlink.cpp index f99bb92b..559d3fe4 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, @@ -161,7 +161,7 @@ void PMObjectLink::readAttributes( const PMXMLHelper& h ) } else h.parser( )->printError( i18n( "Declare \"%1\" has wrong type." ) - .tqarg( id ) ); + .arg( id ) ); } } Base::readAttributes( h ); 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/pmobjectlinkedit.cpp b/kpovmodeler/pmobjectlinkedit.cpp index 98aead0c..ce5f85f8 100644 --- a/kpovmodeler/pmobjectlinkedit.cpp +++ b/kpovmodeler/pmobjectlinkedit.cpp @@ -22,7 +22,7 @@ #include "pmobjectselect.h" #include "pmlinkedit.h" -#include <tqlayout.h> +#include <layout.h> PMObjectLinkEdit::PMObjectLinkEdit( TQWidget* parent, const char* name ) : Base( parent, name ) diff --git a/kpovmodeler/pmobjectsettings.cpp b/kpovmodeler/pmobjectsettings.cpp index 77e7f0f5..b7c43187 100644 --- a/kpovmodeler/pmobjectsettings.cpp +++ b/kpovmodeler/pmobjectsettings.cpp @@ -37,7 +37,7 @@ #include "pmheightfield.h" #include "pmtext.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqgroupbox.h> #include <tqlabel.h> @@ -47,188 +47,188 @@ PMObjectSettings::PMObjectSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) { - TQHBoxLayout* htqlayout; - TQVBoxLayout* vtqlayout; + TQHBoxLayout* hlayout; + TQVBoxLayout* vlayout; TQVBoxLayout* gvl; TQGridLayout* grid; TQGroupBox* gb; - vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); + vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); gb = new TQGroupBox( i18n( "Subdivisions" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); grid = new TQGridLayout( gvl, 13, 3 ); grid->addWidget( new TQLabel( i18n( "Sphere:" ), gb ), 0, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 0, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 0, 2 ); grid->addWidget( new TQLabel( "u", gb ), 0, 1 ); m_pSphereUSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pSphereUSteps ); + hlayout->addWidget( m_pSphereUSteps ); m_pSphereUSteps->setValidation( true, 2, true, 32 ); - htqlayout->addWidget( new TQLabel( "v", gb ) ); + hlayout->addWidget( new TQLabel( "v", gb ) ); m_pSphereVSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pSphereVSteps ); + hlayout->addWidget( m_pSphereVSteps ); m_pSphereVSteps->setValidation( true, 4, true, 64 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Cylinder:" ), gb ), 1, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 1, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 1, 2 ); m_pCylinderSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pCylinderSteps ); + hlayout->addWidget( m_pCylinderSteps ); m_pCylinderSteps->setValidation( true, 4, true, 64 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Cone:" ), gb ), 2, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 2, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 2, 2 ); m_pConeSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pConeSteps ); + hlayout->addWidget( m_pConeSteps ); m_pConeSteps->setValidation( true, 4, true, 64 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Torus:" ), gb ), 3, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 3, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 3, 2 ); grid->addWidget( new TQLabel( "u", gb ), 3, 1 ); m_pTorusUSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pTorusUSteps ); + hlayout->addWidget( m_pTorusUSteps ); m_pTorusUSteps->setValidation( true, 2, true, 16 ); - htqlayout->addWidget( new TQLabel( "v", gb ) ); + hlayout->addWidget( new TQLabel( "v", gb ) ); m_pTorusVSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pTorusVSteps ); + hlayout->addWidget( m_pTorusVSteps ); m_pTorusVSteps->setValidation( true, 4, true, 64 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Disc:" ), gb ), 4, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 4, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 4, 2 ); m_pDiscSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pDiscSteps ); + hlayout->addWidget( m_pDiscSteps ); m_pDiscSteps->setValidation( true, 4, true, 64 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Blob sphere:" ), gb ), 5, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 5, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 5, 2 ); grid->addWidget( new TQLabel( "u", gb ), 5, 1 ); m_pBlobSphereUSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pBlobSphereUSteps ); + hlayout->addWidget( m_pBlobSphereUSteps ); m_pBlobSphereUSteps->setValidation( true, 2, true, 32 ); - htqlayout->addWidget( new TQLabel( "v", gb ) ); + hlayout->addWidget( new TQLabel( "v", gb ) ); m_pBlobSphereVSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pBlobSphereVSteps ); + hlayout->addWidget( m_pBlobSphereVSteps ); m_pBlobSphereVSteps->setValidation( true, 4, true, 64 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Blob cylinder:" ), gb ), 6, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 6, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 6, 2 ); grid->addWidget( new TQLabel( "u", gb ), 6, 1 ); m_pBlobCylinderUSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pBlobCylinderUSteps ); + hlayout->addWidget( m_pBlobCylinderUSteps ); m_pBlobCylinderUSteps->setValidation( true, 2, true, 32 ); - htqlayout->addWidget( new TQLabel( "v", gb ) ); + hlayout->addWidget( new TQLabel( "v", gb ) ); m_pBlobCylinderVSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pBlobCylinderVSteps ); + hlayout->addWidget( m_pBlobCylinderVSteps ); m_pBlobCylinderVSteps->setValidation( true, 4, true, 64 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Lathe:" ), gb ), 7, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 7, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 7, 2 ); grid->addWidget( new TQLabel( "u", gb ), 7, 1 ); m_pLatheUSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pLatheUSteps ); + hlayout->addWidget( m_pLatheUSteps ); m_pLatheUSteps->setValidation( true, 1, true, 16 ); - htqlayout->addWidget( new TQLabel( "v", gb ) ); + hlayout->addWidget( new TQLabel( "v", gb ) ); m_pLatheRSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pLatheRSteps ); + hlayout->addWidget( m_pLatheRSteps ); m_pLatheRSteps->setValidation( true, 4, true, 64 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Surface of revolution:" ), gb ), 8, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 8, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 8, 2 ); grid->addWidget( new TQLabel( "u", gb ), 8, 1 ); m_pSorUSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pSorUSteps ); + hlayout->addWidget( m_pSorUSteps ); m_pSorUSteps->setValidation( true, 1, true, 16 ); - htqlayout->addWidget( new TQLabel( "v", gb ) ); + hlayout->addWidget( new TQLabel( "v", gb ) ); m_pSorRSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pSorRSteps ); + hlayout->addWidget( m_pSorRSteps ); m_pSorRSteps->setValidation( true, 4, true, 64 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Prism:" ), gb ), 9, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 9, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 9, 2 ); m_pPrismSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pPrismSteps ); + hlayout->addWidget( m_pPrismSteps ); m_pPrismSteps->setValidation( true, 1, true, 16 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Superquadric ellipsoid:" ), gb ), 10, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 10, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 10, 2 ); grid->addWidget( new TQLabel( "u", gb ), 10, 1 ); m_pSqeUSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pSqeUSteps ); + hlayout->addWidget( m_pSqeUSteps ); m_pSqeUSteps->setValidation( true, 2, true, 8 ); - htqlayout->addWidget( new TQLabel( "v", gb ) ); + hlayout->addWidget( new TQLabel( "v", gb ) ); m_pSqeVSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pSqeVSteps ); + hlayout->addWidget( m_pSqeVSteps ); m_pSqeVSteps->setValidation( true, 2, true, 8 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Sphere sweep:" ), gb ), 11, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 11, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 11, 2 ); grid->addWidget( new TQLabel( "r", gb ), 11, 1 ); m_pSphereSweepRSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pSphereSweepRSteps ); + hlayout->addWidget( m_pSphereSweepRSteps ); m_pSphereSweepRSteps->setValidation( true, 4, true, 64 ); - htqlayout->addWidget( new TQLabel( "s", gb ) ); + hlayout->addWidget( new TQLabel( "s", gb ) ); m_pSphereSweepSSteps = new PMIntEdit( gb ); - htqlayout->addWidget( m_pSphereSweepSSteps ); + hlayout->addWidget( m_pSphereSweepSSteps ); m_pSphereSweepSSteps->setValidation( true, 1, true, 16 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); grid->addWidget( new TQLabel( i18n( "Heightfield:" ), gb ), 12, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 12, 2 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 12, 2 ); m_pHeightFieldVariance = new PMIntEdit( gb ); - htqlayout->addWidget( m_pHeightFieldVariance ); + hlayout->addWidget( m_pHeightFieldVariance ); m_pHeightFieldVariance->setValidation( true, 1, true, 16 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); gb = new TQGroupBox( i18n( "Sizes" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); grid = new TQGridLayout( gvl, 1, 2 ); grid->addWidget( new TQLabel( i18n( "Plane:" ), gb ), 0, 0 ); - htqlayout = new TQHBoxLayout( ); - grid->addLayout( htqlayout, 0, 1 ); + hlayout = new TQHBoxLayout( ); + grid->addLayout( hlayout, 0, 1 ); m_pPlaneSize = new PMFloatEdit( gb ); - htqlayout->addWidget( m_pPlaneSize ); + hlayout->addWidget( m_pPlaneSize ); m_pPlaneSize->setValidation( true, 0.1, false, 0.0 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); gb = new TQGroupBox( i18n( "Camera Views" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); m_pHighDetailCameraViews = new TQCheckBox( i18n( "High detail for enhanced projections" ), gb ); gvl->addWidget( m_pHighDetailCameraViews ); - vtqlayout->addStretch( 1 ); + vlayout->addStretch( 1 ); } void PMObjectSettings::displaySettings( ) @@ -425,125 +425,125 @@ bool PMObjectSettings::validateData( ) void PMObjectSettings::applySettings( ) { - bool tqrepaint = false; + bool repaint = false; PMRenderManager* rm = PMRenderManager::theManager( ); if( rm->highDetailCameraViews( ) != m_pHighDetailCameraViews->isChecked( ) ) { rm->setHighDetailCameraViews( m_pHighDetailCameraViews->isChecked( ) ); - tqrepaint = true; + repaint = true; } if( PMSphere::uSteps( ) != m_pSphereUSteps->value( ) ) { PMSphere::setUSteps( m_pSphereUSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMSphere::vSteps( ) != m_pSphereVSteps->value( ) ) { PMSphere::setVSteps( m_pSphereVSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMCylinder::steps( ) != m_pCylinderSteps->value( ) ) { PMCylinder::setSteps( m_pCylinderSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMCone::steps( ) != m_pConeSteps->value( ) ) { PMCone::setSteps( m_pConeSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMTorus::uSteps( ) != m_pTorusUSteps->value( ) ) { PMTorus::setUSteps( m_pTorusUSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMTorus::vSteps( ) != m_pTorusVSteps->value( ) ) { PMTorus::setVSteps( m_pTorusVSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMDisc::steps( ) != m_pDiscSteps->value( ) ) { PMDisc::setSteps( m_pDiscSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMBlobSphere::uSteps( ) != m_pBlobSphereUSteps->value( ) ) { PMBlobSphere::setUSteps( m_pBlobSphereUSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMBlobSphere::vSteps( ) != m_pBlobSphereVSteps->value( ) ) { PMBlobSphere::setVSteps( m_pBlobSphereVSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMBlobCylinder::uSteps( ) != m_pBlobCylinderUSteps->value( ) ) { PMBlobCylinder::setUSteps( m_pBlobCylinderUSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMBlobCylinder::vSteps( ) != m_pBlobCylinderVSteps->value( ) ) { PMBlobCylinder::setVSteps( m_pBlobCylinderVSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMPlane::planeSize( ) != m_pPlaneSize->value( ) ) { PMPlane::setPlaneSize( m_pPlaneSize->value( ) ); - tqrepaint = true; + repaint = true; } if( PMLathe::sSteps( ) != m_pLatheUSteps->value( ) ) { PMLathe::setSSteps( m_pLatheUSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMLathe::rSteps( ) != m_pLatheRSteps->value( ) ) { PMLathe::setRSteps( m_pLatheRSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMSurfaceOfRevolution::sSteps( ) != m_pSorUSteps->value( ) ) { PMSurfaceOfRevolution::setSSteps( m_pSorUSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMSurfaceOfRevolution::rSteps( ) != m_pSorRSteps->value( ) ) { PMSurfaceOfRevolution::setRSteps( m_pSorRSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMPrism::sSteps( ) != m_pPrismSteps->value( ) ) { PMPrism::setSSteps( m_pPrismSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMSuperquadricEllipsoid::uSteps( ) != m_pSqeUSteps->value( ) ) { PMSuperquadricEllipsoid::setUSteps( m_pSqeUSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMSuperquadricEllipsoid::vSteps( ) != m_pSqeVSteps->value( ) ) { PMSuperquadricEllipsoid::setVSteps( m_pSqeVSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMSphereSweep::rSteps( ) != m_pSphereSweepRSteps->value( ) ) { PMSphereSweep::setRSteps( m_pSphereSweepRSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMSphereSweep::sSteps( ) != m_pSphereSweepSSteps->value( ) ) { PMSphereSweep::setSSteps( m_pSphereSweepSSteps->value( ) ); - tqrepaint = true; + repaint = true; } if( PMHeightField::variance( ) != m_pHeightFieldVariance->value( ) ) { PMHeightField::setVariance( m_pHeightFieldVariance->value( ) ); - tqrepaint = true; + repaint = true; } - if( tqrepaint ) + if( repaint ) emit repaintViews( ); } diff --git a/kpovmodeler/pmopenglsettings.cpp b/kpovmodeler/pmopenglsettings.cpp index 07376933..d3bf5098 100644 --- a/kpovmodeler/pmopenglsettings.cpp +++ b/kpovmodeler/pmopenglsettings.cpp @@ -20,7 +20,7 @@ #include "pmglview.h" #include "pmdefaults.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <klocale.h> @@ -28,12 +28,12 @@ PMOpenGLSettings::PMOpenGLSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) { - TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); + TQVBoxLayout* vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); m_pDirect = new TQCheckBox( i18n( "Direct rendering" ), this ); - vtqlayout->addWidget( new TQLabel( i18n( "Changes take only effect after a restart!" ), this ) ); - vtqlayout->addWidget( m_pDirect ); - vtqlayout->addStretch( 1 ); + vlayout->addWidget( new TQLabel( i18n( "Changes take only effect after a restart!" ), this ) ); + vlayout->addWidget( m_pDirect ); + vlayout->addStretch( 1 ); } void PMOpenGLSettings::displaySettings( ) diff --git a/kpovmodeler/pmoutputdevice.cpp b/kpovmodeler/pmoutputdevice.cpp index 1ee91b52..bec1675d 100644 --- a/kpovmodeler/pmoutputdevice.cpp +++ b/kpovmodeler/pmoutputdevice.cpp @@ -18,7 +18,7 @@ #include "pmoutputdevice.h" #include "pmpovrayformat.h" -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> unsigned int PMOutputDevice::s_indentOffset = 3; @@ -55,22 +55,22 @@ 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( ) ) ); + .arg( o->description( ) ).arg( description( ) ) ); } else { printError( i18n( "The class \"%1\" doesn't support %2." ) - .tqarg( o->description( ) ).tqarg( mo->className( ) ) ); + .arg( o->description( ) ).arg( mo->className( ) ) ); } } } void PMOutputDevice::serialize( PMObject* o ) { - callSerialization( o, o->tqmetaObject( ) ); + callSerialization( o, o->metaObject( ) ); } void PMOutputDevice::close( ) diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp index 25e1ac64..6cedc617 100644 --- a/kpovmodeler/pmpalettevalueedit.cpp +++ b/kpovmodeler/pmpalettevalueedit.cpp @@ -22,7 +22,7 @@ #include "pmdebug.h" #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqlabel.h> #include <tqlineedit.h> @@ -39,21 +39,21 @@ PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* parent, const char* name ) : TQWidget( parent, name ) { TQLabel* lbl; - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; m_pIndexEdit = new PMIntEdit( this ); m_pValueEdit = new PMFloatEdit( this ); - tqlayout = new TQHBoxLayout( this ); + layout = new TQHBoxLayout( this ); lbl = new TQLabel( i18n( "Index" ), this ); - tqlayout->addWidget( lbl ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); - tqlayout->addWidget( m_pIndexEdit ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( lbl ); + layout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( m_pIndexEdit ); + layout->addSpacing( KDialog::spacingHint( ) ); lbl = new TQLabel( i18n( "Value" ), this ); - tqlayout->addWidget( lbl ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); - tqlayout->addWidget( m_pValueEdit ); + layout->addWidget( lbl ); + layout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( m_pValueEdit ); connect( m_pIndexEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); connect( m_pValueEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp index 52a64acc..5920c448 100644 --- a/kpovmodeler/pmparser.cpp +++ b/kpovmodeler/pmparser.cpp @@ -107,7 +107,7 @@ void PMParser::printMessage( const PMPMessage messageNum ) void PMParser::printMessage( const TQString& type, const TQString& msg ) { if( m_lineNum >= 0 ) - m_messages += PMMessage( i18n( "Line %1: " ).tqarg( m_lineNum ) + type + ": " + msg ); + m_messages += PMMessage( i18n( "Line %1: " ).arg( m_lineNum ) + type + ": " + msg ); else m_messages += PMMessage( type + ": " + msg ); } @@ -122,7 +122,7 @@ void PMParser::printError( const TQString& msg ) else if( m_errors == s_maxErrors ) { m_messages += PMMessage( i18n( "Maximum of %1 errors reached." ) - .tqarg( s_maxErrors ) ); + .arg( s_maxErrors ) ); m_errors++; } } @@ -137,7 +137,7 @@ void PMParser::printWarning( const TQString& msg ) else if( m_warnings == s_maxWarnings ) { m_messages += PMMessage( i18n( "Maximum of %1 warnings reached." ) - .tqarg( s_maxWarnings ) ); + .arg( s_maxWarnings ) ); m_warnings++; } } @@ -145,18 +145,18 @@ void PMParser::printWarning( const TQString& msg ) void PMParser::printExpected( const char c, const char* sValue ) { printError( i18n( "'%1' expected, found token '%2' instead." ) - .tqarg( c ).tqarg( sValue ) ); + .arg( c ).arg( sValue ) ); } void PMParser::printExpected( const TQString& str, const char* sValue ) { printError( i18n( "'%1' expected, found token '%2' instead." ) - .tqarg( str ).tqarg( sValue ) ); + .arg( str ).arg( sValue ) ); } void PMParser::printUnexpected( const TQString& str ) { - printError( i18n( "Unexpected token '%1'." ).tqarg( str ) ); + printError( i18n( "Unexpected token '%1'." ).arg( str ) ); } void PMParser::printInfo( const TQString& msg ) @@ -254,8 +254,8 @@ bool PMParser::insertChild( PMObject* child, PMObject* parent ) else { printError( i18n( "Can't insert %1 into %2." ) - .tqarg( child->description( ) ) - .tqarg( parent->description( ) ) ); + .arg( child->description( ) ) + .arg( parent->description( ) ) ); } } else @@ -270,8 +270,8 @@ bool PMParser::insertChild( PMObject* child, PMObject* parent ) else { printError( i18n( "Can't insert %1 into %2." ) - .tqarg( child->description( ) ) - .tqarg( m_pTopParent->description( ) ) ); + .arg( child->description( ) ) + .arg( m_pTopParent->description( ) ) ); } } else @@ -379,9 +379,9 @@ PMDeclare* PMParser::checkLink( const TQString& id ) s = t->find( id ); if( !s ) - printError( i18n( "Undefined object \"%1\"." ).tqarg( id ) ); + printError( i18n( "Undefined object \"%1\"." ).arg( id ) ); else if( s->type( ) != PMSymbol::Object ) - printError( i18n( "Undefined object \"%1\"." ).tqarg( id ) ); + printError( i18n( "Undefined object \"%1\"." ).arg( id ) ); else { // the object is declared @@ -409,7 +409,7 @@ PMDeclare* PMParser::checkLink( const TQString& id ) if( !ok ) printError( i18n( "Object \"%1\" is undefined at that point." ) - .tqarg( id ) ); + .arg( id ) ); } if( ok ) diff --git a/kpovmodeler/pmparser.h b/kpovmodeler/pmparser.h index 07a28ab6..6d75abe6 100644 --- a/kpovmodeler/pmparser.h +++ b/kpovmodeler/pmparser.h @@ -82,7 +82,7 @@ public: * Appends all parsed objects to the list. * * parent is the object where the parsed objects will be inserted as - * tqchildren behind the object after. These parameters are used to check + * children behind the object after. These parameters are used to check * the consistency of declares and links. * * Set parent and after to 0 if and only if a document is parsed/opened. @@ -218,7 +218,7 @@ protected: PMPart* m_pPart; /** * parent object where the parsed top level objects - * will be inserted _later_ (not from the parser) as tqchildren + * will be inserted _later_ (not from the parser) as children */ const PMObject* m_pTopParent; const PMObject* m_pAfter; diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp index b9105b29..7409079a 100644 --- a/kpovmodeler/pmpart.cpp +++ b/kpovmodeler/pmpart.cpp @@ -20,9 +20,9 @@ #include <tqapplication.h> #include <tqdir.h> #include <tqstrlist.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqmessagebox.h> #include <tqcombobox.h> #include <tqspinbox.h> @@ -145,7 +145,7 @@ PMPart::PMPart( TQWidget* parentWidget, const char* widgetName, restoreConfig( instance( )->config( ) ); - connect( tqApp->tqclipboard( ), TQT_SIGNAL( dataChanged( ) ), + connect( tqApp->clipboard( ), TQT_SIGNAL( dataChanged( ) ), TQT_SLOT( slotClipboardDataChanged( ) ) ); slotClipboardDataChanged( ); connect( &m_commandManager, TQT_SIGNAL( updateUndoRedo( const TQString&, const TQString& ) ), @@ -730,7 +730,7 @@ void PMPart::initView( TQWidget* parent, const char* name ) if( !m_pShell ) { // a part inside konqueror - // simple tqlayout + // simple layout m_pView = new PMView( this, parent, name ); m_pView->show( ); setWidget( m_pView ); @@ -1050,7 +1050,7 @@ bool PMPart::setActiveObject( const TQString& name ) else objIndex = 0; - // Iterate the tqchildren for this element. We stop when there are no more siblings + // Iterate the children for this element. We stop when there are no more siblings // or the object is of the correct type and it's index count is also correct siblingIndex = 0; tmpSibling = tmpObj->firstChild( ); @@ -1373,10 +1373,10 @@ void PMPart::slotFileImport( ) if( newParser ) { if( m_pActiveObject ) - insertFromParser( i18n( "Import %1" ).tqarg( selectedFormat->description( ) ), + insertFromParser( i18n( "Import %1" ).arg( selectedFormat->description( ) ), newParser, m_pActiveObject ); else - insertFromParser( i18n( "Import %1" ).tqarg( selectedFormat->description( ) ), + insertFromParser( i18n( "Import %1" ).arg( selectedFormat->description( ) ), newParser, m_pScene ); delete newParser; } @@ -1450,7 +1450,7 @@ void PMPart::slotEditCut( ) if( sortedList.count( ) > 0 ) { - TQApplication::tqclipboard( )->setData( new PMObjectDrag( this, sortedList ) ); + TQApplication::clipboard( )->setData( new PMObjectDrag( this, sortedList ) ); removeSelection( i18n( "Cut" ) ); } @@ -1472,7 +1472,7 @@ void PMPart::slotEditCopy( ) const PMObjectList& sortedList = selectedObjects( ); if( sortedList.count( ) > 0 ) - TQApplication::tqclipboard( )->setData( new PMObjectDrag( this, sortedList ) ); + TQApplication::clipboard( )->setData( new PMObjectDrag( this, sortedList ) ); emit setStatusBarText( "" ); } @@ -1549,7 +1549,7 @@ void PMPart::slotEditPaste( ) { emit setStatusBarText( i18n( "Inserting clipboard contents..." ) ); - pasteOrDrop( i18n( "Paste" ), tqApp->tqclipboard( )->data( ), + pasteOrDrop( i18n( "Paste" ), tqApp->clipboard( )->data( ), m_pActiveObject ); emit setStatusBarText( "" ); @@ -2508,7 +2508,7 @@ void PMPart::slotClipboardDataChanged( ) { if( isReadWrite( ) ) { - m_canDecode = PMObjectDrag::canDecode( tqApp->tqclipboard( )->data( ), this ); + m_canDecode = PMObjectDrag::canDecode( tqApp->clipboard( )->data( ), this ); m_pPasteAction->setEnabled( m_canDecode && m_pActiveObject ); } else 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/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp index c8d815a8..54630c83 100644 --- a/kpovmodeler/pmpatternedit.cpp +++ b/kpovmodeler/pmpatternedit.cpp @@ -25,7 +25,7 @@ #include "pmvector.h" #include <tqwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcombobox.h> #include <tqlabel.h> #include <tqlineedit.h> @@ -48,12 +48,12 @@ void PMPatternEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQGridLayout* tqlayout; + TQGridLayout* layout; TQHBoxLayout* hl; TQVBoxLayout* vl; TQGridLayout* gl; - tqlayout = new TQGridLayout( topLayout( ), 12, 2 ); + layout = new TQGridLayout( topLayout( ), 12, 2 ); hl = new TQHBoxLayout( KDialog::spacingHint( ) ); hl->addWidget( new TQLabel( i18n( "Type:" ), this ) ); m_pTypeCombo = new TQComboBox( false, this ); @@ -88,12 +88,12 @@ void PMPatternEdit::createTopWidgets( ) m_pTypeCombo->insertItem( i18n( "Wrinkles" ) ); hl->addWidget( m_pTypeCombo ); hl->addStretch( 1 ); - tqlayout->addMultiCellLayout( hl, 0, 0, 0, 1 ); + layout->addMultiCellLayout( hl, 0, 0, 0, 1 ); m_pAgateTurbulenceLabel = new TQLabel( i18n( "Turbulence:" ), this ); - tqlayout->addWidget( m_pAgateTurbulenceLabel, 1, 0 ); + layout->addWidget( m_pAgateTurbulenceLabel, 1, 0 ); m_pAgateTurbulenceEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pAgateTurbulenceEdit, 1, 1, AlignLeft ); + layout->addWidget( m_pAgateTurbulenceEdit, 1, 1, AlignLeft ); m_pCrackleWidget = new TQWidget( this ); vl = new TQVBoxLayout( m_pCrackleWidget, 0, KDialog::spacingHint( ) ); @@ -114,7 +114,7 @@ void PMPatternEdit::createTopWidgets( ) m_pCrackleSolid = new TQCheckBox( i18n( "Solid:" ), m_pCrackleWidget ); gl->addMultiCellWidget( m_pCrackleSolid, 2, 2, 0, 1 ); hl->addStretch( 1 ); - tqlayout->addMultiCellWidget( m_pCrackleWidget, 2, 2, 0, 1 ); + layout->addMultiCellWidget( m_pCrackleWidget, 2, 2, 0, 1 ); m_pDensityWidget = new TQWidget( this ); vl = new TQVBoxLayout( m_pDensityWidget, 0, KDialog::spacingHint( ) ); @@ -132,17 +132,17 @@ void PMPatternEdit::createTopWidgets( ) m_pDensityInterpolate->insertItem( i18n( "Trilinear" ) ); hl->addWidget( m_pDensityInterpolate ); hl->addStretch( 1 ); - tqlayout->addMultiCellWidget( m_pDensityWidget, 3, 3, 0, 1 ); + layout->addMultiCellWidget( m_pDensityWidget, 3, 3, 0, 1 ); m_pGradientLabel = new TQLabel( i18n( "Gradient:" ), this ); - tqlayout->addWidget( m_pGradientLabel, 4, 0 ); + layout->addWidget( m_pGradientLabel, 4, 0 ); m_pGradientEdit = new PMVectorEdit( "x", "y", "z", this ); - tqlayout->addWidget( m_pGradientEdit, 4, 1 ); + layout->addWidget( m_pGradientEdit, 4, 1 ); m_pJuliaComplexLabel = new TQLabel( i18n( "Complex number:" ), this ); - tqlayout->addWidget( m_pJuliaComplexLabel, 5, 0 ); + layout->addWidget( m_pJuliaComplexLabel, 5, 0 ); m_pJuliaComplex = new PMVectorEdit( "Real", "Imaginary", this ); - tqlayout->addWidget( m_pJuliaComplex, 5, 1 ); + layout->addWidget( m_pJuliaComplex, 5, 1 ); m_pFractalWidget = new TQWidget( this ); vl = new TQVBoxLayout( m_pFractalWidget, 0, KDialog::spacingHint( ) ); @@ -195,7 +195,7 @@ void PMPatternEdit::createTopWidgets( ) m_pFractalIntFactor = new PMFloatEdit( m_pFractalWidget ); gl->addWidget( m_pFractalIntFactor, 1, 3 ); hl->addStretch( 1 ); - tqlayout->addMultiCellWidget( m_pFractalWidget, 6, 6, 0, 1 ); + layout->addMultiCellWidget( m_pFractalWidget, 6, 6, 0, 1 ); m_pQuiltControlsLabel = new TQLabel( i18n( "Quilt controls:" ), this ); m_pQuiltControl0Edit = new PMFloatEdit( this ); @@ -204,8 +204,8 @@ void PMPatternEdit::createTopWidgets( ) hl->addWidget( m_pQuiltControl0Edit ); hl->addWidget( m_pQuiltControl1Edit ); hl->addStretch( 1 ); - tqlayout->addWidget( m_pQuiltControlsLabel, 7, 0 ); - tqlayout->addLayout( hl, 7, 1 ); + layout->addWidget( m_pQuiltControlsLabel, 7, 0 ); + layout->addLayout( hl, 7, 1 ); m_pSlopeWidget = new TQWidget( this ); vl = new TQVBoxLayout( m_pSlopeWidget, 0, KDialog::spacingHint( ) ); @@ -240,17 +240,17 @@ void PMPatternEdit::createTopWidgets( ) m_pSlopeHiAlt = new PMFloatEdit( m_pSlopeWidget ); gl->addWidget( m_pSlopeHiAlt, 1, 1 ); hl->addStretch( 1 ); - tqlayout->addMultiCellWidget( m_pSlopeWidget, 8, 8, 0, 1 ); + layout->addMultiCellWidget( m_pSlopeWidget, 8, 8, 0, 1 ); m_pSpiralNumberLabel = new TQLabel( i18n( "Spiral number:" ), this ); m_pSpiralNumberEdit = new PMIntEdit( this ); - tqlayout->addWidget( m_pSpiralNumberLabel, 9, 0 ); - tqlayout->addWidget( m_pSpiralNumberEdit, 9, 1, AlignLeft ); + layout->addWidget( m_pSpiralNumberLabel, 9, 0 ); + layout->addWidget( m_pSpiralNumberEdit, 9, 1, AlignLeft ); m_pDepthLabel = new TQLabel( i18n( "Depth:" ), this ); m_pDepthEdit = new PMFloatEdit( this ); - tqlayout->addWidget( m_pDepthLabel, 10, 0 ); - tqlayout->addWidget( m_pDepthEdit, 10, 1, AlignLeft ); + layout->addWidget( m_pDepthLabel, 10, 0 ); + layout->addWidget( m_pDepthEdit, 10, 1, AlignLeft ); m_pNoiseGeneratorLabel = new TQLabel( i18n( "Noise generator:" ), this ); m_pNoiseGenerator = new TQComboBox( false, this ); @@ -258,8 +258,8 @@ void PMPatternEdit::createTopWidgets( ) m_pNoiseGenerator->insertItem( i18n( "Original" ) ); m_pNoiseGenerator->insertItem( i18n( "Range Corrected" ) ); m_pNoiseGenerator->insertItem( i18n( "Perlin" ) ); - tqlayout->addWidget( m_pNoiseGeneratorLabel, 11, 0 ); - tqlayout->addWidget( m_pNoiseGenerator, 11, 1 ); + layout->addWidget( m_pNoiseGeneratorLabel, 11, 0 ); + layout->addWidget( m_pNoiseGenerator, 11, 1 ); m_pEnableTurbulenceEdit = new TQCheckBox( i18n( "Turbulence" ), this ); topLayout( )->addWidget( m_pEnableTurbulenceEdit ); 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/pmphotonsedit.cpp b/kpovmodeler/pmphotonsedit.cpp index a2fde9a2..a0dd8d9a 100644 --- a/kpovmodeler/pmphotonsedit.cpp +++ b/kpovmodeler/pmphotonsedit.cpp @@ -20,7 +20,7 @@ #include "pmphotons.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <klocale.h> 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/pmpigmentedit.cpp b/kpovmodeler/pmpigmentedit.cpp index 16bfab2c..5b28d545 100644 --- a/kpovmodeler/pmpigmentedit.cpp +++ b/kpovmodeler/pmpigmentedit.cpp @@ -20,7 +20,7 @@ #include "pmpigment.h" #include "pmlinkedit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> 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/pmplaneedit.cpp b/kpovmodeler/pmplaneedit.cpp index 5f90b008..ca0620dd 100644 --- a/kpovmodeler/pmplaneedit.cpp +++ b/kpovmodeler/pmplaneedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <tqcheckbox.h> @@ -38,24 +38,24 @@ void PMPlaneEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; m_pNormal = new PMVectorEdit( "x", "y", "z", this ); m_pDistance = new PMFloatEdit( this ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( new TQLabel( i18n( "Normal:" ), this ) ); - tqlayout->addWidget( m_pNormal ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( new TQLabel( i18n( "Normal:" ), this ) ); + layout->addWidget( m_pNormal ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( new TQLabel( i18n( "Distance:" ), this ) ); - tqlayout->addWidget( m_pDistance ); - tqlayout->addStretch( 1 ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( new TQLabel( i18n( "Distance:" ), this ) ); + layout->addWidget( m_pDistance ); + layout->addStretch( 1 ); TQPushButton* nb = new TQPushButton( i18n( "Normalize" ), this ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( nb ); - tqlayout->addStretch( 1 ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( nb ); + layout->addStretch( 1 ); connect( m_pNormal, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); connect( m_pDistance, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); diff --git a/kpovmodeler/pmpluginsettings.cpp b/kpovmodeler/pmpluginsettings.cpp index f53f9f96..30ffa055 100644 --- a/kpovmodeler/pmpluginsettings.cpp +++ b/kpovmodeler/pmpluginsettings.cpp @@ -19,7 +19,7 @@ #include "pmpluginmanager.h" -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqlistview.h> #include <tqpushbutton.h> @@ -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" ) ); @@ -54,10 +54,10 @@ public: PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) { - TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); + TQVBoxLayout* vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); TQGroupBox* gb = new TQGroupBox( i18n( "Installed Plugins" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); TQVBoxLayout* gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); @@ -77,7 +77,7 @@ PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name ) hl->addWidget( m_pToggle ); hl->addStretch( 1 ); - vtqlayout->addStretch( 1 ); + vlayout->addStretch( 1 ); } void PMPluginSettings::displaySettings( ) @@ -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/pmpolynomedit.cpp b/kpovmodeler/pmpolynomedit.cpp index ec3176d0..54a8cf16 100644 --- a/kpovmodeler/pmpolynomedit.cpp +++ b/kpovmodeler/pmpolynomedit.cpp @@ -22,7 +22,7 @@ #include "pmlineedits.h" #include "pmformulalabel.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqspinbox.h> #include <tqlabel.h> @@ -96,8 +96,8 @@ void PMPolynomEdit::displayCoefficients( const PMVector& co, int cOrder, { if( m_currentOrder > 0 ) { - if( m_pPolyWidget->tqlayout( ) ) - delete m_pPolyWidget->tqlayout( ); + if( m_pPolyWidget->layout( ) ) + delete m_pPolyWidget->layout( ); m_labels.setAutoDelete( true ); m_labels.clear( ); diff --git a/kpovmodeler/pmpovray31serialization.cpp b/kpovmodeler/pmpovray31serialization.cpp index 543fec5b..d153261d 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,16 +102,16 @@ 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; dev->objectBegin( "blob" ); dev->writeName( object->name( ) ); - dev->writeLine( TQString( "threshold %1" ).tqarg( o->threshold( ) ) ); + dev->writeLine( TQString( "threshold %1" ).arg( 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; @@ -132,36 +132,36 @@ void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* tqmetaO str1.setNum( o->radius( ) ); dev->writeLine( o->end1( ).serialize( ) + ", " + o->end2( ).serialize( ) + ", " + str1 + "," ); - dev->writeLine( TQString( "strength %1" ).tqarg( o->strength( ) ) ); + dev->writeLine( TQString( "strength %1" ).arg( 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; dev->objectBegin( "sphere" ); 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->writeLine( o->centre( ).serialize( ) + TQString( ", %1," ).arg( o->radius( ) ) ); + dev->writeLine( TQString( "strength %1" ).arg( o->strength( ) ) ); + 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( ) ); @@ -544,7 +544,7 @@ void PMPov31SerFog( const PMObject* object, const PMMetaObject*, PMOutputDevice* if( text.isEmpty( ) ) text = o->description( ); - dev->writeComment( TQString( "No prototype for %1" ).tqarg( text ) ); + dev->writeComment( TQString( "No prototype for %1" ).arg( text ) ); } } @@ -587,8 +587,8 @@ void PMPov31SerFog( const PMObject* object, const PMMetaObject*, PMOutputDevice* dev->writeLine( "fog_alt " + str ); dev->writeLine( "up " + o->up( ).serialize( ) ); } - // Serialize the tqchildren of this object - dev->callSerialization( object, object->tqmetaObject( )->superClass( )->superClass( ) ); + // Serialize the children of this object + 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; @@ -727,13 +727,13 @@ void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* tqmetaOb dev->writeLine( o->typeToString( o->heightFieldType( ) ) + " \"" + o->fileName( ) + "\"" ); if( o->waterLevel( ) > 0.0 ) - dev->writeLine( TQString( "water_level %1" ).tqarg( o->waterLevel( ) ) ); + dev->writeLine( TQString( "water_level %1" ).arg( o->waterLevel( ) ) ); if( !o->hierarchy( ) ) dev->writeLine( "hierarchy off" ); 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; @@ -885,22 +885,22 @@ void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* tqmetaO dev->writeLine( o->algebraTypeToString( o->algebraType( ) ) ); if( o->functionType( ) == PMJuliaFractal::FTpwr ) - dev->writeLine( TQString( "pwr(%1, %2)" ).tqarg( o->exponent( )[0] ). + dev->writeLine( TQString( "pwr(%1, %2)" ).arg( o->exponent( )[0] ). arg( o->exponent( )[1] ) ); else dev->writeLine( o->functionTypeToString( o->functionType( ) ) ); - dev->writeLine( TQString( "max_iteration %1" ).tqarg( o->maximumIterations( ) ) ); - dev->writeLine( TQString( "precision %1" ).tqarg( o->precision( ) ) ); - dev->writeLine( TQString( "slice %1, %2" ).tqarg( o->sliceNormal( ).serialize( ) ) - .tqarg( o->sliceDistance( ) ) ); + dev->writeLine( TQString( "max_iteration %1" ).arg( o->maximumIterations( ) ) ); + dev->writeLine( TQString( "precision %1" ).arg( o->precision( ) ) ); + dev->writeLine( TQString( "slice %1, %2" ).arg( o->sliceNormal( ).serialize( ) ) + .arg( 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; @@ -925,7 +925,7 @@ void PMPov31SerLathe( const PMObject* object, const PMMetaObject* tqmetaObject, } int num = o->points( ).count( ); - dev->writeLine( TQString( "%1," ).tqarg( num ) ); + dev->writeLine( TQString( "%1," ).arg( num ) ); bool first = true; TQValueList<PMVector> points = o->points( ); @@ -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; @@ -968,10 +968,10 @@ void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, if( ( o->lightType( ) == PMLight::SpotLight ) || ( o->lightType( ) == PMLight::CylinderLight ) ) { - dev->writeLine( TQString( "radius %1" ).tqarg( o->radius( ) ) ); - dev->writeLine( TQString( "falloff %1" ).tqarg( o->falloff( ) ) ); + dev->writeLine( TQString( "radius %1" ).arg( o->radius( ) ) ); + dev->writeLine( TQString( "falloff %1" ).arg( o->falloff( ) ) ); if( o->tightness( ) != c_defaultLightTightness ) - dev->writeLine( TQString( "tightness %1" ).tqarg( o->tightness( ) ) ); + dev->writeLine( TQString( "tightness %1" ).arg( o->tightness( ) ) ); dev->writeLine( TQString( "point_at " ) + o->pointAt( ).serialize( ) ); } @@ -979,17 +979,17 @@ void PMPov31SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, { dev->writeLine( TQString( "area_light " ) + o->axis1( ).serialize( ) + TQString( ", " ) + o->axis2( ).serialize( ) - + TQString( ", %1, %2" ).tqarg( o->size1( ) ).tqarg( o->size2( ) ) ); + + TQString( ", %1, %2" ).arg( o->size1( ) ).arg( o->size2( ) ) ); if( o->adaptive( ) != c_defaultLightAdaptive ) - dev->writeLine( TQString( "adaptive %1" ).tqarg( o->adaptive( ) ) ); + dev->writeLine( TQString( "adaptive %1" ).arg( o->adaptive( ) ) ); if( o->jitter( ) ) dev->writeLine( TQString( "jitter" ) ); } if( o->fading( ) ) { - dev->writeLine( TQString( "fade_distance %1" ).tqarg( o->fadeDistance( ) ) ); - dev->writeLine( TQString( "fade_power %1" ).tqarg( o->fadePower( ) ) ); + dev->writeLine( TQString( "fade_distance %1" ).arg( o->fadeDistance( ) ) ); + dev->writeLine( TQString( "fade_power %1" ).arg( o->fadePower( ) ) ); } if( !o->mediaInteraction( ) ) @@ -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( ); @@ -1302,7 +1302,7 @@ void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* tqmetaObj if( text.isEmpty( ) ) text = o->description( ); - dev->writeComment( TQString( "No prototype for %1" ).tqarg( text ) ); + dev->writeComment( TQString( "No prototype for %1" ).arg( text ) ); } } @@ -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( ); @@ -1501,18 +1501,18 @@ void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* tqmetaObject if( o->polynomOrder( ) == 2 ) { - dev->writeLine( TQString( "<%1, %2, %3>," ).tqarg( coefficients[0] ) - .tqarg( coefficients[4] ).tqarg( coefficients[7] ) ); - dev->writeLine( TQString( "<%1, %2, %3>," ).tqarg( coefficients[1] ) - .tqarg( coefficients[2] ).tqarg( coefficients[5] ) ); - dev->writeLine( TQString( "<%1, %2, %3>, %4" ).tqarg( coefficients[3] ) - .tqarg( coefficients[6] ).tqarg( coefficients[8] ) - .tqarg( coefficients[9] ) ); + dev->writeLine( TQString( "<%1, %2, %3>," ).arg( coefficients[0] ) + .arg( coefficients[4] ).arg( coefficients[7] ) ); + dev->writeLine( TQString( "<%1, %2, %3>," ).arg( coefficients[1] ) + .arg( coefficients[2] ).arg( coefficients[5] ) ); + dev->writeLine( TQString( "<%1, %2, %3>, %4" ).arg( coefficients[3] ) + .arg( coefficients[6] ).arg( coefficients[8] ) + .arg( coefficients[9] ) ); } else { if( o->polynomOrder( ) > 4 ) - dev->writeLine( TQString( "%1," ).tqarg( o->polynomOrder( ) ) ); + dev->writeLine( TQString( "%1," ).arg( o->polynomOrder( ) ) ); int size = coefficients.size( ); @@ -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( ); } @@ -1545,17 +1545,17 @@ void PMPov31SerPovrayMatrix( const PMObject* object, const PMMetaObject*, PMOutp { PMPovrayMatrix* o = ( PMPovrayMatrix* ) object; - dev->writeLine( TQString( "matrix < %1, %2, %3," ).tqarg( o->values( )[0] ) - .tqarg( o->values( )[1] ).tqarg( o->values( )[2] ) ); - dev->writeLine( TQString( " %1, %2, %3," ).tqarg( o->values( )[3] ) - .tqarg( o->values( )[4] ).tqarg( o->values( )[5] ) ); - dev->writeLine( TQString( " %1, %2, %3," ).tqarg( o->values( )[6] ) - .tqarg( o->values( )[7] ).tqarg( o->values( )[8] ) ); - dev->writeLine( TQString( " %1, %2, %3 >" ).tqarg( o->values( )[9] ) - .tqarg( o->values( )[10] ).tqarg( o->values( )[11] ) ); + dev->writeLine( TQString( "matrix < %1, %2, %3," ).arg( o->values( )[0] ) + .arg( o->values( )[1] ).arg( o->values( )[2] ) ); + dev->writeLine( TQString( " %1, %2, %3," ).arg( o->values( )[3] ) + .arg( o->values( )[4] ).arg( o->values( )[5] ) ); + dev->writeLine( TQString( " %1, %2, %3," ).arg( o->values( )[6] ) + .arg( o->values( )[7] ).arg( o->values( )[8] ) ); + dev->writeLine( TQString( " %1, %2, %3 >" ).arg( o->values( )[9] ) + .arg( o->values( )[10] ).arg( 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; @@ -1587,7 +1587,7 @@ void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject, dev->writeLine( "conic_sweep" ); break; } - dev->writeLine( TQString( "%1, %2," ).tqarg( o->height1( ) ).tqarg( o->height2( ) ) ); + dev->writeLine( TQString( "%1, %2," ).arg( o->height1( ) ).arg( o->height2( ) ) ); // count number of points TQValueList< TQValueList<PMVector> > points = o->points( ); @@ -1600,7 +1600,7 @@ void PMPov31SerPrism( const PMObject* object, const PMMetaObject* tqmetaObject, else lines += ( *spit ).count( ) / 3 * 4; } - dev->writeLine( TQString( "%1," ).tqarg( lines ) ); + dev->writeLine( TQString( "%1," ).arg( lines ) ); for( spit = points.begin( ); spit != points.end( ); ++spit ) { @@ -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( ) ); @@ -1756,20 +1756,20 @@ void PMPov31SerScale( const PMObject* object, const PMMetaObject* , PMOutputDevi if( approx( scale[0], scale[1] ) && approx( scale[1], scale[2] ) ) - dev->writeLine( TQString( "scale %1" ).tqarg( scale[0] ) ); + dev->writeLine( TQString( "scale %1" ).arg( scale[0] ) ); else 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; @@ -1821,7 +1821,7 @@ void PMPov31SerSurfaceOfRevolution( const PMObject* object, const PMMetaObject* dev->writeName( object->name( ) ); int num = o->points( ).count( ); - dev->writeLine( TQString( "%1," ).tqarg( num ) ); + dev->writeLine( TQString( "%1," ).arg( num ) ); bool first = true; TQValueList<PMVector> points = o->points( ); @@ -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,25 +1853,25 @@ 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; dev->objectBegin( "superellipsoid" ); dev->writeName( object->name( ) ); - dev->writeLine( TQString( "<%1, %2>" ).tqarg( o->eastWestExponent( ) ) - .tqarg( o->northSouthExponent( ) ) ); + dev->writeLine( TQString( "<%1, %2>" ).arg( o->eastWestExponent( ) ) + .arg( 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; @@ -1880,14 +1880,14 @@ void PMPov31SerText( const PMObject* object, const PMMetaObject* tqmetaObject, P dev->writeName( object->name( ) ); dev->writeLine( TQString( "ttf \"" ) + o->font( ) + "\"" ); dev->writeLine( PMOutputDevice::escapeAndQuoteString( o->text( ) ) ); - dev->writeLine( TQString( "%1, " ).tqarg( o->thickness( ) ) + dev->writeLine( TQString( "%1, " ).arg( 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; @@ -1922,11 +1922,11 @@ void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* tqmetaOb if( text.isEmpty( ) ) text = o->description( ); - dev->writeComment( TQString( "No prototype for %1" ).tqarg( text ) ); + dev->writeComment( TQString( "No prototype for %1" ).arg( text ) ); } } - dev->callSerialization( object, tqmetaObject->superClass( ) ); + dev->callSerialization( object, metaObject->superClass( ) ); } void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* , PMOutputDevice* dev ) @@ -1950,7 +1950,7 @@ void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* , PMO if( text.isEmpty( ) ) text = o->description( ); - dev->writeComment( TQString( "No prototype for %1" ).tqarg( text ) ); + dev->writeComment( TQString( "No prototype for %1" ).arg( text ) ); } } @@ -1962,7 +1962,7 @@ void PMPov31SerTextureMapBase( const PMObject* object, const PMMetaObject* , PMO value = 1.0; if( it != mapValues.end( ) ) value = *it; - dev->write( TQString( "[ %1 " ).tqarg( value ) ); + dev->write( TQString( "[ %1 " ).arg( value ) ); dev->serialize( c ); dev->writeLine( "]" ); ++it; @@ -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..d567100e 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; @@ -102,8 +102,8 @@ void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* tqmetaObj } if( o->evaluate( ) ) { - str = TQString( "%1, %2, %3" ).tqarg( o->evaluateValue( 0 ) ) - .tqarg( o->evaluateValue( 1 ) ).tqarg( o->evaluateValue( 2 ) ); + str = TQString( "%1, %2, %3" ).arg( o->evaluateValue( 0 ) ) + .arg( o->evaluateValue( 1 ) ).arg( o->evaluateValue( 2 ) ); dev->writeLine( "evaluate " + str ); } if( o->allIntersections( ) ) @@ -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; @@ -145,10 +145,10 @@ void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, if( ( o->lightType( ) == PMLight::SpotLight ) || ( o->lightType( ) == PMLight::CylinderLight ) ) { - dev->writeLine( TQString( "radius %1" ).tqarg( o->radius( ) ) ); - dev->writeLine( TQString( "falloff %1" ).tqarg( o->falloff( ) ) ); + dev->writeLine( TQString( "radius %1" ).arg( o->radius( ) ) ); + dev->writeLine( TQString( "falloff %1" ).arg( o->falloff( ) ) ); if( o->tightness( ) != c_defaultLightTightness ) - dev->writeLine( TQString( "tightness %1" ).tqarg( o->tightness( ) ) ); + dev->writeLine( TQString( "tightness %1" ).arg( o->tightness( ) ) ); dev->writeLine( TQString( "point_at " ) + o->pointAt( ).serialize( ) ); } @@ -156,9 +156,9 @@ void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, { dev->writeLine( TQString( "area_light " ) + o->axis1( ).serialize( ) + TQString( ", " ) + o->axis2( ).serialize( ) - + TQString( ", %1, %2" ).tqarg( o->size1( ) ).tqarg( o->size2( ) ) ); + + TQString( ", %1, %2" ).arg( o->size1( ) ).arg( o->size2( ) ) ); if( o->adaptive( ) != c_defaultLightAdaptive ) - dev->writeLine( TQString( "adaptive %1" ).tqarg( o->adaptive( ) ) ); + dev->writeLine( TQString( "adaptive %1" ).arg( o->adaptive( ) ) ); if( o->jitter( ) ) dev->writeLine( TQString( "jitter" ) ); if ( o->areaType( ) == PMLight::Circular ) @@ -169,8 +169,8 @@ void PMPov35SerLight( const PMObject* object, const PMMetaObject* tqmetaObject, if( o->fading( ) ) { - dev->writeLine( TQString( "fade_distance %1" ).tqarg( o->fadeDistance( ) ) ); - dev->writeLine( TQString( "fade_power %1" ).tqarg( o->fadePower( ) ) ); + dev->writeLine( TQString( "fade_distance %1" ).arg( o->fadeDistance( ) ) ); + dev->writeLine( TQString( "fade_power %1" ).arg( o->fadePower( ) ) ); } if( !o->mediaInteraction( ) ) @@ -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/pmpovraymatrixedit.cpp b/kpovmodeler/pmpovraymatrixedit.cpp index 1e0f7833..b905fb77 100644 --- a/kpovmodeler/pmpovraymatrixedit.cpp +++ b/kpovmodeler/pmpovraymatrixedit.cpp @@ -20,7 +20,7 @@ #include "pmpovraymatrix.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> diff --git a/kpovmodeler/pmpovrayoutputwidget.cpp b/kpovmodeler/pmpovrayoutputwidget.cpp index b2230272..13bd967a 100644 --- a/kpovmodeler/pmpovrayoutputwidget.cpp +++ b/kpovmodeler/pmpovrayoutputwidget.cpp @@ -17,8 +17,8 @@ #include "pmpovrayoutputwidget.h" -#include <tqtextedit.h> -#include <tqlayout.h> +#include <textedit.h> +#include <layout.h> #include <klocale.h> #include <kglobalsettings.h> diff --git a/kpovmodeler/pmpovrayparser.cpp b/kpovmodeler/pmpovrayparser.cpp index c4fa41ce..7f041b3e 100644 --- a/kpovmodeler/pmpovrayparser.cpp +++ b/kpovmodeler/pmpovrayparser.cpp @@ -384,7 +384,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* parent, } break; case TURBULENCE_TOK: - // Search for a PMPattern in the object's tqchildren + // Search for a PMPattern in the object's children child = parent->firstChild( ); while( child && !child->isA( "Pattern" ) ) child = child->nextSibling( ); @@ -408,7 +408,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* parent, case SCALLOP_WAVE_TOK: case CUBIC_WAVE_TOK: case POLY_WAVE_TOK: - // Search for a PMBlendMapModifiers in the object's tqchildren + // Search for a PMBlendMapModifiers in the object's children child = parent->firstChild( ); while( child && !child->isA( "BlendMapModifiers" ) ) child = child->nextSibling( ); @@ -972,7 +972,7 @@ bool PMPovrayParser::parseNumericItem( PMValue& v, bool checkForBool /*=false*/ else { printError( i18n( "Undefined identifier \"%1\"." ) - .tqarg( m_pScanner->sValue( ) ) ); + .arg( m_pScanner->sValue( ) ) ); nextToken( ); } break; @@ -2587,7 +2587,7 @@ bool PMPovrayParser::parsePolynom( PMPolynom* pNewPoly ) if( vector.size( ) != ( unsigned ) c_polynomSize[order] ) { printError( i18n( "%1 coefficients are needed for a polynom with order %2" ) - .tqarg( c_polynomSize[order] ).tqarg( order ) ); + .arg( c_polynomSize[order] ).arg( order ) ); vector.resize( c_polynomSize[order] ); } pNewPoly->setCoefficients( vector ); @@ -2883,7 +2883,7 @@ bool PMPovrayParser::parseLathe( PMLathe* pNewLathe ) if( nump < minp ) printError( i18n( "At least %1 points are needed for that spline type" ) - .tqarg( minp ) ); + .arg( minp ) ); else if( ( pNewLathe->splineType( ) == PMLathe::BezierSpline ) && ( ( nump % 4 ) != 0 ) ) printError( i18n( "Bezier splines need 4 points for each segment" ) ); @@ -3231,7 +3231,7 @@ bool PMPovrayParser::parseSor( PMSurfaceOfRevolution* pNewSor ) if( approxZero( ( *it1 )[1] - ( *it3 )[1], c_sorTolerance ) ) { printError( i18n( "The v coordinate of point %1 and %2 must be different; fixed" ) - .tqarg( pnr + 1 ).tqarg( pnr + 3 ) ); + .arg( pnr + 1 ).arg( pnr + 3 ) ); if( pnr == 0 ) ( *it1 )[1] = ( *it3 )[1] - c_sorTolerance; else diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp index ac95309c..fa67ac6f 100644 --- a/kpovmodeler/pmpovrayrenderwidget.cpp +++ b/kpovmodeler/pmpovrayrenderwidget.cpp @@ -28,7 +28,7 @@ #include <ktempfile.h> #include <tqcolor.h> #include <tqpainter.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqdragobject.h> #ifdef KDE_NO_COMPAT @@ -134,7 +134,7 @@ bool PMPovrayRenderWidget::render( const TQByteArray& scene, m_image.setAlphaBuffer( m_renderMode.alpha( ) ); m_image.fill( tqRgb( 0, 0, 0 ) ); m_bPixmapUpToDate = false; - tqrepaint( ); + repaint( ); if( !m_pProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { @@ -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/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp index eac93134..321aee04 100644 --- a/kpovmodeler/pmpovraysettings.cpp +++ b/kpovmodeler/pmpovraysettings.cpp @@ -23,7 +23,7 @@ #include "pmresourcelocator.h" #include "pmtext.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqlistbox.h> @@ -40,60 +40,60 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name ) { m_selectionIndex = 0; - TQHBoxLayout* htqlayout; - TQVBoxLayout* vtqlayout; + TQHBoxLayout* hlayout; + TQVBoxLayout* vlayout; TQVBoxLayout* gvl; TQGroupBox* gb; - vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); + vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); gb = new TQGroupBox( i18n( "Povray Command" ), this ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); - htqlayout = new TQHBoxLayout( gvl ); - htqlayout->addWidget( new TQLabel( i18n( "Command:" ), gb ) ); + hlayout = new TQHBoxLayout( gvl ); + hlayout->addWidget( new TQLabel( i18n( "Command:" ), gb ) ); m_pPovrayCommand = new TQLineEdit( gb ); - htqlayout->addWidget( m_pPovrayCommand ); + hlayout->addWidget( m_pPovrayCommand ); m_pBrowsePovrayCommand = new TQPushButton( gb ); m_pBrowsePovrayCommand->setPixmap( SmallIcon( "fileopen" ) ); connect( m_pBrowsePovrayCommand, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotBrowsePovrayCommand( ) ) ); - htqlayout->addWidget( m_pBrowsePovrayCommand ); - vtqlayout->addWidget( gb ); + hlayout->addWidget( m_pBrowsePovrayCommand ); + vlayout->addWidget( gb ); gb = new TQGroupBox( i18n( "Povray User Documentation" ), this ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); - htqlayout = new TQHBoxLayout( gvl ); - htqlayout->addWidget( new TQLabel( i18n( "Path:" ), gb ) ); + hlayout = new TQHBoxLayout( gvl ); + hlayout->addWidget( new TQLabel( i18n( "Path:" ), gb ) ); m_pDocumentationPath = new TQLineEdit( gb ); - htqlayout->addWidget( m_pDocumentationPath ); + hlayout->addWidget( m_pDocumentationPath ); m_pBrowseDocumentationPath = new TQPushButton( gb ); m_pBrowseDocumentationPath->setPixmap( SmallIcon( "fileopen" ) ); connect( m_pBrowseDocumentationPath, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotBrowsePovrayDocumentation( ) ) ); - htqlayout->addWidget( m_pBrowseDocumentationPath ); - vtqlayout->addWidget( gb ); - htqlayout = new TQHBoxLayout( gvl ); - htqlayout->addWidget( new TQLabel( i18n( "Version:" ), gb ) ); + hlayout->addWidget( m_pBrowseDocumentationPath ); + vlayout->addWidget( gb ); + hlayout = new TQHBoxLayout( gvl ); + hlayout->addWidget( new TQLabel( i18n( "Version:" ), gb ) ); m_pDocumentationVersion = new TQComboBox( false, gb ); TQValueList<TQString> versions = PMDocumentationMap::theMap( )->availableVersions( ); TQValueListIterator<TQString> it; for( it = versions.begin( ); it != versions.end( ); ++it ) m_pDocumentationVersion->insertItem( *it ); - htqlayout->addWidget( m_pDocumentationVersion ); - htqlayout->addStretch( ); + hlayout->addWidget( m_pDocumentationVersion ); + hlayout->addStretch( ); gb = new TQGroupBox( i18n( "Library Paths" ), this ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); - htqlayout = new TQHBoxLayout( gvl ); + hlayout = new TQHBoxLayout( gvl ); m_pLibraryPaths = new TQListBox( gb ); connect( m_pLibraryPaths, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( slotPathSelected( int ) ) ); - htqlayout->addWidget( m_pLibraryPaths ); + hlayout->addWidget( m_pLibraryPaths ); - TQVBoxLayout* bl = new TQVBoxLayout( htqlayout ); + TQVBoxLayout* bl = new TQVBoxLayout( hlayout ); m_pAddLibraryPath = new TQPushButton( i18n( "Add..." ), gb ); connect( m_pAddLibraryPath, TQT_SIGNAL( clicked( ) ), TQT_SLOT( slotAddPath( ) ) ); bl->addWidget( m_pAddLibraryPath ); @@ -113,9 +113,9 @@ PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name ) TQT_SLOT( slotPathDown( ) ) ); bl->addWidget( m_pLibraryPathDown ); bl->addStretch( 1 ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); - vtqlayout->addStretch( 1 ); + vlayout->addStretch( 1 ); } void PMPovraySettings::displaySettings( ) diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp index c4ce83cb..f5035c04 100644 --- a/kpovmodeler/pmpovraywidget.cpp +++ b/kpovmodeler/pmpovraywidget.cpp @@ -30,7 +30,7 @@ #include <kpushbutton.h> #include <kstdguiitem.h> -#include <tqlayout.h> +#include <layout.h> #include <tqprogressbar.h> #include <tqlabel.h> #include <tqscrollview.h> @@ -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 ) ); + .arg( returnStatus ) ); } else if( m_pRenderWidget->povrayOutput( ).contains( "ERROR" ) ) { @@ -405,7 +405,7 @@ void PMPovrayWidget::showSpeed( double pps ) else num.setNum( pps, 'g', 3 ); - m_pProgressLabel->setText( i18n( "running, %1 pixels/second" ).tqarg( num ) ); + m_pProgressLabel->setText( i18n( "running, %1 pixels/second" ).arg( num ) ); } #include "pmpovraywidget.moc" 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/pmpreviewsettings.cpp b/kpovmodeler/pmpreviewsettings.cpp index a08ff1fe..58147bb3 100644 --- a/kpovmodeler/pmpreviewsettings.cpp +++ b/kpovmodeler/pmpreviewsettings.cpp @@ -21,7 +21,7 @@ #include "pmdialogeditbase.h" #include "pmdefaults.h" -#include <tqlayout.h> +#include <layout.h> #include <tqgroupbox.h> #include <tqlabel.h> #include <tqcheckbox.h> @@ -32,16 +32,16 @@ PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name ) : PMSettingsDialogPage( parent, name ) { - TQHBoxLayout* htqlayout; - TQVBoxLayout* vtqlayout; + TQHBoxLayout* hlayout; + TQVBoxLayout* vlayout; TQVBoxLayout* gvl; TQGridLayout* grid; TQGroupBox* gb; - vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); + vlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); - htqlayout = new TQHBoxLayout( vtqlayout ); - grid = new TQGridLayout( htqlayout, 2, 2 ); + hlayout = new TQHBoxLayout( vlayout ); + grid = new TQGridLayout( hlayout, 2, 2 ); grid->addWidget( new TQLabel( i18n( "Size:" ), this ), 0, 0 ); m_pPreviewSize = new PMIntEdit( this ); m_pPreviewSize->setValidation( true, 10, true, 400 ); @@ -50,10 +50,10 @@ PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name ) grid->addWidget( new TQLabel( i18n( "Gamma:" ), this ), 1, 0 ); m_pPreviewGamma = new PMFloatEdit( this ); grid->addWidget( m_pPreviewGamma, 1, 1 ); - htqlayout->addStretch( 1 ); + hlayout->addStretch( 1 ); gb = new TQGroupBox( i18n( "Rendered Objects" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); m_pPreviewSphere = new TQCheckBox( i18n( "Sphere" ), gb ); @@ -64,52 +64,52 @@ PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name ) gvl->addWidget( m_pPreviewBox ); gb = new TQGroupBox( i18n( "Wall" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); m_pPreviewWall = new TQCheckBox( i18n( "Enable wall" ), gb ); gvl->addWidget( m_pPreviewWall ); - htqlayout = new TQHBoxLayout( gvl ); - htqlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) ); + hlayout = new TQHBoxLayout( gvl ); + hlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) ); m_pWallColor1 = new KColorButton( gb ); - htqlayout->addWidget( m_pWallColor1 ); - htqlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) ); + hlayout->addWidget( m_pWallColor1 ); + hlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) ); m_pWallColor2 = new KColorButton( gb ); - htqlayout->addWidget( m_pWallColor2 ); - htqlayout->addStretch( 1 ); + hlayout->addWidget( m_pWallColor2 ); + hlayout->addStretch( 1 ); gb = new TQGroupBox( i18n( "Floor" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); m_pPreviewFloor = new TQCheckBox( i18n( "Enable floor" ), gb ); gvl->addWidget( m_pPreviewFloor ); - htqlayout = new TQHBoxLayout( gvl ); - htqlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) ); + hlayout = new TQHBoxLayout( gvl ); + hlayout->addWidget( new TQLabel( i18n( "Color 1:" ), gb ) ); m_pFloorColor1 = new KColorButton( gb ); - htqlayout->addWidget( m_pFloorColor1 ); - htqlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) ); + hlayout->addWidget( m_pFloorColor1 ); + hlayout->addWidget( new TQLabel( i18n( "Color 2:" ), gb ) ); m_pFloorColor2 = new KColorButton( gb ); - htqlayout->addWidget( m_pFloorColor2 ); - htqlayout->addStretch( 1 ); + hlayout->addWidget( m_pFloorColor2 ); + hlayout->addStretch( 1 ); gb = new TQGroupBox( i18n( "Antialiasing" ), this ); - vtqlayout->addWidget( gb ); + vlayout->addWidget( gb ); gvl = new TQVBoxLayout( gb, KDialog::marginHint( ), KDialog::spacingHint( ) ); gvl->addSpacing( 10 ); m_pPreviewAA = new TQCheckBox( i18n( "Enable antialiasing" ), gb ); gvl->addWidget( m_pPreviewAA ); - htqlayout = new TQHBoxLayout( gvl ); - htqlayout->addWidget( new TQLabel( i18n( "Depth:" ), gb ) ); + hlayout = new TQHBoxLayout( gvl ); + hlayout->addWidget( new TQLabel( i18n( "Depth:" ), gb ) ); m_pPreviewAALevel = new PMIntEdit( gb ); m_pPreviewAALevel->setValidation( true, 1, true, 9 ); - htqlayout->addWidget( m_pPreviewAALevel ); - htqlayout->addWidget( new TQLabel( i18n( "Threshold:" ), gb ) ); + hlayout->addWidget( m_pPreviewAALevel ); + hlayout->addWidget( new TQLabel( i18n( "Threshold:" ), gb ) ); m_pPreviewAAThreshold = new PMFloatEdit( gb ); - htqlayout->addWidget( m_pPreviewAAThreshold ); - htqlayout->addStretch( 1 ); + hlayout->addWidget( m_pPreviewAAThreshold ); + hlayout->addStretch( 1 ); - vtqlayout->addStretch( 1 ); + vlayout->addStretch( 1 ); } void PMPreviewSettings::displaySettings( ) diff --git a/kpovmodeler/pmprism.cpp b/kpovmodeler/pmprism.cpp index a7c5c8f7..81417ba3 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 ) ); @@ -645,7 +645,7 @@ void PMPrism::controlPoints( PMControlPointList& list ) for( i2 = 0; it2 != ( *it1 ).end( ); ++it2, ++i2 ) { cp = new PM2DControlPoint( *it2, PM2DControlPoint::PM2DXZ, i2, - i18n( "Point %1.%2" ).tqarg( i1 + 1 ).tqarg( i2 + 1 ) ); + i18n( "Point %1.%2" ).arg( i1 + 1 ).arg( i2 + 1 ) ); if( i2 == 0 ) firstPoint = cp; else if( i2 == 1 ) @@ -678,7 +678,7 @@ void PMPrism::controlPoints( PMControlPointList& list ) { int i2mod4 = i2 % 4; cp = new PM2DControlPoint( *it2, PM2DControlPoint::PM2DXZ, i2, - i18n( "Point %1.%2" ).tqarg( i1 + 1 ).tqarg( i2 + 1 ) ); + i18n( "Point %1.%2" ).arg( i1 + 1 ).arg( i2 + 1 ) ); if( i2mod4 == 0 ) firstPoint = cp; if( i2mod4 == 2 ) 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/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp index 78960007..64b68229 100644 --- a/kpovmodeler/pmprismedit.cpp +++ b/kpovmodeler/pmprismedit.cpp @@ -23,7 +23,7 @@ #include "pmvectorlistedit.h" #include "pmpart.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqtooltip.h> #include <tqcombobox.h> @@ -206,7 +206,7 @@ void PMPrismEdit::createEdits( const TQValueList< TQValueList<PMVector> >& sp ) { // create all edits for one sub prism hl = new TQHBoxLayout( tvl ); - label = new TQLabel( i18n( "Sub prism %1:" ).tqarg( spnr + 1 ), + label = new TQLabel( i18n( "Sub prism %1:" ).arg( spnr + 1 ), m_pEditWidget ); hl->addWidget( label ); hl->addStretch( 1 ); @@ -332,8 +332,8 @@ void PMPrismEdit::deleteEdits( ) m_points.clear( ); m_points.setAutoDelete( false ); - if( m_pEditWidget->tqlayout( ) ) - delete m_pEditWidget->tqlayout( ); + if( m_pEditWidget->layout( ) ) + delete m_pEditWidget->layout( ); } TQValueList< TQValueList<PMVector> > PMPrismEdit::splinePoints( ) 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/pmquickcoloredit.cpp b/kpovmodeler/pmquickcoloredit.cpp index 9e0a2d29..c4b803a4 100644 --- a/kpovmodeler/pmquickcoloredit.cpp +++ b/kpovmodeler/pmquickcoloredit.cpp @@ -21,7 +21,7 @@ #include "pmcoloredit.h" #include "pmdebug.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> @@ -36,10 +36,10 @@ void PMQuickColorEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) ); + TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) ); m_pColorEdit = new PMColorEdit( false, this ); - tqlayout->addWidget( new TQLabel( i18n( "Color:" ), this ), 0, AlignTop ); - tqlayout->addWidget( m_pColorEdit ); + layout->addWidget( new TQLabel( i18n( "Color:" ), this ), 0, AlignTop ); + layout->addWidget( m_pColorEdit ); connect( m_pColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); } 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/pmradiosityedit.cpp b/kpovmodeler/pmradiosityedit.cpp index 97494ff8..8b17d153 100644 --- a/kpovmodeler/pmradiosityedit.cpp +++ b/kpovmodeler/pmradiosityedit.cpp @@ -20,7 +20,7 @@ #include "pmradiosity.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <klocale.h> 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/pmrainbowedit.cpp b/kpovmodeler/pmrainbowedit.cpp index 7765f720..83440c7f 100644 --- a/kpovmodeler/pmrainbowedit.cpp +++ b/kpovmodeler/pmrainbowedit.cpp @@ -23,7 +23,7 @@ #include "pmvector.h" #include "pmmath.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlabel.h> #include <klocale.h> diff --git a/kpovmodeler/pmraw.cpp b/kpovmodeler/pmraw.cpp index 4971433c..f29b6e4c 100644 --- a/kpovmodeler/pmraw.cpp +++ b/kpovmodeler/pmraw.cpp @@ -23,7 +23,7 @@ #include "pmmemento.h" #include <klocale.h> -#include <tqtextstream.h> +#include <textstream.h> PMDefinePropertyClass( PMRaw, PMRawProperty ); @@ -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/pmrawedit.cpp b/kpovmodeler/pmrawedit.cpp index 98cc5ec1..715d2f8e 100644 --- a/kpovmodeler/pmrawedit.cpp +++ b/kpovmodeler/pmrawedit.cpp @@ -19,7 +19,7 @@ #include "pmrawedit.h" #include "pmraw.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqmultilineedit.h> #include <kglobalsettings.h> diff --git a/kpovmodeler/pmrendermanager.cpp b/kpovmodeler/pmrendermanager.cpp index 6ba1fe99..31f553e5 100644 --- a/kpovmodeler/pmrendermanager.cpp +++ b/kpovmodeler/pmrendermanager.cpp @@ -394,7 +394,7 @@ void PMRenderManager::renderTask( ) void PMRenderManager::renderObject( PMObject* objectToRender ) { - bool tqchildren = false; + bool children = false; PMGraphicalObject* go = 0; m_objectToRenderStack.append( objectToRender ); @@ -426,8 +426,8 @@ void PMRenderManager::renderObject( PMObject* objectToRender ) { PMObject* obj = 0; - tqchildren = objectToRender->lastChild( ) || objectToRender->linkedObject( ); - if( tqchildren ) + children = objectToRender->lastChild( ) || objectToRender->linkedObject( ); + if( children ) { bool stop; @@ -438,7 +438,7 @@ void PMRenderManager::renderObject( PMObject* objectToRender ) matrix = new PMMatrix( PMMatrix::modelviewMatrix( ) ); m_matrixStack.push( matrix ); - // render the tqchildren and the linked object + // render the children and the linked object obj = objectToRender->lastChild( ); while( obj && !m_bStopTask && !m_bStartTask ) { @@ -469,7 +469,7 @@ void PMRenderManager::renderObject( PMObject* objectToRender ) if( !m_bStopTask && !m_bStartTask ) { - // tqchildren of the object are rendered + // children of the object are rendered // render the object if( objectToRender == m_pCurrentTask->activeObject( ) ) @@ -538,7 +538,7 @@ void PMRenderManager::renderObject( PMObject* objectToRender ) } if( !m_bStopTask && !m_bStartTask ) { - if( tqchildren ) + if( children ) { PMMatrix* matrix = m_matrixStack.pop( ); @@ -1410,7 +1410,7 @@ void PMRenderManager::renderGrid( ) glVertex2d( screenx, height/2 ); glEnd( ); - TQString label = TQString( "%1" ).tqarg( x * signx, 0, 'g', 4 ); + TQString label = TQString( "%1" ).arg( x * signx, 0, 'g', 4 ); if( approxZero( x ) && label.find( "e-" ) ) label = "0"; @@ -1431,7 +1431,7 @@ void PMRenderManager::renderGrid( ) glVertex2d( width/2, screeny ); glEnd( ); - TQString label = TQString( "%1" ).tqarg( y * signy, 0, 'g', 4 ); + TQString label = TQString( "%1" ).arg( y * signy, 0, 'g', 4 ); if( approxZero( y ) && label.find( "e-" ) ) label = "0"; diff --git a/kpovmodeler/pmrendermode.cpp b/kpovmodeler/pmrendermode.cpp index 622f7b2f..8ef8d207 100644 --- a/kpovmodeler/pmrendermode.cpp +++ b/kpovmodeler/pmrendermode.cpp @@ -160,33 +160,33 @@ TQStringList PMRenderMode::commandLineSwitches( ) const TQStringList cl; TQString tmp; - cl.append( TQString( "+W%1" ).tqarg( m_width ) ); - cl.append( TQString( "+H%1" ).tqarg( m_height ) ); + cl.append( TQString( "+W%1" ).arg( m_width ) ); + cl.append( TQString( "+H%1" ).arg( m_height ) ); if( m_subSection ) { if( m_startRow < 1.0 ) tmp.sprintf( "+SR%4.2f", m_startRow ); else - tmp = TQString( "+SR%1" ).tqarg( ( int ) ( m_startRow + 0.5 ) ); + tmp = TQString( "+SR%1" ).arg( ( int ) ( m_startRow + 0.5 ) ); cl.append( tmp ); if( m_endRow < 1.0 ) tmp.sprintf( "+ER%4.2f", m_endRow ); else - tmp = TQString( "+ER%1" ).tqarg( ( int ) ( m_endRow + 0.5 ) ); + tmp = TQString( "+ER%1" ).arg( ( int ) ( m_endRow + 0.5 ) ); cl.append( tmp ); if( m_startColumn < 1.0 ) tmp.sprintf( "+SC%4.2f", m_startColumn ); else - tmp = TQString( "+SC%1" ).tqarg( ( int ) ( m_startColumn + 0.5 ) ); + tmp = TQString( "+SC%1" ).arg( ( int ) ( m_startColumn + 0.5 ) ); cl.append( tmp ); if( m_endColumn < 1.0 ) tmp.sprintf( "+EC%4.2f", m_endColumn ); else - tmp = TQString( "+EC%1" ).tqarg( ( int ) ( m_endColumn + 0.5 ) ); + tmp = TQString( "+EC%1" ).arg( ( int ) ( m_endColumn + 0.5 ) ); cl.append( tmp ); } - cl.append( TQString( "+Q%1" ).tqarg( m_quality ) ); + cl.append( TQString( "+Q%1" ).arg( m_quality ) ); if( m_radiosity ) cl.append( TQString( "+QR" ) ); else @@ -195,7 +195,7 @@ TQStringList PMRenderMode::commandLineSwitches( ) const if( m_antialiasing ) { cl.append( TQString( "+A" ) ); - cl.append( TQString( "+AM%1" ).tqarg( m_samplingMethod ) ); + cl.append( TQString( "+AM%1" ).arg( m_samplingMethod ) ); tmp.sprintf( "+A%5.3f", m_antialiasThreshold ); cl.append( tmp ); if( m_antialiasJitter ) @@ -205,7 +205,7 @@ TQStringList PMRenderMode::commandLineSwitches( ) const } else cl.append( TQString( "-J" ) ); - cl.append( TQString( "+R%1" ).tqarg( m_antialiasDepth ) ); + cl.append( TQString( "+R%1" ).arg( m_antialiasDepth ) ); } else cl.append( TQString( "-A" ) ); diff --git a/kpovmodeler/pmrendermodesdialog.cpp b/kpovmodeler/pmrendermodesdialog.cpp index 4fa8f09f..e22a5207 100644 --- a/kpovmodeler/pmrendermodesdialog.cpp +++ b/kpovmodeler/pmrendermodesdialog.cpp @@ -24,7 +24,7 @@ #include <tqlineedit.h> #include <tqtabwidget.h> #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> 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/pmrotateedit.cpp b/kpovmodeler/pmrotateedit.cpp index 2ad5f06e..e310f632 100644 --- a/kpovmodeler/pmrotateedit.cpp +++ b/kpovmodeler/pmrotateedit.cpp @@ -20,7 +20,7 @@ #include "pmrotate.h" #include "pmvectoredit.h" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> 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/pmscaleedit.cpp b/kpovmodeler/pmscaleedit.cpp index 24f3a471..d9f16452 100644 --- a/kpovmodeler/pmscaleedit.cpp +++ b/kpovmodeler/pmscaleedit.cpp @@ -20,7 +20,7 @@ #include "pmscale.h" #include "pmvectoredit.h" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> diff --git a/kpovmodeler/pmscanner.cpp b/kpovmodeler/pmscanner.cpp index 15e50489..d85fa3fb 100644 --- a/kpovmodeler/pmscanner.cpp +++ b/kpovmodeler/pmscanner.cpp @@ -577,10 +577,10 @@ void PMScanner::scanError( int c ) m_token = SCANNER_ERROR_TOK; if( isprint( c ) ) m_error = i18n( "Unexpected character '%1' after \"%2\"" ) - .tqarg( ( char )c ).tqarg( m_svalue ); + .arg( ( char )c ).arg( m_svalue ); else m_error = i18n( "Unexpected character %1 after \"%2\"" ) - .tqarg( c, 4, 16 ).tqarg( m_svalue ); + .arg( c, 4, 16 ).arg( m_svalue ); #ifdef PMSCAN_DEBUG kdDebug( PMArea ) << "Line " << m_line << ": Error " << m_error << "\n"; 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/pmserializer.cpp b/kpovmodeler/pmserializer.cpp index 149e6020..2f58d0c1 100644 --- a/kpovmodeler/pmserializer.cpp +++ b/kpovmodeler/pmserializer.cpp @@ -72,7 +72,7 @@ void PMSerializer::printError( const TQString& msg ) else if( m_errors == s_maxErrors ) { m_messages += PMMessage( i18n( "Maximum of %1 errors reached." ) - .tqarg( s_maxErrors ) ); + .arg( s_maxErrors ) ); m_errors++; } } @@ -87,7 +87,7 @@ void PMSerializer::printWarning( const TQString& msg ) else if( m_warnings == s_maxWarnings ) { m_messages += PMMessage( i18n( "Maximum of %1 warnings reached." ) - .tqarg( s_maxWarnings ) ); + .arg( s_maxWarnings ) ); m_warnings++; } } diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp index 35324495..fa200ba6 100644 --- a/kpovmodeler/pmsettingsdialog.cpp +++ b/kpovmodeler/pmsettingsdialog.cpp @@ -111,7 +111,7 @@ PMSettingsDialog::PMSettingsDialog( PMPart* part, TQWidget* parent, const char* sl.clear( ); sl.append( i18n( "View Layout" ) ); w = addVBoxPage( sl, i18n( "Display Settings for View Layouts" ), - SmallIcon( "pmconfigureviewtqlayout", 22 ) ); + SmallIcon( "pmconfigureviewlayout", 22 ) ); p = new PMLayoutSettings( w ); registerPage( w, p ); @@ -187,13 +187,13 @@ bool PMSettingsDialog::validateData( ) void PMSettingsDialog::saveSettings( ) { - m_tqrepaint = false; + m_repaint = false; TQValueList<PMRegisteredSettingsPage>::const_iterator it; for( it = m_pages.begin( ); it != m_pages.end( ); ++it ) ( *it ).page->applySettings( ); - if( m_tqrepaint ) + if( m_repaint ) { PMRenderManager* rm = PMRenderManager::theManager( ); rm->slotRenderingSettingsChanged( ); @@ -236,7 +236,7 @@ void PMSettingsDialog::registerPage( TQWidget* topPage, void PMSettingsDialog::slotRepaint( ) { - m_tqrepaint = true; + m_repaint = true; } void PMSettingsDialog::slotShowPage( ) diff --git a/kpovmodeler/pmsettingsdialog.h b/kpovmodeler/pmsettingsdialog.h index e30abf7b..e830ed8e 100644 --- a/kpovmodeler/pmsettingsdialog.h +++ b/kpovmodeler/pmsettingsdialog.h @@ -179,7 +179,7 @@ private: bool validateData( ); void saveSettings( ); int findPage( const PMSettingsDialogPage* page ); - bool m_tqrepaint; + bool m_repaint; TQValueList<PMRegisteredSettingsPage> m_pages; PMPart* m_pPart; diff --git a/kpovmodeler/pmshell.cpp b/kpovmodeler/pmshell.cpp index e03ce3b8..fd0c5a73 100644 --- a/kpovmodeler/pmshell.cpp +++ b/kpovmodeler/pmshell.cpp @@ -188,7 +188,7 @@ PMDockWidget* PMShell::createView( const TQString& t, PMViewOptions* o, PMViewFactory::theFactory( )->viewFactory( t ); m_viewNumber++; - TQString name = TQString( "View (%1)" ).tqarg( m_viewNumber ); + TQString name = TQString( "View (%1)" ).arg( m_viewNumber ); if( factory ) { @@ -231,7 +231,7 @@ PMDockWidget* PMShell::createTreeView( ) { PMDockWidget* dock = 0; m_numTreeViews++; - TQString name = TQString( "Object Tree (%1)" ).tqarg( m_numTreeViews ); + TQString name = TQString( "Object Tree (%1)" ).arg( m_numTreeViews ); dock = createDockWidget( name, SmallIcon( "pmtreeview" ), 0L, i18n( "Object Tree" ), i18n( "Object Tree" ) ); dock->setDockSite( PMDockWidget::DockFullSite ); @@ -248,7 +248,7 @@ PMDockWidget* PMShell::createDialogView( ) { PMDockWidget* dock = 0; m_numDialogViews++; - TQString name = TQString( "Object Properties (%1)" ).tqarg( m_numDialogViews ); + TQString name = TQString( "Object Properties (%1)" ).arg( m_numDialogViews ); dock = createDockWidget( name, SmallIcon( "pmdialogview" ), 0L, i18n( "Object Properties" ), i18n( "Object Properties" ) ); dock->setDockSite( PMDockWidget::DockFullSite ); @@ -265,7 +265,7 @@ PMDockWidget* PMShell::create3DView( PMGLView::PMViewType t ) { PMDockWidget* dock = 0; m_numGLViews++; - TQString name = TQString( "3D View (%1)" ).tqarg( m_numGLViews ); + TQString name = TQString( "3D View (%1)" ).arg( m_numGLViews ); dock = createDockWidget( name, SmallIcon( "pmglview" ), 0L, i18n( "3D View" ), i18n( "3D View" ) ); dock->setDockSite( PMDockWidget::DockFullSite ); 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/pmskysphereedit.cpp b/kpovmodeler/pmskysphereedit.cpp index 4a1590b2..a7dc62b2 100644 --- a/kpovmodeler/pmskysphereedit.cpp +++ b/kpovmodeler/pmskysphereedit.cpp @@ -20,7 +20,7 @@ #include "pmskysphere.h" #include "pmlinkedit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> 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/pmslopeedit.cpp b/kpovmodeler/pmslopeedit.cpp index 63b0ee44..f9d2d346 100644 --- a/kpovmodeler/pmslopeedit.cpp +++ b/kpovmodeler/pmslopeedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqcheckbox.h> 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/pmsolidcoloredit.cpp b/kpovmodeler/pmsolidcoloredit.cpp index 62ce6c9e..c72d5c0f 100644 --- a/kpovmodeler/pmsolidcoloredit.cpp +++ b/kpovmodeler/pmsolidcoloredit.cpp @@ -20,7 +20,7 @@ #include "pmsolidcolor.h" #include "pmcoloredit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> @@ -35,12 +35,12 @@ void PMSolidColorEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout = new TQHBoxLayout( topLayout( ) ); + TQHBoxLayout* layout = new TQHBoxLayout( topLayout( ) ); m_pColorEdit = new PMColorEdit( true, this ); TQLabel* label = new TQLabel( i18n( "Color:" ), this ); - tqlayout->addWidget( label, 0, AlignTop ); - tqlayout->addWidget( m_pColorEdit ); + layout->addWidget( label, 0, AlignTop ); + layout->addWidget( m_pColorEdit ); connect( m_pColorEdit, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); } 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..be2d2f5c 100644 --- a/kpovmodeler/pmsolidobject.h +++ b/kpovmodeler/pmsolidobject.h @@ -44,11 +44,11 @@ public: PMSolidObject( const PMSolidObject& s ); /** - * Deletes the object and all tqchildren + * Deletes the object and all children */ virtual ~PMSolidObject( ); /** */ - virtual PMMetaObject* tqmetaObject( ) const; + virtual PMMetaObject* metaObject( ) const; /** */ virtual void cleanUp( ) const; diff --git a/kpovmodeler/pmsolidobjectedit.cpp b/kpovmodeler/pmsolidobjectedit.cpp index 4a1a2205..c5217a39 100644 --- a/kpovmodeler/pmsolidobjectedit.cpp +++ b/kpovmodeler/pmsolidobjectedit.cpp @@ -20,7 +20,7 @@ #include "pmsolidobject.h" #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> PMSolidObjectEdit::PMSolidObjectEdit( TQWidget* parent, const char* name ) diff --git a/kpovmodeler/pmsor.cpp b/kpovmodeler/pmsor.cpp index 997447c4..2ede8b8a 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, @@ -421,7 +421,7 @@ void PMSurfaceOfRevolution::controlPoints( PMControlPointList& list ) { lastPoint = cp; cp = new PMSorControlPoint( lastPoint, *it, PMSorControlPoint::PM2DXY, i, - i18n( "Point %1 (xy)" ).tqarg( i + 1 ) ); + i18n( "Point %1 (xy)" ).arg( i + 1 ) ); tmp1.append( cp ); } @@ -432,7 +432,7 @@ void PMSurfaceOfRevolution::controlPoints( PMControlPointList& list ) { lastPoint = cp; cp = new PMSorControlPoint( lastPoint, *it, PMSorControlPoint::PM2DZY, i, - i18n( "Point %1 (yz)" ).tqarg( i + 1 ) ); + i18n( "Point %1 (yz)" ).arg( i + 1 ) ); tmp2.append( cp ); } 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/pmsoredit.cpp b/kpovmodeler/pmsoredit.cpp index 728aa20f..5fe2b631 100644 --- a/kpovmodeler/pmsoredit.cpp +++ b/kpovmodeler/pmsoredit.cpp @@ -21,7 +21,7 @@ #include "pmvectorlistedit.h" #include "pmpart.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqtooltip.h> #include <tqcombobox.h> @@ -160,7 +160,7 @@ bool PMSurfaceOfRevolutionEdit::isDataValid( ) { m_pPoints->setCurrentCell( pnr, 1 ); KMessageBox::error( this, i18n( "The v coordinate of point %1 and %2 must be different." ) - .tqarg( pnr + 1 ).tqarg( pnr + 3 ), + .arg( pnr + 1 ).arg( pnr + 3 ), i18n( "Error" ) ); return false; } 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/pmsphereedit.cpp b/kpovmodeler/pmsphereedit.cpp index 99bac3ea..4a74cc7b 100644 --- a/kpovmodeler/pmsphereedit.cpp +++ b/kpovmodeler/pmsphereedit.cpp @@ -22,7 +22,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> @@ -36,19 +36,19 @@ void PMSphereEdit::createTopWidgets( ) { Base::createTopWidgets( ); - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; m_pCentre = new PMVectorEdit( "x", "y", "z", this ); m_pRadius = new PMFloatEdit( this ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( new TQLabel( i18n( "Center:" ), this ) ); - tqlayout->addWidget( m_pCentre ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( new TQLabel( i18n( "Center:" ), this ) ); + layout->addWidget( m_pCentre ); - tqlayout = new TQHBoxLayout( topLayout( ) ); - tqlayout->addWidget( new TQLabel( i18n( "Radius:" ), this ) ); - tqlayout->addWidget( m_pRadius ); - tqlayout->addStretch( 1 ); + layout = new TQHBoxLayout( topLayout( ) ); + layout->addWidget( new TQLabel( i18n( "Radius:" ), this ) ); + layout->addWidget( m_pRadius ); + layout->addStretch( 1 ); connect( m_pCentre, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); connect( m_pRadius, TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); diff --git a/kpovmodeler/pmspheresweep.cpp b/kpovmodeler/pmspheresweep.cpp index ff2e8e1a..9660335e 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 ) ); @@ -434,19 +434,19 @@ void PMSphereSweep::controlPoints( PMControlPointList& list ) it != m_points.end( ) && it2 != m_radii.end( ); ++it, ++it2, ++nr ) { PM3DControlPoint* p = new PM3DControlPoint( *it, i++, - i18n( "Center %1" ).tqarg( nr ) ); + i18n( "Center %1" ).arg( nr ) ); list.append( p ); list.append( new PMDistanceControlPoint( p, PMVector( 1.0, 0.0, 0.0 ), *it2, i++, - i18n( "Radius %1 (x)" ).tqarg( nr ), + i18n( "Radius %1 (x)" ).arg( nr ), true ) ); list.append( new PMDistanceControlPoint( p, PMVector( 0.0, 1.0, 0.0 ), *it2, i++, - i18n( "Radius %1 (y)" ).tqarg( nr ), + i18n( "Radius %1 (y)" ).arg( nr ), true ) ); list.append( new PMDistanceControlPoint( p, PMVector( 0.0, 0.0, 1.0 ), *it2, i++, - i18n( "Radius %1 (z)" ).tqarg( nr ), + i18n( "Radius %1 (z)" ).arg( nr ), true ) ); } } 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/pmspheresweepedit.cpp b/kpovmodeler/pmspheresweepedit.cpp index 9798a304..dd8253e6 100644 --- a/kpovmodeler/pmspheresweepedit.cpp +++ b/kpovmodeler/pmspheresweepedit.cpp @@ -23,7 +23,7 @@ #include "pmvectorlistedit.h" #include "pmpart.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqtooltip.h> #include <tqcombobox.h> 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/pmsqeedit.cpp b/kpovmodeler/pmsqeedit.cpp index 377b552b..bbea3896 100644 --- a/kpovmodeler/pmsqeedit.cpp +++ b/kpovmodeler/pmsqeedit.cpp @@ -20,7 +20,7 @@ #include "pmsqe.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> diff --git a/kpovmodeler/pmsymboltable.cpp b/kpovmodeler/pmsymboltable.cpp index 5cb72b94..e8a15c3d 100644 --- a/kpovmodeler/pmsymboltable.cpp +++ b/kpovmodeler/pmsymboltable.cpp @@ -94,7 +94,7 @@ TQString PMSymbolTable::findNewID( const TQString& prefix ) // find next free id do { - testID = prefix + TQString( "%1" ).tqarg( number ); + testID = prefix + TQString( "%1" ).arg( number ); symbol = find( testID ); if( symbol ) number++; 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/pmtextedit.cpp b/kpovmodeler/pmtextedit.cpp index e1e4e038..d9a3fcc8 100644 --- a/kpovmodeler/pmtextedit.cpp +++ b/kpovmodeler/pmtextedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqlineedit.h> #include <tqpushbutton.h> 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..a49b103f 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 ) ); @@ -150,7 +150,7 @@ void PMTextureBase::readAttributes( const PMXMLHelper& h ) } else h.parser( )->printError( i18n( "Declare \"%1\" has wrong type." ) - .tqarg( id ) ); + .arg( id ) ); } } } 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/pmtexturebaseedit.cpp b/kpovmodeler/pmtexturebaseedit.cpp index 0768adc1..1a340f27 100644 --- a/kpovmodeler/pmtexturebaseedit.cpp +++ b/kpovmodeler/pmtexturebaseedit.cpp @@ -20,7 +20,7 @@ #include "pmpigment.h" #include "pmlinkedit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> diff --git a/kpovmodeler/pmtextureedit.cpp b/kpovmodeler/pmtextureedit.cpp index 768cc3cc..e01088bd 100644 --- a/kpovmodeler/pmtextureedit.cpp +++ b/kpovmodeler/pmtextureedit.cpp @@ -20,7 +20,7 @@ #include "pmtexture.h" #include "pmlinkedit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <klocale.h> diff --git a/kpovmodeler/pmtexturemap.cpp b/kpovmodeler/pmtexturemap.cpp index dc9f3b76..b3673f0c 100644 --- a/kpovmodeler/pmtexturemap.cpp +++ b/kpovmodeler/pmtexturemap.cpp @@ -22,7 +22,7 @@ #include "pmxmlhelper.h" #include "pmmapmemento.h" -#include <tqtextstream.h> +#include <textstream.h> #include <klocale.h> class PMValueProperty : public PMPropertyBase @@ -119,7 +119,7 @@ TQString PMTextureMapBase::valuesToString( ) const str.setNum( *it ); ++it; for( ; it != m_mapValues.end( ); ++it ) - str += TQString( " %1" ).tqarg( *it ); + str += TQString( " %1" ).arg( *it ); } return str; } @@ -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/pmtexturemapedit.cpp b/kpovmodeler/pmtexturemapedit.cpp index 2efa7708..8b153bb3 100644 --- a/kpovmodeler/pmtexturemapedit.cpp +++ b/kpovmodeler/pmtexturemapedit.cpp @@ -20,7 +20,7 @@ #include "pmtexturemap.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> #include <kmessagebox.h> 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/pmtorusedit.cpp b/kpovmodeler/pmtorusedit.cpp index e47301b9..4cde4935 100644 --- a/kpovmodeler/pmtorusedit.cpp +++ b/kpovmodeler/pmtorusedit.cpp @@ -20,7 +20,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <klocale.h> #include <tqcheckbox.h> 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/pmtranslateedit.cpp b/kpovmodeler/pmtranslateedit.cpp index f98bcf00..e7a3e7e7 100644 --- a/kpovmodeler/pmtranslateedit.cpp +++ b/kpovmodeler/pmtranslateedit.cpp @@ -20,7 +20,7 @@ #include "pmtranslate.h" #include "pmvectoredit.h" -#include <tqlayout.h> +#include <layout.h> #include <klocale.h> diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp index 8ec640d7..ba64c277 100644 --- a/kpovmodeler/pmtreeview.cpp +++ b/kpovmodeler/pmtreeview.cpp @@ -20,7 +20,7 @@ #include <tqlistview.h> #include <tqheader.h> -#include <tqlayout.h> +#include <layout.h> #include <tqpopupmenu.h> #include <tqcursor.h> @@ -292,7 +292,7 @@ void PMTreeView::addChildItems( PMTreeViewItem* item ) else // first child listItem = new PMTreeViewItem( obj, item ); - // recursive call, if child has tqchildren + // recursive call, if child has children if( obj->countChildren( ) > 0 ) addChildItems( listItem ); } diff --git a/kpovmodeler/pmtreeviewitem.cpp b/kpovmodeler/pmtreeviewitem.cpp index e3017b40..cac3b3c7 100644 --- a/kpovmodeler/pmtreeviewitem.cpp +++ b/kpovmodeler/pmtreeviewitem.cpp @@ -78,7 +78,7 @@ void PMTreeViewItem::setDescriptions( ) { PMTextureMapBase* tm = ( PMTextureMapBase* ) m_pObject->parent( ); if( m_pObject->type( ) == tm->mapType( ) ) - text = TQString( "[%1] " ).tqarg( tm->mapValue( m_pObject ), 4, 'f', 2 ) + text; + text = TQString( "[%1] " ).arg( tm->mapValue( m_pObject ), 4, 'f', 2 ) + text; } } setText( 0, text ); @@ -113,5 +113,5 @@ void PMTreeViewItem::initSelection( ) { TQListViewItem::setSelected( m_pObject->isSelected( ) ); // if( m_pObject->isSelected( ) ) -// tqrepaint( ); +// repaint( ); } diff --git a/kpovmodeler/pmtreeviewitem.h b/kpovmodeler/pmtreeviewitem.h index 7792871a..4ec2b44e 100644 --- a/kpovmodeler/pmtreeviewitem.h +++ b/kpovmodeler/pmtreeviewitem.h @@ -41,17 +41,17 @@ public: PMTreeViewItem( PMObject* object, TQListView* parent ); /** * Constructs a new list view item which is a child of parent and - * first in the parent's list of tqchildren. + * first in the parent's list of children. */ PMTreeViewItem( PMObject* object, TQListViewItem* parent ); /** * Constructs a list view item which is a child of parent - * and is after after in the parent's list of tqchildren. + * and is after after in the parent's list of children. */ PMTreeViewItem( PMObject* object, TQListView* parent, TQListViewItem* after ); /** * Constructs a list view item which is a child of parent - * and is after after in the parent's list of tqchildren. + * and is after after in the parent's list of children. */ PMTreeViewItem( PMObject* object, TQListViewItem* parent, TQListViewItem* after ); @@ -61,7 +61,7 @@ public: PMObject* object( ) const { return m_pObject; } /** * Returns a key that can be used for sorting, here the index in the - * parents list of tqchildren + * parents list of children */ virtual TQString key( int column, bool ascending ) 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/pmtriangleedit.cpp b/kpovmodeler/pmtriangleedit.cpp index b6d544a0..52c751ce 100644 --- a/kpovmodeler/pmtriangleedit.cpp +++ b/kpovmodeler/pmtriangleedit.cpp @@ -20,7 +20,7 @@ #include "pmtriangle.h" #include "pmvectoredit.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcheckbox.h> #include <tqpushbutton.h> @@ -55,21 +55,21 @@ void PMTriangleEdit::createTopWidgets( ) for( i = 0; i < 3; i++ ) { m_pPoint[i] = new PMVectorEdit( "x", "y", "z", this ); - gl->addWidget( new TQLabel( i18n( "Point %1:" ).tqarg( i+1 ), this ), + gl->addWidget( new TQLabel( i18n( "Point %1:" ).arg( i+1 ), this ), i * 3, 0 ); gl->addWidget( m_pPoint[i], i * 3, 1 ); connect( m_pPoint[i], TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); m_pNormal[i] = new PMVectorEdit( "x", "y", "z", this ); - m_pNormalLabel[i] = new TQLabel( i18n( "Normal %1:" ).tqarg( i+1 ), this ); + m_pNormalLabel[i] = new TQLabel( i18n( "Normal %1:" ).arg( i+1 ), this ); gl->addWidget( m_pNormalLabel[i], i * 3 + 1, 0 ); gl->addWidget( m_pNormal[i], i * 3 + 1, 1 ); connect( m_pNormal[i], TQT_SIGNAL( dataChanged( ) ), TQT_SIGNAL( dataChanged( ) ) ); m_pUVVector[i] = new PMVectorEdit( "u", "v", this ); - m_pUVVectorLabel[i] = new TQLabel( i18n( "UV vector %1:" ).tqarg( i+1 ), this ); + m_pUVVectorLabel[i] = new TQLabel( i18n( "UV vector %1:" ).arg( i+1 ), this ); gl->addWidget( m_pUVVectorLabel[i], i * 3 + 2, 0 ); gl->addWidget( m_pUVVector[i], i * 3 + 2, 1 ); connect( m_pUVVector[i], TQT_SIGNAL( dataChanged( ) ), diff --git a/kpovmodeler/pmtruetypecache.cpp b/kpovmodeler/pmtruetypecache.cpp index 41e4296a..f685001a 100644 --- a/kpovmodeler/pmtruetypecache.cpp +++ b/kpovmodeler/pmtruetypecache.cpp @@ -217,7 +217,7 @@ FT_UInt PMTrueTypeFont::findGlyphIndex( TQChar c ) if( m_face ) { - // glyphIndex = FT_Get_Char_Index( m_face, c.tqunicode( ) ); + // glyphIndex = FT_Get_Char_Index( m_face, c.unicode( ) ); // if( !glyphIndex ) char ch = c.latin1( ); if( !ch ) diff --git a/kpovmodeler/pmunknownview.cpp b/kpovmodeler/pmunknownview.cpp index 646aa619..45f06002 100644 --- a/kpovmodeler/pmunknownview.cpp +++ b/kpovmodeler/pmunknownview.cpp @@ -17,7 +17,7 @@ #include "pmunknownview.h" #include <klocale.h> -#include <tqlayout.h> +#include <layout.h> PMUnknownView::PMUnknownView( const TQString& viewType, TQWidget* parent, const char* name ) @@ -25,8 +25,8 @@ 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 = new TQLabel( i18n( "Unknown view type \"%1\"" ).arg( viewType ), this ); + l->setAlignment( TQt::AlignCenter ); hl->addWidget( l ); m_viewType = viewType; } diff --git a/kpovmodeler/pmvector.cpp b/kpovmodeler/pmvector.cpp index 13ba6ba4..fc0e8aad 100644 --- a/kpovmodeler/pmvector.cpp +++ b/kpovmodeler/pmvector.cpp @@ -21,7 +21,7 @@ #include "pmmatrix.h" #include "pmdebug.h" -#include <tqtextstream.h> +#include <textstream.h> #include <stdio.h> #include <stdlib.h> diff --git a/kpovmodeler/pmvectoredit.cpp b/kpovmodeler/pmvectoredit.cpp index 79075dc3..214a3c6e 100644 --- a/kpovmodeler/pmvectoredit.cpp +++ b/kpovmodeler/pmvectoredit.cpp @@ -19,7 +19,7 @@ #include "pmvectoredit.h" #include "pmdebug.h" #include <tqstring.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kdialog.h> #include <kmessagebox.h> @@ -32,7 +32,7 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX, : TQWidget( parent, name ) { unsigned int i; - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; TQLabel* label; m_edits.resize( 2 ); @@ -43,24 +43,24 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX, TQT_SLOT( slotTextChanged( const TQString& ) ) ); } - tqlayout = new TQHBoxLayout( this ); + layout = new TQHBoxLayout( this ); if( !descriptionX.isEmpty( ) ) { label = new TQLabel( descriptionX, this ); - tqlayout->addWidget( label ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( label ); + layout->addSpacing( KDialog::spacingHint( ) ); } - tqlayout->addWidget( m_edits[0] ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( m_edits[0] ); + layout->addSpacing( KDialog::spacingHint( ) ); if( !descriptionY.isEmpty( ) ) { label = new TQLabel( descriptionY, this ); - tqlayout->addWidget( label ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( label ); + layout->addSpacing( KDialog::spacingHint( ) ); } - tqlayout->addWidget( m_edits[1] ); + layout->addWidget( m_edits[1] ); } PMVectorEdit::PMVectorEdit( const TQString& descriptionX, @@ -70,7 +70,7 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX, : TQWidget( parent, name ) { unsigned int i; - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; TQLabel* label; m_edits.resize( 3 ); @@ -81,33 +81,33 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX, TQT_SLOT( slotTextChanged( const TQString& ) ) ); } - tqlayout = new TQHBoxLayout( this ); + layout = new TQHBoxLayout( this ); if( !descriptionX.isEmpty( ) ) { label = new TQLabel( descriptionX, this ); - tqlayout->addWidget( label ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( label ); + layout->addSpacing( KDialog::spacingHint( ) ); } - tqlayout->addWidget( m_edits[0] ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( m_edits[0] ); + layout->addSpacing( KDialog::spacingHint( ) ); if( !descriptionY.isEmpty( ) ) { label = new TQLabel( descriptionY, this ); - tqlayout->addWidget( label ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( label ); + layout->addSpacing( KDialog::spacingHint( ) ); } - tqlayout->addWidget( m_edits[1] ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( m_edits[1] ); + layout->addSpacing( KDialog::spacingHint( ) ); if( !descriptionZ.isEmpty( ) ) { label = new TQLabel( descriptionZ, this ); - tqlayout->addWidget( label ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( label ); + layout->addSpacing( KDialog::spacingHint( ) ); } - tqlayout->addWidget( m_edits[2] ); + layout->addWidget( m_edits[2] ); } PMVectorEdit::PMVectorEdit( const TQString& descriptionA, @@ -118,7 +118,7 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionA, : TQWidget( parent, name ) { unsigned int i; - TQHBoxLayout* tqlayout; + TQHBoxLayout* layout; TQLabel* label; m_edits.resize( 4 ); @@ -129,42 +129,42 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionA, TQT_SLOT( slotTextChanged( const TQString& ) ) ); } - tqlayout = new TQHBoxLayout( this ); + layout = new TQHBoxLayout( this ); if( !descriptionA.isEmpty( ) ) { label = new TQLabel( descriptionA, this ); - tqlayout->addWidget( label ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( label ); + layout->addSpacing( KDialog::spacingHint( ) ); } - tqlayout->addWidget( m_edits[0] ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( m_edits[0] ); + layout->addSpacing( KDialog::spacingHint( ) ); if( !descriptionB.isEmpty( ) ) { label = new TQLabel( descriptionB, this ); - tqlayout->addWidget( label ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( label ); + layout->addSpacing( KDialog::spacingHint( ) ); } - tqlayout->addWidget( m_edits[1] ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( m_edits[1] ); + layout->addSpacing( KDialog::spacingHint( ) ); if( !descriptionC.isEmpty( ) ) { label = new TQLabel( descriptionC, this ); - tqlayout->addWidget( label ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( label ); + layout->addSpacing( KDialog::spacingHint( ) ); } - tqlayout->addWidget( m_edits[2] ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( m_edits[2] ); + layout->addSpacing( KDialog::spacingHint( ) ); if( !descriptionD.isEmpty( ) ) { label = new TQLabel( descriptionD, this ); - tqlayout->addWidget( label ); - tqlayout->addSpacing( KDialog::spacingHint( ) ); + layout->addWidget( label ); + layout->addSpacing( KDialog::spacingHint( ) ); } - tqlayout->addWidget( m_edits[3] ); + layout->addWidget( m_edits[3] ); } void PMVectorEdit::setVector( const PMVector& v, int precision ) diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp index fed18026..4d785b52 100644 --- a/kpovmodeler/pmvectorlistedit.cpp +++ b/kpovmodeler/pmvectorlistedit.cpp @@ -20,7 +20,7 @@ #include <tqheader.h> #include <tqapplication.h> -#include <tqpalette.h> +#include <palette.h> #include <tqpainter.h> #include <kmessagebox.h> #include <klocale.h> @@ -53,7 +53,7 @@ void PMTableItem::paint( TQPainter* p, const TQColorGroup& cg, else p->setPen( cg.text( ) ); p->drawText( x + 2, 0, w - x - 4, h, - wordWrap( ) ? ( tqalignment( ) | WordBreak ) : tqalignment( ), text( ) ); + wordWrap( ) ? ( alignment( ) | WordBreak ) : alignment( ), text( ) ); } */ @@ -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, @@ -256,7 +256,7 @@ void PMVectorListEdit::setLink( int p1, int p2 ) if( p2 >= 0 ) { m_disabled[p2] = true; - str = TQString( "%1 (=%2)" ).tqarg( p2 + 1 ).tqarg( p1 + 1 ); + str = TQString( "%1 (=%2)" ).arg( p2 + 1 ).arg( p1 + 1 ); h->setLabel( p2, str ); if( !isReadOnly( ) ) setRowReadOnly( p2, true ); @@ -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/pmview.cpp b/kpovmodeler/pmview.cpp index 98fb2f61..90e47e69 100644 --- a/kpovmodeler/pmview.cpp +++ b/kpovmodeler/pmview.cpp @@ -19,7 +19,7 @@ #include <tqprinter.h> #include <tqpainter.h> #include <tqsplitter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <kconfig.h> #include <kdialog.h> @@ -39,7 +39,7 @@ PMView::PMView( PMPart* part, TQWidget* parent, const char* name ) { setBackgroundMode( PaletteBase ); - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); m_pMainSplitter = new TQSplitter( Qt::Horizontal, this, "MainSplitter" ); m_pTreeEditSplitter = new TQSplitter( Qt::Vertical, m_pMainSplitter, "TreeEditSplitter" ); @@ -68,8 +68,8 @@ PMView::PMView( PMPart* part, TQWidget* parent, const char* name ) m_pMainSplitter->show( ); - tqlayout->addWidget( m_pMainSplitter ); - tqlayout->activate( ); + layout->addWidget( m_pMainSplitter ); + layout->activate( ); m_pPart = part; } diff --git a/kpovmodeler/pmviewbase.h b/kpovmodeler/pmviewbase.h index 68febcf4..66426987 100644 --- a/kpovmodeler/pmviewbase.h +++ b/kpovmodeler/pmviewbase.h @@ -60,7 +60,7 @@ public: /** * Base class for configuration widgets for view types - * for the tqlayout settings dialog page + * for the layout settings dialog page */ class PMViewOptionsWidget : public TQWidget { diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp index e6f9148c..7d45224d 100644 --- a/kpovmodeler/pmviewlayoutmanager.cpp +++ b/kpovmodeler/pmviewlayoutmanager.cpp @@ -32,7 +32,7 @@ #include <tqwidgetlist.h> #include <tqlistbox.h> #include <tqlineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include "pmshell.h" @@ -443,7 +443,7 @@ void PMViewLayout::normalize( ) PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell ) { - PMViewLayout tqlayout; + PMViewLayout layout; TQValueList< TQValueList< PMViewLayoutEntry > > cols; cols.append( TQValueList< PMViewLayoutEntry >( ) ); @@ -457,7 +457,7 @@ PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell ) for( cit = cols.begin( ); cit != cols.end( ); ++cit ) for( eit = ( *cit ).begin( ); eit != ( *cit ).end( ); ++eit ) - tqlayout.addEntry( *eit ); + layout.addEntry( *eit ); // find floating widgets TQPtrList<PMDockWidget> list; @@ -495,11 +495,11 @@ PMViewLayout PMViewLayout::extractViewLayout( PMShell* shell ) invalid = true; if( !invalid ) - tqlayout.addEntry( e ); + layout.addEntry( e ); } } - return tqlayout; + return layout; } void PMViewLayout::recursiveExtractColumns( @@ -666,7 +666,7 @@ void PMViewLayoutManager::loadData( ) TQString fileName = locate( "data", "kpovmodeler/viewlayouts.xml" ); if( fileName.isEmpty( ) ) { - // Generate a default tqlayout + // Generate a default layout // I have a feeling this shouldn't be here but hey, it works for now // TODO Must find a way to move this cleanly to PMShell PMViewLayout a; @@ -763,7 +763,7 @@ void PMViewLayoutManager::saveData( ) { TQDomElement l; - l = doc.createElement( "viewtqlayout" ); + l = doc.createElement( "viewlayout" ); ( *it ).saveData( l, doc ); e.appendChild( l ); } @@ -810,7 +810,7 @@ void PMViewLayoutManager::displayLayout( const TQString& name, PMShell* shell ) flist.remove( ); } } - // Create the new tqlayout + // Create the new layout v_layout->displayLayout( shell ); m_layoutDisplayed = true; } @@ -879,7 +879,7 @@ PMSaveViewLayoutDialog::PMSaveViewLayoutDialog( PMShell* parent, TQWidget* w = new TQWidget( this ); TQVBoxLayout* vl = new TQVBoxLayout( w, 0, KDialog::spacingHint( ) ); - TQLabel* l = new TQLabel( i18n( "Enter view tqlayout name:" ), w ); + TQLabel* l = new TQLabel( i18n( "Enter view layout name:" ), w ); vl->addWidget( l ); m_pLayoutName = new TQLineEdit( w ); @@ -907,13 +907,13 @@ void PMSaveViewLayoutDialog::slotOk( ) TQString name = m_pLayoutName->text( ); PMViewLayoutManager* m = PMViewLayoutManager::theManager( ); - PMViewLayout* tqlayout = m->findLayout( name ); + PMViewLayout* layout = m->findLayout( name ); PMViewLayout newLayout = PMViewLayout::extractViewLayout( m_pShell ); newLayout.setName( name ); - if( tqlayout ) - *tqlayout = newLayout; + if( layout ) + *layout = newLayout; else m->addLayout( newLayout ); diff --git a/kpovmodeler/pmviewlayoutmanager.h b/kpovmodeler/pmviewlayoutmanager.h index c84147fb..a1129406 100644 --- a/kpovmodeler/pmviewlayoutmanager.h +++ b/kpovmodeler/pmviewlayoutmanager.h @@ -108,8 +108,8 @@ private: /** * Class used internally by @ref PMViewLayoutManager * - * This class maintains a named tqlayout. It basically stores all views - * associated with that tqlayout. + * This class maintains a named layout. It basically stores all views + * associated with that layout. */ class PMViewLayout { @@ -143,12 +143,12 @@ public: */ void displayLayout( PMShell* shell ); /** - * Sets the name of the tqlayout + * Sets the name of the layout */ void setName( const TQString& n ); /** * - * Add a new entry to the tqlayout. By default it adds the entry at the end + * Add a new entry to the layout. By default it adds the entry at the end * of the list. If a position is given it adds the entry at the indicated * position */ @@ -179,7 +179,7 @@ public: void normalize( ); /** - * Extracts the view tqlayout from the current window + * Extracts the view layout from the current window */ static PMViewLayout extractViewLayout( PMShell* shell ); private: @@ -202,7 +202,7 @@ private: * * It interacts with @ref PMShell to create the view layouts. * The class maintains a list of layouts as well as the name of the default - * tqlayout. The layouts are stored in a XML file caled viewlayouts.xml. + * layout. The layouts are stored in a XML file caled viewlayouts.xml. */ class PMViewLayoutManager { @@ -221,11 +221,11 @@ public: */ TQStringList availableLayouts( ); /** - * Sets the default tqlayout + * Sets the default layout */ void setDefaultLayout( const TQString& name ); /** - * Returns the default tqlayout + * Returns the default layout */ TQString defaultLayout( ) const { return m_defaultLayout; } /** @@ -233,7 +233,7 @@ public: */ void displayLayout( const TQString& name, PMShell* shell ); /** - * Displays the tqlayout indicated as default + * Displays the layout indicated as default */ void displayDefaultLayout( PMShell* shell ); /** @@ -241,23 +241,23 @@ public: */ void loadData( ); /** - * Saves the current tqlayout collection to the configuration file + * Saves the current layout collection to the configuration file */ void saveData( ); /** - * Add a new empty tqlayout + * Add a new empty layout */ void addLayout( const TQString& name ); /** - * Add a new tqlayout + * Add a new layout */ void addLayout( const PMViewLayout& l ) { m_layouts.append( l ); } /** - * Remove a tqlayout + * Remove a layout */ void removeLayout( const TQString& name ); /** - * Get a known tqlayout + * Get a known layout */ PMViewLayout* findLayout( const TQString& name ); /** 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; diff --git a/kpovmodeler/pmwarpedit.cpp b/kpovmodeler/pmwarpedit.cpp index 64e327f2..f18f8d67 100644 --- a/kpovmodeler/pmwarpedit.cpp +++ b/kpovmodeler/pmwarpedit.cpp @@ -21,7 +21,7 @@ #include "pmvectoredit.h" #include "pmlineedits.h" -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqcombobox.h> #include <tqcheckbox.h> diff --git a/kpovmodeler/pmxmlparser.cpp b/kpovmodeler/pmxmlparser.cpp index eb5d0123..11d42015 100644 --- a/kpovmodeler/pmxmlparser.cpp +++ b/kpovmodeler/pmxmlparser.cpp @@ -143,7 +143,7 @@ void PMXMLParser::parseChildObjects( TQDomElement& e, PMObject* parent ) delete obj; } else if( ce.tagName( ) != "extra_data" ) - printError( i18n( "Unknown object %1" ).tqarg( ce.tagName( ) ) ); + printError( i18n( "Unknown object %1" ).arg( ce.tagName( ) ) ); } c = c.nextSibling( ); } |