3 files changed, 7 insertions, 8 deletions
diff --git a/src/library/export/trackexportdlg.cpp b/src/library/export/trackexportdlg.cpp
index c02b30daee..66d52774c1 100644
--- a/src/library/export/trackexportdlg.cpp
+++ b/src/library/export/trackexportdlg.cpp
@@ -7,7 +7,7 @@
 #include "util/assert.h"
 
 TrackExportDlg::TrackExportDlg(QWidget *parent,
-                               ConfigObject<ConfigValue>* pConfig,
+                               UserSettingsPointer pConfig,
                                TrackExportWorker* worker)
         : QDialog(parent),
           Ui::DlgTrackExport(),
@@ -110,4 +110,3 @@ void TrackExportDlg::finish() {
     }
     accept();
 }
-
diff --git a/src/library/export/trackexportdlg.h b/src/library/export/trackexportdlg.h
index 57f916ea26..91cd790855 100644
--- a/src/library/export/trackexportdlg.h
+++ b/src/library/export/trackexportdlg.h
@@ -8,7 +8,7 @@
 #include <QScopedPointer>
 #include <QTime>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "library/export/trackexportworker.h"
 #include "library/export/ui_dlgtrackexport.h"
 #include "trackinfoobject.h"
@@ -26,7 +26,7 @@ class TrackExportDlg : public QDialog, public Ui::DlgTrackExport {
 
     // The dialog is prepared, but not shown on construction.  Does not
     // take ownership of the export worker.
-    TrackExportDlg(QWidget *parent, ConfigObject<ConfigValue>* pConfig,
+    TrackExportDlg(QWidget *parent, UserSettingsPointer pConfig,
                    TrackExportWorker* worker);
     virtual ~TrackExportDlg() { }
 
@@ -48,7 +48,7 @@ class TrackExportDlg : public QDialog, public Ui::DlgTrackExport {
     // Makes sure the exporter thread has exited.
     void finish();
 
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     QList<TrackPointer> m_tracks;
     TrackExportWorker* m_worker;
 };
diff --git a/src/library/export/trackexportwizard.h b/src/library/export/trackexportwizard.h
index f5dc774935..f1cd2217ba 100644
--- a/src/library/export/trackexportwizard.h
+++ b/src/library/export/trackexportwizard.h
@@ -13,7 +13,7 @@
 #include <QString>
 #include <QScopedPointer>
 
-#include "configobject.h"
+#include "preferences/usersettings.h"
 #include "library/export/trackexportdlg.h"
 #include "library/export/trackexportworker.h"
 #include "trackinfoobject.h"
@@ -22,7 +22,7 @@
 class TrackExportWizard : public QObject {
   Q_OBJECT
   public:
-    TrackExportWizard(QWidget *parent, ConfigObject<ConfigValue>* pConfig,
+    TrackExportWizard(QWidget *parent, UserSettingsPointer pConfig,
                       QList<TrackPointer> tracks)
             : m_parent(parent), m_pConfig(pConfig), m_tracks(tracks) { }
     virtual ~TrackExportWizard() { }
@@ -35,7 +35,7 @@ class TrackExportWizard : public QObject {
     bool selectDestinationDirectory();
 
     QWidget* m_parent;
-    ConfigObject<ConfigValue>* m_pConfig;
+    UserSettingsPointer m_pConfig;
     QList<TrackPointer> m_tracks;
     QScopedPointer<TrackExportDlg> m_dialog;
     QScopedPointer<TrackExportWorker> m_worker;