Remove additional unneeded tq method conversions

9 files changed, 28 insertions, 28 deletions

diff --git a/kig/misc/calcpaths.cc b/kig/misc/calcpaths.cc
index 3e947789..1532715b 100644
--- a/kig/misc/calcpaths.cc
+++ b/kig/misc/calcpaths.cc
@@ -75,7 +75,7 @@ void localdfs( ObjectCalcer* obj,
                std::vector<ObjectCalcer*>& all)
 {
   visited.push_back( obj );
-  const std::vector<ObjectCalcer*> o = obj->tqchildren();
+  const std::vector<ObjectCalcer*> o = obj->children();
   for ( std::vector<ObjectCalcer*>::const_iterator i = o.begin(); i != o.end(); ++i )
   {
     if ( std::find( visited.begin(), visited.end(), *i ) == visited.end() )
@@ -98,7 +98,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& os )
 
   // the general idea here:
   // first we build a new Objects variable.  For every object in os,
-  // we put all of its tqchildren at the end of it, and we do the same
+  // we put all of its children at the end of it, and we do the same
   // for the ones we add..
 
   // "all" is the Objects var we're building...
@@ -115,7 +115,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& os )
   {
     for ( std::vector<ObjectCalcer*>::const_iterator i = tmp.begin(); i != tmp.end(); ++i )
     {
-      const std::vector<ObjectCalcer*> o = (*i)->tqchildren();
+      const std::vector<ObjectCalcer*> o = (*i)->children();
       std::copy( o.begin(), o.end(), std::back_inserter( all ) );
       std::copy( o.begin(), o.end(), std::back_inserter( tmp2 ) );
     };
@@ -148,7 +148,7 @@ bool addBranch( const std::vector<ObjectCalcer*>& o, const ObjectCalcer* to, std
     if ( *i == to )
       rb = true;
     else
-      if ( addBranch( (*i)->tqchildren(), to, ret ) )
+      if ( addBranch( (*i)->children(), to, ret ) )
       {
         rb = true;
         ret.push_back( *i );
@@ -163,7 +163,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& from, con
 
   for ( std::vector<ObjectCalcer*>::const_iterator i = from.begin(); i != from.end(); ++i )
   {
-    (void) addBranch( (*i)->tqchildren(), to, all );
+    (void) addBranch( (*i)->children(), to, all );
   };
 
   std::vector<ObjectCalcer*> ret;
@@ -193,7 +193,7 @@ static bool visit( const ObjectCalcer* o, const std::vector<ObjectCalcer*>& from
   // this function returns true if the visited object depends on one
   // of the objects in from.  If we encounter objects that are on the
   // side of the tree path ( they do not depend on from themselves,
-  // but their direct tqchildren do ), then we add them to ret.
+  // but their direct children do ), then we add them to ret.
   if ( std::find( from.begin(), from.end(), o ) != from.end() ) return true;
 
   std::vector<bool> deps( o->parents().size(), false );
@@ -289,8 +289,8 @@ std::set<ObjectCalcer*> getAllChildren( const std::vector<ObjectCalcer*> objs )
          i != cur.end(); ++i )
     {
       ret.insert( *i );
-      std::vector<ObjectCalcer*> tqchildren = (*i)->tqchildren();
-      next.insert( tqchildren.begin(), tqchildren.end() );
+      std::vector<ObjectCalcer*> children = (*i)->children();
+      next.insert( children.begin(), children.end() );
     };
     cur = next;
   };
diff --git a/kig/misc/calcpaths.h b/kig/misc/calcpaths.h
index f81ddc09..620558a3 100644
--- a/kig/misc/calcpaths.h
+++ b/kig/misc/calcpaths.h
@@ -30,7 +30,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& os );
 /**
  * This is a different function for more or less the same purpose.  It
  * takes a few Objects, which are considered to have been calced
- * already.  Then, it puts the necessary part of their tqchildren in the
+ * already.  Then, it puts the necessary part of their children in the
  * right order, so that calc()-ing correctly updates all of their data
  * ( they're calc'ed in the right order, i mean... ).  The objects in
  * from are normally not included in the output, unless they appear
@@ -42,7 +42,7 @@ std::vector<ObjectCalcer*> calcPath( const std::vector<ObjectCalcer*>& from, con
  * This function returns all objects on the side of the path through
  * the dependency tree from from down to to.  This means that we look
  * for any objects that don't depend on any of the objects in from
- * themselves, but of which one of the direct tqchildren does.  We need
+ * themselves, but of which one of the direct children does.  We need
  * this function for Locus stuff...
  */
 std::vector<ObjectCalcer*> sideOfTreePath( const std::vector<ObjectCalcer*>& from, const ObjectCalcer* to );
diff --git a/kig/misc/coordinate_system.cpp b/kig/misc/coordinate_system.cpp
index b518078e..36cfef0b 100644
--- a/kig/misc/coordinate_system.cpp
+++ b/kig/misc/coordinate_system.cpp
@@ -146,7 +146,7 @@ TQString EuclideanCoords::fromScreen( const Coordinate& p, const KigDocument& d
   int l = kigMax( 0, (int) ( 3 - log10( m ) ) );
   TQString xs = KGlobal::locale()->formatNumber( p.x, l );
   TQString ys = KGlobal::locale()->formatNumber( p.y, l );
-  return TQString::fromLatin1( "( %1; %2 )" ).tqarg( xs ).tqarg( ys );
+  return TQString::fromLatin1( "( %1; %2 )" ).arg( xs ).arg( ys );
 }
 
 Coordinate EuclideanCoords::toScreen(const TQString& s, bool& ok) const
@@ -354,7 +354,7 @@ TQString PolarCoords::fromScreen( const Coordinate& pt, const KigDocument& d ) c
   TQString rs = KGlobal::locale()->formatNumber( r, l );
   TQString ts = KGlobal::locale()->formatNumber( theta, 0 );
 
-  return TQString::fromLatin1("( %1; %2° )").tqarg( rs ).tqarg( ts );
+  return TQString::fromLatin1("( %1; %2° )").arg( rs ).arg( ts );
 }
 
 TQString PolarCoords::coordinateFormatNotice() const
