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

14 files changed, 50 insertions, 50 deletions

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 ) );
   }
 
 }