Rename a number of old tq methods that are no longer tq specific

66 files changed, 278 insertions, 278 deletions

diff --git a/kig/ChangeLog b/kig/ChangeLog
index af35b577..ec8d6042 100644
--- a/kig/ChangeLog
+++ b/kig/ChangeLog
@@ -936,7 +936,7 @@
 	and made a sort of skeleton to modify type's data.
 
 	* Made buttons of some dialogs like other KDE dialogs ones (with
-	icons and correct tqalignment).
+	icons and correct alignment).
 
 	* Kig now ask the user when exporting type(s) to an already
 	existant file.
@@ -1143,7 +1143,7 @@
 	* Fix the moving system again, it now only redraws exactly those
 	objects that need to be redrawn.  E.g. when a constrained point
 	was moved, before it was assumed that all of its parents, and
-	their tqchildren would move, whereas in reality, a constrained point
+	their children would move, whereas in reality, a constrained point
 	does not move the curve it is constrained to.  This is now taken
 	into account for.  This much optimizes the case where we move the
 	constrained point in examples/sine-curve.kig.
@@ -1438,7 +1438,7 @@
 2003-05-24  Dominique Devriese  <devriese@kde.org>
 
 	* when the user tries to construct a macro that constructs an
-		object from its tqchildren, warn him instead of
+		object from its children, warn him instead of
 		crashing... Thanks to Stephan Binner for the bug report
 
 	* improve the export to image dialog, as suggested by Stephan Binner
@@ -1516,7 +1516,7 @@
 
 	* organise the filters directory more sanely
 
-	* fix for deleting: remove deleted objects from their tqchildren, so
+	* fix for deleting: remove deleted objects from their children, so
 		  they don't appear in saved files
 
 2003-05-07  Dominique Devriese  <devriese@kde.org>
diff --git a/kig/DESIGN b/kig/DESIGN
index b3f844f2..fd887779 100644
--- a/kig/DESIGN
+++ b/kig/DESIGN
@@ -185,7 +185,7 @@ All this gives labels in Kig a lot of flexibility.
 2.2 Locuses
 
 Locuses are a mathematical concept that has been modelled in Kig.
-Loosely defined, a locus is the mathematical tqshape defined by the set
+Loosely defined, a locus is the mathematical shape defined by the set
 of points that a certain point moves through while another point is
 moved over its constraints.  This can be used to define mathematical
 objects like conics, and various other things.  It has been modelled
@@ -258,7 +258,7 @@ the constrained point.  This is wrong because when the constrained
 point moves within the limits of the curve constraining it, the locus
 does by definition not change.  Also, if the constrained point is
 redefined so that it is no longer constrained to any curve, this is a
-major problem, because it would tqinvalidate the locus.  Another point
+major problem, because it would invalidate the locus.  Another point
 is that in practice, the locus depends on more objects than its
 parents alone.  This is not a good thing, because it makes it
 impossible to optimise drawing of the objects, using the information
diff --git a/kig/TODO b/kig/TODO
index 3329bf08..292cae17 100644
--- a/kig/TODO
+++ b/kig/TODO
@@ -50,7 +50,7 @@
 - make DoubleImp a "visible" object with uses like Dr. Geo numeric
   values.
 
-- Provide some nice stuff for differential tqgeometry: velocity vector
+- Provide some nice stuff for differential geometry: velocity vector
   of a curve, curvature vector, osculating parabole. Most of this is
   not too difficult to implement, but very cool :)
 
@@ -58,9 +58,9 @@
   allow for importing from/exporting to other formula formats such as
   KFormula, OOFormula and MathML.
 
-- other types of fillable tqshapes, like arc sector, arc segment...
+- other types of fillable shapes, like arc sector, arc segment...
 
-- defined integrals, as a particular case of filled tqshapes.
+- defined integrals, as a particular case of filled shapes.
 
 - improve *a lot* the transformation support for cubics.
 
@@ -141,7 +141,7 @@
 
 - write cabri-filter-status.txt.
 
-- add "Tools": easy tools designed for tqgeometry, like Angle converter and
+- add "Tools": easy tools designed for geometry, like Angle converter and
   so on...
 
 - save a "session", i.e.: record how a document is moved, and save it to
diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc
index 7d7369a1..b1bf83dd 100644
--- a/kig/filters/cabri-filter.cc
+++ b/kig/filters/cabri-filter.cc
@@ -549,7 +549,7 @@ KigDocument* KigFilterCabri::load( const TQString& file )
     else
     {
       notSupported( file, i18n( "This Cabri file contains a \"%1\" object, "
-                                "which Kig does not currently support." ).tqarg( TQString(obj.type) ) );
+                                "which Kig does not currently support." ).arg( TQString(obj.type) ) );
       return 0;
     }
 
diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui
index 1a9589b2..2473fd12 100644
--- a/kig/filters/drgeo-filter-chooserbase.ui
+++ b/kig/filters/drgeo-filter-chooserbase.ui
@@ -33,7 +33,7 @@
                 <string>The current Dr. Geo file contains more than one figure.
 Please select which to import:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -96,7 +96,7 @@ Please select which to import:</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc
index 6596bf44..13a3ca0f 100644
--- a/kig/filters/drgeo-filter.cc
+++ b/kig/filters/drgeo-filter.cc
@@ -106,9 +106,9 @@ KigDocument* KigFilterDrgeo::load( const TQString& file )
   if ( figures.isEmpty() ) {
     if( nmacros > 0 )
       warning( i18n( "The Dr. Geo file \"%1\" is a macro file so it contains no "
-                     "figures." ).tqarg( file ) );
+                     "figures." ).arg( file ) );
     else
-      warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).tqarg( file ) );
+      warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).arg( file ) );
     return false;
   }
 
@@ -333,7 +333,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
         {
 //          oc = fact->constrainedPointCalcer( parents[0], value );
           notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                    "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                    "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                       domelem.attribute( "type" ) ) );
           return false;
         }
@@ -387,7 +387,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
       else
       {
         notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                  "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                  "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                     domelem.attribute( "type" ) ) );
         return false;
       }
@@ -419,7 +419,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
         else
         {
           notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                    "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                    "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                     domelem.attribute( "type" ) ) );
           return false;
         }
@@ -432,7 +432,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
         else
         {
           notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                    "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                    "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                     domelem.attribute( "type" ) ) );
           return false;
         }
@@ -453,7 +453,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
         else
         {
           notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                    "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                    "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                     domelem.attribute( "type" ) ) );
           return false;
         }
@@ -469,7 +469,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
         else
         {
           notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                    "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                    "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                     domelem.attribute( "type" ) ) );
           return false;
         }
@@ -490,7 +490,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
       else
       {
         notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                  "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                  "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                   domelem.attribute( "type" ) ) );
         return false;
       }
@@ -529,7 +529,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
         bool ok3;
         double dvalue = value.toDouble( &ok3 );
         if ( ok3 )
-          value = TQString( "%1" ).tqarg( dvalue, 0, 'g', 3 );
+          value = TQString( "%1" ).arg( dvalue, 0, 'g', 3 );
         oc = fact->labelCalcer( value, m, false, std::vector<ObjectCalcer*>(), *ret );
       }
       else if ( domelem.attribute( "type" ) == "pt_abscissa" )
@@ -618,7 +618,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
       else
       {
         notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                  "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                  "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                   domelem.attribute( "type" ) ) );
         return false;
       }
@@ -636,7 +636,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
       else
       {
         notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                  "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                  "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                   domelem.attribute( "type" ) ) );
         return false;
       }
@@ -677,7 +677,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
       else
       {
         notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                  "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                  "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                   domelem.attribute( "type" ) ) );
         return false;
       }
@@ -689,7 +689,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
       else
       {
         notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                  "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                  "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                   domelem.attribute( "type" ) ) );
         return false;
       }
@@ -709,7 +709,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
       kdDebug() << ">>>>>>>>> UNKNOWN OBJECT" << endl;
 #endif
       notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
-                                "which Kig does not currently support." ).tqarg( domelem.tagName() ).tqarg(
+                                "which Kig does not currently support." ).arg( domelem.tagName() ).arg(
                                 domelem.attribute( "type" ) ) );
       return false;
     }
@@ -770,7 +770,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
       {
         std::vector<ObjectCalcer*> args2;
         args2.push_back( o->nameCalcer() );
-        oc2 = fact->attachedLabelCalcer( TQString::tqfromLatin1( "%1" ), oc,
+        oc2 = fact->attachedLabelCalcer( TQString::fromLatin1( "%1" ), oc,
                  static_cast<const PointImp*>( oc->imp() )->coordinate(),
                  false, args2, *ret );
         co = TQt::black;
diff --git a/kig/filters/drgeo-filter.h b/kig/filters/drgeo-filter.h
index ddd2359e..9b0ef369 100644
--- a/kig/filters/drgeo-filter.h
+++ b/kig/filters/drgeo-filter.h
@@ -26,7 +26,7 @@ class KigDocument;
 class TQString;
 
 /**
- * This is an import filter for the GNOME tqgeometry program DrGeo.
+ * This is an import filter for the GNOME geometry program DrGeo.
  */
 class KigFilterDrgeo
   : public KigFilter
diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cc
index 8dfeffda..53e14139 100644
--- a/kig/filters/exporter.cc
+++ b/kig/filters/exporter.cc
@@ -40,7 +40,7 @@
 #include <tqcolor.h>
 #include <tqfile.h>
 #include <tqiconset.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kaction.h>
 #include <kiconloader.h>
@@ -156,7 +156,7 @@ void ImageExporter::run( const KigPart& doc, KigWidget& w )
   {
     KMessageBox::sorry( &w,
                         i18n( "The file \"%1\" could not be opened. Please check if the file permissions are set correctly." )
-                        .tqarg( filename ) );
+                        .arg( filename ) );
     return;
   };
 
@@ -169,7 +169,7 @@ void ImageExporter::run( const KigPart& doc, KigWidget& w )
   p.drawObjects( doc.document().objects(), false );
   if ( ! img.save( filename, type.latin1() ) )
   {
-    KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to image \"%1\"" ).tqarg( filename ) );
+    KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to image \"%1\"" ).arg( filename ) );
   }
 
 }
