diff options
author | Owen Williams <owilliams@mixxx.org> | 2016-01-20 10:51:56 -0500 |
---|---|---|
committer | Owen Williams <owilliams@mixxx.org> | 2016-01-20 10:51:56 -0500 |
commit | f385207da598859a1ea1aff6efe1d9e05d1ac607 (patch) | |
tree | df6a1b84e6d4d6d522820154f21c36c6a187a77c | |
parent | fba211368ff93133dce0e2c6252615225f3c8ae6 (diff) |
TrackExport: format
-rw-r--r-- | src/library/export/trackexportdlg.cpp | 3 | ||||
-rw-r--r-- | src/library/export/trackexportwizard.h | 6 | ||||
-rw-r--r-- | src/library/export/trackexportworker.cpp | 4 | ||||
-rw-r--r-- | src/library/export/trackexportworker.h | 5 |
4 files changed, 8 insertions, 10 deletions
diff --git a/src/library/export/trackexportdlg.cpp b/src/library/export/trackexportdlg.cpp index 68b883b69e..c02b30daee 100644 --- a/src/library/export/trackexportdlg.cpp +++ b/src/library/export/trackexportdlg.cpp @@ -27,8 +27,7 @@ TrackExportDlg::TrackExportDlg(QWidget *parent, SIGNAL(askOverwriteMode(QString, std::promise<TrackExportWorker::OverwriteAnswer>*)), this, SLOT(slotAskOverwriteMode(QString, std::promise<TrackExportWorker::OverwriteAnswer>*))); - connect(m_worker, SIGNAL(canceled()), this, - SLOT(cancelButtonClicked())); + connect(m_worker, SIGNAL(canceled()), this, SLOT(cancelButtonClicked())); } void TrackExportDlg::showEvent(QShowEvent* event) { diff --git a/src/library/export/trackexportwizard.h b/src/library/export/trackexportwizard.h index 30c0ef4b20..f5dc774935 100644 --- a/src/library/export/trackexportwizard.h +++ b/src/library/export/trackexportwizard.h @@ -23,10 +23,8 @@ class TrackExportWizard : public QObject { Q_OBJECT public: TrackExportWizard(QWidget *parent, ConfigObject<ConfigValue>* pConfig, - QList<TrackPointer> tracks) - : m_parent(parent), - m_pConfig(pConfig), - m_tracks(tracks) { } + QList<TrackPointer> tracks) + : m_parent(parent), m_pConfig(pConfig), m_tracks(tracks) { } virtual ~TrackExportWizard() { } // Displays a dialog requesting destination directory, then performs diff --git a/src/library/export/trackexportworker.cpp b/src/library/export/trackexportworker.cpp index 312bd9316a..7a1947bcef 100644 --- a/src/library/export/trackexportworker.cpp +++ b/src/library/export/trackexportworker.cpp @@ -23,8 +23,8 @@ void TrackExportWorker::run() { void TrackExportWorker::exportTrack(TrackPointer track) { QString sourceFilename = track->getLocation(); auto source_fileinfo = track->getFileInfo(); - const QString dest_filename = - QDir(m_destDir).filePath(source_fileinfo.fileName()); + const QString dest_filename = QDir(m_destDir).filePath( + source_fileinfo.fileName()); QFileInfo dest_fileinfo(dest_filename); if (dest_fileinfo.exists()) { diff --git a/src/library/export/trackexportworker.h b/src/library/export/trackexportworker.h index 1a7250bc11..7733a21285 100644 --- a/src/library/export/trackexportworker.h +++ b/src/library/export/trackexportworker.h @@ -56,8 +56,9 @@ class TrackExportWorker : public QThread { // is not quite what we want here, so we use the STL's future class. // Note that fully qualifying the Answer class name is required for the // signal to connect. - void askOverwriteMode(QString filename, - std::promise<TrackExportWorker::OverwriteAnswer>* promise); + void askOverwriteMode( + QString filename, + std::promise<TrackExportWorker::OverwriteAnswer>* promise); void progress(QString filename, int progress, int count); void canceled(); |