clean up diff

9 files changed, 27 insertions, 226 deletions

diff --git a/.gitignore b/.gitignore
index c476f707b2..4aa36f454e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 .sconsign.branch
 .sconsign.dblite
 *.sqlite
+*.cfg
 cache
 lib/*/*.a
 lib/*/lib/*.a
diff --git a/res/schema.xml b/res/schema.xml
index 9044393390..13f3d0e321 100644
--- a/res/schema.xml
+++ b/res/schema.xml
@@ -384,5 +384,3 @@ METADATA
     </sql>
   </revision>
 </schema>
-
-
diff --git a/src/dlgpreferences.cpp b/src/dlgpreferences.cpp
index 09d33f7562..a84701673e 100755
--- a/src/dlgpreferences.cpp
+++ b/src/dlgpreferences.cpp
@@ -55,7 +55,7 @@
 DlgPreferences::DlgPreferences(MixxxApp * mixxx, SkinLoader* pSkinLoader,
                                SoundManager * soundman, PlayerManager* pPlayerManager,
                                ControllerManager * controllers, VinylControlManager *pVCManager,
-                               ConfigObject<ConfigValue> * pconfig, Library *pLibrary) 
+                               ConfigObject<ConfigValue> * pConfig, Library *pLibrary) 
         : m_pageSizeHint(QSize(0, 0)),
           m_preferencesUpdated(ConfigKey("[Preferences]", "updated")) {
     setupUi(this);
@@ -75,38 +75,38 @@ DlgPreferences::DlgPreferences(MixxxApp * mixxx, SkinLoader* pSkinLoader,
 #ifdef __VINYLCONTROL__
     // It's important for this to be before the connect for wsound.
     // TODO(rryan) determine why/if this is still true
-    m_wvinylcontrol = new DlgPrefVinyl(this, pVCManager, pconfig);
+    m_wvinylcontrol = new DlgPrefVinyl(this, pVCManager, pConfig);
     addPageWidget(m_wvinylcontrol);
 #else
-    m_wnovinylcontrol = new DlgPrefNoVinyl(this, soundman, pconfig);
+    m_wnovinylcontrol = new DlgPrefNoVinyl(this, soundman, pConfig);
     addPageWidget(m_wnovinylcontrol);
 #endif
-    m_wsound = new DlgPrefSound(this, soundman, pPlayerManager, pconfig);
+    m_wsound = new DlgPrefSound(this, soundman, pPlayerManager, pConfig);
     addPageWidget(m_wsound);
-    m_wplaylist = new DlgPrefPlaylist(this, pconfig, pLibrary);
+    m_wplaylist = new DlgPrefPlaylist(this, pConfig, pLibrary);
     addPageWidget(m_wplaylist);
-    m_wcontrols = new DlgPrefControls(this, mixxx, pSkinLoader, pPlayerManager, pconfig);
+    m_wcontrols = new DlgPrefControls(this, mixxx, pSkinLoader, pPlayerManager, pConfig);
     addPageWidget(m_wcontrols);
-    m_weq = new DlgPrefEQ(this, pconfig);
+    m_weq = new DlgPrefEQ(this, pConfig);
     addPageWidget(m_weq);
-    m_wcrossfader = new DlgPrefCrossfader(this, pconfig);
+    m_wcrossfader = new DlgPrefCrossfader(this, pConfig);
     addPageWidget(m_wcrossfader);
 
-    m_wbeats = new DlgPrefBeats(this, pconfig);
+    m_wbeats = new DlgPrefBeats(this, pConfig);
     addPageWidget (m_wbeats);
-    m_wreplaygain = new DlgPrefReplayGain(this, pconfig);
+    m_wreplaygain = new DlgPrefReplayGain(this, pConfig);
     addPageWidget(m_wreplaygain);
-    m_wrecord = new DlgPrefRecord(this, pconfig);
+    m_wrecord = new DlgPrefRecord(this, pConfig);
     addPageWidget(m_wrecord);
 #ifdef __SHOUTCAST__
-    m_wshoutcast = new DlgPrefShoutcast(this, pconfig);
+    m_wshoutcast = new DlgPrefShoutcast(this, pConfig);
     addPageWidget(m_wshoutcast);
 #endif
 #ifdef __MODPLUG__
-    m_wmodplug = new DlgPrefModplug(this, pconfig);
+    m_wmodplug = new DlgPrefModplug(this, pConfig);
     addPageWidget(m_wmodplug);
 #endif
-    m_wcontrollers = new DlgPrefControllers(this, pconfig, controllers,
+    m_wcontrollers = new DlgPrefControllers(this, pConfig, controllers,
                                             m_pControllerTreeItem);
     addPageWidget(m_wcontrollers);
 
diff --git a/src/dlgpreferences.h b/src/dlgpreferences.h
index 930a454f85..4dc7ed60b2 100644
--- a/src/dlgpreferences.h
+++ b/src/dlgpreferences.h
@@ -56,7 +56,7 @@ class DlgPreferences : public QDialog, public Ui::DlgPreferencesDlg {
   public:
     DlgPreferences(MixxxApp* mixxx, SkinLoader* pSkinLoader, SoundManager* soundman,
                    PlayerManager* pPlayerManager, ControllerManager* controllers,
-                   VinylControlManager* pVCManager, ConfigObject<ConfigValue>* config,
+                   VinylControlManager* pVCManager, ConfigObject<ConfigValue>* pConfig,
                    Library *pLibrary);
     virtual ~DlgPreferences();
 
diff --git a/src/dlgprefplaylist.cpp b/src/dlgprefplaylist.cpp
index d08c309aca..e963353417 100644
--- a/src/dlgprefplaylist.cpp
+++ b/src/dlgprefplaylist.cpp
@@ -29,10 +29,10 @@
 
 DlgPrefPlaylist::DlgPrefPlaylist(QWidget * parent, ConfigObject<ConfigValue> * config,
                                  Library *pLibrary)
-        : DlgPreferencePage(parent),
-                 m_dirListModel(),
-                 m_pconfig(config),
-                 m_pLibrary(pLibrary) {
+        :DlgPreferencePage(parent),
+        m_dirListModel(),
+        m_pconfig(config),
+        m_pLibrary(pLibrary) {
     setupUi(this);
     slotUpdate();
     checkbox_ID3_sync->setVisible(false);
diff --git a/src/library/browse/browsefeature.cpp b/src/library/browse/browsefeature.cpp
index b5ffeab5b1..1de6049a9d 100644
--- a/src/library/browse/browsefeature.cpp
+++ b/src/library/browse/browsefeature.cpp
@@ -11,7 +11,6 @@
 #include <QMenu>
 
 #include "trackinfoobject.h"
-#include "library/library_preferences.h"
 #include "library/treeitem.h"
 #include "library/browse/browsefeature.h"
 #include "library/trackcollection.h"
diff --git a/src/library/trackcollection.cpp b/src/library/trackcollection.cpp
index eb38fb47dc..bffe97a2b0 100644
--- a/src/library/trackcollection.cpp
+++ b/src/library/trackcollection.cpp
@@ -190,12 +190,12 @@ DirectoryDAO& TrackCollection::getDirectoryDAO() {
 }
 
 QSharedPointer<BaseTrackCache> TrackCollection::getTrackSource(
-                               const QString name) {
+        const QString name) {
     return m_trackSources.value(name, QSharedPointer<BaseTrackCache>());
 }
 
-void TrackCollection::addTrackSource(const QString name,
-                                     QSharedPointer<BaseTrackCache> trackSource) {
+void TrackCollection::addTrackSource(
+        const QString name, QSharedPointer<BaseTrackCache> trackSource) {
     Q_ASSERT(!m_trackSources.contains(name));
     m_trackSources[name] = trackSource;
 }
diff --git a/src/library/trackcollection.h b/src/library/trackcollection.h
index fe0c945251..e9908f7115 100644
--- a/src/library/trackcollection.h
+++ b/src/library/trackcollection.h
@@ -51,9 +51,8 @@ class TrackCollection : public QObject
     bool checkForTables();
 
     /** Import the files in a given diretory, without recursing into subdirectories */
