Mercurial > hg > qm-dsp

changeset 489:701233f8ed41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make include-guards consistent
author Chris Cannam <cannam@all-day-breakfast.com>
date Fri, 31 May 2019 16:48:37 +0100
parents 7992d0923626
children 103156707542
files base/KaiserWindow.h base/Pitch.h base/SincWindow.h base/Window.h dsp/chromagram/Chromagram.h dsp/chromagram/ConstantQ.h dsp/keydetection/GetKeyMode.h dsp/mfcc/MFCC.h dsp/onsets/DetectionFunction.h dsp/onsets/PeakPicking.h dsp/phasevocoder/PhaseVocoder.h dsp/rateconversion/Decimator.h dsp/rateconversion/DecimatorB.h dsp/rateconversion/Resampler.h dsp/rhythm/BeatSpectrum.h dsp/segmentation/Segmenter.h dsp/segmentation/cluster_melt.h dsp/segmentation/cluster_segmenter.h dsp/segmentation/segment.h dsp/signalconditioning/DFProcess.h dsp/signalconditioning/FiltFilt.h dsp/signalconditioning/Filter.h dsp/signalconditioning/Framer.h dsp/tempotracking/DownBeat.h dsp/tempotracking/TempoTrack.h dsp/tempotracking/TempoTrackV2.h dsp/tonal/ChangeDetectionFunction.h dsp/tonal/TCSgram.h dsp/tonal/TonalEstimator.h dsp/transforms/DCT.h dsp/transforms/FFT.h dsp/wavelet/Wavelet.h hmm/hmm.h maths/Correlation.cpp maths/Correlation.h maths/CosineDistance.h maths/KLDivergence.h maths/MathAliases.h maths/MedianFilter.h maths/Polyfit.h maths/nan-inf.h maths/pca/pca.h thread/AsynchronousTask.h thread/BlockAllocator.h thread/Thread.h
diffstat 45 files changed, 94 insertions(+), 108 deletions(-) [+]
line wrap: on
line diff
--- a/base/KaiserWindow.h	Fri May 31 16:48:29 2019 +0100
+++ b/base/KaiserWindow.h	Fri May 31 16:48:37 2019 +0100
@@ -11,8 +11,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef KAISER_WINDOW_H
-#define KAISER_WINDOW_H
+#ifndef QM_DSP_KAISER_WINDOW_H
+#define QM_DSP_KAISER_WINDOW_H
 
 #include <vector>
 #include <cmath>
--- a/base/Pitch.h	Fri May 31 16:48:29 2019 +0100
+++ b/base/Pitch.h	Fri May 31 16:48:37 2019 +0100
@@ -12,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _PITCH_H_
-#define _PITCH_H_
+#ifndef QM_DSP_PITCH_H
+#define QM_DSP_PITCH_H
 
 /**
  * Convert between musical pitch (i.e. MIDI pitch number) and
--- a/base/SincWindow.h	Fri May 31 16:48:29 2019 +0100
+++ b/base/SincWindow.h	Fri May 31 16:48:37 2019 +0100
@@ -11,8 +11,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef SINC_WINDOW_H
-#define SINC_WINDOW_H
+#ifndef QM_DSP_SINC_WINDOW_H
+#define QM_DSP_SINC_WINDOW_H
 
 #include <vector>
 
--- a/base/Window.h	Fri May 31 16:48:29 2019 +0100
+++ b/base/Window.h	Fri May 31 16:48:37 2019 +0100
@@ -12,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _WINDOW_H_
-#define _WINDOW_H_
+#ifndef QM_DSP_WINDOW_H
+#define QM_DSP_WINDOW_H
 
 #include <cmath>
 #include <iostream>
--- a/dsp/chromagram/Chromagram.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/chromagram/Chromagram.h	Fri May 31 16:48:37 2019 +0100
@@ -12,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef CHROMAGRAM_H
-#define CHROMAGRAM_H
+#ifndef QM_DSP_CHROMAGRAM_H
+#define QM_DSP_CHROMAGRAM_H
 
 #include "dsp/transforms/FFT.h"
 #include "base/Window.h"
--- a/dsp/chromagram/ConstantQ.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/chromagram/ConstantQ.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef CONSTANTQ_H
-#define CONSTANTQ_H
+#ifndef QM_DSP_CONSTANTQ_H
+#define QM_DSP_CONSTANTQ_H
 
 #include <vector>
 #include "maths/MathAliases.h"
--- a/dsp/keydetection/GetKeyMode.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/keydetection/GetKeyMode.h	Fri May 31 16:48:37 2019 +0100
@@ -10,8 +10,8 @@
     COPYING included with this distribution for more information.
  */
 
