From fdb88d4738df0b33fd0e104d35512934319f14bd Mon Sep 17 00:00:00 2001
From: Matthew Scheirer <matt.scheirer@gmail.com>
Date: Sun, 28 Sep 2014 19:34:28 -0400
Subject: [PATCH] Fixed formatting for merge.

---
 src/transcoder/transcodedialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/transcoder/transcodedialog.cpp b/src/transcoder/transcodedialog.cpp
index ac1ac1171..172d27a7b 100644
--- a/src/transcoder/transcodedialog.cpp
+++ b/src/transcoder/transcodedialog.cpp
@@ -234,7 +234,7 @@ void TranscodeDialog::Import() {
       this, tr("Open a directory to import music from"),
       last_import_dir_, QFileDialog::ShowDirsOnly);
   
-  if(path.isEmpty()) return;
+  if (path.isEmpty()) return;
   
   QStringList filenames;
   QStringList audioTypes = QString(FileView::kFileFilter).split(" ", 
@@ -242,7 +242,7 @@ void TranscodeDialog::Import() {
   QDirIterator files(path, audioTypes, QDir::Files | QDir::Readable, 
       QDirIterator::Subdirectories);
   
-  while(files.hasNext()) {
+  while (files.hasNext()) {
     filenames << files.next();
   }