Namespace lmms (#6174)

This PR places all LMMS symbols into namespaces to eliminate any potential future name collisions between LMMS and third-party modules.

Also, this PR changes back `LmmsCore` to `Engine`, reverting c519921306 .

Co-authored-by: allejok96 <allejok96@gmail.com>

include/AboutDialog.h

@@ -30,6 +30,8 @@
 
 #include "ui_about_dialog.h"
 
+namespace lmms::gui
+{
 
 class AboutDialog : public QDialog, public Ui::AboutDialog
 {
@@ -38,6 +40,7 @@ public:
 
 } ;
 
+} // namespace lmms::gui
 
 #endif
 

include/ActionGroup.h

@@ -28,6 +28,9 @@
 
 #include <QActionGroup>
 
+namespace lmms::gui
+{
+
 /// \brief Convenience subclass of QActionGroup
 ///
 /// This class provides the same functionality as QActionGroup, but in addition
@@ -54,4 +57,6 @@ private:
 	QList<QAction*> m_actions;
 };
 
+} // namespace lmms::gui
+
 #endif

include/AudioAlsa.h

@@ -37,6 +37,8 @@
 
 #include "AudioDevice.h"
 
+namespace lmms
+{
 
 class AudioAlsa : public QThread, public AudioDevice
 {
@@ -102,6 +104,8 @@ private:
 
 } ;
 
-#endif
+} // namespace lmms
+
+#endif // LMMS_HAVE_ALSA
 
 #endif

include/AudioAlsaSetupWidget.h

@@ -35,8 +35,11 @@
 
 
 class QComboBox;
-class LcdSpinBox;
 
+namespace lmms::gui
+{
+
+class LcdSpinBox;
 
 class AudioAlsaSetupWidget : public AudioDeviceSetupWidget
 {
@@ -59,6 +62,8 @@ private:
 	AudioAlsa::DeviceInfoCollection m_deviceInfos;
 };
 
-#endif
+} // namespace lmms::gui
+
+#endif // LMMS_HAVE_ALSA
 
 #endif

include/AudioDevice.h

@@ -30,10 +30,13 @@
 
 #include "lmms_basics.h"
 
+class QThread;
+
+namespace lmms
+{
 
 class AudioEngine;
 class AudioPort;
-class QThread;
 
 
 class AudioDevice
@@ -153,7 +156,8 @@ private:
 
 	surroundSampleFrame * m_buffer;
 
-} ;
+};
 
+} // namespace lmms
 
 #endif

include/AudioDeviceSetupWidget.h

@@ -27,6 +27,8 @@
 
 #include "TabWidget.h"
 
+namespace lmms::gui
+{
 
 class AudioDeviceSetupWidget : public TabWidget
 {
@@ -41,5 +43,6 @@ public:
 	virtual void show();
 };
 
+} // namespace lmms::gui
 
 #endif

include/AudioDummy.h

@@ -30,6 +30,8 @@
 #include "AudioEngine.h"
 #include "MicroTimer.h"
 
+namespace lmms
+{
 
 class AudioDummy : public QThread, public AudioDevice
 {
@@ -52,11 +54,11 @@ public:
 	}
 
 
-	class setupWidget : public AudioDeviceSetupWidget
+	class setupWidget : public gui::AudioDeviceSetupWidget
 	{
 	public:
 		setupWidget( QWidget * _parent ) :
-			AudioDeviceSetupWidget( AudioDummy::name(), _parent )
+			gui::AudioDeviceSetupWidget( AudioDummy::name(), _parent )
 		{
 		}
 
@@ -114,5 +116,6 @@ private:
 
 } ;
 
+} // namespace lmms
 
 #endif

include/AudioEngine.h

@@ -39,9 +39,13 @@
 #include "PlayHandle.h"
 
 
+namespace lmms
+{
+
 class AudioDevice;
 class MidiClient;
 class AudioPort;
+class AudioEngineWorkerThread;
 
 
 const fpp_t MINIMUM_BUFFER_SIZE = 32;
@@ -54,10 +58,6 @@ const int BYTES_PER_SURROUND_FRAME = sizeof( surroundSampleFrame );
 
 const float OUTPUT_SAMPLE_MULTIPLIER = 32767.0f;
 
-
-class AudioEngineWorkerThread;
-
-
 class LMMS_EXPORT AudioEngine : public QObject
 {
 	Q_OBJECT
@@ -361,7 +361,7 @@ public:
 signals:
 	void qualitySettingsChanged();
 	void sampleRateChanged();
-	void nextAudioBuffer( const surroundSampleFrame * buffer );
+	void nextAudioBuffer( const lmms::surroundSampleFrame * buffer );
 
 
 private:
@@ -471,9 +471,11 @@ private:
 
 	bool m_waitingForWrite;
 
-	friend class LmmsCore;
+	friend class Engine;
 	friend class AudioEngineWorkerThread;
 	friend class ProjectRenderer;
 } ;
 
+} // namespace lmms
+
 #endif

include/AudioEngineProfiler.h

@@ -30,6 +30,9 @@
 #include "lmms_basics.h"
 #include "MicroTimer.h"
 
+namespace lmms
+{
+
 class AudioEngineProfiler
 {
 public:
@@ -57,4 +60,6 @@ private:
 	QFile m_outputFile;
 };
 
+} // namespace lmms
+
 #endif

include/AudioEngineWorkerThread.h

@@ -29,8 +29,12 @@
 
 #include <atomic>
 
-class AudioEngine;
 class QWaitCondition;
+
+namespace lmms
+{
+
+class AudioEngine;
 class ThreadableJob;
 
 class AudioEngineWorkerThread : public QThread
@@ -115,5 +119,6 @@ private:
 	volatile bool m_quit;
 } ;
 
+} // namespace lmms
 
 #endif

include/AudioFileDevice.h

@@ -31,6 +31,8 @@
 #include "AudioDevice.h"
 #include "OutputSettings.h"
 
+namespace lmms
+{
 
 class AudioFileDevice : public AudioDevice
 {
@@ -74,5 +76,6 @@ typedef AudioFileDevice * ( * AudioFileDeviceInstantiaton )
 					  AudioEngine* audioEngine,
 					  bool & successful );
 
+} // namespace lmms
 
 #endif

include/AudioFileFlac.h

@@ -30,6 +30,9 @@
 #include "AudioFileDevice.h"
 #include <sndfile.h>
 
+namespace lmms
+{
+
 class AudioFileFlac: public AudioFileDevice
 {
 public:
@@ -71,4 +74,7 @@ private:
 
 };
 
+
+} // namespace lmms
+
 #endif //AUDIO_FILE_FLAC_H

include/AudioFileMP3.h

@@ -34,6 +34,8 @@
 
 #include "lame/lame.h"
 
+namespace lmms
+{
 
 class AudioFileMP3 : public AudioFileDevice
 {
@@ -69,6 +71,8 @@ private:
 	lame_t m_lame;
 };
 
-#endif
+} // namespace lmms
+
+#endif // LMMS_HAVE_MP3LAME
 
 #endif

include/AudioFileOgg.h

@@ -34,6 +34,8 @@
 
 #include "AudioFileDevice.h"
 
+namespace lmms
+{
 
 class AudioFileOgg : public AudioFileDevice
 {
@@ -107,6 +109,8 @@ private:
 } ;
 
 
-#endif
+} // namespace lmms
+
+#endif // LMMS_HAVE_OGGVORBIS
 
 #endif

include/AudioFileWave.h

@@ -31,6 +31,8 @@
 
 #include <sndfile.h>
 
+namespace lmms
+{
 
 class AudioFileWave : public AudioFileDevice
 {
@@ -66,4 +68,7 @@ private:
 	SNDFILE * m_sf;
 } ;
 
+
+} // namespace lmms
+
 #endif

include/AudioJack.h

@@ -41,9 +41,17 @@
 #include "AudioDeviceSetupWidget.h"
 
 class QLineEdit;
-class LcdSpinBox;
+
+namespace lmms
+{
+
 class MidiJack;
 
+namespace gui
+{
+class LcdSpinBox;
+}
+
 
 class AudioJack : public QObject, public AudioDevice
 {
@@ -66,7 +74,7 @@ public:
 	}
 
 
-	class setupWidget : public AudioDeviceSetupWidget
+class setupWidget : public gui::AudioDeviceSetupWidget
 	{
 	public:
 		setupWidget( QWidget * _parent );
@@ -76,7 +84,7 @@ public:
 
 	private:
 		QLineEdit * m_clientName;
-		LcdSpinBox * m_channels;
+		gui::LcdSpinBox * m_channels;
 
 	} ;
 
@@ -132,6 +140,8 @@ signals:
 
 } ;
 
