TQt4 convert kdesdk

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1236185 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 11 insertions, 11 deletions

diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index 0526bd74..1cb26723 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -21,11 +21,11 @@
 
   In addition, as a special exception, the copyright holders give
   permission to link the code of this program with any edition of
-  the Qt library by Trolltech AS, Norway (or with modified versions
-  of Qt that use the same license as Qt), and distribute linked
+  the TQt library by Trolltech AS, Norway (or with modified versions
+  of TQt that use the same license as TQt), and distribute linked
   combinations including the two.  You must obey the GNU General
   Public License in all respects for all of the code used other than
-  Qt. If you modify this file, you may extend this exception to
+  TQt. If you modify this file, you may extend this exception to
   your version of the file, but you are not obligated to do so.  If
   you do not wish to do so, delete this exception statement from
   your version.
@@ -53,8 +53,8 @@
 
 using namespace KBabel;
 
-KBabelMailer::KBabelMailer( TQWidget* parent, Project::Ptr project)
-  : _project( project ), m_parent( parent )
+KBabelMailer::KBabelMailer( TQWidget* tqparent, Project::Ptr project)
+  : _project( project ), m_parent( tqparent )
 {
   m_tempDir.setAutoDelete( true );
   readConfig();
@@ -103,7 +103,7 @@ void KBabelMailer::sendOneFile( const KURL& url)
       kapp->invokeMailer("", "", "", "", "", "", fileName);
     else
     {
-      KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").arg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").tqarg( url.prettyURL() ) );
     }
   }
   else
@@ -133,7 +133,7 @@ TQString KBabelMailer::createArchive(TQStringList fileList, TQString initialName
 
   // do nothing if there are no files in the list
   if (fileList.empty())
-    return TQString::null;
+    return TQString();
 
   // determine the name of the archive, do nothing if none is given
   // or Cancel was pressed
@@ -176,7 +176,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
   KTar archive(archiveName, mimetype);
   if (!archive.open(IO_WriteOnly)) {
     KMessageBox::error( m_parent, i18n("Error while trying to create archive file.") );
-    return TQString::null;
+    return TQString();
   }
 
   // add files to this archive
@@ -190,7 +190,7 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
 #endif
     TQString poTempName;
     if ( !KIO::NetAccess::download( url, poTempName, m_parent ) ) {
-      KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").arg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to read file %1.").tqarg( url.prettyURL() ) );
       continue;
     }
 
@@ -199,13 +199,13 @@ TQString KBabelMailer::buildArchive(TQStringList fileList, TQString archiveName,
     // actually reside in one of its subdirectories. Else they are stored
     // without relative path.
     TQString poArchFileName = url.path();
-    if (_poBaseDir.isEmpty( ) || poArchFileName.find(_poBaseDir) != 0)
+    if (_poBaseDir.isEmpty( ) || poArchFileName.tqfind(_poBaseDir) != 0)
       poArchFileName = TQFileInfo( poArchFileName ).fileName();
     else
       poArchFileName.remove( TQRegExp( "^" + TQRegExp::escape( _poBaseDir ) + "/?" ) );
     if ( !archive.addLocalFile( poTempName, poArchFileName ) ) 
     {
-      KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").arg( url.prettyURL() ) );
+      KMessageBox::error( m_parent, i18n("Error while trying to copy file %1 into archive.").tqarg( url.prettyURL() ) );
     }
    
     KIO::NetAccess::removeTempFile(poTempName);