Misc

source/modules/utils/CarlaLogThread.hpp

@@ -19,7 +19,7 @@
 #define CARLA_LOG_THREAD_HPP_INCLUDED
 
 #include "CarlaBackend.hpp"
-#include "CarlaUtils.hpp"
+#include "CarlaJuceUtils.hpp"
 
 #include <fcntl.h>
 #include <QtCore/QThread>
@@ -133,6 +133,9 @@ private:
 
     CallbackFunc fCallback;
     void*        fCallbackPtr;
+
+    CARLA_PREVENT_HEAP_ALLOCATION
+    CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(LogThread)
 };
 
 // -----------------------------------------------------------------------

source/modules/widgets/Makefile

@@ -24,12 +24,14 @@ FILES = \
 	moc_paramspinbox.cpp \
 	moc_pixmapkeyboard.cpp
 
-OBJS = \
+OBJS  = \
 	digitalpeakmeter.cpp.o \
 	ledbutton.cpp.o \
 	paramspinbox.cpp.o \
 	pixmapdial.cpp.o \
-	pixmapkeyboard.cpp.o \
+	pixmapkeyboard.cpp.o
+
+OBJS += \
 	moc_paramspinbox.cpp.o \
 	moc_pixmapkeyboard.cpp.o
 

source/modules/widgets/digitalpeakmeter.cpp

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * For a full copy of the GNU General Public License see the GPL.txt file
+ * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
 #include "digitalpeakmeter.hpp"

source/modules/widgets/digitalpeakmeter.hpp

@@ -12,11 +12,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * For a full copy of the GNU General Public License see the GPL.txt file
+ * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#ifndef __DIGITALPEAKMETER_HPP__
-#define __DIGITALPEAKMETER_HPP__
+#ifndef DIGITALPEAKMETER_HPP_INCLUDED
+#define DIGITALPEAKMETER_HPP_INCLUDED
 
 #include "CarlaJuceUtils.hpp"
 
@@ -74,7 +74,8 @@ private:
     float* fChannelsData;
     float* fLastValueData;
 
-    CARLA_LEAK_DETECTOR(DigitalPeakMeter)
+    CARLA_PREVENT_HEAP_ALLOCATION
+    CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(DigitalPeakMeter)
 };
 
-#endif // __DIGITALPEAKMETER_HPP__
+#endif // DIGITALPEAKMETER_HPP_INCLUDED

source/modules/widgets/ledbutton.cpp

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * For a full copy of the GNU General Public License see the GPL.txt file
+ * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
 #include "ledbutton.hpp"

source/modules/widgets/ledbutton.hpp

@@ -12,11 +12,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * For a full copy of the GNU General Public License see the GPL.txt file
+ * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#ifndef __LEDBUTTON_HPP__
-#define __LEDBUTTON_HPP__
+#ifndef LEDBUTTON_HPP_INCLUDED
+#define LEDBUTTON_HPP_INCLUDED
 
 #include "CarlaJuceUtils.hpp"
 
@@ -54,7 +54,8 @@ private:
     QPixmap fPixmap;
     QRectF  fPixmapRect;
 
-    CARLA_LEAK_DETECTOR(LEDButton)
+    CARLA_PREVENT_HEAP_ALLOCATION
+    CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(LEDButton)
 };
 
-#endif // __LEDBUTTON_HPP__
+#endif // LEDBUTTON_HPP_INCLUDED

source/modules/widgets/paramspinbox.cpp

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * For a full copy of the GNU General Public License see the GPL.txt file
+ * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
 #include "paramspinbox.hpp"

source/modules/widgets/paramspinbox.hpp

@@ -12,11 +12,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * For a full copy of the GNU General Public License see the GPL.txt file
+ * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#ifndef __PARAMSPINBOX_HPP__
-#define __PARAMSPINBOX_HPP__
+#ifndef PARAMSPINBOX_HPP_INCLUDED
+#define PARAMSPINBOX_HPP_INCLUDED
 
 #include "CarlaJuceUtils.hpp"
 
@@ -68,7 +68,8 @@ private:
 
     TextCallback* m_textCall;
 
-    CARLA_LEAK_DETECTOR(ParamProgressBar)
+    CARLA_PREVENT_HEAP_ALLOCATION
+    CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ParamProgressBar)
 };
 
-#endif // #define __PARAMSPINBOX_HPP__
+#endif // PARAMSPINBOX_HPP_INCLUDED

source/modules/widgets/pixmapdial.cpp

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * For a full copy of the GNU General Public License see the GPL.txt file
+ * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
 #include "pixmapdial.hpp"

source/modules/widgets/pixmapdial.hpp

@@ -12,11 +12,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * For a full copy of the GNU General Public License see the GPL.txt file
+ * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#ifndef __PIXMAPDIAL_HPP__
-#define __PIXMAPDIAL_HPP__
+#ifndef PIXMAPDIAL_HPP_INCLUDED
+#define PIXMAPDIAL_HPP_INCLUDED
 
 #include "CarlaJuceUtils.hpp"
 
@@ -93,7 +93,8 @@ private:
 
     int fWidth, fHeight, fSize, fCount;
 
-    CARLA_LEAK_DETECTOR(PixmapDial)
+    CARLA_PREVENT_HEAP_ALLOCATION
+    CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(PixmapDial)
 };
 
-#endif // __PIXMAPDIAL_HPP__
+#endif // PIXMAPDIAL_HPP_INCLUDED

source/modules/widgets/pixmapkeyboard.cpp

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * For a full copy of the GNU General Public License see the GPL.txt file
+ * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
 #include "pixmapkeyboard.hpp"

source/modules/widgets/pixmapkeyboard.hpp

@@ -12,11 +12,11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * For a full copy of the GNU General Public License see the GPL.txt file
+ * For a full copy of the GNU General Public License see the doc/GPL.txt file.
  */
 
-#ifndef __PIXMAPKEYBOARD_HPP__
-#define __PIXMAPKEYBOARD_HPP__
+#ifndef PIXMAPKEYBOARD_HPP_INCLUDED
+#define PIXMAPKEYBOARD_HPP_INCLUDED
 
 #include "CarlaJuceUtils.hpp"
 
@@ -87,7 +87,8 @@ private:
     bool _isNoteBlack(int note) const;
     const QRectF& _getRectFromMidiNote(int note) const;
 
-    CARLA_LEAK_DETECTOR(PixmapKeyboard)
+    CARLA_PREVENT_HEAP_ALLOCATION
+    CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(PixmapKeyboard)
 };
 
-#endif // __PIXMAPKEYBOARD_HPP__
+#endif // PIXMAPKEYBOARD_HPP_INCLUDED