-#endif
+} // namespace lmms
+
+#endif // LMMS_HAVE_JACK
 
 #endif

include/AudioOss.h

@@ -34,10 +34,17 @@
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
 
-
-class LcdSpinBox;
 class QLineEdit;
 
+namespace lmms
+{
+
+namespace gui
+{
+class LcdSpinBox;
+}
+
+
 
 class AudioOss : public QThread, public AudioDevice
 {
@@ -54,7 +61,7 @@ public:
 	static QString probeDevice();
 
 
-	class setupWidget : public AudioDeviceSetupWidget
+class setupWidget : public gui::AudioDeviceSetupWidget
 	{
 	public:
 		setupWidget( QWidget * _parent );
@@ -64,7 +71,7 @@ public:
 
 	private:
 		QLineEdit * m_device;
-		LcdSpinBox * m_channels;
+		gui::LcdSpinBox * m_channels;
 
 	} ;
 
@@ -81,7 +88,8 @@ private:
 
 } ;
 
-
-#endif
+} // namespace lmms
+
+#endif // LMMS_HAVE_OSS
 
 #endif

include/AudioPort.h

@@ -32,6 +32,9 @@
 #include "MemoryManager.h"
 #include "PlayHandle.h"
 
+namespace lmms
+{
+
 class EffectChain;
 class FloatModel;
 class BoolModel;
@@ -133,5 +136,6 @@ private:
 
 } ;
 
+} // namespace lmms
 
 #endif

include/AudioPortAudio.h

@@ -30,9 +30,28 @@
 #include "lmmsconfig.h"
 #include "ComboBoxModel.h"
 
+#ifdef LMMS_HAVE_PORTAUDIO
+
+#   include <portaudio.h>
+
+#   include "AudioDevice.h"
+#   include "AudioDeviceSetupWidget.h"
+
+#   if defined paNeverDropInput || defined paNonInterleaved
+#	    define PORTAUDIO_V19
+#   else
+#	    define PORTAUDIO_V18
+#   endif
+
+#endif
+
+
+namespace lmms
+{
+
 class AudioPortAudioSetupUtil : public QObject
 {
-	Q_OBJECT
+Q_OBJECT
 public slots:
 	void updateBackends();
 	void updateDevices();
@@ -41,26 +60,17 @@ public slots:
 public:
 	ComboBoxModel m_backendModel;
 	ComboBoxModel m_deviceModel;
-} ;
+};
 
 
 #ifdef LMMS_HAVE_PORTAUDIO
 
-#include <portaudio.h>
-
-
-#include "AudioDevice.h"
-#include "AudioDeviceSetupWidget.h"
-
-#if defined paNeverDropInput || defined paNonInterleaved
-#	define PORTAUDIO_V19
-#else
-#	define PORTAUDIO_V18
-#endif
-
 
+namespace gui
+{
 class ComboBox;
 class LcdSpinBox;
+}
 
 
 class AudioPortAudio : public AudioDevice
@@ -80,7 +90,7 @@ public:
 		unsigned long _framesPerBuffer );
 
 
-	class setupWidget : public AudioDeviceSetupWidget
+	class setupWidget : public gui::AudioDeviceSetupWidget
 	{
 	public:
 		setupWidget( QWidget * _parent );
@@ -90,8 +100,8 @@ public:
 		virtual void show();
 
 	private:
-		ComboBox * m_backend;
-		ComboBox * m_device;
+		gui::ComboBox * m_backend;
+		gui::ComboBox * m_device;
 		AudioPortAudioSetupUtil m_setupUtil;
 
 	} ;
@@ -149,6 +159,8 @@ private:
 
 } ;
 
-#endif
+#endif // LMMS_HAVE_PORTAUDIO
+
+} // namespace lmms
 
 #endif

include/AudioPulseAudio.h

@@ -36,10 +36,16 @@
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
 
-
-class LcdSpinBox;
 class QLineEdit;
 
+namespace lmms
+{
+
+namespace gui
+{
+class LcdSpinBox;
+}
+
 
 class AudioPulseAudio : public QThread, public AudioDevice
 {
@@ -56,7 +62,7 @@ public:
 	static QString probeDevice();
 
 
-	class setupWidget : public AudioDeviceSetupWidget
+	class setupWidget : public gui::AudioDeviceSetupWidget
 	{
 	public:
 		setupWidget( QWidget * _parent );
@@ -66,7 +72,7 @@ public:
 
 	private:
 		QLineEdit * m_device;
-		LcdSpinBox * m_channels;
+		gui::LcdSpinBox * m_channels;
 
 	} ;
 
@@ -94,6 +100,8 @@ private:
 
 } ;
 
+} // namespace lmms
+
 #endif
 
 #endif

include/AudioSampleRecorder.h

@@ -31,6 +31,9 @@
 
 #include "AudioDevice.h"
 
+namespace lmms
+{
+
 class SampleBuffer;
 
 
@@ -54,5 +57,6 @@ private:
 
 } ;
 
+} // namespace lmms
 
 #endif

include/AudioSdl.h

@@ -41,6 +41,8 @@
 
 class QLineEdit;
 
+namespace lmms
+{
 
 class AudioSdl : public AudioDevice
 {
@@ -55,7 +57,7 @@ public:
 	}
 
 
-	class setupWidget : public AudioDeviceSetupWidget
+	class setupWidget : public gui::AudioDeviceSetupWidget
 	{
 	public:
 		setupWidget( QWidget * _parent );
@@ -108,6 +110,9 @@ private:
 
 } ;
 
-#endif
+
+} // namespace lmms
+
+#endif // LMMS_HAVE_SDL
 
 #endif

include/AudioSndio.h

@@ -36,9 +36,16 @@
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
 
-class LcdSpinBox;
 class QLineEdit;
 
+namespace lmms
+{
+
+namespace gui
+{
+class LcdSpinBox;
+}
+
 
 class AudioSndio : public QThread, public AudioDevice
 {
@@ -52,7 +59,7 @@ public:
 		return QT_TRANSLATE_NOOP( "AudioDeviceSetupWidget", "sndio" );
 	}
 
-	class setupWidget : public AudioDeviceSetupWidget
+	class setupWidget : public gui::AudioDeviceSetupWidget
 	{
 	public:
 		setupWidget( QWidget * _parent );
@@ -62,7 +69,7 @@ public:
 
 	private:
 		QLineEdit * m_device;
-		LcdSpinBox * m_channels;
+		gui::LcdSpinBox * m_channels;
 	} ;
 
 private:
@@ -78,6 +85,8 @@ private:
 } ;
 
 
+} // namespace lmms
+
 #endif	/* LMMS_HAVE_SNDIO */
 
 #endif	/* _AUDIO_SNDIO_H */

include/AudioSoundIo.h

@@ -37,8 +37,14 @@
 #include "AudioDevice.h"
 #include "AudioDeviceSetupWidget.h"
 
+namespace lmms
+{
+
+namespace gui
+{
 class ComboBox;
 class LcdSpinBox;
+}
 
 // Exists only to work around "Error: Meta object features not supported for nested classes"
 class AudioSoundIoSetupUtil : public QObject
@@ -134,6 +140,9 @@ private:
 
 };
 
-#endif
+
+} // namespace lmms
+
+#endif // LMMS_HAVE_SOUNDIO
 
 #endif

include/AutomatableButton.h

@@ -30,6 +30,8 @@
 
 #include "AutomatableModelView.h"
 
+namespace lmms::gui
+{
 
 class automatableButtonGroup;
 
@@ -105,5 +107,6 @@ private:
 } ;
 
 
+} // namespace lmms::gui
 
 #endif

include/AutomatableModel.h

@@ -35,6 +35,10 @@
 #include "MemoryManager.h"
 #include "ModelVisitor.h"
 