-#ifndef GETKEYMODE_H
-#define GETKEYMODE_H
+#ifndef QM_DSP_GETKEYMODE_H
+#define QM_DSP_GETKEYMODE_H
 
 
 #include "dsp/rateconversion/Decimator.h"
--- a/dsp/mfcc/MFCC.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/mfcc/MFCC.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef MFCC_H
-#define MFCC_H
+#ifndef QM_DSP_MFCC_H
+#define QM_DSP_MFCC_H
 
 #include "base/Window.h"
 
--- a/dsp/onsets/DetectionFunction.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/onsets/DetectionFunction.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef DETECTIONFUNCTION_H
-#define DETECTIONFUNCTION_H
+#ifndef QM_DSP_DETECTIONFUNCTION_H
+#define QM_DSP_DETECTIONFUNCTION_H
 
 #include "maths/MathUtilities.h"
 #include "maths/MathAliases.h"
--- a/dsp/onsets/PeakPicking.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/onsets/PeakPicking.h	Fri May 31 16:48:37 2019 +0100
@@ -21,12 +21,8 @@
     COPYING included with this distribution for more information.
 */
 
-// PeakPicking.h: interface for the PeakPicking class.
-//
-//////////////////////////////////////////////////////////////////////
-
-#ifndef PEAKPICKING_H
-#define PEAKPICKING_H
+#ifndef QM_DSP_PEAKPICKING_H
+#define QM_DSP_PEAKPICKING_H
 
 #include "maths/MathUtilities.h"
 #include "maths/MathAliases.h"
--- a/dsp/phasevocoder/PhaseVocoder.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/phasevocoder/PhaseVocoder.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef PHASEVOCODER_H
-#define PHASEVOCODER_H
+#ifndef QM_DSP_PHASEVOCODER_H
+#define QM_DSP_PHASEVOCODER_H
 
 class FFTReal;
 
--- a/dsp/rateconversion/Decimator.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/rateconversion/Decimator.h	Fri May 31 16:48:37 2019 +0100
@@ -12,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef DECIMATOR_H
-#define DECIMATOR_H
+#ifndef QM_DSP_DECIMATOR_H
+#define QM_DSP_DECIMATOR_H
 
 /**
  * Decimator carries out a fast downsample by a power-of-two
--- a/dsp/rateconversion/DecimatorB.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/rateconversion/DecimatorB.h	Fri May 31 16:48:37 2019 +0100
@@ -11,8 +11,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef DECIMATORB_H
-#define DECIMATORB_H
+#ifndef QM_DSP_DECIMATORB_H
+#define QM_DSP_DECIMATORB_H
 
 #include <vector>
 
--- a/dsp/rateconversion/Resampler.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/rateconversion/Resampler.h	Fri May 31 16:48:37 2019 +0100
@@ -12,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef RESAMPLER_H
-#define RESAMPLER_H
+#ifndef QM_DSP_RESAMPLER_H
+#define QM_DSP_RESAMPLER_H
 
 #include <vector>
 
--- a/dsp/rhythm/BeatSpectrum.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/rhythm/BeatSpectrum.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef BEATSPECTRUM_H
-#define BEATSPECTRUM_H
+#ifndef QM_DSP_BEATSPECTRUM_H
+#define QM_DSP_BEATSPECTRUM_H
 
 #include <vector>
 
--- a/dsp/segmentation/Segmenter.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/segmentation/Segmenter.h	Fri May 31 16:48:37 2019 +0100
@@ -14,8 +14,8 @@
  *
  */
 
-#ifndef _SEGMENTER_H
-#define _SEGMENTER_H
+#ifndef QM_DSP_SEGMENTER_H
+#define QM_DSP_SEGMENTER_H
 
 #include <vector>
 #include <iostream>
--- a/dsp/segmentation/cluster_melt.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/segmentation/cluster_melt.h	Fri May 31 16:48:37 2019 +0100
@@ -14,8 +14,8 @@
  *
  */
 
