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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 15 insertions, 15 deletions

diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index c71c7609..0767ab04 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -67,13 +67,13 @@ public:
   bool m_deleted;
 };
 
-KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& geometry )
+KoDocumentChild::KoDocumentChild( KoDocument* parent, KoDocument* doc, const TQRect& tqgeometry )
     : KoChild( parent )
 {
   d = new KoDocumentChildPrivate;
   d->m_parent = parent;
   d->m_doc = doc;
-  setGeometry( geometry );
+  setGeometry( tqgeometry );
   d->m_deleted = false;
   if ( doc )
     doc->setStoreInternal( !doc->hasExternURL() );
@@ -88,11 +88,11 @@ KoDocumentChild::KoDocumentChild( KoDocument* parent )
   d->m_deleted = false;
 }
 
-void KoDocumentChild::setDocument( KoDocument *doc, const TQRect &geometry )
+void KoDocumentChild::setDocument( KoDocument *doc, const TQRect &tqgeometry )
 {
   kdDebug()<<k_funcinfo<<"doc: "<<doc->url().url()<<endl;
   d->m_doc = doc;
-  setGeometry( geometry );
+  setGeometry( tqgeometry );
 
   updateMatrix();
 }
@@ -213,7 +213,7 @@ bool KoDocumentChild::loadDocument( KoStore* store )
             KMimeType::Ptr mime = KMimeType::mimeType( m_tmpMimeType );
             if ( mime->name() != KMimeType::defaultMimeType() )
                 mimeName = mime->comment();
-            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).arg( mimeName ) );
+            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).tqarg( mimeName ) );
         }
         return res;
     }
@@ -252,7 +252,7 @@ bool KoDocumentChild::loadOasisDocument( KoStore* store, const TQDomDocument& ma
             KMimeType::Ptr mime = KMimeType::mimeType( mimeType );
             if ( mime->name() != KMimeType::defaultMimeType() )
                 mimeName = mime->comment();
-            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).arg( mimeName ) );
+            d->m_doc->setProperty( "unavailReason", i18n( "No handler found for %1" ).tqarg( mimeName ) );
         }
         return res;
     }
@@ -306,7 +306,7 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr
                 TQApplication::restoreOverrideCursor();
                 // For security reasons we need to ask confirmation if the url is remote
                 int result = KMessageBox::warningYesNoCancel(
-                    0, i18n( "This document contains an external link to a remote document\n%1").arg(m_tmpURL),
+                    0, i18n( "This document contains an external link to a remote document\n%1").tqarg(m_tmpURL),
                     i18n( "Confirmation Required" ), i18n( "Download" ), i18n( "Skip" ) );
 
                 if ( result == KMessageBox::Cancel )
@@ -335,9 +335,9 @@ bool KoDocumentChild::loadDocumentInternal( KoStore* store, const KoDocumentEntr
                 d->m_doc->setProperty( "realURL", tmpURL ); // so that it gets saved correctly
                 d->m_doc->setStoreInternal( true );
                 if ( internalURL )
-                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load embedded object:\n%1" ).arg( errorMessage ) );
+                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load embedded object:\n%1" ).tqarg( errorMessage ) );
                 else
-                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load external document %1:\n%2" ).arg( tmpURL, errorMessage ) );
+                    d->m_doc->setProperty( "unavailReason", i18n( "Could not load external document %1:\n%2" ).tqarg( tmpURL, errorMessage ) );
             }
             return res;
         }
@@ -409,7 +409,7 @@ bool KoDocumentChild::saveOasis( KoStore* store, KoXmlWriter* manifestWriter )
         }
         else
         {
-            // To make the children happy cd to the correct directory
+            // To make the tqchildren happy cd to the correct directory
             store->pushDirectory();
             store->enterDirectory( name );
 
@@ -454,7 +454,7 @@ void KoDocumentChild::saveOasisAttributes( KoXmlWriter &xmlWriter, const TQStrin
         d->m_doc->setURL( u );
     }
 
-    //<draw:object draw:style-name="standard" draw:id="1" draw:layer="layout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
+    //<draw:object draw:style-name="standard" draw:id="1" draw:layer="tqlayout" svg:width="14.973cm" svg:height="4.478cm" svg:x="11.641cm" svg:y="14.613cm" xlink:href="#./Object 1" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/>
     xmlWriter.addAttribute( "xlink:type", "simple" );
     xmlWriter.addAttribute( "xlink:show", "embed" );
     xmlWriter.addAttribute( "xlink:actuate", "onLoad" );
@@ -480,10 +480,10 @@ TQDomElement KoDocumentChild::save( TQDomDocument& doc, bool uppercase )
         e.setAttribute( "mime", d->m_doc->nativeFormatMimeType().data() );
         kdDebug() << "KoDocumentChild::save mime=" << d->m_doc->nativeFormatMimeType() << endl;
         TQDomElement rect = doc.createElement( ( uppercase ? "RECT" : "rect" ) );
-        rect.setAttribute( "x", geometry().left() );
-        rect.setAttribute( "y", geometry().top() );
-        rect.setAttribute( "w", geometry().width() );
-        rect.setAttribute( "h", geometry().height() );
+        rect.setAttribute( "x", tqgeometry().left() );
+        rect.setAttribute( "y", tqgeometry().top() );
+        rect.setAttribute( "w", tqgeometry().width() );
+        rect.setAttribute( "h", tqgeometry().height() );
         e.appendChild(rect);
         return e;
     }