diff options
Diffstat (limited to 'src/library')
48 files changed, 91 insertions, 92 deletions
diff --git a/src/library/analysisfeature.cpp b/src/library/analysisfeature.cpp index f1bffb7ce3..88429d3165 100644 --- a/src/library/analysisfeature.cpp +++ b/src/library/analysisfeature.cpp @@ -18,7 +18,7 @@ const QString AnalysisFeature::m_sAnalysisViewName = QString("Analysis"); AnalysisFeature::AnalysisFeature(QObject* parent, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, TrackCollection* pTrackCollection) : LibraryFeature(parent), m_pConfig(pConfig), diff --git a/src/library/analysisfeature.h b/src/library/analysisfeature.h index ac5e75b7c2..fa8974bd8f 100644 --- a/src/library/analysisfeature.h +++ b/src/library/analysisfeature.h @@ -13,7 +13,7 @@ #include <QList> #include "library/libraryfeature.h" -#include "configobject.h" +#include "preferences/usersettings.h" #include "treeitemmodel.h" #include "library/dlganalysis.h" @@ -24,7 +24,7 @@ class AnalysisFeature : public LibraryFeature { Q_OBJECT public: AnalysisFeature(QObject* parent, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, TrackCollection* pTrackCollection); virtual ~AnalysisFeature(); @@ -62,7 +62,7 @@ class AnalysisFeature : public LibraryFeature { // tracks in the job void setTitleProgress(int trackNum, int totalNum); - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; TrackCollection* m_pTrackCollection; AnalyzerQueue* m_pAnalyzerQueue; // Used to temporarily enable BPM detection in the prefs before we analyse diff --git a/src/library/autodj/autodjfeature.cpp b/src/library/autodj/autodjfeature.cpp index 93f278e1b4..a77f1feed1 100644 --- a/src/library/autodj/autodjfeature.cpp +++ b/src/library/autodj/autodjfeature.cpp @@ -26,7 +26,7 @@ const QString AutoDJFeature::m_sAutoDJViewName = QString("Auto DJ"); static const int kMaxRetrieveAttempts = 3; AutoDJFeature::AutoDJFeature(Library* pLibrary, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, PlayerManagerInterface* pPlayerManager, TrackCollection* pTrackCollection) : LibraryFeature(pLibrary), diff --git a/src/library/autodj/autodjfeature.h b/src/library/autodj/autodjfeature.h index 48d4d0a6e6..5b3c137cf8 100644 --- a/src/library/autodj/autodjfeature.h +++ b/src/library/autodj/autodjfeature.h @@ -17,7 +17,7 @@ #include <QSignalMapper> #include "library/libraryfeature.h" -#include "configobject.h" +#include "preferences/usersettings.h" #include "library/treeitemmodel.h" #ifdef __AUTODJCRATES__ @@ -34,7 +34,7 @@ class AutoDJFeature : public LibraryFeature { Q_OBJECT public: AutoDJFeature(Library* pLibrary, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, PlayerManagerInterface* pPlayerManager, TrackCollection* pTrackCollection); virtual ~AutoDJFeature(); @@ -59,7 +59,7 @@ class AutoDJFeature : public LibraryFeature { #endif // __AUTODJCRATES__ private: - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; Library* m_pLibrary; TrackCollection* m_pTrackCollection; CrateDAO& m_crateDao; diff --git a/src/library/autodj/autodjprocessor.cpp b/src/library/autodj/autodjprocessor.cpp index f9db164af0..5a435e2296 100644 --- a/src/library/autodj/autodjprocessor.cpp +++ b/src/library/autodj/autodjprocessor.cpp @@ -63,7 +63,7 @@ TrackPointer DeckAttributes::getLoadedTrack() const { } AutoDJProcessor::AutoDJProcessor(QObject* pParent, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, PlayerManagerInterface* pPlayerManager, int iAutoDJPlaylistId, TrackCollection* pTrackCollection) diff --git a/src/library/autodj/autodjprocessor.h b/src/library/autodj/autodjprocessor.h index a7c4b72bac..f4eac0d456 100644 --- a/src/library/autodj/autodjprocessor.h +++ b/src/library/autodj/autodjprocessor.h @@ -5,7 +5,7 @@ #include <QString> #include <QModelIndexList> -#include "configobject.h" +#include "preferences/usersettings.h" #include "controlobjectslave.h" #include "engine/enginechannel.h" #include "library/playlisttablemodel.h" @@ -113,7 +113,7 @@ class AutoDJProcessor : public QObject { }; AutoDJProcessor(QObject* pParent, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, PlayerManagerInterface* pPlayerManager, int iAutoDJPlaylistId, TrackCollection* pCollection); @@ -190,7 +190,7 @@ class AutoDJProcessor : public QObject { // present. bool removeTrackFromTopOfQueue(TrackPointer pTrack); - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; PlayerManagerInterface* m_pPlayerManager; PlaylistTableModel* m_pAutoDJTableModel; diff --git a/src/library/autodj/dlgautodj.cpp b/src/library/autodj/dlgautodj.cpp index 156341d509..939f71088b 100644 --- a/src/library/autodj/dlgautodj.cpp +++ b/src/library/autodj/dlgautodj.cpp @@ -8,7 +8,7 @@ #include "util/time.h" DlgAutoDJ::DlgAutoDJ(QWidget* parent, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, Library* pLibrary, AutoDJProcessor* pProcessor, TrackCollection* pTrackCollection, diff --git a/src/library/autodj/dlgautodj.h b/src/library/autodj/dlgautodj.h index 3031ad673d..ec3c046b21 100644 --- a/src/library/autodj/dlgautodj.h +++ b/src/library/autodj/dlgautodj.h @@ -5,7 +5,7 @@ #include <QString> #include "library/autodj/ui_dlgautodj.h" -#include "configobject.h" +#include "preferences/usersettings.h" #include "trackinfoobject.h" #include "library/libraryview.h" #include "library/library.h" @@ -19,7 +19,7 @@ class WTrackTableView; class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView { Q_OBJECT public: - DlgAutoDJ(QWidget* parent, ConfigObject<ConfigValue>* pConfig, + DlgAutoDJ(QWidget* parent, UserSettingsPointer pConfig, Library* pLibrary, AutoDJProcessor* pProcessor, TrackCollection* pTrackCollection, MixxxKeyboard* pKeyboard); diff --git a/src/library/banshee/bansheefeature.cpp b/src/library/banshee/bansheefeature.cpp index a4790052d3..ca2873e745 100644 --- a/src/library/banshee/bansheefeature.cpp +++ b/src/library/banshee/bansheefeature.cpp @@ -13,7 +13,7 @@ const QString BansheeFeature::BANSHEE_MOUNT_KEY = "mixxx.BansheeFeature.mount"; QString BansheeFeature::m_databaseFile; -BansheeFeature::BansheeFeature(QObject* parent, TrackCollection* pTrackCollection, ConfigObject<ConfigValue>* pConfig) +BansheeFeature::BansheeFeature(QObject* parent, TrackCollection* pTrackCollection, UserSettingsPointer pConfig) : BaseExternalLibraryFeature(parent, pTrackCollection), m_pTrackCollection(pTrackCollection), m_cancelImport(false) { @@ -42,7 +42,7 @@ bool BansheeFeature::isSupported() { } // static -void BansheeFeature::prepareDbPath(ConfigObject<ConfigValue>* pConfig) { +void BansheeFeature::prepareDbPath(UserSettingsPointer pConfig) { m_databaseFile = pConfig->getValueString(ConfigKey("[Banshee]","Database")); if (!QFile::exists(m_databaseFile)) { // Fall back to default diff --git a/src/library/banshee/bansheefeature.h b/src/library/banshee/bansheefeature.h index 2f33d1d323..5668358962 100644 --- a/src/library/banshee/bansheefeature.h +++ b/src/library/banshee/bansheefeature.h @@ -20,10 +20,10 @@ class BansheePlaylistModel; class BansheeFeature : public BaseExternalLibraryFeature { Q_OBJECT public: - BansheeFeature(QObject* parent, TrackCollection* pTrackCollection, ConfigObject<ConfigValue>* pConfig); + BansheeFeature(QObject* parent, TrackCollection* pTrackCollection, UserSettingsPointer pConfig); virtual ~BansheeFeature(); static bool isSupported(); - static void prepareDbPath(ConfigObject<ConfigValue>* pConfig); + static void prepareDbPath(UserSettingsPointer pConfig); virtual QVariant title(); virtual QIcon getIcon(); diff --git a/src/library/baseplaylistfeature.cpp b/src/library/baseplaylistfeature.cpp index 92e329626f..90cfc82fff 100644 --- a/src/library/baseplaylistfeature.cpp +++ b/src/library/baseplaylistfeature.cpp @@ -20,7 +20,7 @@ #include "util/assert.h" BasePlaylistFeature::BasePlaylistFeature(QObject* parent, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, TrackCollection* pTrackCollection, QString rootViewName) : LibraryFeature(parent), diff --git a/src/library/baseplaylistfeature.h b/src/library/baseplaylistfeature.h index 1e2fb88a3f..b28d6301fd 100644 --- a/src/library/baseplaylistfeature.h +++ b/src/library/baseplaylistfeature.h @@ -26,7 +26,7 @@ class BasePlaylistFeature : public LibraryFeature { Q_OBJECT public: BasePlaylistFeature(QObject* parent, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, TrackCollection* pTrackCollection, QString rootViewName); virtual ~BasePlaylistFeature(); @@ -77,7 +77,7 @@ class BasePlaylistFeature : public LibraryFeature { // on failure. QModelIndex indexFromPlaylistId(int playlistId); - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; TrackCollection* m_pTrackCollection; PlaylistDAO &m_playlistDao; TrackDAO &m_trackDao; diff --git a/src/library/browse/browsefeature.cpp b/src/library/browse/browsefeature.cpp index 4d0c1a42c0..92422b4f73 100644 --- a/src/library/browse/browsefeature.cpp +++ b/src/library/browse/browsefeature.cpp @@ -23,7 +23,7 @@ const QString kQuickLinksSeparator = "-+-"; BrowseFeature::BrowseFeature(QObject* parent, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, TrackCollection* pTrackCollection, RecordingManager* pRecordingManager) : LibraryFeature(parent), @@ -79,7 +79,7 @@ BrowseFeature::BrowseFeature(QObject* parent, // QDir::drives(). See Qt's QDir code, especially qdir.cpp QString display_path = drive.filePath(); if (display_path.endsWith("/")) { - display_path.chop(1); + display_path.chop(1); } TreeItem* driveLetter = new TreeItem( display_path, // Displays C: @@ -324,7 +324,7 @@ void BrowseFeature::onLazyChildExpandation(const QModelIndex& index) { // shorten the delay QString display_path = drive.filePath(); if (display_path.endsWith("/")) { - display_path.chop(1); + display_path.chop(1); } TreeItem* driveLetter = new TreeItem( display_path, // Displays C: diff --git a/src/library/browse/browsefeature.h b/src/library/browse/browsefeature.h index 027f42b9df..a38c5b6723 100644 --- a/src/library/browse/browsefeature.h +++ b/src/library/browse/browsefeature.h @@ -13,7 +13,7 @@ #include <QPoint> #include <QString> -#include "configobject.h" +#include "preferences/usersettings.h" #include "library/browse/browsetablemodel.h" #include "library/browse/foldertreemodel.h" #include "library/libraryfeature.h" @@ -28,7 +28,7 @@ class BrowseFeature : public LibraryFeature { Q_OBJECT public: BrowseFeature(QObject* parent, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, TrackCollection* pTrackCollection, RecordingManager* pRec); virtual ~BrowseFeature(); @@ -64,7 +64,7 @@ class BrowseFeature : public LibraryFeature { void saveQuickLinks(); void loadQuickLinks(); - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; BrowseTableModel m_browseModel; ProxyTrackModel m_proxyModel; TrackCollection* m_pTrackCollection; diff --git a/src/library/cratefeature.cpp b/src/library/cratefeature.cpp index d3f0ecc8c6..5dfa0cc09b 100644 --- a/src/library/cratefeature.cpp +++ b/src/library/cratefeature.cpp @@ -27,7 +27,7 @@ CrateFeature::CrateFeature(Library* pLibrary, TrackCollection* pTrackCollection, - ConfigObject<ConfigValue>* pConfig) + UserSettingsPointer pConfig) : m_pTrackCollection(pTrackCollection), m_crateDao(pTrackCollection->getCrateDAO()), m_crateTableModel(this, pTrackCollection), diff --git a/src/library/cratefeature.h b/src/library/cratefeature.h index aab17463b1..d289568e15 100644 --- a/src/library/cratefeature.h +++ b/src/library/cratefeature.h @@ -16,7 +16,7 @@ #include "library/library.h" #include "treeitemmodel.h" -#include "configobject.h" +#include "preferences/usersettings.h" #include "trackinfoobject.h" class TrackCollection; @@ -26,7 +26,7 @@ class CrateFeature : public LibraryFeature { public: CrateFeature(Library* pLibrary, TrackCollection* pTrackCollection, - ConfigObject<ConfigValue>* pConfig); + UserSettingsPointer pConfig); virtual ~CrateFeature(); QVariant title(); @@ -100,7 +100,7 @@ class CrateFeature : public LibraryFeature { CrateTableModel m_crateTableModel; QModelIndex m_lastRightClickedIndex; TreeItemModel m_childModel; - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; TrackPointer m_pSelectedTrack; QSet<int> m_cratesSelectedTrackIsIn; }; diff --git a/src/library/dao/analysisdao.cpp b/src/library/dao/analysisdao.cpp index 88d71dd574..73c795b6bc 100644 --- a/src/library/dao/analysisdao.cpp +++ b/src/library/dao/analysisdao.cpp @@ -16,7 +16,7 @@ const QString AnalysisDao::s_analysisTableName = "track_analysis"; // CPU time so I think we should stick with the default. rryan 4/3/2012 const int kCompressionLevel = -1; -AnalysisDao::AnalysisDao(QSqlDatabase& database, ConfigObject<ConfigValue>* pConfig) +AnalysisDao::AnalysisDao(QSqlDatabase& database, UserSettingsPointer pConfig) : m_pConfig(pConfig), m_db(database) { QDir storagePath = getAnalysisStoragePath(); diff --git a/src/library/dao/analysisdao.h b/src/library/dao/analysisdao.h index ab366c833d..05065d3a5c 100644 --- a/src/library/dao/analysisdao.h +++ b/src/library/dao/analysisdao.h @@ -4,7 +4,7 @@ #include <QObject> #include <QSqlDatabase> -#include "configobject.h" +#include "preferences/usersettings.h" #include "library/dao/dao.h" #include "trackinfoobject.h" @@ -31,7 +31,7 @@ class AnalysisDao : public DAO { QByteArray data; }; - AnalysisDao(QSqlDatabase& database, ConfigObject<ConfigValue>* pConfig); + AnalysisDao(QSqlDatabase& database, UserSettingsPointer pConfig); virtual ~AnalysisDao(); virtual void initialize(); @@ -62,7 +62,7 @@ class AnalysisDao : public DAO { bool deleteFile(const QString& filename) const; QList<AnalysisInfo> loadAnalysesFromQuery(TrackId trackId, QSqlQuery* query); - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; QSqlDatabase m_db; }; diff --git a/src/library/dao/autodjcratesdao.cpp b/src/library/dao/autodjcratesdao.cpp index a430e3d732..2b48251d02 100644 --- a/src/library/dao/autodjcratesdao.cpp +++ b/src/library/dao/autodjcratesdao.cpp @@ -16,7 +16,7 @@ static const int kLeastPreferredPercent = 15; AutoDJCratesDAO::AutoDJCratesDAO(QSqlDatabase& a_rDatabase, TrackDAO& a_rTrackDAO, CrateDAO& a_rCrateDAO, PlaylistDAO &a_rPlaylistDAO, - ConfigObject<ConfigValue>* a_pConfig) + UserSettingsPointer a_pConfig) : m_rDatabase(a_rDatabase), m_rTrackDAO(a_rTrackDAO), m_rCrateDAO(a_rCrateDAO), diff --git a/src/library/dao/autodjcratesdao.h b/src/library/dao/autodjcratesdao.h index 7374c9bdf0..498c6060b8 100644 --- a/src/library/dao/autodjcratesdao.h +++ b/src/library/dao/autodjcratesdao.h @@ -3,7 +3,7 @@ #include <QObject> -#include "configobject.h" +#include "preferences/usersettings.h" #include "library/dao/dao.h" #include "trackinfoobject.h" #include "util/class.h" @@ -28,7 +28,7 @@ class AutoDJCratesDAO : public QObject, public virtual DAO { AutoDJCratesDAO(QSqlDatabase& a_rDatabase, TrackDAO& a_rTrackDAO, CrateDAO& a_rCrateDAO, PlaylistDAO &a_rPlaylistDAO, - ConfigObject<ConfigValue>* a_pConfig); + UserSettingsPointer a_pConfig); virtual ~AutoDJCratesDAO(); // A pure virtual method from the subclass. @@ -127,7 +127,7 @@ class AutoDJCratesDAO : public QObject, public virtual DAO { PlaylistDAO& m_rPlaylistDAO; // The source of our configuration. - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; // The ID of every set-log playlist. QList<int> m_lstSetLogPlaylistIds; diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp index f705a3bb9b..8d94800579 100644 --- a/src/library/dao/trackdao.cpp +++ b/src/library/dao/trackdao.cpp @@ -72,7 +72,7 @@ TrackDAO::TrackDAO(QSqlDatabase& database, CrateDAO& crateDao, AnalysisDao& analysisDao, LibraryHashDAO& libraryHashDao, - ConfigObject<ConfigValue> * pConfig) + UserSettingsPointer pConfig) : m_database(database), m_cueDao(cueDao), m_playlistDao(playlistDao), diff --git a/src/library/dao/trackdao.h b/src/library/dao/trackdao.h index 3b749886e2..d5961852d3 100644 --- a/src/library/dao/trackdao.h +++ b/src/library/dao/trackdao.h @@ -12,7 +12,7 @@ #include <QCache> #include <QString> -#include "configobject.h" +#include "preferences/usersettings.h" #include "library/dao/dao.h" #include "trackinfoobject.h" #include "util/class.h" @@ -104,7 +104,7 @@ class TrackDAO : public QObject, public virtual DAO { TrackDAO(QSqlDatabase& database, CueDAO& cueDao, PlaylistDAO& playlistDao, CrateDAO& crateDao, AnalysisDao& analysisDao, LibraryHashDAO& libraryHashDao, - ConfigObject<ConfigValue>* pConfig = NULL); + UserSettingsPointer pConfig); virtual ~TrackDAO(); void finish(); @@ -209,7 +209,7 @@ class TrackDAO : public QObject, public virtual DAO { CrateDAO& m_crateDao; AnalysisDao& m_analysisDao; LibraryHashDAO& m_libraryHashDao; - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; // Mutex that protects m_sTracks. static QMutex m_sTracksMutex; // Weak pointer cache of active tracks. diff --git a/src/library/dlganalysis.cpp b/src/library/dlganalysis.cpp index 3258403795..1459665a85 100644 --- a/src/library/dlganalysis.cpp +++ b/src/library/dlganalysis.cpp @@ -8,7 +8,7 @@ #include "util/assert.h" DlgAnalysis::DlgAnalysis(QWidget* parent, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, TrackCollection* pTrackCollection) : QWidget(parent), m_pConfig(pConfig), diff --git a/src/library/dlganalysis.h b/src/library/dlganalysis.h index 8e73a700bb..84520b38cf 100644 --- a/src/library/dlganalysis.h +++ b/src/library/dlganalysis.h @@ -3,7 +3,7 @@ #include <QItemSelection> -#include "configobject.h" +#include "preferences/usersettings.h" #include "library/analysislibrarytablemodel.h" #include "library/libraryview.h" #include "library/trackcollection.h" @@ -16,7 +16,7 @@ class DlgAnalysis : public QWidget, public Ui::DlgAnalysis, public virtual Libra Q_OBJECT public: DlgAnalysis(QWidget *parent, - ConfigObject<ConfigValue>* pConfig, + UserSettingsPointer pConfig, TrackCollection* pTrackCollection); virtual ~DlgAnalysis(); @@ -54,7 +54,7 @@ class DlgAnalysis : public QWidget, public Ui::DlgAnalysis, public virtual Libra private: //Note m_pTrackTablePlaceholder is defined in the .ui file - ConfigObject<ConfigValue>* m_pConfig; + UserSettingsPointer m_pConfig; TrackCollection* m_pTrackCollection; bool m_bAnalysisActive; QButtonGroup m_songsButtonGroup; diff --git a/src/library/dlghidden.cpp b/src/library/dlghidden.cpp index 127641f104..0bbf9f563b 100644 --- a/src/library/dlghidden.cpp +++ b/src/library/dlghidden.cpp @@ -5,7 +5,7 @@ #include "widget/wtracktableview.h" #include "util/assert.h" -DlgHidden::DlgHidden(QWidget* parent, ConfigObject<ConfigValue>* pConfig, +DlgHidden::DlgHidden(QWidget* parent, UserSettingsPointer pConfig, Library* pLibrary, TrackCollection* pTrackCollection, MixxxKeyboard* pKeyboard) : QWidget(parent), diff --git a/src/library/dlghidden.h b/src/library/dlghidden.h index 4a5261c43c..5c7a9493f6 100644 --- a/src/library/dlghidden.h +++ b/src/library/dlghidden.h @@ -2,7 +2,7 @@ #define DLGHIDDEN_H #include "library/ui_dlghidden.h" -#include "configobject.h" +#include "preferences/usersettings.h" #include "library/library.h" #include "library/libraryview.h" #include "library/trackcollection.h" @@ -15,7 +15,7 @@ class QItemSelection; class DlgHidden : public QWidget, public Ui::DlgHidden, public LibraryView { Q_OBJECT public: - DlgHidden(QWidget* parent, ConfigObject<ConfigValue>* pConfig, + DlgHidden(QWidget* parent, UserSettingsPointer pConfig, Library* pLibrary, TrackCollection* pTrackCollection, MixxxKeyboard* pKeyboard); virtual ~DlgHidden(); diff --git a/src/library/dlgmissing.cpp b/src/library/dlgmissing.cpp index 74124dde9b..d9a1fc0285 100644 --- a/src/library/dlgmissing.cpp +++ b/src/library/dlgmissing.cpp @@ -4,7 +4,7 @@ #include "widget/wtracktableview.h" #include "util/assert.h" -DlgMissing::DlgMissing(QWidget* parent, ConfigObject<ConfigValue>* pConfig, +DlgMissing::DlgMissing(QWidget* parent, UserSettingsPointer pConfig, Library* pLi |