@@ -593,7 +593,7 @@ void XFigExporter::run( const KigPart& doc, KigWidget& w )
   {
     KMessageBox::sorry( &w, i18n( "The file \"%1\" could not be opened. Please "
                                   "check if the file permissions are set correctly." )
-                        .tqarg( file_name ) );
+                        .arg( file_name ) );
     return;
   };
   TQTextStream stream( &file );
diff --git a/kig/filters/filter.cc b/kig/filters/filter.cc
index ff380bec..81cd1ef4 100644
--- a/kig/filters/filter.cc
+++ b/kig/filters/filter.cc
@@ -73,14 +73,14 @@ void KigFilter::fileNotFound( const TQString& file ) const
                       i18n( "The file \"%1\" could not be opened.  "
                             "This probably means that it does not "
                             "exist, or that it cannot be opened due to "
-                            "its permissions" ).tqarg( file ) );
+                            "its permissions" ).arg( file ) );
 }
 
 void KigFilter::parseError( const TQString& file, const TQString& explanation ) const
 {
   const TQString text =
     i18n( "An error was encountered while parsing the file \"%1\".  It "
-          "cannot be opened." ).tqarg( file );
+          "cannot be opened." ).arg( file );
   const TQString title = i18n( "Parse Error" );
 
   if ( explanation.isNull() )
@@ -92,7 +92,7 @@ void KigFilter::parseError( const TQString& file, const TQString& explanation )
 void KigFilter::notSupported( const TQString& file, const TQString& explanation ) const
 {
   KMessageBox::detailedSorry( 0,
-                              i18n( "Kig cannot open the file \"%1\"." ).tqarg( file ),
+                              i18n( "Kig cannot open the file \"%1\"." ).arg( file ),
                               explanation, i18n( "Not Supported" ) );
 }
 
diff --git a/kig/filters/filter.h b/kig/filters/filter.h
index 8904b52d..9680d114 100644
--- a/kig/filters/filter.h
+++ b/kig/filters/filter.h
@@ -55,7 +55,7 @@ protected:
   { \
     TQString locs = i18n( "An error was encountered at " \
                          "line %1 in file %2." ) \
-      .tqarg( __LINE__ ).tqarg( __FILE__ ); \
+      .arg( __LINE__ ).arg( __FILE__ ); \
     parseError( file, locs ); \
     return 0; \
   }
diff --git a/kig/filters/filters-common.cc b/kig/filters/filters-common.cc
index 6ae6cef9..4ba24e9f 100644
--- a/kig/filters/filters-common.cc
+++ b/kig/filters/filters-common.cc
@@ -34,6 +34,6 @@ ObjectTypeCalcer* filtersConstructTextObject(
   propo->calc( doc );
   std::vector<ObjectCalcer*> args;
   args.push_back( propo );
-  return fact->labelCalcer( TQString::tqfromLatin1( "%1" ), c, needframe,
+  return fact->labelCalcer( TQString::fromLatin1( "%1" ), c, needframe,
                             args, doc );
 }
diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc
index 8d37a871..8849256b 100644
--- a/kig/filters/kgeo-filter.cc
+++ b/kig/filters/kgeo-filter.cc
@@ -130,7 +130,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
     elems.push_back( elem );
     for ( const char* parent = parents.first(); parent; parent = parents.next() )
     {
-      int parentIndex = TQString::tqfromLatin1( parent ).toInt( &ok );
+      int parentIndex = TQString::fromLatin1( parent ).toInt( &ok );
       if ( ! ok ) KIG_FILTER_PARSE_ERROR;
       if ( parentIndex != 0 )
         elems[i].parents.push_back( parentIndex - 1 );
diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h
index e2317d1b..9bac9085 100644
--- a/kig/filters/kgeo-filter.h
+++ b/kig/filters/kgeo-filter.h
@@ -25,11 +25,11 @@ class KSimpleConfig;
 
 /**
  * This is an import filter for files generated by the program KGeo,
- * which was an interactive tqgeometry program in tdeedu.  Kig is
+ * which was an interactive geometry program in tdeedu.  Kig is
  * supposed to be its successor, and this import filter is part of my
  * attempt to achieve that :)
  *
- * tqStatus: a significant part of KGeo's format is supported, not all
+ * Status: a significant part of KGeo's format is supported, not all
  * yet, though..
  */
 class KigFilterKGeo
diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc
index 7ddfcde4..2873242a 100644
--- a/kig/filters/kseg-filter.cc
+++ b/kig/filters/kseg-filter.cc
@@ -45,7 +45,7 @@
 
 #include <tqfont.h>
 #include <tqpen.h>
-#include <tqbrush.h>
+#include <brush.h>
 #include <tqfile.h>
 #include <tqdatastream.h>
 #include <tqbuffer.h>
@@ -636,7 +636,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
       std::vector<ObjectCalcer*> args2;
       args2.push_back( object->nameCalcer() );
       ObjectCalcer* oc2 = fact->attachedLabelCalcer(
-               TQString::tqfromLatin1( "%1" ), object->calcer(),
+               TQString::fromLatin1( "%1" ), object->calcer(),
                static_cast<const PointImp*>( object->imp() )->coordinate(),
                false, args2, *retdoc );
       oc2->calc( *retdoc );
diff --git a/kig/filters/latexexporter.cc b/kig/filters/latexexporter.cc
index a1be1f5f..cca305c4 100644
--- a/kig/filters/latexexporter.cc
+++ b/kig/filters/latexexporter.cc
@@ -47,7 +47,7 @@
 #include <tqcheckbox.h>
 #include <tqcolor.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -228,9 +228,9 @@ void LatexExportImpVisitor::plotGenericCurve( const CurveImp* imp )
   if ( width == -1 ) width = 1;
 
   TQString prefix = TQString( "\\pscurve[linecolor=%1,linewidth=%2,%3]" )
-      .tqarg( mcurcolorid )
-      .tqarg( width / 100.0 )
-      .tqarg( writeStyle( mcurobj->drawer()->style() ) );
+      .arg( mcurcolorid )
+      .arg( width / 100.0 )
+      .arg( writeStyle( mcurobj->drawer()->style() ) );
 
   std::vector< std::vector< Coordinate > > coordlist;
   coordlist.push_back( std::vector< Coordinate >() );
@@ -507,7 +507,7 @@ void LatexExporter::run( const KigPart& doc, KigWidget& w )
   {
     KMessageBox::sorry( &w, i18n( "The file \"%1\" could not be opened. Please "
                                   "check if the file permissions are set correctly." )
-                        .tqarg( file_name ) );
+                        .arg( file_name ) );
     return;
   };
 
diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc
index d3323778..a9bcc241 100644
--- a/kig/filters/native-filter.cc
+++ b/kig/filters/native-filter.cc
@@ -114,7 +114,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
   TQFile kigdoc( file );
 #ifndef KIG_NO_COMPRESSED_FILES
   bool iscompressed = false;
-  if ( !file.tqendsWith( ".kig", false ) )
+  if ( !file.endsWith( ".kig", false ) )
   {
     // the file is compressed, so we have to decompress it and fetch the
     // kig file inside it...
@@ -125,7 +125,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
       KIG_FILTER_PARSE_ERROR;
 
     TQString tempname = file.section( '/', -1 );
-    if ( file.tqendsWith( ".kigz", false ) )
+    if ( file.endsWith( ".kigz", false ) )
     {
       tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) );
     }
@@ -193,7 +193,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
   if ( major > 0 || minor > 9 )
   {
     notSupported( file, i18n( "This file was created by Kig version \"%1\", "
-                              "which this version cannot open." ).tqarg( version ) );
+                              "which this version cannot open." ).arg( version ) );
     return false;
   }
   else if ( major == 0 && minor <= 3 )
@@ -204,7 +204,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
                               "You can try to open this file with an older Kig "
                               "version (0.4 to 0.6),\n"
                               "and then save it again, which will save it in the "
-                              "new format." ).tqarg( version ) );
+                              "new format." ).arg( version ) );
     return false;
   }
   else if ( major == 0 && minor <= 6 )
@@ -338,7 +338,7 @@ KigDocument* KigFilterNative::load04( const TQString& file, 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( tmp ) );
+                                      "or perhaps you are using an older Kig version." ).arg( tmp ) );
             return false;
           };
 
@@ -485,7 +485,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, 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( tmp ) );
+                                      "or perhaps you are using an older Kig version." ).arg( tmp ) );
             return false;
           }
 
@@ -642,7 +642,7 @@ bool KigFilterNative::save07( const KigDocument& kdoc, TQTextStream& stream )
     TQDomElement drawelem = doc.createElement( "Draw" );
     drawelem.setAttribute( "object", id );
     drawelem.setAttribute( "color", d->color().name() );
-    drawelem.setAttribute( "shown", TQString::tqfromLatin1( d->shown() ? "true" : "false" ) );
+    drawelem.setAttribute( "shown", TQString::fromLatin1( d->shown() ? "true" : "false" ) );
     drawelem.setAttribute( "width", TQString::number( d->width() ) );
     drawelem.setAttribute( "style", d->styleToString() );
     drawelem.setAttribute( "point-style", d->pointStyleToString() );
@@ -683,7 +683,7 @@ bool KigFilterNative::save07( const KigDocument& data, const TQString& outfile )
     return save07( data, stdoutstream );
   }
 #ifndef KIG_NO_COMPRESSED_FILES
-  if ( !outfile.tqendsWith( ".kig", false ) )
+  if ( !outfile.endsWith( ".kig", false ) )
   {
     // the user wants to save a compressed file, so we have to save our kig
     // file to a temp file and then compress it...
@@ -693,7 +693,7 @@ bool KigFilterNative::save07( const KigDocument& data, const TQString& outfile )
       return false;
 
     TQString tempname = outfile.section( '/', -1 );
-    if ( outfile.tqendsWith( ".kigz", false ) )
+    if ( outfile.endsWith( ".kigz", false ) )
       tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) );
     else
       return false;