diff --git a/kig/misc/kigfiledialog.cc b/kig/misc/kigfiledialog.cc
index 2c211690..2d7ea08f 100644
--- a/kig/misc/kigfiledialog.cc
+++ b/kig/misc/kigfiledialog.cc
@@ -53,7 +53,7 @@ void KigFileDialog::accept()
   {
     int ret = KMessageBox::warningContinueCancel( this,
                                          i18n( "The file \"%1\" already exists. Do you wish to overwrite it?" )
-                                         .tqarg( sFile ), i18n( "Overwrite File?" ), i18n("Overwrite") );
+                                         .arg( sFile ), i18n( "Overwrite File?" ), i18n("Overwrite") );
     if ( ret != KMessageBox::Continue )
     {
       KFileDialog::reject();
diff --git a/kig/misc/kiginputdialog.cc b/kig/misc/kiginputdialog.cc
index f45d6949..ac7f9ac5 100644
--- a/kig/misc/kiginputdialog.cc
+++ b/kig/misc/kiginputdialog.cc
@@ -85,7 +85,7 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label,
   d->m_textEdit->setText( label );
   d->m_textEdit->setReadOnly( true );
   d->m_textEdit->setFocusPolicy( TQ_NoFocus );
-//  d->m_textEdit->setAlignment( d->m_textEdit->tqalignment() | TQt::WordBreak );
+//  d->m_textEdit->setAlignment( d->m_textEdit->alignment() | TQt::WordBreak );
   d->m_textEdit->setFrameStyle( TQFrame::NoFrame );
   mainlay->addWidget( d->m_textEdit );
 
diff --git a/kig/misc/lists.cc b/kig/misc/lists.cc
index 7d2bee62..d3a4fb4d 100644
--- a/kig/misc/lists.cc
+++ b/kig/misc/lists.cc
@@ -301,13 +301,13 @@ bool MacroList::load( const TQString& f, std::vector<Macro*>& ret, const KigPart
   TQFile file( f );
   if ( ! file.open( IO_ReadOnly ) )
   {
-    KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).tqarg( f ) );
+    KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).arg( f ) );
     return false;
   }
   TQDomDocument doc( "KigMacroFile" );
   if ( !doc.setContent( &file ) )
   {
-    KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).tqarg( f ) );
+    KMessageBox::sorry( 0, i18n( "Could not open macro file '%1'" ).arg( f ) );
     return false;
   }
   file.close();