-    bool importDirectory(const QString& directory, TrackDAO &trackDao,
-                         const QStringList & nameFilters,
-                         volatile bool* cancel);
+    bool importDirectory(const QString& directory, TrackDAO& trackDao,
+                         const QStringList& nameFilters, volatile bool* cancel);
 
     void resetLibaryCancellation();
     QSqlDatabase& getDatabase();
@@ -62,8 +61,8 @@ class TrackCollection : public QObject
     TrackDAO& getTrackDAO();
     PlaylistDAO& getPlaylistDAO();
     DirectoryDAO& getDirectoryDAO();
-    QSharedPointer<BaseTrackCache> getTrackSource(const QString name);
-    void addTrackSource(const QString name, QSharedPointer<BaseTrackCache> trackSource);
+    QSharedPointer<BaseTrackCache> getTrackSource(const QString& name);
+    void addTrackSource(const QString& name, QSharedPointer<BaseTrackCache> trackSource);
     void cancelLibraryScan();
 
     ConfigObject<ConfigValue>* getConfig() {
diff --git a/src/test/test_data/test.cfg b/src/test/test_data/test.cfg
deleted file mode 100644
index 08de3fa73b..0000000000
--- a/src/test/test_data/test.cfg
+++ /dev/null
@@ -1,196 +0,0 @@
-
-[Config]
-Version 1.12.0-alpha-pre
-Locale 
-
-[Controls]
-Tooltips 
-
-[Config]
-Path res/
-
-[Keyboard]
-Enabled 1
-
-[Recording]
-FileSize 
-
-[Library]
-WriteAudioTags 0
-
-[Channel1]
-vinylcontrol_speed_type 
-
-[Controls]
-RateRamp 
-RateRampSensitivity 100
-
-[Channel2]
-vinylcontrol_speed_type 
-
-[Sampler1]
-vinylcontrol_speed_type 
-
-[Sampler2]
-vinylcontrol_speed_type 
-
-[Sampler3]
-vinylcontrol_speed_type 
-
-[Sampler4]
-vinylcontrol_speed_type 
-
-[PreviewDeck1]
-vinylcontrol_speed_type 
-
-[VinylControl]
-mode 
-cueing_ch1 0
-cueing_ch2 0
-
-[Browse]
-QuickLinks 
-
-[Playlist]
-directory /home/test
-
-[Library]
-ShowRhythmboxLibrary 
-ShowITunesLibrary 
-
-[BPM]
-BPMRangeStart 70
-BPMRangeEnd 140
-AnalyzeEntireSong 1
-
-[Waveform]
-FrameRate 30
-DefaultZoom 3
-ZoomSynchronization 0
-WaveformType 6
-VisualGain_0 1.5
-VisualGain_1 1
-VisualGain_2 1
-VisualGain_3 1
-OverviewNormalized 0
-
-[Promo]
-StatTracking 
-
-[Library]
-RescanOnStartup 
-UseRelativePathOnExport 
-ShowTraktorLibrary 
-
-[Controls]
-PositionDisplay 0
-RateDir 0
-RateRange 2
-RateTempLeft 4.0
-RateTempRight 2.000000
-RatePermLeft 0.50
-RatePermRight 0.05
-AllowTrackLoadToPlayingDeck 
-CueDefault 0
-CueRecall 
-
-[Auto DJ]
-Requeue 
-MinimumAvailable 
-UseIgnoreTime 
-IgnoreTime 
-
-[Config]
-Skin 
-
-[Waveform]
-WaveformOverviewType 
-
-[Mixer Profile]
-HiEQFrequency 2484
-HiEQFrequencyPrecise 2484.999990
-LoEQFrequency 246
-LoEQFrequencyPrecise 246.469196
-LoFiEQs yes
-xFaderCurve 1
-xFaderMode 0
-xFaderReverse 0
-
-[Vamp]
-AnalyserBeatPluginID qm-tempotracker:0
-AnalyserBeatLibrary libmixxxminimal
-
-[BPM]
-BPMDetectionEnabled 1
-BeatDetectionFixedTempoAssumption 1
-FixedTempoOffsetCorrection 1
-ReanalyzeWhenSettingsChange 0
-FastAnalysisEnabled 0
-
-[ReplayGain]
-ReplayGainEnabled 1
-ReplayGainAnalyserEnabled 1
-InitialReplayGainBoost 6
-
-[Recording]
-Directory /home/Recordings
-Encoding WAV
-Title 
-Author 
-Album 
-CueEnabled 
-
-[Shoutcast]
-enabled 0
-servertype Icecast2
-mountpoint 
-host 
-port 8000
-login 
-password 
-stream_name 
-stream_website http://www.mixxx.org
-stream_desc 
-stream_genre Live Mix
-stream_public 0
-ogg_dynamicupdate 0
-bitrate 128
-format MP3
-channels 2
-metadata_charset 
-enable_metadata 0
-custom_artist 
-custom_title 
-
-[Samplers]
-show_samplers 0
-
-[PreviewDeck]
-show_previewdeck 0
-
-[Library]
-VScrollBarPos 0
-
-[Auto DJ]
-Transition 10
-
-[Vinylcontrol]
-show_vinylcontrol 0
-
-[Microphone]
-show_microphone 0
-
-[Spinny1]
-show_spinny 0
-
-[Spinny2]
-show_spinny 0
-
-[Library]
-SupportedFileExtensions mp3,ogg,aiff,aif,wav,flac
-
-[Channel1]
-vinylcontrol_enabled 0
-
-[Channel2]
-vinylcontrol_enabled 0