TQt4 port piklab

This enables compilation under both Qt3 and Qt4


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

1 files changed, 12 insertions, 12 deletions

diff --git a/src/common/gui/pfile_ext.cpp b/src/common/gui/pfile_ext.cpp
index d42de16..43f9e81 100644
--- a/src/common/gui/pfile_ext.cpp
+++ b/src/common/gui/pfile_ext.cpp
@@ -8,7 +8,7 @@
  ***************************************************************************/
 #include "pfile_ext.h"
 
-#include <qfile.h>
+#include <tqfile.h>
 #include <kio/netaccess.h>
 #include <ktempfile.h>
 #include "common/gui/misc_gui.h"
@@ -18,11 +18,11 @@ bool PURL::File::openForWrite()
 {
   close();
   if (_tmp) delete _tmp;
-  _tmp = new KTempFile(QString::null, _extension);
+  _tmp = new KTempFile(TQString(), _extension);
   _tmp->setAutoDelete(true);
   if ( _tmp->status()!=0 ) {
     _error = i18n("Could not create temporary file.");
-    _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
+    _log.sorry(_error, i18n("File: %1").tqarg(_tmp->name()));
     return false;
   }
   return true;
@@ -35,11 +35,11 @@ bool PURL::File::close()
   bool ok = (_tmp ? _tmp->status() : _file->status())==IO_Ok;
   if ( !_file->name().isEmpty() ) {
     KIO::NetAccess::removeTempFile(_file->name());
-    _file->setName(QString::null);
+    _file->setName(TQString());
   }
   delete _stream;
   _stream = 0;
-  if ( ok && _tmp && !_url.isEmpty() && !KIO::NetAccess::upload(_tmp->name(), _url.kurl(), qApp->mainWidget()) ) {
+  if ( ok && _tmp && !_url.isEmpty() && !KIO::NetAccess::upload(_tmp->name(), _url.kurl(), tqApp->mainWidget()) ) {
     _error = KIO::NetAccess::lastErrorString();
     ok = false;
     _log.sorry(i18n("Could not save file."), errorString());
@@ -52,8 +52,8 @@ bool PURL::File::close()
 bool PURL::File::openForRead()
 {
   close();
-  QString tmp;
-  if ( !KIO::NetAccess::download(_url.kurl(), tmp, qApp->mainWidget()) ) {
+  TQString tmp;
+  if ( !KIO::NetAccess::download(_url.kurl(), tmp, tqApp->mainWidget()) ) {
     _error = KIO::NetAccess::lastErrorString();
     _log.sorry(i18n("Could not open file for reading."), errorString());
     return false;
@@ -61,7 +61,7 @@ bool PURL::File::openForRead()
   _file->setName(tmp);
   if ( !_file->open(IO_ReadOnly) ) {
     _error = i18n("Could not open temporary file.");
-    _log.sorry(_error, i18n("File: %1").arg(_file->name()));
+    _log.sorry(_error, i18n("File: %1").tqarg(_file->name()));
     return false;
   }
   return true;
@@ -75,7 +75,7 @@ bool PURL::File::remove()
 }
 
 //-----------------------------------------------------------------------------
-PURL::TempFile::TempFile(Log::Generic &log, const QString &extension)
+PURL::TempFile::TempFile(Log::Generic &log, const TQString &extension)
   : FileBase(log, extension)
 {}
 
@@ -92,7 +92,7 @@ bool PURL::TempFile::close()
     _tmp->close();
     if ( _tmp->status()!=IO_Ok ) {
       _error = i18n("Could not write to temporary file.");
-      _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
+      _log.sorry(_error, i18n("File: %1").tqarg(_tmp->name()));
       return false;
     }
   }
@@ -103,11 +103,11 @@ bool PURL::TempFile::openForWrite()
 {
   close();
   if (_tmp) delete _tmp;
-  _tmp = new KTempFile(QString::null, _extension);
+  _tmp = new KTempFile(TQString(), _extension);
   _tmp->setAutoDelete(true);
   if ( _tmp->status()!=0 ) {
     _error = i18n("Could not create temporary file.");
-    _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
+    _log.sorry(_error, i18n("File: %1").tqarg(_tmp->name()));
     return false;
   }
   return true;