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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

2 files changed, 14 insertions, 14 deletions

diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index 894dd1eb..38ac5257 100644
--- a/kugar/part/kugar_part.cpp
+++ b/kugar/part/kugar_part.cpp
@@ -89,19 +89,19 @@ bool KugarPart::loadXML( TQIODevice *file, const TQDomDocument & /*doc*/ )
                 }
             }
             if ( !ok )
-                KMessageBox::sorry( 0, i18n( "Invalid data file %1" ).arg( m_file ) );
+                KMessageBox::sorry( 0, i18n( "Invalid data file %1" ).tqarg( m_file ) );
         }
         else
         {
             ok = false;
-            KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).arg( m_file ) );
+            KMessageBox::sorry( 0, i18n( "The zero sized data file %1 can't be rendered" ).tqarg( m_file ) );
         }
 
     }
     else
     {
         ok = false;
-        KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).arg( m_file ) );
+        KMessageBox::sorry( 0, i18n( "Unable to open data file: %1" ).tqarg( m_file ) );
     }
 
     return ok;
@@ -166,7 +166,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
                 if ( KIO::NetAccess::download( tmpURL, localtpl ) )
                     isTemp = true;
                 else
-                    KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) );
+                    KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) );
             }
             else
                 localtpl = tpl;
@@ -183,7 +183,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
                 if ( KIO::NetAccess::download( tmpURL, localtpl ) )
                     isTemp = true;
                 else
-                    KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) );
+                    KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) );
             }
         }
     }
@@ -192,7 +192,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
         if ( KIO::NetAccess::download( url, localtpl ) )
             isTemp = true;
         else
-            KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).arg( url.prettyURL() ) );
+            KMessageBox::sorry( 0, i18n( "Unable to download template file: %1" ).tqarg( url.prettyURL() ) );
     }
 
 /*    kdDebug() << "localtpl: " << localtpl.latin1() << endl;*/
@@ -215,7 +215,7 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
 /*                    kdDebug() << "RawXML" << endl;*/
                     f.open( IO_ReadOnly );
                     if ( !m_reportEngine -> setReportTemplate( TQT_TQIODEVICE(&f) ) )
-                        KMessageBox::sorry( 0, i18n( "Invalid template file: %1" ).arg( localtpl ) );
+                        KMessageBox::sorry( 0, i18n( "Invalid template file: %1" ).tqarg( localtpl ) );
                     else
                     {
                         m_templateOk = true;
@@ -229,13 +229,13 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
                     if ( tmpStore->open( "maindoc.xml" ) )
                     {
                         if ( !m_reportEngine -> setReportTemplate( tmpStore->device() ) )
-                            KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).arg( localtpl ) );
+                            KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( localtpl ) );
                         else
                             m_templateOk = true;
                         tmpStore->close();
                     }
                     else
-                        KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).arg( localtpl ) );
+                        KMessageBox::sorry( 0, i18n( "%1 is not a valid Kugar Designer template file." ).tqarg( localtpl ) );
 
                     delete tmpStore;
                 }
@@ -244,12 +244,12 @@ void KugarPart::slotPreferredTemplate( const TQString &tpl )
             else
             {
                 f.close();
-                KMessageBox::sorry( 0, i18n( "Couldn't read the beginning of the template file: %1" ).arg( localtpl ) );
+                KMessageBox::sorry( 0, i18n( "Couldn't read the beginning of the template file: %1" ).tqarg( localtpl ) );
             }
 
         }
         else
-            KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).arg( localtpl ) );
+            KMessageBox::sorry( 0, i18n( "Unable to open template file: %1" ).tqarg( localtpl ) );
 
         if ( isTemp )
             KIO::NetAccess::removeTempFile( localtpl );
diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp
index 631bbe1d..ddd8dfe1 100644
--- a/kugar/part/kugar_view.cpp
+++ b/kugar/part/kugar_view.cpp
@@ -15,7 +15,7 @@
 #include <tqfile.h>
 #include <kglobal.h>
 #include <kiconloader.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #if defined(HAVE_CONFIG_H)
 #include "config.h"
@@ -90,12 +90,12 @@ bool KugarPart::openFile()
                 ok = true;
         }
         else
-            KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).arg( m_file ) );
+            KMessageBox::sorry( this, i18n( "Invalid data file: %1" ).tqarg( m_file ) );
 
         f.close();
     }
     else
-        KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).arg( m_file ) );
+        KMessageBox::sorry( this, i18n( "Unable to open data file: %1" ).tqarg( m_file ) );
 
     return ok;
 }