diff options
author | xerus2000 <27jf@pm.me> | 2020-08-13 13:47:36 +0200 |
---|---|---|
committer | xerus2000 <27jf@pm.me> | 2020-11-10 23:39:30 +0100 |
commit | 99419f9a8265221faab895f8f7d9b500b1789f4e (patch) | |
tree | 3a139cd2dbfeb726fa0ae4a913b56dddf91c8b2d /src/library | |
parent | 6e6685fe7c5db184bdc0fad7d9956a0b43783574 (diff) |
Use #pragma once everywhere
Diffstat (limited to 'src/library')
53 files changed, 53 insertions, 214 deletions
diff --git a/src/library/analysisfeature.h b/src/library/analysisfeature.h index 50587b046e..c101fde937 100644 --- a/src/library/analysisfeature.h +++ b/src/library/analysisfeature.h @@ -2,8 +2,7 @@ // Created 8/23/2009 by RJ Ryan (rryan@mit.edu) // Forked 11/11/2009 by Albert Santoni (alberts@mixxx.org) -#ifndef ANALYSISFEATURE_H -#define ANALYSISFEATURE_H +#pragma once #include <QStringListModel> #include <QUrl> @@ -79,6 +78,3 @@ class AnalysisFeature : public LibraryFeature { // The title is dynamic and reflects the current progress QString m_title; }; - - -#endif /* ANALYSISFEATURE_H */ diff --git a/src/library/autodj/autodjprocessor.h b/src/library/autodj/autodjprocessor.h index f702614d64..806887bcf7 100644 --- a/src/library/autodj/autodjprocessor.h +++ b/src/library/autodj/autodjprocessor.h @@ -1,5 +1,4 @@ -#ifndef AUTODJPROCESSOR_H -#define AUTODJPROCESSOR_H +#pragma once #include <QModelIndexList> #include <QObject> @@ -299,5 +298,3 @@ class AutoDJProcessor : public QObject { DISALLOW_COPY_AND_ASSIGN(AutoDJProcessor); }; - -#endif /* AUTODJPROCESSOR_H */ diff --git a/src/library/autodj/dlgautodj.h b/src/library/autodj/dlgautodj.h index bbdff9f988..9326872bd0 100644 --- a/src/library/autodj/dlgautodj.h +++ b/src/library/autodj/dlgautodj.h @@ -1,5 +1,4 @@ -#ifndef DLGAUTODJ_H -#define DLGAUTODJ_H +#pragma once #include <QLineEdit> #include <QString> @@ -69,5 +68,3 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView { QString m_enableBtnTooltip; QString m_disableBtnTooltip; }; - -#endif //DLGAUTODJ_H diff --git a/src/library/banshee/bansheedbconnection.h b/src/library/banshee/bansheedbconnection.h index d7e2df6ddd..5b59bd638d 100644 --- a/src/library/banshee/bansheedbconnection.h +++ b/src/library/banshee/bansheedbconnection.h @@ -1,5 +1,4 @@ -#ifndef BANSHEEDBCONNECTION_H -#define BANSHEEDBCONNECTION_H +#pragma once #include <QSqlDatabase> #include <QUrl> @@ -64,5 +63,3 @@ private: QMap<int, Album> m_albumMap; }; - -#endif // BANSHEEDBCONNECTION_H diff --git a/src/library/banshee/bansheefeature.h b/src/library/banshee/bansheefeature.h index 23e86900b8..f67b622100 100644 --- a/src/library/banshee/bansheefeature.h +++ b/src/library/banshee/bansheefeature.h @@ -1,6 +1,5 @@ -#ifndef BANSHEEFEATURE_H -#define BANSHEEFEATURE_H +#pragma once #include <QStringListModel> #include <QtSql> @@ -58,5 +57,3 @@ class BansheeFeature : public BaseExternalLibraryFeature { static const QString BANSHEE_MOUNT_KEY; }; - -#endif // BANSHEEFEATURE_H diff --git a/src/library/banshee/bansheeplaylistmodel.h b/src/library/banshee/bansheeplaylistmodel.h index 97e2b3c79c..e55e0f0354 100644 --- a/src/library/banshee/bansheeplaylistmodel.h +++ b/src/library/banshee/bansheeplaylistmodel.h @@ -1,5 +1,4 @@ -#ifndef BANSHEEPLAYLISTMODEL_H -#define BANSHEEPLAYLISTMODEL_H +#pragma once #include <QHash> #include <QtSql> @@ -39,5 +38,3 @@ class BansheePlaylistModel final : public BaseSqlTableModel { int m_playlistId; QString m_tempTableName; }; - -#endif // BANSHEEPLAYLISTMODEL_H diff --git a/src/library/baseexternalplaylistmodel.h b/src/library/baseexternalplaylistmodel.h index b1b19e9f00..867d962760 100644 --- a/src/library/baseexternalplaylistmodel.h +++ b/src/library/baseexternalplaylistmodel.h @@ -1,5 +1,4 @@ -#ifndef BASEEXTERNALPLAYLISTMODEL_H -#define BASEEXTERNALPLAYLISTMODEL_H +#pragma once #include <QtSql> #include <QItemDelegate> @@ -37,5 +36,3 @@ class BaseExternalPlaylistModel : public BaseSqlTableModel { QString m_playlistTracksTable; QSharedPointer<BaseTrackCache> m_trackSource; }; - -#endif /* BASEEXTERNALPLAYLISTMODEL_H */ diff --git a/src/library/baseexternaltrackmodel.h b/src/library/baseexternaltrackmodel.h index 23ed68092c..7b13ac895a 100644 --- a/src/library/baseexternaltrackmodel.h +++ b/src/library/baseexternaltrackmodel.h @@ -1,5 +1,4 @@ -#ifndef BASEEXTERNALTRACKMODEL_H -#define BASEEXTERNALTRACKMODEL_H +#pragma once #include <QModelIndex> #include <QObject> @@ -29,5 +28,3 @@ class BaseExternalTrackModel : public BaseSqlTableModel { private: TrackId doGetTrackId(const TrackPointer& pTrack) const override; }; - -#endif /* BASEEXTERNALTRACKMODEL_H */ diff --git a/src/library/bpmdelegate.h b/src/library/bpmdelegate.h index b6919b2b31..02db4ad09b 100644 --- a/src/library/bpmdelegate.h +++ b/src/library/bpmdelegate.h @@ -1,5 +1,4 @@ -#ifndef BPMDELEGATE_H -#define BPMDELEGATE_H +#pragma once #include <QCheckBox> #include <QModelIndex> @@ -22,5 +21,3 @@ class BPMDelegate : public TableItemDelegate { QCheckBox* m_pCheckBox; QItemEditorFactory* m_pFactory; }; - -#endif // BPMDELEGATE_H diff --git a/src/library/browse/browsefeature.h b/src/library/browse/browsefeature.h index 0665a96b3c..47d1b291e1 100644 --- a/src/library/browse/browsefeature.h +++ b/src/library/browse/browsefeature.h @@ -1,8 +1,7 @@ // browsefeature.h // Created 9/8/2009 by RJ Ryan (rryan@mit.edu) -#ifndef BROWSEFEATURE_H -#define BROWSEFEATURE_H +#pragma once #include <QStringListModel> #include <QSortFilterProxyModel> @@ -80,5 +79,3 @@ class BrowseFeature : public LibraryFeature { QIcon m_icon; QPointer<WLibrarySidebar> m_pSidebarWidget; }; - -#endif // BROWSEFEATURE_H diff --git a/src/library/browse/browsetablemodel.h b/src/library/browse/browsetablemodel.h index 5e959a9d90..2b13e22026 100644 --- a/src/library/browse/browsetablemodel.h +++ b/src/library/browse/browsetablemodel.h @@ -1,5 +1,4 @@ -#ifndef BROWSETABLEMODEL_H -#define BROWSETABLEMODEL_H +#pragma once #include <QStandardItemModel> #include <QMimeData> @@ -93,5 +92,3 @@ class BrowseTableModel final : public QStandardItemModel, public virtual TrackMo QMap<int, TrackModel::SortColumnId> m_sortColumnIdByColumnIndex; }; - -#endif diff --git a/src/library/browse/browsethread.h b/src/library/browse/browsethread.h index cee56c2dad..08c15630d2 100644 --- a/src/library/browse/browsethread.h +++ b/src/library/browse/browsethread.h @@ -2,8 +2,7 @@ * browsethread.h (C) 2011 Tobias Rafreider */ -#ifndef BROWSETHREAD_H -#define BROWSETHREAD_H +#pragma once #include <QThread> #include <QMutex> @@ -55,5 +54,3 @@ class BrowseThread : public QThread { static QWeakPointer<BrowseThread> m_weakInstanceRef; }; - -#endif // BROWSETHREAD_H diff --git a/src/library/browse/foldertreemodel.h b/src/library/browse/foldertreemodel.h index 240e26b447..2bff73671a 100644 --- a/src/library/browse/foldertreemodel.h +++ b/src/library/browse/foldertreemodel.h @@ -1,5 +1,4 @@ -#ifndef FOLDER_TREE_MODEL -#define FOLDER_TREE_MODEL +#pragma once #include <QAbstractItemModel> #include <QModelIndex> @@ -27,5 +26,3 @@ class FolderTreeModel : public TreeItemModel { // Used for memoizing the results of directoryHasChildren mutable QHash<QString, bool> m_directoryCache; }; - -#endif diff --git a/src/library/columncache.h b/src/library/columncache.h index 2051b874b6..05c144db11 100644 --- a/src/library/columncache.h +++ b/src/library/columncache.h @@ -1,5 +1,4 @@ -#ifndef COLUMNCACHE_H -#define COLUMNCACHE_H +#pragma once #include <QObject> #include <QMap> @@ -121,5 +120,3 @@ class ColumnCache : public QObject { private slots: void slotSetKeySortOrder(double); }; - -#endif /* COLUMNCACHE_H */ diff --git a/src/library/dao/analysisdao.h b/src/library/dao/analysisdao.h index 3a7992832d..1519b30f22 100644 --- a/src/library/dao/analysisdao.h +++ b/src/library/dao/analysisdao.h @@ -1,5 +1,4 @@ -#ifndef ANALYSISDAO_H -#define ANALYSISDAO_H +#pragma once #include <QObject> #include <QDir> @@ -67,5 +66,3 @@ class AnalysisDao : public DAO { const UserSettingsPointer m_pConfig; }; - -#endif // ANALYSISDAO_H diff --git a/src/library/dao/libraryhashdao.h b/src/library/dao/libraryhashdao.h index e3e4b4bf47..0f16cefa5b 100644 --- a/src/library/dao/libraryhashdao.h +++ b/src/library/dao/libraryhashdao.h @@ -1,5 +1,4 @@ -#ifndef LIBRARYHASHDAO_H -#define LIBRARYHASHDAO_H +#pragma once #include <QObject> #include <QHash> @@ -26,5 +25,3 @@ class LibraryHashDAO : public DAO { const bool deleted, const bool verified); QStringList getDeletedDirectories(); }; - -#endif //LIBRARYHASHDAO_H diff --git a/src/library/dao/playlistdao.h b/src/library/dao/playlistdao.h index fba4602c3e..6062c19a15 100644 --- a/src/library/dao/playlistdao.h +++ b/src/library/dao/playlistdao.h @@ -1,5 +1,4 @@ -#ifndef PLAYLISTDAO_H -#define PLAYLISTDAO_H +#pragma once #include <QHash> #include <QObject> @@ -146,5 +145,3 @@ class PlaylistDAO : public QObject, public virtual DAO { AutoDJProcessor* m_pAutoDJProcessor; DISALLOW_COPY_AND_ASSIGN(PlaylistDAO); }; - -#endif //PLAYLISTDAO_H diff --git a/src/library/dao/trackdao.h b/src/library/dao/trackdao.h index 76d0721aeb..6af30b65d3 100644 --- a/src/library/dao/trackdao.h +++ b/src/library/dao/trackdao.h @@ -1,5 +1,4 @@ -#ifndef TRACKDAO_H -#define TRACKDAO_H +#pragma once #include <QFileInfo> #include <QObject> @@ -178,5 +177,3 @@ class TrackDAO : public QObject, public virtual DAO, public virtual GlobalTrackC }; Q_DECLARE_OPERATORS_FOR_FLAGS(TrackDAO::ResolveTrackIdFlags) - -#endif //TRACKDAO_H diff --git a/src/library/dlganalysis.h b/src/library/dlganalysis.h index 1aacad7478..4b3e443d09 100644 --- a/src/library/dlganalysis.h +++ b/src/library/dlganalysis.h @@ -1,5 +1,4 @@ -#ifndef DLGANALYSIS_H -#define DLGANALYSIS_H +#pragma once #include <QButtonGroup> #include <QItemSelection> @@ -63,5 +62,3 @@ class DlgAnalysis : public QWidget, public Ui::DlgAnalysis, public virtual Libra WAnalysisLibraryTableView* m_pAnalysisLibraryTableView; AnalysisLibraryTableModel* m_pAnalysisLibraryTableModel; }; - -#endif //DLGTRIAGE_H diff --git a/src/library/export/trackexportdlg.h b/src/library/export/trackexportdlg.h index f565af4faa..9afd27a3fe 100644 --- a/src/library/export/trackexportdlg.h +++ b/src/library/export/trackexportdlg.h @@ -1,5 +1,4 @@ -#ifndef DLGTRACKEXPORT_H -#define DLGTRACKEXPORT_H +#pragma once #include <QDialog> #include <QScopedPointer> @@ -50,5 +49,3 @@ class TrackExportDlg : public QDialog, public Ui::DlgTrackExport { TrackPointerList m_tracks; TrackExportWorker* m_worker; }; - -#endif // DLGTRACKEXPORT_H diff --git a/src/library/export/trackexportwizard.h b/src/library/export/trackexportwizard.h index b863e8f0b4..1372563294 100644 --- a/src/library/export/trackexportwizard.h +++ b/src/library/export/trackexportwizard.h @@ -6,8 +6,7 @@ // FLAC -> AIFF for CDJ // * Export sidecar metadata files for import into Mixxx -#ifndef TRACKEXPORT_H -#define TRACKEXPORT_H +#pragma once #include <QScopedPointer> #include <QString> @@ -39,5 +38,3 @@ class TrackExportWizard : public QObject { QScopedPointer<TrackExportDlg> m_dialog; QScopedPointer<TrackExportWorker> m_worker; }; - -#endif // TRACKEXPORT_H diff --git a/src/library/export/trackexportworker.h b/src/library/export/trackexportworker.h index 8e22d98a4f..bb998a849b 100644 --- a/src/library/export/trackexportworker.h +++ b/src/library/export/trackexportworker.h @@ -1,5 +1,4 @@ -#ifndef TRACKEXPORTWORKER_H -#define TRACKEXPORTWORKER_H +#pragma once #include <QObject> #include <QScopedPointer> @@ -86,5 +85,3 @@ class TrackExportWorker : public QThread { const QString m_destDir; const TrackPointerList m_tracks; }; - -#endif // TRACKEXPORTWORKER_H diff --git a/src/library/hiddentablemodel.h b/src/library/hiddentablemodel.h index 1099fc4421..87a8c13fb9 100644 --- a/src/library/hiddentablemodel.h +++ b/src/library/hiddentablemodel.h @@ -1,5 +1,4 @@ -#ifndef HIDDENTABLEMODEL_H -#define HIDDENTABLEMODEL_H +#pragma once #include "library/basesqltablemodel.h" @@ -17,5 +16,3 @@ class HiddenTableModel final : public BaseSqlTableModel { Qt::ItemFlags flags(const QModelIndex &index) const final; CapabilitiesFlags getCapabilities() const final; }; - -#endif diff --git a/src/library/itunes/itunesfeature.h b/src/library/itunes/itunesfeature.h index da27b1d79e..c68e5f2737 100644 --- a/src/library/itunes/itunesfeature.h +++ b/src/library/itunes/itunesfeature.h @@ -1,8 +1,7 @@ // itunesfeaturefeature.h // Created 8/23/2009 by RJ Ryan (rryan@mit.edu) -#ifndef ITUNESFEATURE_H -#define ITUNESFEATURE_H +#pragma once #include <QStringListModel> #include <QtSql> @@ -75,5 +74,3 @@ class ITunesFeature : public BaseExternalLibraryFeature { QPointer<WLibrarySidebar> m_pSidebarWidget; QIcon m_icon; }; - -#endif // ITUNESFEATURE_H diff --git a/src/library/library_preferences.h b/src/library/library_preferences.h index a30a452fa7..3622c99dcf 100644 --- a/src/library/library_preferences.h +++ b/src/library/library_preferences.h @@ -1,8 +1,5 @@ -#ifndef LIBRARY_PREFERENCES_H -#define LIBRARY_PREFERENCES_H +#pragma once #define PREF_LEGACY_LIBRARY_DIR ConfigKey("[Playlist]","Directory") #define PREF_LIBRARY_EDIT_METADATA_DEFAULT false - -#endif /* LIBRARY_PREFERENCES_H */ diff --git a/src/library/librarycontrol.h b/src/library/librarycontrol.h index dd8046c89e..f6d2fce4e9 100644 --- a/src/library/librarycontrol.h +++ b/src/library/librarycontrol.h @@ -1,5 +1,4 @@ -#ifndef LIBRARYMIDICONTROL_H -#define LIBRARYMIDICONTROL_H +#pragma once #include <QObject> @@ -170,5 +169,3 @@ class LibraryControl : public QObject { ControlProxy m_numPreviewDecks; std::map<QString, std::unique_ptr<LoadToGroupController>> m_loadToGroupControllers; }; - -#endif //LIBRARYMIDICONTROL_H diff --git a/src/library/libraryfeature.h b/src/library/libraryfeature.h index 9f375a778f..8b72da08e9 100644 --- a/src/library/libraryfeature.h +++ b/src/library/libraryfeature.h @@ -1,8 +1,7 @@ // libraryfeature.h // Created 8/17/2009 by RJ Ryan (rryan@mit.edu) -#ifndef LIBRARYFEATURE_H -#define LIBRARYFEATURE_H +#pragma once #include <QAbstractItemModel> #include <QDesktopServices> @@ -138,5 +137,3 @@ class LibraryFeature : public QObject { private: QStringList getPlaylistFiles(QFileDialog::FileMode mode) const; }; - -#endif /* LIBRARYFEATURE_H */ diff --git a/src/library/librarytablemodel.h b/src/library/librarytablemodel.h index ffee364ffd..c803582e96 100644 --- a/src/library/librarytablemodel.h +++ b/src/library/librarytablemodel.h @@ -1,5 +1,4 @@ -#ifndef LIBRARYTABLEMODEL_H -#define LIBRARYTABLEMODEL_H +#pragma once #include "library/basesqltablemodel.h" @@ -18,5 +17,3 @@ class LibraryTableModel : public BaseSqlTableModel { int addTracks(const QModelIndex& index, const QList<QString>& locations) final; TrackModel::CapabilitiesFlags getCapabilities() const final; }; - -#endif diff --git a/src/library/libraryview.h b/src/library/libraryview.h index 21b20228fe..e3c4bf21b4 100644 --- a/src/library/libraryview.h +++ b/src/library/libraryview.h @@ -4,8 +4,7 @@ /// LibraryView is an abstract interface that all views to be used with the /// Library widget should support. -#ifndef LIBRARYVIEW_H -#define LIBRARYVIEW_H +#pragma once #include <QString> @@ -47,5 +46,3 @@ class LibraryView { virtual void assignPreviousTrackColor(){}; virtual void assignNextTrackColor(){}; }; - -#endif /* LIBRARYVIEW_H */ diff --git a/src/library/mixxxlibraryfeature.h b/src/library/mixxxlibraryfeature.h index 3dd70bbb7b..3acf3573f3 100644 --- a/src/library/mixxxlibraryfeature.h +++ b/src/library/mixxxlibraryfeature.h @@ -1,8 +1,7 @@ // mixxxlibraryfeature.h // Created 8/23/2009 by RJ Ryan (rryan@mit.edu) -#ifndef MIXXXLIBRARYFEATURE_H -#define MIXXXLIBRARYFEATURE_H +#pragma once #include <QStringListModel> #include <QUrl> @@ -63,5 +62,3 @@ class MixxxLibraryFeature final : public LibraryFeature { DlgMissing* m_pMissingView; DlgHidden* m_pHiddenView; }; - -#endif /* MIXXXLIBRARYFEATURE_H */ diff --git a/src/library/parser.h b/src/library/parser.h index 28e565dd2a..35b12ce774 100644 --- a/src/library/parser.h +++ b/src/library/parser.h @@ -11,8 +11,7 @@ // // -#ifndef PARSER_H -#define PARSER_H +#pragma once /**Developer Information: This is the rootclass for all parser classes for the Importer class. @@ -61,5 +60,3 @@ protected: const QString& playlistEntry, const QString& basePath = QString()); }; - -#endif diff --git a/src/library/parsercsv.h b/src/library/parsercsv.h index 57f92a5f6c..f4dae4319a 100644 --- a/src/library/parsercsv.h +++ b/src/library/parsercsv.h @@ -11,8 +11,7 @@ // Copyright: See COPYING file that comes with this distribution // // -#ifndef PARSERCSV_H -#define PARSERCSV_H +#pragma once #include <QList> #include <QString |