Continue previous commit

source/backend/CarlaUtils.cpp

@@ -669,8 +669,7 @@ public:
     CarlaPipeClientPlugin(const CarlaPipeCallbackFunc callbackFunc, void* const callbackPtr) noexcept
         : CarlaPipeClient(),
           fCallbackFunc(callbackFunc),
-          fCallbackPtr(callbackPtr),
-          leakDetector_CarlaPipeClientPlugin()
+          fCallbackPtr(callbackPtr)
     {
         CARLA_SAFE_ASSERT(fCallbackFunc != nullptr);
     }

source/backend/engine/CarlaEngineBridge.cpp

@@ -375,8 +375,7 @@ public:
           fShmNonRtServerControl(),
           fIsOffline(false),
           fFirstIdle(true),
-          fLastPingTime(-1),
-          leakDetector_CarlaEngineBridge()
+          fLastPingTime(-1)
     {
         carla_stdout("CarlaEngineBridge::CarlaEngineBridge(\"%s\", \"%s\", \"%s\", \"%s\")", audioPoolBaseName, rtClientBaseName, nonRtClientBaseName, nonRtServerBaseName);
 

source/backend/engine/CarlaEngineGraph.cpp

@@ -1135,8 +1135,7 @@ class CarlaPluginInstance : public AudioPluginInstance
 public:
     CarlaPluginInstance(CarlaEngine* const engine, CarlaPlugin* const plugin)
         : kEngine(engine),
-          fPlugin(plugin),
-          leakDetector_CarlaPluginInstance()
+          fPlugin(plugin)
     {
         setPlayConfigDetails(static_cast<int>(fPlugin->getAudioInCount()),
                              static_cast<int>(fPlugin->getAudioOutCount()),

source/backend/engine/CarlaEngineJack.cpp

@@ -79,8 +79,7 @@ public:
         : CarlaEngineAudioPort(client, isInputPort, indexOffset),
           fJackClient(jackClient),
           fJackPort(jackPort),
-          kDeletionCallback(delCallback),
-          leakDetector_CarlaEngineJackAudioPort()
+          kDeletionCallback(delCallback)
     {
         carla_debug("CarlaEngineJackAudioPort::CarlaEngineJackAudioPort(%s, %p, %p)", bool2str(isInputPort), jackClient, jackPort);
 
@@ -172,8 +171,7 @@ public:
         : CarlaEngineCVPort(client, isInputPort, indexOffset),
           fJackClient(jackClient),
           fJackPort(jackPort),
-          kDeletionCallback(delCallback),
-          leakDetector_CarlaEngineJackCVPort()
+          kDeletionCallback(delCallback)
     {
         carla_debug("CarlaEngineJackCVPort::CarlaEngineJackCVPort(%s, %p, %p)", bool2str(isInputPort), jackClient, jackPort);
 
@@ -265,8 +263,7 @@ public:
           fJackPort(jackPort),
           fJackBuffer(nullptr),
           fRetEvent(kFallbackJackEngineEvent),
-          kDeletionCallback(delCallback),
-          leakDetector_CarlaEngineJackEventPort()
+          kDeletionCallback(delCallback)
     {
         carla_debug("CarlaEngineJackEventPort::CarlaEngineJackEventPort(%s, %p, %p)", bool2str(isInputPort), jackClient, jackPort);
 
@@ -458,8 +455,7 @@ public:
           fUseClient(engine.getProccessMode() == ENGINE_PROCESS_MODE_SINGLE_CLIENT || engine.getProccessMode() == ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS),
           fAudioPorts(),
           fCVPorts(),
-          fEventPorts(),
-          leakDetector_CarlaEngineJackClient()
+          fEventPorts()
     {
         carla_debug("CarlaEngineJackClient::CarlaEngineJackClient(%p)", jackClient);
 
@@ -669,15 +665,14 @@ public:
           fExternalPatchbay(true),
           fFreewheel(false),
 #ifdef BUILD_BRIDGE
-          fIsRunning(false),
+          fIsRunning(false)
 #else
           fUsedGroups(),
           fUsedPorts(),
           fUsedConnections(),
           fNewGroups(),
-          fRetConns(),
+          fRetConns()
 #endif
-          leakDetector_CarlaEngineJack()
     {
         carla_debug("CarlaEngineJack::CarlaEngineJack()");
 

source/backend/engine/CarlaEngineJuce.cpp

@@ -85,8 +85,7 @@ public:
           fMidiIns(),
           fMidiInEvents(),
           fMidiOuts(),
-          fMidiOutMutex(),
-          leakDetector_CarlaEngineJuce()
+          fMidiOutMutex()
     {
         carla_debug("CarlaEngineJuce::CarlaEngineJuce(%p)", devType);
 

source/backend/engine/CarlaEngineNative.cpp

@@ -63,8 +63,7 @@ class CarlaEngineNativeUI : public CarlaExternalUI
 {
 public:
     CarlaEngineNativeUI(CarlaEngine* const engine)
-        : fEngine(engine),
-          leakDetector_CarlaEngineNativeUI()
+        : fEngine(engine)
     {
         carla_debug("CarlaEngineNativeUI::CarlaEngineNativeUI(%p)", engine);
     }
@@ -566,8 +565,7 @@ public:
           fIsActive(false),
           fIsRunning(false),
           fUiServer(this),
-          fOptionsForced(false),
-          leakDetector_CarlaEngineNative()
+          fOptionsForced(false)
     {
         carla_debug("CarlaEngineNative::CarlaEngineNative()");
 

source/backend/engine/CarlaEngineOsc.cpp

@@ -39,8 +39,7 @@ CarlaEngineOsc::CarlaEngineOsc(CarlaEngine* const engine) noexcept
       fServerPathTCP(),
       fServerPathUDP(),
       fServerTCP(nullptr),
-      fServerUDP(nullptr),
-      leakDetector_CarlaEngineOsc()
+      fServerUDP(nullptr)
 {
     CARLA_SAFE_ASSERT(engine != nullptr);
     carla_debug("CarlaEngineOsc::CarlaEngineOsc(%p)", engine);

source/backend/engine/CarlaEngineRtAudio.cpp

@@ -170,8 +170,7 @@ public:
           fMidiInEvents(),
           fMidiOuts(),
           fMidiOutMutex(),
-          fMidiOutVector(3),
-          leakDetector_CarlaEngineRtAudio()
+          fMidiOutVector(3)
     {
         carla_debug("CarlaEngineRtAudio::CarlaEngineRtAudio(%i)", api);
 

source/backend/engine/CarlaEngineThread.cpp

@@ -25,8 +25,7 @@ CARLA_BACKEND_START_NAMESPACE
 
 CarlaEngineThread::CarlaEngineThread(CarlaEngine* const engine) noexcept
     : CarlaThread("CarlaEngineThread"),
-      kEngine(engine),
-      leakDetector_CarlaEngineThread()
+      kEngine(engine)
 {
     CARLA_SAFE_ASSERT(engine != nullptr);
     carla_debug("CarlaEngineThread::CarlaEngineThread(%p)", engine);

source/backend/plugin/CarlaPluginBridge.cpp

@@ -498,8 +498,7 @@ public:
           fBinary(),
           fLabel(),
           fShmIds(),
-          fProcess(),
-          leakDetector_CarlaPluginBridgeThread() {}
+          fProcess() {}
 
     void setData(const char* const binary, const char* const label, const char* const shmIds) noexcept
     {
@@ -744,8 +743,7 @@ public:
           fShmNonRtServerControl(),
           fInfo(),
           fUniqueId(0),
-          fParams(nullptr),
-          leakDetector_CarlaPluginBridge()
+          fParams(nullptr)
     {
         carla_debug("CarlaPluginBridge::CarlaPluginBridge(%p, %i, %s, %s)", engine, id, BinaryType2Str(btype), PluginType2Str(ptype));
 

source/backend/plugin/CarlaPluginDSSI.cpp

@@ -75,8 +75,7 @@ public:
           fBinary(),
           fLabel(),
           fOscData(oscData),
-          fProcess(),
-          leakDetector_CarlaThreadDSSIUI() {}
+          fProcess() {}
 
     void setData(const char* const binary, const char* const label) noexcept
     {
@@ -276,13 +275,12 @@ public:
           fForcedStereoIn(false),
           fForcedStereoOut(false),
           fIsDssiVst(false),
-          fUsesCustomData(false),
+          fUsesCustomData(false)
 #ifdef HAVE_LIBLO
-          fOscData(),
+        , fOscData(),
           fThreadUI(engine, this, fOscData),
-          fUiFilename(nullptr),
+          fUiFilename(nullptr)
 #endif
-          leakDetector_CarlaPluginDSSI()
     {
         carla_debug("CarlaPluginDSSI::CarlaPluginDSSI(%p, %i)", engine, id);
 

source/backend/plugin/CarlaPluginFluidSynth.cpp

@@ -49,8 +49,7 @@ public:
           fSynth(nullptr),
           fSynthId(0),
           fAudio16Buffers(nullptr),
-          fLabel(nullptr),
-          leakDetector_CarlaPluginFluidSynth()
+          fLabel(nullptr)
     {
         carla_debug("CarlaPluginFluidSynth::CarlaPluginFluidSynth(%p, %i, %s)", engine, id,  bool2str(use16Outs));
 

source/backend/plugin/CarlaPluginInternal.cpp

@@ -576,11 +576,11 @@ CarlaPlugin::ProtectedData::ProtectedData(CarlaEngine* const eng, const uint idx
       extNotes(),
       latency(),
       postRtEvents(),
-      postUiEvents(),
+      postUiEvents()
 #ifndef BUILD_BRIDGE
-      postProc(),
+    , postProc(),
 #endif
-      leakDetector_ProtectedData() {}
+      {}
 
 CarlaPlugin::ProtectedData::~ProtectedData() noexcept
 {

source/backend/plugin/CarlaPluginJuce.cpp

@@ -47,8 +47,7 @@ public:
           fPosInfo(),
           fChunk(),
           fUniqueId(nullptr),
-          fWindow(),
-          leakDetector_CarlaPluginJuce()
+          fWindow()
     {
         carla_debug("CarlaPluginJuce::CarlaPluginJuce(%p, %i)", engine, id);
 

source/backend/plugin/CarlaPluginLADSPA.cpp

@@ -40,8 +40,7 @@ public:
           fLatencyIndex(-1),
           fForcedStereoIn(false),
           fForcedStereoOut(false),
-          fIsDssiVst(false),
-          leakDetector_CarlaPluginLADSPA()
+          fIsDssiVst(false)
     {
         carla_debug("CarlaPluginLADSPA::CarlaPluginLADSPA(%p, %i)", engine, id);
 

source/backend/plugin/CarlaPluginLV2.cpp

@@ -401,8 +401,7 @@ public:
           fFilename(),
           fPluginURI(),
           fUiURI(),
-          fUiState(UiNone),
-          leakDetector_CarlaPipeServerLV2() {}
+          fUiState(UiNone) {}
 
     ~CarlaPipeServerLV2() noexcept override
     {
@@ -523,8 +522,7 @@ public:
           fLastStateChunk(nullptr),
           fLastTimeInfo(),
           fExt(),
-          fUI(),
-          leakDetector_CarlaPluginLV2()
+          fUI()
     {
         carla_debug("CarlaPluginLV2::CarlaPluginLV2(%p, %i)", engine, id);
 

source/backend/plugin/CarlaPluginLinuxSampler.cpp

@@ -59,8 +59,7 @@ public:
     AudioOutputDevicePlugin(const CarlaEngine* const engine, const CarlaPlugin* const plugin, const bool uses16Outs)
         : AudioOutputDevice(std::map<std::string, DeviceCreationParameter*>()),
           kEngine(engine),
-          kPlugin(plugin),
-          leakDetector_AudioOutputDevicePlugin()
+          kPlugin(plugin)
     {
         CARLA_ASSERT(engine != nullptr);
         CARLA_ASSERT(plugin != nullptr);
@@ -130,8 +129,7 @@ class MidiInputPortPlugin : public MidiInputPort
 {
 public:
     MidiInputPortPlugin(MidiInputDevice* const device, const int portNum = 0)
-        : MidiInputPort(device, portNum),
-          leakDetector_MidiInputPortPlugin() {}
+        : MidiInputPort(device, portNum) {}
 
     CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(MidiInputPortPlugin)
 };
@@ -143,8 +141,7 @@ class MidiInputDevicePlugin : public MidiInputDevice
 {
 public:
     MidiInputDevicePlugin(Sampler* const sampler)
-        : MidiInputDevice(std::map<std::string, DeviceCreationParameter*>(), sampler),
-          leakDetector_MidiInputDevicePlugin()
+        : MidiInputDevice(std::map<std::string, DeviceCreationParameter*>(), sampler)
     {
         AcquirePorts(1);
     }
@@ -210,8 +207,7 @@ public:
           fMidiInputDevice(sSampler),
           fMidiInputPort(nullptr),
           fInstrumentIds(),
-          fInstrumentInfo(),
-          leakDetector_CarlaPluginLinuxSampler()
+          fInstrumentInfo()
     {
         carla_debug("CarlaPluginLinuxSampler::CarlaPluginLinuxSampler(%p, %i, %s, %s)", engine, id, bool2str(isGIG), bool2str(use16Outs));
 

source/backend/plugin/CarlaPluginNative.cpp

@@ -185,8 +185,7 @@ public:
           fMidiEventCount(0),
           fMidiIn(),
           fMidiOut(),
-          fTimeInfo(),
-          leakDetector_CarlaPluginNative()
+          fTimeInfo()
     {
         carla_debug("CarlaPluginNative::CarlaPluginNative(%p, %i)", engine, id);
 

source/backend/plugin/CarlaPluginVST2.cpp

@@ -72,8 +72,7 @@ public:
 #endif
           fEvents(),
           fUI(),
-          fUnique2(2),
-          leakDetector_CarlaPluginVST2()
+          fUnique2(2)
     {
         carla_debug("CarlaPluginVST2::CarlaPluginVST2(%p, %i)", engine, id);
 

source/bridges-plugin/CarlaBridgePlugin.cpp

@@ -177,8 +177,7 @@ public:
     CarlaBridgePlugin(const bool useBridge, const char* const clientName, const char* const audioPoolBaseName,
                       const char* const rtClientBaseName, const char* const nonRtClientBaseName, const char* const nonRtServerBaseName)
         : fEngine(nullptr),
-          fUsingBridge(false),
-          leakDetector_CarlaBridgePlugin()
+          fUsingBridge(false)
     {
         CARLA_ASSERT(clientName != nullptr && clientName[0] != '\0');
         carla_debug("CarlaBridgePlugin::CarlaBridgePlugin(%s, \"%s\", %s, %s, %s, %s)", bool2str(useBridge), clientName, audioPoolBaseName, rtClientBaseName, nonRtClientBaseName, nonRtServerBaseName);

source/bridges-ui/CarlaBridgeToolkit.hpp

@@ -49,8 +49,7 @@ protected:
     CarlaBridgeUI* const ui;
 
     CarlaBridgeToolkit(CarlaBridgeUI* const u)
-        : ui(u),
-          leakDetector_CarlaBridgeToolkit() {}
+        : ui(u) {}
 
     CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(CarlaBridgeToolkit)
 };

source/bridges-ui/CarlaBridgeToolkitGtk.cpp

@@ -45,8 +45,7 @@ public:
           fLastX(0),
           fLastY(0),
           fLastWidth(0),
-          fLastHeight(0),
-          leakDetector_CarlaBridgeToolkitGtk()
+          fLastHeight(0)
     {
         carla_debug("CarlaBridgeToolkitGtk::CarlaBridgeToolkitGtk(%p)", u);
     }

source/bridges-ui/CarlaBridgeToolkitPlugin.cpp

@@ -37,11 +37,10 @@ public:
     CarlaBridgeToolkitPlugin(CarlaBridgeUI* const u)
         : CarlaBridgeToolkit(u),
           fUI(nullptr),
-          fIdling(false),
+          fIdling(false)
 #if defined(CARLA_OS_WIN) || defined(CARLA_OS_MAC)
-          kJuceInit(),
+        , kJuceInit()
 #endif
-          leakDetector_CarlaBridgeToolkitPlugin()
     {
         carla_debug("CarlaBridgeToolkitPlugin::CarlaBridgeToolkitPlugin(%p)", u);
     }

source/bridges-ui/CarlaBridgeToolkitQt.cpp

@@ -57,8 +57,7 @@ public:
           fApp(nullptr),
           fWindow(nullptr),
           fMsgTimer(0),
-          fNeedsShow(false),
-          leakDetector_CarlaBridgeToolkitQt()
+          fNeedsShow(false)
     {
         carla_debug("CarlaBridgeToolkitQt::CarlaBridgeToolkitQt(%p)", u);
     }

source/bridges-ui/CarlaBridgeUI-LV2.cpp

@@ -212,8 +212,7 @@ public:
           fLv2Options(),
           fUiOptions(),
           fCustomURIDs(),
-          fExt(),
-          leakDetector_CarlaLv2Client()
+          fExt()
     {
         carla_zeroPointers(fFeatures, kFeatureCount+1);
 

source/bridges-ui/CarlaBridgeUI.cpp

@@ -39,8 +39,7 @@ CarlaBridgeUI::CarlaBridgeUI() noexcept
       fLastMsgTimer(-1),
       fToolkit(nullptr),
       fLib(nullptr),
-      fLibFilename(),
-      leakDetector_CarlaBridgeUI()
+      fLibFilename()
 {
     carla_debug("CarlaBridgeUI::CarlaBridgeUI()");
 

source/includes/CarlaNative.hpp

@@ -34,8 +34,7 @@ class NativePluginClass
 {
 public:
     NativePluginClass(const NativeHostDescriptor* const host)
-        : pHost(host),
-          leakDetector_NativePluginClass()
+        : pHost(host)
     {
         CARLA_SAFE_ASSERT(host != nullptr);
     }

source/includes/CarlaNativeExtUI.hpp

@@ -36,8 +36,7 @@ public:
     NativePluginAndUiClass(const NativeHostDescriptor* const host, const char* const extUiPath)
         : NativePluginClass(host),
           CarlaExternalUI(),
-          fExtUiPath(getResourceDir()),
-          leakDetector_NativePluginAndUiClass()
+          fExtUiPath(getResourceDir())
     {
         fExtUiPath += CARLA_OS_SEP_STR;
         fExtUiPath += extUiPath;

source/native-plugins/audio-file.cpp

@@ -47,8 +47,7 @@ public:
           fReaderBuffer(),
           fReaderMutex(),
           fReader(),
-          fReaderSource(),
-          leakDetector_AudioFilePlugin()
+          fReaderSource()
     {
         fReaderBuffer.setSize(2, static_cast<int>(getBufferSize()));
     }

source/native-plugins/bigmeter.cpp

@@ -35,8 +35,7 @@ public:
           fColor(1),
           fStyle(1),
           fOutLeft(0.0f),
-          fOutRight(0.0f),
-          leakDetector_BigMeterPlugin() {}
+          fOutRight(0.0f) {}
 
 protected:
     // -------------------------------------------------------------------

source/native-plugins/midi-base.hpp

@@ -58,8 +58,7 @@ public:
           fMidiPort(0),
           fStartTime(0),
           fMutex(),
-          fData(),
-          leakDetector_MidiPattern()
+          fData()
     {
         CARLA_SAFE_ASSERT(kPlayer != nullptr);
     }

source/native-plugins/midi-file.cpp

@@ -30,8 +30,7 @@ public:
         : NativePluginClass(host),
           fMidiOut(this),
           fNeedsAllNotesOff(false),
-          fWasPlayingBefore(false),
-          leakDetector_MidiFilePlugin() {}
+          fWasPlayingBefore(false) {}
 
 protected:
     // -------------------------------------------------------------------

source/native-plugins/midi-sequencer.cpp

@@ -38,8 +38,7 @@ public:
           fTicksPerFrame(0.0),
           fInEvents(),
           fMidiOut(this),
-          fTimeInfo(),
-          leakDetector_MidiSequencerPlugin()
+          fTimeInfo()
     {
         carla_zeroStruct(fTimeInfo);
     }

source/native-plugins/notes.cpp

@@ -26,8 +26,7 @@ class NotesPlugin : public NativePluginAndUiClass
 public:
     NotesPlugin(const NativeHostDescriptor* const host)
         : NativePluginAndUiClass(host, "notes-ui"),
-          fCurPage(1),
-          leakDetector_NotesPlugin() {}
+          fCurPage(1) {}
 
 protected:
     // -------------------------------------------------------------------

source/native-plugins/zita-at1.cpp

@@ -54,8 +54,7 @@ public:
         : NativePluginAndUiClass(host, "at1-ui"),
           fJackClient(),
           jclient(nullptr),
-          notemask(0xfff),
-          leakDetector_AT1Plugin()
+          notemask(0xfff)
     {
         CARLA_SAFE_ASSERT(host != nullptr);
 

source/native-plugins/zita-bls1.cpp

@@ -52,8 +52,7 @@ public:
     BLS1Plugin(const NativeHostDescriptor* const host)
         : NativePluginAndUiClass(host, "bls1-ui"),
           fJackClient(),
-          jclient(nullptr),
-          leakDetector_BLS1Plugin()
+          jclient(nullptr)
     {
         CARLA_SAFE_ASSERT(host != nullptr);
 

source/native-plugins/zita-rev1.cpp

@@ -55,8 +55,7 @@ public:
           kNumInputs(2),
           kNumOutputs(isAmbisonic ? 4 : 2),
           fJackClient(),
-          jclient(nullptr),
-          leakDetector_REV1Plugin()
+          jclient(nullptr)
     {
         CARLA_SAFE_ASSERT(host != nullptr);
 

source/native-plugins/zynaddsubfx-fx.cpp

@@ -46,8 +46,7 @@ protected:
           fSampleRate(getSampleRate()),
           fEffect(nullptr),
           efxoutl(nullptr),
-          efxoutr(nullptr),
-          leakDetector_FxAbstractPlugin()
+          efxoutr(nullptr)
     {
         const int ibufferSize(static_cast<int>(fBufferSize));
 
@@ -233,8 +232,7 @@ class FxAlienWahPlugin : public FxAbstractPlugin<Alienwah>
 {
 public:
     FxAlienWahPlugin(const NativeHostDescriptor* const host)
-        : FxAbstractPlugin(host, 11, 4),
-          leakDetector_FxAlienWahPlugin() {}
+        : FxAbstractPlugin(host, 11, 4) {}
 
 protected:
     // -------------------------------------------------------------------
@@ -370,8 +368,7 @@ class FxChorusPlugin : public FxAbstractPlugin<Chorus>
 {
 public:
     FxChorusPlugin(const NativeHostDescriptor* const host)
-        : FxAbstractPlugin(host, 12, 10),
-          leakDetector_FxChorusPlugin() {}
+        : FxAbstractPlugin(host, 12, 10) {}
 
 protected:
     // -------------------------------------------------------------------
@@ -531,8 +528,7 @@ class FxDistortionPlugin : public FxAbstractPlugin<Distorsion>
 {
 public:
     FxDistortionPlugin(const NativeHostDescriptor* const host)
-        : FxAbstractPlugin(host, 11, 6),
-          leakDetector_FxDistortionPlugin() {}
+        : FxAbstractPlugin(host, 11, 6) {}
 
 protected:
     // -------------------------------------------------------------------
@@ -700,8 +696,7 @@ class FxDynamicFilterPlugin : public FxAbstractPlugin<DynamicFilter>
 {
 public:
     FxDynamicFilterPlugin(const NativeHostDescriptor* const host)
-        : FxAbstractPlugin(host, 10, 5),
-          leakDetector_FxDynamicFilterPlugin() {}
+        : FxAbstractPlugin(host, 10, 5) {}
 
 protected:
     // -------------------------------------------------------------------
@@ -835,8 +830,7 @@ class FxEchoPlugin : public FxAbstractPlugin<Echo>
 {
 public:
     FxEchoPlugin(const NativeHostDescriptor* const host)
-        : FxAbstractPlugin(host, 7, 9),
-          leakDetector_FxEchoPlugin() {}
+        : FxAbstractPlugin(host, 7, 9) {}
 
 protected:
     // -------------------------------------------------------------------
@@ -958,8 +952,7 @@ class FxPhaserPlugin : public FxAbstractPlugin<Phaser>
 {
 public:
     FxPhaserPlugin(const NativeHostDescriptor* const host)
-        : FxAbstractPlugin(host, 15, 12),
-          leakDetector_FxPhaserPlugin() {}
+        : FxAbstractPlugin(host, 15, 12) {}
 
 protected:
     // -------------------------------------------------------------------
@@ -1142,8 +1135,7 @@ class FxReverbPlugin : public FxAbstractPlugin<Reverb>
 {
 public:
     FxReverbPlugin(const NativeHostDescriptor* const host)
-        : FxAbstractPlugin(host, 13, 13),
-          leakDetector_FxReverbPlugin() {}
+        : FxAbstractPlugin(host, 13, 13) {}
 
 protected:
     // -------------------------------------------------------------------

source/native-plugins/zynaddsubfx-synth.cpp

@@ -207,8 +207,7 @@ public:
           fMaster(nullptr),
           fSynth(),
           fIsActive(false),
-          fMutex(),
-          leakDetector_ZynAddSubFxPlugin()
+          fMutex()
     {
         sPrograms.initIfNeeded();
 

source/plugin/carla-lv2.cpp

@@ -90,8 +90,7 @@ public:
           fURIs(),
           fUI(),
           fPorts(),
-          sJuceInitialiser(),
-          leakDetector_NativePlugin()
+          sJuceInitialiser()
     {
         run  = extui_run;
         show = extui_show;

source/plugin/carla-vst.cpp

@@ -83,8 +83,7 @@ public:
           fVstRect(),
           fMidiOutEvents(),
           fStateChunk(nullptr),
-          sJuceInitialiser(),
-          leakDetector_NativePlugin()
+          sJuceInitialiser()
     {
         fHost.handle      = this;
         fHost.uiName      = carla_strdup("CarlaVST");

source/utils/CarlaExternalUI.hpp

@@ -37,8 +37,7 @@ public:
         : fFilename(),
           fArg1(),
           fArg2(),
-          fUiState(UiNone),
-          leakDetector_CarlaExternalUI() {}
+          fUiState(UiNone) {}
 
     ~CarlaExternalUI() /*noexcept*/ override
     {

source/utils/CarlaJuceEvents.cpp

@@ -41,8 +41,7 @@ public:
         : Thread("JuceEventsThread"),
           fInitializing(false),
           fLock(),
-          fQueue(),
-          leakDetector_JuceEventsThread() {}
+          fQueue() {}
 
     ~JuceEventsThread()
     {

source/utils/CarlaPipeUtils.cpp

@@ -534,8 +534,7 @@ struct CarlaPipeCommon::PrivateData {
 // -----------------------------------------------------------------------
 
 CarlaPipeCommon::CarlaPipeCommon() noexcept
-    : pData(new PrivateData()),
-      leakDetector_CarlaPipeCommon()
+    : pData(new PrivateData())
 {
     carla_debug("CarlaPipeCommon::CarlaPipeCommon()");
 }
@@ -1112,8 +1111,7 @@ bool CarlaPipeCommon::_writeMsgBuffer(const char* const msg, const std::size_t s
 // -----------------------------------------------------------------------
 
 CarlaPipeServer::CarlaPipeServer() noexcept
-    : CarlaPipeCommon(),
-      leakDetector_CarlaPipeServer()
+    : CarlaPipeCommon()
 {
     carla_debug("CarlaPipeServer::CarlaPipeServer()");
 }
@@ -1485,8 +1483,7 @@ void CarlaPipeServer::writeHideMessage() const noexcept
 // -----------------------------------------------------------------------
 
 CarlaPipeClient::CarlaPipeClient() noexcept
-    : CarlaPipeCommon(),
-      leakDetector_CarlaPipeClient()
+    : CarlaPipeCommon()
 {
     carla_debug("CarlaPipeClient::CarlaPipeClient()");
 }

source/utils/CarlaPluginUI.cpp

@@ -133,9 +133,8 @@ public:
           DocumentWindow("JucePluginUI", Colour(50, 50, 200), DocumentWindow::closeButton, false),
           fClosed(false),
 #ifdef CARLA_OS_MAC
-          fCocoaWrapper(),
+        , fCocoaWrapper()
 #endif
-          leakDetector_JucePluginUI()
     {
         setVisible(false);
         //setAlwaysOnTop(true);
@@ -296,8 +295,7 @@ public:
           fWindow(0),
           fIsVisible(false),
           fFirstShow(true),
-          fEventProc(nullptr),
-          leakDetector_X11PluginUI()
+          fEventProc(nullptr)
      {
         fDisplay = XOpenDisplay(nullptr);
         CARLA_SAFE_ASSERT_RETURN(fDisplay != nullptr,);

source/utils/JucePluginWindow.hpp

@@ -39,8 +39,7 @@ class JucePluginWindow : public DocumentWindow
 public:
     JucePluginWindow()
         : DocumentWindow("JucePluginWindow", Colour(50, 50, 200), DocumentWindow::closeButton, false),
-          fClosed(false),
-          leakDetector_JucePluginWindow()
+          fClosed(false)
     {
         setVisible(false);
         //setAlwaysOnTop(true);

source/widgets/digitalpeakmeter.hpp

@@ -65,8 +65,7 @@ public:
           fMeterStyle(STYLE_DEFAULT),
           fMeterBackground("#111111"),
           fMeterGradient(0, 0, 0, 0),
-          fSmoothMultiplier(1),
-          leakDetector_DigitalPeakMeter()
+          fSmoothMultiplier(1)
     {
         updateGrandient();
     }