diff --git a/kig/filters/svgexporter.cc b/kig/filters/svgexporter.cc
index 93801b3b..e2cc41bd 100644
--- a/kig/filters/svgexporter.cc
+++ b/kig/filters/svgexporter.cc
@@ -81,7 +81,7 @@ void SVGExporter::run( const KigPart& part, KigWidget& w )
   {
     KMessageBox::sorry( &w, i18n( "The file \"%1\" could not be opened. Please "
                                   "check if the file permissions are set correctly." )
-                        .tqarg( file_name ) );
+                        .arg( file_name ) );
     return;
   };
 
@@ -105,7 +105,7 @@ void SVGExporter::run( const KigPart& part, KigWidget& w )
 
   if ( !pic.save( file_name, "SVG" ) )
   {
-    KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to SVG file \"%1\"" ).tqarg( file_name ) );
+    KMessageBox::error( &w, i18n( "Sorry, something went wrong while saving to SVG file \"%1\"" ).arg( file_name ) );
   }
 
 }
diff --git a/kig/kfile/kfile_kig.cpp b/kig/kfile/kfile_kig.cpp
index 496a851f..bd54a036 100644
--- a/kig/kfile/kfile_kig.cpp
+++ b/kig/kfile/kfile_kig.cpp
@@ -58,7 +58,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
   TQString sfile =  metainfo.path();
   bool iscompressed = false;
   TQFile f( sfile );
-  if ( !sfile.tqendsWith( ".kig", false ) )
+  if ( !sfile.endsWith( ".kig", false ) )
   {
     iscompressed = true;
 
@@ -67,7 +67,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
       return false;
 
     TQString tempname = sfile.section( '/', -1 );
-    if ( sfile.tqendsWith( ".kigz", false ) )
+    if ( sfile.endsWith( ".kigz", false ) )
     {
       tempname.remove( TQRegExp( "\\.[Kk][Ii][Gg][Zz]$" ) );
     }
@@ -114,7 +114,7 @@ bool KigPlugin::readInfo( KFileMetaInfo& metainfo, uint /*what*/ )
   TQString compatversion = main.attribute( "CompatibilityVersion" );
   if ( compatversion.isEmpty() )
     compatversion = i18n( "%1 represents Kig version",
-                          "%1 (as the version)" ).tqarg( version );
+                          "%1 (as the version)" ).arg( version );
   appendItem( metagroup, "CompatVersion", compatversion );
 
   // reading the Coordinate System...
diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp
index dc63b2dc..8d60a796 100644
--- a/kig/kig/kig.cpp
+++ b/kig/kig/kig.cpp
@@ -219,7 +219,7 @@ bool Kig::queryClose()
   switch( KMessageBox::warningYesNoCancel
 	  (
 	   widget(),
-	   i18n("Save changes to document %1?").tqarg(m_part->url().path()),
+	   i18n("Save changes to document %1?").arg(m_part->url().path()),
 	   i18n("Save Changes?"),KStdGuiItem::save(),KStdGuiItem::discard()
 	   ))
     {
diff --git a/kig/kig/kig_commands.cpp b/kig/kig/kig_commands.cpp
index bcf26969..d4668f55 100644
--- a/kig/kig/kig_commands.cpp
+++ b/kig/kig/kig_commands.cpp
@@ -97,7 +97,7 @@ KigCommand* KigCommand::removeCommand( KigPart& doc, const std::vector<ObjectHol
   if ( os.size() == 1 )
     text = os.back()->imp()->type()->removeAStatement();
   else
-    text = i18n( "Remove %1 Objects" ).tqarg( os.size() );
+    text = i18n( "Remove %1 Objects" ).arg( os.size() );
   KigCommand* ret = new KigCommand( doc, text );
   ret->addTask( new RemoveObjectsTask( os ) );
   return ret;
@@ -109,7 +109,7 @@ KigCommand* KigCommand::addCommand( KigPart& doc, const std::vector<ObjectHolder
   if ( os.size() == 1 )
     text = os.back()->imp()->type()->addAStatement();
   else
-    text = i18n( "Add %1 Objects" ).tqarg( os.size() );
+    text = i18n( "Add %1 Objects" ).arg( os.size() );
   KigCommand* ret = new KigCommand( doc, text );
   ret->addTask( new AddObjectsTask( os ) );
   return ret;
@@ -181,11 +181,11 @@ void ChangeObjectConstCalcerTask::execute( KigPart& doc )
 {
   mnewimp = mcalcer->switchImp( mnewimp );
 
-  std::set<ObjectCalcer*> alltqchildren = getAllChildren( mcalcer.get() );
-  std::vector<ObjectCalcer*> alltqchildrenvect( alltqchildren.begin(), alltqchildren.end() );
-  alltqchildrenvect = calcPath( alltqchildrenvect );
-  for ( std::vector<ObjectCalcer*>::iterator i = alltqchildrenvect.begin();
-        i != alltqchildrenvect.end(); ++i )
+  std::set<ObjectCalcer*> allchildren = getAllChildren( mcalcer.get() );
+  std::vector<ObjectCalcer*> allchildrenvect( allchildren.begin(), allchildren.end() );
+  allchildrenvect = calcPath( allchildrenvect );
+  for ( std::vector<ObjectCalcer*>::iterator i = allchildrenvect.begin();
+        i != allchildrenvect.end(); ++i )
     ( *i )->calc( doc.document() );
 }
 
@@ -313,11 +313,11 @@ void ChangeParentsAndTypeTask::execute( KigPart& doc )
   for ( std::vector<ObjectCalcer*>::iterator i = newparents.begin(); i != newparents.end(); ++i )
     ( *i )->calc( doc.document() );
   d->o->calc( doc.document() );
-  std::set<ObjectCalcer*> alltqchildren = getAllChildren( d->o );
-  std::vector<ObjectCalcer*> alltqchildrenvect( alltqchildren.begin(), alltqchildren.end() );
-  alltqchildrenvect = calcPath( alltqchildrenvect );
-  for ( std::vector<ObjectCalcer*>::iterator i = alltqchildrenvect.begin();
-        i != alltqchildrenvect.end(); ++i )
+  std::set<ObjectCalcer*> allchildren = getAllChildren( d->o );
+  std::vector<ObjectCalcer*> allchildrenvect( allchildren.begin(), allchildren.end() );
+  allchildrenvect = calcPath( allchildrenvect );
+  for ( std::vector<ObjectCalcer*>::iterator i = allchildrenvect.begin();
+        i != allchildrenvect.end(); ++i )
     ( *i )->calc( doc.document() );
 }
 
diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp
index 089865f0..75927682 100644
--- a/kig/kig/kig_part.cpp
+++ b/kig/kig/kig_part.cpp
@@ -63,7 +63,7 @@
 
 #include <tqcheckbox.h>
 #include <tqfile.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqsizepolicy.h>
 #include <tqtimer.h>
@@ -369,7 +369,7 @@ bool KigPart::openFile()
   {
     KMessageBox::sorry( widget(),
                         i18n( "The file \"%1\" you tried to open does not exist. "
-                              "Please verify that you entered the correct path." ).tqarg( m_file ),
+                              "Please verify that you entered the correct path." ).arg( m_file ),
                         i18n( "File Not Found" ) );
     return false;
   };
@@ -390,7 +390,7 @@ bool KigPart::openFile()
               "question would be worth implementing support for, you can "
               "always ask us nicely on mailto:toscano.pino@tiscali.it "
               "or do the work yourself and send me a patch."
-          ).tqarg(mimeType->name()),
+          ).arg(mimeType->name()),
         i18n( "Format Not Supported" )
         );
     return false;
@@ -466,7 +466,7 @@ void KigPart::_addObject( ObjectHolder* o )
 
 void KigPart::delObject( ObjectHolder* o )
 {
-  // we delete all tqchildren and their tqchildren etc. too...
+  // we delete all children and their children etc. too...
   std::vector<ObjectHolder*> os;
   os.push_back( o );
   delObjects( os );
@@ -619,7 +619,7 @@ bool KigPart::internalSaveAs()
   {
     int ret = KMessageBox::warningContinueCancel( m_widget,
                                          i18n( "The file \"%1\" already exists. Do you wish to overwrite it?" )
-                                         .tqarg( file_name ), i18n( "Overwrite File?" ), i18n("Overwrite") );
+                                         .arg( file_name ), i18n( "Overwrite File?" ), i18n("Overwrite") );
     if ( ret != KMessageBox::Continue )
     {
       return false;
diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp
index fe2da6e1..00a50692 100644
--- a/kig/kig/kig_view.cpp
+++ b/kig/kig/kig_view.cpp
@@ -33,7 +33,7 @@
 #include <tqdialog.h>
 #include <tqevent.h>
 #include <tqwhatsthis.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqscrollbar.h>
 
 #include <kdebug.h>
@@ -290,13 +290,13 @@ KigView::KigView( KigPart* part,
                   TQWidget* parent,
                   const char* name )
   : TQWidget( parent, name ),
-    mtqlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ),
+    mlayout( 0 ), mrightscroll( 0 ), mbottomscroll( 0 ),
     mupdatingscrollbars( false ),
     mrealwidget( 0 ), mpart( part )
 {
   connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) );
 
-  mtqlayout = new TQGridLayout( this, 2, 2 );
+  mlayout = new TQGridLayout( this, 2, 2 );
   mrightscroll = new TQScrollBar(Qt::Vertical, this, "Right Scrollbar" );
   // TODO: make this configurable...
   mrightscroll->setTracking( true );
@@ -310,11 +310,11 @@ KigView::KigView( KigPart* part,
   connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ),
            this, TQT_SLOT( updateScrollBars() ) );
   mrealwidget = new KigWidget( part, this, this, "Kig Widget", fullscreen );
-  mtqlayout->addWidget( mbottomscroll, 1, 0 );
-  mtqlayout->addWidget( mrealwidget, 0, 0 );
-  mtqlayout->addWidget( mrightscroll, 0, 1 );
+  mlayout->addWidget( mbottomscroll, 1, 0 );
+  mlayout->addWidget( mrealwidget, 0, 0 );
+  mlayout->addWidget( mrightscroll, 0, 1 );
 
-  resize( tqsizeHint() );
+  resize( sizeHint() );
   mrealwidget->recenterScreen();
   part->redrawScreen( mrealwidget );
   updateScrollBars();
