← Back to branch summary

~ubuntu-branches/ubuntu/trusty/krusader/trusty

« back to all changes in this revision

Viewing changes to krusader/VFS/virt_vfs.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2009-04-04 13:47:12 UTC
  • mfrom: (1.2.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20090404134712-cjyw31gz2mxtyd3p
Tags: 2.0~svn6249-0ubuntu1
* New svn snapshot to commit 6249
  - Additional bug fixes
  - Fixes to build with Qt 4.5
* Update debian/copyright to use © instead of (c) throughouht

Show diffs side-by-side

added added

removed removed

Lines of Context:
krusader/VFS/virt_vfs.cpp
106
106
        vfs_refresh();
107
107
}
108
108
 
109
 
void virt_vfs::vfs_delFiles( QStringList *fileNames ) {
 
109
void virt_vfs::vfs_delFiles( QStringList *fileNames, bool reallyDelete ) {
110
110
        if ( path == "/" ) {
111
111
                for ( int i = 0 ; i < fileNames->count(); ++i ) {
112
112
                        QString filename = ( *fileNames ) [ i ];
130
130
 
131
131
        // delete of move to trash ?
132
132
        KConfigGroup group( krConfig, "General" );
133
 
        if ( group.readEntry( "Move To Trash", _MoveToTrash ) ) {
 
133
        if ( !reallyDelete && group.readEntry( "Move To Trash", _MoveToTrash ) ) {
134
134
                job = KIO::trash( filesUrls );
135
135
                connect( job, SIGNAL( result( KJob* ) ), krApp, SLOT( changeTrashIcon() ) );
136
136
        } else