From a2277b6bc715464e83882b90c2a058139b8a6b54 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 23 Jun 2011 01:42:07 +0000 Subject: TQt4 port kdeutils This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- ark/compressedfile.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ark/compressedfile.cpp') diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index 65e21de..17df279 100644 --- a/ark/compressedfile.cpp +++ b/ark/compressedfile.cpp @@ -28,7 +28,7 @@ #include #include -// Qt includes +// TQt includes #include // KDE includes @@ -60,7 +60,7 @@ CompressedFile::CompressedFile( ArkWidget *_gui, const TQString & _fileName, con m_openAsMimeType = _openAsMimeType; kdDebug(1601) << "CompressedFile constructor" << endl; m_tempDirectory = new KTempDir( _gui->tmpDir() - + TQString::fromLatin1( "compressed_file_temp" ) ); + + TQString::tqfromLatin1( "compressed_file_temp" ) ); m_tempDirectory->setAutoDelete( true ); m_tmpdir = m_tempDirectory->name(); initData(); @@ -97,8 +97,8 @@ void CompressedFile::setHeaders() void CompressedFile::initData() { - m_unarchiver_program = TQString::null; - m_archiver_program = TQString::null; + m_unarchiver_program = TQString(); + m_archiver_program = TQString(); TQString mimeType; if ( !m_openAsMimeType.isNull() ) @@ -155,7 +155,7 @@ TQString CompressedFile::extension() TQStringList::Iterator it = m_defaultExtensions.begin(); for( ; it != m_defaultExtensions.end(); ++it ) if( m_filename.endsWith( *it ) ) - return TQString::null; + return TQString(); return m_defaultExtensions.first(); } @@ -212,7 +212,7 @@ void CompressedFile::open() if (kp->start(KProcess::NotifyOnExit, KProcess::AllOutput) == false) { KMessageBox::error( 0, i18n("Could not start a subprocess.") ); - emit sigOpen(this, false, TQString::null, 0 ); + emit sigOpen(this, false, TQString(), 0 ); } kdDebug(1601) << "-CompressedFile::open" << endl; @@ -235,7 +235,7 @@ void CompressedFile::slotUncompressDone(KProcess *_kp) if ( !bSuccess ) { - emit sigOpen( this, false, TQString::null, 0 ); + emit sigOpen( this, false, TQString(), 0 ); return; } @@ -289,7 +289,7 @@ void CompressedFile::addFile( const TQStringList &urls ) proc.start(KProcess::Block); m_tmpfile = file.right(file.length() - - file.findRev("/")-1); + - file.tqfindRev("/")-1); m_tmpfile = m_tmpdir + '/' + m_tmpfile; kdDebug(1601) << "Temp file name is " << m_tmpfile << endl; -- cgit v1.2.3