@@ -443,7 +443,7 @@ const KigDocument& KigWidget::document() const
   return mpart->document();
 }
 
-TQSize KigWidget::tqsizeHint() const
+TQSize KigWidget::sizeHint() const
 {
   return TQSize( 630, 450 );
 }
@@ -508,9 +508,9 @@ void KigView::toggleFullScreen()
 {
   mrealwidget->setFullScreen( ! mrealwidget->isFullScreen() );
   if ( mrealwidget->isFullScreen() )
-    tqtopLevelWidget()->showFullScreen();
+    topLevelWidget()->showFullScreen();
   else
-    tqtopLevelWidget()->showNormal();
+    topLevelWidget()->showNormal();
 }
 
 void KigWidget::setFullScreen( bool f )
@@ -568,7 +568,7 @@ void KigWidget::zoomArea()
   KigInputDialog::getTwoCoordinates( i18n( "Select Zoom Area" ),
         i18n( "Select the zoom area by entering the coordinates of "
               "the upper left corner and the lower right corner." ) +
-        TQString::tqfromLatin1("<br>") +
+        TQString::fromLatin1("<br>") +
         mpart->document().coordinateSystem().coordinateFormatNoticeMarkup(),
         this, &ok, mpart->document(), &tl, &br );
   if ( ok )
diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h
index 6cda690b..28cc9947 100644
--- a/kig/kig/kig_view.h
+++ b/kig/kig/kig_view.h
@@ -62,7 +62,7 @@ class KigWidget : public TQWidget
   void paintEvent( TQPaintEvent* e );
   void wheelEvent( TQWheelEvent* e );
   void resizeEvent( TQResizeEvent* );
-  TQSize tqsizeHint() const;
+  TQSize sizeHint() const;
 
   /**
    * this is called to match a rect's dimensions to the dimensions of
@@ -230,7 +230,7 @@ class KigView
   Q_OBJECT
   TQ_OBJECT
 
-  TQGridLayout* mtqlayout;
+  TQGridLayout* mlayout;
   TQScrollBar* mrightscroll;
   TQScrollBar* mbottomscroll;
 
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 10bd96ce..36cfef0b 100644
--- a/kig/misc/coordinate_system.cpp
+++ b/kig/misc/coordinate_system.cpp
@@ -116,19 +116,19 @@ void CoordinateValidator::fixup( TQString & input ) const
     sc = input.length();
     KLocale* l = KGlobal::locale();
     if ( mpolar )
-      input.append( TQString::tqfromLatin1( ";" ) + l->positiveSign() +
-                    TQString::tqfromLatin1( "0°" ) );
+      input.append( TQString::fromLatin1( ";" ) + l->positiveSign() +
+                    TQString::fromLatin1( "0°" ) );
     else
-      input.append( TQString::tqfromLatin1( ";" ) + l->positiveSign() +
-                    TQString::tqfromLatin1( "0" ) + l->decimalSymbol() +
-                    TQString::tqfromLatin1( "0" ) );
+      input.append( TQString::fromLatin1( ";" ) + l->positiveSign() +
+                    TQString::fromLatin1( "0" ) + l->decimalSymbol() +
+                    TQString::fromLatin1( "0" ) );
   };
   mre.exactMatch( input );
   TQString ds1 = mre.cap( 1 );
   mdv.fixup( ds1 );
   TQString ds2 = mre.cap( 2 );
   mdv.fixup( ds2 );
-  input = ds1 + TQString::tqfromLatin1( "; " ) + ds2;
+  input = ds1 + TQString::fromLatin1( "; " ) + ds2;
 }
 
 EuclideanCoords::EuclideanCoords()
@@ -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::tqfromLatin1( "( %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::tqfromLatin1("( %1; %2° )").tqarg( rs ).tqarg( ts );
+  return TQString::fromLatin1("( %1; %2° )").arg( rs ).arg( ts );
 }
 
 TQString PolarCoords::coordinateFormatNotice() const
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cc
index f19f2d82..d42b7ca4 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cc
@@ -223,7 +223,7 @@ void AddFixedPointAction::act( KigPart& doc )
   KigInputDialog::getCoordinate(
     i18n( "Fixed Point" ),
     i18n( "Enter the coordinates for the new point." ) +
-    TQString::tqfromLatin1( "<br>" ) +
+    TQString::fromLatin1( "<br>" ) +
     doc.document().coordinateSystem().coordinateFormatNoticeMarkup(),
     doc.widget(), &ok, doc.document(), &c );
   if ( ! ok ) return;
@@ -272,7 +272,7 @@ TestAction::~TestAction()
 
 TQString TestAction::description() const
 {
-  return TQString::tqfromLatin1( "Test stuff !!!" );
+  return TQString::fromLatin1( "Test stuff !!!" );
 }
 
 TQCString TestAction::iconFileName() const
@@ -282,7 +282,7 @@ TQCString TestAction::iconFileName() const
 
 TQString TestAction::descriptiveName() const
 {
-  return TQString::tqfromLatin1( "Test stuff !!!" );
+  return TQString::fromLatin1( "Test stuff !!!" );
 }
 
 const char* TestAction::actionName() const
@@ -297,7 +297,7 @@ void TestAction::act( KigPart& doc )
   Object* constantpoint = ObjectFactory::instance()->fixedPoint( Coordinate( -1, -1 ) );
   constantpoint->calc( doc );
 
-  Object* codeobject = new DataObject( new StringImp( TQString::tqfromLatin1( script ) ) );
+  Object* codeobject = new DataObject( new StringImp( TQString::fromLatin1( script ) ) );
   Object* compiledcode = new RealObject( PythonCompileType::instance(), Objects( codeobject ) );
   compiledcode->calc( doc );
 
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 99e635b2..61d89883 100644
--- a/kig/misc/kiginputdialog.cc
+++ b/kig/misc/kiginputdialog.cc
@@ -28,7 +28,7 @@
 #include "../kig/kig_document.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqpushbutton.h>
 #include <tqvalidator.h>
 #include <tqwhatsthis.h>
@@ -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->tqsetAlignment( 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/kigpainter.cpp b/kig/misc/kigpainter.cpp
index 81ae6574..4b3ede2e 100644
--- a/kig/misc/kigpainter.cpp
+++ b/kig/misc/kigpainter.cpp
@@ -300,7 +300,7 @@ void KigPainter::drawPolygon( const std::vector<TQPoint>& pts,
   {
     t.putPoints( c++, 1, i->x(), i->y() );
   };
-  mP.tqdrawPolygon( t, winding, index, npoints );
+  mP.drawPolygon( t, winding, index, npoints );
   setPen( oldpen );
   setBrush( oldbrush );
   if( mNeedOverlay ) mOverlay.push_back( t.boundingRect() );
@@ -645,7 +645,7 @@ void KigPainter::drawAngle( const Coordinate& cpoint, const double dstartangle,
 
   setBrushStyle( Qt::SolidPattern );
 //  drawPolygon( arrow );
-  mP.tqdrawPolygon( arrow, false, 0, -1 );
+  mP.drawPolygon( arrow, false, 0, -1 );
 
 //  if ( mNeedOverlay ) mOverlay.push_back( toScreen( r ) );
   setWholeWinOverlay();   //mp: ugly! why not compute a correct overlay?
@@ -859,7 +859,7 @@ void KigPainter::drawCurve( const CurveImp* curve )
         if ( curpolylinenextfree > 0 && curpolyline[curpolylinenextfree - 1] != tp1 )
         {
           // flush the current part of the curve
-          mP.tqdrawPolyline( curpolyline, 0, curpolylinenextfree );
+          mP.drawPolyline( curpolyline, 0, curpolylinenextfree );
           curpolylinenextfree = 0;
         }
         if ( curpolylinenextfree == 0 )
@@ -883,7 +883,7 @@ void KigPainter::drawCurve( const CurveImp* curve )
     }
   }
   // flush the rest of the curve
-  mP.tqdrawPolyline( curpolyline, 0, curpolylinenextfree );
+  mP.drawPolyline( curpolyline, 0, curpolylinenextfree );
   curpolylinenextfree = 0;
 
   if ( ! workstack.empty () )
diff --git a/kig/misc/lists.cc b/kig/misc/lists.cc
index 7d2bee62..a294105e 100644
--- a/kig/misc/lists.cc
+++ b/kig/misc/lists.cc
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqdom.h>
 #include <tqregexp.h>
 #include <algorithm>
@@ -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 e72a3c19..da89b66c 100644
--- a/kig/misc/object_hierarchy.cc
+++ b/kig/misc/object_hierarchy.cc
@@ -419,10 +419,10 @@ void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) cons
     // we don't save these atm, since the user can't define them.
     // we only load them from builtin macro's.
 //     TQDomElement ut = doc.createElement( "UseText" );
-//     ut.appendChild( doc.createTextNode( TQString::tqfromLatin1(musetexts[i].c_str() ) ) );
+//     ut.appendChild( doc.createTextNode( TQString::fromLatin1(musetexts[i].c_str() ) ) );
 //     e.appendChild( ut );
 //     TQDomElement ss = doc.createElement( "SelectStatement" );
-//     ss.appendChild( doc.createTextNode( TQString::tqfromLatin1(mselectstatements[i].c_str() ) ) );
+//     ss.appendChild( doc.createTextNode( TQString::fromLatin1(mselectstatements[i].c_str() ) ) );
 //     e.appendChild( ss );
     parent.appendChild( e );
   }
@@ -437,7 +437,7 @@ void ObjectHierarchy::serialize( TQDomElement& parent, TQDomDocument& doc ) cons
     {
       const ApplyTypeNode* node = static_cast<const ApplyTypeNode*>( mnodes[i] );
       e.setAttribute( "action", "calc" );
-      e.setAttribute( "type", TQString::tqfromLatin1( node->type()->fullName() ) );
+      e.setAttribute( "type", TQString::fromLatin1( node->type()->fullName() ) );
       for ( uint i = 0; i < node->parents().size(); ++i )
       {
         int parent = node->parents()[i] + 1;
@@ -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;
diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cc
index e9e2e5ad..f2d5f2ed 100644
--- a/kig/modes/construct_mode.cc
+++ b/kig/modes/construct_mode.cc
@@ -485,7 +485,7 @@ void TestConstructMode::leftClickedObject( ObjectHolder* o, const TQPoint& p,
     std::vector<ObjectCalcer*> parents;
     parents.push_back( new ObjectConstCalcer( new IntImp( test_has_frame_dflt ) ) );
     parents.push_back( new ObjectConstCalcer( new PointImp( loc ) ) );
-    parents.push_back( new ObjectConstCalcer( new StringImp( TQString::tqfromLatin1( "%1" ) ) ) );
+    parents.push_back( new ObjectConstCalcer( new StringImp( TQString::fromLatin1( "%1" ) ) ) );
     assert( mresult->imp()->inherits( TestResultImp::stype() ) );
     parents.push_back(
       new ObjectPropertyCalcer(
diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cc
index d2f25a47..f4ed323e 100644
--- a/kig/modes/edittype.cc
+++ b/kig/modes/edittype.cc
@@ -50,8 +50,8 @@ EditType::~EditType()
 
 void EditType::helpSlot()
 {
-  kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ),
-                    TQString::tqfromLatin1( "kig" ) );
+  kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+                    TQString::fromLatin1( "kig" ) );
 }
 
 void EditType::okSlot()
diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui
index e69d9f13..e0af9850 100644
--- a/kig/modes/edittypebase.ui
+++ b/kig/modes/edittypebase.ui
@@ -43,7 +43,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -51,7 +51,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -125,7 +125,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout23</cstring>
+                        <cstring>layout23</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -152,7 +152,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -179,7 +179,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout24</cstring>
+                <cstring>layout24</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -212,7 +212,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kig/modes/label.cc b/kig/modes/label.cc
index 48f729bf..a6399b3d 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cc
@@ -38,7 +38,7 @@
 #include <kmessagebox.h>
 #include <kaction.h>
 #include <klocale.h>
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tqregexp.h>
@@ -376,7 +376,7 @@ void TextLabelModeBase::updateLinksLabel()
     }
     else
       // otherwise, we show a stub...
-      linktext = i18n( "argument %1" ).tqarg( count + 1 );
+      linktext = i18n( "argument %1" ).arg( count + 1 );
 
     d->wiz->myCustomWidget1->addLink( linktext, buf );
     // set pos and prevpos to the next char after the last match, so
@@ -406,7 +406,7 @@ void TextLabelModeBase::linkClicked( int i )
   d->mwawd = ReallySelectingArgs;
   d->mwaaws = i;
 
-  mdoc.emitStatusBarText( i18n( "Selecting argument %1" ).tqarg( i + 1 ) );
+  mdoc.emitStatusBarText( i18n( "Selecting argument %1" ).arg( i + 1 ) );
 }
 
 void TextLabelModeBase::redrawScreen( KigWidget* w )
diff --git a/kig/modes/label.h b/kig/modes/label.h
index b016d691..828c2e29 100644
--- a/kig/modes/label.h
+++ b/kig/modes/label.h
@@ -35,7 +35,7 @@ class ObjectCalcer;
 /**
  * this is the base class for TextLabelConstructionMode and
  * TextLabelRedefineMode..  most of the work is done in this class,
- * with some specific things delegated to the tqchildren..  Template
+ * with some specific things delegated to the children..  Template
  * method pattern, right ? :)
  */
 class TextLabelModeBase
