From ffe8a83e053396df448e9413828527613ca3bd46 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:46:43 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kio/kioexec/main.cpp | 40 ++++++++++++++++++++-------------------- kio/kioexec/main.h | 16 ++++++++-------- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'kio/kioexec') diff --git a/kio/kioexec/main.cpp b/kio/kioexec/main.cpp index 12a2d64bf..e444ebd46 100644 --- a/kio/kioexec/main.cpp +++ b/kio/kioexec/main.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -61,11 +61,11 @@ static KCmdLineOptions options[] = int jobCounter = 0; -QPtrList* jobList = 0L; +TQPtrList* jobList = 0L; KIOExec::KIOExec() { - jobList = new QPtrList; + jobList = new TQPtrList; jobList->setAutoDelete( false ); // jobs autodelete themselves KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); @@ -74,7 +74,7 @@ KIOExec::KIOExec() tempfiles = args->isSet("tempfiles"); if ( args->isSet( "suggestedfilename" ) ) - suggestedFileName = QString::fromLocal8Bit( args->getOption( "suggestedfilename" ) ); + suggestedFileName = TQString::fromLocal8Bit( args->getOption( "suggestedfilename" ) ); expectedCounter = 0; command = args->arg(0); kdDebug() << "command=" << command << endl; @@ -105,14 +105,14 @@ KIOExec::KIOExec() else // We must fetch the file { - QString fileName = KIO::encodeFileName( url.fileName() ); + TQString fileName = KIO::encodeFileName( url.fileName() ); if ( !suggestedFileName.isEmpty() ) fileName = suggestedFileName; // Build the destination filename, in ~/.kde/cache-*/krun/ // Unlike KDE-1.1, we put the filename at the end so that the extension is kept // (Some programs rely on it) - QString tmp = KGlobal::dirs()->saveLocation( "cache", "krun/" ) + - QString("%1.%2.%3").arg(getpid()).arg(jobCounter++).arg(fileName); + TQString tmp = KGlobal::dirs()->saveLocation( "cache", "krun/" ) + + TQString("%1.%2.%3").arg(getpid()).arg(jobCounter++).arg(fileName); fileInfo file; file.path = tmp; file.url = url; @@ -125,7 +125,7 @@ KIOExec::KIOExec() KIO::Job *job = KIO::file_copy( url, dest ); jobList->append( job ); - connect( job, SIGNAL( result( KIO::Job * ) ), SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) ); } } } @@ -133,7 +133,7 @@ KIOExec::KIOExec() if ( tempfiles ) { // #113991 - QTimer::singleShot( 0, this, SLOT( slotRunApp() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) ); //slotRunApp(); // does not return return; } @@ -152,9 +152,9 @@ void KIOExec::slotResult( KIO::Job * job ) if ( (job->error() != KIO::ERR_USER_CANCELED) ) KMessageBox::error( 0L, job->errorString() ); - QString path = static_cast(job)->destURL().path(); + TQString path = static_cast(job)->destURL().path(); - QValueList::Iterator it = fileList.begin(); + TQValueList::Iterator it = fileList.begin(); for(;it != fileList.end(); ++it) { if ((*it).path == path) @@ -174,7 +174,7 @@ void KIOExec::slotResult( KIO::Job * job ) kdDebug() << "All files downloaded, will call slotRunApp shortly" << endl; // We know we can run the app now - but let's finish the job properly first. - QTimer::singleShot( 0, this, SLOT( slotRunApp() ) ); + TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) ); jobList->clear(); } @@ -186,21 +186,21 @@ void KIOExec::slotRunApp() exit(1); } - KService service("dummy", command, QString::null); + KService service("dummy", command, TQString::null); KURL::List list; // Store modification times - QValueList::Iterator it = fileList.begin(); + TQValueList::Iterator it = fileList.begin(); for ( ; it != fileList.end() ; ++it ) { KDE_struct_stat buff; - (*it).time = KDE_stat( QFile::encodeName((*it).path), &buff ) ? 0 : buff.st_mtime; + (*it).time = KDE_stat( TQFile::encodeName((*it).path), &buff ) ? 0 : buff.st_mtime; KURL url; url.setPath((*it).path); list << url; } - QStringList params = KRun::processDesktopExec(service, list, false /*no shell*/); + TQStringList params = KRun::processDesktopExec(service, list, false /*no shell*/); kdDebug() << "EXEC " << KShell::joinArgs( params ) << endl; @@ -226,9 +226,9 @@ void KIOExec::slotRunApp() for( ;it != fileList.end(); ++it ) { KDE_struct_stat buff; - QString src = (*it).path; + TQString src = (*it).path; KURL dest = (*it).url; - if ( (KDE_stat( QFile::encodeName(src), &buff ) == 0) && + if ( (KDE_stat( TQFile::encodeName(src), &buff ) == 0) && ((*it).time != buff.st_mtime) ) { if ( tempfiles ) @@ -244,7 +244,7 @@ void KIOExec::slotRunApp() i18n( "The file\n%1\nhas been modified.\nDo you want to upload the changes?" ).arg(dest.prettyURL()), i18n( "File Changed" ), i18n("Upload"), i18n("Do Not Upload") ) == KMessageBox::Yes ) { - kdDebug() << QString("src='%1' dest='%2'").arg(src).arg(dest.url()).ascii() << endl; + kdDebug() << TQString("src='%1' dest='%2'").arg(src).arg(dest.url()).ascii() << endl; // Do it the synchronous way. if ( !KIO::NetAccess::upload( src, dest, 0 ) ) { @@ -261,7 +261,7 @@ void KIOExec::slotRunApp() kdDebug() << "sleeping..." << endl; sleep(180); // 3 mn kdDebug() << "about to delete " << src << endl; - unlink( QFile::encodeName(src) ); + unlink( TQFile::encodeName(src) ); } } diff --git a/kio/kioexec/main.h b/kio/kioexec/main.h index 8fb98130f..59f1cdac2 100644 --- a/kio/kioexec/main.h +++ b/kio/kioexec/main.h @@ -1,10 +1,10 @@ #ifndef _main_h #define _main_h -#include -#include -#include -#include +#include +#include +#include +#include namespace KIO { class Job; } @@ -20,16 +20,16 @@ public slots: protected: bool tempfiles; - QString suggestedFileName; + TQString suggestedFileName; int counter; int expectedCounter; - QString command; + TQString command; struct fileInfo { - QString path; + TQString path; KURL url; int time; }; - QValueList fileList; + TQValueList fileList; }; #endif -- cgit v1.2.1