+
+namespace lmms
+{
+
 // simple way to map a property of a view to a model
 #define mapPropertyFromModelPtr(type,getfunc,setfunc,modelname)	\
 		public:													\
@@ -416,7 +420,7 @@ private:
 
 signals:
 	void initValueChanged( float val );
-	void destroyed( jo_id_t id );
+	void destroyed( lmms::jo_id_t id );
 
 } ;
 
@@ -502,5 +506,8 @@ public:
 
 typedef QMap<AutomatableModel*, float> AutomatedValueMap;
 
+
+} // namespace lmms
+
 #endif
 

include/AutomatableModelView.h

@@ -32,6 +32,9 @@
 class QMenu;
 class QMouseEvent;
 
+namespace lmms::gui
+{
+
 class LMMS_EXPORT AutomatableModelView : public ModelView
 {
 public:
@@ -132,5 +135,7 @@ using FloatModelView = TypedModelView<FloatModel>;
 using IntModelView = TypedModelView<IntModel>;
 using BoolModelView = TypedModelView<BoolModel>;
 
+} // namespace lmms::gui
+
 #endif
 

include/AutomatableSlider.h

@@ -31,6 +31,8 @@
 #include "AutomatableModelView.h"
 
 
+namespace lmms::gui
+{
 
 class AutomatableSlider : public QSlider, public IntModelView
 {
@@ -73,5 +75,6 @@ private slots:
 
 typedef IntModel sliderModel;
 
+} // namespace lmms::gui
 
 #endif

include/AutomationClip.h

@@ -34,9 +34,17 @@
 #include "Clip.h"
 
 
+namespace lmms
+{
+
 class AutomationTrack;
 class TimePos;
 
+namespace gui
+{
+class AutomationClipView;
+} // namespace gui
+
 
 
 class LMMS_EXPORT AutomationClip : public Clip
@@ -152,7 +160,7 @@ public:
 	static const QString classNodeName() { return "automationclip"; }
 	QString nodeName() const override { return classNodeName(); }
 
-	ClipView * createView( TrackView * _tv ) override;
+	gui::ClipView * createView( gui::TrackView * _tv ) override;
 
 
 	static bool isAutomated( const AutomatableModel * _m );
@@ -168,7 +176,7 @@ public:
 
 public slots:
 	void clear();
-	void objectDestroyed( jo_id_t );
+	void objectDestroyed( lmms::jo_id_t );
 	void flipY( int min, int max );
 	void flipY();
 	void flipX( int length = -1 );
@@ -204,7 +212,7 @@ private:
 	static const float DEFAULT_MIN_VALUE;
 	static const float DEFAULT_MAX_VALUE;
 
-	friend class AutomationClipView;
+	friend class gui::AutomationClipView;
 	friend class AutomationNode;
 
 } ;
@@ -242,4 +250,7 @@ inline int POS(AutomationClip::TimemapIterator it)
 	return it.key();
 }
 
+
+} // namespace lmms
+
 #endif

include/AutomationClipView.h

@@ -29,8 +29,14 @@
 
 #include "ClipView.h"
 
+namespace lmms
+{
+
 class AutomationClip;
 
+namespace gui
+{
+
 
 class AutomationClipView : public ClipView
 {
@@ -75,4 +81,8 @@ private:
 } ;
 
 
+} // namespace gui
+
+} // namespace lmms
+
 #endif

include/AutomationEditor.h

@@ -40,9 +40,16 @@ class QPainter;
 class QPixmap;
 class QScrollBar;
 
-class ComboBox;
-class Knob;
+namespace lmms
+{
+
 class NotePlayHandle;
+
+namespace gui
+{
+
+class Knob;
+class ComboBox;
 class TimeLineWidget;
 
 
@@ -128,7 +135,7 @@ protected slots:
 	void setProgressionType(int type);
 	void setTension();
 
-	void updatePosition( const TimePos & t );
+	void updatePosition( const lmms::TimePos & t );
 
 	void zoomingXChanged();
 	void zoomingYChanged();
@@ -234,7 +241,7 @@ private:
 
 signals:
 	void currentClipChanged();
-	void positionChanged( const TimePos & );
+	void positionChanged( const lmms::TimePos & );
 } ;
 
 
@@ -293,5 +300,8 @@ private:
 	ComboBox * m_quantizeComboBox;
 };
 
+} // namespace gui
+
+} // namespace lmms
 
 #endif

include/AutomationNode.h

@@ -26,6 +26,9 @@
 #ifndef AUTOMATION_NODE_H
 #define AUTOMATION_NODE_H
 
+namespace lmms
+{
+
 class AutomationClip;
 
 
@@ -151,5 +154,6 @@ private:
 	float m_outTangent;
 };
 
+} // namespace lmms
 
 #endif

include/AutomationTrack.h

@@ -29,6 +29,8 @@
 
 #include "Track.h"
 
+namespace lmms
+{
 
 class AutomationTrack : public Track
 {
@@ -45,7 +47,7 @@ public:
 		return "automationtrack";
 	}
 
-	TrackView * createView( TrackContainerView* ) override;
+	gui::TrackView * createView( gui::TrackContainerView* ) override;
 	Clip* createClip(const TimePos & pos) override;
 
 	virtual void saveTrackSpecificSettings( QDomDocument & _doc,
@@ -58,4 +60,6 @@ private:
 } ;
 
 
+} // namespace lmms
+
 #endif

include/AutomationTrackView.h

@@ -28,8 +28,14 @@
 
 #include "TrackView.h"
 
+namespace lmms
+{
+
 class AutomationTrack;
 
+namespace gui
+{
+
 
 class AutomationTrackView : public TrackView
 {
@@ -42,4 +48,8 @@ public:
 } ;
 
 
+} // namespace gui
+
+} // namespace lmms
+
 #endif

include/BandLimitedWave.h

@@ -36,6 +36,9 @@ class QString;
 #include "Engine.h"
 #include "AudioEngine.h"
 
+namespace lmms
+{
+
 constexpr int MAXLEN = 11;
 constexpr int MIPMAPSIZE = 2 << ( MAXLEN + 1 );
 constexpr int MIPMAPSIZE3 = 3 << ( MAXLEN + 1 );
@@ -168,5 +171,6 @@ public:
 	static QString s_wavetableDir;
 };
 
+} // namespace lmms
 
 #endif

include/BasicFilters.h

@@ -43,6 +43,9 @@
 #include "interpolation.h"
 #include "MemoryManager.h"
 
+namespace lmms
+{
+
 template<ch_cnt_t CHANNELS=DEFAULT_CHANNELS> class BasicFilters;
 
 template<ch_cnt_t CHANNELS>
@@ -913,4 +916,6 @@ private:
 } ;
 
 
+} // namespace lmms
+
 #endif

include/BufferManager.h

@@ -29,10 +29,14 @@
 #include "lmms_export.h"
 #include "lmms_basics.h"
 
+namespace lmms
+{
+
+
 class LMMS_EXPORT BufferManager
 {
 public:
-	static void init( fpp_t framesPerPeriod );
+	static void init( fpp_t fpp );
 	static sampleFrame * acquire();
 	// audio-buffer-mgm
 	static void clear( sampleFrame * ab, const f_cnt_t frames,
@@ -42,6 +46,12 @@ public:
 						const f_cnt_t offset = 0 );
 #endif
 	static void release( sampleFrame * buf );
+
+private:
+	static fpp_t s_framesPerPeriod;
 };
 
+
+} // namespace lmms
+
 #endif

include/CPULoadWidget.h

@@ -34,6 +34,10 @@
 #include "lmms_basics.h"
 
 
+namespace lmms::gui
+{
+
+
 class CPULoadWidget : public QWidget
 {
 	Q_OBJECT
@@ -64,4 +68,6 @@ private:
 } ;
 
 
+} // namespace lmms::gui
+
 #endif

include/CaptionMenu.h

@@ -30,6 +30,9 @@
 
 #include "lmms_export.h"
 
+namespace lmms::gui
+{
+
 ///
 /// \brief A context menu with a caption
 ///
@@ -42,6 +45,6 @@ public:
 } ;
 
 
-
+} // namespace lmms::gui
 
 #endif

include/Clip.h

@@ -30,11 +30,20 @@
 #include "AutomatableModel.h"
 
 