@@ -65,7 +65,7 @@ protected:
   void setLocationParent( ObjectCalcer* o );
   /**
    * objects you pass here, should be newly created property objects,
-   * that have no tqchildren..
+   * that have no children..
    */
   void setPropertyObjects( const argvect& props );
   void setFrame( bool f );
diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp
index 693c165a..7472dec6 100644
--- a/kig/modes/linkslabel.cpp
+++ b/kig/modes/linkslabel.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlabel.h>
 #include <kurllabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <vector>
 #include <algorithm>
@@ -33,7 +33,7 @@ using namespace std;
 class LinksLabel::Private
 {
 public:
-  TQHBoxLayout* tqlayout;
+  TQHBoxLayout* layout;
   std::vector<TQLabel*> labels;
   std::vector<KURLLabel*> urllabels;
 };
@@ -42,22 +42,22 @@ LinksLabel::LinksLabel( TQWidget* parent, const char* name )
   : TQWidget( parent, name )
 {
   p = new Private;
-  p->tqlayout = new TQHBoxLayout( this );
+  p->layout = new TQHBoxLayout( this );
 
   TQLabel* l = new TQLabel( TQString::fromUtf8( "Dit is een " ), this );
   p->labels.push_back( l );
-  p->tqlayout->addWidget( l );
+  p->layout->addWidget( l );
 
   KURLLabel* u = new KURLLabel( TQString::fromUtf8( "http://www.kde.org/" ),
                                 TQString::fromUtf8( "url"), this );
   p->urllabels.push_back( u );
-  p->tqlayout->addWidget( u );
+  p->layout->addWidget( u );
 
   l = new TQLabel( TQString::fromUtf8( " !" ), this );
   p->labels.push_back( l );
-  p->tqlayout->addWidget(l );
+  p->layout->addWidget(l );
 
-  p->tqlayout->activate();
+  p->layout->activate();
 }
 
 LinksLabel::~LinksLabel()
@@ -99,8 +99,8 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
   p->urllabels.clear();
   p->labels.clear();
 
-  delete p->tqlayout;
-  p->tqlayout = new TQHBoxLayout( this );
+  delete p->layout;
+  p->layout = new TQHBoxLayout( this );
 
   for ( LinksLabelEditBuf::vec::iterator i = buf.data.begin(); i != buf.data.end(); ++i )
   {
@@ -111,7 +111,7 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
       KURLLabel* l = new KURLLabel( TQString::fromUtf8( "http://edu.kde.org/kig" ),
                                     i->second, this );
       p->urllabels.push_back( l );
-      p->tqlayout->addWidget( l );
+      p->layout->addWidget( l );
       connect( l, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( urlClicked() ) );
     }
     else
@@ -119,15 +119,15 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf )
       // we need a normal label...
       TQLabel* l = new TQLabel( i->second, this );
       p->labels.push_back( l );
-      p->tqlayout->addWidget( l );
+      p->layout->addWidget( l );
     };
   };
 
   TQSpacerItem* spacer = new TQSpacerItem( 40,  20,  TQSizePolicy::Expanding,  TQSizePolicy::Minimum );
 
-  p->tqlayout->addItem( spacer );
+  p->layout->addItem( spacer );
 
-  p->tqlayout->activate();
+  p->layout->activate();
 
   std::for_each( p->urllabels.begin(), p->urllabels.end(), mem_fun( &TQWidget::show ) );
   std::for_each( p->labels.begin(), p->labels.end(), mem_fun( &TQWidget::show ) );
diff --git a/kig/modes/macrowizard.cc b/kig/modes/macrowizard.cc
index 1b25c803..662e3a0d 100644
--- a/kig/modes/macrowizard.cc
+++ b/kig/modes/macrowizard.cc
@@ -85,6 +85,6 @@ void MacroWizard::accept()
 
 void MacroWizard::slotHelpClicked()
 {
-  kapp->invokeHelp( TQString::tqfromLatin1( "defining-macros"),
-                    TQString::tqfromLatin1( "kig" ) );
+  kapp->invokeHelp( TQString::fromLatin1( "defining-macros"),
+                    TQString::fromLatin1( "kig" ) );
 }
diff --git a/kig/modes/macrowizardbase.ui b/kig/modes/macrowizardbase.ui
index fefd5c6f..ea20ead7 100644
--- a/kig/modes/macrowizardbase.ui
+++ b/kig/modes/macrowizardbase.ui
@@ -55,7 +55,7 @@
                 <property name="text">
                     <string>Select the "given" objects for your new macro and press "Next".</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
diff --git a/kig/modes/moving.cc b/kig/modes/moving.cc
index 7c3148da..593c7077 100644
--- a/kig/modes/moving.cc
+++ b/kig/modes/moving.cc
@@ -143,8 +143,8 @@ MovingMode::MovingMode( const std::vector<ObjectHolder*>& os, const Coordinate&
   std::set<ObjectCalcer*> tmp = objs;
   for ( std::set<ObjectCalcer*>::const_iterator i = tmp.begin(); i != tmp.end(); ++i )
   {
-    std::set<ObjectCalcer*> tqchildren = getAllChildren(*i);
-    objs.insert( tqchildren.begin(), tqchildren.end() );
+    std::set<ObjectCalcer*> children = getAllChildren(*i);
+    objs.insert( children.begin(), children.end() );
   }
 
   initScreen( calcPath( std::vector<ObjectCalcer*>( objs.begin(), objs.end() ) ) );
@@ -154,7 +154,7 @@ void MovingMode::stopMove()
 {
   TQString text = d->emo.size() == 1 ?
                  d->emo[0]->imp()->type()->moveAStatement() :
-                 i18n( "Move %1 Objects" ).tqarg( d->emo.size() );
+                 i18n( "Move %1 Objects" ).arg( d->emo.size() );
   KigCommand* mc = new KigCommand( mdoc, text );
   d->mon->finish( mc );
   mdoc.history()->addCommand( mc );
@@ -182,8 +182,8 @@ PointRedefineMode::PointRedefineMode( ObjectHolder* p, KigPart& d, KigWidget& v
   std::vector<ObjectCalcer*> parents = getAllParents( mp->calcer() );
   mmon = new MonitorDataObjects( parents );
   std::vector<ObjectCalcer*> moving = parents;
-  std::set<ObjectCalcer*> tqchildren = getAllChildren( mp->calcer() );
-  std::copy( tqchildren.begin(), tqchildren.end(), std::back_inserter( moving ) );
+  std::set<ObjectCalcer*> children = getAllChildren( mp->calcer() );
+  std::copy( children.begin(), children.end(), std::back_inserter( moving ) );
   initScreen( moving );
 }
 
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cc
index 32280d62..ba778f43 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cc
@@ -198,12 +198,12 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part,
   else if ( single )
   {
     if ( !objs[0]->name().isNull() )
-      title = TQString::tqfromLatin1( "%1 %2" ).tqarg( objs[0]->imp()->type()->translatedName() ).tqarg( objs[0]->name() );
+      title = TQString::fromLatin1( "%1 %2" ).arg( objs[0]->imp()->type()->translatedName() ).arg( objs[0]->name() );
     else
       title = objs[0]->imp()->type()->translatedName();
   }
   else
-    title = i18n( "%1 Objects" ).tqarg( objs.size() );
+    title = i18n( "%1 Objects" ).arg( objs.size() );
   insertTitle( title, 1 );
 
   if ( !empty )
@@ -518,7 +518,7 @@ static void addNameLabel( ObjectCalcer* object, ObjectCalcer* namecalcer, const
        object->imp()->inherits( CurveImp::stype() ) )
     attachto = object;
   ObjectHolder* label = ObjectFactory::instance()->attachedLabel(
-      TQString::tqfromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() );
+      TQString::fromLatin1( "%1" ), attachto, loc, namelabelneedsframe, args, doc.document() );
   doc.addObject( label );
 }
 
