From b1dbb3828c3e1f7a3315131ef8610c6bb75c2a4c Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 30 Jul 2013 15:49:31 +0100 Subject: [PATCH] Misc --- source/modules/utils/CarlaLogThread.hpp | 5 ++++- source/modules/widgets/Makefile | 6 ++++-- source/modules/widgets/digitalpeakmeter.cpp | 2 +- source/modules/widgets/digitalpeakmeter.hpp | 11 ++++++----- source/modules/widgets/ledbutton.cpp | 2 +- source/modules/widgets/ledbutton.hpp | 11 ++++++----- source/modules/widgets/paramspinbox.cpp | 2 +- source/modules/widgets/paramspinbox.hpp | 11 ++++++----- source/modules/widgets/pixmapdial.cpp | 2 +- source/modules/widgets/pixmapdial.hpp | 11 ++++++----- source/modules/widgets/pixmapkeyboard.cpp | 2 +- source/modules/widgets/pixmapkeyboard.hpp | 11 ++++++----- 12 files changed, 43 insertions(+), 33 deletions(-) diff --git a/source/modules/utils/CarlaLogThread.hpp b/source/modules/utils/CarlaLogThread.hpp index 387a65572..e168aca36 100644 --- a/source/modules/utils/CarlaLogThread.hpp +++ b/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 #include @@ -133,6 +133,9 @@ private: CallbackFunc fCallback; void* fCallbackPtr; + + CARLA_PREVENT_HEAP_ALLOCATION + CARLA_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(LogThread) }; // ----------------------------------------------------------------------- diff --git a/source/modules/widgets/Makefile b/source/modules/widgets/Makefile index adad24bd4..82d48eed5 100644 --- a/source/modules/widgets/Makefile +++ b/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 diff --git a/source/modules/widgets/digitalpeakmeter.cpp b/source/modules/widgets/digitalpeakmeter.cpp index 16e17fad2..1c8a81ab7 100644 --- a/source/modules/widgets/digitalpeakmeter.cpp +++ b/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" diff --git a/source/modules/widgets/digitalpeakmeter.hpp b/source/modules/widgets/digitalpeakmeter.hpp index 8cb08ab0b..db3a61afb 100644 --- a/source/modules/widgets/digitalpeakmeter.hpp +++ b/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 diff --git a/source/modules/widgets/ledbutton.cpp b/source/modules/widgets/ledbutton.cpp index ceb58b54c..b9fdeb3ef 100644 --- a/source/modules/widgets/ledbutton.cpp +++ b/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" diff --git a/source/modules/widgets/ledbutton.hpp b/source/modules/widgets/ledbutton.hpp index 773decd21..20a52768f 100644 --- a/source/modules/widgets/ledbutton.hpp +++ b/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 diff --git a/source/modules/widgets/paramspinbox.cpp b/source/modules/widgets/paramspinbox.cpp index 58cb6db86..53020387b 100644 --- a/source/modules/widgets/paramspinbox.cpp +++ b/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" diff --git a/source/modules/widgets/paramspinbox.hpp b/source/modules/widgets/paramspinbox.hpp index 7a147b388..3641861e1 100644 --- a/source/modules/widgets/paramspinbox.hpp +++ b/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 diff --git a/source/modules/widgets/pixmapdial.cpp b/source/modules/widgets/pixmapdial.cpp index 986ac58db..472650d7a 100644 --- a/source/modules/widgets/pixmapdial.cpp +++ b/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" diff --git a/source/modules/widgets/pixmapdial.hpp b/source/modules/widgets/pixmapdial.hpp index b567da895..09126489a 100644 --- a/source/modules/widgets/pixmapdial.hpp +++ b/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 diff --git a/source/modules/widgets/pixmapkeyboard.cpp b/source/modules/widgets/pixmapkeyboard.cpp index df87b0bf6..229b5c256 100644 --- a/source/modules/widgets/pixmapkeyboard.cpp +++ b/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" diff --git a/source/modules/widgets/pixmapkeyboard.hpp b/source/modules/widgets/pixmapkeyboard.hpp index 2efb619e5..1ea32ffd5 100644 --- a/source/modules/widgets/pixmapkeyboard.hpp +++ b/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