summaryrefslogtreecommitdiffstats
path: root/kpovmodeler
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:56:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:56:05 -0600
commit74c05bbf9d92e43a6cf3799355b5f3598884409e (patch)
tree9371e52e1564e08fd280f28e49981ffeb881b9d2 /kpovmodeler
parent45f529de247fc4b3662f6b474abe03fe904306ec (diff)
downloadtdegraphics-74c05bbf9d92e43a6cf3799355b5f3598884409e.tar.gz
tdegraphics-74c05bbf9d92e43a6cf3799355b5f3598884409e.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kpovmodeler')
-rw-r--r--kpovmodeler/pmaddcommand.cpp2
-rw-r--r--kpovmodeler/pmaddcommand.h4
-rw-r--r--kpovmodeler/pmbicubicpatch.cpp8
-rw-r--r--kpovmodeler/pmcolorsettings.cpp14
-rw-r--r--kpovmodeler/pmcommand.h4
-rw-r--r--kpovmodeler/pmcompositeobject.h4
-rw-r--r--kpovmodeler/pmdatachangecommand.cpp2
-rw-r--r--kpovmodeler/pmdeclare.cpp2
-rw-r--r--kpovmodeler/pmdeletecommand.cpp4
-rw-r--r--kpovmodeler/pmdialogeditbase.cpp14
-rw-r--r--kpovmodeler/pmdockwidget.cpp54
-rw-r--r--kpovmodeler/pmdockwidget.h4
-rw-r--r--kpovmodeler/pmdockwidget_private.cpp16
-rw-r--r--kpovmodeler/pmglview.cpp14
-rw-r--r--kpovmodeler/pmglview.h2
-rw-r--r--kpovmodeler/pmgraphicalobject.h2
-rw-r--r--kpovmodeler/pmgraphicalobjectedit.cpp2
-rw-r--r--kpovmodeler/pmgridsettings.cpp8
-rw-r--r--kpovmodeler/pminserterrordialog.cpp2
-rw-r--r--kpovmodeler/pminsertrulesystem.cpp20
-rw-r--r--kpovmodeler/pminsertrulesystem.h4
-rw-r--r--kpovmodeler/pmisosurfaceedit.cpp2
-rw-r--r--kpovmodeler/pmlathe.cpp8
-rw-r--r--kpovmodeler/pmlibraryiconview.cpp2
-rw-r--r--kpovmodeler/pmlineedits.cpp16
-rw-r--r--kpovmodeler/pmlistpatternedit.cpp6
-rw-r--r--kpovmodeler/pmmovecommand.cpp10
-rw-r--r--kpovmodeler/pmmovecommand.h4
-rw-r--r--kpovmodeler/pmobject.h18
-rw-r--r--kpovmodeler/pmobjectlink.cpp2
-rw-r--r--kpovmodeler/pmobjectsettings.cpp50
-rw-r--r--kpovmodeler/pmoutputdevice.cpp4
-rw-r--r--kpovmodeler/pmparser.cpp26
-rw-r--r--kpovmodeler/pmparser.h4
-rw-r--r--kpovmodeler/pmpart.cpp6
-rw-r--r--kpovmodeler/pmpovray31serialization.cpp94
-rw-r--r--kpovmodeler/pmpovray35serialization.cpp18
-rw-r--r--kpovmodeler/pmpovrayparser.cpp12
-rw-r--r--kpovmodeler/pmpovrayrenderwidget.cpp2
-rw-r--r--kpovmodeler/pmpovraywidget.cpp4
-rw-r--r--kpovmodeler/pmprism.cpp4
-rw-r--r--kpovmodeler/pmprismedit.cpp2
-rw-r--r--kpovmodeler/pmrendermanager.cpp16
-rw-r--r--kpovmodeler/pmrendermode.cpp18
-rw-r--r--kpovmodeler/pmscanner.cpp4
-rw-r--r--kpovmodeler/pmserializer.cpp4
-rw-r--r--kpovmodeler/pmsettingsdialog.cpp6
-rw-r--r--kpovmodeler/pmsettingsdialog.h2
-rw-r--r--kpovmodeler/pmshell.cpp8
-rw-r--r--kpovmodeler/pmsolidobject.h2
-rw-r--r--kpovmodeler/pmsor.cpp4
-rw-r--r--kpovmodeler/pmsoredit.cpp2
-rw-r--r--kpovmodeler/pmspheresweep.cpp8
-rw-r--r--kpovmodeler/pmsymboltable.cpp2
-rw-r--r--kpovmodeler/pmtexturebase.cpp2
-rw-r--r--kpovmodeler/pmtexturemap.cpp2
-rw-r--r--kpovmodeler/pmtreeview.cpp2
-rw-r--r--kpovmodeler/pmtreeviewitem.cpp4
-rw-r--r--kpovmodeler/pmtreeviewitem.h8
-rw-r--r--kpovmodeler/pmtriangleedit.cpp6
-rw-r--r--kpovmodeler/pmunknownview.cpp2
-rw-r--r--kpovmodeler/pmvectorlistedit.cpp4
-rw-r--r--kpovmodeler/pmxmlparser.cpp2
63 files changed, 294 insertions, 294 deletions
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 b4c363d5..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 );
@@ -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/pmcolorsettings.cpp b/kpovmodeler/pmcolorsettings.cpp
index e8518312..4be987ac 100644
--- a/kpovmodeler/pmcolorsettings.cpp
+++ b/kpovmodeler/pmcolorsettings.cpp
@@ -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/pmcompositeobject.h b/kpovmodeler/pmcompositeobject.h
index b970faf1..350180db 100644
--- a/kpovmodeler/pmcompositeobject.h
+++ b/kpovmodeler/pmcompositeobject.h
@@ -44,7 +44,7 @@ public:
*/
PMCompositeObject( const PMCompositeObject& o );
/**
- * Deletes the object and all tqchildren.
+ * Deletes the object and all children.
*/
virtual ~PMCompositeObject( );
@@ -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/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 a5863582..3f290e2f 100644
--- a/kpovmodeler/pmdeclare.cpp
+++ b/kpovmodeler/pmdeclare.cpp
@@ -44,7 +44,7 @@ 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::metaObject( ) const
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/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp
index 9b575fd8..bd444718 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -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 );
@@ -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/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp
index 733922f2..f340cde4 100644
--- a/kpovmodeler/pmdockwidget.cpp
+++ b/kpovmodeler/pmdockwidget.cpp
@@ -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 );
@@ -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
@@ -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 )
@@ -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();
}
@@ -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 );
@@ -1319,18 +1319,18 @@ bool PMDockManager::eventFilter( TQObject *obj, TQEvent *event )
TQMainWindow's tqlayout 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 tqlayout 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
@@ -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;
@@ -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;
@@ -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);
@@ -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..c240e153 100644
--- a/kpovmodeler/pmdockwidget.h
+++ b/kpovmodeler/pmdockwidget.h
@@ -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.
*
@@ -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
diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp
index c17b8c62..a7f45e50 100644
--- a/kpovmodeler/pmdockwidget_private.cpp
+++ b/kpovmodeler/pmdockwidget_private.cpp
@@ -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();
@@ -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/pmglview.cpp b/kpovmodeler/pmglview.cpp
index 41a748e0..a8cf75a7 100644
--- a/kpovmodeler/pmglview.cpp
+++ b/kpovmodeler/pmglview.cpp
@@ -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..30ee5d16 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
*/
diff --git a/kpovmodeler/pmgraphicalobject.h b/kpovmodeler/pmgraphicalobject.h
index fd53e919..399e351d 100644
--- a/kpovmodeler/pmgraphicalobject.h
+++ b/kpovmodeler/pmgraphicalobject.h
@@ -46,7 +46,7 @@ public:
*/
PMGraphicalObject( const PMGraphicalObject& o );
/**
- * Deletes the object and all tqchildren
+ * Deletes the object and all children
*/
virtual ~PMGraphicalObject( );
diff --git a/kpovmodeler/pmgraphicalobjectedit.cpp b/kpovmodeler/pmgraphicalobjectedit.cpp
index 1429d75f..c623c51f 100644
--- a/kpovmodeler/pmgraphicalobjectedit.cpp
+++ b/kpovmodeler/pmgraphicalobjectedit.cpp
@@ -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..644b2ab3 100644
--- a/kpovmodeler/pmgridsettings.cpp
+++ b/kpovmodeler/pmgridsettings.cpp
@@ -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/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 af899947..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( );
@@ -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/pmisosurfaceedit.cpp b/kpovmodeler/pmisosurfaceedit.cpp
index 6b775fe4..752331b6 100644
--- a/kpovmodeler/pmisosurfaceedit.cpp
+++ b/kpovmodeler/pmisosurfaceedit.cpp
@@ -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/pmlathe.cpp b/kpovmodeler/pmlathe.cpp
index c5021d28..9f6a00ff 100644
--- a/kpovmodeler/pmlathe.cpp
+++ b/kpovmodeler/pmlathe.cpp
@@ -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/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp
index 976bfcbe..d2588dca 100644
--- a/kpovmodeler/pmlibraryiconview.cpp
+++ b/kpovmodeler/pmlibraryiconview.cpp
@@ -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/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/pmlistpatternedit.cpp b/kpovmodeler/pmlistpatternedit.cpp
index bc897c61..1c8c6f34 100644
--- a/kpovmodeler/pmlistpatternedit.cpp
+++ b/kpovmodeler/pmlistpatternedit.cpp
@@ -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/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/pmobject.h b/kpovmodeler/pmobject.h
index 4a48e450..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( );
@@ -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; }
@@ -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/pmobjectlink.cpp b/kpovmodeler/pmobjectlink.cpp
index 0eec53c7..559d3fe4 100644
--- a/kpovmodeler/pmobjectlink.cpp
+++ b/kpovmodeler/pmobjectlink.cpp
@@ -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/pmobjectsettings.cpp b/kpovmodeler/pmobjectsettings.cpp
index 77e7f0f5..e9cd33b4 100644
--- a/kpovmodeler/pmobjectsettings.cpp
+++ b/kpovmodeler/pmobjectsettings.cpp
@@ -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/pmoutputdevice.cpp b/kpovmodeler/pmoutputdevice.cpp
index 8e6333f2..abad0e36 100644
--- a/kpovmodeler/pmoutputdevice.cpp
+++ b/kpovmodeler/pmoutputdevice.cpp
@@ -58,12 +58,12 @@ void PMOutputDevice::callSerialization( const PMObject* o, const PMMetaObject* m
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( ) ) );
}
}
}
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..e8d1a984 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -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;
}
diff --git a/kpovmodeler/pmpovray31serialization.cpp b/kpovmodeler/pmpovray31serialization.cpp
index a31c46de..d153261d 100644
--- a/kpovmodeler/pmpovray31serialization.cpp
+++ b/kpovmodeler/pmpovray31serialization.cpp
@@ -109,7 +109,7 @@ void PMPov31SerBlob( const PMObject* object, const PMMetaObject* metaObject, PMO
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, metaObject->superClass( ) );
@@ -132,7 +132,7 @@ void PMPov31SerBlobCylinder( const PMObject* object, const PMMetaObject* metaObj
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, metaObject->superClass( ) );
dev->objectEnd( );
@@ -144,8 +144,8 @@ void PMPov31SerBlobSphere( const PMObject* object, const PMMetaObject* metaObjec
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->writeLine( o->centre( ).serialize( ) + TQString( ", %1," ).arg( o->radius( ) ) );
+ dev->writeLine( TQString( "strength %1" ).arg( o->strength( ) ) );
dev->callSerialization( object, metaObject->superClass( ) );
dev->objectEnd( );
}
@@ -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,7 +587,7 @@ 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
+ // Serialize the children of this object
dev->callSerialization( object, object->metaObject( )->superClass( )->superClass( ) );
dev->objectEnd( );
}
@@ -727,7 +727,7 @@ void PMPov31SerHeightField( const PMObject* object, const PMMetaObject* metaObje
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( ) )
@@ -885,15 +885,15 @@ void PMPov31SerJuliaFractal( const PMObject* object, const PMMetaObject* metaObj
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, metaObject->superClass( ) );
@@ -925,7 +925,7 @@ void PMPov31SerLathe( const PMObject* object, const PMMetaObject* metaObject, PM
}
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( );
@@ -968,10 +968,10 @@ void PMPov31SerLight( const PMObject* object, const PMMetaObject* metaObject, PM
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* metaObject, PM
{
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( ) )
@@ -1302,7 +1302,7 @@ void PMPov31SerObjectLink( const PMObject* object, const PMMetaObject* metaObjec
if( text.isEmpty( ) )
text = o->description( );
- dev->writeComment( TQString( "No prototype for %1" ).tqarg( text ) );
+ dev->writeComment( TQString( "No prototype for %1" ).arg( text ) );
}
}
@@ -1501,18 +1501,18 @@ void PMPov31SerPolynom( const PMObject* object, const PMMetaObject* metaObject,
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( );
@@ -1545,14 +1545,14 @@ 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* metaObject, PMOutputDevice* dev )
@@ -1587,7 +1587,7 @@ void PMPov31SerPrism( const PMObject* object, const PMMetaObject* metaObject, PM
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* metaObject, PM
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 )
{
@@ -1756,7 +1756,7 @@ 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( ) );
}
@@ -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( );
@@ -1864,8 +1864,8 @@ void PMPov31SerSuperquadricEllipsoid( const PMObject* object, const PMMetaObject
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, metaObject->superClass( ) );
dev->objectEnd( );
@@ -1880,7 +1880,7 @@ void PMPov31SerText( const PMObject* object, const PMMetaObject* metaObject, PMO
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, metaObject->superClass( ) );
@@ -1922,7 +1922,7 @@ void PMPov31SerTextureBase( const PMObject* object, const PMMetaObject* metaObje
if( text.isEmpty( ) )
text = o->description( );
- dev->writeComment( TQString( "No prototype for %1" ).tqarg( text ) );
+ dev->writeComment( TQString( "No prototype for %1" ).arg( text ) );
}
}
@@ -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;
diff --git a/kpovmodeler/pmpovray35serialization.cpp b/kpovmodeler/pmpovray35serialization.cpp
index 457f51a4..d567100e 100644
--- a/kpovmodeler/pmpovray35serialization.cpp
+++ b/kpovmodeler/pmpovray35serialization.cpp
@@ -102,8 +102,8 @@ void PMPov35SerIsoSurface( const PMObject* object, const PMMetaObject* metaObjec
}
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( ) )
@@ -145,10 +145,10 @@ void PMPov35SerLight( const PMObject* object, const PMMetaObject* metaObject, PM
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* metaObject, PM
{
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* metaObject, PM
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( ) )
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 6e8b4ef2..ce7ff716 100644
--- a/kpovmodeler/pmpovrayrenderwidget.cpp
+++ b/kpovmodeler/pmpovrayrenderwidget.cpp
@@ -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 ) )
{
diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp
index 0d9cea35..04564b93 100644
--- a/kpovmodeler/pmpovraywidget.cpp
+++ b/kpovmodeler/pmpovraywidget.cpp
@@ -335,7 +335,7 @@ void PMPovrayWidget::slotRenderingFinished( int returnStatus )
{
KMessageBox::error( this, i18n( "Povray exited abnormally.\n"
"See the povray output for details." )
- .tqarg( returnStatus ) );
+ .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/pmprism.cpp b/kpovmodeler/pmprism.cpp
index 5e627935..81417ba3 100644
--- a/kpovmodeler/pmprism.cpp
+++ b/kpovmodeler/pmprism.cpp
@@ -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/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp
index 78960007..09039d7e 100644
--- a/kpovmodeler/pmprismedit.cpp
+++ b/kpovmodeler/pmprismedit.cpp
@@ -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 );
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/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/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..f8c73a80 100644
--- a/kpovmodeler/pmsettingsdialog.cpp
+++ b/kpovmodeler/pmsettingsdialog.cpp
@@ -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/pmsolidobject.h b/kpovmodeler/pmsolidobject.h
index 2a2990c0..be2d2f5c 100644
--- a/kpovmodeler/pmsolidobject.h
+++ b/kpovmodeler/pmsolidobject.h
@@ -44,7 +44,7 @@ public:
PMSolidObject( const PMSolidObject& s );
/**
- * Deletes the object and all tqchildren
+ * Deletes the object and all children
*/
virtual ~PMSolidObject( );
/** */
diff --git a/kpovmodeler/pmsor.cpp b/kpovmodeler/pmsor.cpp
index f25669e6..2ede8b8a 100644
--- a/kpovmodeler/pmsor.cpp
+++ b/kpovmodeler/pmsor.cpp
@@ -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/pmsoredit.cpp b/kpovmodeler/pmsoredit.cpp
index 728aa20f..127015df 100644
--- a/kpovmodeler/pmsoredit.cpp
+++ b/kpovmodeler/pmsoredit.cpp
@@ -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/pmspheresweep.cpp b/kpovmodeler/pmspheresweep.cpp
index 40df90f3..9660335e 100644
--- a/kpovmodeler/pmspheresweep.cpp
+++ b/kpovmodeler/pmspheresweep.cpp
@@ -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/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/pmtexturebase.cpp b/kpovmodeler/pmtexturebase.cpp
index 0a8d087b..a49b103f 100644
--- a/kpovmodeler/pmtexturebase.cpp
+++ b/kpovmodeler/pmtexturebase.cpp
@@ -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/pmtexturemap.cpp b/kpovmodeler/pmtexturemap.cpp
index 8602c9fc..1ab0c3a4 100644
--- a/kpovmodeler/pmtexturemap.cpp
+++ b/kpovmodeler/pmtexturemap.cpp
@@ -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;
}
diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp
index 8ec640d7..a555e12e 100644
--- a/kpovmodeler/pmtreeview.cpp
+++ b/kpovmodeler/pmtreeview.cpp
@@ -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/pmtriangleedit.cpp b/kpovmodeler/pmtriangleedit.cpp
index b6d544a0..457ddb29 100644
--- a/kpovmodeler/pmtriangleedit.cpp
+++ b/kpovmodeler/pmtriangleedit.cpp
@@ -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/pmunknownview.cpp b/kpovmodeler/pmunknownview.cpp
index 7a1e6afb..72827c2f 100644
--- a/kpovmodeler/pmunknownview.cpp
+++ b/kpovmodeler/pmunknownview.cpp
@@ -25,7 +25,7 @@ PMUnknownView::PMUnknownView( const TQString& viewType,
{
TQHBoxLayout* hl = new TQHBoxLayout( this );
TQLabel* l;
- l = new TQLabel( i18n( "Unknown view type \"%1\"" ).tqarg( viewType ), this );
+ l = new TQLabel( i18n( "Unknown view type \"%1\"" ).arg( viewType ), this );
l->setAlignment( TQt::AlignCenter );
hl->addWidget( l );
m_viewType = viewType;
diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp
index fb1fa482..eb580d63 100644
--- a/kpovmodeler/pmvectorlistedit.cpp
+++ b/kpovmodeler/pmvectorlistedit.cpp
@@ -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( ) );
}
*/
@@ -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 );
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( );
}