+namespace lmms
+{
+
 class Track;
-class ClipView;
 class TrackContainer;
+
+namespace gui
+{
+
+class ClipView;
 class TrackView;
 
+} // namespace gui
+
 
 class LMMS_EXPORT Clip : public Model, public JournallingObject
 {
@@ -116,7 +125,7 @@ public:
 	virtual void movePosition( const TimePos & pos );
 	virtual void changeLength( const TimePos & length );
 
-	virtual ClipView * createView( TrackView * tv ) = 0;
+	virtual gui::ClipView * createView( gui::TrackView * tv ) = 0;
 
 	inline void selectViewOnCreate( bool select )
 	{
@@ -177,4 +186,6 @@ private:
 } ;
 
 
+} // namespace lmms
+
 #endif

include/ClipView.h

@@ -36,9 +36,16 @@
 class QMenu;
 class QContextMenuEvent;
 
+namespace lmms
+{
+
 class DataFile;
-class TextFloat;
 class Clip;
+
+namespace gui
+{
+
+class TextFloat;
 class TrackView;
 
 
@@ -241,4 +248,8 @@ private:
 } ;
 
 
+} // namespace gui
+
+} // namespace lmms
+
 #endif

include/Clipboard.h

@@ -30,8 +30,9 @@
 
 class QMimeData;
 
-namespace Clipboard
+namespace lmms::Clipboard
 {
+
 	enum class MimeType
 	{
 		StringPair,
@@ -64,6 +65,7 @@ namespace Clipboard
 				break;
 		}
 	}
-} ;
+
+} // namespace lmms::Clipboard
 
 #endif

include/ColorChooser.h

@@ -21,12 +21,19 @@
  *
  */
 
+#ifndef COLOR_CHOOSER_H
+#define COLOR_CHOOSER_H
+
 #include <QApplication>
 #include <QColor>
 #include <QColorDialog>
 #include <QKeyEvent>
 #include <QVector>
 
+namespace lmms::gui
+{
+
+
 class ColorChooser: public QColorDialog
 {
 public:
@@ -57,3 +64,9 @@ private:
 	//! Generate a nice palette, with adjustable value
 	static QVector<QColor> nicePalette (int);
 };
+
+
+} // namespace lmms::gui
+
+#endif
+

include/ComboBox.h

@@ -32,6 +32,9 @@
 #include "ComboBoxModel.h"
 #include "AutomatableModelView.h"
 
+namespace lmms::gui
+{
+
 class LMMS_EXPORT ComboBox : public QWidget, public IntModelView
 {
 	Q_OBJECT
@@ -78,4 +81,6 @@ private slots:
 
 } ;
 
+} // namespace lmms::gui
+
 #endif

include/ComboBoxModel.h

@@ -32,6 +32,8 @@
 #include "AutomatableModel.h"
 #include "embed.h"
 
+namespace lmms
+{
 
 class LMMS_EXPORT ComboBoxModel : public IntModel
 {
@@ -91,5 +93,6 @@ private:
 
 } ;
 
+} // namespace lmms
 
 #endif

include/ConfigManager.h

@@ -37,7 +37,11 @@
 #include "lmms_export.h"
 
 
-class LmmsCore;
+namespace lmms
+{
+
+
+class Engine;
 
 const QString PROJECTS_PATH = "projects/";
 const QString TEMPLATE_PATH = "templates/";
@@ -304,6 +308,10 @@ private:
 	settingsMap m_settings;
 
 
-	friend class LmmsCore;
+	friend class Engine;
 };
+
+
+} // namespace lmms
+
 #endif

include/ControlLayout.h

@@ -76,9 +76,15 @@
 #include <QLayout>
 #include <QMultiMap>
 #include <QStyle>
+
 class QLayoutItem;
 class QRect;
 class QString;