@@ -924,7 +924,7 @@ bool PropertiesActionsProvider::executeAction(
 //  ///////    Coordinate c = Coordinate::invalidCoord();
     Coordinate c = w.fromScreen( popup.plc() );
     ObjectHolder* label = ObjectFactory::instance()->attachedLabel(
-      TQString::tqfromLatin1( "%1" ), parent->calcer(), c,
+      TQString::fromLatin1( "%1" ), parent->calcer(), c,
       false, args, doc.document() );
     doc.addObject( label );
   }
@@ -1182,7 +1182,7 @@ ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view,
   for ( uint i = 0; i < mobjs.size(); i++ )
   {
     insertItem( !mobjs[i]->name().isEmpty()
-                ? TQString::tqfromLatin1( "%1 %2" ).tqarg( mobjs[i]->imp()->type()->translatedName() ).tqarg( mobjs[i]->name() )
+                ? TQString::fromLatin1( "%1 %2" ).arg( mobjs[i]->imp()->type()->translatedName() ).arg( mobjs[i]->name() )
                 : mobjs[i]->imp()->type()->translatedName(),
                 i );
   }
diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cc
index e35e707a..3853ab18 100644
--- a/kig/modes/textlabelwizard.cc
+++ b/kig/modes/textlabelwizard.cc
@@ -21,10 +21,10 @@
 #include "label.h"
 #include "linkslabel.h"
 
-#include <tqtextedit.h>
+#include <textedit.h>
 #include <kapplication.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 
 TextLabelWizard::TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode )
   : TextLabelWizardBase( parent, "TextLabelWizard", false ), mmode( mode )
@@ -84,12 +84,12 @@ void TextLabelWizard::linkClicked( int which )
 void TextLabelWizard::relayoutArgsPage()
 {
   select_arguments_pageLayout->activate();
-  tqrepaint();
+  repaint();
 }
 
 void TextLabelWizard::slotHelpClicked()
 {
-  kapp->invokeHelp( TQString::tqfromLatin1( "text-labels" ),
-                    TQString::tqfromLatin1( "kig" ) );
+  kapp->invokeHelp( TQString::fromLatin1( "text-labels" ),
+                    TQString::fromLatin1( "kig" ) );
 }
 
diff --git a/kig/modes/textlabelwizardbase.ui b/kig/modes/textlabelwizardbase.ui
index 8f12ca3c..06e3db8f 100644
--- a/kig/modes/textlabelwizardbase.ui
+++ b/kig/modes/textlabelwizardbase.ui
@@ -34,7 +34,7 @@
                     <string>Enter the text for your label here and press "Next".
 If you want to show variable parts, then put %1, %2, ... at the appropriate places (e.g. "This segment is %1 units long.").</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
@@ -71,7 +71,7 @@ If you want to show variable parts, then put %1, %2, ... at the appropriate plac
                 <property name="text">
                     <string>Now select the argument(s) you need.  For every argument, click on it, select an object and a property in the Kig window, and click finish when you are done...</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
                 </property>
             </widget>
diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp
index df061888..f023d288 100644
--- a/kig/modes/typesdialog.cpp
+++ b/kig/modes/typesdialog.cpp
@@ -40,7 +40,7 @@
 #include <tqfile.h>
 #include <tqpixmap.h>
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <algorithm>
 #include <vector>
@@ -108,8 +108,8 @@ TypesDialog::~TypesDialog()
 
 void TypesDialog::helpSlot()
 {
-  kapp->invokeHelp( TQString::tqfromLatin1( "working-with-types" ),
-                    TQString::tqfromLatin1( "kig" ) );
+  kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ),
+                    TQString::fromLatin1( "kig" ) );
 }
 
 void TypesDialog::okSlot()
@@ -173,7 +173,7 @@ void TypesDialog::exportType()
   TQFile fi( file_name );
   if ( fi.exists() )
     if ( KMessageBox::warningContinueCancel( this, i18n( "The file \"%1\" already exists. "
-                                       "Do you wish to overwrite it?" ).tqarg( fi.name() ),
+                                       "Do you wish to overwrite it?" ).arg( fi.name() ),
                                        i18n( "Overwrite File?" ), i18n("Overwrite") ) == KMessageBox::Cancel )
        return;
   MacroList::instance()->save( types, file_name );
diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui
index 89f00986..90216532 100644
--- a/kig/modes/typesdialogbase.ui
+++ b/kig/modes/typesdialogbase.ui
@@ -30,7 +30,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -90,7 +90,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -98,7 +98,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -138,7 +138,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -147,7 +147,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -228,7 +228,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cc
index 5c68c30c..b7b8f41e 100644
--- a/kig/objects/bogus_imp.cc
+++ b/kig/objects/bogus_imp.cc
@@ -88,22 +88,22 @@ InvalidImp::InvalidImp()
 
 void InvalidImp::fillInNextEscape( TQString& s, const KigDocument& ) const
 {
-  s = s.tqarg( "[invalid]" );
+  s = s.arg( "[invalid]" );
 }
 
 void DoubleImp::fillInNextEscape( TQString& s, const KigDocument& ) const
 {
-  s = s.tqarg( mdata );
+  s = s.arg( mdata );
 }
 
 void IntImp::fillInNextEscape( TQString& s, const KigDocument& ) const
 {
-  s = s.tqarg( mdata );
+  s = s.arg( mdata );
 }
 
 void StringImp::fillInNextEscape( TQString& s, const KigDocument& ) const
 {
-  s = s.tqarg( mdata );
+  s = s.arg( mdata );
 }
 
 HierarchyImp::HierarchyImp( const ObjectHierarchy& h )
diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cc
index 4b6c1123..38522c22 100644
--- a/kig/objects/circle_imp.cc
+++ b/kig/objects/circle_imp.cc
@@ -235,8 +235,8 @@ TQString CircleImp::polarEquationString( const KigDocument& w ) const
 {
   TQString ret = i18n( "rho = %1   [centered at %2]" );
   ConicPolarData data = polarData();
-  ret = ret.tqarg( data.pdimen, 0, 'g', 3 );
-  ret = ret.tqarg( w.coordinateSystem().fromScreen( data.focus1, w ) );
+  ret = ret.arg( data.pdimen, 0, 'g', 3 );
+  ret = ret.arg( w.coordinateSystem().fromScreen( data.focus1, w ) );
   return ret;
 }
 
@@ -244,18 +244,18 @@ TQString CircleImp::cartesianEquationString( const KigDocument& ) const
 {
   TQString ret = i18n( "x² + y² + %1 x + %2 y + %3 = 0" );
   ConicCartesianData data = cartesianData();
-  ret = ret.tqarg( data.coeffs[3], 0, 'g', 3 );
-  ret = ret.tqarg( data.coeffs[4], 0, 'g', 3 );
-  ret = ret.tqarg( data.coeffs[5], 0, 'g', 3 );
+  ret = ret.arg( data.coeffs[3], 0, 'g', 3 );
+  ret = ret.arg( data.coeffs[4], 0, 'g', 3 );
+  ret = ret.arg( data.coeffs[5], 0, 'g', 3 );
   return ret;
 }
 
 TQString CircleImp::simplyCartesianEquationString( const KigDocument& ) const
 {
   TQString ret = i18n( "( x - %1 )² + ( y - %2 )² = %3" );
-  ret = ret.tqarg( mcenter.x, 0, 'g', 3 );
-  ret = ret.tqarg( mcenter.y, 0, 'g', 3 );
-  ret = ret.tqarg( mradius * mradius, 0, 'g', 3 );
+  ret = ret.arg( mcenter.x, 0, 'g', 3 );
+  ret = ret.arg( mcenter.y, 0, 'g', 3 );
+  ret = ret.arg( mradius * mradius, 0, 'g', 3 );
   return ret;
 }
 
diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cc
index 5828fc98..81331522 100644
--- a/kig/objects/conic_imp.cc
+++ b/kig/objects/conic_imp.cc
@@ -204,12 +204,12 @@ TQString ConicImp::cartesianEquationString( const KigDocument& ) const
 {
   TQString ret = i18n( "%1 x² + %2 y² + %3 xy + %4 x + %5 y + %6 = 0" );
   ConicCartesianData data = cartesianData();
-  ret = ret.tqarg( data.coeffs[0], 0, 'g', 3 );
-  ret = ret.tqarg( data.coeffs[1], 0, 'g', 3 );
-  ret = ret.tqarg( data.coeffs[2], 0, 'g', 3 );
-  ret = ret.tqarg( data.coeffs[3], 0, 'g', 3 );
-  ret = ret.tqarg( data.coeffs[4], 0, 'g', 3 );
-  ret = ret.tqarg( data.coeffs[5], 0, 'g', 3 );
+  ret = ret.arg( data.coeffs[0], 0, 'g', 3 );
+  ret = ret.arg( data.coeffs[1], 0, 'g', 3 );
+  ret = ret.arg( data.coeffs[2], 0, 'g', 3 );
+  ret = ret.arg( data.coeffs[3], 0, 'g', 3 );
+  ret = ret.arg( data.coeffs[4], 0, 'g', 3 );
+  ret = ret.arg( data.coeffs[5], 0, 'g', 3 );
   return ret;
 }
 