@@ -318,7 +318,7 @@ bool MacroList::load( const TQString& f, std::vector<Macro*>& ret, const KigPart
   else
   {
     KMessageBox::detailedSorry(
-      0, i18n( "Kig cannot open the macro file \"%1\"." ).tqarg( f ),
+      0, i18n( "Kig cannot open the macro file \"%1\"." ).arg( f ),
       i18n( "This file was created by a very old Kig version (pre-0.4). "
             "Support for this format has been removed from recent Kig versions. "
             "You can try to import this macro using a previous Kig version "
@@ -372,7 +372,7 @@ bool MacroList::loadNew( const TQDomElement& docelem, std::vector<Macro*>& ret,
     assert( hierarchy );
     // if the macro has no name, we give it a bogus name...
     if ( name.isEmpty() )
-      name = i18n( "Unnamed Macro #%1" ).tqarg( unnamedindex++ );
+      name = i18n( "Unnamed Macro #%1" ).arg( unnamedindex++ );
     MacroConstructor* ctor =
       new MacroConstructor( *hierarchy, i18n( name.latin1() ), i18n( description.latin1() ), iconfile );
     delete hierarchy;
diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cc
index 55914081..da89b66c 100644
--- a/kig/misc/object_hierarchy.cc
+++ b/kig/misc/object_hierarchy.cc
@@ -478,7 +478,7 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement&
 #define KIG_GENERIC_PARSE_ERROR \
   { \
     error = i18n( "An error was encountered at line %1 in file %2." ) \
-            .tqarg( __LINE__ ).tqarg( __FILE__ ); \
+            .arg( __LINE__ ).arg( __FILE__ ); \
     return 0; \
   }
 
@@ -544,7 +544,7 @@ ObjectHierarchy* ObjectHierarchy::buildSafeObjectHierarchy( const TQDomElement&
                       "which this Kig version does not support."
                       "Perhaps you have compiled Kig without support "
                       "for this object type,"
-                      "or perhaps you are using an older Kig version." ).tqarg( TQString(typen) );
+                      "or perhaps you are using an older Kig version." ).arg( TQString(typen) );
         return 0;
       }
 
diff --git a/kig/misc/object_hierarchy.h b/kig/misc/object_hierarchy.h
index 5997015c..60df8a59 100644
--- a/kig/misc/object_hierarchy.h
+++ b/kig/misc/object_hierarchy.h
@@ -73,7 +73,7 @@ public:
   std::vector<ObjectImp*> calc( const Args& a, const KigDocument& doc ) const;
 
   /**
-   * saves the ObjectHierarchy data in tqchildren xml tags of \p parent ..
+   * saves the ObjectHierarchy data in children xml tags of \p parent ..
    */
   void serialize( TQDomElement& parent, TQDomDocument& doc ) const;
   /**
diff --git a/kig/misc/special_constructors.cc b/kig/misc/special_constructors.cc
index edc54b42..51ac346e 100644
--- a/kig/misc/special_constructors.cc
+++ b/kig/misc/special_constructors.cc
@@ -210,14 +210,14 @@ const int LocusConstructor::wantArgs(
   if ( dynamic_cast<ObjectTypeCalcer*>( os.front() ) &&
        static_cast<ObjectTypeCalcer*>( os.front() )->type()->inherits( ObjectType::ID_ConstrainedPointType ) )
   {
-    std::set<ObjectCalcer*> tqchildren = getAllChildren( os.front() );
-    return tqchildren.find( os.back() ) != tqchildren.end() ? ret : ArgsParser::Invalid;
+    std::set<ObjectCalcer*> children = getAllChildren( os.front() );
+    return children.find( os.back() ) != children.end() ? ret : ArgsParser::Invalid;
   }
   if ( dynamic_cast<ObjectTypeCalcer*>( os.back() ) &&
        static_cast<ObjectTypeCalcer*>( os.back() )->type()->inherits( ObjectType::ID_ConstrainedPointType ) )
   {
-    std::set<ObjectCalcer*> tqchildren = getAllChildren( os.back() );
-    return tqchildren.find( os.front() ) != tqchildren.end() ? ret : ArgsParser::Invalid;
+    std::set<ObjectCalcer*> children = getAllChildren( os.back() );
+    return children.find( os.front() ) != children.end() ? ret : ArgsParser::Invalid;
   }
   return ArgsParser::Invalid;
 }
@@ -682,7 +682,7 @@ void PolygonBCVConstructor::handlePrelim(
       ptn = PointImp( where );
       ptn.draw( p );
       if ( i > 5 ) continue;
-      text = TextImp( TQString( "(%1)" ).tqarg(i), where, false );
+      text = TextImp( TQString( "(%1)" ).arg(i), where, false );
       text.draw( p );
     }
     p.setStyle( Qt::DotLine );
@@ -752,13 +752,13 @@ TQString PolygonBCVConstructor::useText( const ObjectCalcer&, const std::vector<
     {
       TQString result = TQString(
         i18n( "Adjust the number of sides (%1/%2)" )
-        ).tqarg( nsides ).tqarg( winding );
+        ).arg( nsides ).arg( winding );
       return result;
     } else
     {
       TQString result = TQString(
         i18n( "Adjust the number of sides (%1)" )
-        ).tqarg( nsides );
+        ).arg( nsides );
       return result;
     }
     break;