+class QLineEdit;
+
+
+namespace lmms::gui
+{
 
 /**
 	Layout for controls (models)
@@ -128,9 +134,11 @@ private:
 	// relevant dimension is width, as later, heightForWidth() will be called
 	// 400 looks good and is ~4 knobs in a row
 	constexpr const static int m_minWidth = 400;
-	class QLineEdit* m_searchBar;
+	QLineEdit* m_searchBar;
 	//! name of search bar, must be ASCII sorted before any alpha numerics
 	static constexpr const char* s_searchBarName = "!!searchBar!!";
 };
 
+} // namespace lmms::gui
+
 #endif // CONTROLLAYOUT_H

include/Controller.h

@@ -33,10 +33,20 @@
 #include "JournallingObject.h"
 #include "ValueBuffer.h"
 
-class ControllerDialog;
+namespace lmms
+{
+
 class Controller;
 class ControllerConnection;
 
+namespace gui
+{
+
+class ControllerDialog;
+
+} // namespace gui
+
+
 typedef QVector<Controller *> ControllerVector;
 
 
@@ -132,7 +142,7 @@ public:
 	bool hasModel( const Model * m ) const;
 
 public slots:
-	virtual ControllerDialog * createDialog( QWidget * _parent );
+	virtual gui::ControllerDialog * createDialog( QWidget * _parent );
 
 	virtual void setName( const QString & _new_name )
 	{
@@ -169,9 +179,12 @@ signals:
 	// The value changed while the audio engine isn't running (i.e: MIDI CC)
 	void valueChanged();
 
-	friend class ControllerDialog;
+	friend class gui::ControllerDialog;
 
 } ;
 
+
+} // namespace lmms
+
 #endif
 

include/ControllerConnection.h

@@ -37,8 +37,16 @@
 #include "JournallingObject.h"
 #include "ValueBuffer.h"
 
+namespace lmms
+{
+
 class ControllerConnection;
 
+namespace gui
+{
+class ControllerConnectionDialog;
+}
+
 typedef QVector<ControllerConnection *> ControllerConnectionVector;
 
 
@@ -115,8 +123,11 @@ signals:
 	// The value changed while the audio engine isn't running (i.e: MIDI CC)
 	void valueChanged();
 
-	friend class ControllerConnectionDialog;
+	friend class gui::ControllerConnectionDialog;
 };
 
+
+} // namespace lmms
+
 #endif
 

include/ControllerConnectionDialog.h

@@ -38,7 +38,15 @@
 class QLineEdit;
 class QListView;
 class QScrollArea;
+
+namespace lmms
+{
+
 class AutoDetectMidiController;
+
+namespace gui
+{
+
 class ComboBox;
 class GroupBox;
 class TabWidget;
@@ -47,7 +55,6 @@ class LedCheckBox;
 class MidiPortMenu;
 
 
-
 class ControllerConnectionDialog : public QDialog
 {
 	Q_OBJECT
@@ -99,4 +106,9 @@ private:
 	AutoDetectMidiController * m_midiController;
 } ;
 
+
+} // namespace gui
+
+} // namespace lmms
+
 #endif

include/ControllerDialog.h

@@ -30,8 +30,13 @@
 
 #include "ModelView.h"
 
+namespace lmms
+{
+
 class Controller;
 
+namespace gui
+{
 
 class ControllerDialog : public QWidget, public ModelView
 {
@@ -51,4 +56,9 @@ protected:
 
 } ;
 
+
+} // namespace gui
+
+} // namespace lmms
+
 #endif

include/ControllerRackView.h

@@ -36,9 +36,17 @@ class QPushButton;
 class QScrollArea;
 class QVBoxLayout;
 
-class ControllerView;
+
+namespace lmms
+{
+
 class Controller;
 
+namespace gui
+{
+
+class ControllerView;
+
 
 class ControllerRackView : public QWidget, public SerializingObject
 {
@@ -57,9 +65,9 @@ public:
 
 
 public slots:
-	void deleteController( ControllerView * _view );
-	void onControllerAdded( Controller * );
-	void onControllerRemoved( Controller * );
+	void deleteController( lmms::gui::ControllerView * _view );
+	void onControllerAdded( lmms::Controller * );
+	void onControllerRemoved( lmms::Controller * );
 
 protected:
 	void closeEvent( QCloseEvent * _ce ) override;
@@ -80,4 +88,8 @@ private:
 	int m_nextIndex;
 } ;
 
+} // namespace gui
+
+} // namespace lmms
+
 #endif

include/ControllerView.h

@@ -36,6 +36,10 @@ class QLabel;
 class QPushButton;
 class QMdiSubWindow;
 
+namespace lmms::gui
+{
+
+
 class LedCheckBox;
 
 
@@ -64,7 +68,7 @@ public slots:
 	void renameController();
 
 signals:
-	void deleteController( ControllerView * _view );
+	void deleteController( lmms::gui::ControllerView * _view );
 
 
 protected:
@@ -81,4 +85,7 @@ private:
 
 } ;
 
+
+} // namespace lmms::gui
+
 #endif

include/Controls.h

@@ -34,8 +34,20 @@
 
 class QString;
 class QWidget;
+class QLabel;
+
+namespace lmms
+{
+
 class AutomatableModel;
 
+namespace gui
+{
+
+class AutomatableModelView;
+class Knob;
+class ComboBox;
+class LedCheckBox;
 
 /**
 	These classes provide
@@ -52,7 +64,7 @@ public:
 
 	virtual void setModel(AutomatableModel* model) = 0;
 	virtual AutomatableModel* model() = 0;
-	virtual class AutomatableModelView* modelView() = 0;
+	virtual AutomatableModelView* modelView() = 0;
 
 	virtual ~Control();
 };
@@ -60,7 +72,7 @@ public:
 
 class KnobControl : public Control
 {
-	class Knob* m_knob;
+	Knob* m_knob;
 
 public:
 	void setText(const QString& text) override;
@@ -68,7 +80,7 @@ public:
 
 	void setModel(AutomatableModel* model) override;
 	FloatModel* model() override;
-	class AutomatableModelView* modelView() override;
+	AutomatableModelView* modelView() override;
 
 	KnobControl(QWidget* parent = nullptr);
 	~KnobControl() override;
@@ -78,8 +90,8 @@ public:
 class ComboControl : public Control
 {
 	QWidget* m_widget;
-	class ComboBox* m_combo;
-	class QLabel* m_label;
+	ComboBox* m_combo;
+	QLabel* m_label;
 
 public:
 	void setText(const QString& text) override;
@@ -87,7 +99,7 @@ public:
 
 	void setModel(AutomatableModel* model) override;
 	ComboBoxModel* model() override;
-	class AutomatableModelView* modelView() override;
+	AutomatableModelView* modelView() override;
 
 	ComboControl(QWidget* parent = nullptr);
 	~ComboControl() override;
@@ -104,7 +116,7 @@ public:
 
 	void setModel(AutomatableModel* model) override;
 	IntModel* model() override;
-	class AutomatableModelView* modelView() override;
+	AutomatableModelView* modelView() override;
 
 	LcdControl(int numDigits, QWidget* parent = nullptr);
 	~LcdControl() override;
@@ -114,7 +126,7 @@ public:
 class CheckControl : public Control
 {
 	QWidget* m_widget;
-	class LedCheckBox* m_checkBox;
+	LedCheckBox* m_checkBox;
 	QLabel* m_label;
 
 public:
@@ -122,12 +134,16 @@ public:
 	QWidget* topWidget() override;
 
 	void setModel(AutomatableModel* model) override;
-	BoolModel *model() override;
-	class AutomatableModelView* modelView() override;
+	BoolModel* model() override;
+	AutomatableModelView* modelView() override;
 
 	CheckControl(QWidget* parent = nullptr);
 	~CheckControl() override;
 };
 
 
+} // namespace gui
+
+} // namespace lmms
+
 #endif // CONTROLS_H

include/CustomTextKnob.h

@@ -4,6 +4,10 @@
 
 #include "Knob.h"
 
+namespace lmms::gui
+{
+
+
 class LMMS_EXPORT CustomTextKnob : public Knob
 {
 protected:
@@ -27,4 +31,7 @@ protected:
 	QString m_value_text;
 } ;
 
+
+} // namespace lmms::gui
+
 #endif

include/DataFile.h

@@ -33,9 +33,14 @@
 #include "lmms_export.h"
 #include "MemoryManager.h"
 
-class ProjectVersion;
 class QTextStream;
 
+namespace lmms
+{
+
+class ProjectVersion;
+
+
 class LMMS_EXPORT DataFile : public QDomDocument
 {
 	MM_OPERATORS
@@ -155,4 +160,6 @@ private:
 } ;
 
 
+} // namespace lmms
+
 #endif

include/Delay.h

@@ -32,6 +32,9 @@
 #include "interpolation.h"
 #include "MemoryManager.h"
 
+namespace lmms
+{
+
 // brief usage 
 
 // Classes:
@@ -360,4 +363,7 @@ typedef CombFeedfwd<2> StereoCombFeedfwd;
 typedef CombFeedbackDualtap<2> StereoCombFeedbackDualtap;
 typedef AllpassDelay<2> StereoAllpassDelay;
 
+
+} // namespace lmms
+
 #endif

include/DeprecationHelper.h

@@ -30,6 +30,9 @@
 #include <QFontMetrics>
 #include <QWheelEvent>
 
+namespace lmms
+{
+
 /**
  * @brief horizontalAdvance is a backwards-compatible adapter for
  * QFontMetrics::horizontalAdvance and width functions.
@@ -60,4 +63,7 @@ inline QPoint position(QWheelEvent *wheelEvent)
 	return wheelEvent->pos();
 #endif
 }
+
+} // namespace lmms
+
 #endif // DEPRECATIONHELPER_H

include/DetuningHelper.h

@@ -29,6 +29,9 @@
 #include "InlineAutomation.h"
 #include "MemoryManager.h"
 
+namespace lmms
+{
+
 class DetuningHelper : public InlineAutomation
 {
 	Q_OBJECT
@@ -61,4 +64,6 @@ public:
 } ;
 
 
+} // namespace lmms
+
 #endif

include/DrumSynth.h

@@ -32,6 +32,9 @@
 
 class QString;
 
+namespace lmms
+{
+
 class DrumSynth {
     public:
         DrumSynth() {};
@@ -51,4 +54,7 @@ class DrumSynth {
 
 };
 
+
+} // namespace lmms
+
 #endif

include/DspEffectLibrary.h

@@ -31,7 +31,7 @@
 #include "lmms_basics.h"
 
 
-namespace DspEffectLibrary
+namespace lmms::DspEffectLibrary
 {
 
 	template<typename T>
@@ -329,7 +329,7 @@ namespace DspEffectLibrary
 
 	} ;
 
-} ;
+} // namespace lmms::DspEffectLibrary
 
 
 #endif

include/DummyEffect.h

@@ -31,6 +31,12 @@
 #include "EffectControls.h"
 #include "EffectControlDialog.h"
 
+namespace lmms
+{
+
+namespace gui
+{
+
 class Knob;
 
 
@@ -44,6 +50,7 @@ public:
 
 } ;
 
+}
 
 class DummyEffectControls : public EffectControls
 {
@@ -75,9 +82,9 @@ public:
 		return "DummyControls";
 	}
 
-	EffectControlDialog * createView() override
+	gui::EffectControlDialog * createView() override
 	{
-		return new DummyEffectControlDialog( this );
+		return new gui::DummyEffectControlDialog( this );
 	}
 } ;
 
@@ -144,4 +151,6 @@ private:
 } ;
 
 
+} // namespace lmms
+
 #endif

include/DummyInstrument.h

@@ -35,6 +35,10 @@
 #include "AudioEngine.h"
 
 
+namespace lmms
+{
+
+
 class DummyInstrument : public Instrument
 {
 public:
@@ -66,11 +70,13 @@ public:
 		return "dummyinstrument";
 	}
 
-	PluginView * instantiateView( QWidget * _parent ) override
+	gui::PluginView * instantiateView( QWidget * _parent ) override
 	{
-		return new InstrumentViewFixedSize( this, _parent );
+		return new gui::InstrumentViewFixedSize( this, _parent );
 	}
 } ;
 
 
+} // namespace lmms
+
 #endif

include/DummyPlugin.h

@@ -30,6 +30,9 @@
 #include "PluginView.h"
 
 
+namespace lmms
+{
+
 class DummyPlugin : public Plugin
 {
 public:
@@ -57,12 +60,14 @@ public:
 
 
 protected:
-	PluginView * instantiateView( QWidget * _parent ) override
+	gui::PluginView * instantiateView( QWidget * _parent ) override
 	{
-		return new PluginView( this, _parent );
+		return new gui::PluginView( this, _parent );
 	}
 
 } ;
 
 
+} // namesplace lmms
+
 #endif

include/Editor.h

@@ -28,14 +28,17 @@
 #include <QMainWindow>
 #include <QToolBar>
 
+class QAction;
+
+namespace lmms::gui
+{
+
 static const int Quantizations[] = {
 	1, 2, 4, 8, 16, 32, 64,
 	3, 6, 12, 24, 48, 96, 192
 };
 
 
-class QAction;
-
 class DropToolBar;
 
 /// \brief Superclass for editors with a toolbar.
@@ -108,4 +111,6 @@ protected:
 };
 
 
+} // namespace lmms::gui
+
 #endif

include/Effect.h

@@ -33,9 +33,19 @@
 #include "TempoSyncKnobModel.h"
 #include "MemoryManager.h"
 
+namespace lmms
+{
+
 class EffectChain;
 class EffectControls;
 
+namespace gui
+{
+
+class EffectView;
+
+} // namespace gui
+
 
 class LMMS_EXPORT Effect : public Plugin
 {
@@ -170,7 +180,7 @@ protected:
 	*/
 	void checkGate( double _out_sum );
 
-	PluginView * instantiateView( QWidget * ) override;
+	gui::PluginView* instantiateView( QWidget * ) override;
 
 	// some effects might not be capable of higher sample-rates so they can
 	// sample it down before processing and back after processing
@@ -221,7 +231,7 @@ private:
 	SRC_STATE * m_srcState[2];
 
 
-	friend class EffectView;
+	friend class gui::EffectView;
 	friend class EffectChain;
 
 } ;