@@ -218,11 +218,11 @@ TQString ConicImp::polarEquationString( const KigDocument& w ) const
   TQString ret = i18n( "rho = %1/(1 + %2 cos theta + %3 sin theta)\n    [centered at %4]" );
   const ConicPolarData data = polarData();
 
-  ret = ret.tqarg( data.pdimen, 0, 'g', 3 );
-  ret = ret.tqarg( -data.ecostheta0, 0, 'g', 3 );
-  ret = ret.tqarg( -data.esintheta0, 0, 'g', 3 );
+  ret = ret.arg( data.pdimen, 0, 'g', 3 );
+  ret = ret.arg( -data.ecostheta0, 0, 'g', 3 );
+  ret = ret.arg( -data.esintheta0, 0, 'g', 3 );
 
-  ret = ret.tqarg( w.coordinateSystem().fromScreen( data.focus1, w ) );
+  ret = ret.arg( w.coordinateSystem().fromScreen( data.focus1, w ) );
   return ret;
 }
 
diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cc
index b4a85b8e..9fc8c53c 100644
--- a/kig/objects/cubic_imp.cc
+++ b/kig/objects/cubic_imp.cc
@@ -417,18 +417,18 @@ TQString CubicImp::cartesianEquationString( const KigDocument& ) const
    */
 
   TQString ret = i18n( "%6 x³ + %9 y³ + %7 x²y + %8 xy² + %5 y² + %3 x² + %4 xy + %1 x + %2 y" );
-  ret = ret.tqarg( mdata.coeffs[1], 0, 'g', 3 );
-  ret = ret.tqarg( mdata.coeffs[2], 0, 'g', 3 );
-  ret = ret.tqarg( mdata.coeffs[3], 0, 'g', 3 );
-  ret = ret.tqarg( mdata.coeffs[4], 0, 'g', 3 );
-  ret = ret.tqarg( mdata.coeffs[5], 0, 'g', 3 );
-  ret = ret.tqarg( mdata.coeffs[6], 0, 'g', 3 );
-  ret = ret.tqarg( mdata.coeffs[7], 0, 'g', 3 );
-  ret = ret.tqarg( mdata.coeffs[8], 0, 'g', 3 );
-  ret = ret.tqarg( mdata.coeffs[9], 0, 'g', 3 );
+  ret = ret.arg( mdata.coeffs[1], 0, 'g', 3 );
+  ret = ret.arg( mdata.coeffs[2], 0, 'g', 3 );
+  ret = ret.arg( mdata.coeffs[3], 0, 'g', 3 );
+  ret = ret.arg( mdata.coeffs[4], 0, 'g', 3 );
+  ret = ret.arg( mdata.coeffs[5], 0, 'g', 3 );
+  ret = ret.arg( mdata.coeffs[6], 0, 'g', 3 );
+  ret = ret.arg( mdata.coeffs[7], 0, 'g', 3 );
+  ret = ret.arg( mdata.coeffs[8], 0, 'g', 3 );
+  ret = ret.arg( mdata.coeffs[9], 0, 'g', 3 );
 
   ret.append( i18n( " + %1 = 0" ) );
-  ret = ret.tqarg( mdata.coeffs[0], 0, 'g', 3 );
+  ret = ret.arg( mdata.coeffs[0], 0, 'g', 3 );
 
   // we should find a common place to do this...
   ret.replace( "+ -", "- " );
diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cc
index 7583dc71..a49078a1 100644
--- a/kig/objects/line_imp.cc
+++ b/kig/objects/line_imp.cc
@@ -186,8 +186,8 @@ const TQString AbstractLineImp::equationString() const
                 TQString::fromUtf8( r > 0 ? "+" : "-" ) +
                 TQString::fromUtf8( " %2" );
 
-  ret = ret.tqarg( m, 0, 'g', 3 );
-  ret = ret.tqarg( abs( r ), 0, 'g', 3 );
+  ret = ret.arg( m, 0, 'g', 3 );
+  ret = ret.arg( abs( r ), 0, 'g', 3 );
 
   return ret;
 }
diff --git a/kig/objects/object_calcer.cc b/kig/objects/object_calcer.cc
index 0bf4e774..40545ed1 100644
--- a/kig/objects/object_calcer.cc
+++ b/kig/objects/object_calcer.cc
@@ -106,16 +106,16 @@ std::vector<ObjectCalcer*> ObjectTypeCalcer::parents() const
 
 void ObjectCalcer::addChild( ObjectCalcer* c )
 {
-  mtqchildren.push_back( c );
+  mchildren.push_back( c );
   ref();
 }
 
 void ObjectCalcer::delChild( ObjectCalcer* c )
 {
-  std::vector<ObjectCalcer*>::iterator i = std::find( mtqchildren.begin(), mtqchildren.end(), c );
-  assert( i != mtqchildren.end() );
+  std::vector<ObjectCalcer*>::iterator i = std::find( mchildren.begin(), mchildren.end(), c );
+  assert( i != mchildren.end() );
 
-  mtqchildren.erase( i );
+  mchildren.erase( i );
   deref();
 }
 
@@ -175,9 +175,9 @@ ObjectImp* ObjectConstCalcer::switchImp( ObjectImp* newimp )
   return ret;
 }
 
-std::vector<ObjectCalcer*> ObjectCalcer::tqchildren() const
+std::vector<ObjectCalcer*> ObjectCalcer::children() const
 {
-  return mtqchildren;
+  return mchildren;
 }
 
 const ObjectImpType* ObjectPropertyCalcer::impRequirement(
diff --git a/kig/objects/object_calcer.h b/kig/objects/object_calcer.h
index 98262e5e..6df94fe8 100644
--- a/kig/objects/object_calcer.h
+++ b/kig/objects/object_calcer.h
@@ -77,10 +77,10 @@ protected:
   void ref();
   void deref();
 
-  // we keep track of our tqchildren, so algorithms can easily walk over
+  // we keep track of our children, so algorithms can easily walk over
   // the dependency graph..
 
-  std::vector<ObjectCalcer*> mtqchildren;
+  std::vector<ObjectCalcer*> mchildren;
 
   ObjectCalcer();
 public:
@@ -102,7 +102,7 @@ public:
   /**
    * Returns the child ObjectCalcer's of this ObjectCalcer.
    */
- std::vector<ObjectCalcer*> tqchildren() const;
+ std::vector<ObjectCalcer*> children() const;
 
   virtual ~ObjectCalcer();
   /**
diff --git a/kig/objects/object_factory.cc b/kig/objects/object_factory.cc
index 942139f4..f2957a7e 100644
--- a/kig/objects/object_factory.cc
+++ b/kig/objects/object_factory.cc
@@ -299,12 +299,12 @@ void ObjectFactory::redefinePoint(
                   std::mem_fun( calcmeth ) );
   ObjectCalcer* v = 0;
 
-  // we don't want one of our tqchildren as a parent...
-  std::set<ObjectCalcer*> tqchildren = getAllChildren( point );
+  // we don't want one of our children as a parent...
+  std::set<ObjectCalcer*> children = getAllChildren( point );
   for ( std::vector<ObjectCalcer*>::iterator i = os.begin();
         i != os.end(); ++i )
     if ( (*i)->imp()->inherits( CurveImp::stype() ) &&
-         tqchildren.find( *i ) == tqchildren.end() )
+         children.find( *i ) == children.end() )
     {
       v = *i;
       break;
diff --git a/kig/objects/object_holder.cc b/kig/objects/object_holder.cc
index b6c5f09e..cdf06396 100644
--- a/kig/objects/object_holder.cc
+++ b/kig/objects/object_holder.cc
@@ -160,5 +160,5 @@ TQString ObjectHolder::selectStatement() const
   if ( n.isEmpty() )
     return i18n( imp()->type()->selectStatement() );
   else
-    return i18n( imp()->type()->selectNameStatement() ).tqarg( n );
+    return i18n( imp()->type()->selectNameStatement() ).arg( n );
 }
diff --git a/kig/objects/object_imp.h b/kig/objects/object_imp.h
index ddf0eb46..eaf29328 100644
--- a/kig/objects/object_imp.h
+++ b/kig/objects/object_imp.h
@@ -170,7 +170,7 @@ public:
    * Returns a translatable string of the form "Select point %1".  %1
    * will be filled in by whomever calls this function with the name
    * of the object in question.  This function should be used as
-   * follows: i18n( x->selectNameStatement() ).tqarg( xname ).
+   * follows: i18n( x->selectNameStatement() ).arg( xname ).
    */
   const char* selectNameStatement() const;
 
diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cc
index a29cf5e8..d095c238 100644
--- a/kig/objects/object_imp_factory.cc
+++ b/kig/objects/object_imp_factory.cc
@@ -84,33 +84,33 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
     parent.appendChild(
       doc.createTextNode(
         TQString::number( static_cast<const IntImp&>( d ).data() ) ) );
-    return TQString::tqfromLatin1( "int" );
+    return TQString::fromLatin1( "int" );
   }
   else if ( d.inherits( DoubleImp::stype() ) )
   {
     parent.appendChild(
       doc.createTextNode(
         TQString::number( static_cast<const DoubleImp&>( d ).data() ) ) );
-    return TQString::tqfromLatin1( "double" );
+    return TQString::fromLatin1( "double" );
   }
   else if( d.inherits( StringImp::stype() ) )
   {
     parent.appendChild(
       doc.createTextNode(
         static_cast<const StringImp&>( d ).data() ) );
-    return TQString::tqfromLatin1( "string" );
+    return TQString::fromLatin1( "string" );
   }
   else if ( d.inherits( TestResultImp::stype() ) )
   {
     parent.appendChild(
       doc.createTextNode(
         static_cast<const TestResultImp&>( d ).data() ) );
-    return TQString::tqfromLatin1( "testresult" );
+    return TQString::fromLatin1( "testresult" );
   }
   else if( d.inherits( HierarchyImp::stype() ) )
   {
     static_cast<const HierarchyImp&>( d ).data().serialize( parent, doc );
-    return TQString::tqfromLatin1( "hierarchy" );
+    return TQString::fromLatin1( "hierarchy" );
   }
   else if ( d.inherits( TransformationImp::stype() ) )
   {
@@ -135,7 +135,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
     homothetye.appendChild( doc.createTextNode( ishomothety ) );
     parent.appendChild( homothetye );
 
-    return TQString::tqfromLatin1( "transformation" );
+    return TQString::fromLatin1( "transformation" );
   }
   else if( d.inherits( AbstractLineImp::stype() ) )
   {
@@ -143,28 +143,28 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
     addCoordinateElement( "a", l.a, parent, doc );
     addCoordinateElement( "b", l.b, parent, doc );
     if( d.inherits( SegmentImp::stype() ) )
-      return TQString::tqfromLatin1( "segment" );
+      return TQString::fromLatin1( "segment" );
     else if( d.inherits( RayImp::stype() ) )
-      return TQString::tqfromLatin1( "ray" );
-    else return TQString::tqfromLatin1( "line" );
+      return TQString::fromLatin1( "ray" );
+    else return TQString::fromLatin1( "line" );
   }
   else if( d.inherits( PointImp::stype() ) )
   {
     addXYElements( static_cast<const PointImp&>( d ).coordinate(),
                    parent, doc );
-    return TQString::tqfromLatin1( "point" );
+    return TQString::fromLatin1( "point" );
   }
   else if( d.inherits( TextImp::stype() ) )
   {
     TQString text = static_cast<const TextImp&>( d ).text();
     parent.appendChild(
       doc.createTextNode( text ) );
-    return TQString::tqfromLatin1( "text" );
+    return TQString::fromLatin1( "text" );
   }
   else if( d.inherits( AngleImp::stype() ) )
   {
     addDoubleElement( "size", static_cast<const AngleImp&>( d ).size(), parent, doc );
-    return TQString::tqfromLatin1( "angle" );
+    return TQString::fromLatin1( "angle" );
   }
   else if ( d.inherits( ArcImp::stype() ) )
   {
@@ -173,13 +173,13 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
     addDoubleElement( "radius", a.radius(), parent, doc );
     addDoubleElement( "startangle", a.startAngle(), parent, doc );
     addDoubleElement( "angle", a.angle(), parent, doc );
-    return TQString::tqfromLatin1( "arc" );
+    return TQString::fromLatin1( "arc" );
   }
   else if( d.inherits( VectorImp::stype() ) )
   {
     Coordinate dir = static_cast<const VectorImp&>( d ).dir();
     addXYElements( dir, parent, doc );
-    return TQString::tqfromLatin1( "vector" );
+    return TQString::fromLatin1( "vector" );
   }
   else if( d.inherits( LocusImp::stype() ) )
   {
@@ -197,14 +197,14 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
     locus.hierarchy().serialize( hier, doc );
     parent.appendChild( hier );
 
-    return TQString::tqfromLatin1( "locus" );
+    return TQString::fromLatin1( "locus" );
   }
   else if( d.inherits( CircleImp::stype() ) )
   {
     const CircleImp& c = static_cast<const CircleImp&>( d );
     addCoordinateElement( "center", c.center(), parent, doc );
     addDoubleElement( "radius", c.radius(), parent, doc );
-    return TQString::tqfromLatin1( "circle" );
+    return TQString::fromLatin1( "circle" );
   }
   else if( d.inherits( ConicImp::stype() ) )
   {
@@ -213,7 +213,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
     addDoubleElement( "pdimen", data.pdimen, parent, doc );
     addDoubleElement( "ecostheta0", data.ecostheta0, parent, doc );
     addDoubleElement( "esintheta0", data.esintheta0, parent, doc );
-    return TQString::tqfromLatin1( "conic" );
+    return TQString::fromLatin1( "conic" );
   }
   else if( d.inherits( CubicImp::stype() ) )
   {
@@ -230,7 +230,7 @@ TQString ObjectImpFactory::serialize( const ObjectImp& d, TQDomElement& parent,
     addDoubleElement( "a122", data.coeffs[8], coeffs, doc );
     addDoubleElement( "a222", data.coeffs[9], coeffs, doc );
     parent.appendChild( coeffs );
-    return TQString::tqfromLatin1( "cubic" );
+    return TQString::fromLatin1( "cubic" );
   }
   assert( false );
   return TQString();
@@ -291,7 +291,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
 #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; \
   }
 
