diff options
author | Be <be@mixxx.org> | 2020-12-07 21:08:48 -0600 |
---|---|---|
committer | Be <be@mixxx.org> | 2020-12-07 21:08:48 -0600 |
commit | 3085bbe95107fd789a8a966dfeb341cfe74cfad8 (patch) | |
tree | 7aac36fca1cce483218b3f06435d218283f156e3 /src/analyzer | |
parent | 7d82224170a6e9b9a9242b65c2ccb82ba749949a (diff) |
merge 2.3
Diffstat (limited to 'src/analyzer')
-rw-r--r-- | src/analyzer/analyzerbeats.h | 5 | ||||
-rw-r--r-- | src/analyzer/analyzerebur128.h | 5 | ||||
-rw-r--r-- | src/analyzer/analyzergain.h | 5 | ||||
-rw-r--r-- | src/analyzer/analyzerkey.h | 5 | ||||
-rw-r--r-- | src/analyzer/analyzerwaveform.h | 5 | ||||
-rw-r--r-- | src/analyzer/plugins/analyzerplugin.h | 5 | ||||
-rw-r--r-- | src/analyzer/plugins/analyzerqueenmarybeats.h | 5 | ||||
-rw-r--r-- | src/analyzer/plugins/analyzerqueenmarykey.h | 5 | ||||
-rw-r--r-- | src/analyzer/plugins/analyzersoundtouchbeats.h | 5 |
9 files changed, 9 insertions, 36 deletions
diff --git a/src/analyzer/analyzerbeats.h b/src/analyzer/analyzerbeats.h index e0667149e6..1169fd0436 100644 --- a/src/analyzer/analyzerbeats.h +++ b/src/analyzer/analyzerbeats.h @@ -5,8 +5,7 @@ * Author: Vittorio Colao */ -#ifndef ANALYZER_ANALYZERBEATS_H -#define ANALYZER_ANALYZERBEATS_H +#pragma once #include <QHash> #include <QList> @@ -53,5 +52,3 @@ class AnalyzerBeats : public Analyzer { int m_iCurrentSample; int m_iMinBpm, m_iMaxBpm; }; - -#endif /* ANALYZER_ANALYZERBEATS_H */ diff --git a/src/analyzer/analyzerebur128.h b/src/analyzer/analyzerebur128.h index d725f31eb6..5cc794425d 100644 --- a/src/analyzer/analyzerebur128.h +++ b/src/analyzer/analyzerebur128.h @@ -1,5 +1,4 @@ -#ifndef ANALYZER_ANALYZEREBUR128_H_ -#define ANALYZER_ANALYZEREBUR128_H_ +#pragma once #include <ebur128.h> @@ -24,5 +23,3 @@ class AnalyzerEbur128 : public Analyzer { ReplayGainSettings m_rgSettings; ebur128_state* m_pState; }; - -#endif /* ANALYZER_ANALYZEREBUR128_H_ */ diff --git a/src/analyzer/analyzergain.h b/src/analyzer/analyzergain.h index dbe426b919..ddc2d6df57 100644 --- a/src/analyzer/analyzergain.h +++ b/src/analyzer/analyzergain.h @@ -5,8 +5,7 @@ * Author: Vittorio Colao * */ -#ifndef ANALYZER_ANALYZERGAIN_H -#define ANALYZER_ANALYZERGAIN_H +#pragma once #include "analyzer/analyzer.h" #include "preferences/replaygainsettings.h" @@ -34,5 +33,3 @@ class AnalyzerGain : public Analyzer { ReplayGain* m_pReplayGain; int m_iBufferSize; }; - -#endif /* ANALYZER_ANALYZERGAIN_H */ diff --git a/src/analyzer/analyzerkey.h b/src/analyzer/analyzerkey.h index b25fec8b07..504df21705 100644 --- a/src/analyzer/analyzerkey.h +++ b/src/analyzer/analyzerkey.h @@ -1,5 +1,4 @@ -#ifndef ANALYZER_ANALYZERKEY_H -#define ANALYZER_ANALYZERKEY_H +#pragma once #include <QHash> #include <QList> @@ -43,5 +42,3 @@ class AnalyzerKey : public Analyzer { bool m_bPreferencesFastAnalysisEnabled; bool m_bPreferencesReanalyzeEnabled; }; - -#endif /* ANALYZER_ANALYZERKEY_H */ diff --git a/src/analyzer/analyzerwaveform.h b/src/analyzer/analyzerwaveform.h index 86b13f2c26..03089261b2 100644 --- a/src/analyzer/analyzerwaveform.h +++ b/src/analyzer/analyzerwaveform.h @@ -1,5 +1,4 @@ -#ifndef ANALYZER_ANALYZERWAVEFORM_H -#define ANALYZER_ANALYZERWAVEFORM_H +#pragma once #include <QImage> #include <QSqlDatabase> @@ -178,5 +177,3 @@ class AnalyzerWaveform : public Analyzer { QImage* test_heatMap; #endif }; - -#endif /* ANALYZER_ANALYZERWAVEFORM_H */ diff --git a/src/analyzer/plugins/analyzerplugin.h b/src/analyzer/plugins/analyzerplugin.h index 872e8bda92..03bb7ac2d6 100644 --- a/src/analyzer/plugins/analyzerplugin.h +++ b/src/analyzer/plugins/analyzerplugin.h @@ -1,5 +1,4 @@ -#ifndef ANALYZER_PLUGINS_ANALYZERPLUGIN_H -#define ANALYZER_PLUGINS_ANALYZERPLUGIN_H +#pragma once #include <QString> @@ -66,5 +65,3 @@ class AnalyzerKeyPlugin : public AnalyzerPlugin { }; } // namespace mixxx - -#endif /* ANALYZER_PLUGINS_ANALYZERPLUGIN_H */ diff --git a/src/analyzer/plugins/analyzerqueenmarybeats.h b/src/analyzer/plugins/analyzerqueenmarybeats.h index bdc525bd73..5dc70ae85c 100644 --- a/src/analyzer/plugins/analyzerqueenmarybeats.h +++ b/src/analyzer/plugins/analyzerqueenmarybeats.h @@ -1,5 +1,4 @@ -#ifndef ANALYZER_PLUGINS_ANALYZERQUEENMARYBEATS_H -#define ANALYZER_PLUGINS_ANALYZERQUEENMARYBEATS_H +#pragma once #include <vector> @@ -56,5 +55,3 @@ class AnalyzerQueenMaryBeats : public AnalyzerBeatsPlugin { }; } // namespace mixxx - -#endif /* ANALYZER_PLUGINS_ANALYZERQUEENMARYBEATS_H */ diff --git a/src/analyzer/plugins/analyzerqueenmarykey.h b/src/analyzer/plugins/analyzerqueenmarykey.h index 253688b1cf..ea9d014f6f 100644 --- a/src/analyzer/plugins/analyzerqueenmarykey.h +++ b/src/analyzer/plugins/analyzerqueenmarykey.h @@ -1,5 +1,4 @@ -#ifndef ANALYZER_PLUGINS_ANALYZERQUEENMARYKEY_H -#define ANALYZER_PLUGINS_ANALYZERQUEENMARYKEY_H +#pragma once #include <vector> @@ -50,5 +49,3 @@ class AnalyzerQueenMaryKey : public AnalyzerKeyPlugin { }; } // namespace mixxx - -#endif /* ANALYZER_PLUGINS_ANALYZERQUEENMARYKEY_H */ diff --git a/src/analyzer/plugins/analyzersoundtouchbeats.h b/src/analyzer/plugins/analyzersoundtouchbeats.h index ec495e58a5..1c8e26a359 100644 --- a/src/analyzer/plugins/analyzersoundtouchbeats.h +++ b/src/analyzer/plugins/analyzersoundtouchbeats.h @@ -1,5 +1,4 @@ -#ifndef ANALYZER_PLUGINS_ANALYZERSOUNDTOUCHBEATS -#define ANALYZER_PLUGINS_ANALYZERSOUNDTOUCHBEATS +#pragma once #include <QObject> @@ -49,5 +48,3 @@ class AnalyzerSoundTouchBeats : public AnalyzerBeatsPlugin { }; } // namespace mixxx - -#endif /* ANALYZER_PLUGINS_ANALYZERSOUNDTOUCHBEATS */ |