@@ -231,4 +241,6 @@ typedef Effect::Descriptor::SubPluginFeatures::Key EffectKey;
 typedef Effect::Descriptor::SubPluginFeatures::KeyList EffectKeyList;
 
 
+} // namespace lmms
+
 #endif

include/EffectChain.h

@@ -30,8 +30,18 @@
 #include "SerializingObject.h"
 #include "AutomatableModel.h"
 
+namespace lmms
+{
+
 class Effect;
 
+namespace gui
+{
+
+class EffectRackView;
+
+} // namespace gui
+
 
 class LMMS_EXPORT EffectChain : public Model, public SerializingObject
 {
@@ -65,7 +75,7 @@ private:
 	BoolModel m_enabledModel;
 
 
-	friend class EffectRackView;
+	friend class gui::EffectRackView;
 
 
 signals:
@@ -73,5 +83,7 @@ signals:
 
 } ;
 
+} // namespace lmms
+
 #endif
 

include/EffectControlDialog.h

@@ -30,9 +30,15 @@
 
 #include "ModelView.h"
 
+namespace lmms
+{
+
 class EffectControls;
 
 
+namespace gui
+{
+
 class LMMS_EXPORT EffectControlDialog : public QWidget, public ModelView
 {
 	Q_OBJECT
@@ -54,4 +60,8 @@ protected:
 
 } ;
 
+} // namespace gui
+
+} // namespace lmms
+
 #endif

include/EffectControls.h

@@ -29,8 +29,16 @@
 #include "JournallingObject.h"
 #include "Effect.h"
 
+namespace lmms
+{
+
+
+namespace gui
+{
+
 class EffectControlDialog;
 
+} // namespace gui
 
 class EffectControls : public JournallingObject, public Model
 {
@@ -48,7 +56,7 @@ public:
 	}
 
 	virtual int controlCount() = 0;
-	virtual EffectControlDialog * createView() = 0;
+	virtual gui::EffectControlDialog * createView() = 0;
 
 
 	void setViewVisible( bool _visible )
@@ -73,4 +81,7 @@ private:
 
 } ;
 
+
+} // namespace lmms
+
 #endif

include/EffectRackView.h

@@ -35,6 +35,9 @@
 class QScrollArea;
 class QVBoxLayout;
 
+namespace lmms::gui
+{
+
 class EffectView;
 class GroupBox;
 
@@ -50,9 +53,9 @@ public:
 
 public slots:
 	void clearViews();
-	void moveUp( EffectView* view );
-	void moveDown( EffectView* view );
-	void deletePlugin( EffectView* view );
+	void moveUp( lmms::gui::EffectView* view );
+	void moveDown( lmms::gui::EffectView* view );
+	void deletePlugin( lmms::gui::EffectView* view );
 
 
 private slots:
@@ -83,4 +86,6 @@ private:
 
 } ;
 
+} // namespace lmms::gui
+
 #endif

include/EffectSelectDialog.h

@@ -34,6 +34,9 @@
 
 namespace Ui { class EffectSelectDialog; }
 
+namespace lmms::gui
+{
+
 
 class EffectSelectDialog : public QDialog
 {
@@ -65,5 +68,7 @@ private:
 } ;
 
 
+} // namespace lmms::gui
+
 
 #endif

include/EffectView.h

@@ -35,6 +35,9 @@ class QLabel;
 class QPushButton;
 class QMdiSubWindow;
 
+namespace lmms::gui
+{
+
 class EffectControlDialog;
 class Knob;
 class LedCheckBox;
@@ -68,9 +71,9 @@ public slots:
 
 
 signals:
-	void moveUp( EffectView * _plugin );
-	void moveDown( EffectView * _plugin );
-	void deletePlugin( EffectView * _plugin );
+	void moveUp( lmms::gui::EffectView * _plugin );
+	void moveDown( lmms::gui::EffectView * _plugin );
+	void deletePlugin( lmms::gui::EffectView * _plugin );
 
 
 protected:
@@ -90,4 +93,7 @@ private:
 
 } ;
 
+
+} // namespace lmms::gui
+
 #endif

include/Engine.h

@@ -34,6 +34,9 @@
 #include "lmms_export.h"
 #include "lmms_basics.h"
 
+namespace lmms
+{
+
 class AudioEngine;
 class Mixer;
 class PatternStore;
@@ -41,20 +44,13 @@ class ProjectJournal;
 class Song;
 class Ladspa2LMMS;
 
+namespace gui
+{
+class GuiApplication;
+}
 
-// Note: This class is called 'LmmsCore' instead of 'Engine' because of naming
-// conflicts caused by ZynAddSubFX. See https://github.com/LMMS/lmms/issues/2269
-// and https://github.com/LMMS/lmms/pull/2118 for more details.
-//
-// The workaround was to rename Lmms' Engine so that it has a different symbol
-// name in the object files, but typedef it back to 'Engine' and keep it inside
-// of Engine.h so that the rest of the codebase can be oblivious to this issue
-// (and it could be fixed without changing every single file).
 
-class LmmsCore;
-typedef LmmsCore Engine;
-
-class LMMS_EXPORT LmmsCore : public QObject
+class LMMS_EXPORT Engine : public QObject
 {
 	Q_OBJECT
 public:
@@ -110,11 +106,11 @@ public:
 
 	static void updateFramesPerTick();
 
-	static inline LmmsCore * inst()
+	static inline Engine * inst()
 	{
 		if( s_instanceOfMe == nullptr )
 		{
-			s_instanceOfMe = new LmmsCore();
+			s_instanceOfMe = new Engine();
 		}
 		return s_instanceOfMe;
 	}
@@ -130,9 +126,9 @@ private:
 	// small helper function which sets the pointer to NULL before actually deleting
 	// the object it refers to
 	template<class T>
-	static inline void deleteHelper( T * * ptr )
+	static inline void deleteHelper(T** ptr)
 	{
-		T * tmp = *ptr;
+		T* tmp = *ptr;
 		*ptr = nullptr;
 		delete tmp;
 	}
@@ -149,15 +145,17 @@ private:
 #ifdef LMMS_HAVE_LV2
 	static class Lv2Manager* s_lv2Manager;
 #endif
-	static Ladspa2LMMS * s_ladspaManager;
+	static Ladspa2LMMS* s_ladspaManager;
 	static void* s_dndPluginKey;
 
 	// even though most methods are static, an instance is needed for Qt slots/signals
-	static LmmsCore * s_instanceOfMe;
+	static Engine* s_instanceOfMe;
 
-	friend class GuiApplication;
+	friend class gui::GuiApplication;
 };
 
 
+} // namespace lmms
+
 #endif
 

include/EnvelopeAndLfoParameters.h

@@ -33,6 +33,15 @@
 #include "TempoSyncKnobModel.h"
 #include "lmms_basics.h"
 
