← Back to branch summary

~ubuntu-branches/ubuntu/lucid/amarok/lucid-backports

« back to all changes in this revision

Viewing changes to src/databaseimporter/amarok14/FastForwardImporter.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2011-03-03 10:27:39 UTC
  • mfrom: (114.1.20 natty)
  • Revision ID: james.westby@ubuntu.com-20110303102739-ar67wpa6mllo59n2
Tags: 2:2.4.0-0ubuntu4~lucid1
https://launchpad.net/bugs/728447
* Source backport to lucid (LP: #728447)
  - Drop version requirement on libindicate-qt-dev build-dep

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/databaseimporter/amarok14/FastForwardImporter.cpp
17
17
#include "FastForwardImporter.h"
18
18
#include "FastForwardImporterConfig.h"
19
19
#include "FastForwardWorker.h"
20
 
#include "CollectionManager.h"
21
 
#include "Debug.h"
 
20
#include "core-impl/collections/support/CollectionManager.h"
 
21
#include "core/support/Debug.h"
22
22
 
 
23
#include <KLocale>
23
24
 
24
25
FastForwardImporter::FastForwardImporter( QObject *parent )
25
26
    : DatabaseImporter( parent )
78
79
    m_worker->setImportArtwork( m_config->importArtwork() );
79
80
    m_worker->setImportArtworkDir( m_config->importArtworkDir() );
80
81
 
81
 
    connect( m_worker, SIGNAL( trackAdded( Meta::TrackPtr ) ), 
 
82
    connect( m_worker, SIGNAL( trackAdded( Meta::TrackPtr ) ),
82
83
             this, SIGNAL( trackAdded( Meta::TrackPtr ) ), Qt::QueuedConnection );
83
84
    connect( m_worker, SIGNAL( trackDiscarded( QString ) ),
84
85
             this, SIGNAL( trackDiscarded( QString ) ), Qt::QueuedConnection );
88
89
             this, SIGNAL( trackMatchMultiple( Meta::TrackList, QString ) ), Qt::QueuedConnection );
89
90
    connect( m_worker, SIGNAL( importError( QString ) ),
90
91
             this, SIGNAL( importError( QString ) ), Qt::QueuedConnection );
91
 
    connect( m_worker, SIGNAL( done(ThreadWeaver::Job*) ), 
 
92
    connect( m_worker, SIGNAL( done( ThreadWeaver::Job* ) ),
92
93
             this, SLOT( finishUp() ), Qt::QueuedConnection );
93
94
    connect( m_worker, SIGNAL( showMessage( QString ) ),
94
95
             this, SIGNAL( showMessage( QString ) ), Qt::QueuedConnection );
103
104
    m_worker->failed() ?
104
105
        emit( importFailed() ) :
105
106
        emit( importSucceeded() );
106
 
    
 
107
 
107
108
    delete m_worker;
108
109
}
109
110