-#ifndef _CLUSTER_MELT_H
-#define _CLUSTER_MELT_H
+#ifndef QM_DSP_CLUSTER_MELT_H
+#define QM_DSP_CLUSTER_MELT_H
 
 #include <stdlib.h>
 #include <math.h>
--- a/dsp/segmentation/cluster_segmenter.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/segmentation/cluster_segmenter.h	Fri May 31 16:48:37 2019 +0100
@@ -14,8 +14,8 @@
  *
  */
 
-#ifndef _CLUSTER_SEGMENTER_H
-#define _CLUSTER_SEGMENTER_H
+#ifndef QM_DSP_CLUSTER_SEGMENTER_H
+#define QM_DSP_CLUSTER_SEGMENTER_H
 
 #include <stdio.h>
 #include <stdlib.h>
--- a/dsp/segmentation/segment.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/segmentation/segment.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef _SEGMENT_H
-#define _SEGMENT_H
+#ifndef QM_DSP_SEGMENT_H
+#define QM_DSP_SEGMENT_H
 
 #ifdef __cplusplus
 extern "C" {
--- a/dsp/signalconditioning/DFProcess.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/signalconditioning/DFProcess.h	Fri May 31 16:48:37 2019 +0100
@@ -21,8 +21,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef CDFPROCESS_H
-#define CDFPROCESS_H
+#ifndef QM_DSP_DFPROCESS_H
+#define QM_DSP_DFPROCESS_H
 
 #include <stdio.h>
 #include "FiltFilt.h"
@@ -59,7 +59,6 @@
     virtual ~DFProcess();
 
     void process( double* src, double* dst );
-
         
 private:
     void initialise( DFProcConfig Config );
--- a/dsp/signalconditioning/FiltFilt.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/signalconditioning/FiltFilt.h	Fri May 31 16:48:37 2019 +0100
@@ -1,5 +1,4 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
 /*
     QM DSP Library
 
@@ -13,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef FILTFILT_H
-#define FILTFILT_H
+#ifndef QM_DSP_FILTFILT_H
+#define QM_DSP_FILTFILT_H
 
 #include "Filter.h"
 
--- a/dsp/signalconditioning/Filter.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/signalconditioning/Filter.h	Fri May 31 16:48:37 2019 +0100
@@ -12,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef FILTER_H
-#define FILTER_H
+#ifndef QM_DSP_FILTER_H
+#define QM_DSP_FILTER_H
 
 #include "base/Restrict.h"
 
--- a/dsp/signalconditioning/Framer.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/signalconditioning/Framer.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef FRAMER_H
-#define FRAMER_H
+#ifndef QM_DSP_FRAMER_H
+#define QM_DSP_FRAMER_H
 
 class Framer  
 {
--- a/dsp/tempotracking/DownBeat.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/tempotracking/DownBeat.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef DOWNBEAT_H
-#define DOWNBEAT_H
+#ifndef QM_DSP_DOWNBEAT_H
+#define QM_DSP_DOWNBEAT_H
 
 #include <vector>
 #include <cstddef>
--- a/dsp/tempotracking/TempoTrack.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/tempotracking/TempoTrack.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef TEMPOTRACK_H
-#define TEMPOTRACK_H
+#ifndef QM_DSP_TEMPOTRACK_H
+#define QM_DSP_TEMPOTRACK_H
 
 
 #include <stdio.h>
--- a/dsp/tempotracking/TempoTrackV2.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/tempotracking/TempoTrackV2.h	Fri May 31 16:48:37 2019 +0100
@@ -13,9 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-
-#ifndef TEMPOTRACKV2_H
-#define TEMPOTRACKV2_H
+#ifndef QM_DSP_TEMPOTRACKV2_H
+#define QM_DSP_TEMPOTRACKV2_H
 
 #include <vector>
 using namespace std;
--- a/dsp/tonal/ChangeDetectionFunction.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/tonal/ChangeDetectionFunction.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _CHANGEDETECTIONFUNCTION_
-#define _CHANGEDETECTIONFUNCTION_
+#ifndef QM_DSP_CHANGEDETECTIONFUNCTION_H
+#define QM_DSP_CHANGEDETECTIONFUNCTION_H
 
 #include "TCSgram.h"
 
--- a/dsp/tonal/TCSgram.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/tonal/TCSgram.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _TCSGram_
-#define _TCSGram_
+#ifndef QM_DSP_TCSGRAM_H
+#define QM_DSP_TCSGRAM_H
 
 #include <vector>
 #include <valarray>
--- a/dsp/tonal/TonalEstimator.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/tonal/TonalEstimator.h	Fri May 31 16:48:37 2019 +0100
@@ -13,9 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _TONALESTIMATOR_
-#define _TONALESTIMATOR_
-
+#ifndef QM_DSP_TONALESTIMATOR_H
+#define QM_DSP_TONALESTIMATOR_H
 
 #include <valarray>
 #include <numeric>
--- a/dsp/transforms/DCT.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/transforms/DCT.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef DCT_H
-#define DCT_H
+#ifndef QM_DSP_DCT_H
+#define QM_DSP_DCT_H
 
 #include "FFT.h"
 
--- a/dsp/transforms/FFT.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/transforms/FFT.h	Fri May 31 16:48:37 2019 +0100
@@ -12,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef FFT_H
-#define FFT_H
+#ifndef QM_DSP_FFT_H
+#define QM_DSP_FFT_H
 
 class FFT  
 {
--- a/dsp/wavelet/Wavelet.h	Fri May 31 16:48:29 2019 +0100
+++ b/dsp/wavelet/Wavelet.h	Fri May 31 16:48:37 2019 +0100
@@ -12,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _WAVELET_H_
-#define _WAVELET_H_
+#ifndef QM_DSP_WAVELET_H
+#define QM_DSP_WAVELET_H
 
 #include <string>
 #include <vector>
--- a/hmm/hmm.h	Fri May 31 16:48:29 2019 +0100
+++ b/hmm/hmm.h	Fri May 31 16:48:37 2019 +0100
@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef _HMM_H
-#define _HMM_H
+#ifndef QM_DSP_HMM_H
+#define QM_DSP_HMM_H
 
 #ifdef __cplusplus
 extern "C" {
--- a/maths/Correlation.cpp	Fri May 31 16:48:29 2019 +0100
+++ b/maths/Correlation.cpp	Fri May 31 16:48:37 2019 +0100
@@ -15,6 +15,8 @@
 
 #include "Correlation.h"
 
+#include "MathAliases.h"
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
--- a/maths/Correlation.h	Fri May 31 16:48:29 2019 +0100
+++ b/maths/Correlation.h	Fri May 31 16:48:37 2019 +0100
@@ -1,5 +1,4 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
 /*
     QM DSP Library
 
@@ -13,10 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef CORRELATION_H
-#define CORRELATION_H
-
-#define  EPS  2.2204e-016
+#ifndef QM_DSP_CORRELATION_H
+#define QM_DSP_CORRELATION_H
 
 class Correlation  
 {
--- a/maths/CosineDistance.h	Fri May 31 16:48:29 2019 +0100
+++ b/maths/CosineDistance.h	Fri May 31 16:48:37 2019 +0100
@@ -1,5 +1,4 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
 /*
     QM DSP Library
 
@@ -13,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef COSINEDISTANCE_H
-#define COSINEDISTANCE_H
+#ifndef QM_DSP_COSINEDISTANCE_H
+#define QM_DSP_COSINEDISTANCE_H
 
 #include <vector>
 #include <math.h>
--- a/maths/KLDivergence.h	Fri May 31 16:48:29 2019 +0100
+++ b/maths/KLDivergence.h	Fri May 31 16:48:37 2019 +0100
@@ -1,5 +1,4 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
 /*
     QM DSP Library
 
@@ -13,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef KLDIVERGENCE_H
-#define KLDIVERGENCE_H
+#ifndef QM_DSP_KLDIVERGENCE_H
+#define QM_DSP_KLDIVERGENCE_H
 
 #include <vector>
 
--- a/maths/MathAliases.h	Fri May 31 16:48:29 2019 +0100
+++ b/maths/MathAliases.h	Fri May 31 16:48:37 2019 +0100
@@ -1,5 +1,4 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
 /*
     QM DSP Library
 
@@ -13,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef MATHALIASES_H
-#define MATHALIASES_H
+#ifndef QM_DSP_MATHALIASES_H
+#define QM_DSP_MATHALIASES_H
 
 #include <cmath>
 #include <complex>
--- a/maths/MedianFilter.h	Fri May 31 16:48:29 2019 +0100
+++ b/maths/MedianFilter.h	Fri May 31 16:48:37 2019 +0100
@@ -1,5 +1,4 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
 /*
     QM DSP Library
 
@@ -13,8 +12,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef MEDIAN_FILTER_H
-#define MEDIAN_FILTER_H
+#ifndef QM_DSP_MEDIAN_FILTER_H
+#define QM_DSP_MEDIAN_FILTER_H
 
 #include <algorithm>
 #include <cassert>
--- a/maths/Polyfit.h	Fri May 31 16:48:29 2019 +0100
+++ b/maths/Polyfit.h	Fri May 31 16:48:37 2019 +0100
@@ -1,8 +1,9 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 //---------------------------------------------------------------------------
 
-#ifndef PolyfitHPP
-#define PolyfitHPP
+#ifndef QM_DSP_POLYFIT_H
+#define QM_DSP_POLYFIT_H
+
 //---------------------------------------------------------------------------
 // Least-squares curve fitting class for arbitrary data types
 /*
--- a/maths/nan-inf.h	Fri May 31 16:48:29 2019 +0100
+++ b/maths/nan-inf.h	Fri May 31 16:48:37 2019 +0100
@@ -1,6 +1,6 @@
 
-#ifndef NAN_INF_H
-#define NAN_INF_H
+#ifndef QM_DSP_NAN_INF_H
+#define QM_DSP_NAN_INF_H
 
 #define ISNAN(x) (sizeof(x) == sizeof(double) ? ISNANd(x) : ISNANf(x))
 static inline int ISNANf(float x) { return x != x; }
--- a/maths/pca/pca.h	Fri May 31 16:48:29 2019 +0100
+++ b/maths/pca/pca.h	Fri May 31 16:48:37 2019 +0100
@@ -1,5 +1,5 @@
-#ifndef _PCA_H
-#define _PCA_H
+#ifndef QM_DSP_PCA_H
+#define QM_DSP_PCA_H
 
 #ifdef __cplusplus
 extern "C" {
--- a/thread/AsynchronousTask.h	Fri May 31 16:48:29 2019 +0100
+++ b/thread/AsynchronousTask.h	Fri May 31 16:48:37 2019 +0100
@@ -1,5 +1,4 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
-
 /*
     QM DSP Library
 
@@ -7,8 +6,8 @@
     This file Copyright 2009 QMUL.
 */
 
-#ifndef _ASYNCHRONOUS_TASK_H_
-#define _ASYNCHRONOUS_TASK_H_
+#ifndef QM_DSP_ASYNCHRONOUS_TASK_H
+#define QM_DSP_ASYNCHRONOUS_TASK_H
 
 #include "Thread.h"
 
@@ -42,12 +41,11 @@
         m_todo("AsynchronousTask: task to perform"),
         m_done("AsynchronousTask: task complete"),
         m_inTask(false),
-        m_finishing(false)
-    {
+        m_finishing(false) {
         start();
     }
-    virtual ~AsynchronousTask()
-    {
+    
+    virtual ~AsynchronousTask() {
         m_todo.lock();
         m_finishing = true;
         m_todo.signal();
--- a/thread/BlockAllocator.h	Fri May 31 16:48:29 2019 +0100
+++ b/thread/BlockAllocator.h	Fri May 31 16:48:37 2019 +0100
@@ -31,8 +31,8 @@
 THE SOFTWARE.
 */
 
-#ifndef _BLOCK_ALLOCATOR_H_
-#define _BLOCK_ALLOCATOR_H_
+#ifndef QM_DSP_BLOCK_ALLOCATOR_H
+#define QM_DSP_BLOCK_ALLOCATOR_H
 
 #include <cstdlib>
 
--- a/thread/Thread.h	Fri May 31 16:48:29 2019 +0100
+++ b/thread/Thread.h	Fri May 31 16:48:37 2019 +0100
@@ -7,8 +7,8 @@
     This file copyright Chris Cannam, used with permission.
 */
 
-#ifndef _THREAD_H_
-#define _THREAD_H_
+#ifndef QM_DSP_THREAD_H
+#define QM_DSP_THREAD_H
 
 #ifdef _WIN32
 #include <windows.h>