+namespace lmms
+{
+
+namespace gui
+{
+
+class EnvelopeAndLfoView;
+
+}
 
 class LMMS_EXPORT EnvelopeAndLfoParameters : public Model, public JournallingObject
 {
@@ -179,8 +188,10 @@ private:
 	void updateLfoShapeData();
 
 
-	friend class EnvelopeAndLfoView;
+	friend class gui::EnvelopeAndLfoView;
 
 } ;
 
+} // namespace lmms
+
 #endif

include/EnvelopeAndLfoView.h

@@ -33,8 +33,14 @@
 class QPaintEvent;
 class QPixmap;
 
+namespace lmms
+{
+
 class EnvelopeAndLfoParameters;
 
+namespace gui
+{
+
 class automatableButtonGroup;
 class Knob;
 class LedCheckBox;
@@ -94,4 +100,8 @@ private:
 	float m_randomGraph;
 } ;
 
+} // namespace gui
+
+} // namespace lmms
+
 #endif

include/ExportFilter.h

@@ -32,6 +32,10 @@
 #include "Plugin.h"
 
 
+namespace lmms
+{
+
+
 class LMMS_EXPORT ExportFilter : public Plugin
 {
 public:
@@ -63,4 +67,6 @@ private:
 } ;
 
 
+} // namespace lmms
+
 #endif

include/ExportProjectDialog.h

@@ -34,6 +34,10 @@
 #include "ProjectRenderer.h"
 #include "RenderManager.h"
 
+namespace lmms::gui
+{
+
+
 class ExportProjectDialog : public QDialog, public Ui::ExportProjectDialog
 {
 	Q_OBJECT
@@ -63,4 +67,8 @@ private:
 	std::unique_ptr<RenderManager> m_renderManager;
 } ;
 
+
+} // namespace lmms::gui
+
+
 #endif

include/FadeButton.h

@@ -31,6 +31,10 @@
 #include <QElapsedTimer>
 
 
+namespace lmms::gui
+{
+
+
 class FadeButton : public QAbstractButton
 {
 	Q_OBJECT
@@ -71,4 +75,6 @@ private:
 } ;
 
 
+} // namespace lmms::gui
+
 #endif

include/Fader.h

@@ -55,6 +55,9 @@
 
 #include "AutomatableModelView.h"
 
+namespace lmms::gui
+{
+
 class TextFloat;
 
 
@@ -169,4 +172,7 @@ private:
 } ;
 
 
+} // namespace lmms::gui
+
+
 #endif

include/FifoBuffer.h

@@ -28,6 +28,10 @@
 #include <QSemaphore>
 
 
+namespace lmms
+{
+
+
 template<typename T>
 class FifoBuffer
 {
@@ -88,4 +92,6 @@ private:
 } ;
 
 
+} // namespace lmms
+
 #endif

include/FileBrowser.h

@@ -37,13 +37,18 @@
 
 class QLineEdit;
 
-class FileItem;
+namespace lmms
+{
+
 class InstrumentTrack;
-class FileBrowserTreeWidget;
 class PlayHandle;
 class TrackContainer;
 
+namespace gui
+{
 
+class FileItem;
+class FileBrowserTreeWidget;
 
 class FileBrowser : public SideBarWidget
 {
@@ -142,11 +147,11 @@ private:
 
 private slots:
 	void activateListItem( QTreeWidgetItem * item, int column );
-	void openInNewInstrumentTrack( FileItem* item, bool songEditor );
-	bool openInNewSampleTrack( FileItem* item );
-	void sendToActiveInstrumentTrack( FileItem* item );
+	void openInNewInstrumentTrack( lmms::gui::FileItem* item, bool songEditor );
+	bool openInNewSampleTrack( lmms::gui::FileItem* item );
+	void sendToActiveInstrumentTrack( lmms::gui::FileItem* item );
 	void updateDirectory( QTreeWidgetItem * item );
-	void openContainingFolder( FileItem* item );
+	void openContainingFolder( lmms::gui::FileItem* item );
 
 } ;
 
@@ -281,4 +286,8 @@ private:
 } ;
 
 
+} // namespace gui
+
+} // namespace lmms
+
 #endif

include/FileDialog.h

@@ -30,6 +30,10 @@
 
 #include "lmms_export.h"
 
+namespace lmms::gui
+{
+
+
 class LMMS_EXPORT FileDialog : public QFileDialog
 {
 	Q_OBJECT
@@ -50,4 +54,7 @@ public:
 	void clearSelection();
 };
 
-#endif // FILEDIALOG_HPP
+
+} // namespace lmms::gui
+
+#endif // FILEDIALOG_H

include/Graph.h

@@ -35,8 +35,15 @@
 #include "ModelView.h"
 #include "lmms_basics.h"
 