@@ -504,7 +504,7 @@ ObjectImp* ObjectImpFactory::deserialize( const TQString& type,
                 "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( type );
+                "or perhaps you are using an older Kig version." ).arg( type );
   return 0;
 }
 
diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cc
index 1e5b8766..539f98b3 100644
--- a/kig/objects/point_imp.cc
+++ b/kig/objects/point_imp.cc
@@ -137,7 +137,7 @@ void PointImp::setCoordinate( const Coordinate& c )
 
 void PointImp::fillInNextEscape( TQString& s, const KigDocument& doc ) const
 {
-  s = s.tqarg( doc.coordinateSystem().fromScreen( mc, doc ) );
+  s = s.arg( doc.coordinateSystem().fromScreen( mc, doc ) );
 }
 
 void PointImp::visit( ObjectImpVisitor* vtor ) const
diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cc
index f1c59ac4..2acd8479 100644
--- a/kig/objects/point_type.cc
+++ b/kig/objects/point_type.cc
@@ -395,7 +395,7 @@ void FixedPointType::executeAction(
     Coordinate oldc = static_cast<const PointImp*>( o.imp() )->coordinate();
     KigInputDialog::getCoordinate(
       i18n( "Set Coordinate" ),
-      i18n( "Enter the new coordinate." ) + TQString::tqfromLatin1( "<br>" ) +
+      i18n( "Enter the new coordinate." ) + TQString::fromLatin1( "<br>" ) +
       d.document().coordinateSystem().coordinateFormatNoticeMarkup(),
       &w, &ok, d.document(), &oldc );
     if ( ! ok ) break;
diff --git a/kig/objects/text_type.cc b/kig/objects/text_type.cc
index 09e84c30..0b5832cd 100644
--- a/kig/objects/text_type.cc
+++ b/kig/objects/text_type.cc
@@ -30,7 +30,7 @@
 
 #include <algorithm>
 
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqstringlist.h>
 
 #include <kapplication.h>
@@ -144,7 +144,7 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c,
 
   if ( i == 0 )
   {
-    TQClipboard* cb = kapp->tqclipboard();
+    TQClipboard* cb = kapp->clipboard();
 
     // copy the text into the clipboard
     const TextImp* ti = static_cast<const TextImp*>( c.imp() );
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cc
index 255a6073..c0fc08ec 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cc
@@ -21,7 +21,7 @@
 #include "script_mode.h"
 
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 //#include <kactionclasses.h>
 //#include <kactioncollection.h>
@@ -159,8 +159,8 @@ void NewScriptWizard::accept()
 
 void NewScriptWizard::slotHelpClicked()
 {
-  kapp->invokeHelp( TQString::tqfromLatin1( "scripting" ),
-                    TQString::tqfromLatin1( "kig" ) );
+  kapp->invokeHelp( TQString::fromLatin1( "scripting" ),
+                    TQString::fromLatin1( "kig" ) );
 }
 
 void NewScriptWizard::setText( const TQString& text )
diff --git a/kig/scripting/newscriptwizardbase.ui b/kig/scripting/newscriptwizardbase.ui
index 8c58bd2e..a26dda29 100644
--- a/kig/scripting/newscriptwizardbase.ui
+++ b/kig/scripting/newscriptwizardbase.ui
@@ -34,7 +34,7 @@
                     <string>Select the argument objects ( if any )
 in the Kig window and press "Next".</string>
                 </property>
-                <property name="tqalignment">
+                <property name="alignment">
                     <set>AlignCenter</set>
                 </property>
             </widget>
diff --git a/kig/scripting/script-common.cc b/kig/scripting/script-common.cc
index 1f5d8c4a..2eb2da81 100644
--- a/kig/scripting/script-common.cc
+++ b/kig/scripting/script-common.cc
@@ -44,7 +44,7 @@ TQString ScriptType::templateCode( ScriptType::Type type, std::list<ObjectHolder
 {
   if ( type == Python )
   {
-    TQString tempcode = TQString::tqfromLatin1( "def calc( " );
+    TQString tempcode = TQString::fromLatin1( "def calc( " );
     bool firstarg = true;
     TQString temparg = i18n( "Note to translators: this should be a default "
                             "name for an argument in a Python function. The "
@@ -58,7 +58,7 @@ TQString ScriptType::templateCode( ScriptType::Type type, std::list<ObjectHolder
       if ( !firstarg ) tempcode += ", ";
       else firstarg = false;
       TQString n = ( *i )->name();
-      tempcode += n.isEmpty() ? temparg.tqarg( id ) : n;
+      tempcode += n.isEmpty() ? temparg.arg( id ) : n;
       id++;
     };
     tempcode +=
diff --git a/kig/scripting/script_mode.cc b/kig/scripting/script_mode.cc
index 945ad62f..d22fa40c 100644
--- a/kig/scripting/script_mode.cc
+++ b/kig/scripting/script_mode.cc
@@ -204,7 +204,7 @@ bool ScriptCreationMode::queryFinish()
       KMessageBox::detailedSorry(
         mwizard, i18n( "The Python interpreter caught an error during the execution of your "
                        "script. Please fix the script and click the Finish button again." ),
-        i18n( "The Python Interpreter generated the following error output:\n%1").tqarg( errtrace.data() ) );
+        i18n( "The Python Interpreter generated the following error output:\n%1").arg( errtrace.data() ) );
     }
     else
     {
@@ -322,7 +322,7 @@ bool ScriptEditMode::queryFinish()
       KMessageBox::detailedSorry(
         mpart.widget(), i18n( "The Python interpreter caught an error during the execution of your "
                               "script. Please fix the script." ),
-        i18n( "The Python Interpreter generated the following error output:\n%1").tqarg( errtrace.data() ) );
+        i18n( "The Python Interpreter generated the following error output:\n%1").arg( errtrace.data() ) );
     }
     else
     {