← Back to branch summary

~ubuntu-branches/debian/sid/kde-baseapps/sid

« back to all changes in this revision

Viewing changes to lib/konq/konq_operations.cpp

  • Committer: Package Import Robot
  • Author(s): Modestas Vainius, Eshat Cakar, Pino Toscano
  • Date: 2012-06-09 22:18:08 UTC
  • mfrom: (4.2.1) (6.1.1 experimental)
  • Revision ID: package-import@ubuntu.com-20120609221808-h1l0ekd5qmb8nefr
Tags: 4:4.8.4-1
* New upstream release.

[ Eshat Cakar ]
* Add watch file.
* Bump kde-sc-dev-latest build dependency to version 4:4.8.4.
* Update installed files.

[ Pino Toscano ]
* Move files of the konqueror documentation from kde-baseapps-data to
  konqueror itself.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/konq/konq_operations.cpp
225
225
            return;
226
226
        }
227
227
        job->ui()->setWindow(parentWidget());
228
 
        connect( job, SIGNAL( result( KJob * ) ),
229
 
                 SLOT( slotResult( KJob * ) ) );
 
228
        connect( job, SIGNAL(result(KJob*)),
 
229
                 SLOT(slotResult(KJob*)) );
230
230
    } else {
231
231
        delete this; // this one is ok, _del is always called directly
232
232
    }
238
238
    KonqMultiRestoreJob* job = new KonqMultiRestoreJob( urls );
239
239
    job->ui()->setWindow(parentWidget());
240
240
    KIO::getJobTracker()->registerJob(job);
241
 
    connect( job, SIGNAL( result( KJob * ) ),
242
 
             SLOT( slotResult( KJob * ) ) );
 
241
    connect( job, SIGNAL(result(KJob*)),
 
242
             SLOT(slotResult(KJob*)) );
243
243
}
244
244
 
245
245
bool KonqOperations::askDeleteConfirmation( const KUrl::List & selectedUrls, int method, ConfirmationType confirmation, QWidget* widget )
317
317
            // We have it already, we could just call asyncDrop.
318
318
            // But popping up a menu in the middle of a DND operation confuses and crashes Qt (#157630)
319
319
            // So let's delay it.
 
320
            qRegisterMetaType<KFileItem>("KFileItem");
320
321
            QMetaObject::invokeMethod(op, "asyncDrop", Qt::QueuedConnection, Q_ARG(KFileItem, destItem));
321
322
        }
322
323
        else
323
324
        {
324
325
            // we need to stat to get it.
325
 
            op->_statUrl( dest, op, SLOT( asyncDrop( const KFileItem & ) ) );
 
326
            op->_statUrl( dest, op, SLOT(asyncDrop(KFileItem)) );
326
327
        }
327
328
        // In both cases asyncDrop will delete op when done
328
329
 
397
398
                    const bool ro = desktopGroup.readEntry( "ReadOnly", false );
398
399
                    const QByteArray fstype = desktopGroup.readEntry( "FSType" ).toLatin1();
399
400
                    KAutoMount* am = new KAutoMount( ro, fstype, dev, point, m_destUrl.path(), false );
400
 
                    connect( am, SIGNAL( finished() ), this, SLOT( doDropFileCopy() ) );
 
401
                    connect( am, SIGNAL(finished()), this, SLOT(doDropFileCopy()) );
401
402
                }
402
403
#endif
403
404
                return;
745
746
    if ( job )
746
747
    {
747
748
        job->ui()->setWindow(parentWidget());
748
 
        connect( job, SIGNAL( result( KJob * ) ),
749
 
                 SLOT( slotResult( KJob * ) ) );
 
749
        connect( job, SIGNAL(result(KJob*)),
 
750
                 SLOT(slotResult(KJob*)) );
750
751
#if 0
751
752
        KIO::CopyJob *copyJob = dynamic_cast<KIO::CopyJob*>(job);
752
753
        KonqIconViewWidget *iconView = dynamic_cast<KonqIconViewWidget*>(parent());
753
754
        if (copyJob && iconView)
754
755
        {
755
 
            connect(copyJob, SIGNAL(aboutToCreate(KIO::Job *,const QList<KIO::CopyInfo> &)),
756
 
                 this, SLOT(slotAboutToCreate(KIO::Job *,const QList<KIO::CopyInfo> &)));
 
756
            connect(copyJob, SIGNAL(aboutToCreate(KIO::Job*,QList<KIO::CopyInfo>)),
 
757
                 this, SLOT(slotAboutToCreate(KIO::Job*,QList<KIO::CopyInfo>)));
757
758
            // TODO move this connect into the iconview!
758
 
            connect(this, SIGNAL(aboutToCreate(const QPoint &, const QList<KIO::CopyInfo> &)),
759
 
                 iconView, SLOT(slotAboutToCreate(const QPoint &, const QList<KIO::CopyInfo> &)));
 
759
            connect(this, SIGNAL(aboutToCreate(QPoint,QList<KIO::CopyInfo>)),
 
760
                 iconView, SLOT(slotAboutToCreate(QPoint,QList<KIO::CopyInfo>)));
760
761
        }
761
762
#endif
762
763
    }
778
779
 
779
780
void KonqOperations::_statUrl( const KUrl & url, const QObject *receiver, const char *member )
780
781
{
781
 
    connect( this, SIGNAL( statFinished( const KFileItem & ) ), receiver, member );
 
782
    connect( this, SIGNAL(statFinished(KFileItem)), receiver, member );
782
783
    KIO::StatJob * job = KIO::stat( url /*, KIO::HideProgressInfo?*/ );
783
784
    job->ui()->setWindow(parentWidget());
784
 
    connect( job, SIGNAL( result( KJob * ) ),
785
 
             SLOT( slotStatResult( KJob * ) ) );
 
785
    connect( job, SIGNAL(result(KJob*)),
 
786
             SLOT(slotStatResult(KJob*)) );
786
787
}
787
788
 
788
789
void KonqOperations::slotStatResult( KJob * job )