+namespace lmms
+{
+
+
 class graphModel;
 
+namespace gui
+{
+
 
 class LMMS_EXPORT Graph : public QWidget, public ModelView
 {
@@ -116,6 +123,9 @@ private:
 } ;
 
 
+} // namespace gui
+
+
 /**
 	@brief 2 dimensional function plot
 
@@ -137,7 +147,7 @@ public:
 	graphModel( float _min,
 			float _max,
 			int _size,
-			:: Model * _parent,
+			Model * _parent,
 			bool _default_constructed = false,
 			float _step = 0.0 );
 
@@ -211,8 +221,11 @@ private:
 	float m_maxValue;
 	float m_step;
 
-	friend class Graph;
+	friend class gui::Graph;
 
 };
 
+
+} // namespace lmms
+
 #endif

include/GroupBox.h

@@ -34,6 +34,8 @@
 
 class QPixmap;
 
+namespace lmms::gui
+{
 
 class GroupBox : public QWidget, public BoolModelView
 {
@@ -70,6 +72,7 @@ private:
 } ;
 
 
+} // namespace lmms::gui
 
 
 #endif

include/GuiApplication.h

@@ -32,6 +32,9 @@
 
 class QLabel;
 
+namespace lmms::gui
+{
+
 class AutomationEditorWindow;
 class ControllerRackView;
 class MixerView;
@@ -88,4 +91,6 @@ private:
 // Short-hand function
 LMMS_EXPORT GuiApplication* getGUI();
 
+} // namespace lmms::gui
+
 #endif // GUIAPPLICATION_H

include/ImportFilter.h

@@ -30,6 +30,9 @@
 
 #include "Plugin.h"
 
+namespace lmms
+{
+
 
 class TrackContainer;
 
@@ -109,4 +112,6 @@ private:
 } ;
 
 
+} // namespace lmms
+
 #endif

include/InlineAutomation.h

@@ -29,6 +29,8 @@
 #include "AutomationClip.h"
 #include "shared_object.h"
 
+namespace lmms
+{
 
 class InlineAutomation : public FloatModel, public sharedObject
 {
@@ -95,4 +97,6 @@ private:
 } ;
 
 
+} // namespace lmms
+
 #endif

include/Instrument.h

@@ -33,6 +33,8 @@
 #include "Plugin.h"
 #include "TimePos.h"
 
+namespace lmms
+{
 
 // forward-declarations
 class InstrumentTrack;
@@ -146,6 +148,10 @@ private:
 
 } ;
 
+
 Q_DECLARE_OPERATORS_FOR_FLAGS(Instrument::Flags)
 
+
+} // namespace lmms
+
 #endif

include/InstrumentFunctionViews.h

@@ -30,15 +30,20 @@
 #include <QWidget>
 
 class QLabel;
-class ComboBox;
-class GroupBox;
-class Knob;
-class TempoSyncKnob;
+
+namespace lmms
+{
 
 class InstrumentFunctionArpeggio;
 class InstrumentFunctionNoteStacking;
 
+namespace gui
+{
 
+class ComboBox;
+class GroupBox;
+class Knob;
+class TempoSyncKnob;
 
 class InstrumentFunctionNoteStackingView : public QWidget, public ModelView
 {
@@ -90,5 +95,8 @@ private:
 
 } ;
 
+} // namespace gui
+
+} // namespace lmms
 
 #endif

include/InstrumentFunctions.h

@@ -31,10 +31,19 @@
 #include "TempoSyncKnobModel.h"
 #include "ComboBoxModel.h"
 
+namespace lmms
+{
 
 class InstrumentTrack;
 class NotePlayHandle;
 
+namespace gui
+{
+
+class InstrumentFunctionNoteStackingView;
+class InstrumentFunctionArpeggioView;
+
+}
 
 
 class InstrumentFunctionNoteStacking : public Model, public JournallingObject
@@ -149,7 +158,7 @@ private:
 	FloatModel m_chordRangeModel;
 
 
-	friend class InstrumentFunctionNoteStackingView;
+	friend class gui::InstrumentFunctionNoteStackingView;
 
 } ;
 
@@ -207,9 +216,11 @@ private:
 
 
 	friend class InstrumentTrack;
-	friend class InstrumentFunctionArpeggioView;
+	friend class gui::InstrumentFunctionArpeggioView;
 
 } ;
 
 
+} // namespace lmms
+
 #endif

include/InstrumentMidiIOView.h

@@ -30,12 +30,19 @@
 
 #include "ModelView.h"
 
+class QToolButton;
+
+namespace lmms
+{
+
+class InstrumentTrack;
+
+namespace gui
+{
 
 class GroupBox;
 class LcdSpinBox;
-class QToolButton;
 class LedCheckBox;
-class InstrumentTrack;
 
 
 class InstrumentMidiIOView : public QWidget, public ModelView
@@ -65,4 +72,9 @@ private:
 
 } ;
 
+
+} // namespace gui
+
+} // namespace lmms
+
 #endif

include/InstrumentMiscView.h

@@ -29,10 +29,16 @@
 
 #include <QWidget>
 
+namespace lmms
+{
+
+class InstrumentTrack;
+
+namespace gui
+{
 
 class ComboBox;
 class GroupBox;
-class InstrumentTrack;
 class LedCheckBox;
 
 
@@ -60,4 +66,9 @@ private:
 	LedCheckBox *m_rangeImportCheckbox;
 };
 
+
+} // namespace gui
+
+} // namespace lmms
+
 #endif

include/InstrumentPlayHandle.h

@@ -30,6 +30,9 @@
 #include "NotePlayHandle.h"
 #include "lmms_export.h"
 
+namespace lmms
+{
+
 class LMMS_EXPORT InstrumentPlayHandle : public PlayHandle
 {
 public:
@@ -81,4 +84,7 @@ private:
 
 } ;
 
+
+} // namespace lmms
+
 #endif

include/InstrumentSoundShaping.h

@@ -27,11 +27,19 @@
 
 #include "ComboBoxModel.h"
 
+namespace lmms
+{
+
 
 class InstrumentTrack;
 class EnvelopeAndLfoParameters;
 class NotePlayHandle;
 
+namespace gui
+{
+class InstrumentSoundShapingView;
+}
+
 
 class InstrumentSoundShaping : public Model, public JournallingObject
 {
@@ -77,9 +85,11 @@ private:
 	static const char *const targetNames[InstrumentSoundShaping::NumTargets][3];
 
 
-	friend class InstrumentSoundShapingView;
+	friend class gui::InstrumentSoundShapingView;
 
 } ;
 
 
+} // namespace lmms
+
 #endif

include/InstrumentSoundShapingView.h

@@ -32,6 +32,9 @@
 
 class QLabel;
 
+namespace lmms::gui
+{
+
 class EnvelopeAndLfoView;
 class ComboBox;
 class GroupBox;
@@ -67,4 +70,7 @@ private:
 
 } ;
 
+
+} // namespace lmms::gui
+
 #endif

include/InstrumentTrack.h

@@ -39,9 +39,23 @@
 #include "Track.h"
 
 
+namespace lmms
+{
+
+
 class Instrument;
 class DataFile;
 
+namespace gui
+{
+
+class InstrumentTrackView;
+class InstrumentTrackWindow;
+class InstrumentMiscView;
+class MidiCCRackView;
+
+} // namespace gui
+
 
 class LMMS_EXPORT InstrumentTrack : public Track, public MidiEventProcessor
 {
@@ -111,7 +125,7 @@ public:
 	virtual bool play( const TimePos & _start, const fpp_t _frames,
 						const f_cnt_t _frame_base, int _clip_num = -1 ) override;
 	// create new view for me
-	TrackView * createView( TrackContainerView* tcv ) override;
+	gui::TrackView* createView( gui::TrackContainerView* tcv ) override;
 
 	// create new track-content-object = clip
 	Clip* createClip(const TimePos & pos) override;
@@ -223,8 +237,8 @@ public:
 
 signals:
 	void instrumentChanged();
-	void midiNoteOn( const Note& );
-	void midiNoteOff( const Note& );
+	void midiNoteOn( const lmms::Note& );
+	void midiNoteOff( const lmms::Note& );
 	void nameChanged();
 	void newNote();
 	void endNote();
@@ -294,12 +308,16 @@ private:
 	std::unique_ptr<BoolModel> m_midiCCEnable;
 	std::unique_ptr<FloatModel> m_midiCCModel[MidiControllerCount];
 
-	friend class InstrumentTrackView;
-	friend class InstrumentTrackWindow;
+	friend class gui::InstrumentTrackView;
+	friend class gui::InstrumentTrackWindow;
 	friend class NotePlayHandle;
-	friend class InstrumentMiscView;
-	friend class MidiCCRackView;
+	friend class gui::InstrumentMiscView;
+	friend class gui::MidiCCRackView;
 
 } ;
 
+
+
+} // namespace lmms
+
 #endif

include/InstrumentTrackView.h

@@ -30,6 +30,10 @@
 #include "InstrumentTrack.h"
 
 
+namespace lmms::gui
+{
+
+
 class InstrumentTrackWindow;
 class Knob;
 class MidiCCRackView;
@@ -114,5 +118,7 @@ private:
 	friend class InstrumentTrackWindow;
 } ;
 
-#endif
 
+} // namespace lmms::gui
+
+#endif

include/InstrumentTrackWindow.h

@@ -30,6 +30,17 @@
 #include "ModelView.h"
 #include "SerializingObject.h"
 
+class QLabel;
+class QLineEdit;
+class QWidget;
+
+namespace lmms
+{
+
+class InstrumentTrack;
+
+namespace gui
+{
 
 class EffectRackView;
 class MixerLineLcdSpinBox;
@@ -38,7 +49,6 @@ class InstrumentFunctionNoteStackingView;
 class InstrumentMidiIOView;
 class InstrumentMiscView;
 class InstrumentSoundShapingView;
-class InstrumentTrack;
 class InstrumentTrackShapingView;
 class InstrumentTrackView;
 class Knob;
@@ -46,9 +56,6 @@ class LcdSpinBox;
 class LeftRightNav;
 class PianoView;
 class PluginView;
-class QLabel;
-class QLineEdit;
-class QWidget;
 class TabWidget;
 
 
@@ -157,5 +164,9 @@ private:
 	friend class InstrumentTrackView;
 } ;
 
-#endif
 
+} // namespace gui
+
+} // namespace lmms
+
+#endif

include/InstrumentView.h

@@ -29,6 +29,10 @@
 #include "Instrument.h"
 #include "PluginView.h"
 
+
+namespace lmms::gui
+{
+
 class InstrumentTrackWindow;
 
 
@@ -70,4 +74,6 @@ public:
 } ;
 
 
+} // namespace lmms::gui
+
 #endif

include/IoHelper.h

@@ -27,9 +27,23 @@
 
 #include <cstdio>
 
-
 #ifdef _WIN32
 #include <windows.h>
+#endif
+
+#ifdef LMMS_BUILD_WIN32
+#include <io.h>
+#else
+#ifdef LMMS_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#endif
+
+namespace lmms
+{
+
+
+#ifdef _WIN32
 
 std::wstring toWString(const std::string& s)
 {
@@ -44,15 +58,9 @@ std::wstring toWString(const std::string& s)
 	MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s.length(), &ret[0], len);
 	return ret;
 }
+
 #endif
 
-#ifdef LMMS_BUILD_WIN32
-#include <io.h>
-#else
-#ifdef LMMS_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#endif
 
 FILE* F_OPEN_UTF8(std::string const& fname, const char* mode){
 #ifdef LMMS_BUILD_WIN32
@@ -62,6 +70,7 @@ FILE* F_OPEN_UTF8(std::string const& fname, const char* mode){
 #endif
 }
 
+
 int fileToDescriptor(FILE* f, bool closeFile = true)
 {
 	int fh;
@@ -76,3 +85,6 @@ int fileToDescriptor(FILE* f, bool closeFile = true)
 	if (closeFile) {fclose(f);}
 	return fh;
 }
+
+
+} // namespace lmms