|
|
@ -319,7 +319,7 @@ KCleanup::expandVariables( const KFileInfo * item,
|
|
|
|
if ( KDE::versionMajor() >= 3 && KDE::versionMinor() >= 4 )
|
|
|
|
if ( KDE::versionMajor() >= 3 && KDE::versionMinor() >= 4 )
|
|
|
|
expanded.replace( TQRegExp( "%t" ), "trash:/" );
|
|
|
|
expanded.replace( TQRegExp( "%t" ), "trash:/" );
|
|
|
|
else
|
|
|
|
else
|
|
|
|
expanded.replace( TQRegExp( "%t" ), KGlobalSettings::trashPath() );
|
|
|
|
expanded.replace( TQRegExp( "%t" ), TDEGlobalSettings::trashPath() );
|
|
|
|
|
|
|
|
|
|
|
|
return expanded;
|
|
|
|
return expanded;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -329,7 +329,7 @@ void
|
|
|
|
KCleanup::runCommand ( const KFileInfo * item,
|
|
|
|
KCleanup::runCommand ( const KFileInfo * item,
|
|
|
|
const TQString & command ) const
|
|
|
|
const TQString & command ) const
|
|
|
|
{
|
|
|
|
{
|
|
|
|
KProcess proc;
|
|
|
|
TDEProcess proc;
|
|
|
|
KDirSaver dir( itemDir( item ) );
|
|
|
|
KDirSaver dir( itemDir( item ) );
|
|
|
|
TQString cmd( expandVariables( item, command ));
|
|
|
|
TQString cmd( expandVariables( item, command ));
|
|
|
|
|
|
|
|
|
|
|
@ -356,7 +356,7 @@ KCleanup::runCommand ( const KFileInfo * item,
|
|
|
|
// finish, so we are starting the command as a pure
|
|
|
|
// finish, so we are starting the command as a pure
|
|
|
|
// background process.
|
|
|
|
// background process.
|
|
|
|
|
|
|
|
|
|
|
|
proc.start( KProcess::DontCare );
|
|
|
|
proc.start( TDEProcess::DontCare );
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -369,7 +369,7 @@ KCleanup::runCommand ( const KFileInfo * item,
|
|
|
|
// process in blocking mode.
|
|
|
|
// process in blocking mode.
|
|
|
|
|
|
|
|
|
|
|
|
TQApplication::setOverrideCursor( waitCursor );
|
|
|
|
TQApplication::setOverrideCursor( waitCursor );
|
|
|
|
proc.start( KProcess::Block );
|
|
|
|
proc.start( TDEProcess::Block );
|
|
|
|
TQApplication::restoreOverrideCursor();
|
|
|
|
TQApplication::restoreOverrideCursor();
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|