|
|
|
@ -278,7 +278,7 @@ KCleanup::itemDir( const KFileInfo *item ) const
|
|
|
|
|
|
|
|
|
|
if ( ! item->isDir() && ! item->isDotEntry() )
|
|
|
|
|
{
|
|
|
|
|
dir.tqreplace ( TQRegExp ( "/[^/]*$" ), "" );
|
|
|
|
|
dir.replace ( TQRegExp ( "/[^/]*$" ), "" );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dir;
|
|
|
|
@ -299,7 +299,7 @@ KCleanup::cleanTitle() const
|
|
|
|
|
|
|
|
|
|
// Get rid of any "&" characters in the text that denote keyboard
|
|
|
|
|
// shortcuts in menus.
|
|
|
|
|
title.tqreplace( TQRegExp( "&" ), "" );
|
|
|
|
|
title.replace( TQRegExp( "&" ), "" );
|
|
|
|
|
|
|
|
|
|
return title;
|
|
|
|
|
}
|
|
|
|
@ -311,15 +311,15 @@ KCleanup::expandVariables( const KFileInfo * item,
|
|
|
|
|
{
|
|
|
|
|
TQString expanded = unexpanded;
|
|
|
|
|
|
|
|
|
|
expanded.tqreplace( TQRegExp( "%p" ),
|
|
|
|
|
expanded.replace( TQRegExp( "%p" ),
|
|
|
|
|
"\"" + TQString::fromLocal8Bit( item->url() ) + "\"" );
|
|
|
|
|
expanded.tqreplace( TQRegExp( "%n" ),
|
|
|
|
|
expanded.replace( TQRegExp( "%n" ),
|
|
|
|
|
"\"" + TQString::fromLocal8Bit( item->name() ) + "\"" );
|
|
|
|
|
|
|
|
|
|
if ( KDE::versionMajor() >= 3 && KDE::versionMinor() >= 4 )
|
|
|
|
|
expanded.tqreplace( TQRegExp( "%t" ), "trash:/" );
|
|
|
|
|
expanded.replace( TQRegExp( "%t" ), "trash:/" );
|
|
|
|
|
else
|
|
|
|
|
expanded.tqreplace( TQRegExp( "%t" ), KGlobalSettings::trashPath() );
|
|
|
|
|
expanded.replace( TQRegExp( "%t" ), KGlobalSettings::trashPath() );
|
|
|
|
|
|
|
|
|
|
return expanded;
|
|
|
|
|
}
|
|
|
|
|