From 2b51b79aebe179ea221af743ec2527de543e7942 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Fri, 15 May 2015 22:16:46 +0000 Subject: [PATCH 1/6] add src/* into lmms namespace, except gui --- src/core/AutomatableModel.cpp | 6 +++++- src/core/AutomationPattern.cpp | 6 +++++- src/core/BBTrackContainer.cpp | 5 ++++- src/core/BandLimitedWave.cpp | 7 +++++++ src/core/BufferManager.cpp | 7 +++++++ src/core/Clipboard.cpp | 4 ++++ src/core/ComboBoxModel.cpp | 4 +++- src/core/ConfigManager.cpp | 5 +++++ src/core/Controller.cpp | 6 +++++- src/core/ControllerConnection.cpp | 6 +++++- src/core/DataFile.cpp | 5 +++++ src/core/DrumSynth.cpp | 7 +++++++ src/core/Effect.cpp | 6 ++++++ src/core/EffectChain.cpp | 6 +++++- src/core/Engine.cpp | 7 +++++++ src/core/EnvelopeAndLfoParameters.cpp | 6 +++++- src/core/FxMixer.cpp | 7 +++++++ src/core/ImportFilter.cpp | 4 ++++ src/core/InlineAutomation.cpp | 6 ++++++ src/core/Instrument.cpp | 6 +++++- src/core/InstrumentFunctions.cpp | 5 ++++- src/core/InstrumentPlayHandle.cpp | 8 ++++++++ src/core/InstrumentSoundShaping.cpp | 6 +++++- src/core/JournallingObject.cpp | 5 +++++ src/core/Ladspa2LMMS.cpp | 6 ++++++ src/core/LadspaControl.cpp | 6 +++++- src/core/LadspaManager.cpp | 7 +++++++ src/core/LfoController.cpp | 6 +++++- src/core/MemoryHelper.cpp | 7 +++++++ src/core/MemoryManager.cpp | 7 +++++++ src/core/MeterModel.cpp | 6 +++++- src/core/MixHelpers.cpp | 6 ++++++ src/core/Mixer.cpp | 4 ++++ src/core/MixerProfiler.cpp | 7 +++++++ src/core/MixerWorkerThread.cpp | 7 +++++++ src/core/Model.cpp | 6 +++++- src/core/Note.cpp | 6 ++++++ src/core/NotePlayHandle.cpp | 8 ++++++++ src/core/Oscillator.cpp | 6 +++++- src/core/PeakController.cpp | 7 ++++++- src/core/Piano.cpp | 7 +++++-- src/core/PlayHandle.cpp | 8 ++++++++ src/core/Plugin.cpp | 6 ++++++ src/core/PresetPreviewPlayHandle.cpp | 5 +++++ src/core/ProjectJournal.cpp | 7 +++++++ src/core/ProjectRenderer.cpp | 7 +++++++ src/core/ProjectVersion.cpp | 6 ++++++ src/core/RemotePlugin.cpp | 6 +++++- src/core/RingBuffer.cpp | 6 ++++++ src/core/SampleBuffer.cpp | 9 +++++++++ src/core/SamplePlayHandle.cpp | 6 +++++- src/core/SampleRecordHandle.cpp | 5 +++++ src/core/SerializingObject.cpp | 6 ++++++ src/core/Song.cpp | 6 +++++- src/core/TempoSyncKnobModel.cpp | 9 +++++---- src/core/ToolPlugin.cpp | 7 +++++++ src/core/Track.cpp | 6 ++++++ src/core/TrackContainer.cpp | 8 +++++--- src/core/VstSyncController.cpp | 8 ++++++-- src/core/audio/AudioAlsa.cpp | 5 +++++ src/core/audio/AudioDevice.cpp | 4 ++++ src/core/audio/AudioFileDevice.cpp | 4 ++++ src/core/audio/AudioFileOgg.cpp | 5 +++++ src/core/audio/AudioFileWave.cpp | 4 ++++ src/core/audio/AudioJack.cpp | 5 +++-- src/core/audio/AudioOss.cpp | 5 +++++ src/core/audio/AudioPort.cpp | 5 +++++ src/core/audio/AudioPortAudio.cpp | 11 +++++++++++ src/core/audio/AudioPulseAudio.cpp | 5 +++++ src/core/audio/AudioSampleRecorder.cpp | 5 ++++- src/core/audio/AudioSdl.cpp | 5 ++++- src/core/base64.cpp | 5 +++++ src/core/fft_helpers.cpp | 7 +++++++ src/core/main.cpp | 3 +++ src/core/midi/MidiAlsaRaw.cpp | 4 ++++ src/core/midi/MidiAlsaSeq.cpp | 5 ++++- src/core/midi/MidiClient.cpp | 4 ++++ src/core/midi/MidiController.cpp | 5 ++++- src/core/midi/MidiOss.cpp | 3 +++ src/core/midi/MidiPort.cpp | 4 +++- src/core/midi/MidiWinMM.cpp | 5 ++++- src/tracks/AutomationTrack.cpp | 7 +++++++ src/tracks/BBTrack.cpp | 9 +++++---- src/tracks/InstrumentTrack.cpp | 11 ++++++++++- src/tracks/Pattern.cpp | 6 ++++++ src/tracks/SampleTrack.cpp | 8 ++++++++ 86 files changed, 475 insertions(+), 44 deletions(-) diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp index bf56285e5ca..99c6e6d4988 100644 --- a/src/core/AutomatableModel.cpp +++ b/src/core/AutomatableModel.cpp @@ -28,6 +28,10 @@ #include "ControllerConnection.h" #include "lmms_math.h" + +namespace lmms +{ + float AutomatableModel::s_copiedValue = 0; long AutomatableModel::s_periodCounter = 0; @@ -707,4 +711,4 @@ float AutomatableModel::globalAutomationValueAt( const MidiTime& time ) - +} diff --git a/src/core/AutomationPattern.cpp b/src/core/AutomationPattern.cpp index 93934c2a2a2..ad0f34865d9 100644 --- a/src/core/AutomationPattern.cpp +++ b/src/core/AutomationPattern.cpp @@ -33,6 +33,10 @@ #include "Song.h" #include "embed.h" + +namespace lmms +{ + int AutomationPattern::s_quantization = 1; const float AutomationPattern::DEFAULT_MIN_VALUE = 0; const float AutomationPattern::DEFAULT_MAX_VALUE = 1; @@ -895,4 +899,4 @@ void AutomationPattern::generateTangents( timeMap::const_iterator it, - +} diff --git a/src/core/BBTrackContainer.cpp b/src/core/BBTrackContainer.cpp index d38cfdc0096..a6abbb246f4 100644 --- a/src/core/BBTrackContainer.cpp +++ b/src/core/BBTrackContainer.cpp @@ -30,6 +30,9 @@ +namespace lmms +{ + BBTrackContainer::BBTrackContainer() : TrackContainer(), m_bbComboBoxModel( this ) @@ -262,4 +265,4 @@ void BBTrackContainer::createTCOsForBB( int _bb ) - +} diff --git a/src/core/BandLimitedWave.cpp b/src/core/BandLimitedWave.cpp index de608ba1d9c..f828ee83cd9 100644 --- a/src/core/BandLimitedWave.cpp +++ b/src/core/BandLimitedWave.cpp @@ -27,6 +27,10 @@ #include "ConfigManager.h" + +namespace lmms +{ + WaveMipMap BandLimitedWave::s_waveforms[4] = { }; bool BandLimitedWave::s_wavesGenerated = false; QString BandLimitedWave::s_wavetableDir = ""; @@ -270,3 +274,6 @@ moogfile.close(); */ } + + +} diff --git a/src/core/BufferManager.cpp b/src/core/BufferManager.cpp index 1f535443e70..a477369598c 100644 --- a/src/core/BufferManager.cpp +++ b/src/core/BufferManager.cpp @@ -30,6 +30,10 @@ #include "MemoryManager.h" + +namespace lmms +{ + sampleFrame ** BufferManager::s_available; QAtomicInt BufferManager::s_availableIndex = 0; sampleFrame ** BufferManager::s_released; @@ -112,3 +116,6 @@ void BufferManager::extend( int c ) b += Engine::mixer()->framesPerPeriod(); } }*/ + + +} diff --git a/src/core/Clipboard.cpp b/src/core/Clipboard.cpp index e5f2de1ce12..0c4c2703ff1 100644 --- a/src/core/Clipboard.cpp +++ b/src/core/Clipboard.cpp @@ -26,6 +26,9 @@ #include "JournallingObject.h" +namespace lmms +{ + Clipboard::Map Clipboard::content; @@ -51,3 +54,4 @@ const QDomElement * Clipboard::getContent( const QString & _node_name ) +} diff --git a/src/core/ComboBoxModel.cpp b/src/core/ComboBoxModel.cpp index e5df419a8e1..426cf5a2b2e 100644 --- a/src/core/ComboBoxModel.cpp +++ b/src/core/ComboBoxModel.cpp @@ -26,6 +26,8 @@ #include "embed.h" +namespace lmms +{ void ComboBoxModel::addItem( const QString& item, PixmapLoader* loader ) { @@ -67,4 +69,4 @@ int ComboBoxModel::findText( const QString& txt ) const - +} diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp index fd9dcc31ffc..be9dc0a5bcc 100644 --- a/src/core/ConfigManager.cpp +++ b/src/core/ConfigManager.cpp @@ -33,6 +33,10 @@ #include "ProjectVersion.h" + +namespace lmms +{ + static inline QString ensureTrailingSlash( const QString & _s ) { if( _s.right( 1 ) != QDir::separator() ) @@ -497,3 +501,4 @@ void ConfigManager::saveConfigFile() } +} diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp index 325399e0bf2..f2fbbfde006 100644 --- a/src/core/Controller.cpp +++ b/src/core/Controller.cpp @@ -40,6 +40,10 @@ #include "PeakController.h" + +namespace lmms +{ + long Controller::s_periods = 0; QVector Controller::s_controllers; @@ -351,4 +355,4 @@ int Controller::connectionCount() const{ - +} diff --git a/src/core/ControllerConnection.cpp b/src/core/ControllerConnection.cpp index 8b7040b50f4..95e995209f6 100644 --- a/src/core/ControllerConnection.cpp +++ b/src/core/ControllerConnection.cpp @@ -33,6 +33,10 @@ #include "ControllerConnection.h" + +namespace lmms +{ + ControllerConnectionVector ControllerConnection::s_connections; @@ -221,4 +225,4 @@ void ControllerConnection::deleteConnection() - +} diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp index ccd5d07c031..a47d26e24ae 100644 --- a/src/core/DataFile.cpp +++ b/src/core/DataFile.cpp @@ -45,6 +45,10 @@ +namespace lmms +{ + + DataFile::typeDescStruct DataFile::s_types[DataFile::TypeCount] = { @@ -879,3 +883,4 @@ void DataFile::loadData( const QByteArray & _data, const QString & _sourceFile ) item( 0 ).toElement(); } +} diff --git a/src/core/DrumSynth.cpp b/src/core/DrumSynth.cpp index 8c732bb7d3f..16d2ab90df7 100644 --- a/src/core/DrumSynth.cpp +++ b/src/core/DrumSynth.cpp @@ -45,6 +45,11 @@ using namespace std; #define DWORD __u32 #define WAVE_FORMAT_PCM 0x0001 + + +namespace lmms +{ + // const int Fs = 44100; const float TwoPi = 6.2831853f; const int MAX = 0; @@ -732,3 +737,5 @@ int DrumSynth::GetDSFileSamples(const char *dsfile, int16_t *&wave, int channels return Length; } + +} diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp index 36e86ef9ce4..2fa16bf00d5 100644 --- a/src/core/Effect.cpp +++ b/src/core/Effect.cpp @@ -34,6 +34,10 @@ #include "ConfigManager.h" +namespace lmms +{ + + Effect::Effect( const Plugin::Descriptor * _desc, Model * _parent, const Descriptor::SubPluginFeatures::Key * _key ) : @@ -217,3 +221,5 @@ void Effect::resample( int _i, const sampleFrame * _src_buf, } } + +} diff --git a/src/core/EffectChain.cpp b/src/core/EffectChain.cpp index f310f94dc45..014913e6619 100644 --- a/src/core/EffectChain.cpp +++ b/src/core/EffectChain.cpp @@ -34,6 +34,10 @@ #include "Song.h" +namespace lmms +{ + + EffectChain::EffectChain( Model * _parent ) : Model( _parent ), SerializingObject(), @@ -265,4 +269,4 @@ void EffectChain::clear() - +} diff --git a/src/core/Engine.cpp b/src/core/Engine.cpp index 8e5d85139ed..bd4e6330b1b 100644 --- a/src/core/Engine.cpp +++ b/src/core/Engine.cpp @@ -37,6 +37,11 @@ #include "GuiApplication.h" + +namespace lmms +{ + + float Engine::s_framesPerTick; Mixer* Engine::s_mixer = NULL; FxMixer * Engine::s_fxMixer = NULL; @@ -150,3 +155,5 @@ void Engine::initPluginFileHandling() Engine * Engine::s_instanceOfMe = NULL; + +} diff --git a/src/core/EnvelopeAndLfoParameters.cpp b/src/core/EnvelopeAndLfoParameters.cpp index 271bfd6f49c..2af378096c0 100644 --- a/src/core/EnvelopeAndLfoParameters.cpp +++ b/src/core/EnvelopeAndLfoParameters.cpp @@ -30,6 +30,10 @@ #include "Oscillator.h" +namespace lmms +{ + + // how long should be each envelope-segment maximal (e.g. attack)? extern const float SECS_PER_ENV_SEGMENT = 5.0f; // how long should be one LFO-oscillation maximal? @@ -540,5 +544,5 @@ void EnvelopeAndLfoParameters::updateSampleVars() - +} diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp index 083a84b9f93..48abdd9b317 100644 --- a/src/core/FxMixer.cpp +++ b/src/core/FxMixer.cpp @@ -33,6 +33,11 @@ #include "BBTrackContainer.h" #include "ValueBuffer.h" + +namespace lmms +{ + + FxRoute::FxRoute( FxChannel * from, FxChannel * to, float amount ) : m_from( from ), m_to( to ), @@ -771,3 +776,5 @@ void FxMixer::validateChannelName( int index, int oldIndex ) } } + +} diff --git a/src/core/ImportFilter.cpp b/src/core/ImportFilter.cpp index e126de51251..9dde03a6a83 100644 --- a/src/core/ImportFilter.cpp +++ b/src/core/ImportFilter.cpp @@ -31,6 +31,9 @@ #include "ProjectJournal.h" +namespace lmms +{ + ImportFilter::ImportFilter( const QString & _file_name, const Descriptor * _descriptor ) : @@ -124,3 +127,4 @@ bool ImportFilter::openFile() +} diff --git a/src/core/InlineAutomation.cpp b/src/core/InlineAutomation.cpp index a352689ee86..cee8d357ace 100644 --- a/src/core/InlineAutomation.cpp +++ b/src/core/InlineAutomation.cpp @@ -27,6 +27,10 @@ #include "InlineAutomation.h" +namespace lmms +{ + + void InlineAutomation::saveSettings( QDomDocument & _doc, QDomElement & _parent ) { @@ -58,3 +62,5 @@ void InlineAutomation::loadSettings( const QDomElement & _this ) } } + +} diff --git a/src/core/Instrument.cpp b/src/core/Instrument.cpp index b4bf40bd179..4d041919aa1 100644 --- a/src/core/Instrument.cpp +++ b/src/core/Instrument.cpp @@ -29,6 +29,10 @@ #include "Engine.h" +namespace lmms +{ + + Instrument::Instrument( InstrumentTrack * _instrument_track, const Descriptor * _descriptor ) : Plugin( _descriptor, NULL/* _instrument_track*/ ), @@ -126,4 +130,4 @@ QString Instrument::fullDisplayName() const } - +} diff --git a/src/core/InstrumentFunctions.cpp b/src/core/InstrumentFunctions.cpp index 1083a3052d0..165f88237ce 100644 --- a/src/core/InstrumentFunctions.cpp +++ b/src/core/InstrumentFunctions.cpp @@ -32,6 +32,9 @@ #include "PresetPreviewPlayHandle.h" +namespace lmms +{ + InstrumentFunctionNoteStacking::ChordTable::Init InstrumentFunctionNoteStacking::ChordTable::s_initTable[] = { @@ -527,4 +530,4 @@ void InstrumentFunctionArpeggio::loadSettings( const QDomElement & _this ) } - +} diff --git a/src/core/InstrumentPlayHandle.cpp b/src/core/InstrumentPlayHandle.cpp index e44cf4e0020..e3c7bdcd1ed 100644 --- a/src/core/InstrumentPlayHandle.cpp +++ b/src/core/InstrumentPlayHandle.cpp @@ -26,9 +26,17 @@ #include "InstrumentPlayHandle.h" #include "InstrumentTrack.h" + +namespace lmms +{ + + InstrumentPlayHandle::InstrumentPlayHandle( Instrument * instrument, InstrumentTrack* instrumentTrack ) : PlayHandle( TypeInstrumentPlayHandle ), m_instrument( instrument ) { setAudioPort( instrumentTrack->audioPort() ); } + + +} diff --git a/src/core/InstrumentSoundShaping.cpp b/src/core/InstrumentSoundShaping.cpp index b95bacc1519..9f627ae12d0 100644 --- a/src/core/InstrumentSoundShaping.cpp +++ b/src/core/InstrumentSoundShaping.cpp @@ -35,6 +35,10 @@ +namespace lmms +{ + + const float CUT_FREQ_MULTIPLIER = 6000.0f; const float RES_MULTIPLIER = 2.0f; const float RES_PRECISION = 1000.0f; @@ -367,6 +371,6 @@ void InstrumentSoundShaping::loadSettings( const QDomElement & _this ) - +} diff --git a/src/core/JournallingObject.cpp b/src/core/JournallingObject.cpp index 4c3163f0c10..33b63230ed3 100644 --- a/src/core/JournallingObject.cpp +++ b/src/core/JournallingObject.cpp @@ -32,6 +32,9 @@ #include "Engine.h" +namespace lmms +{ + JournallingObject::JournallingObject() : SerializingObject(), @@ -141,3 +144,5 @@ void JournallingObject::changeID( jo_id_t _id ) } + +} diff --git a/src/core/Ladspa2LMMS.cpp b/src/core/Ladspa2LMMS.cpp index 7f8e4d67f81..ec3cb809aec 100644 --- a/src/core/Ladspa2LMMS.cpp +++ b/src/core/Ladspa2LMMS.cpp @@ -27,6 +27,10 @@ #include "Ladspa2LMMS.h" +namespace lmms +{ + + Ladspa2LMMS::Ladspa2LMMS() { l_sortable_plugin_t plugins = getSortedPlugins(); @@ -126,3 +130,5 @@ QString Ladspa2LMMS::getShortName( const ladspa_key_t & _key ) return name; } + +} diff --git a/src/core/LadspaControl.cpp b/src/core/LadspaControl.cpp index 2559fe3d9f1..54da89e6fa8 100644 --- a/src/core/LadspaControl.cpp +++ b/src/core/LadspaControl.cpp @@ -29,6 +29,10 @@ #include "LadspaBase.h" +namespace lmms +{ + + LadspaControl::LadspaControl( Model * _parent, port_desc_t * _port, bool _link ) : Model( _parent ), @@ -339,4 +343,4 @@ void LadspaControl::setLink( bool _state ) - +} diff --git a/src/core/LadspaManager.cpp b/src/core/LadspaManager.cpp index 8dcb2015862..3cfcd77cc8d 100644 --- a/src/core/LadspaManager.cpp +++ b/src/core/LadspaManager.cpp @@ -37,6 +37,10 @@ +namespace lmms +{ + + LadspaManager::LadspaManager() { QStringList ladspaDirectories = QString( getenv( "LADSPA_PATH" ) ). @@ -994,3 +998,6 @@ bool LadspaManager::cleanup( const ladspa_key_t & _plugin, } return( false ); } + + +} diff --git a/src/core/LfoController.cpp b/src/core/LfoController.cpp index e1b20a492d3..576ce4fa34b 100644 --- a/src/core/LfoController.cpp +++ b/src/core/LfoController.cpp @@ -34,6 +34,10 @@ #include "lmms_math.h" +namespace lmms +{ + + LfoController::LfoController( Model * _parent ) : Controller( Controller::LfoController, _parent, tr( "LFO Controller" ) ), m_baseModel( 0.5, 0.0, 1.0, 0.001, this, tr( "Base value" ) ), @@ -230,5 +234,5 @@ ControllerDialog * LfoController::createDialog( QWidget * _parent ) - +} diff --git a/src/core/MemoryHelper.cpp b/src/core/MemoryHelper.cpp index afe0ac31f08..872c295090b 100644 --- a/src/core/MemoryHelper.cpp +++ b/src/core/MemoryHelper.cpp @@ -26,6 +26,11 @@ #include "lmms_basics.h" #include "MemoryHelper.h" + +namespace lmms +{ + + /** * Allocate a number of bytes and return them. * @param byteNum is the number of bytes @@ -63,3 +68,5 @@ void MemoryHelper::alignedFree( void* _buffer ) } } + +} diff --git a/src/core/MemoryManager.cpp b/src/core/MemoryManager.cpp index 7366aa234cc..28f881ee6fc 100644 --- a/src/core/MemoryManager.cpp +++ b/src/core/MemoryManager.cpp @@ -30,6 +30,10 @@ #include +namespace lmms +{ + + MemoryPoolVector MemoryManager::s_memoryPools; QReadWriteLock MemoryManager::s_poolMutex; PointerInfoMap MemoryManager::s_pointerInfo; @@ -217,3 +221,6 @@ void MemoryPool::releaseChunks( void * ptr, int chunks ) m_mutex.unlock(); } + + +} diff --git a/src/core/MeterModel.cpp b/src/core/MeterModel.cpp index a243dfa6df2..8df7cddc019 100644 --- a/src/core/MeterModel.cpp +++ b/src/core/MeterModel.cpp @@ -27,6 +27,10 @@ #include "AutomationPattern.h" +namespace lmms +{ + + MeterModel::MeterModel( ::Model * _parent ) : Model( _parent ), m_numeratorModel( 4, 1, 32, this, tr( "Numerator" ) ), @@ -79,5 +83,5 @@ void MeterModel::loadSettings( const QDomElement & _this, - +} diff --git a/src/core/MixHelpers.cpp b/src/core/MixHelpers.cpp index 22065c9672f..f622ad07214 100644 --- a/src/core/MixHelpers.cpp +++ b/src/core/MixHelpers.cpp @@ -27,6 +27,10 @@ #include "ValueBuffer.h" +namespace lmms +{ + + namespace MixHelpers { @@ -269,3 +273,5 @@ void multiplyAndAddMultipliedJoined( sampleFrame* dst, } + +} diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp index 686e2c5c7c0..42cc58faf9b 100644 --- a/src/core/Mixer.cpp +++ b/src/core/Mixer.cpp @@ -56,6 +56,9 @@ #include "BufferManager.h" +namespace lmms +{ + Mixer::Mixer() : m_framesPerPeriod( DEFAULT_BUFFER_SIZE ), @@ -957,3 +960,4 @@ void Mixer::fifoWriter::run() +} diff --git a/src/core/MixerProfiler.cpp b/src/core/MixerProfiler.cpp index a081caea4d2..8c28842a6b7 100644 --- a/src/core/MixerProfiler.cpp +++ b/src/core/MixerProfiler.cpp @@ -25,6 +25,10 @@ #include "MixerProfiler.h" +namespace lmms +{ + + MixerProfiler::MixerProfiler() : m_periodTimer(), m_cpuLoad( 0 ), @@ -61,3 +65,6 @@ void MixerProfiler::setOutputFile( const QString& outputFile ) m_outputFile.open( QFile::WriteOnly | QFile::Truncate ); } + + +} diff --git a/src/core/MixerWorkerThread.cpp b/src/core/MixerWorkerThread.cpp index 45554708c68..a2c030feaf7 100644 --- a/src/core/MixerWorkerThread.cpp +++ b/src/core/MixerWorkerThread.cpp @@ -31,6 +31,11 @@ #include "denormals.h" + +namespace lmms +{ + + MixerWorkerThread::JobQueue MixerWorkerThread::globalJobQueue; QWaitCondition * MixerWorkerThread::queueReadyWaitCond = NULL; QList MixerWorkerThread::workerThreads; @@ -167,3 +172,5 @@ void MixerWorkerThread::run() } + +} diff --git a/src/core/Model.cpp b/src/core/Model.cpp index 560b294d2c9..98f7cfc7ca3 100644 --- a/src/core/Model.cpp +++ b/src/core/Model.cpp @@ -25,6 +25,10 @@ #include "Model.h" +namespace lmms +{ + + QString Model::fullDisplayName() const { const QString & n = displayName(); @@ -46,5 +50,5 @@ QString Model::fullDisplayName() const - +} diff --git a/src/core/Note.cpp b/src/core/Note.cpp index f5851dde497..097bffc82b9 100644 --- a/src/core/Note.cpp +++ b/src/core/Note.cpp @@ -33,6 +33,8 @@ +namespace lmms +{ Note::Note( const MidiTime & length, const MidiTime & pos, @@ -236,3 +238,7 @@ bool Note::withinRange(int tickStart, int tickEnd) const return pos().getTicks() >= tickStart && pos().getTicks() <= tickEnd && length().getTicks() != 0; } + + + +} diff --git a/src/core/NotePlayHandle.cpp b/src/core/NotePlayHandle.cpp index be5a3829593..05dd82b7b7f 100644 --- a/src/core/NotePlayHandle.cpp +++ b/src/core/NotePlayHandle.cpp @@ -34,6 +34,10 @@ #include "Song.h" +namespace lmms +{ + + NotePlayHandle::BaseDetuning::BaseDetuning( DetuningHelper *detuning ) : m_value( detuning ? detuning->automationPattern()->valueAt( 0 ) : 0 ) { @@ -626,3 +630,7 @@ void NotePlayHandleManager::extend( int c ) ++n; } } + + + +} diff --git a/src/core/Oscillator.cpp b/src/core/Oscillator.cpp index 843e99688c7..4850c74e1fd 100644 --- a/src/core/Oscillator.cpp +++ b/src/core/Oscillator.cpp @@ -29,6 +29,10 @@ +namespace lmms +{ + + Oscillator::Oscillator( const IntModel * _wave_shape_model, const IntModel * _mod_algo_model, const float & _freq, @@ -548,4 +552,4 @@ inline sample_t Oscillator::getSample( - +} diff --git a/src/core/PeakController.cpp b/src/core/PeakController.cpp index 2d92cff055a..c8e498f9484 100644 --- a/src/core/PeakController.cpp +++ b/src/core/PeakController.cpp @@ -36,6 +36,11 @@ #include "plugins/peak_controller_effect/peak_controller_effect.h" #include "PresetPreviewPlayHandle.h" + +namespace lmms +{ + + class ControllerDialog; PeakControllerEffectVector PeakController::s_effects; @@ -260,4 +265,4 @@ ControllerDialog * PeakController::createDialog( QWidget * _parent ) - +} diff --git a/src/core/Piano.cpp b/src/core/Piano.cpp index d72160b5ab3..a2940ef6b2a 100644 --- a/src/core/Piano.cpp +++ b/src/core/Piano.cpp @@ -42,6 +42,10 @@ #include "MidiEventProcessor.h" +namespace lmms +{ + + /*! \brief Create a new keyboard display * * \param _it the InstrumentTrack window to attach to @@ -126,5 +130,4 @@ void Piano::handleKeyRelease( int key ) - - +} diff --git a/src/core/PlayHandle.cpp b/src/core/PlayHandle.cpp index 1e3666c0889..63ff2df6c14 100644 --- a/src/core/PlayHandle.cpp +++ b/src/core/PlayHandle.cpp @@ -26,6 +26,10 @@ #include "BufferManager.h" +namespace lmms +{ + + PlayHandle::PlayHandle( const Type type, f_cnt_t offset ) : m_type( type ), m_offset( offset ), @@ -60,3 +64,7 @@ void PlayHandle::releaseBuffer() if( m_playHandleBuffer ) BufferManager::release( m_playHandleBuffer ); m_playHandleBuffer = NULL; } + + + +} diff --git a/src/core/Plugin.cpp b/src/core/Plugin.cpp index 49aa41e25bb..a398ccf9081 100644 --- a/src/core/Plugin.cpp +++ b/src/core/Plugin.cpp @@ -38,6 +38,11 @@ #include "Song.h" + +namespace lmms +{ + + static PixmapLoader __dummyLoader; static Plugin::Descriptor dummyPluginDescriptor = @@ -228,3 +233,4 @@ QDomElement Plugin::Descriptor::SubPluginFeatures::Key::saveXML( +} diff --git a/src/core/PresetPreviewPlayHandle.cpp b/src/core/PresetPreviewPlayHandle.cpp index a91681758b5..f565f61a994 100644 --- a/src/core/PresetPreviewPlayHandle.cpp +++ b/src/core/PresetPreviewPlayHandle.cpp @@ -38,6 +38,10 @@ +namespace lmms +{ + + // invisible track-container which is needed as parent for preview-channels class PreviewTrackContainer : public TrackContainer { @@ -276,3 +280,4 @@ bool PresetPreviewPlayHandle::isPreviewing() +} diff --git a/src/core/ProjectJournal.cpp b/src/core/ProjectJournal.cpp index 4e5c9229b42..a92fa6caf61 100644 --- a/src/core/ProjectJournal.cpp +++ b/src/core/ProjectJournal.cpp @@ -29,6 +29,12 @@ #include "JournallingObject.h" #include "Song.h" + + +namespace lmms +{ + + const int ProjectJournal::MAX_UNDO_STATES = 100; // TODO: make this configurable in settings ProjectJournal::ProjectJournal() : @@ -191,3 +197,4 @@ void ProjectJournal::stopAllJournalling() +} diff --git a/src/core/ProjectRenderer.cpp b/src/core/ProjectRenderer.cpp index e8a91c77d92..5b3b30ee995 100644 --- a/src/core/ProjectRenderer.cpp +++ b/src/core/ProjectRenderer.cpp @@ -37,6 +37,12 @@ #endif #include + + +namespace lmms +{ + + FileEncodeDevice __fileEncodeDevices[] = { @@ -230,3 +236,4 @@ void ProjectRenderer::updateConsoleProgress() +} diff --git a/src/core/ProjectVersion.cpp b/src/core/ProjectVersion.cpp index 111e014a841..c3aa5fb1ded 100644 --- a/src/core/ProjectVersion.cpp +++ b/src/core/ProjectVersion.cpp @@ -27,6 +27,11 @@ #include "ProjectVersion.h" + +namespace lmms +{ + + int parseMajor(QString & version) { return version.section( '.', 0, 0 ).toInt(); } @@ -134,3 +139,4 @@ int ProjectVersion::compare(ProjectVersion v1, ProjectVersion v2) +} diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp index 84555fb3c20..cc46b259a76 100644 --- a/src/core/RemotePlugin.cpp +++ b/src/core/RemotePlugin.cpp @@ -40,6 +40,10 @@ #endif +namespace lmms +{ + + // simple helper thread monitoring our RemotePlugin - if process terminates // unexpectedly invalidate plugin so LMMS doesn't lock up ProcessWatcher::ProcessWatcher( RemotePlugin * _p ) : @@ -396,4 +400,4 @@ bool RemotePlugin::processMessage( const message & _m ) - +} diff --git a/src/core/RingBuffer.cpp b/src/core/RingBuffer.cpp index 474c1f52766..374a2f4ce6a 100644 --- a/src/core/RingBuffer.cpp +++ b/src/core/RingBuffer.cpp @@ -29,6 +29,10 @@ #include #include "MixHelpers.h" + +namespace lmms +{ + RingBuffer::RingBuffer( f_cnt_t size ) : m_fpp( Engine::mixer()->framesPerPeriod() ), @@ -315,3 +319,5 @@ void RingBuffer::updateSamplerate() } + +} diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp index 01778653f98..5ed6b9f1263 100644 --- a/src/core/SampleBuffer.cpp +++ b/src/core/SampleBuffer.cpp @@ -64,6 +64,11 @@ #include "MemoryManager.h" + +namespace lmms +{ + + SampleBuffer::SampleBuffer( const QString & _audio_file, bool _is_base64_data ) : m_audioFile( ( _is_base64_data == true ) ? "" : _audio_file ), @@ -1480,3 +1485,7 @@ SampleBuffer::handleState::~handleState() { src_delete( m_resamplingData ); } + + + +} diff --git a/src/core/SamplePlayHandle.cpp b/src/core/SamplePlayHandle.cpp index 1bcf6691ef8..8c7699abc87 100644 --- a/src/core/SamplePlayHandle.cpp +++ b/src/core/SamplePlayHandle.cpp @@ -33,6 +33,10 @@ +namespace lmms +{ + + SamplePlayHandle::SamplePlayHandle( const QString& sampleFile ) : PlayHandle( TypeSamplePlayHandle ), m_sampleBuffer( new SampleBuffer( sampleFile ) ), @@ -159,4 +163,4 @@ f_cnt_t SamplePlayHandle::totalFrames() const - +} diff --git a/src/core/SampleRecordHandle.cpp b/src/core/SampleRecordHandle.cpp index a16f5633008..d21eb338bd5 100644 --- a/src/core/SampleRecordHandle.cpp +++ b/src/core/SampleRecordHandle.cpp @@ -33,6 +33,10 @@ #include "debug.h" +namespace lmms +{ + + SampleRecordHandle::SampleRecordHandle( SampleTCO* tco ) : PlayHandle( TypeSamplePlayHandle ), m_framesRecorded( 0 ), @@ -152,3 +156,4 @@ void SampleRecordHandle::writeBuffer( const sampleFrame * _ab, +} diff --git a/src/core/SerializingObject.cpp b/src/core/SerializingObject.cpp index 913c73111f1..69e1b2b6241 100644 --- a/src/core/SerializingObject.cpp +++ b/src/core/SerializingObject.cpp @@ -28,6 +28,10 @@ +namespace lmms +{ + + SerializingObject::SerializingObject() : m_hook( NULL ) { @@ -111,3 +115,5 @@ void SerializingObject::loadSettings( const QDomElement& element ) } + +} diff --git a/src/core/Song.cpp b/src/core/Song.cpp index b336aec8279..9eff58daf59 100644 --- a/src/core/Song.cpp +++ b/src/core/Song.cpp @@ -67,6 +67,10 @@ #include "PeakController.h" +namespace lmms +{ + + tick_t MidiTime::s_ticksPerTact = DefaultTicksPerTact; @@ -1431,4 +1435,4 @@ QString* Song::errorSummary() - +} diff --git a/src/core/TempoSyncKnobModel.cpp b/src/core/TempoSyncKnobModel.cpp index c3583f88a26..b6c31f35d20 100644 --- a/src/core/TempoSyncKnobModel.cpp +++ b/src/core/TempoSyncKnobModel.cpp @@ -31,6 +31,10 @@ #include "Song.h" +namespace lmms +{ + + TempoSyncKnobModel::TempoSyncKnobModel( const float _val, const float _min, const float _max, const float _step, const float _scale, Model * _parent, @@ -180,7 +184,4 @@ void TempoSyncKnobModel::updateCustom() - - - - +} diff --git a/src/core/ToolPlugin.cpp b/src/core/ToolPlugin.cpp index 8f72e117209..835677f8970 100644 --- a/src/core/ToolPlugin.cpp +++ b/src/core/ToolPlugin.cpp @@ -26,6 +26,10 @@ #include "ToolPlugin.h" +namespace lmms +{ + + ToolPlugin::ToolPlugin( const Descriptor * _descriptor, Model * _parent ) : Plugin( _descriptor, _parent ) { @@ -56,3 +60,6 @@ ToolPlugin * ToolPlugin::instantiate( const QString & _plugin_name, Model * _par return NULL; } + + +} diff --git a/src/core/Track.cpp b/src/core/Track.cpp index 456cb7cd9cd..6b5282cd99e 100644 --- a/src/core/Track.cpp +++ b/src/core/Track.cpp @@ -74,6 +74,11 @@ #include "TrackContainer.h" + +namespace lmms +{ + + /*! The width of the resize grip in pixels */ const int RESIZE_GRIP_WIDTH = 4; @@ -2724,3 +2729,4 @@ void TrackView::createTCOView( TrackContentObject * tco ) +} diff --git a/src/core/TrackContainer.cpp b/src/core/TrackContainer.cpp index 2cf02e28c37..9bae0cd8dcd 100644 --- a/src/core/TrackContainer.cpp +++ b/src/core/TrackContainer.cpp @@ -35,6 +35,10 @@ #include "Song.h" +namespace lmms +{ + + TrackContainer::TrackContainer() : Model( NULL ), JournallingObject(), @@ -246,6 +250,4 @@ DummyTrackContainer::DummyTrackContainer() : - - - +} diff --git a/src/core/VstSyncController.cpp b/src/core/VstSyncController.cpp index a28b9adb10d..8a71fcc39c0 100644 --- a/src/core/VstSyncController.cpp +++ b/src/core/VstSyncController.cpp @@ -42,6 +42,11 @@ #endif + +namespace lmms +{ + + VstSyncController::VstSyncController() : m_syncData( NULL ), m_shmID( -1 ), @@ -191,5 +196,4 @@ void VstSyncController::updateSampleRate() - - +} diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp index 93f2d08b282..86f5f0302e8 100644 --- a/src/core/audio/AudioAlsa.cpp +++ b/src/core/audio/AudioAlsa.cpp @@ -37,6 +37,9 @@ #include "templates.h" +namespace lmms +{ + AudioAlsa::AudioAlsa( bool & _success_ful, Mixer* _mixer ) : AudioDevice( tLimit( @@ -538,5 +541,7 @@ void AudioAlsa::setupWidget::saveSettings() } +} + #endif diff --git a/src/core/audio/AudioDevice.cpp b/src/core/audio/AudioDevice.cpp index 7acbdbbf1aa..1f73873d0c9 100644 --- a/src/core/audio/AudioDevice.cpp +++ b/src/core/audio/AudioDevice.cpp @@ -29,6 +29,9 @@ #include "debug.h" +namespace lmms +{ + AudioDevice::AudioDevice( const ch_cnt_t _channels, Mixer* _mixer ) : m_supportsCapture( false ), @@ -252,3 +255,4 @@ bool AudioDevice::hqAudio() const } +} diff --git a/src/core/audio/AudioFileDevice.cpp b/src/core/audio/AudioFileDevice.cpp index b04cc4ebdcc..b1200613375 100644 --- a/src/core/audio/AudioFileDevice.cpp +++ b/src/core/audio/AudioFileDevice.cpp @@ -29,6 +29,9 @@ #include "ExportProjectDialog.h" +namespace lmms +{ + AudioFileDevice::AudioFileDevice( const sample_rate_t _sample_rate, const ch_cnt_t _channels, const QString & _file, @@ -85,3 +88,4 @@ int AudioFileDevice::writeData( const void* data, int len ) return -1; } +} diff --git a/src/core/audio/AudioFileOgg.cpp b/src/core/audio/AudioFileOgg.cpp index 798418bf2ac..ce860ce3dca 100644 --- a/src/core/audio/AudioFileOgg.cpp +++ b/src/core/audio/AudioFileOgg.cpp @@ -35,6 +35,9 @@ #include +namespace lmms +{ + AudioFileOgg::AudioFileOgg( const sample_rate_t _sample_rate, const ch_cnt_t _channels, bool & _success_ful, @@ -266,6 +269,8 @@ void AudioFileOgg::finishEncoding() } +} + #endif diff --git a/src/core/audio/AudioFileWave.cpp b/src/core/audio/AudioFileWave.cpp index cbb0d6c5f0a..7a783202cd8 100644 --- a/src/core/audio/AudioFileWave.cpp +++ b/src/core/audio/AudioFileWave.cpp @@ -27,6 +27,9 @@ #include "endian_handling.h" +namespace lmms +{ + AudioFileWave::AudioFileWave( const sample_rate_t _sample_rate, const ch_cnt_t _channels, bool & _success_ful, const QString & _file, @@ -123,3 +126,4 @@ void AudioFileWave::finishEncoding() } } +} diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp index b491ea82633..9024fd30e24 100644 --- a/src/core/audio/AudioJack.cpp +++ b/src/core/audio/AudioJack.cpp @@ -42,7 +42,8 @@ #include "MainWindow.h" - +namespace lmms +{ AudioJack::AudioJack( bool & _success_ful, Mixer* _mixer ) : AudioDevice( tLimit( ConfigManager::inst()->value( @@ -473,6 +474,6 @@ void AudioJack::setupWidget::saveSettings() - +} #endif diff --git a/src/core/audio/AudioOss.cpp b/src/core/audio/AudioOss.cpp index f280da0f9ee..4697b607bbb 100644 --- a/src/core/audio/AudioOss.cpp +++ b/src/core/audio/AudioOss.cpp @@ -71,6 +71,9 @@ +namespace lmms +{ + AudioOss::AudioOss( bool & _success_ful, Mixer* _mixer ) : AudioDevice( tLimit( ConfigManager::inst()->value( "audiooss", "channels" ).toInt(), @@ -371,5 +374,7 @@ void AudioOss::setupWidget::saveSettings() } +} + #endif diff --git a/src/core/audio/AudioPort.cpp b/src/core/audio/AudioPort.cpp index e2014609754..22541379b0a 100644 --- a/src/core/audio/AudioPort.cpp +++ b/src/core/audio/AudioPort.cpp @@ -33,6 +33,9 @@ #include "panning.h" +namespace lmms +{ + AudioPort::AudioPort( const QString & _name, bool _has_effect_chain, FloatModel * volumeModel, FloatModel * panningModel, BoolModel * mutedModel ) : @@ -249,3 +252,5 @@ void AudioPort::removePlayHandle( PlayHandle * handle ) } m_playHandleLock.unlock(); } + +} diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp index d23baf277ef..ebf3aae2b31 100644 --- a/src/core/audio/AudioPortAudio.cpp +++ b/src/core/audio/AudioPortAudio.cpp @@ -27,12 +27,18 @@ #include "AudioPortAudio.h" #ifndef LMMS_HAVE_PORTAUDIO + +namespace lmms +{ + void AudioPortAudioSetupUtil::updateDevices() { } void AudioPortAudioSetupUtil::updateChannels() { +} + } #endif @@ -50,6 +56,9 @@ void AudioPortAudioSetupUtil::updateChannels() #include "LcdSpinBox.h" +namespace lmms +{ + AudioPortAudio::AudioPortAudio( bool & _success_ful, Mixer * _mixer ) : AudioDevice( tLimit( ConfigManager::inst()->value( "audioportaudio", "channels" ).toInt(), @@ -485,6 +494,8 @@ void AudioPortAudio::setupWidget::saveSettings() } +} + #endif diff --git a/src/core/audio/AudioPulseAudio.cpp b/src/core/audio/AudioPulseAudio.cpp index a1d1e740f36..099c65f67b5 100644 --- a/src/core/audio/AudioPulseAudio.cpp +++ b/src/core/audio/AudioPulseAudio.cpp @@ -37,6 +37,9 @@ #include "Engine.h" +namespace lmms +{ + static void stream_write_callback(pa_stream *s, size_t length, void *userdata) { static_cast( userdata )->streamWriteCallback( s, length ); @@ -322,5 +325,7 @@ void AudioPulseAudio::setupWidget::saveSettings() } +} + #endif diff --git a/src/core/audio/AudioSampleRecorder.cpp b/src/core/audio/AudioSampleRecorder.cpp index 01d1091ac44..66f4de936cd 100644 --- a/src/core/audio/AudioSampleRecorder.cpp +++ b/src/core/audio/AudioSampleRecorder.cpp @@ -30,6 +30,9 @@ +namespace lmms +{ + AudioSampleRecorder::AudioSampleRecorder( const ch_cnt_t _channels, bool & _success_ful, Mixer * _mixer ) : @@ -111,4 +114,4 @@ void AudioSampleRecorder::writeBuffer( const surroundSampleFrame * _ab, } - +} diff --git a/src/core/audio/AudioSdl.cpp b/src/core/audio/AudioSdl.cpp index 6285b4d4bc9..afffa6e3b86 100644 --- a/src/core/audio/AudioSdl.cpp +++ b/src/core/audio/AudioSdl.cpp @@ -36,7 +36,8 @@ #include "templates.h" - +namespace lmms +{ AudioSdl::AudioSdl( bool & _success_ful, Mixer* _mixer ) : AudioDevice( DEFAULT_CHANNELS, _mixer ), @@ -232,5 +233,7 @@ void AudioSdl::setupWidget::saveSettings() } +} + #endif diff --git a/src/core/base64.cpp b/src/core/base64.cpp index 0479d468bf0..15472a0af42 100644 --- a/src/core/base64.cpp +++ b/src/core/base64.cpp @@ -30,6 +30,10 @@ #include #include + +namespace lmms +{ + namespace base64 { @@ -73,3 +77,4 @@ QVariant decode( const QString & _b64, QVariant::Type _force_type ) } ; +} diff --git a/src/core/fft_helpers.cpp b/src/core/fft_helpers.cpp index 11f619c4a00..d77640712d8 100644 --- a/src/core/fft_helpers.cpp +++ b/src/core/fft_helpers.cpp @@ -28,6 +28,11 @@ #include #include "lmms_constants.h" + +namespace lmms +{ + + /* returns biggest value from abs_spectrum[spec_size] array returns -1 on error @@ -241,3 +246,5 @@ float signalpower(float *timesignal, int num_values) return power; } + +} diff --git a/src/core/main.cpp b/src/core/main.cpp index bba357b010a..d9ae9924a38 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -68,6 +68,9 @@ #include "DataFile.h" #include "Song.h" + +using namespace lmms; + static inline QString baseName( const QString & _file ) { return( QFileInfo( _file ).absolutePath() + "/" + diff --git a/src/core/midi/MidiAlsaRaw.cpp b/src/core/midi/MidiAlsaRaw.cpp index 534a7dd9f05..53e74bb224d 100644 --- a/src/core/midi/MidiAlsaRaw.cpp +++ b/src/core/midi/MidiAlsaRaw.cpp @@ -32,6 +32,8 @@ #ifdef LMMS_HAVE_ALSA +namespace lmms +{ MidiAlsaRaw::MidiAlsaRaw() : MidiClientRaw(), @@ -204,5 +206,7 @@ void MidiAlsaRaw::setupWidget::saveSettings() } +} + #endif diff --git a/src/core/midi/MidiAlsaSeq.cpp b/src/core/midi/MidiAlsaSeq.cpp index 33740bafd1e..9160e15e844 100644 --- a/src/core/midi/MidiAlsaSeq.cpp +++ b/src/core/midi/MidiAlsaSeq.cpp @@ -37,6 +37,9 @@ #ifdef LMMS_HAVE_ALSA +namespace lmms +{ + const int EventPollTimeOut = 250; @@ -736,7 +739,7 @@ void MidiAlsaSeq::setupWidget::saveSettings() - +} #endif diff --git a/src/core/midi/MidiClient.cpp b/src/core/midi/MidiClient.cpp index b4e9e250a3e..cefc281fbc4 100644 --- a/src/core/midi/MidiClient.cpp +++ b/src/core/midi/MidiClient.cpp @@ -28,6 +28,9 @@ #include "Note.h" +namespace lmms +{ + MidiClient::MidiClient() { } @@ -319,3 +322,4 @@ int MidiClientRaw::eventLength( const unsigned char event ) } +} diff --git a/src/core/midi/MidiController.cpp b/src/core/midi/MidiController.cpp index 7ff057c6f50..350b3e00307 100644 --- a/src/core/midi/MidiController.cpp +++ b/src/core/midi/MidiController.cpp @@ -34,6 +34,9 @@ #include "MidiController.h" +namespace lmms +{ + MidiController::MidiController( Model * _parent ) : Controller( Controller::MidiController, _parent, tr( "MIDI Controller" ) ), MidiEventProcessor(), @@ -158,4 +161,4 @@ ControllerDialog * MidiController::createDialog( QWidget * _parent ) - +} diff --git a/src/core/midi/MidiOss.cpp b/src/core/midi/MidiOss.cpp index d9777587f66..f603da49924 100644 --- a/src/core/midi/MidiOss.cpp +++ b/src/core/midi/MidiOss.cpp @@ -41,6 +41,8 @@ #include "gui_templates.h" +namespace lmms +{ MidiOss::MidiOss() : MidiClientRaw(), @@ -142,6 +144,7 @@ void MidiOss::setupWidget::saveSettings() } +} #endif diff --git a/src/core/midi/MidiPort.cpp b/src/core/midi/MidiPort.cpp index 7185c6dc7e9..c2bd914de87 100644 --- a/src/core/midi/MidiPort.cpp +++ b/src/core/midi/MidiPort.cpp @@ -30,6 +30,8 @@ #include "Song.h" +namespace lmms +{ MidiPort::MidiPort( const QString& name, MidiClient* client, @@ -405,5 +407,5 @@ void MidiPort::updateOutputProgram() - +} diff --git a/src/core/midi/MidiWinMM.cpp b/src/core/midi/MidiWinMM.cpp index 01badfd5d96..b17ff2d8bc6 100644 --- a/src/core/midi/MidiWinMM.cpp +++ b/src/core/midi/MidiWinMM.cpp @@ -36,6 +36,9 @@ #ifdef LMMS_BUILD_WIN32 +namespace lmms +{ + MidiWinMM::MidiWinMM() : MidiClient(), m_inputDevices(), @@ -324,7 +327,7 @@ MidiWinMM::setupWidget::~setupWidget() - +} #endif diff --git a/src/tracks/AutomationTrack.cpp b/src/tracks/AutomationTrack.cpp index 2b397862d6c..db2b0a64aad 100644 --- a/src/tracks/AutomationTrack.cpp +++ b/src/tracks/AutomationTrack.cpp @@ -34,6 +34,11 @@ #include "TrackLabelButton.h" +namespace lmms +{ + + + AutomationTrack::AutomationTrack( TrackContainer* tc, bool _hidden ) : Track( _hidden ? HiddenAutomationTrack : Track::AutomationTrack, tc ) { @@ -192,3 +197,5 @@ void AutomationTrackView::dropEvent( QDropEvent * _de ) } + +} diff --git a/src/tracks/BBTrack.cpp b/src/tracks/BBTrack.cpp index 45210b05f4e..d25e31df5f4 100644 --- a/src/tracks/BBTrack.cpp +++ b/src/tracks/BBTrack.cpp @@ -43,6 +43,10 @@ #include "TrackLabelButton.h" +namespace lmms +{ + + BBTrack::infoMap BBTrack::s_infoMap; @@ -635,7 +639,4 @@ void BBTrackView::clickedTrackLabel() - - - - +} diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index 19d936a1f4d..438e4333439 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -86,6 +86,11 @@ #include "volume.h" +namespace lmms +{ + + + const char * volume_help = QT_TRANSLATE_NOOP( "InstrumentTrack", "With this knob you can set " "the volume of the opened " @@ -1774,4 +1779,8 @@ void InstrumentTrackWindow::viewNextInstrument() void InstrumentTrackWindow::viewPrevInstrument() { viewInstrumentInDirection(-1); -} \ No newline at end of file +} + + + +} diff --git a/src/tracks/Pattern.cpp b/src/tracks/Pattern.cpp index e9ba69d9f5f..3f14813e38e 100644 --- a/src/tracks/Pattern.cpp +++ b/src/tracks/Pattern.cpp @@ -51,6 +51,10 @@ #include "MainWindow.h" +namespace lmms +{ + + QPixmap * PatternView::s_stepBtnOn = NULL; QPixmap * PatternView::s_stepBtnOverlay = NULL; QPixmap * PatternView::s_stepBtnOff = NULL; @@ -1222,3 +1226,5 @@ void PatternView::paintEvent( QPaintEvent * ) } + +} diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp index 3ee6836053b..d025a07f13a 100644 --- a/src/tracks/SampleTrack.cpp +++ b/src/tracks/SampleTrack.cpp @@ -51,6 +51,10 @@ #include "panning_constants.h" +namespace lmms +{ + + SampleTCO::SampleTCO( Track * _track ) : TrackContentObject( _track ), m_sampleBuffer( new SampleBuffer ) @@ -632,3 +636,7 @@ void SampleTrackView::modelChanged() TrackView::modelChanged(); } + + + +} From 5d2ba29be42e6c01b445609ae635cc311c4b3c72 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Fri, 15 May 2015 22:34:49 +0000 Subject: [PATCH 2/6] add src/gui/* into lmms namespace --- src/gui/AboutDialog.cpp | 7 +++++++ src/gui/ActionGroup.cpp | 9 +++++++++ src/gui/AutomatableModelView.cpp | 4 ++++ src/gui/AutomationPatternView.cpp | 7 +++++-- src/gui/ControllerConnectionDialog.cpp | 7 +++++-- src/gui/ControllerDialog.cpp | 6 +++++- src/gui/EffectControlDialog.cpp | 7 +++++-- src/gui/EffectSelectDialog.cpp | 7 +++++-- src/gui/ExportProjectDialog.cpp | 8 ++++++++ src/gui/FileBrowser.cpp | 6 +++++- src/gui/FxMixerView.cpp | 8 ++++++-- src/gui/GuiApplication.cpp | 9 +++++++++ src/gui/InstrumentView.cpp | 7 +++++++ src/gui/LfoControllerDialog.cpp | 8 ++++++++ src/gui/LmmsPalette.cpp | 6 ++++++ src/gui/LmmsStyle.cpp | 8 ++++++++ src/gui/MainWindow.cpp | 7 +++++++ src/gui/ModelView.cpp | 5 +++++ src/gui/PeakControllerDialog.cpp | 7 +++++++ src/gui/PianoView.cpp | 9 ++++++--- src/gui/PluginBrowser.cpp | 9 +++++---- src/gui/SetupDialog.cpp | 6 +++++- src/gui/StringPairDrag.cpp | 8 ++++++++ src/gui/TimeLineWidget.cpp | 5 +++++ src/gui/ToolPluginView.cpp | 6 ++++++ src/gui/TrackContainerView.cpp | 9 +++++++++ src/gui/dialogs/FileDialog.cpp | 5 +++++ src/gui/dialogs/VersionedSaveDialog.cpp | 5 +++++ src/gui/editors/AutomationEditor.cpp | 8 ++++++++ src/gui/editors/BBEditor.cpp | 8 ++++++++ src/gui/editors/Editor.cpp | 8 ++++++++ src/gui/editors/PianoRoll.cpp | 7 +++++++ src/gui/editors/SongEditor.cpp | 8 ++++++++ src/gui/widgets/AutomatableButton.cpp | 6 +++++- src/gui/widgets/AutomatableSlider.cpp | 7 ++++--- src/gui/widgets/CPULoadWidget.cpp | 8 +++++--- src/gui/widgets/CaptionMenu.cpp | 6 ++++++ src/gui/widgets/ComboBox.cpp | 8 +++++--- src/gui/widgets/ControllerRackView.cpp | 11 +++++++++-- src/gui/widgets/ControllerView.cpp | 7 +++++-- src/gui/widgets/EffectRackView.cpp | 7 +++++-- src/gui/widgets/EffectView.cpp | 8 ++++++-- src/gui/widgets/EnvelopeAndLfoView.cpp | 9 +++++---- src/gui/widgets/FadeButton.cpp | 9 +++++---- src/gui/widgets/Fader.cpp | 5 +++++ src/gui/widgets/FxLine.cpp | 6 ++++++ src/gui/widgets/Graph.cpp | 7 +++++-- src/gui/widgets/GroupBox.cpp | 8 ++++---- src/gui/widgets/InstrumentFunctionViews.cpp | 6 +++++- src/gui/widgets/InstrumentMidiIOView.cpp | 8 ++++++++ src/gui/widgets/InstrumentSoundShapingView.cpp | 6 ++++-- src/gui/widgets/Knob.cpp | 8 +++++--- src/gui/widgets/LadspaControlView.cpp | 7 +++++-- src/gui/widgets/LcdSpinBox.cpp | 5 +++++ src/gui/widgets/LcdWidget.cpp | 5 +++-- src/gui/widgets/LedCheckbox.cpp | 7 +++++-- src/gui/widgets/LeftRightNav.cpp | 10 +++++++++- src/gui/widgets/MeterDialog.cpp | 7 +++++++ src/gui/widgets/MidiPortMenu.cpp | 7 +++++-- src/gui/widgets/NStateButton.cpp | 8 ++++---- src/gui/widgets/PixmapButton.cpp | 6 ++++-- src/gui/widgets/ProjectNotes.cpp | 6 ++++++ src/gui/widgets/RenameDialog.cpp | 7 ++++--- src/gui/widgets/Rubberband.cpp | 9 +++++---- src/gui/widgets/SendButtonIndicator.cpp | 9 +++++++++ src/gui/widgets/SideBar.cpp | 6 +++++- src/gui/widgets/SideBarWidget.cpp | 6 ++++-- src/gui/widgets/TabBar.cpp | 10 +++++----- src/gui/widgets/TabWidget.cpp | 8 ++++---- src/gui/widgets/TempoSyncKnob.cpp | 7 ++++--- src/gui/widgets/TextFloat.cpp | 5 ++++- src/gui/widgets/TimeDisplayWidget.cpp | 7 ++++--- src/gui/widgets/ToolButton.cpp | 8 +++++--- src/gui/widgets/ToolTip.cpp | 5 +++++ src/gui/widgets/TrackLabelButton.cpp | 6 ++++-- src/gui/widgets/VisualizationWidget.cpp | 7 ++++--- 76 files changed, 435 insertions(+), 107 deletions(-) diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp index 6d39a8e46c0..e2757746a37 100644 --- a/src/gui/AboutDialog.cpp +++ b/src/gui/AboutDialog.cpp @@ -29,6 +29,9 @@ #include "versioninfo.h" +namespace lmms +{ + AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), @@ -52,3 +55,7 @@ AboutDialog::AboutDialog(QWidget* parent) : involvedLabel->setPlainText( embed::getText( "CONTRIBUTORS" ) ); } + + + +} diff --git a/src/gui/ActionGroup.cpp b/src/gui/ActionGroup.cpp index b0f0dbcd326..032b1fd2179 100644 --- a/src/gui/ActionGroup.cpp +++ b/src/gui/ActionGroup.cpp @@ -24,6 +24,11 @@ #include "ActionGroup.h" + +namespace lmms +{ + + ActionGroup::ActionGroup(QObject* parent) : QActionGroup(parent) { connect(this, SIGNAL(triggered(QAction*)), this, SLOT(actionTriggered_(QAction*))); @@ -53,3 +58,7 @@ void ActionGroup::actionTriggered_(QAction* action) emit triggered(actions().indexOf(action)); } + + + +} diff --git a/src/gui/AutomatableModelView.cpp b/src/gui/AutomatableModelView.cpp index 453d7e0134d..caffe25b44b 100644 --- a/src/gui/AutomatableModelView.cpp +++ b/src/gui/AutomatableModelView.cpp @@ -37,6 +37,9 @@ #include "AutomationEditor.h" +namespace lmms +{ + AutomatableModelView::AutomatableModelView( ::Model* model, QWidget* _this ) : ModelView( model, _this ), @@ -247,3 +250,4 @@ void AutomatableModelViewSlots::unlinkAllModels() +} diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp index e92b5eb71af..6f60f35b0aa 100644 --- a/src/gui/AutomationPatternView.cpp +++ b/src/gui/AutomationPatternView.cpp @@ -39,6 +39,10 @@ #include "ToolTip.h" +namespace lmms +{ + + QPixmap * AutomationPatternView::s_pat_rec = NULL; AutomationPatternView::AutomationPatternView( AutomationPattern * _pattern, @@ -480,5 +484,4 @@ void AutomationPatternView::scaleTimemapToFit( float oldMin, float oldMax ) - - +} diff --git a/src/gui/ControllerConnectionDialog.cpp b/src/gui/ControllerConnectionDialog.cpp index d4485519a2f..4150a27e56d 100644 --- a/src/gui/ControllerConnectionDialog.cpp +++ b/src/gui/ControllerConnectionDialog.cpp @@ -46,6 +46,10 @@ #include "embed.h" +namespace lmms +{ + + class AutoDetectMidiController : public MidiController { public: @@ -432,5 +436,4 @@ void ControllerConnectionDialog::enableAutoDetect( QAction * _a ) - - +} diff --git a/src/gui/ControllerDialog.cpp b/src/gui/ControllerDialog.cpp index 03995ec59f6..1a5a4ab6d9d 100644 --- a/src/gui/ControllerDialog.cpp +++ b/src/gui/ControllerDialog.cpp @@ -29,6 +29,10 @@ #include "Controller.h" +namespace lmms +{ + + ControllerDialog::ControllerDialog( Controller * _controller, QWidget * _parent ) : QWidget( _parent ), @@ -52,4 +56,4 @@ void ControllerDialog::closeEvent( QCloseEvent * _ce ) - +} diff --git a/src/gui/EffectControlDialog.cpp b/src/gui/EffectControlDialog.cpp index 81af476c5a4..6c9f2adbe1e 100644 --- a/src/gui/EffectControlDialog.cpp +++ b/src/gui/EffectControlDialog.cpp @@ -31,6 +31,10 @@ #include "Effect.h" +namespace lmms +{ + + EffectControlDialog::EffectControlDialog( EffectControls * _controls ) : QWidget( NULL ), ModelView( _controls, this ), @@ -57,5 +61,4 @@ void EffectControlDialog::closeEvent( QCloseEvent * _ce ) - - +} diff --git a/src/gui/EffectSelectDialog.cpp b/src/gui/EffectSelectDialog.cpp index 9249116846a..5913bff6ed2 100644 --- a/src/gui/EffectSelectDialog.cpp +++ b/src/gui/EffectSelectDialog.cpp @@ -32,6 +32,10 @@ #include +namespace lmms +{ + + EffectSelectDialog::EffectSelectDialog( QWidget * _parent ) : QDialog( _parent ), ui( new Ui::EffectSelectDialog ), @@ -254,5 +258,4 @@ void EffectSelectDialog::updateSelection() - - +} diff --git a/src/gui/ExportProjectDialog.cpp b/src/gui/ExportProjectDialog.cpp index dd1586704a4..0a646ed74cb 100644 --- a/src/gui/ExportProjectDialog.cpp +++ b/src/gui/ExportProjectDialog.cpp @@ -34,6 +34,10 @@ #include "BBTrack.h" +namespace lmms +{ + + ExportProjectDialog::ExportProjectDialog( const QString & _file_name, QWidget * _parent, bool multi_export=false ) : QDialog( _parent ), @@ -344,3 +348,7 @@ void ExportProjectDialog::updateTitleBar( int _prog ) gui->mainWindow()->setWindowTitle( tr( "Rendering: %1%" ).arg( _prog ) ); } + + + +} diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp index e213d801c4d..92f41597998 100644 --- a/src/gui/FileBrowser.cpp +++ b/src/gui/FileBrowser.cpp @@ -55,6 +55,10 @@ +namespace lmms +{ + + enum TreeWidgetItemTypes { TypeFileItem = QTreeWidgetItem::UserType, @@ -1109,4 +1113,4 @@ QString FileItem::extension(const QString & file ) - +} diff --git a/src/gui/FxMixerView.cpp b/src/gui/FxMixerView.cpp index 2a8271048d6..f184a7c4cd2 100644 --- a/src/gui/FxMixerView.cpp +++ b/src/gui/FxMixerView.cpp @@ -48,6 +48,11 @@ #include "Song.h" #include "BBTrackContainer.h" + +namespace lmms +{ + + FxMixerView::FxMixerView() : QWidget(), ModelView( NULL, this ), @@ -593,5 +598,4 @@ void FxMixerView::updateFaders() - - +} diff --git a/src/gui/GuiApplication.cpp b/src/gui/GuiApplication.cpp index 4a9b35f73d4..dd7cdcc6b1b 100644 --- a/src/gui/GuiApplication.cpp +++ b/src/gui/GuiApplication.cpp @@ -42,6 +42,11 @@ #include #include + +namespace lmms +{ + + GuiApplication* GuiApplication::s_instance = nullptr; GuiApplication* GuiApplication::instance() @@ -137,3 +142,7 @@ void GuiApplication::displayInitProgress(const QString &msg) m_loadingProgressLabel->repaint(); qApp->processEvents(); } + + + +} diff --git a/src/gui/InstrumentView.cpp b/src/gui/InstrumentView.cpp index dedbaef8bd2..b2b441d85d9 100644 --- a/src/gui/InstrumentView.cpp +++ b/src/gui/InstrumentView.cpp @@ -31,6 +31,10 @@ #include "StringPairDrag.h" +namespace lmms +{ + + InstrumentView::InstrumentView( Instrument * _Instrument, QWidget * _parent ) : PluginView( _Instrument, _parent ) { @@ -72,3 +76,6 @@ InstrumentTrackWindow * InstrumentView::instrumentTrackWindow( void ) parentWidget()->parentWidget() ) ); } + + +} diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp index f13928969f5..72efccd5b72 100644 --- a/src/gui/LfoControllerDialog.cpp +++ b/src/gui/LfoControllerDialog.cpp @@ -44,6 +44,12 @@ #include "TempoSyncKnob.h" #include "PixmapButton.h" + + +namespace lmms +{ + + const int CD_ENV_KNOBS_LBL_Y = 20; const int CD_KNOB_X_SPACING = 32; @@ -299,3 +305,5 @@ void LfoControllerDialog::modelChanged() } + +} diff --git a/src/gui/LmmsPalette.cpp b/src/gui/LmmsPalette.cpp index 374c8c90454..3becf3f49ed 100644 --- a/src/gui/LmmsPalette.cpp +++ b/src/gui/LmmsPalette.cpp @@ -29,6 +29,11 @@ #include "LmmsStyle.h" + +namespace lmms +{ + + LmmsPalette::LmmsPalette( QWidget * parent, QStyle * stylearg ) : QWidget( parent ), @@ -98,3 +103,4 @@ QPalette LmmsPalette::palette() const +} diff --git a/src/gui/LmmsStyle.cpp b/src/gui/LmmsStyle.cpp index 893e0068431..125adb74332 100644 --- a/src/gui/LmmsStyle.cpp +++ b/src/gui/LmmsStyle.cpp @@ -35,6 +35,11 @@ #include "LmmsStyle.h" #include "LmmsPalette.h" + +namespace lmms +{ + + QPalette * LmmsStyle::s_palette = NULL; QLinearGradient getGradient( const QColor & _col, const QRectF & _rect ) @@ -368,3 +373,6 @@ void LmmsStyle::hoverColors( bool sunken, bool hover, bool active, QColor& color } } + + +} diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index b837a3fa2a6..3a26b57ada4 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -69,6 +69,9 @@ +namespace lmms +{ + MainWindow::MainWindow() : m_workspace( NULL ), @@ -1381,3 +1384,7 @@ void MainWindow::autoSave() QTimer::singleShot( 10*1000, this, SLOT( autoSave() ) ); } } + + + +} diff --git a/src/gui/ModelView.cpp b/src/gui/ModelView.cpp index 0e240ebaf9b..dce0ea8ee86 100644 --- a/src/gui/ModelView.cpp +++ b/src/gui/ModelView.cpp @@ -27,6 +27,9 @@ #include "ModelView.h" +namespace lmms +{ + ModelView::ModelView( Model* model, QWidget* widget ) : m_widget( widget ), @@ -84,3 +87,5 @@ void ModelView::doConnections() } + +} diff --git a/src/gui/PeakControllerDialog.cpp b/src/gui/PeakControllerDialog.cpp index 4403a7baa56..b4f4365db68 100644 --- a/src/gui/PeakControllerDialog.cpp +++ b/src/gui/PeakControllerDialog.cpp @@ -44,6 +44,11 @@ #include "PixmapButton.h" + +namespace lmms +{ + + PeakControllerDialog::PeakControllerDialog( Controller * _model, QWidget * _parent ) : ControllerDialog( _model, _parent ) { @@ -107,3 +112,5 @@ void PeakControllerDialog::modelChanged() } + +} diff --git a/src/gui/PianoView.cpp b/src/gui/PianoView.cpp index 8b74c628bbd..271f0999630 100644 --- a/src/gui/PianoView.cpp +++ b/src/gui/PianoView.cpp @@ -58,6 +58,11 @@ #include "update_event.h" + +namespace lmms +{ + + /*! The black / white order of keys as they appear on the keyboard. */ const Piano::KeyTypes KEY_ORDER[] = @@ -917,6 +922,4 @@ void PianoView::paintEvent( QPaintEvent * ) - - - +} diff --git a/src/gui/PluginBrowser.cpp b/src/gui/PluginBrowser.cpp index 96f33ae7501..efb544ddba9 100644 --- a/src/gui/PluginBrowser.cpp +++ b/src/gui/PluginBrowser.cpp @@ -38,6 +38,10 @@ #include "StringPairDrag.h" +namespace lmms +{ + + bool pluginBefore( const Plugin::Descriptor& d1, const Plugin::Descriptor& d2 ) { return qstricmp( d1.displayName, d2.displayName ) < 0 ? true : false; @@ -240,7 +244,4 @@ void PluginDescWidget::updateHeight() - - - - +} diff --git a/src/gui/SetupDialog.cpp b/src/gui/SetupDialog.cpp index 7ca9911ce41..4eaf3ceb0de 100644 --- a/src/gui/SetupDialog.cpp +++ b/src/gui/SetupDialog.cpp @@ -67,6 +67,10 @@ +namespace lmms +{ + + inline void labelWidget( QWidget * _w, const QString & _txt ) { QLabel * title = new QLabel( _txt, _w ); @@ -1495,4 +1499,4 @@ void SetupDialog::displayMIDIHelp() - +} diff --git a/src/gui/StringPairDrag.cpp b/src/gui/StringPairDrag.cpp index d9e01d0651a..52b66737b62 100644 --- a/src/gui/StringPairDrag.cpp +++ b/src/gui/StringPairDrag.cpp @@ -35,6 +35,10 @@ #include "MainWindow.h" +namespace lmms +{ + + StringPairDrag::StringPairDrag( const QString & _key, const QString & _value, const QPixmap & _icon, QWidget * _w ) : QDrag( _w ) @@ -121,3 +125,7 @@ QString StringPairDrag::decodeValue( QDropEvent * _de ) { return decodeMimeValue( _de->mimeData() ); } + + + +} diff --git a/src/gui/TimeLineWidget.cpp b/src/gui/TimeLineWidget.cpp index 870d7288d79..1d6c735b8f5 100644 --- a/src/gui/TimeLineWidget.cpp +++ b/src/gui/TimeLineWidget.cpp @@ -47,6 +47,10 @@ #endif +namespace lmms +{ + + QPixmap * TimeLineWidget::s_timeLinePixmap = NULL; QPixmap * TimeLineWidget::s_posMarkerPixmap = NULL; QPixmap * TimeLineWidget::s_loopPointBeginPixmap = NULL; @@ -401,3 +405,4 @@ void TimeLineWidget::mouseReleaseEvent( QMouseEvent* event ) +} diff --git a/src/gui/ToolPluginView.cpp b/src/gui/ToolPluginView.cpp index 8426c146e44..4528b7b619e 100644 --- a/src/gui/ToolPluginView.cpp +++ b/src/gui/ToolPluginView.cpp @@ -35,6 +35,10 @@ #include "MainWindow.h" +namespace lmms +{ + + ToolPluginView::ToolPluginView( ToolPlugin * _toolPlugin ) : PluginView( _toolPlugin, NULL ) { @@ -46,3 +50,5 @@ ToolPluginView::ToolPluginView( ToolPlugin * _toolPlugin ) : } + +} diff --git a/src/gui/TrackContainerView.cpp b/src/gui/TrackContainerView.cpp index 29abbfc7cbb..4ea5a231c0a 100644 --- a/src/gui/TrackContainerView.cpp +++ b/src/gui/TrackContainerView.cpp @@ -49,6 +49,11 @@ #include "GuiApplication.h" + +namespace lmms +{ + + TrackContainerView::TrackContainerView( TrackContainer * _tc ) : QWidget(), ModelView( NULL, this ), @@ -531,3 +536,7 @@ void InstrumentLoaderThread::run() i->moveToThread( m_containerThread ); i->setParent( parent ); } + + + +} diff --git a/src/gui/dialogs/FileDialog.cpp b/src/gui/dialogs/FileDialog.cpp index ec991161066..dbc2beb3bd5 100644 --- a/src/gui/dialogs/FileDialog.cpp +++ b/src/gui/dialogs/FileDialog.cpp @@ -31,6 +31,10 @@ #include "FileDialog.h" +namespace lmms +{ + + FileDialog::FileDialog( QWidget *parent, const QString &caption, const QString &directory, const QString &filter ) : QFileDialog( parent, caption, directory, filter ) @@ -86,3 +90,4 @@ void FileDialog::clearSelection() +} diff --git a/src/gui/dialogs/VersionedSaveDialog.cpp b/src/gui/dialogs/VersionedSaveDialog.cpp index 476046371c2..3f3758c20ee 100644 --- a/src/gui/dialogs/VersionedSaveDialog.cpp +++ b/src/gui/dialogs/VersionedSaveDialog.cpp @@ -32,6 +32,9 @@ +namespace lmms +{ + VersionedSaveDialog::VersionedSaveDialog( QWidget *parent, const QString &caption, @@ -137,3 +140,5 @@ void VersionedSaveDialog::decrementVersion() } + +} diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp index f51e7bce93e..3de4868353c 100644 --- a/src/gui/editors/AutomationEditor.cpp +++ b/src/gui/editors/AutomationEditor.cpp @@ -68,6 +68,10 @@ #include "ProjectJournal.h" +namespace lmms +{ + + QPixmap * AutomationEditor::s_toolDraw = NULL; QPixmap * AutomationEditor::s_toolErase = NULL; QPixmap * AutomationEditor::s_toolSelect = NULL; @@ -2349,3 +2353,7 @@ void AutomationEditorWindow::stop() { m_editor->stop(); } + + + +} diff --git a/src/gui/editors/BBEditor.cpp b/src/gui/editors/BBEditor.cpp index 953cefa9148..690a22a2997 100644 --- a/src/gui/editors/BBEditor.cpp +++ b/src/gui/editors/BBEditor.cpp @@ -44,6 +44,10 @@ +namespace lmms +{ + + BBEditor::BBEditor( BBTrackContainer* tc ) : Editor(false), m_trackContainerView( new BBTrackContainerView(tc) ) @@ -285,3 +289,7 @@ void BBTrackContainerView::makeSteps( bool clone ) } } } + + + +} diff --git a/src/gui/editors/Editor.cpp b/src/gui/editors/Editor.cpp index a4f277ac055..d022798bced 100644 --- a/src/gui/editors/Editor.cpp +++ b/src/gui/editors/Editor.cpp @@ -33,6 +33,10 @@ #include +namespace lmms +{ + + void Editor::setPauseIcon(bool displayPauseIcon) { // If we're playing, show a pause icon @@ -114,3 +118,7 @@ void DropToolBar::dropEvent(QDropEvent* event) { dropped(event); } + + + +} diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 8d02ddcf14d..c818172098a 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -77,6 +77,10 @@ #endif +namespace lmms +{ + + typedef AutomationPattern::timeMap timeMap; @@ -4311,3 +4315,6 @@ void PianoRollWindow::focusInEvent(QFocusEvent * event) // when the window is given focus, also give focus to the actual piano roll m_editor->setFocus(event->reason()); } + + +} diff --git a/src/gui/editors/SongEditor.cpp b/src/gui/editors/SongEditor.cpp index 2807c7a676c..393725e7a60 100644 --- a/src/gui/editors/SongEditor.cpp +++ b/src/gui/editors/SongEditor.cpp @@ -57,6 +57,10 @@ +namespace lmms +{ + + positionLine::positionLine( QWidget * _parent ) : QWidget( _parent ) { @@ -734,3 +738,7 @@ void SongEditorWindow::adjustUiAfterProjectLoad() qobject_cast( parentWidget() ) ); m_editor->scrolled(0); } + + + +} diff --git a/src/gui/widgets/AutomatableButton.cpp b/src/gui/widgets/AutomatableButton.cpp index 1e482d7f7d3..f99444ffaf2 100644 --- a/src/gui/widgets/AutomatableButton.cpp +++ b/src/gui/widgets/AutomatableButton.cpp @@ -36,6 +36,10 @@ +namespace lmms +{ + + AutomatableButton::AutomatableButton( QWidget * _parent, const QString & _name ) : QPushButton( _parent ), @@ -270,4 +274,4 @@ void automatableButtonGroup::updateButtons() - +} diff --git a/src/gui/widgets/AutomatableSlider.cpp b/src/gui/widgets/AutomatableSlider.cpp index c6a36c93969..5c80b65c33d 100644 --- a/src/gui/widgets/AutomatableSlider.cpp +++ b/src/gui/widgets/AutomatableSlider.cpp @@ -35,6 +35,9 @@ +namespace lmms +{ + AutomatableSlider::AutomatableSlider( QWidget * _parent, const QString & _name ) : @@ -143,6 +146,4 @@ void AutomatableSlider::updateSlider() - - - +} diff --git a/src/gui/widgets/CPULoadWidget.cpp b/src/gui/widgets/CPULoadWidget.cpp index 94910754294..406fa5a3191 100644 --- a/src/gui/widgets/CPULoadWidget.cpp +++ b/src/gui/widgets/CPULoadWidget.cpp @@ -32,6 +32,10 @@ #include "Mixer.h" +namespace lmms +{ + + CPULoadWidget::CPULoadWidget( QWidget * _parent ) : QWidget( _parent ), m_currentLoad( 0 ), @@ -103,6 +107,4 @@ void CPULoadWidget::updateCpuLoad() - - - +} diff --git a/src/gui/widgets/CaptionMenu.cpp b/src/gui/widgets/CaptionMenu.cpp index 7c4deca6b94..902de0c3bed 100644 --- a/src/gui/widgets/CaptionMenu.cpp +++ b/src/gui/widgets/CaptionMenu.cpp @@ -27,6 +27,8 @@ #include "embed.h" +namespace lmms +{ CaptionMenu::CaptionMenu( const QString & _title, QWidget * _parent ) : @@ -62,3 +64,7 @@ void CaptionMenu::addHelpAction() helpAction->setDisabled(true); } } + + + +} diff --git a/src/gui/widgets/ComboBox.cpp b/src/gui/widgets/ComboBox.cpp index 86294a86391..bc3248b0007 100644 --- a/src/gui/widgets/ComboBox.cpp +++ b/src/gui/widgets/ComboBox.cpp @@ -41,6 +41,10 @@ #include "MainWindow.h" +namespace lmms +{ + + QPixmap * ComboBox::s_background = NULL; QPixmap * ComboBox::s_arrow = NULL; QPixmap * ComboBox::s_arrowSelected = NULL; @@ -270,6 +274,4 @@ void ComboBox::setItem( QAction* item ) - - - +} diff --git a/src/gui/widgets/ControllerRackView.cpp b/src/gui/widgets/ControllerRackView.cpp index 72f0b8eed94..f0b77baa312 100644 --- a/src/gui/widgets/ControllerRackView.cpp +++ b/src/gui/widgets/ControllerRackView.cpp @@ -42,6 +42,10 @@ #include "LfoController.h" +namespace lmms +{ + + ControllerRackView::ControllerRackView( ) : QWidget() { @@ -197,7 +201,7 @@ void ControllerRackView::addController() void ControllerRackView::closeEvent( QCloseEvent * _ce ) - { +{ if( parentWidget() ) { parentWidget()->hide(); @@ -207,5 +211,8 @@ void ControllerRackView::closeEvent( QCloseEvent * _ce ) hide(); } _ce->ignore(); - } +} + + +} diff --git a/src/gui/widgets/ControllerView.cpp b/src/gui/widgets/ControllerView.cpp index 8b618a3e191..6c29c9e53cb 100644 --- a/src/gui/widgets/ControllerView.cpp +++ b/src/gui/widgets/ControllerView.cpp @@ -45,6 +45,10 @@ #include "ToolTip.h" +namespace lmms +{ + + ControllerView::ControllerView( Controller * _model, QWidget * _parent ) : QWidget( _parent ), ModelView( _model, this ), @@ -197,5 +201,4 @@ void ControllerView::displayHelp() - - +} diff --git a/src/gui/widgets/EffectRackView.cpp b/src/gui/widgets/EffectRackView.cpp index b136b16f752..d10ea70bbb7 100644 --- a/src/gui/widgets/EffectRackView.cpp +++ b/src/gui/widgets/EffectRackView.cpp @@ -35,6 +35,10 @@ #include "GroupBox.h" +namespace lmms +{ + + EffectRackView::EffectRackView( EffectChain* model, QWidget* parent ) : QWidget( parent ), ModelView( NULL, this ) @@ -264,5 +268,4 @@ void EffectRackView::modelChanged() - - +} diff --git a/src/gui/widgets/EffectView.cpp b/src/gui/widgets/EffectView.cpp index 64463caed32..41a4f5cfb07 100644 --- a/src/gui/widgets/EffectView.cpp +++ b/src/gui/widgets/EffectView.cpp @@ -46,6 +46,11 @@ #include "ToolTip.h" + +namespace lmms +{ + + EffectView::EffectView( Effect * _model, QWidget * _parent ) : PluginView( _model, _parent ), m_bg( embed::getIconPixmap( "effect_plugin" ) ), @@ -294,5 +299,4 @@ void EffectView::modelChanged() - - +} diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp index 5c364c19bd2..d8f5f167c39 100644 --- a/src/gui/widgets/EnvelopeAndLfoView.cpp +++ b/src/gui/widgets/EnvelopeAndLfoView.cpp @@ -44,6 +44,10 @@ #include "Track.h" +namespace lmms +{ + + extern const float SECS_PER_ENV_SEGMENT; extern const float SECS_PER_LFO_OSCILLATION; @@ -590,7 +594,4 @@ void EnvelopeAndLfoView::lfoUserWaveChanged() - - - - +} diff --git a/src/gui/widgets/FadeButton.cpp b/src/gui/widgets/FadeButton.cpp index 4fea14f97a4..6f2ef918e1e 100644 --- a/src/gui/widgets/FadeButton.cpp +++ b/src/gui/widgets/FadeButton.cpp @@ -33,6 +33,10 @@ #include "update_event.h" +namespace lmms +{ + + const float FadeDuration = 300; @@ -122,7 +126,4 @@ void FadeButton::signalUpdate() - - - - +} diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp index d8055f5acdd..0fbf316e964 100644 --- a/src/gui/widgets/Fader.cpp +++ b/src/gui/widgets/Fader.cpp @@ -59,6 +59,10 @@ #include "MainWindow.h" +namespace lmms +{ + + TextFloat * Fader::s_textFloat = NULL; QPixmap * Fader::s_back = NULL; QPixmap * Fader::s_leds = NULL; @@ -400,3 +404,4 @@ void Fader::setPeakRed( const QColor & c ) +} diff --git a/src/gui/widgets/FxLine.cpp b/src/gui/widgets/FxLine.cpp index 13c20c4c866..d2a058608de 100644 --- a/src/gui/widgets/FxLine.cpp +++ b/src/gui/widgets/FxLine.cpp @@ -40,6 +40,11 @@ #include "gui_templates.h" #include "CaptionMenu.h" + +namespace lmms +{ + + const int FxLine::FxLineHeight = 287; QPixmap * FxLine::s_sendBgArrow = NULL; QPixmap * FxLine::s_receiveBgArrow = NULL; @@ -274,3 +279,4 @@ void FxLine::setBackgroundActive( const QBrush & c ) +} diff --git a/src/gui/widgets/Graph.cpp b/src/gui/widgets/Graph.cpp index 3fea035cde1..fb9f7f60515 100644 --- a/src/gui/widgets/Graph.cpp +++ b/src/gui/widgets/Graph.cpp @@ -34,6 +34,10 @@ #include "Engine.h" +namespace lmms +{ + + Graph::Graph( QWidget * _parent, graphStyle _style, int _width, int _height ) : QWidget( _parent ), @@ -708,5 +712,4 @@ void graphModel::drawSampleAt( int x, float val ) - - +} diff --git a/src/gui/widgets/GroupBox.cpp b/src/gui/widgets/GroupBox.cpp index b6145076f72..63123602d96 100644 --- a/src/gui/widgets/GroupBox.cpp +++ b/src/gui/widgets/GroupBox.cpp @@ -36,6 +36,9 @@ #include "gui_templates.h" +namespace lmms +{ + GroupBox::GroupBox( const QString & _caption, QWidget * _parent ) : QWidget( _parent ), @@ -139,7 +142,4 @@ void GroupBox::updatePixmap() - - - - +} diff --git a/src/gui/widgets/InstrumentFunctionViews.cpp b/src/gui/widgets/InstrumentFunctionViews.cpp index 632526a25fb..87c87788f5b 100644 --- a/src/gui/widgets/InstrumentFunctionViews.cpp +++ b/src/gui/widgets/InstrumentFunctionViews.cpp @@ -38,6 +38,10 @@ #include "ToolTip.h" +namespace lmms +{ + + InstrumentFunctionNoteStackingView::InstrumentFunctionNoteStackingView( InstrumentFunctionNoteStacking* cc, QWidget* parent ) : QWidget( parent ), ModelView( NULL, this ), @@ -203,4 +207,4 @@ void InstrumentFunctionArpeggioView::modelChanged() - +} diff --git a/src/gui/widgets/InstrumentMidiIOView.cpp b/src/gui/widgets/InstrumentMidiIOView.cpp index f2747fe7dd2..007ac2c9a24 100644 --- a/src/gui/widgets/InstrumentMidiIOView.cpp +++ b/src/gui/widgets/InstrumentMidiIOView.cpp @@ -42,6 +42,10 @@ #include "QLabel" +namespace lmms +{ + + InstrumentMidiIOView::InstrumentMidiIOView( QWidget* parent ) : QWidget( parent ), ModelView( NULL, this ), @@ -224,3 +228,7 @@ InstrumentMiscView::~InstrumentMiscView() { } + + + +} diff --git a/src/gui/widgets/InstrumentSoundShapingView.cpp b/src/gui/widgets/InstrumentSoundShapingView.cpp index 39637e7e7b7..d52a87cd210 100644 --- a/src/gui/widgets/InstrumentSoundShapingView.cpp +++ b/src/gui/widgets/InstrumentSoundShapingView.cpp @@ -34,6 +34,9 @@ #include "TabWidget.h" +namespace lmms +{ + const int TARGETS_TABWIDGET_X = 4; const int TARGETS_TABWIDGET_Y = 5; @@ -163,5 +166,4 @@ void InstrumentSoundShapingView::modelChanged() - - +} diff --git a/src/gui/widgets/Knob.cpp b/src/gui/widgets/Knob.cpp index 7c6b26c3636..59c3df674ed 100644 --- a/src/gui/widgets/Knob.cpp +++ b/src/gui/widgets/Knob.cpp @@ -52,6 +52,10 @@ #include "TextFloat.h" +namespace lmms +{ + + TextFloat * Knob::s_textFloat = NULL; @@ -813,6 +817,4 @@ void Knob::displayHelp() - - - +} diff --git a/src/gui/widgets/LadspaControlView.cpp b/src/gui/widgets/LadspaControlView.cpp index 75eaf64cb9d..f6423356104 100644 --- a/src/gui/widgets/LadspaControlView.cpp +++ b/src/gui/widgets/LadspaControlView.cpp @@ -33,6 +33,10 @@ #include "ToolTip.h" +namespace lmms +{ + + LadspaControlView::LadspaControlView( QWidget * _parent, LadspaControl * _ctl ) : QWidget( _parent ), @@ -124,5 +128,4 @@ LadspaControlView::~LadspaControlView() - - +} diff --git a/src/gui/widgets/LcdSpinBox.cpp b/src/gui/widgets/LcdSpinBox.cpp index 73534f5c71a..fb7c987b1ad 100644 --- a/src/gui/widgets/LcdSpinBox.cpp +++ b/src/gui/widgets/LcdSpinBox.cpp @@ -42,6 +42,10 @@ +namespace lmms +{ + + LcdSpinBox::LcdSpinBox( int numDigits, QWidget* parent, const QString& name ) : LcdWidget( numDigits, parent, name ), IntModelView( new IntModel( 0, 0, 0, NULL, name, true ), this ), @@ -193,3 +197,4 @@ void LcdSpinBox::enterValue() +} diff --git a/src/gui/widgets/LcdWidget.cpp b/src/gui/widgets/LcdWidget.cpp index eab4870f3b0..7cd795a66b7 100644 --- a/src/gui/widgets/LcdWidget.cpp +++ b/src/gui/widgets/LcdWidget.cpp @@ -39,6 +39,8 @@ #include "MainWindow.h" +namespace lmms +{ //! @todo: in C++11, we can use delegating ctors @@ -257,5 +259,4 @@ void LcdWidget::initUi(const QString& name , const QString& style) - - +} diff --git a/src/gui/widgets/LedCheckbox.cpp b/src/gui/widgets/LedCheckbox.cpp index cce0b975b79..76244d9ae98 100644 --- a/src/gui/widgets/LedCheckbox.cpp +++ b/src/gui/widgets/LedCheckbox.cpp @@ -31,6 +31,10 @@ #include "gui_templates.h" +namespace lmms +{ + + static const QString names[LedCheckBox::NumColors] = { "led_yellow", "led_green", "led_red" @@ -132,5 +136,4 @@ void LedCheckBox::onTextUpdated() - - +} diff --git a/src/gui/widgets/LeftRightNav.cpp b/src/gui/widgets/LeftRightNav.cpp index 530d128d739..23ee83224e7 100644 --- a/src/gui/widgets/LeftRightNav.cpp +++ b/src/gui/widgets/LeftRightNav.cpp @@ -28,6 +28,10 @@ #include "embed.h" +namespace lmms +{ + + LeftRightNav::LeftRightNav(QWidget *parent) : QWidget(parent), m_layout(this), @@ -88,4 +92,8 @@ void LeftRightNav::setShortcuts(const QKeySequence &leftShortcut, const QKeySequ ToolTip::add(&m_leftBtn, tr("Previous (%1)").arg(leftShortcut.toString())); ToolTip::add(&m_rightBtn, tr("Next (%1)").arg(rightShortcut.toString())); -} \ No newline at end of file +} + + + +} diff --git a/src/gui/widgets/MeterDialog.cpp b/src/gui/widgets/MeterDialog.cpp index 62b0da72a21..8f26fa8f80c 100644 --- a/src/gui/widgets/MeterDialog.cpp +++ b/src/gui/widgets/MeterDialog.cpp @@ -35,6 +35,10 @@ #include "LcdSpinBox.h" +namespace lmms +{ + + MeterDialog::MeterDialog( QWidget * _parent, bool _simple ) : QWidget( _parent ), ModelView( NULL, this ) @@ -113,3 +117,6 @@ void MeterDialog::modelChanged() m_denominator->setModel( &mm->denominatorModel() ); } + + +} diff --git a/src/gui/widgets/MidiPortMenu.cpp b/src/gui/widgets/MidiPortMenu.cpp index 6ea7193a7ab..f6d4730b031 100644 --- a/src/gui/widgets/MidiPortMenu.cpp +++ b/src/gui/widgets/MidiPortMenu.cpp @@ -28,6 +28,10 @@ +namespace lmms +{ + + MidiPortMenu::MidiPortMenu( MidiPort::Modes _mode ) : ModelView( NULL, this ), m_mode( _mode ) @@ -100,5 +104,4 @@ void MidiPortMenu::updateMenu() - - +} diff --git a/src/gui/widgets/NStateButton.cpp b/src/gui/widgets/NStateButton.cpp index c05f311a5cb..4ea032e6a51 100644 --- a/src/gui/widgets/NStateButton.cpp +++ b/src/gui/widgets/NStateButton.cpp @@ -30,6 +30,9 @@ #include "ToolTip.h" +namespace lmms +{ + NStateButton::NStateButton( QWidget * _parent ) : ToolButton( _parent ), @@ -99,7 +102,4 @@ void NStateButton::mousePressEvent( QMouseEvent * _me ) - - - - +} diff --git a/src/gui/widgets/PixmapButton.cpp b/src/gui/widgets/PixmapButton.cpp index 44e957eeffd..abf0adf0712 100644 --- a/src/gui/widgets/PixmapButton.cpp +++ b/src/gui/widgets/PixmapButton.cpp @@ -32,6 +32,9 @@ #include "embed.h" +namespace lmms +{ + PixmapButton::PixmapButton( QWidget * _parent, const QString & _name ) : AutomatableButton( _parent, _name ), @@ -144,5 +147,4 @@ QSize PixmapButton::sizeHint() const - - +} diff --git a/src/gui/widgets/ProjectNotes.cpp b/src/gui/widgets/ProjectNotes.cpp index 75f2143385a..ed5de529230 100644 --- a/src/gui/widgets/ProjectNotes.cpp +++ b/src/gui/widgets/ProjectNotes.cpp @@ -45,6 +45,10 @@ +namespace lmms +{ + + ProjectNotes::ProjectNotes() : QMainWindow( gui->mainWindow()->workspace() ) { @@ -411,3 +415,5 @@ void ProjectNotes::closeEvent( QCloseEvent * _ce ) } + +} diff --git a/src/gui/widgets/RenameDialog.cpp b/src/gui/widgets/RenameDialog.cpp index 2e443f241bb..78aeae2305b 100644 --- a/src/gui/widgets/RenameDialog.cpp +++ b/src/gui/widgets/RenameDialog.cpp @@ -29,6 +29,9 @@ #include "RenameDialog.h" +namespace lmms +{ + RenameDialog::RenameDialog( QString & _string ) : QDialog(), @@ -75,6 +78,4 @@ void RenameDialog::textChanged( const QString & _new_string ) - - - +} diff --git a/src/gui/widgets/Rubberband.cpp b/src/gui/widgets/Rubberband.cpp index eedec42d3d2..da6c4083f20 100644 --- a/src/gui/widgets/Rubberband.cpp +++ b/src/gui/widgets/Rubberband.cpp @@ -27,6 +27,10 @@ #include "Rubberband.h" +namespace lmms +{ + + RubberBand::RubberBand( QWidget * _parent ) : QRubberBand( Rectangle, _parent ) { @@ -103,7 +107,4 @@ QVector RubberBand::selectableObjects() const - - - - +} diff --git a/src/gui/widgets/SendButtonIndicator.cpp b/src/gui/widgets/SendButtonIndicator.cpp index 5ac55b761a0..08960b3875e 100644 --- a/src/gui/widgets/SendButtonIndicator.cpp +++ b/src/gui/widgets/SendButtonIndicator.cpp @@ -4,6 +4,11 @@ #include "FxMixer.h" #include "Model.h" + +namespace lmms +{ + + QPixmap * SendButtonIndicator::s_qpmOff = NULL; QPixmap * SendButtonIndicator::s_qpmOn = NULL; @@ -61,3 +66,7 @@ void SendButtonIndicator::updateLightStatus() { setPixmap( getSendModel() == NULL ? *s_qpmOff : *s_qpmOn ); } + + + +} diff --git a/src/gui/widgets/SideBar.cpp b/src/gui/widgets/SideBar.cpp index 990bae7f651..83909381f1d 100644 --- a/src/gui/widgets/SideBar.cpp +++ b/src/gui/widgets/SideBar.cpp @@ -31,6 +31,10 @@ #include "ToolTip.h" +namespace lmms +{ + + // internal helper class allowing to create QToolButtons with // vertical orientation class SideBarButton : public QToolButton @@ -163,4 +167,4 @@ void SideBar::toggleButton( QAbstractButton * button ) - +} diff --git a/src/gui/widgets/SideBarWidget.cpp b/src/gui/widgets/SideBarWidget.cpp index 2da0c9a4568..59c627a1879 100644 --- a/src/gui/widgets/SideBarWidget.cpp +++ b/src/gui/widgets/SideBarWidget.cpp @@ -30,6 +30,9 @@ #include "gui_templates.h" +namespace lmms +{ + SideBarWidget::SideBarWidget( const QString & _title, const QPixmap & _icon, QWidget * _parent ) : @@ -85,5 +88,4 @@ void SideBarWidget::resizeEvent( QResizeEvent * ) - - +} diff --git a/src/gui/widgets/TabBar.cpp b/src/gui/widgets/TabBar.cpp index 325767ad13d..37eec282208 100644 --- a/src/gui/widgets/TabBar.cpp +++ b/src/gui/widgets/TabBar.cpp @@ -30,6 +30,10 @@ +namespace lmms +{ + + TabBar::TabBar( QWidget * _parent, QBoxLayout::Direction _dir ) : QWidget( _parent ), m_layout( new QBoxLayout( _dir, this ) ), @@ -241,8 +245,4 @@ bool TabBar::allHidden() - - - - - +} diff --git a/src/gui/widgets/TabWidget.cpp b/src/gui/widgets/TabWidget.cpp index b29b27c706f..80ec55352ff 100644 --- a/src/gui/widgets/TabWidget.cpp +++ b/src/gui/widgets/TabWidget.cpp @@ -33,6 +33,9 @@ #include "gui_templates.h" +namespace lmms +{ + TabWidget::TabWidget( const QString & _caption, QWidget * _parent ) : QWidget( _parent ), @@ -231,7 +234,4 @@ void TabWidget::wheelEvent( QWheelEvent * _we ) - - - - +} diff --git a/src/gui/widgets/TempoSyncKnob.cpp b/src/gui/widgets/TempoSyncKnob.cpp index 598cfc06234..dd886056f4b 100644 --- a/src/gui/widgets/TempoSyncKnob.cpp +++ b/src/gui/widgets/TempoSyncKnob.cpp @@ -36,6 +36,9 @@ #include "Song.h" +namespace lmms +{ + TempoSyncKnob::TempoSyncKnob( knobTypes _knob_num, QWidget * _parent, const QString & _name ) : @@ -303,6 +306,4 @@ void TempoSyncKnob::showCustom() - - - +} diff --git a/src/gui/widgets/TextFloat.cpp b/src/gui/widgets/TextFloat.cpp index 99d99069999..fd7bab432e2 100644 --- a/src/gui/widgets/TextFloat.cpp +++ b/src/gui/widgets/TextFloat.cpp @@ -33,6 +33,9 @@ #include "Engine.h" +namespace lmms +{ + TextFloat::TextFloat() : QWidget( gui->mainWindow(), Qt::ToolTip ), @@ -201,4 +204,4 @@ void TextFloat::updateSize() - +} diff --git a/src/gui/widgets/TimeDisplayWidget.cpp b/src/gui/widgets/TimeDisplayWidget.cpp index d6e1e5210ee..2b9c15edc80 100644 --- a/src/gui/widgets/TimeDisplayWidget.cpp +++ b/src/gui/widgets/TimeDisplayWidget.cpp @@ -32,6 +32,9 @@ #include "Song.h" +namespace lmms +{ + TimeDisplayWidget::TimeDisplayWidget() : QWidget(), @@ -140,6 +143,4 @@ void TimeDisplayWidget::mousePressEvent( QMouseEvent* mouseEvent ) - - - +} diff --git a/src/gui/widgets/ToolButton.cpp b/src/gui/widgets/ToolButton.cpp index 20e6018682f..f6d1c2a46ad 100644 --- a/src/gui/widgets/ToolButton.cpp +++ b/src/gui/widgets/ToolButton.cpp @@ -27,6 +27,10 @@ #include "ToolTip.h" +namespace lmms +{ + + ToolButton::ToolButton( const QPixmap & _pixmap, const QString & _tooltip, QObject * _receiver, const char * _slot, QWidget * _parent ) : @@ -52,6 +56,4 @@ ToolButton::~ToolButton() - - - +} diff --git a/src/gui/widgets/ToolTip.cpp b/src/gui/widgets/ToolTip.cpp index e51b72e69ef..db9840466d9 100644 --- a/src/gui/widgets/ToolTip.cpp +++ b/src/gui/widgets/ToolTip.cpp @@ -29,6 +29,10 @@ #include "ConfigManager.h" +namespace lmms +{ + + void ToolTip::add( QWidget * _w, const QString & _txt ) { if( !ConfigManager::inst()->value( "tooltips", "disabled" ).toInt() ) @@ -38,3 +42,4 @@ void ToolTip::add( QWidget * _w, const QString & _txt ) } +} diff --git a/src/gui/widgets/TrackLabelButton.cpp b/src/gui/widgets/TrackLabelButton.cpp index 150300564c7..e0f0bd48e54 100644 --- a/src/gui/widgets/TrackLabelButton.cpp +++ b/src/gui/widgets/TrackLabelButton.cpp @@ -37,6 +37,9 @@ #include "Engine.h" +namespace lmms +{ + TrackLabelButton::TrackLabelButton( TrackView * _tv, QWidget * _parent ) : QToolButton( _parent ), @@ -163,5 +166,4 @@ void TrackLabelButton::paintEvent( QPaintEvent * _pe ) - - +} diff --git a/src/gui/widgets/VisualizationWidget.cpp b/src/gui/widgets/VisualizationWidget.cpp index 734defc68ce..04de152cd83 100644 --- a/src/gui/widgets/VisualizationWidget.cpp +++ b/src/gui/widgets/VisualizationWidget.cpp @@ -38,6 +38,9 @@ #include "ConfigManager.h" +namespace lmms +{ + VisualizationWidget::VisualizationWidget( const QPixmap & _bg, QWidget * _p, visualizationTypes _vtype ) : @@ -192,6 +195,4 @@ void VisualizationWidget::mousePressEvent( QMouseEvent * _me ) - - - +} From 4e87371b5aa539e01bc808014259a5b88e63e1c3 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Sat, 16 May 2015 23:47:26 +0000 Subject: [PATCH 3/6] update includes for lmms namespace change --- include/AboutDialog.h | 7 ++++++- include/ActionGroup.h | 7 +++++++ include/AudioAlsa.h | 8 ++++++++ include/AudioDevice.h | 5 +++++ include/AudioDummy.h | 5 +++++ include/AudioFileDevice.h | 5 +++++ include/AudioFileOgg.h | 4 ++++ include/AudioFileWave.h | 5 +++++ include/AudioJack.h | 7 +++++++ include/AudioOss.h | 5 +++++ include/AudioPort.h | 6 ++++++ include/AudioPortAudio.h | 7 +++++++ include/AudioPulseAudio.h | 7 +++++++ include/AudioSampleRecorder.h | 6 ++++++ include/AudioSdl.h | 7 +++++++ include/AutomatableButton.h | 5 +++++ include/AutomatableModel.h | 7 ++++++- include/AutomatableModelView.h | 9 ++++++++- include/AutomatableSlider.h | 4 ++++ include/AutomationEditor.h | 7 +++++++ include/AutomationPattern.h | 6 ++++++ include/AutomationPatternView.h | 6 ++++++ include/AutomationTrack.h | 5 +++++ include/BBEditor.h | 6 ++++++ include/BBTrack.h | 6 ++++++ include/BBTrackContainer.h | 6 ++++++ include/BandLimitedWave.h | 7 +++++++ include/BasicFilters.h | 7 +++++++ include/BufferManager.h | 7 +++++++ include/CPULoadWidget.h | 5 +++++ include/CaptionMenu.h | 6 +++++- include/Clipboard.h | 6 ++++++ include/ComboBox.h | 5 +++++ include/ComboBoxModel.h | 6 ++++++ include/ConfigManager.h | 7 +++++++ include/Controller.h | 9 ++++++++- include/ControllerConnection.h | 9 ++++++++- include/ControllerConnectionDialog.h | 7 +++++++ include/ControllerDialog.h | 7 +++++++ include/ControllerRackView.h | 6 ++++++ include/ControllerView.h | 7 +++++++ include/DataFile.h | 7 ++++++- include/Delay.h | 8 ++++++++ include/DetuningHelper.h | 6 ++++++ include/DrumSynth.h | 7 +++++++ include/DspEffectLibrary.h | 6 ++++++ include/DummyEffect.h | 6 ++++++ include/DummyInstrument.h | 6 ++++++ include/DummyPlugin.h | 6 ++++++ include/Editor.h | 7 +++++++ include/Effect.h | 6 ++++++ include/EffectChain.h | 9 ++++++++- include/EffectControlDialog.h | 8 ++++++++ include/EffectControls.h | 8 ++++++++ include/EffectRackView.h | 7 +++++++ include/EffectSelectDialog.h | 5 ++++- include/EffectView.h | 6 ++++++ include/Engine.h | 7 ++++++- include/EnvelopeAndLfoParameters.h | 8 ++++++++ include/EnvelopeAndLfoView.h | 7 +++++++ include/ExportFilter.h | 6 ++++++ include/ExportProjectDialog.h | 6 ++++++ include/FadeButton.h | 5 +++++ include/Fader.h | 5 +++++ include/FileBrowser.h | 6 ++++++ include/FileDialog.h | 6 ++++++ include/FxLine.h | 6 ++++++ include/FxMixer.h | 5 +++++ include/FxMixerView.h | 8 ++++++++ include/Graph.h | 7 +++++++ include/GroupBox.h | 5 +++++ include/GuiApplication.h | 7 +++++++ include/ImportFilter.h | 5 +++++ include/InlineAutomation.h | 5 +++++ include/Instrument.h | 6 ++++++ include/InstrumentFunctionViews.h | 7 +++++++ include/InstrumentFunctions.h | 6 ++++++ include/InstrumentMidiIOView.h | 6 ++++++ include/InstrumentPlayHandle.h | 7 +++++++ include/InstrumentSoundShaping.h | 5 +++++ include/InstrumentSoundShapingView.h | 7 +++++++ include/InstrumentTrack.h | 7 +++++++ include/InstrumentView.h | 6 ++++++ include/JournallingObject.h | 7 ++++++- include/Knob.h | 9 +++++++++ include/Ladspa2LMMS.h | 6 ++++++ include/LadspaBase.h | 6 ++++++ include/LadspaControl.h | 6 ++++++ include/LadspaControlView.h | 8 ++++++++ include/LadspaManager.h | 8 ++++++++ include/LcdSpinBox.h | 6 ++++++ include/LcdWidget.h | 7 +++++++ include/LedCheckbox.h | 6 ++++++ include/LeftRightNav.h | 7 +++++++ include/LfoController.h | 7 +++++++ include/LmmsPalette.h | 6 +++++- include/LmmsStyle.h | 5 +++++ include/MainWindow.h | 7 +++++++ include/MemoryHelper.h | 7 +++++++ include/MemoryManager.h | 6 ++++++ include/MeterDialog.h | 7 +++++++ include/MeterModel.h | 6 ++++++ include/MicroTimer.h | 6 ++++++ include/Midi.h | 6 ++++++ include/MidiAlsaRaw.h | 6 ++++++ include/MidiAlsaSeq.h | 6 ++++++ include/MidiClient.h | 6 +++++- include/MidiController.h | 5 +++++ include/MidiDummy.h | 5 +++++ include/MidiEvent.h | 8 ++++++++ include/MidiEventProcessor.h | 7 +++++++ include/MidiOss.h | 6 ++++++ include/MidiPort.h | 5 +++++ include/MidiPortMenu.h | 5 +++++ include/MidiTime.h | 7 ++++++- include/MidiWinMM.h | 7 ++++++- include/MixHelpers.h | 7 ++++++- include/Mixer.h | 6 ++++++ include/MixerProfiler.h | 7 +++++++ include/MixerWorkerThread.h | 7 +++++++ include/Model.h | 6 +++++- include/ModelView.h | 6 +++++- include/NStateButton.h | 6 ++++++ include/Note.h | 7 +++++++ include/NotePlayHandle.h | 7 +++++++ include/Oscillator.h | 7 +++++++ include/Pattern.h | 6 ++++++ include/PeakController.h | 7 +++++++ include/Piano.h | 8 +++++++- include/PianoRoll.h | 7 ++++++- include/PianoView.h | 8 +++++++- include/Pitch.h | 7 +++++++ include/PixmapButton.h | 6 ++++++ include/PlayHandle.h | 6 ++++++ include/Plugin.h | 6 ++++++ include/PluginBrowser.h | 5 +++++ include/PluginView.h | 5 +++++ include/PresetPreviewPlayHandle.h | 5 +++++ include/ProjectJournal.h | 7 ++++++- include/ProjectNotes.h | 5 +++++ include/ProjectRenderer.h | 6 ++++++ include/ProjectVersion.h | 7 +++++++ include/RemotePlugin.h | 17 +++++++++++++---- include/RenameDialog.h | 6 +++++- include/RingBuffer.h | 8 ++++++++ include/RmsHelper.h | 6 ++++++ include/Rubberband.h | 7 ++++++- include/SampleBuffer.h | 7 +++++++ include/SamplePlayHandle.h | 6 ++++++ include/SampleRecordHandle.h | 6 ++++++ include/SampleTrack.h | 6 ++++++ include/SendButtonIndicator.h | 7 +++++++ include/SerializingObject.h | 7 ++++++- include/SetupDialog.h | 6 ++++++ include/SideBar.h | 8 ++++++++ include/SideBarWidget.h | 7 +++++++ include/Song.h | 6 ++++++ include/SongEditor.h | 7 +++++++ include/StringPairDrag.h | 5 +++++ include/SweepOscillator.h | 6 ++++++ include/TabBar.h | 5 +++++ include/TabButton.h | 6 ++++++ include/TabWidget.h | 7 +++++++ include/TempoSyncKnob.h | 7 ++++++- include/TempoSyncKnobModel.h | 7 +++++++ include/TextFloat.h | 6 ++++++ include/ThreadableJob.h | 6 ++++++ include/TimeDisplayWidget.h | 6 ++++++ include/TimeLineWidget.h | 7 +++++++ include/ToolButton.h | 7 ++++++- include/ToolPlugin.h | 7 +++++++ include/ToolPluginView.h | 6 ++++++ include/ToolTip.h | 5 +++++ include/Track.h | 6 ++++++ include/TrackContainer.h | 6 ++++++ include/TrackContainerView.h | 7 +++++++ include/TrackLabelButton.h | 6 ++++++ include/ValueBuffer.h | 7 +++++++ include/VersionedSaveDialog.h | 6 ++++++ include/VisualizationWidget.h | 6 ++++++ include/VstSyncController.h | 6 ++++++ include/VstSyncData.h | 5 +++++ include/base64.h | 5 +++++ include/custom_events.h | 6 ++++-- include/denormals.h | 7 ++++++- include/endian_handling.h | 6 ++++++ include/fft_helpers.h | 7 +++++++ include/fifo_buffer.h | 6 +++++- include/gui_templates.h | 5 +++++ include/interpolation.h | 8 ++++++-- include/lmms_basics.h | 5 +++++ include/lmms_constants.h | 7 +++++++ include/lmms_math.h | 8 ++++++++ include/panning.h | 7 +++++++ include/panning_constants.h | 7 +++++++ include/shared_object.h | 8 +++++--- include/templates.h | 4 ++++ include/update_event.h | 4 ++++ include/volume.h | 7 +++++++ 199 files changed, 1239 insertions(+), 40 deletions(-) diff --git a/include/AboutDialog.h b/include/AboutDialog.h index c07ef6d7097..7c80eea63f1 100644 --- a/include/AboutDialog.h +++ b/include/AboutDialog.h @@ -31,6 +31,10 @@ #include "ui_about_dialog.h" +namespace lmms +{ + + class AboutDialog : public QDialog, public Ui::AboutDialog { public: @@ -39,5 +43,6 @@ class AboutDialog : public QDialog, public Ui::AboutDialog } ; -#endif +} +#endif diff --git a/include/ActionGroup.h b/include/ActionGroup.h index 9928e8906c3..43662fa0cc5 100644 --- a/include/ActionGroup.h +++ b/include/ActionGroup.h @@ -28,6 +28,11 @@ #include + +namespace lmms +{ + + /// \brief Convenience subclass of QActionGroup /// /// This class provides the same functionality as QActionGroup, but in addition @@ -54,4 +59,6 @@ private slots: QList m_actions; }; + +} #endif diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h index 88438a10595..608eb15a129 100644 --- a/include/AudioAlsa.h +++ b/include/AudioAlsa.h @@ -37,6 +37,11 @@ #include "AudioDevice.h" + +namespace lmms +{ + + class LcdSpinBox; class QLineEdit; @@ -94,6 +99,9 @@ class AudioAlsa : public AudioDevice, public QThread } ; + + +} #endif #endif diff --git a/include/AudioDevice.h b/include/AudioDevice.h index 298279ddbfa..f78566b27bd 100644 --- a/include/AudioDevice.h +++ b/include/AudioDevice.h @@ -33,6 +33,10 @@ #include "TabWidget.h" +namespace lmms +{ + + class AudioPort; @@ -180,4 +184,5 @@ class AudioDevice } ; +} #endif diff --git a/include/AudioDummy.h b/include/AudioDummy.h index 31781e0498a..189fb344290 100644 --- a/include/AudioDummy.h +++ b/include/AudioDummy.h @@ -29,6 +29,10 @@ #include "MicroTimer.h" +namespace lmms +{ + + class AudioDummy : public AudioDevice, public QThread { public: @@ -113,4 +117,5 @@ class AudioDummy : public AudioDevice, public QThread } ; +} #endif diff --git a/include/AudioFileDevice.h b/include/AudioFileDevice.h index a50ff31fcdd..545ca704402 100644 --- a/include/AudioFileDevice.h +++ b/include/AudioFileDevice.h @@ -31,6 +31,10 @@ #include "AudioDevice.h" +namespace lmms +{ + + class AudioFileDevice : public AudioDevice { public: @@ -111,4 +115,5 @@ typedef AudioFileDevice * ( * AudioFileDeviceInstantiaton ) Mixer* mixer ); +} #endif diff --git a/include/AudioFileOgg.h b/include/AudioFileOgg.h index bae5648def5..5b92ac231eb 100644 --- a/include/AudioFileOgg.h +++ b/include/AudioFileOgg.h @@ -35,6 +35,9 @@ #include "AudioFileDevice.h" +namespace lmms +{ + class AudioFileOgg : public AudioFileDevice { public: @@ -102,6 +105,7 @@ class AudioFileOgg : public AudioFileDevice } ; +} #endif #endif diff --git a/include/AudioFileWave.h b/include/AudioFileWave.h index 223479eb32a..4367be9bb32 100644 --- a/include/AudioFileWave.h +++ b/include/AudioFileWave.h @@ -32,6 +32,10 @@ #include +namespace lmms +{ + + class AudioFileWave : public AudioFileDevice { public: @@ -81,4 +85,5 @@ class AudioFileWave : public AudioFileDevice } ; +} #endif diff --git a/include/AudioJack.h b/include/AudioJack.h index 35801ef03e0..9a5b323a475 100644 --- a/include/AudioJack.h +++ b/include/AudioJack.h @@ -37,6 +37,10 @@ #include "AudioDevice.h" +namespace lmms +{ + + class QLineEdit; class LcdSpinBox; @@ -120,6 +124,9 @@ private slots: } ; + + +} #endif #endif diff --git a/include/AudioOss.h b/include/AudioOss.h index b40edd58e73..91f883c2c86 100644 --- a/include/AudioOss.h +++ b/include/AudioOss.h @@ -32,6 +32,10 @@ #include "AudioDevice.h" +namespace lmms +{ + + class LcdSpinBox; class QLineEdit; @@ -78,6 +82,7 @@ class AudioOss : public AudioDevice, public QThread } ; +} #endif #endif diff --git a/include/AudioPort.h b/include/AudioPort.h index 7412d5eb591..23e62783aba 100644 --- a/include/AudioPort.h +++ b/include/AudioPort.h @@ -33,6 +33,11 @@ #include "MemoryManager.h" #include "PlayHandle.h" + +namespace lmms +{ + + class EffectChain; class FloatModel; class BoolModel; @@ -135,4 +140,5 @@ class AudioPort : public ThreadableJob } ; +} #endif diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h index a52ba52be57..4875d77e969 100644 --- a/include/AudioPortAudio.h +++ b/include/AudioPortAudio.h @@ -30,6 +30,11 @@ #include "lmmsconfig.h" #include "ComboBoxModel.h" + +namespace lmms +{ + + class AudioPortAudioSetupUtil : public QObject { Q_OBJECT @@ -152,4 +157,6 @@ class AudioPortAudio : public AudioDevice #endif + +} #endif diff --git a/include/AudioPulseAudio.h b/include/AudioPulseAudio.h index 5a8504d1f65..6565f572f25 100644 --- a/include/AudioPulseAudio.h +++ b/include/AudioPulseAudio.h @@ -34,6 +34,11 @@ #include "AudioDevice.h" + +namespace lmms +{ + + class LcdSpinBox; class QLineEdit; @@ -85,6 +90,8 @@ class AudioPulseAudio : public AudioDevice, public QThread } ; + +} #endif #endif diff --git a/include/AudioSampleRecorder.h b/include/AudioSampleRecorder.h index f6c196dd231..5d35861df25 100644 --- a/include/AudioSampleRecorder.h +++ b/include/AudioSampleRecorder.h @@ -31,6 +31,11 @@ #include "AudioDevice.h" + +namespace lmms +{ + + class SampleBuffer; @@ -56,4 +61,5 @@ class AudioSampleRecorder : public AudioDevice } ; +} #endif diff --git a/include/AudioSdl.h b/include/AudioSdl.h index 15facb52aee..986623c218d 100644 --- a/include/AudioSdl.h +++ b/include/AudioSdl.h @@ -34,6 +34,11 @@ #include "AudioDevice.h" + +namespace lmms +{ + + class QLineEdit; @@ -86,6 +91,8 @@ class AudioSdl : public AudioDevice } ; + +} #endif #endif diff --git a/include/AutomatableButton.h b/include/AutomatableButton.h index 1d0f69e2f7a..32af5eed1c1 100644 --- a/include/AutomatableButton.h +++ b/include/AutomatableButton.h @@ -31,6 +31,10 @@ #include "AutomatableModelView.h" +namespace lmms +{ + + class automatableButtonGroup; @@ -106,4 +110,5 @@ private slots: +} #endif diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h index 9f53c9451a3..33db24b04cf 100644 --- a/include/AutomatableModel.h +++ b/include/AutomatableModel.h @@ -60,6 +60,10 @@ +namespace lmms +{ + + class ControllerConnection; class EXPORT AutomatableModel : public Model, public JournallingObject @@ -444,5 +448,6 @@ class BoolModel : public AutomatableModel } ; -#endif +} +#endif diff --git a/include/AutomatableModelView.h b/include/AutomatableModelView.h index 471106dc47c..466ced954fc 100644 --- a/include/AutomatableModelView.h +++ b/include/AutomatableModelView.h @@ -28,6 +28,12 @@ #include "ModelView.h" #include "AutomatableModel.h" + + +namespace lmms +{ + + class QMenu; class QMouseEvent; @@ -128,5 +134,6 @@ generateTypedModelView(Int); generateTypedModelView(Bool); -#endif +} +#endif diff --git a/include/AutomatableSlider.h b/include/AutomatableSlider.h index 7627ddd959f..54f2d55800b 100644 --- a/include/AutomatableSlider.h +++ b/include/AutomatableSlider.h @@ -31,6 +31,9 @@ #include "AutomatableModelView.h" +namespace lmms +{ + class AutomatableSlider : public QSlider, public IntModelView { @@ -74,4 +77,5 @@ private slots: typedef IntModel sliderModel; +} #endif diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h index eca52d2c6da..099f73d9133 100644 --- a/include/AutomationEditor.h +++ b/include/AutomationEditor.h @@ -38,6 +38,11 @@ #include "ComboBoxModel.h" #include "Knob.h" + +namespace lmms +{ + + class QPainter; class QPixmap; class QScrollBar; @@ -299,4 +304,6 @@ protected slots: }; + +} #endif diff --git a/include/AutomationPattern.h b/include/AutomationPattern.h index 58127d02c9c..c4e50a973f1 100644 --- a/include/AutomationPattern.h +++ b/include/AutomationPattern.h @@ -33,6 +33,10 @@ #include "Track.h" +namespace lmms +{ + + class AutomationTrack; class MidiTime; @@ -193,4 +197,6 @@ public slots: } ; + +} #endif diff --git a/include/AutomationPatternView.h b/include/AutomationPatternView.h index 714eaed5350..3c477c12c9a 100644 --- a/include/AutomationPatternView.h +++ b/include/AutomationPatternView.h @@ -27,6 +27,11 @@ #include "Track.h" + +namespace lmms +{ + + class AutomationPattern; @@ -80,4 +85,5 @@ protected slots: } ; +} #endif diff --git a/include/AutomationTrack.h b/include/AutomationTrack.h index b8d3da38dd8..b3b7401ce55 100644 --- a/include/AutomationTrack.h +++ b/include/AutomationTrack.h @@ -30,6 +30,10 @@ #include "Track.h" +namespace lmms +{ + + class AutomationTrack : public Track { Q_OBJECT @@ -71,4 +75,5 @@ class AutomationTrackView : public TrackView } ; +} #endif diff --git a/include/BBEditor.h b/include/BBEditor.h index 17ab510ab32..8f82cdc0355 100644 --- a/include/BBEditor.h +++ b/include/BBEditor.h @@ -30,6 +30,10 @@ #include "TrackContainerView.h" +namespace lmms +{ + + class BBTrackContainer; class ComboBox; @@ -96,4 +100,6 @@ protected slots: }; + +} #endif diff --git a/include/BBTrack.h b/include/BBTrack.h index b822c8e2be6..8ecb3bcfa06 100644 --- a/include/BBTrack.h +++ b/include/BBTrack.h @@ -32,6 +32,11 @@ #include "Track.h" + +namespace lmms +{ + + class TrackLabelButton; class TrackContainer; @@ -226,4 +231,5 @@ public slots: +} #endif diff --git a/include/BBTrackContainer.h b/include/BBTrackContainer.h index a9e1eb3c2e3..d958c46f61e 100644 --- a/include/BBTrackContainer.h +++ b/include/BBTrackContainer.h @@ -30,6 +30,10 @@ #include "ComboBoxModel.h" +namespace lmms +{ + + class EXPORT BBTrackContainer : public TrackContainer { Q_OBJECT @@ -79,4 +83,6 @@ public slots: } ; + +} #endif diff --git a/include/BandLimitedWave.h b/include/BandLimitedWave.h index d8f1eae1397..9872a9a1a69 100644 --- a/include/BandLimitedWave.h +++ b/include/BandLimitedWave.h @@ -43,6 +43,11 @@ class QString; #define MINTLEN 2 << 0 #define MAXTLEN 3 << MAXLEN + +namespace lmms +{ + + // table for table sizes const int TLENS[MAXTBL+1] = { 2 << 0, 3 << 0, 2 << 1, 3 << 1, 2 << 2, 3 << 2, 2 << 3, 3 << 3, @@ -208,4 +213,6 @@ class EXPORT BandLimitedWave }; + +} #endif diff --git a/include/BasicFilters.h b/include/BasicFilters.h index 58c811c6fca..744769461c9 100644 --- a/include/BasicFilters.h +++ b/include/BasicFilters.h @@ -45,6 +45,11 @@ #include "interpolation.h" #include "MemoryManager.h" + +namespace lmms +{ + + template class BasicFilters; template @@ -915,4 +920,6 @@ class BasicFilters } ; + +} #endif diff --git a/include/BufferManager.h b/include/BufferManager.h index b40b431431e..f27c67e8832 100644 --- a/include/BufferManager.h +++ b/include/BufferManager.h @@ -31,6 +31,11 @@ class QAtomicInt; + +namespace lmms +{ + + const int BM_INITIAL_BUFFERS = 512; //const int BM_INCREMENT = 64; @@ -53,4 +58,6 @@ class EXPORT BufferManager static int s_size; }; + +} #endif diff --git a/include/CPULoadWidget.h b/include/CPULoadWidget.h index e15368519af..1e92a8fe21b 100644 --- a/include/CPULoadWidget.h +++ b/include/CPULoadWidget.h @@ -34,6 +34,10 @@ #include "lmms_basics.h" +namespace lmms +{ + + class CPULoadWidget : public QWidget { Q_OBJECT @@ -64,4 +68,5 @@ protected slots: } ; +} #endif diff --git a/include/CaptionMenu.h b/include/CaptionMenu.h index 9e40d9be511..bb2913765d5 100644 --- a/include/CaptionMenu.h +++ b/include/CaptionMenu.h @@ -30,6 +30,10 @@ #include "export.h" + +namespace lmms +{ + /// /// \brief A context menu with a caption /// @@ -50,5 +54,5 @@ class EXPORT CaptionMenu : public QMenu - +} #endif diff --git a/include/Clipboard.h b/include/Clipboard.h index 8237c49c015..f074932c842 100644 --- a/include/Clipboard.h +++ b/include/Clipboard.h @@ -29,6 +29,10 @@ #include +namespace lmms +{ + + class JournallingObject; class Clipboard @@ -50,4 +54,6 @@ class Clipboard } ; + +} #endif diff --git a/include/ComboBox.h b/include/ComboBox.h index 0c348e53b2f..07a1a5c2fe9 100644 --- a/include/ComboBox.h +++ b/include/ComboBox.h @@ -33,6 +33,9 @@ #include "AutomatableModelView.h" +namespace lmms +{ + class EXPORT ComboBox : public QWidget, public IntModelView { @@ -80,4 +83,6 @@ private slots: } ; + +} #endif diff --git a/include/ComboBoxModel.h b/include/ComboBoxModel.h index 5af4355f05a..65be3dc483b 100644 --- a/include/ComboBoxModel.h +++ b/include/ComboBoxModel.h @@ -30,6 +30,11 @@ #include "AutomatableModel.h" + +namespace lmms +{ + + class PixmapLoader; @@ -89,4 +94,5 @@ class EXPORT ComboBoxModel : public IntModel } ; +} #endif diff --git a/include/ConfigManager.h b/include/ConfigManager.h index f0d8996e0fe..9c6b8729b41 100644 --- a/include/ConfigManager.h +++ b/include/ConfigManager.h @@ -37,6 +37,10 @@ #include "MemoryManager.h" #include "lmmsversion.h" + +namespace lmms +{ + class Engine; @@ -282,4 +286,7 @@ class EXPORT ConfigManager } ; + + +} #endif diff --git a/include/Controller.h b/include/Controller.h index e1d2f98621e..436c9a74945 100644 --- a/include/Controller.h +++ b/include/Controller.h @@ -33,6 +33,11 @@ #include "JournallingObject.h" #include "ValueBuffer.h" + +namespace lmms +{ + + class ControllerDialog; class Controller; class ControllerConnection; @@ -174,5 +179,7 @@ public slots: } ; -#endif + +} +#endif diff --git a/include/ControllerConnection.h b/include/ControllerConnection.h index dab0a3fdcb3..5e441ad5e7f 100644 --- a/include/ControllerConnection.h +++ b/include/ControllerConnection.h @@ -37,6 +37,11 @@ #include "JournallingObject.h" #include "ValueBuffer.h" + +namespace lmms +{ + + class ControllerConnection; typedef QVector ControllerConnectionVector; @@ -119,5 +124,7 @@ public slots: friend class ControllerConnectionDialog; }; -#endif + +} +#endif diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h index 02a717abdf0..84d4450d43e 100644 --- a/include/ControllerConnectionDialog.h +++ b/include/ControllerConnectionDialog.h @@ -38,6 +38,11 @@ class QLineEdit; class QListView; class QScrollArea; + + +namespace lmms +{ + class AutoDetectMidiController; class ComboBox; class GroupBox; @@ -98,4 +103,6 @@ protected slots: AutoDetectMidiController * m_midiController; } ; + +} #endif diff --git a/include/ControllerDialog.h b/include/ControllerDialog.h index dc28783df75..e386e64102c 100644 --- a/include/ControllerDialog.h +++ b/include/ControllerDialog.h @@ -30,6 +30,11 @@ #include "ModelView.h" + +namespace lmms +{ + + class Controller; @@ -51,4 +56,6 @@ class ControllerDialog : public QWidget, public ModelView } ; + +} #endif diff --git a/include/ControllerRackView.h b/include/ControllerRackView.h index eb99ded4d1f..2859ddd3b7b 100644 --- a/include/ControllerRackView.h +++ b/include/ControllerRackView.h @@ -35,6 +35,10 @@ class QPushButton; class QScrollArea; + +namespace lmms +{ + class ControllerView; @@ -73,4 +77,6 @@ private slots: } ; + +} #endif diff --git a/include/ControllerView.h b/include/ControllerView.h index f1d73c400b9..d851610bb68 100644 --- a/include/ControllerView.h +++ b/include/ControllerView.h @@ -36,6 +36,11 @@ class QLabel; class QPushButton; class QMdiSubWindow; + +namespace lmms +{ + + class LedCheckBox; @@ -83,4 +88,6 @@ public slots: } ; + +} #endif diff --git a/include/DataFile.h b/include/DataFile.h index c8586fd9de4..c9e5eddb1c2 100644 --- a/include/DataFile.h +++ b/include/DataFile.h @@ -34,6 +34,11 @@ class QTextStream; + +namespace lmms +{ + + class EXPORT DataFile : public QDomDocument { MM_OPERATORS @@ -133,5 +138,5 @@ const int LDF_MINOR_VERSION = 0; const QString LDF_VERSION_STRING = QString::number( LDF_MAJOR_VERSION ) + "." + QString::number( LDF_MINOR_VERSION ); +} #endif - diff --git a/include/Delay.h b/include/Delay.h index 9010232b949..b1963198eab 100644 --- a/include/Delay.h +++ b/include/Delay.h @@ -32,6 +32,11 @@ #include "interpolation.h" #include "MemoryManager.h" + +namespace lmms +{ + + // brief usage // Classes: @@ -360,4 +365,7 @@ typedef CombFeedfwd<2> StereoCombFeedfwd; typedef CombFeedbackDualtap<2> StereoCombFeedbackDualtap; typedef AllpassDelay<2> StereoAllpassDelay; + + +} #endif diff --git a/include/DetuningHelper.h b/include/DetuningHelper.h index 7f702ac4a71..c7479c86f23 100644 --- a/include/DetuningHelper.h +++ b/include/DetuningHelper.h @@ -29,6 +29,11 @@ #include "InlineAutomation.h" #include "MemoryManager.h" + +namespace lmms +{ + + class DetuningHelper : public InlineAutomation { MM_OPERATORS @@ -60,4 +65,5 @@ class DetuningHelper : public InlineAutomation } ; +} #endif diff --git a/include/DrumSynth.h b/include/DrumSynth.h index e29c4bc2ce9..de0c76a6112 100644 --- a/include/DrumSynth.h +++ b/include/DrumSynth.h @@ -30,6 +30,11 @@ #include #include "lmms_basics.h" + +namespace lmms +{ + + class DrumSynth { public: DrumSynth() {}; @@ -49,4 +54,6 @@ class DrumSynth { }; + +} #endif diff --git a/include/DspEffectLibrary.h b/include/DspEffectLibrary.h index 49b55ad4328..02f9a363cc7 100644 --- a/include/DspEffectLibrary.h +++ b/include/DspEffectLibrary.h @@ -32,6 +32,10 @@ #include "lmms_basics.h" + +namespace lmms +{ + namespace DspEffectLibrary { @@ -347,4 +351,6 @@ namespace DspEffectLibrary } ; + +} #endif diff --git a/include/DummyEffect.h b/include/DummyEffect.h index 155a98d335e..954911cbebf 100644 --- a/include/DummyEffect.h +++ b/include/DummyEffect.h @@ -30,6 +30,10 @@ #include "EffectControlDialog.h" +namespace lmms +{ + + class DummyEffectControlDialog : public EffectControlDialog { public: @@ -139,4 +143,6 @@ class DummyEffect : public Effect } ; + +} #endif diff --git a/include/DummyInstrument.h b/include/DummyInstrument.h index c3ba12f8320..616703b312c 100644 --- a/include/DummyInstrument.h +++ b/include/DummyInstrument.h @@ -30,6 +30,11 @@ #include "InstrumentView.h" + +namespace lmms +{ + + class DummyInstrument : public Instrument { public: @@ -66,4 +71,5 @@ class DummyInstrument : public Instrument } ; +} #endif diff --git a/include/DummyPlugin.h b/include/DummyPlugin.h index 42f57c19c22..a0b22731e6c 100644 --- a/include/DummyPlugin.h +++ b/include/DummyPlugin.h @@ -30,6 +30,11 @@ #include "PluginView.h" + +namespace lmms +{ + + class DummyPlugin : public Plugin { public: @@ -65,4 +70,5 @@ class DummyPlugin : public Plugin } ; +} #endif diff --git a/include/Editor.h b/include/Editor.h index c97065813b9..f9402ac301a 100644 --- a/include/Editor.h +++ b/include/Editor.h @@ -32,6 +32,11 @@ #include "TimeLineWidget.h" #include "ToolButton.h" + +namespace lmms +{ + + class DropToolBar; /// \brief Superclass for editors with a toolbar. @@ -91,4 +96,6 @@ class DropToolBar : public QToolBar }; + +} #endif diff --git a/include/Effect.h b/include/Effect.h index c91b8a53b29..812f387c36a 100644 --- a/include/Effect.h +++ b/include/Effect.h @@ -33,6 +33,11 @@ #include "TempoSyncKnobModel.h" #include "MemoryManager.h" + +namespace lmms +{ + + class EffectChain; class EffectControls; @@ -231,4 +236,5 @@ typedef Effect::Descriptor::SubPluginFeatures::Key EffectKey; typedef Effect::Descriptor::SubPluginFeatures::KeyList EffectKeyList; +} #endif diff --git a/include/EffectChain.h b/include/EffectChain.h index 858938b0219..a06284a1df5 100644 --- a/include/EffectChain.h +++ b/include/EffectChain.h @@ -31,6 +31,11 @@ #include "Mixer.h" #include "AutomatableModel.h" + +namespace lmms +{ + + class Effect; @@ -79,5 +84,7 @@ class EXPORT EffectChain : public Model, public SerializingObject } ; -#endif + +} +#endif diff --git a/include/EffectControlDialog.h b/include/EffectControlDialog.h index 2338b560718..45655df76b7 100644 --- a/include/EffectControlDialog.h +++ b/include/EffectControlDialog.h @@ -30,6 +30,12 @@ #include "ModelView.h" + + +namespace lmms +{ + + class EffectControls; @@ -52,4 +58,6 @@ class EXPORT EffectControlDialog : public QWidget, public ModelView } ; + +} #endif diff --git a/include/EffectControls.h b/include/EffectControls.h index d97bf1c997b..663f0f351d3 100644 --- a/include/EffectControls.h +++ b/include/EffectControls.h @@ -29,6 +29,12 @@ #include "JournallingObject.h" #include "Effect.h" + + +namespace lmms +{ + + class EffectControlDialog; @@ -73,4 +79,6 @@ class EffectControls : public JournallingObject, public Model } ; + +} #endif diff --git a/include/EffectRackView.h b/include/EffectRackView.h index 58d6bc3fc19..b4b112b1be0 100644 --- a/include/EffectRackView.h +++ b/include/EffectRackView.h @@ -35,6 +35,11 @@ class QScrollArea; class QVBoxLayout; + +namespace lmms +{ + + class EffectView; class GroupBox; @@ -82,4 +87,6 @@ private slots: } ; + +} #endif diff --git a/include/EffectSelectDialog.h b/include/EffectSelectDialog.h index 658966bdf0a..6d70d26c401 100644 --- a/include/EffectSelectDialog.h +++ b/include/EffectSelectDialog.h @@ -36,6 +36,9 @@ namespace Ui { class EffectSelectDialog; } +namespace lmms +{ + class EffectSelectDialog : public QDialog { Q_OBJECT @@ -66,5 +69,5 @@ protected slots: } ; - +} #endif diff --git a/include/EffectView.h b/include/EffectView.h index c251a41ae88..ce238a8d8af 100644 --- a/include/EffectView.h +++ b/include/EffectView.h @@ -35,6 +35,10 @@ class QLabel; class QPushButton; class QMdiSubWindow; + +namespace lmms +{ + class EffectControlDialog; class Knob; class LedCheckBox; @@ -90,4 +94,6 @@ public slots: } ; + +} #endif diff --git a/include/Engine.h b/include/Engine.h index 659c1ee1a74..1472ee1fa88 100644 --- a/include/Engine.h +++ b/include/Engine.h @@ -33,6 +33,11 @@ #include "export.h" + +namespace lmms +{ + + class BBTrackContainer; class DummyTrackContainer; class FxMixer; @@ -146,5 +151,5 @@ class EXPORT Engine : public QObject - +} #endif diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h index 01a31251b20..bcf9d0a9414 100644 --- a/include/EnvelopeAndLfoParameters.h +++ b/include/EnvelopeAndLfoParameters.h @@ -34,6 +34,11 @@ #include "lmms_basics.h" + +namespace lmms +{ + + class EXPORT EnvelopeAndLfoParameters : public Model, public JournallingObject { Q_OBJECT @@ -183,4 +188,7 @@ public slots: } ; + + +} #endif diff --git a/include/EnvelopeAndLfoView.h b/include/EnvelopeAndLfoView.h index f491ea7bf9d..1de010c5952 100644 --- a/include/EnvelopeAndLfoView.h +++ b/include/EnvelopeAndLfoView.h @@ -33,6 +33,11 @@ class QPaintEvent; class QPixmap; + +namespace lmms +{ + + class EnvelopeAndLfoParameters; class automatableButtonGroup; @@ -94,4 +99,6 @@ protected slots: float m_randomGraph; } ; + +} #endif diff --git a/include/ExportFilter.h b/include/ExportFilter.h index 857ed1b6c73..dc77022a8f9 100644 --- a/include/ExportFilter.h +++ b/include/ExportFilter.h @@ -32,6 +32,11 @@ #include "Plugin.h" + +namespace lmms +{ + + class EXPORT ExportFilter : public Plugin { public: @@ -61,4 +66,5 @@ class EXPORT ExportFilter : public Plugin } ; +} #endif diff --git a/include/ExportProjectDialog.h b/include/ExportProjectDialog.h index 46ab7fdb2e8..1ba193006a9 100644 --- a/include/ExportProjectDialog.h +++ b/include/ExportProjectDialog.h @@ -34,6 +34,10 @@ #include "ProjectRenderer.h" +namespace lmms +{ + + class ExportProjectDialog : public QDialog, public Ui::ExportProjectDialog { Q_OBJECT @@ -72,4 +76,6 @@ private slots: ProjectRenderer* m_activeRenderer; } ; + +} #endif diff --git a/include/FadeButton.h b/include/FadeButton.h index 4f05b349166..027b87c4280 100644 --- a/include/FadeButton.h +++ b/include/FadeButton.h @@ -31,6 +31,10 @@ #include +namespace lmms +{ + + class FadeButton : public QAbstractButton { Q_OBJECT @@ -61,5 +65,6 @@ public slots: } ; +} #endif diff --git a/include/Fader.h b/include/Fader.h index d21b7fa3138..00279246413 100644 --- a/include/Fader.h +++ b/include/Fader.h @@ -54,6 +54,11 @@ #include "AutomatableModelView.h" + +namespace lmms +{ + + class TextFloat; diff --git a/include/FileBrowser.h b/include/FileBrowser.h index b2d1e83bf29..f29ebc9fb54 100644 --- a/include/FileBrowser.h +++ b/include/FileBrowser.h @@ -36,6 +36,11 @@ class QLineEdit; + +namespace lmms +{ + + class FileItem; class InstrumentTrack; class FileBrowserTreeWidget; @@ -242,4 +247,5 @@ class FileItem : public QTreeWidgetItem } ; +} #endif diff --git a/include/FileDialog.h b/include/FileDialog.h index 4d03cd101a3..a890508104a 100644 --- a/include/FileDialog.h +++ b/include/FileDialog.h @@ -30,6 +30,11 @@ #include "export.h" + +namespace lmms +{ + + class EXPORT FileDialog : public QFileDialog { Q_OBJECT @@ -41,4 +46,5 @@ class EXPORT FileDialog : public QFileDialog void clearSelection(); }; +} #endif // FILEDIALOG_HPP diff --git a/include/FxLine.h b/include/FxLine.h index 69f6a9ed0cb..8bf483c2e81 100644 --- a/include/FxLine.h +++ b/include/FxLine.h @@ -33,6 +33,11 @@ #include "LcdWidget.h" #include "SendButtonIndicator.h" + +namespace lmms +{ + + class FxMixerView; class SendButtonIndicator; @@ -81,4 +86,5 @@ private slots: }; +} #endif // FXLINE_H diff --git a/include/FxMixer.h b/include/FxMixer.h index ddc2b743444..5793eec7dcb 100644 --- a/include/FxMixer.h +++ b/include/FxMixer.h @@ -32,6 +32,10 @@ #include "ThreadableJob.h" +namespace lmms +{ + + class FxRoute; typedef QVector FxRouteVector; @@ -217,4 +221,5 @@ class EXPORT FxMixer : public Model, public JournallingObject } ; +} #endif diff --git a/include/FxMixerView.h b/include/FxMixerView.h index 08d24fd09b4..4f661e79739 100644 --- a/include/FxMixerView.h +++ b/include/FxMixerView.h @@ -41,6 +41,12 @@ #include "EffectRackView.h" class QButtonGroup; + + +namespace lmms +{ + + class FxLine; class EXPORT FxMixerView : public QWidget, public ModelView, @@ -133,4 +139,6 @@ private slots: friend class FxChannelView; } ; + +} #endif diff --git a/include/Graph.h b/include/Graph.h index 9474c354ddc..146b6898ce8 100644 --- a/include/Graph.h +++ b/include/Graph.h @@ -35,6 +35,11 @@ #include "ModelView.h" #include "lmms_basics.h" + +namespace lmms +{ + + class graphModel; @@ -184,4 +189,6 @@ public slots: }; + +} #endif diff --git a/include/GroupBox.h b/include/GroupBox.h index 3b71c2dbd8a..c890a42cb60 100644 --- a/include/GroupBox.h +++ b/include/GroupBox.h @@ -35,6 +35,10 @@ class QPixmap; +namespace lmms +{ + + class GroupBox : public QWidget, public BoolModelView { Q_OBJECT @@ -73,4 +77,5 @@ class GroupBox : public QWidget, public BoolModelView typedef BoolModel groupBoxModel; +} #endif diff --git a/include/GuiApplication.h b/include/GuiApplication.h index 40fb4578d96..9d8b925f45b 100644 --- a/include/GuiApplication.h +++ b/include/GuiApplication.h @@ -31,6 +31,11 @@ class QLabel; + +namespace lmms +{ + + class AutomationEditorWindow; class BBEditor; class ControllerRackView; @@ -77,4 +82,6 @@ public slots: #define gui GuiApplication::instance() + +} #endif // GUIAPPLICATION_H diff --git a/include/ImportFilter.h b/include/ImportFilter.h index 44078082b53..e0fe4801a51 100644 --- a/include/ImportFilter.h +++ b/include/ImportFilter.h @@ -31,6 +31,10 @@ #include "Plugin.h" +namespace lmms +{ + + class TrackContainer; @@ -103,4 +107,5 @@ class EXPORT ImportFilter : public Plugin } ; +} #endif diff --git a/include/InlineAutomation.h b/include/InlineAutomation.h index 9da293574fe..51ae3367e18 100644 --- a/include/InlineAutomation.h +++ b/include/InlineAutomation.h @@ -29,6 +29,10 @@ #include "shared_object.h" +namespace lmms +{ + + class InlineAutomation : public FloatModel, public sharedObject { public: @@ -89,4 +93,5 @@ class InlineAutomation : public FloatModel, public sharedObject } ; +} #endif diff --git a/include/Instrument.h b/include/Instrument.h index fdacce603ac..5d8912f2d88 100644 --- a/include/Instrument.h +++ b/include/Instrument.h @@ -35,6 +35,10 @@ #include "Plugin.h" +namespace lmms +{ + + // forward-declarations class InstrumentTrack; class MidiEvent; @@ -141,4 +145,6 @@ class EXPORT Instrument : public Plugin Q_DECLARE_OPERATORS_FOR_FLAGS(Instrument::Flags) + +} #endif diff --git a/include/InstrumentFunctionViews.h b/include/InstrumentFunctionViews.h index c8c91f302a1..b94cb0962cf 100644 --- a/include/InstrumentFunctionViews.h +++ b/include/InstrumentFunctionViews.h @@ -30,6 +30,12 @@ #include class QLabel; + + +namespace lmms +{ + + class ComboBox; class GroupBox; class Knob; @@ -87,4 +93,5 @@ class InstrumentFunctionArpeggioView : public QWidget, public ModelView } ; +} #endif diff --git a/include/InstrumentFunctions.h b/include/InstrumentFunctions.h index d6abef16a40..e91ac9cb3a3 100644 --- a/include/InstrumentFunctions.h +++ b/include/InstrumentFunctions.h @@ -32,6 +32,10 @@ #include "ComboBoxModel.h" +namespace lmms +{ + + class InstrumentTrack; class NotePlayHandle; @@ -209,4 +213,6 @@ class InstrumentFunctionArpeggio : public Model, public JournallingObject } ; + +} #endif diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h index a8208424f33..c659854507b 100644 --- a/include/InstrumentMidiIOView.h +++ b/include/InstrumentMidiIOView.h @@ -31,6 +31,10 @@ #include "ModelView.h" +namespace lmms +{ + + class GroupBox; class LcdSpinBox; class QToolButton; @@ -78,4 +82,6 @@ class InstrumentMiscView : public QWidget }; + +} #endif diff --git a/include/InstrumentPlayHandle.h b/include/InstrumentPlayHandle.h index ffbfbce735a..de97eaf7ddb 100644 --- a/include/InstrumentPlayHandle.h +++ b/include/InstrumentPlayHandle.h @@ -30,6 +30,11 @@ #include "NotePlayHandle.h" #include "export.h" + +namespace lmms +{ + + class EXPORT InstrumentPlayHandle : public PlayHandle { public: @@ -87,4 +92,6 @@ class EXPORT InstrumentPlayHandle : public PlayHandle } ; + +} #endif diff --git a/include/InstrumentSoundShaping.h b/include/InstrumentSoundShaping.h index 90405a414e7..8a5b9dbec03 100644 --- a/include/InstrumentSoundShaping.h +++ b/include/InstrumentSoundShaping.h @@ -29,6 +29,10 @@ #include "ComboBoxModel.h" +namespace lmms +{ + + class InstrumentTrack; class EnvelopeAndLfoParameters; class NotePlayHandle; @@ -85,4 +89,5 @@ class InstrumentSoundShaping : public Model, public JournallingObject extern const QString __targetNames[InstrumentSoundShaping::NumTargets][3]; +} #endif diff --git a/include/InstrumentSoundShapingView.h b/include/InstrumentSoundShapingView.h index 8f87bb51c3b..ad95d8ba3d9 100644 --- a/include/InstrumentSoundShapingView.h +++ b/include/InstrumentSoundShapingView.h @@ -32,6 +32,11 @@ class QLabel; + +namespace lmms +{ + + class EnvelopeAndLfoView; class ComboBox; class GroupBox; @@ -67,4 +72,6 @@ class InstrumentSoundShapingView : public QWidget, public ModelView } ; + +} #endif diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index 6475a86227f..c31722528d6 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -41,6 +41,12 @@ class QLineEdit; template class QQueue; + + +namespace lmms +{ + + class InstrumentFunctionArpeggioView; class InstrumentFunctionNoteStackingView; class EffectRackView; @@ -458,4 +464,5 @@ protected slots: +} #endif diff --git a/include/InstrumentView.h b/include/InstrumentView.h index c39fc6bcd59..a694bd78094 100644 --- a/include/InstrumentView.h +++ b/include/InstrumentView.h @@ -29,6 +29,11 @@ #include "Instrument.h" #include "PluginView.h" + +namespace lmms +{ + + class InstrumentTrackWindow; @@ -55,4 +60,5 @@ class EXPORT InstrumentView : public PluginView } ; +} #endif diff --git a/include/JournallingObject.h b/include/JournallingObject.h index 9e423aa4ce7..7adf9d931c5 100644 --- a/include/JournallingObject.h +++ b/include/JournallingObject.h @@ -31,6 +31,11 @@ #include "SerializingObject.h" + +namespace lmms +{ + + class EXPORT JournallingObject : public SerializingObject { public: @@ -99,5 +104,5 @@ class EXPORT JournallingObject : public SerializingObject } ; +} #endif - diff --git a/include/Knob.h b/include/Knob.h index c41ebf08d0b..d1f5a7dc0c2 100644 --- a/include/Knob.h +++ b/include/Knob.h @@ -34,6 +34,12 @@ class QPixmap; + + +namespace lmms +{ + + class TextFloat; enum knobTypes @@ -191,4 +197,7 @@ private slots: } ; + + +} #endif diff --git a/include/Ladspa2LMMS.h b/include/Ladspa2LMMS.h index e24d0b3826a..f4c571605c4 100644 --- a/include/Ladspa2LMMS.h +++ b/include/Ladspa2LMMS.h @@ -30,6 +30,10 @@ #include "LadspaManager.h" +namespace lmms +{ + + class EXPORT Ladspa2LMMS : public LadspaManager { public: @@ -75,4 +79,6 @@ class EXPORT Ladspa2LMMS : public LadspaManager } ; + +} #endif diff --git a/include/LadspaBase.h b/include/LadspaBase.h index 888a16ef91f..b9122461475 100644 --- a/include/LadspaBase.h +++ b/include/LadspaBase.h @@ -29,6 +29,11 @@ #include "LadspaManager.h" #include "Plugin.h" + +namespace lmms +{ + + class LadspaControl; @@ -87,4 +92,5 @@ inline Plugin::Descriptor::SubPluginFeatures::Key ladspaKeyToSubPluginKey( } +} #endif diff --git a/include/LadspaControl.h b/include/LadspaControl.h index e9fc424de93..31648067bce 100644 --- a/include/LadspaControl.h +++ b/include/LadspaControl.h @@ -33,6 +33,10 @@ #include "ValueBuffer.h" +namespace lmms +{ + + typedef struct PortDescription port_desc_t; @@ -119,4 +123,6 @@ protected slots: } ; + +} #endif diff --git a/include/LadspaControlView.h b/include/LadspaControlView.h index f787768b053..1d82b31d647 100644 --- a/include/LadspaControlView.h +++ b/include/LadspaControlView.h @@ -30,6 +30,12 @@ #include "ModelView.h" + + +namespace lmms +{ + + class LadspaControl; @@ -45,4 +51,6 @@ class EXPORT LadspaControlView : public QWidget, public ModelView } ; + +} #endif diff --git a/include/LadspaManager.h b/include/LadspaManager.h index 13ecd59883e..b5b3c744fa2 100644 --- a/include/LadspaManager.h +++ b/include/LadspaManager.h @@ -40,6 +40,11 @@ #include "lmms_basics.h" + +namespace lmms +{ + + const float NOHINT = -99342.2243f; typedef QPair ladspa_key_t; @@ -335,4 +340,7 @@ class EXPORT LadspaManager } ; + + +} #endif diff --git a/include/LcdSpinBox.h b/include/LcdSpinBox.h index 1592ef15b7c..cab3e7cf000 100644 --- a/include/LcdSpinBox.h +++ b/include/LcdSpinBox.h @@ -30,6 +30,10 @@ #include "AutomatableModelView.h" +namespace lmms +{ + + class EXPORT LcdSpinBox : public LcdWidget, public IntModelView { Q_OBJECT @@ -85,4 +89,6 @@ public slots: typedef IntModel LcdSpinBoxModel; + +} #endif diff --git a/include/LcdWidget.h b/include/LcdWidget.h index d0105047ce6..c6bdf169c22 100644 --- a/include/LcdWidget.h +++ b/include/LcdWidget.h @@ -31,6 +31,11 @@ #include "export.h" + +namespace lmms +{ + + class EXPORT LcdWidget : public QWidget { Q_OBJECT @@ -90,4 +95,6 @@ public slots: } ; + +} #endif diff --git a/include/LedCheckbox.h b/include/LedCheckbox.h index f2e215b2f03..d1756a6c20d 100644 --- a/include/LedCheckbox.h +++ b/include/LedCheckbox.h @@ -32,6 +32,10 @@ class QPixmap; +namespace lmms +{ + + class EXPORT LedCheckBox : public AutomatableButton { Q_OBJECT @@ -78,4 +82,6 @@ class EXPORT LedCheckBox : public AutomatableButton } ; + +} #endif diff --git a/include/LeftRightNav.h b/include/LeftRightNav.h index b675446ca1e..94540e2895a 100644 --- a/include/LeftRightNav.h +++ b/include/LeftRightNav.h @@ -29,6 +29,11 @@ #include + +namespace lmms +{ + + class LeftRightNav : public QWidget { Q_OBJECT @@ -46,4 +51,6 @@ class LeftRightNav : public QWidget PixmapButton m_rightBtn; }; + +} #endif \ No newline at end of file diff --git a/include/LfoController.h b/include/LfoController.h index 8cc5ec70f38..2527d9f8058 100644 --- a/include/LfoController.h +++ b/include/LfoController.h @@ -34,6 +34,11 @@ #include "TempoSyncKnobModel.h" #include "Oscillator.h" + +namespace lmms +{ + + class automatableButtonGroup; class Knob; class LedCheckBox; @@ -120,4 +125,6 @@ private slots: } ; + +} #endif diff --git a/include/LmmsPalette.h b/include/LmmsPalette.h index 17063525d5b..748d2f54478 100644 --- a/include/LmmsPalette.h +++ b/include/LmmsPalette.h @@ -30,6 +30,10 @@ #define LMMSPALETTE_H +namespace lmms +{ + + class EXPORT LmmsPalette : public QWidget { Q_OBJECT @@ -89,5 +93,5 @@ class EXPORT LmmsPalette : public QWidget - +} #endif diff --git a/include/LmmsStyle.h b/include/LmmsStyle.h index a99628f5efe..49f8022af1d 100644 --- a/include/LmmsStyle.h +++ b/include/LmmsStyle.h @@ -30,6 +30,9 @@ #include +namespace lmms +{ + class LmmsStyle : public QProxyStyle { @@ -92,4 +95,6 @@ class LmmsStyle : public QProxyStyle }; + +} #endif diff --git a/include/MainWindow.h b/include/MainWindow.h index 8ab93d34d66..c449754c0f0 100644 --- a/include/MainWindow.h +++ b/include/MainWindow.h @@ -35,6 +35,11 @@ class QDomElement; class QGridLayout; class QMdiArea; + +namespace lmms +{ + + class ConfigManager; class PluginView; class ToolButton; @@ -197,4 +202,6 @@ private slots: } ; + +} #endif diff --git a/include/MemoryHelper.h b/include/MemoryHelper.h index 66258f73093..633ddc31428 100644 --- a/include/MemoryHelper.h +++ b/include/MemoryHelper.h @@ -25,6 +25,11 @@ #ifndef MEMORY_HELPER_H #define MEMORY_HELPER_H + +namespace lmms +{ + + /** * Helper class to alocate aligned memory and free it. */ @@ -38,5 +43,7 @@ class MemoryHelper { private: }; + +} #endif diff --git a/include/MemoryManager.h b/include/MemoryManager.h index 559e908691b..481f9209340 100644 --- a/include/MemoryManager.h +++ b/include/MemoryManager.h @@ -34,6 +34,11 @@ class QReadWriteLock; + +namespace lmms +{ + + const int MM_CHUNK_SIZE = 64; // granularity of managed memory const int MM_INITIAL_CHUNKS = 1024 * 1024; // how many chunks to allocate at startup - TODO: make configurable const int MM_INCREMENT_CHUNKS = 16 * 1024; // min. amount of chunks to increment at a time @@ -156,4 +161,5 @@ static void operator delete[] ( void * ptr ) \ } +} #endif diff --git a/include/MeterDialog.h b/include/MeterDialog.h index 50d93831eb3..f35ba7c8dae 100644 --- a/include/MeterDialog.h +++ b/include/MeterDialog.h @@ -30,6 +30,11 @@ #include "ModelView.h" + +namespace lmms +{ + + class LcdSpinBox; @@ -49,4 +54,6 @@ class MeterDialog : public QWidget, public ModelView } ; + +} #endif diff --git a/include/MeterModel.h b/include/MeterModel.h index 4c3a80409b6..3b349c7157a 100644 --- a/include/MeterModel.h +++ b/include/MeterModel.h @@ -28,6 +28,10 @@ #include "AutomatableModel.h" +namespace lmms +{ + + class MeterModel : public Model { Q_OBJECT @@ -62,4 +66,6 @@ class MeterModel : public Model } ; + +} #endif diff --git a/include/MicroTimer.h b/include/MicroTimer.h index 45cd4f13bde..4f2e7017a3f 100644 --- a/include/MicroTimer.h +++ b/include/MicroTimer.h @@ -35,6 +35,11 @@ #include "lmms_basics.h" + +namespace lmms +{ + + class MicroTimer { public: @@ -67,4 +72,5 @@ class MicroTimer } ; +} #endif diff --git a/include/Midi.h b/include/Midi.h index 70a9ab2847e..3d206817c66 100644 --- a/include/Midi.h +++ b/include/Midi.h @@ -28,6 +28,10 @@ #include "lmms_basics.h" +namespace lmms +{ + + enum MidiEventTypes { // messages @@ -137,4 +141,6 @@ const int MidiMinPanning = -128; const int MidiMinPitchBend = 0; const int MidiMaxPitchBend = 16383; + +} #endif diff --git a/include/MidiAlsaRaw.h b/include/MidiAlsaRaw.h index 2c1a938e63f..134d1bd84a1 100644 --- a/include/MidiAlsaRaw.h +++ b/include/MidiAlsaRaw.h @@ -40,6 +40,10 @@ struct pollfd; class QLineEdit; +namespace lmms +{ + + class MidiAlsaRaw : public MidiClientRaw , public QThread { public: @@ -85,6 +89,8 @@ class MidiAlsaRaw : public MidiClientRaw , public QThread } ; + +} #endif #endif diff --git a/include/MidiAlsaSeq.h b/include/MidiAlsaSeq.h index 9e399a01156..7e839a0e29b 100644 --- a/include/MidiAlsaSeq.h +++ b/include/MidiAlsaSeq.h @@ -42,6 +42,10 @@ struct pollfd; class QLineEdit; +namespace lmms +{ + + class MidiAlsaSeq : public QThread, public MidiClient { Q_OBJECT @@ -158,6 +162,8 @@ private slots: } ; + +} #endif #endif diff --git a/include/MidiClient.h b/include/MidiClient.h index 09e4a07ae83..bca3385d254 100644 --- a/include/MidiClient.h +++ b/include/MidiClient.h @@ -34,6 +34,10 @@ #include "TabWidget.h" +namespace lmms +{ + + class MidiPort; @@ -194,5 +198,5 @@ class MidiClientRaw : public MidiClient } ; +} #endif - diff --git a/include/MidiController.h b/include/MidiController.h index 4dde605bd03..145d1273050 100644 --- a/include/MidiController.h +++ b/include/MidiController.h @@ -33,6 +33,10 @@ #include "MidiPort.h" +namespace lmms +{ + + class MidiPort; @@ -82,4 +86,5 @@ public slots: } ; +} #endif diff --git a/include/MidiDummy.h b/include/MidiDummy.h index c2c07911dcc..83f3de6edb1 100644 --- a/include/MidiDummy.h +++ b/include/MidiDummy.h @@ -28,6 +28,10 @@ #include "MidiClient.h" +namespace lmms +{ + + class MidiDummy : public MidiClientRaw { public: @@ -78,4 +82,5 @@ class MidiDummy : public MidiClientRaw } ; +} #endif diff --git a/include/MidiEvent.h b/include/MidiEvent.h index aa53bbeb3db..0d5526f625e 100644 --- a/include/MidiEvent.h +++ b/include/MidiEvent.h @@ -30,6 +30,11 @@ #include "panning_constants.h" #include "volume.h" + +namespace lmms +{ + + class MidiEvent { public: @@ -207,4 +212,7 @@ class MidiEvent } ; + + +} #endif diff --git a/include/MidiEventProcessor.h b/include/MidiEventProcessor.h index 46eacea0bc4..a6c87ace204 100644 --- a/include/MidiEventProcessor.h +++ b/include/MidiEventProcessor.h @@ -29,6 +29,11 @@ #include "MidiTime.h" #include "MemoryManager.h" + +namespace lmms +{ + + // all classes being able to process MIDI-events should inherit from this class MidiEventProcessor { @@ -48,4 +53,6 @@ class MidiEventProcessor } ; + +} #endif diff --git a/include/MidiOss.h b/include/MidiOss.h index 83bc6e6724b..ff51489ca8f 100644 --- a/include/MidiOss.h +++ b/include/MidiOss.h @@ -38,6 +38,10 @@ class QLineEdit; +namespace lmms +{ + + class MidiOss : public MidiClientRaw, public QThread { public: @@ -80,6 +84,8 @@ class MidiOss : public MidiClientRaw, public QThread } ; + +} #endif diff --git a/include/MidiPort.h b/include/MidiPort.h index 9312d92724d..2766ee669cc 100644 --- a/include/MidiPort.h +++ b/include/MidiPort.h @@ -35,6 +35,10 @@ #include "AutomatableModel.h" +namespace lmms +{ + + class MidiClient; class MidiEvent; class MidiEventProcessor; @@ -175,4 +179,5 @@ private slots: typedef QList MidiPortList; +} #endif diff --git a/include/MidiPortMenu.h b/include/MidiPortMenu.h index 1bfb196a662..dcfe1714e77 100644 --- a/include/MidiPortMenu.h +++ b/include/MidiPortMenu.h @@ -34,6 +34,10 @@ class QAction; +namespace lmms +{ + + class MidiPortMenu : public QMenu, public ModelView { Q_OBJECT @@ -58,4 +62,5 @@ protected slots: } ; +} #endif diff --git a/include/MidiTime.h b/include/MidiTime.h index 788e6fb5789..00a6501e90a 100644 --- a/include/MidiTime.h +++ b/include/MidiTime.h @@ -30,6 +30,11 @@ #include "lmms_basics.h" #include "export.h" + +namespace lmms +{ + + const int DefaultTicksPerTact = 192; const int DefaultStepsPerTact = 16; const int DefaultBeatsPerTact = DefaultTicksPerTact / DefaultStepsPerTact; @@ -155,5 +160,5 @@ class EXPORT MidiTime } ; +} #endif - diff --git a/include/MidiWinMM.h b/include/MidiWinMM.h index 9e5838034a2..b7f81ba79da 100644 --- a/include/MidiWinMM.h +++ b/include/MidiWinMM.h @@ -38,6 +38,10 @@ class QLineEdit; +namespace lmms +{ + + class MidiWinMM : public QObject, public MidiClient { Q_OBJECT @@ -146,7 +150,8 @@ class MidiWinMM : public QObject, public MidiClient } ; -#endif +} #endif +#endif diff --git a/include/MixHelpers.h b/include/MixHelpers.h index ec5395a9078..4277454e0be 100644 --- a/include/MixHelpers.h +++ b/include/MixHelpers.h @@ -27,6 +27,10 @@ #include "lmms_basics.h" + +namespace lmms +{ + class ValueBuffer; namespace MixHelpers { @@ -71,5 +75,6 @@ void multiplyAndAddMultipliedJoined( sampleFrame* dst, const sample_t* srcLeft, } -#endif +} +#endif diff --git a/include/Mixer.h b/include/Mixer.h index 03a81597560..3edccebcd67 100644 --- a/include/Mixer.h +++ b/include/Mixer.h @@ -52,6 +52,10 @@ #include "MixerProfiler.h" + +namespace lmms +{ + class AudioDevice; class MidiClient; class AudioPort; @@ -462,4 +466,6 @@ class EXPORT Mixer : public QObject } ; + +} #endif diff --git a/include/MixerProfiler.h b/include/MixerProfiler.h index ccb14ecd924..d5f91865031 100644 --- a/include/MixerProfiler.h +++ b/include/MixerProfiler.h @@ -29,6 +29,11 @@ #include "MicroTimer.h" + +namespace lmms +{ + + class MixerProfiler { public: @@ -57,4 +62,6 @@ class MixerProfiler }; + +} #endif diff --git a/include/MixerWorkerThread.h b/include/MixerWorkerThread.h index e95c13a3b91..3082e4b2ccd 100644 --- a/include/MixerWorkerThread.h +++ b/include/MixerWorkerThread.h @@ -29,6 +29,12 @@ #include class QWaitCondition; + + +namespace lmms +{ + + class Mixer; class ThreadableJob; @@ -114,4 +120,5 @@ class MixerWorkerThread : public QThread } ; +} #endif diff --git a/include/Model.h b/include/Model.h index c62c52ebd15..654dc87f7d4 100644 --- a/include/Model.h +++ b/include/Model.h @@ -31,6 +31,10 @@ #include "export.h" +namespace lmms +{ + + class EXPORT Model : public QObject { Q_OBJECT @@ -88,5 +92,5 @@ class EXPORT Model : public QObject } ; +} #endif - diff --git a/include/ModelView.h b/include/ModelView.h index 866546061a3..aff230b69ec 100644 --- a/include/ModelView.h +++ b/include/ModelView.h @@ -29,6 +29,10 @@ #include "Model.h" +namespace lmms +{ + + class EXPORT ModelView { public: @@ -81,5 +85,5 @@ class EXPORT ModelView } ; +} #endif - diff --git a/include/NStateButton.h b/include/NStateButton.h index 37dcde1dd87..fc7bbc51bb9 100644 --- a/include/NStateButton.h +++ b/include/NStateButton.h @@ -33,6 +33,10 @@ #include "ToolButton.h" +namespace lmms +{ + + class NStateButton : public ToolButton { Q_OBJECT @@ -72,4 +76,6 @@ public slots: } ; + +} #endif diff --git a/include/Note.h b/include/Note.h index 62a6f6f9308..22e6d37db83 100644 --- a/include/Note.h +++ b/include/Note.h @@ -33,6 +33,12 @@ #include "MidiTime.h" #include "SerializingObject.h" + + +namespace lmms +{ + + class DetuningHelper; @@ -234,4 +240,5 @@ class EXPORT Note : public SerializingObject typedef QVector NoteVector; +} #endif diff --git a/include/NotePlayHandle.h b/include/NotePlayHandle.h index 9cabdc346c8..7ec326fc224 100644 --- a/include/NotePlayHandle.h +++ b/include/NotePlayHandle.h @@ -33,6 +33,12 @@ class QAtomicInt; class QReadWriteLock; + + +namespace lmms +{ + + class InstrumentTrack; class NotePlayHandle; @@ -340,4 +346,5 @@ class NotePlayHandleManager }; +} #endif diff --git a/include/Oscillator.h b/include/Oscillator.h index e146b5af0e1..555a23bb1ba 100644 --- a/include/Oscillator.h +++ b/include/Oscillator.h @@ -36,6 +36,12 @@ #include "SampleBuffer.h" #include "lmms_constants.h" + + +namespace lmms +{ + + class IntModel; @@ -211,4 +217,5 @@ class EXPORT Oscillator } ; +} #endif diff --git a/include/Pattern.h b/include/Pattern.h index ce6702fbb3c..18e25260487 100644 --- a/include/Pattern.h +++ b/include/Pattern.h @@ -41,6 +41,11 @@ class QAction; class QProgressBar; class QPushButton; + +namespace lmms +{ + + class InstrumentTrack; class SampleBuffer; @@ -204,4 +209,5 @@ protected slots: +} #endif diff --git a/include/PeakController.h b/include/PeakController.h index 2b87ff09a3b..89130ba874f 100644 --- a/include/PeakController.h +++ b/include/PeakController.h @@ -32,6 +32,11 @@ #include "Controller.h" #include "ControllerDialog.h" + +namespace lmms +{ + + class automatableButtonGroup; class Knob; class PeakControllerEffect; @@ -102,4 +107,6 @@ class PeakControllerDialog : public ControllerDialog } ; + +} #endif diff --git a/include/Piano.h b/include/Piano.h index 48dd7f137aa..114b5bfb5c2 100644 --- a/include/Piano.h +++ b/include/Piano.h @@ -28,6 +28,11 @@ #include "Note.h" #include "Model.h" + +namespace lmms +{ + + class InstrumentTrack; class MidiEventProcessor; @@ -76,5 +81,6 @@ class Piano : public Model } ; -#endif +} +#endif diff --git a/include/PianoRoll.h b/include/PianoRoll.h index 9deeeb9e1a1..85f448d0bbf 100644 --- a/include/PianoRoll.h +++ b/include/PianoRoll.h @@ -45,6 +45,11 @@ class QString; class QMenu; class QSignalMapper; + +namespace lmms +{ + + class ComboBox; class NotePlayHandle; class Pattern; @@ -397,5 +402,5 @@ class PianoRollWindow : public Editor, SerializingObject }; +} #endif - diff --git a/include/PianoView.h b/include/PianoView.h index 24fb40097cc..fe7fbbdd38d 100644 --- a/include/PianoView.h +++ b/include/PianoView.h @@ -30,6 +30,12 @@ #include "ModelView.h" + + +namespace lmms +{ + + class Piano; @@ -85,5 +91,5 @@ private slots: } ; +} #endif - diff --git a/include/Pitch.h b/include/Pitch.h index a052f4c8b06..3f1150a676c 100644 --- a/include/Pitch.h +++ b/include/Pitch.h @@ -28,6 +28,11 @@ #include "lmms_basics.h" #include "Midi.h" + +namespace lmms +{ + + typedef int16_t pitch_t; const pitch_t CentsPerSemitone = 100; @@ -35,4 +40,6 @@ const pitch_t MinPitchDefault = -CentsPerSemitone; const pitch_t MaxPitchDefault = CentsPerSemitone; const pitch_t DefaultPitch = 0; + +} #endif diff --git a/include/PixmapButton.h b/include/PixmapButton.h index 04a7a7f5b64..c18efeaf369 100644 --- a/include/PixmapButton.h +++ b/include/PixmapButton.h @@ -31,6 +31,10 @@ #include "AutomatableButton.h" +namespace lmms +{ + + class EXPORT PixmapButton : public AutomatableButton { Q_OBJECT @@ -62,4 +66,6 @@ class EXPORT PixmapButton : public AutomatableButton } ; + +} #endif diff --git a/include/PlayHandle.h b/include/PlayHandle.h index ea66cc65ceb..58a09380498 100644 --- a/include/PlayHandle.h +++ b/include/PlayHandle.h @@ -32,6 +32,11 @@ #include "ThreadableJob.h" #include "lmms_basics.h" + +namespace lmms +{ + + class Track; class AudioPort; @@ -158,4 +163,5 @@ typedef QList PlayHandleList; typedef QList ConstPlayHandleList; +} #endif diff --git a/include/Plugin.h b/include/Plugin.h index 4bed7307da5..e7d893defb8 100644 --- a/include/Plugin.h +++ b/include/Plugin.h @@ -36,6 +36,11 @@ class QWidget; + +namespace lmms +{ + + class PixmapLoader; class PluginView; class AutomatableModel; @@ -199,4 +204,5 @@ class EXPORT Plugin : public Model, public JournallingObject } ; +} #endif diff --git a/include/PluginBrowser.h b/include/PluginBrowser.h index ee399e25a36..860c7466e02 100644 --- a/include/PluginBrowser.h +++ b/include/PluginBrowser.h @@ -32,6 +32,10 @@ #include "Plugin.h" +namespace lmms +{ + + class trackContainer; @@ -94,4 +98,5 @@ private slots: }; +} #endif diff --git a/include/PluginView.h b/include/PluginView.h index 9cc128a11b5..fc1c811e633 100644 --- a/include/PluginView.h +++ b/include/PluginView.h @@ -31,6 +31,10 @@ #include "ModelView.h" +namespace lmms +{ + + class EXPORT PluginView : public QWidget, public ModelView { public: @@ -43,4 +47,5 @@ class EXPORT PluginView : public QWidget, public ModelView } ; +} #endif diff --git a/include/PresetPreviewPlayHandle.h b/include/PresetPreviewPlayHandle.h index 0ebed9c8977..8e361d3b639 100644 --- a/include/PresetPreviewPlayHandle.h +++ b/include/PresetPreviewPlayHandle.h @@ -29,6 +29,10 @@ #include "NotePlayHandle.h" +namespace lmms +{ + + class InstrumentTrack; class PreviewTrackContainer; @@ -58,4 +62,5 @@ class EXPORT PresetPreviewPlayHandle : public PlayHandle } ; +} #endif diff --git a/include/ProjectJournal.h b/include/ProjectJournal.h index 28beaa82ff7..92c66ccfeda 100644 --- a/include/ProjectJournal.h +++ b/include/ProjectJournal.h @@ -31,6 +31,11 @@ #include "lmms_basics.h" #include "DataFile.h" + +namespace lmms +{ + + class JournallingObject; @@ -113,5 +118,5 @@ class ProjectJournal } ; +} #endif - diff --git a/include/ProjectNotes.h b/include/ProjectNotes.h index 998f47d996a..1b7169535a3 100644 --- a/include/ProjectNotes.h +++ b/include/ProjectNotes.h @@ -37,6 +37,10 @@ class QTextCharFormat; class QTextEdit; +namespace lmms +{ + + class EXPORT ProjectNotes : public QMainWindow, public SerializingObject { Q_OBJECT @@ -90,4 +94,5 @@ private slots: } ; +} #endif diff --git a/include/ProjectRenderer.h b/include/ProjectRenderer.h index 04baf27717c..5ecd2dcf73f 100644 --- a/include/ProjectRenderer.h +++ b/include/ProjectRenderer.h @@ -29,6 +29,10 @@ #include "lmmsconfig.h" +namespace lmms +{ + + class ProjectRenderer : public QThread { Q_OBJECT @@ -115,4 +119,6 @@ struct FileEncodeDevice extern FileEncodeDevice __fileEncodeDevices[]; + +} #endif diff --git a/include/ProjectVersion.h b/include/ProjectVersion.h index 545b916687f..b144af864f6 100644 --- a/include/ProjectVersion.h +++ b/include/ProjectVersion.h @@ -29,6 +29,11 @@ #include + +namespace lmms +{ + + enum CompareType { Major, Minor, Release, Build }; @@ -71,4 +76,6 @@ inline bool operator>=(const ProjectVersion & v1, const ProjectVersion & v2) { r inline bool operator==(const ProjectVersion & v1, const ProjectVersion & v2) { return ProjectVersion::compare(v1, v2) == 0; } inline bool operator!=(const ProjectVersion & v1, const ProjectVersion & v2) { return ProjectVersion::compare(v1, v2) != 0; } + +} #endif diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h index 42caa36aa66..bfa666bc6c7 100644 --- a/include/RemotePlugin.h +++ b/include/RemotePlugin.h @@ -85,6 +85,12 @@ typedef int32_t key_t; #include #endif + + +namespace lmms +{ + + // sometimes we need to exchange bigger messages (e.g. for VST parameter dumps) // so set a usable value here const int SHM_FIFO_SIZE = 512*1024; @@ -771,7 +777,7 @@ class EXPORT RemotePlugin : public RemotePluginBase friend class ProcessWatcher; } ; -#endif +#endif //BUILD_REMOTE_PLUGIN_CLIENT #ifdef BUILD_REMOTE_PLUGIN_CLIENT @@ -863,7 +869,7 @@ class RemotePluginClient : public RemotePluginBase } ; -#endif +#endif //BUILD_REMOTE_PLUGIN_CLIENT @@ -967,7 +973,7 @@ RemotePluginBase::message RemotePluginBase::waitForMessage( } -#endif +#endif //COMPILE_REMOTE_PLUGIN_BASE @@ -1186,8 +1192,11 @@ void RemotePluginClient::doProcessing() -#endif +#endif //BUILD_REMOTE_PLUGIN_CLIENT #define QSTR_TO_STDSTR(s) std::string( s.toUtf8().constData() ) + + +} #endif diff --git a/include/RenameDialog.h b/include/RenameDialog.h index 8c857e15d2d..8bccfe3ff3d 100644 --- a/include/RenameDialog.h +++ b/include/RenameDialog.h @@ -33,6 +33,10 @@ class QLineEdit; +namespace lmms +{ + + class RenameDialog : public QDialog { Q_OBJECT @@ -57,5 +61,5 @@ protected slots: } ; +} #endif - diff --git a/include/RingBuffer.h b/include/RingBuffer.h index f601e9aa628..651865ad59c 100644 --- a/include/RingBuffer.h +++ b/include/RingBuffer.h @@ -32,6 +32,11 @@ #include "lmms_math.h" #include "MemoryManager.h" + +namespace lmms +{ + + class EXPORT RingBuffer : public QObject { Q_OBJECT @@ -214,4 +219,7 @@ protected slots: volatile unsigned int m_position; }; + + +} #endif diff --git a/include/RmsHelper.h b/include/RmsHelper.h index a65c5461b42..9247933cfe1 100644 --- a/include/RmsHelper.h +++ b/include/RmsHelper.h @@ -28,6 +28,11 @@ #include "lmms_math.h" + +namespace lmms +{ + + class RmsHelper { public: @@ -91,4 +96,5 @@ class RmsHelper }; +} #endif diff --git a/include/Rubberband.h b/include/Rubberband.h index 7c8454f7610..2945f63a98b 100644 --- a/include/Rubberband.h +++ b/include/Rubberband.h @@ -31,6 +31,11 @@ #include + +namespace lmms +{ + + class selectableObject : public QWidget { Q_OBJECT @@ -90,5 +95,5 @@ class RubberBand : public QRubberBand }; +} #endif - diff --git a/include/SampleBuffer.h b/include/SampleBuffer.h index ef97f84eebc..f095ba72832 100644 --- a/include/SampleBuffer.h +++ b/include/SampleBuffer.h @@ -43,6 +43,12 @@ class QPainter; + + +namespace lmms +{ + + // values for buffer margins, used for various libsamplerate interpolation modes // the array positions correspond to the converter_type parameter values in libsamplerate // if there appears problems with playback on some interpolation mode, then the value for that mode @@ -317,4 +323,5 @@ public slots: } ; +} #endif diff --git a/include/SamplePlayHandle.h b/include/SamplePlayHandle.h index 847277a5b49..3d4a73d9592 100644 --- a/include/SamplePlayHandle.h +++ b/include/SamplePlayHandle.h @@ -29,6 +29,11 @@ #include "SampleBuffer.h" #include "AutomatableModel.h" + +namespace lmms +{ + + class BBTrack; class SampleTCO; class Track; @@ -93,4 +98,5 @@ class SamplePlayHandle : public PlayHandle } ; +} #endif diff --git a/include/SampleRecordHandle.h b/include/SampleRecordHandle.h index b6a44439674..6d7d7fbe3b6 100644 --- a/include/SampleRecordHandle.h +++ b/include/SampleRecordHandle.h @@ -32,6 +32,11 @@ #include "Mixer.h" #include "SampleBuffer.h" + +namespace lmms +{ + + class BBTrack; class SampleTCO; class Track; @@ -68,4 +73,5 @@ class SampleRecordHandle : public PlayHandle } ; +} #endif diff --git a/include/SampleTrack.h b/include/SampleTrack.h index c8b17b1481e..f4307ee0dfa 100644 --- a/include/SampleTrack.h +++ b/include/SampleTrack.h @@ -30,6 +30,11 @@ #include "AudioPort.h" #include "Track.h" + +namespace lmms +{ + + class EffectRackView; class Knob; class SampleBuffer; @@ -188,4 +193,5 @@ public slots: } ; +} #endif diff --git a/include/SendButtonIndicator.h b/include/SendButtonIndicator.h index 97acde1ba5e..3e8b0ff7dfa 100644 --- a/include/SendButtonIndicator.h +++ b/include/SendButtonIndicator.h @@ -8,6 +8,11 @@ #include "FxLine.h" #include "FxMixerView.h" + +namespace lmms +{ + + class FxLine; class FxMixerView; @@ -30,4 +35,6 @@ class SendButtonIndicator : public QLabel FloatModel * getSendModel(); }; + +} #endif // SENDBUTTONINDICATOR_H diff --git a/include/SerializingObject.h b/include/SerializingObject.h index deb0e08abaa..2b43082acd9 100644 --- a/include/SerializingObject.h +++ b/include/SerializingObject.h @@ -33,6 +33,11 @@ class QDomDocument; class QDomElement; + +namespace lmms +{ + + class SerializingObjectHook; @@ -96,5 +101,5 @@ class SerializingObjectHook } ; +} #endif - diff --git a/include/SetupDialog.h b/include/SetupDialog.h index 3357bf54ccf..539950d170c 100644 --- a/include/SetupDialog.h +++ b/include/SetupDialog.h @@ -39,6 +39,11 @@ class QLabel; class QLineEdit; class QSlider; + +namespace lmms +{ + + class TabBar; @@ -194,4 +199,5 @@ private slots: } ; +} #endif diff --git a/include/SideBar.h b/include/SideBar.h index 03c07d1b0cb..0989a4d63a6 100644 --- a/include/SideBar.h +++ b/include/SideBar.h @@ -30,6 +30,12 @@ #include class QToolButton; + + +namespace lmms +{ + + class SideBarWidget; @@ -54,4 +60,6 @@ private slots: } ; + +} #endif diff --git a/include/SideBarWidget.h b/include/SideBarWidget.h index 74fae99b3db..13f077a4885 100644 --- a/include/SideBarWidget.h +++ b/include/SideBarWidget.h @@ -30,6 +30,11 @@ #include + +namespace lmms +{ + + class SideBarWidget : public QWidget { Q_OBJECT @@ -79,4 +84,6 @@ class SideBarWidget : public QWidget } ; + +} #endif diff --git a/include/Song.h b/include/Song.h index 3f52cbbb13e..f7699f81cbc 100644 --- a/include/Song.h +++ b/include/Song.h @@ -35,6 +35,11 @@ #include "VstSyncController.h" + +namespace lmms +{ + + class AutomationTrack; class Pattern; class TimeLineWidget; @@ -377,4 +382,5 @@ private slots: } ; +} #endif diff --git a/include/SongEditor.h b/include/SongEditor.h index 4280540cef1..a71f4ea05de 100644 --- a/include/SongEditor.h +++ b/include/SongEditor.h @@ -33,6 +33,11 @@ class QLabel; class QScrollBar; + +namespace lmms +{ + + class AutomatableSlider; class ComboBox; class ComboBoxModel; @@ -161,4 +166,6 @@ protected slots: ComboBox * m_zoomingComboBox; }; + +} #endif diff --git a/include/StringPairDrag.h b/include/StringPairDrag.h index ca6591bbc92..c4fe408de2f 100644 --- a/include/StringPairDrag.h +++ b/include/StringPairDrag.h @@ -36,6 +36,10 @@ class QPixmap; +namespace lmms +{ + + class EXPORT StringPairDrag : public QDrag { public: @@ -58,4 +62,5 @@ class EXPORT StringPairDrag : public QDrag } ; +} #endif diff --git a/include/SweepOscillator.h b/include/SweepOscillator.h index 5779dc6a17f..5f771c0ff28 100644 --- a/include/SweepOscillator.h +++ b/include/SweepOscillator.h @@ -29,6 +29,11 @@ #include "DspEffectLibrary.h" + +namespace lmms +{ + + template class SweepOscillator { @@ -67,4 +72,5 @@ class SweepOscillator } ; +} #endif diff --git a/include/TabBar.h b/include/TabBar.h index dde54b04955..6c2824d463d 100644 --- a/include/TabBar.h +++ b/include/TabBar.h @@ -33,6 +33,10 @@ #include "export.h" +namespace lmms +{ + + class TabButton; @@ -85,4 +89,5 @@ protected slots: } ; +} #endif diff --git a/include/TabButton.h b/include/TabButton.h index 94f0d9b6bde..4813f84dd94 100644 --- a/include/TabButton.h +++ b/include/TabButton.h @@ -29,6 +29,10 @@ #include +namespace lmms +{ + + class TabButton : public QPushButton { Q_OBJECT @@ -63,4 +67,6 @@ protected slots: } ; + +} #endif diff --git a/include/TabWidget.h b/include/TabWidget.h index 1d5635c959e..a4c7a0840b8 100644 --- a/include/TabWidget.h +++ b/include/TabWidget.h @@ -30,6 +30,11 @@ #include + +namespace lmms +{ + + class TabWidget : public QWidget { Q_OBJECT @@ -69,4 +74,6 @@ class TabWidget : public QWidget quint8 m_tabheight; } ; + +} #endif diff --git a/include/TempoSyncKnob.h b/include/TempoSyncKnob.h index a1906990194..0eddc05651e 100644 --- a/include/TempoSyncKnob.h +++ b/include/TempoSyncKnob.h @@ -32,6 +32,11 @@ #include "Knob.h" #include "TempoSyncKnobModel.h" + +namespace lmms +{ + + class MeterDialog; class EXPORT TempoSyncKnob : public Knob @@ -78,5 +83,5 @@ protected slots: } ; - +} #endif diff --git a/include/TempoSyncKnobModel.h b/include/TempoSyncKnobModel.h index eaec0902382..b324456c60c 100644 --- a/include/TempoSyncKnobModel.h +++ b/include/TempoSyncKnobModel.h @@ -30,6 +30,11 @@ class QAction; + +namespace lmms +{ + + class EXPORT TempoSyncKnobModel : public FloatModel { Q_OBJECT @@ -101,4 +106,6 @@ protected slots: } ; + +} #endif diff --git a/include/TextFloat.h b/include/TextFloat.h index c89c346b418..c7ef15b6ec9 100644 --- a/include/TextFloat.h +++ b/include/TextFloat.h @@ -32,6 +32,10 @@ #include "export.h" +namespace lmms +{ + + class EXPORT TextFloat : public QWidget { Q_OBJECT @@ -79,4 +83,6 @@ class EXPORT TextFloat : public QWidget }; + +} #endif diff --git a/include/ThreadableJob.h b/include/ThreadableJob.h index f116a9324b3..a81e0b9250a 100644 --- a/include/ThreadableJob.h +++ b/include/ThreadableJob.h @@ -30,6 +30,10 @@ #include "lmms_basics.h" +namespace lmms +{ + + class ThreadableJob { public: @@ -86,4 +90,6 @@ class ThreadableJob } ; + +} #endif diff --git a/include/TimeDisplayWidget.h b/include/TimeDisplayWidget.h index c0decd8c5c4..27c076cfcc8 100644 --- a/include/TimeDisplayWidget.h +++ b/include/TimeDisplayWidget.h @@ -32,6 +32,10 @@ #include "LcdWidget.h" +namespace lmms +{ + + class TimeDisplayWidget : public QWidget { Q_OBJECT @@ -67,4 +71,6 @@ private slots: } ; + +} #endif diff --git a/include/TimeLineWidget.h b/include/TimeLineWidget.h index f962657e6f8..b5911a20f8c 100644 --- a/include/TimeLineWidget.h +++ b/include/TimeLineWidget.h @@ -33,6 +33,12 @@ class QPixmap; class QToolBar; + + +namespace lmms +{ + + class NStateButton; class TextFloat; class SongEditor; @@ -199,4 +205,5 @@ public slots: } ; +} #endif diff --git a/include/ToolButton.h b/include/ToolButton.h index 27365d69dbb..2d90d889d07 100644 --- a/include/ToolButton.h +++ b/include/ToolButton.h @@ -30,6 +30,10 @@ #include +namespace lmms +{ + + class ToolButton : public QToolButton { Q_OBJECT @@ -46,5 +50,6 @@ class ToolButton : public QToolButton } ; -#endif +} +#endif diff --git a/include/ToolPlugin.h b/include/ToolPlugin.h index f692bc407db..ca7e0b0e5cd 100644 --- a/include/ToolPlugin.h +++ b/include/ToolPlugin.h @@ -29,6 +29,11 @@ #include "Plugin.h" + +namespace lmms +{ + + class EXPORT ToolPlugin : public Plugin { public: @@ -42,4 +47,6 @@ class EXPORT ToolPlugin : public Plugin } ; + +} #endif diff --git a/include/ToolPluginView.h b/include/ToolPluginView.h index f1eede782a1..cd940a57596 100644 --- a/include/ToolPluginView.h +++ b/include/ToolPluginView.h @@ -28,6 +28,11 @@ #include "PluginView.h" + +namespace lmms +{ + + class ToolPlugin; class EXPORT ToolPluginView : public PluginView @@ -38,4 +43,5 @@ class EXPORT ToolPluginView : public PluginView } ; +} #endif diff --git a/include/ToolTip.h b/include/ToolTip.h index b543b3808be..b509c8e947b 100644 --- a/include/ToolTip.h +++ b/include/ToolTip.h @@ -33,10 +33,15 @@ class QWidget; +namespace lmms +{ + + struct ToolTip { static void EXPORT add( QWidget * _w, const QString & _txt ); } ; +} #endif diff --git a/include/Track.h b/include/Track.h index 73db6017a99..0b174726200 100644 --- a/include/Track.h +++ b/include/Track.h @@ -45,6 +45,11 @@ class QMenu; class QPushButton; + +namespace lmms +{ + + class PixmapButton; class TextFloat; class Track; @@ -684,4 +689,5 @@ private slots: +} #endif diff --git a/include/TrackContainer.h b/include/TrackContainer.h index 2e31e0814f8..b4fdd022dd8 100644 --- a/include/TrackContainer.h +++ b/include/TrackContainer.h @@ -32,6 +32,11 @@ #include "JournallingObject.h" + +namespace lmms +{ + + class AutomationPattern; class InstrumentTrack; class TrackContainerView; @@ -138,4 +143,5 @@ class DummyTrackContainer : public TrackContainer } ; +} #endif diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h index 4544d26b33c..697850f827c 100644 --- a/include/TrackContainerView.h +++ b/include/TrackContainerView.h @@ -37,6 +37,11 @@ class QVBoxLayout; + +namespace lmms +{ + + class TrackContainer; @@ -211,4 +216,6 @@ class InstrumentLoaderThread : public QThread QThread *m_containerThread; }; + +} #endif diff --git a/include/TrackLabelButton.h b/include/TrackLabelButton.h index 7af8f495e4c..d42289d0e39 100644 --- a/include/TrackLabelButton.h +++ b/include/TrackLabelButton.h @@ -29,6 +29,10 @@ #include +namespace lmms +{ + + class TrackView; @@ -58,4 +62,6 @@ public slots: } ; + +} #endif diff --git a/include/ValueBuffer.h b/include/ValueBuffer.h index 9c5e8bf456d..0129ef3c7db 100644 --- a/include/ValueBuffer.h +++ b/include/ValueBuffer.h @@ -31,6 +31,11 @@ #include #include "MemoryManager.h" + +namespace lmms +{ + + class ValueBuffer { MM_OPERATORS @@ -160,4 +165,6 @@ class ValueBuffer int m_length; }; + +} #endif diff --git a/include/VersionedSaveDialog.h b/include/VersionedSaveDialog.h index 22fda676fcf..3b07caed0ee 100644 --- a/include/VersionedSaveDialog.h +++ b/include/VersionedSaveDialog.h @@ -33,6 +33,10 @@ class QLineEdit; +namespace lmms +{ + + class VersionedSaveDialog : public FileDialog { Q_OBJECT @@ -50,4 +54,6 @@ public slots: void decrementVersion(); }; + +} #endif // VERSIONEDSAVEDIALOG_H diff --git a/include/VisualizationWidget.h b/include/VisualizationWidget.h index 12922ffc637..3375c6046cf 100644 --- a/include/VisualizationWidget.h +++ b/include/VisualizationWidget.h @@ -32,6 +32,10 @@ #include "Mixer.h" +namespace lmms +{ + + class VisualizationWidget : public QWidget { Q_OBJECT @@ -66,4 +70,6 @@ protected slots: } ; + +} #endif diff --git a/include/VstSyncController.h b/include/VstSyncController.h index b09afb5dc12..d53122b92d4 100644 --- a/include/VstSyncController.h +++ b/include/VstSyncController.h @@ -32,6 +32,10 @@ #include "VstSyncData.h" +namespace lmms +{ + + class VstSyncController : public QObject { Q_OBJECT @@ -96,4 +100,6 @@ private slots: }; + +} #endif diff --git a/include/VstSyncData.h b/include/VstSyncData.h index 5ca7bd6e9ee..84ca3e5f9e4 100644 --- a/include/VstSyncData.h +++ b/include/VstSyncData.h @@ -38,6 +38,9 @@ //#define VST_SNC_SHM_RND_KEY 3561653564469 +namespace lmms +{ + struct VstSyncData { @@ -58,4 +61,6 @@ struct VstSyncData #endif } ; + +} #endif diff --git a/include/base64.h b/include/base64.h index 0b15d7f72be..23dfb28672a 100644 --- a/include/base64.h +++ b/include/base64.h @@ -30,6 +30,9 @@ #include #include +namespace lmms +{ + namespace base64 { @@ -55,4 +58,6 @@ namespace base64 } + +} #endif diff --git a/include/custom_events.h b/include/custom_events.h index 08fef10b02b..e723b0971fc 100644 --- a/include/custom_events.h +++ b/include/custom_events.h @@ -29,6 +29,9 @@ #include +namespace lmms +{ + namespace customEvents { @@ -41,6 +44,5 @@ namespace customEvents } - - +} #endif diff --git a/include/denormals.h b/include/denormals.h index f89325ac1c9..6b9a08263f8 100644 --- a/include/denormals.h +++ b/include/denormals.h @@ -13,6 +13,10 @@ #endif +namespace lmms +{ + + // Set denormal protection for this thread. // To be on the safe side, don't set the DAZ flag for SSE2 builds, // even if most SSE2 CPUs can handle it. @@ -28,5 +32,6 @@ void inline disable_denormals() { #endif } -#endif +} +#endif diff --git a/include/endian_handling.h b/include/endian_handling.h index a2faa0f7c18..2be25d3152d 100644 --- a/include/endian_handling.h +++ b/include/endian_handling.h @@ -30,6 +30,10 @@ #include "lmms_basics.h" +namespace lmms +{ + + inline bool isLittleEndian() { return( QSysInfo::ByteOrder == QSysInfo::LittleEndian ); @@ -50,4 +54,6 @@ inline int32_t swap32IfBE( int32_t i ) ( ( i & 0x000000ff ) << 24 ) ); } + +} #endif diff --git a/include/fft_helpers.h b/include/fft_helpers.h index 59805c40007..619528f5bb9 100644 --- a/include/fft_helpers.h +++ b/include/fft_helpers.h @@ -30,6 +30,11 @@ #include + +namespace lmms +{ + + const int FFT_BUFFER_SIZE = 2048; enum WINDOWS @@ -81,4 +86,6 @@ int EXPORT calc13octaveband31( float * _absspec_buffer, float * _subbands, */ float EXPORT signalpower(float *timesignal, int num_values); + +} #endif diff --git a/include/fifo_buffer.h b/include/fifo_buffer.h index a1983008cf2..4e65657fdfc 100644 --- a/include/fifo_buffer.h +++ b/include/fifo_buffer.h @@ -28,6 +28,10 @@ #include +namespace lmms +{ + + template class fifoBuffer { @@ -84,5 +88,5 @@ class fifoBuffer - +} #endif diff --git a/include/gui_templates.h b/include/gui_templates.h index 47e88ad6f61..199d87131a3 100644 --- a/include/gui_templates.h +++ b/include/gui_templates.h @@ -34,6 +34,10 @@ +namespace lmms +{ + + // return DPI-independent font-size - font with returned font-size has always // the same size in pixels template @@ -65,4 +69,5 @@ inline QFont pointSizeF( QFont _f, float SIZE ) } +} #endif diff --git a/include/interpolation.h b/include/interpolation.h index 6938975873e..f6a92715d62 100644 --- a/include/interpolation.h +++ b/include/interpolation.h @@ -34,6 +34,11 @@ #include "lmms_constants.h" #include "lmms_math.h" + +namespace lmms +{ + + inline float hermiteInterpolate( float x0, float x1, float x2, float x3, float frac_pos ) { @@ -135,6 +140,5 @@ inline float lagrangeInterpolate( float v0, float v1, float v2, float v3, float - - +} #endif diff --git a/include/lmms_basics.h b/include/lmms_basics.h index ea02f77d183..c16a1eb0185 100644 --- a/include/lmms_basics.h +++ b/include/lmms_basics.h @@ -35,6 +35,10 @@ #endif +namespace lmms +{ + + typedef int32_t tact_t; typedef int32_t tick_t; typedef uint8_t volume_t; @@ -139,4 +143,5 @@ typedef sample_t sampleFrameA[DEFAULT_CHANNELS] __attribute__((__aligned__(ALIGN #define STR(PN) #PN +} #endif diff --git a/include/lmms_constants.h b/include/lmms_constants.h index 6f50c6f8e07..974fdf2f611 100644 --- a/include/lmms_constants.h +++ b/include/lmms_constants.h @@ -25,6 +25,11 @@ #ifndef LMMS_CONSTANTS_H #define LMMS_CONSTANTS_H + +namespace lmms +{ + + const long double LD_PI = 3.14159265358979323846264338327950288419716939937510; const long double LD_2PI = LD_PI * 2.0; const long double LD_PI_2 = LD_PI * 0.5; @@ -49,4 +54,6 @@ const float F_PI_SQR = (float) LD_PI_SQR; const float F_E = (float) LD_E; const float F_E_R = (float) LD_E_R; + +} #endif diff --git a/include/lmms_math.h b/include/lmms_math.h index b4d8995a035..314c3297dcf 100644 --- a/include/lmms_math.h +++ b/include/lmms_math.h @@ -32,6 +32,11 @@ #include #include + + +namespace lmms +{ + using namespace std; #if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) @@ -325,4 +330,7 @@ static inline T absMin( T a, T b ) return qAbs(a) < qAbs(b) ? a : b; } + + +} #endif diff --git a/include/panning.h b/include/panning.h index 4512bc74503..f51dfb4ab93 100644 --- a/include/panning.h +++ b/include/panning.h @@ -32,6 +32,11 @@ #include "panning_constants.h" #include "Midi.h" + +namespace lmms +{ + + inline stereoVolumeVector panningToVolumeVector( panning_t _p, float _scale = 1.0f ) { @@ -50,4 +55,6 @@ inline int panningToMidi( panning_t _p ) ( (float)( MidiMaxPanning - MidiMinPanning ) ) ); } + +} #endif diff --git a/include/panning_constants.h b/include/panning_constants.h index b5395de479a..30783194b1d 100644 --- a/include/panning_constants.h +++ b/include/panning_constants.h @@ -26,9 +26,16 @@ #ifndef PANNING_CONSTANTS_H #define PANNING_CONSTANTS_H + +namespace lmms +{ + + const panning_t PanningRight = ( 0 + 100 ); const panning_t PanningLeft = - PanningRight; const panning_t PanningCenter = 0; const panning_t DefaultPanning = PanningCenter; + +} #endif diff --git a/include/shared_object.h b/include/shared_object.h index 66e7364d11a..2626d3347b4 100644 --- a/include/shared_object.h +++ b/include/shared_object.h @@ -29,6 +29,10 @@ #include +namespace lmms +{ + + class sharedObject { public: @@ -78,7 +82,5 @@ class sharedObject } ; - - +} #endif - diff --git a/include/templates.h b/include/templates.h index a876315b518..d7489bb57e3 100644 --- a/include/templates.h +++ b/include/templates.h @@ -28,6 +28,9 @@ #include +namespace lmms +{ + template inline T tLimit( const T x, const T x1, const T x2 ) @@ -36,4 +39,5 @@ inline T tLimit( const T x, const T x1, const T x2 ) } +} #endif diff --git a/include/update_event.h b/include/update_event.h index 1657f4cc782..35ce75004cb 100644 --- a/include/update_event.h +++ b/include/update_event.h @@ -29,6 +29,9 @@ #include "custom_events.h" +namespace lmms +{ + class updateEvent : public QEvent { @@ -41,4 +44,5 @@ class updateEvent : public QEvent } ; +} #endif diff --git a/include/volume.h b/include/volume.h index e78e22f3974..0413b2ded96 100644 --- a/include/volume.h +++ b/include/volume.h @@ -31,6 +31,11 @@ #include "lmms_basics.h" #include "Midi.h" + +namespace lmms +{ + + const volume_t MinVolume = 0; const volume_t MaxVolume = 200; const volume_t DefaultVolume = 100; @@ -40,4 +45,6 @@ typedef struct float vol[2]; } stereoVolumeVector; + +} #endif From c3342500bff8c6f492706e2e92740e52836b7a88 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Sun, 17 May 2015 22:31:42 +0000 Subject: [PATCH 4/6] Minor fixes for lmms namespace change fixes for lmms namespace change Minor fixes for lmms namespace change --- include/AudioAlsa.h | 3 ++- include/AudioJack.h | 4 +++- include/AudioOss.h | 4 +++- include/AudioPortAudio.h | 9 ++++++++- include/AudioPulseAudio.h | 3 ++- include/AudioSdl.h | 6 +++--- include/AutomatableModelView.h | 6 +++--- include/AutomationEditor.h | 9 +++++---- include/Fader.h | 2 ++ include/Graph.h | 2 +- include/InstrumentMidiIOView.h | 4 +++- include/Mixer.h | 4 +--- include/PeakController.h | 4 +++- include/RemotePlugin.h | 10 ++++++---- include/SendButtonIndicator.h | 4 +--- include/embed.h | 5 +++++ src/core/AutomatableModel.cpp | 6 +++--- src/core/Controller.cpp | 4 ++-- src/core/MeterModel.cpp | 2 +- src/core/Track.cpp | 10 +++++----- src/gui/AutomatableModelView.cpp | 2 +- src/gui/embed.cpp | 7 +++++++ src/gui/widgets/Graph.cpp | 2 +- src/gui/widgets/SendButtonIndicator.cpp | 3 +++ src/tracks/InstrumentTrack.cpp | 2 +- 25 files changed, 75 insertions(+), 42 deletions(-) diff --git a/include/AudioAlsa.h b/include/AudioAlsa.h index 608eb15a129..0daa71f0885 100644 --- a/include/AudioAlsa.h +++ b/include/AudioAlsa.h @@ -37,13 +37,14 @@ #include "AudioDevice.h" +class QLineEdit; + namespace lmms { class LcdSpinBox; -class QLineEdit; class AudioAlsa : public AudioDevice, public QThread diff --git a/include/AudioJack.h b/include/AudioJack.h index 9a5b323a475..5f87d31bd6d 100644 --- a/include/AudioJack.h +++ b/include/AudioJack.h @@ -37,11 +37,13 @@ #include "AudioDevice.h" +class QLineEdit; + + namespace lmms { -class QLineEdit; class LcdSpinBox; diff --git a/include/AudioOss.h b/include/AudioOss.h index 91f883c2c86..680dbf5eede 100644 --- a/include/AudioOss.h +++ b/include/AudioOss.h @@ -32,12 +32,14 @@ #include "AudioDevice.h" +class QLineEdit; + + namespace lmms { class LcdSpinBox; -class QLineEdit; class AudioOss : public AudioDevice, public QThread diff --git a/include/AudioPortAudio.h b/include/AudioPortAudio.h index 4875d77e969..8ecec7f6338 100644 --- a/include/AudioPortAudio.h +++ b/include/AudioPortAudio.h @@ -48,6 +48,9 @@ public slots: } ; +} // namespace lmms + + #ifdef LMMS_HAVE_PORTAUDIO #if defined(__FreeBSD__) @@ -65,6 +68,10 @@ public slots: #endif +namespace lmms +{ + + class ComboBox; class LcdSpinBox; @@ -158,5 +165,5 @@ class AudioPortAudio : public AudioDevice #endif -} +} // namespace lmms #endif diff --git a/include/AudioPulseAudio.h b/include/AudioPulseAudio.h index 6565f572f25..284d647ff9a 100644 --- a/include/AudioPulseAudio.h +++ b/include/AudioPulseAudio.h @@ -34,13 +34,14 @@ #include "AudioDevice.h" +class QLineEdit; + namespace lmms { class LcdSpinBox; -class QLineEdit; class AudioPulseAudio : public AudioDevice, public QThread diff --git a/include/AudioSdl.h b/include/AudioSdl.h index 986623c218d..dd438b7bf82 100644 --- a/include/AudioSdl.h +++ b/include/AudioSdl.h @@ -35,11 +35,11 @@ #include "AudioDevice.h" -namespace lmms -{ +class QLineEdit; -class QLineEdit; +namespace lmms +{ class AudioSdl : public AudioDevice diff --git a/include/AutomatableModelView.h b/include/AutomatableModelView.h index 466ced954fc..a54e9196632 100644 --- a/include/AutomatableModelView.h +++ b/include/AutomatableModelView.h @@ -29,14 +29,14 @@ #include "AutomatableModel.h" +class QMenu; +class QMouseEvent; + namespace lmms { -class QMenu; -class QMouseEvent; - class EXPORT AutomatableModelView : public ModelView { public: diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h index 099f73d9133..cea5a4319d6 100644 --- a/include/AutomationEditor.h +++ b/include/AutomationEditor.h @@ -39,20 +39,21 @@ #include "Knob.h" -namespace lmms -{ - class QPainter; class QPixmap; class QScrollBar; + +namespace lmms +{ + + class ComboBox; class NotePlayHandle; class TimeLineWidget; - class AutomationEditor : public QWidget, public JournallingObject { Q_OBJECT diff --git a/include/Fader.h b/include/Fader.h index 00279246413..965a4278806 100644 --- a/include/Fader.h +++ b/include/Fader.h @@ -145,4 +145,6 @@ class EXPORT Fader : public QWidget, public FloatModelView } ; + +} #endif diff --git a/include/Graph.h b/include/Graph.h index 146b6898ce8..2d01c30e11c 100644 --- a/include/Graph.h +++ b/include/Graph.h @@ -122,7 +122,7 @@ class EXPORT graphModel : public Model graphModel( float _min, float _max, int _size, - :: Model * _parent, + Model * _parent, bool _default_constructed = false, float _step = 0.0 ); diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h index c659854507b..2f053b0d9d5 100644 --- a/include/InstrumentMidiIOView.h +++ b/include/InstrumentMidiIOView.h @@ -31,13 +31,15 @@ #include "ModelView.h" +class QToolButton; + + namespace lmms { class GroupBox; class LcdSpinBox; -class QToolButton; class LedCheckBox; class InstrumentTrack; diff --git a/include/Mixer.h b/include/Mixer.h index 3edccebcd67..ff39aa30e97 100644 --- a/include/Mixer.h +++ b/include/Mixer.h @@ -50,6 +50,7 @@ #include "Note.h" #include "fifo_buffer.h" #include "MixerProfiler.h" +#include "PlayHandle.h" @@ -76,9 +77,6 @@ const Keys BaseKey = Key_A; const Octaves BaseOctave = DefaultOctave; -#include "PlayHandle.h" - - class MixerWorkerThread; diff --git a/include/PeakController.h b/include/PeakController.h index 89130ba874f..d3373786918 100644 --- a/include/PeakController.h +++ b/include/PeakController.h @@ -33,13 +33,15 @@ #include "ControllerDialog.h" +class PeakControllerEffect; +class PeakControllerDialog; + namespace lmms { class automatableButtonGroup; class Knob; -class PeakControllerEffect; typedef QVector PeakControllerEffectVector; diff --git a/include/RemotePlugin.h b/include/RemotePlugin.h index bfa666bc6c7..c3d1453237f 100644 --- a/include/RemotePlugin.h +++ b/include/RemotePlugin.h @@ -86,6 +86,12 @@ typedef int32_t key_t; #endif +#ifdef COMPILE_REMOTE_PLUGIN_BASE +#ifndef BUILD_REMOTE_PLUGIN_CLIENT +#include +#endif +#endif + namespace lmms { @@ -877,10 +883,6 @@ class RemotePluginClient : public RemotePluginBase #ifdef COMPILE_REMOTE_PLUGIN_BASE -#ifndef BUILD_REMOTE_PLUGIN_CLIENT -#include -#endif - RemotePluginBase::RemotePluginBase( shmFifo * _in, shmFifo * _out ) : m_in( _in ), diff --git a/include/SendButtonIndicator.h b/include/SendButtonIndicator.h index 3e8b0ff7dfa..1a9990dc2ae 100644 --- a/include/SendButtonIndicator.h +++ b/include/SendButtonIndicator.h @@ -5,14 +5,12 @@ #include #include -#include "FxLine.h" -#include "FxMixerView.h" - namespace lmms { +class FloatModel; class FxLine; class FxMixerView; diff --git a/include/embed.h b/include/embed.h index 3ecf307f5ac..624cb80e21d 100644 --- a/include/embed.h +++ b/include/embed.h @@ -32,6 +32,10 @@ #include "lmms_basics.h" +namespace lmms +{ + + namespace embed { @@ -126,4 +130,5 @@ class PluginPixmapLoader : public PixmapLoader +} #endif diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp index 99c6e6d4988..856bfd909d6 100644 --- a/src/core/AutomatableModel.cpp +++ b/src/core/AutomatableModel.cpp @@ -248,7 +248,7 @@ void AutomatableModel::setValue( const float value ) template T AutomatableModel::logToLinearScale( T value ) const { - return castValue( ::logToLinearScale( minValue(), maxValue(), static_cast( value ) ) ); + return castValue( lmms::logToLinearScale( minValue(), maxValue(), static_cast( value ) ) ); } @@ -264,7 +264,7 @@ float AutomatableModel::inverseScaledValue( float value ) const { return m_scaleType == Linear ? value - : ::linearToLogScale( minValue(), maxValue(), value ); + : lmms::linearToLogScale( minValue(), maxValue(), value ); } @@ -299,7 +299,7 @@ void roundAt( T& value, const T& where, const T& step_size ) template void AutomatableModel::roundAt( T& value, const T& where ) const { - ::roundAt(value, where, m_step); + lmms::roundAt(value, where, m_step); } diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp index f2fbbfde006..6055aa3420f 100644 --- a/src/core/Controller.cpp +++ b/src/core/Controller.cpp @@ -217,7 +217,7 @@ Controller * Controller::create( ControllerTypes _ct, Model * _parent ) break; case Controller::LfoController: - c = new ::LfoController( _parent ); + c = new lmms::LfoController( _parent ); break; case Controller::PeakController: @@ -226,7 +226,7 @@ Controller * Controller::create( ControllerTypes _ct, Model * _parent ) break; case Controller::MidiController: - c = new ::MidiController( _parent ); + c = new lmms::MidiController( _parent ); break; default: diff --git a/src/core/MeterModel.cpp b/src/core/MeterModel.cpp index 8df7cddc019..6dc381dced6 100644 --- a/src/core/MeterModel.cpp +++ b/src/core/MeterModel.cpp @@ -31,7 +31,7 @@ namespace lmms { -MeterModel::MeterModel( ::Model * _parent ) : +MeterModel::MeterModel( Model * _parent ) : Model( _parent ), m_numeratorModel( 4, 1, 32, this, tr( "Numerator" ) ), m_denominatorModel( 4, 1, 32, this, tr( "Denominator" ) ) diff --git a/src/core/Track.cpp b/src/core/Track.cpp index 6b5282cd99e..46145697ba0 100644 --- a/src/core/Track.cpp +++ b/src/core/Track.cpp @@ -1867,14 +1867,14 @@ Track * Track::create( TrackTypes tt, TrackContainer * tc ) switch( tt ) { - case InstrumentTrack: t = new ::InstrumentTrack( tc ); break; - case BBTrack: t = new ::BBTrack( tc ); break; - case SampleTrack: t = new ::SampleTrack( tc ); break; + case InstrumentTrack: t = new lmms::InstrumentTrack( tc ); break; + case BBTrack: t = new lmms::BBTrack( tc ); break; + case SampleTrack: t = new lmms::SampleTrack( tc ); break; // case EVENT_TRACK: // case VIDEO_TRACK: - case AutomationTrack: t = new ::AutomationTrack( tc ); break; + case AutomationTrack: t = new lmms::AutomationTrack( tc ); break; case HiddenAutomationTrack: - t = new ::AutomationTrack( tc, true ); break; + t = new lmms::AutomationTrack( tc, true ); break; default: break; } diff --git a/src/gui/AutomatableModelView.cpp b/src/gui/AutomatableModelView.cpp index caffe25b44b..6603c85a111 100644 --- a/src/gui/AutomatableModelView.cpp +++ b/src/gui/AutomatableModelView.cpp @@ -41,7 +41,7 @@ namespace lmms { -AutomatableModelView::AutomatableModelView( ::Model* model, QWidget* _this ) : +AutomatableModelView::AutomatableModelView( Model* model, QWidget* _this ) : ModelView( model, _this ), m_description( QString::null ), m_unit( QString::null ) diff --git a/src/gui/embed.cpp b/src/gui/embed.cpp index 4e6ecaa13b7..9f46cf20476 100644 --- a/src/gui/embed.cpp +++ b/src/gui/embed.cpp @@ -30,6 +30,11 @@ #include "embed.h" #include "ConfigManager.h" + +namespace lmms +{ + + #ifndef PLUGIN_NAME namespace embed #else @@ -123,3 +128,5 @@ QString getText( const char * _name ) } + +} diff --git a/src/gui/widgets/Graph.cpp b/src/gui/widgets/Graph.cpp index fb9f7f60515..407d399d2e8 100644 --- a/src/gui/widgets/Graph.cpp +++ b/src/gui/widgets/Graph.cpp @@ -448,7 +448,7 @@ void Graph::updateGraph() graphModel::graphModel( float _min, float _max, int _length, - ::Model * _parent, bool _default_constructed, float _step ) : + Model * _parent, bool _default_constructed, float _step ) : Model( _parent, tr( "Graph" ), _default_constructed ), m_samples( _length ), m_length( _length ), diff --git a/src/gui/widgets/SendButtonIndicator.cpp b/src/gui/widgets/SendButtonIndicator.cpp index 08960b3875e..205568b2c3a 100644 --- a/src/gui/widgets/SendButtonIndicator.cpp +++ b/src/gui/widgets/SendButtonIndicator.cpp @@ -4,6 +4,9 @@ #include "FxMixer.h" #include "Model.h" +#include "FxLine.h" +#include "FxMixerView.h" + namespace lmms { diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index 438e4333439..f800e83d6d1 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -596,7 +596,7 @@ bool InstrumentTrack::play( const MidiTime & _start, const fpp_t _frames, const float frames_per_tick = Engine::framesPerTick(); tcoVector tcos; - ::BBTrack * bb_track = NULL; + lmms::BBTrack * bb_track = NULL; if( _tco_num >= 0 ) { TrackContentObject * tco = getTCO( _tco_num ); From ea2cafd2677affb280808cb2ec171aae2d848872 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Mon, 18 May 2015 01:30:01 +0000 Subject: [PATCH 5/6] update plugins for lmms namespace change --- include/EnvelopeAndLfoParameters.h | 4 +++- include/GuiApplication.h | 2 +- include/InstrumentFunctions.h | 5 ++++- include/InstrumentSoundShaping.h | 5 ++++- include/InstrumentTrack.h | 4 +++- plugins/Amplifier/Amplifier.h | 3 +++ plugins/Amplifier/AmplifierControlDialog.h | 3 +++ plugins/Amplifier/AmplifierControls.h | 3 +++ plugins/BassBooster/BassBooster.h | 2 ++ plugins/BassBooster/BassBoosterControlDialog.h | 2 ++ plugins/BassBooster/BassBoosterControls.h | 2 ++ plugins/Bitcrush/Bitcrush.h | 3 +++ plugins/Bitcrush/BitcrushControlDialog.h | 3 +++ plugins/Bitcrush/BitcrushControls.h | 3 +++ plugins/CrossoverEQ/CrossoverEQ.h | 3 +++ plugins/CrossoverEQ/CrossoverEQControlDialog.h | 3 +++ plugins/CrossoverEQ/CrossoverEQControls.h | 3 +++ plugins/Delay/DelayControls.h | 1 + plugins/Delay/DelayControlsDialog.h | 3 +++ plugins/Delay/DelayEffect.h | 3 +++ plugins/Delay/Lfo.h | 3 +++ plugins/Delay/StereoDelay.h | 3 +++ plugins/DualFilter/DualFilter.h | 3 +++ plugins/DualFilter/DualFilterControlDialog.h | 2 ++ plugins/DualFilter/DualFilterControls.h | 3 +++ plugins/Eq/EqControls.h | 2 ++ plugins/Eq/EqControlsDialog.h | 2 ++ plugins/Eq/EqEffect.h | 1 + plugins/Eq/EqFader.h | 2 ++ plugins/Eq/EqFilter.h | 3 +++ plugins/Eq/EqParameterWidget.h | 3 +++ plugins/Eq/EqSpectrumView.h | 2 ++ plugins/Flanger/FlangerControls.h | 2 ++ plugins/Flanger/FlangerControlsDialog.h | 3 +++ plugins/Flanger/FlangerEffect.h | 2 ++ plugins/Flanger/MonoDelay.h | 3 +++ plugins/Flanger/Noise.cpp | 3 +++ plugins/Flanger/QuadratureLfo.h | 3 +++ plugins/GigPlayer/GigPlayer.h | 6 +++++- plugins/GigPlayer/PatchesDialog.h | 2 ++ plugins/HydrogenImport/HydrogenImport.h | 2 ++ plugins/LadspaEffect/LadspaControlDialog.h | 6 ++++++ plugins/LadspaEffect/LadspaControls.h | 2 ++ plugins/LadspaEffect/LadspaEffect.h | 2 ++ plugins/LadspaEffect/LadspaSubPluginFeatures.h | 2 ++ plugins/MidiExport/MidiExport.h | 2 ++ plugins/MidiImport/MidiImport.h | 2 ++ plugins/MultitapEcho/MultitapEcho.h | 3 +++ plugins/MultitapEcho/MultitapEchoControlDialog.h | 3 +++ plugins/MultitapEcho/MultitapEchoControls.h | 2 ++ plugins/SpectrumAnalyzer/SpectrumAnalyzer.h | 2 ++ .../SpectrumAnalyzer/SpectrumAnalyzerControlDialog.h | 2 ++ plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.h | 2 ++ plugins/VstEffect/VstEffect.h | 2 ++ plugins/VstEffect/VstEffectControlDialog.h | 6 +++++- plugins/VstEffect/VstEffectControls.h | 2 ++ plugins/VstEffect/VstSubPluginFeatures.h | 5 ++--- plugins/audio_file_processor/audio_file_processor.h | 2 ++ plugins/bit_invader/bit_invader.h | 4 ++++ plugins/carlabase/carla.h | 3 +++ plugins/dynamics_processor/dynamics_processor.h | 3 +++ .../dynamics_processor_control_dialog.h | 2 ++ .../dynamics_processor/dynamics_processor_controls.h | 3 +++ plugins/flp_import/FlpImport.h | 4 ++++ plugins/kicker/KickerOsc.h | 2 ++ plugins/kicker/kicker.h | 5 +++++ plugins/ladspa_browser/ladspa_browser.h | 4 ++++ plugins/ladspa_browser/ladspa_description.h | 2 ++ plugins/ladspa_browser/ladspa_port_dialog.h | 1 + plugins/lb302/lb302.h | 10 +++++++++- plugins/lb303/lb303.h | 9 ++++++++- plugins/monstro/Monstro.h | 2 ++ plugins/nes/Nes.h | 2 ++ plugins/opl2/opl2instrument.h | 3 +++ plugins/organic/organic.h | 5 +++++ plugins/papu/Basic_Gb_Apu.h | 2 ++ plugins/papu/papu_instrument.h | 6 ++++++ plugins/patman/patman.h | 4 ++++ .../peak_controller_effect/peak_controller_effect.h | 3 +++ .../peak_controller_effect_control_dialog.h | 6 ++++++ .../peak_controller_effect_controls.h | 3 +++ plugins/sf2_player/patches_dialog.h | 3 +++ plugins/sf2_player/sf2_player.h | 8 +++++++- plugins/sfxr/sfxr.h | 2 ++ plugins/sid/sid_instrument.h | 7 +++++++ plugins/stereo_enhancer/stereo_enhancer.h | 4 ++++ .../stereo_enhancer/stereoenhancer_control_dialog.h | 3 +++ plugins/stereo_enhancer/stereoenhancer_controls.h | 3 +++ plugins/stereo_matrix/stereo_matrix.h | 3 +++ plugins/stereo_matrix/stereomatrix_control_dialog.h | 3 +++ plugins/stereo_matrix/stereomatrix_controls.h | 4 ++++ plugins/stk/mallets/mallets.h | 3 +++ plugins/triple_oscillator/TripleOscillator.h | 6 +++++- plugins/vestige/vestige.h | 9 ++++++++- plugins/vibed/nine_button_selector.h | 1 + plugins/vibed/string_container.h | 1 + plugins/vibed/vibed.h | 7 +++++++ plugins/vibed/vibrating_string.h | 2 ++ plugins/vst_base/VstPlugin.h | 2 ++ plugins/vst_base/communication.h | 1 + plugins/vst_base/vst_base.cpp | 1 + plugins/watsyn/Watsyn.h | 1 + plugins/waveshaper/waveshaper.h | 1 + plugins/waveshaper/waveshaper_control_dialog.h | 1 + plugins/waveshaper/waveshaper_controls.h | 3 +++ plugins/zynaddsubfx/LocalZynAddSubFx.h | 2 ++ plugins/zynaddsubfx/RemoteZynAddSubFx.h | 2 ++ plugins/zynaddsubfx/ZynAddSubFx.h | 6 ++++++ 108 files changed, 324 insertions(+), 15 deletions(-) diff --git a/include/EnvelopeAndLfoParameters.h b/include/EnvelopeAndLfoParameters.h index bcf9d0a9414..68db575555c 100644 --- a/include/EnvelopeAndLfoParameters.h +++ b/include/EnvelopeAndLfoParameters.h @@ -34,6 +34,8 @@ #include "lmms_basics.h" +// need to forward-declare plugins/flp_import to give C++ friend status +class FlpImport; namespace lmms { @@ -184,7 +186,7 @@ public slots: friend class EnvelopeAndLfoView; - friend class FlpImport; + friend class ::FlpImport; } ; diff --git a/include/GuiApplication.h b/include/GuiApplication.h index 9d8b925f45b..4512cf4e5bf 100644 --- a/include/GuiApplication.h +++ b/include/GuiApplication.h @@ -80,7 +80,7 @@ public slots: QLabel* m_loadingProgressLabel; }; -#define gui GuiApplication::instance() +#define gui lmms::GuiApplication::instance() } diff --git a/include/InstrumentFunctions.h b/include/InstrumentFunctions.h index e91ac9cb3a3..cc21a06e5b6 100644 --- a/include/InstrumentFunctions.h +++ b/include/InstrumentFunctions.h @@ -32,6 +32,9 @@ #include "ComboBoxModel.h" +// need to forward-declare plugins/flp_import to give C++ friend status +class FlpImport; + namespace lmms { @@ -206,7 +209,7 @@ class InstrumentFunctionArpeggio : public Model, public JournallingObject ComboBoxModel m_arpModeModel; - friend class FlpImport; + friend class ::FlpImport; friend class InstrumentTrack; friend class InstrumentFunctionArpeggioView; diff --git a/include/InstrumentSoundShaping.h b/include/InstrumentSoundShaping.h index 8a5b9dbec03..d269b1ceefb 100644 --- a/include/InstrumentSoundShaping.h +++ b/include/InstrumentSoundShaping.h @@ -29,6 +29,9 @@ #include "ComboBoxModel.h" +// need to forward-declare plugins/flp_import to give C++ friend status +class FlpImport; + namespace lmms { @@ -81,7 +84,7 @@ class InstrumentSoundShaping : public Model, public JournallingObject friend class InstrumentSoundShapingView; - friend class FlpImport; + friend class ::FlpImport; } ; diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index c31722528d6..68467ed12b9 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -42,6 +42,8 @@ class QLineEdit; template class QQueue; +// need to forward-declare plugins/flp_import to give C++ friend status +class FlpImport; namespace lmms { @@ -275,7 +277,7 @@ protected slots: friend class InstrumentTrackView; friend class InstrumentTrackWindow; friend class NotePlayHandle; - friend class FlpImport; + friend class ::FlpImport; friend class InstrumentMiscView; } ; diff --git a/plugins/Amplifier/Amplifier.h b/plugins/Amplifier/Amplifier.h index 2c2c0855c5f..31573d9ca9f 100644 --- a/plugins/Amplifier/Amplifier.h +++ b/plugins/Amplifier/Amplifier.h @@ -31,6 +31,9 @@ #include "AmplifierControls.h" #include "ValueBuffer.h" + +using namespace lmms; + class AmplifierEffect : public Effect { public: diff --git a/plugins/Amplifier/AmplifierControlDialog.h b/plugins/Amplifier/AmplifierControlDialog.h index f9ee9e61b61..d8ce8c55209 100644 --- a/plugins/Amplifier/AmplifierControlDialog.h +++ b/plugins/Amplifier/AmplifierControlDialog.h @@ -32,6 +32,9 @@ class AmplifierControls; +using namespace lmms; + + class AmplifierControlDialog : public EffectControlDialog { Q_OBJECT diff --git a/plugins/Amplifier/AmplifierControls.h b/plugins/Amplifier/AmplifierControls.h index 0d2f52daba1..3c1b5a2f9c9 100644 --- a/plugins/Amplifier/AmplifierControls.h +++ b/plugins/Amplifier/AmplifierControls.h @@ -34,6 +34,9 @@ class AmplifierEffect; +using namespace lmms; + + class AmplifierControls : public EffectControls { Q_OBJECT diff --git a/plugins/BassBooster/BassBooster.h b/plugins/BassBooster/BassBooster.h index 160328e93dd..3cd74c2282d 100644 --- a/plugins/BassBooster/BassBooster.h +++ b/plugins/BassBooster/BassBooster.h @@ -31,6 +31,8 @@ #include "BassBoosterControls.h" +using namespace lmms; + class BassBoosterEffect : public Effect { public: diff --git a/plugins/BassBooster/BassBoosterControlDialog.h b/plugins/BassBooster/BassBoosterControlDialog.h index 218ec7cb76e..32aacc2513c 100644 --- a/plugins/BassBooster/BassBoosterControlDialog.h +++ b/plugins/BassBooster/BassBoosterControlDialog.h @@ -27,6 +27,8 @@ #include "EffectControlDialog.h" +using namespace lmms; + class BassBoosterControls; diff --git a/plugins/BassBooster/BassBoosterControls.h b/plugins/BassBooster/BassBoosterControls.h index 7a3bea3ce31..07945e7f499 100644 --- a/plugins/BassBooster/BassBoosterControls.h +++ b/plugins/BassBooster/BassBoosterControls.h @@ -29,6 +29,8 @@ #include "BassBoosterControlDialog.h" #include "Knob.h" +using namespace lmms; + class BassBoosterEffect; diff --git a/plugins/Bitcrush/Bitcrush.h b/plugins/Bitcrush/Bitcrush.h index 0c599e107cc..d089767d31e 100644 --- a/plugins/Bitcrush/Bitcrush.h +++ b/plugins/Bitcrush/Bitcrush.h @@ -33,6 +33,9 @@ #include "lmms_math.h" #include "BasicFilters.h" +using namespace lmms; + + class BitcrushEffect : public Effect { public: diff --git a/plugins/Bitcrush/BitcrushControlDialog.h b/plugins/Bitcrush/BitcrushControlDialog.h index 69c4dd5f5ad..da51ca5c4d1 100644 --- a/plugins/Bitcrush/BitcrushControlDialog.h +++ b/plugins/Bitcrush/BitcrushControlDialog.h @@ -29,6 +29,9 @@ #include "EffectControlDialog.h" +using namespace lmms; + + class BitcrushControls; class BitcrushControlDialog : public EffectControlDialog diff --git a/plugins/Bitcrush/BitcrushControls.h b/plugins/Bitcrush/BitcrushControls.h index 42ec34e3822..450d19f5c54 100644 --- a/plugins/Bitcrush/BitcrushControls.h +++ b/plugins/Bitcrush/BitcrushControls.h @@ -29,6 +29,9 @@ #include "EffectControls.h" #include "BitcrushControlDialog.h" +using namespace lmms; + + class BitcrushEffect; class BitcrushControls : public EffectControls diff --git a/plugins/CrossoverEQ/CrossoverEQ.h b/plugins/CrossoverEQ/CrossoverEQ.h index 36b3a6bc555..716bfdfd06e 100644 --- a/plugins/CrossoverEQ/CrossoverEQ.h +++ b/plugins/CrossoverEQ/CrossoverEQ.h @@ -33,6 +33,9 @@ #include "lmms_math.h" #include "BasicFilters.h" +using namespace lmms; + + class CrossoverEQEffect : public Effect { public: diff --git a/plugins/CrossoverEQ/CrossoverEQControlDialog.h b/plugins/CrossoverEQ/CrossoverEQControlDialog.h index 08c67888646..4c08a8bb4a0 100644 --- a/plugins/CrossoverEQ/CrossoverEQControlDialog.h +++ b/plugins/CrossoverEQ/CrossoverEQControlDialog.h @@ -30,6 +30,9 @@ #include #include "EffectControlDialog.h" +using namespace lmms; + + class CrossoverEQControls; class CrossoverEQControlDialog : public EffectControlDialog diff --git a/plugins/CrossoverEQ/CrossoverEQControls.h b/plugins/CrossoverEQ/CrossoverEQControls.h index 18e87baeef5..6dc45780715 100644 --- a/plugins/CrossoverEQ/CrossoverEQControls.h +++ b/plugins/CrossoverEQ/CrossoverEQControls.h @@ -30,6 +30,9 @@ #include "EffectControls.h" #include "CrossoverEQControlDialog.h" +using namespace lmms; + + class CrossoverEQEffect; class CrossoverEQControls : public EffectControls diff --git a/plugins/Delay/DelayControls.h b/plugins/Delay/DelayControls.h index 1cd98715209..c0368c44380 100644 --- a/plugins/Delay/DelayControls.h +++ b/plugins/Delay/DelayControls.h @@ -29,6 +29,7 @@ #include "Knob.h" #include "DelayControlsDialog.h" +using namespace lmms; class DelayEffect; diff --git a/plugins/Delay/DelayControlsDialog.h b/plugins/Delay/DelayControlsDialog.h index 386c970521a..4b7b6af3b82 100644 --- a/plugins/Delay/DelayControlsDialog.h +++ b/plugins/Delay/DelayControlsDialog.h @@ -28,6 +28,9 @@ #include "EffectControlDialog.h" #include "AutomatableModel.h" +using namespace lmms; + + class DelayControls; class DelayControlsDialog : public EffectControlDialog diff --git a/plugins/Delay/DelayEffect.h b/plugins/Delay/DelayEffect.h index af4f86b073e..8a4192a9c45 100644 --- a/plugins/Delay/DelayEffect.h +++ b/plugins/Delay/DelayEffect.h @@ -31,6 +31,9 @@ #include "StereoDelay.h" #include "ValueBuffer.h" +using namespace lmms; + + class DelayEffect : public Effect { public: diff --git a/plugins/Delay/Lfo.h b/plugins/Delay/Lfo.h index 3c307723a35..480b71b440e 100644 --- a/plugins/Delay/Lfo.h +++ b/plugins/Delay/Lfo.h @@ -27,6 +27,9 @@ #include "lmms_math.h" +using namespace lmms; + + class Lfo { public: diff --git a/plugins/Delay/StereoDelay.h b/plugins/Delay/StereoDelay.h index 6485b283be5..e1f7d85c540 100644 --- a/plugins/Delay/StereoDelay.h +++ b/plugins/Delay/StereoDelay.h @@ -27,6 +27,9 @@ #include "lmms_basics.h" +using namespace lmms; + + class StereoDelay { public: diff --git a/plugins/DualFilter/DualFilter.h b/plugins/DualFilter/DualFilter.h index 561f04dd6f7..9d593315ac0 100644 --- a/plugins/DualFilter/DualFilter.h +++ b/plugins/DualFilter/DualFilter.h @@ -31,6 +31,9 @@ #include "DualFilterControls.h" #include "BasicFilters.h" +using namespace lmms; + + class DualFilterEffect : public Effect { public: diff --git a/plugins/DualFilter/DualFilterControlDialog.h b/plugins/DualFilter/DualFilterControlDialog.h index aef0ad47fcf..281fdb8d86d 100644 --- a/plugins/DualFilter/DualFilterControlDialog.h +++ b/plugins/DualFilter/DualFilterControlDialog.h @@ -28,6 +28,8 @@ #include "EffectControlDialog.h" +using namespace lmms; + class DualFilterControls; diff --git a/plugins/DualFilter/DualFilterControls.h b/plugins/DualFilter/DualFilterControls.h index ad9d3915a82..672b76c279c 100644 --- a/plugins/DualFilter/DualFilterControls.h +++ b/plugins/DualFilter/DualFilterControls.h @@ -31,6 +31,9 @@ #include "Knob.h" #include "ComboBoxModel.h" +using namespace lmms; + + class DualFilterEffect; diff --git a/plugins/Eq/EqControls.h b/plugins/Eq/EqControls.h index 5218b6a9fd3..14e3fc38bf0 100644 --- a/plugins/Eq/EqControls.h +++ b/plugins/Eq/EqControls.h @@ -29,6 +29,8 @@ #include "EqControlsDialog.h" #include "Knob.h" +using namespace lmms; + class EqEffect; diff --git a/plugins/Eq/EqControlsDialog.h b/plugins/Eq/EqControlsDialog.h index d220d51ad3b..583082d7077 100644 --- a/plugins/Eq/EqControlsDialog.h +++ b/plugins/Eq/EqControlsDialog.h @@ -34,6 +34,8 @@ #include "qpushbutton.h" #include "EqSpectrumView.h" +using namespace lmms; + class EqControls; diff --git a/plugins/Eq/EqEffect.h b/plugins/Eq/EqEffect.h index 63f76f3dd54..6e364ace601 100644 --- a/plugins/Eq/EqEffect.h +++ b/plugins/Eq/EqEffect.h @@ -31,6 +31,7 @@ #include "BasicFilters.h" #include "EqFilter.h" +using namespace lmms; class EqEffect : public Effect diff --git a/plugins/Eq/EqFader.h b/plugins/Eq/EqFader.h index 0e1ae986aa7..886038546f7 100644 --- a/plugins/Eq/EqFader.h +++ b/plugins/Eq/EqFader.h @@ -32,6 +32,8 @@ #include "qlist.h" +using namespace lmms; + class EqFader : public Fader { diff --git a/plugins/Eq/EqFilter.h b/plugins/Eq/EqFilter.h index 37cef312d92..fab05653c8a 100644 --- a/plugins/Eq/EqFilter.h +++ b/plugins/Eq/EqFilter.h @@ -28,6 +28,9 @@ #include "BasicFilters.h" #include "lmms_math.h" +using namespace lmms; + + /// /// \brief The EqFilter class. /// A wrapper for the StereoBiQuad class, giving it freq, res, and gain controls. diff --git a/plugins/Eq/EqParameterWidget.h b/plugins/Eq/EqParameterWidget.h index eb83ec96202..221a3b86553 100644 --- a/plugins/Eq/EqParameterWidget.h +++ b/plugins/Eq/EqParameterWidget.h @@ -29,6 +29,9 @@ #include "EffectControls.h" #include "TextFloat.h" +using namespace lmms; + + class EqControls; diff --git a/plugins/Eq/EqSpectrumView.h b/plugins/Eq/EqSpectrumView.h index 30693739964..41e6db14a70 100644 --- a/plugins/Eq/EqSpectrumView.h +++ b/plugins/Eq/EqSpectrumView.h @@ -29,6 +29,8 @@ #include "fft_helpers.h" #include "Engine.h" +using namespace lmms; + const int MAX_BANDS = 2048; diff --git a/plugins/Flanger/FlangerControls.h b/plugins/Flanger/FlangerControls.h index 29f5a5aaf33..4582c01fadb 100644 --- a/plugins/Flanger/FlangerControls.h +++ b/plugins/Flanger/FlangerControls.h @@ -29,6 +29,8 @@ #include "Knob.h" #include "FlangerControlsDialog.h" +using namespace lmms; + class FlangerEffect; diff --git a/plugins/Flanger/FlangerControlsDialog.h b/plugins/Flanger/FlangerControlsDialog.h index 1fef65a3e8a..c3f2ada64f7 100644 --- a/plugins/Flanger/FlangerControlsDialog.h +++ b/plugins/Flanger/FlangerControlsDialog.h @@ -27,6 +27,9 @@ #include "EffectControlDialog.h" +using namespace lmms; + + class FlangerControls; class FlangerControlsDialog : public EffectControlDialog diff --git a/plugins/Flanger/FlangerEffect.h b/plugins/Flanger/FlangerEffect.h index ac6125623e3..d9b70cc85a2 100644 --- a/plugins/Flanger/FlangerEffect.h +++ b/plugins/Flanger/FlangerEffect.h @@ -32,6 +32,8 @@ #include "MonoDelay.h" #include "Noise.h" +using namespace lmms; + class FlangerEffect : public Effect { diff --git a/plugins/Flanger/MonoDelay.h b/plugins/Flanger/MonoDelay.h index 866c5e697ae..7d8991bd900 100644 --- a/plugins/Flanger/MonoDelay.h +++ b/plugins/Flanger/MonoDelay.h @@ -27,6 +27,9 @@ #include "lmms_basics.h" +using namespace lmms; + + class MonoDelay { public: diff --git a/plugins/Flanger/Noise.cpp b/plugins/Flanger/Noise.cpp index 4d4c06e0a32..adf85f43ef6 100644 --- a/plugins/Flanger/Noise.cpp +++ b/plugins/Flanger/Noise.cpp @@ -25,6 +25,9 @@ #include "Noise.h" #include "lmms_math.h" +using namespace lmms; + + Noise::Noise() { inv_randmax = 1.0/FAST_RAND_MAX; /* for range of 0 - 1.0 */ diff --git a/plugins/Flanger/QuadratureLfo.h b/plugins/Flanger/QuadratureLfo.h index 04f2e62df05..d687cb2019a 100644 --- a/plugins/Flanger/QuadratureLfo.h +++ b/plugins/Flanger/QuadratureLfo.h @@ -27,6 +27,9 @@ #include "lmms_math.h" +using namespace lmms; + + class QuadratureLfo { public: diff --git a/plugins/GigPlayer/GigPlayer.h b/plugins/GigPlayer/GigPlayer.h index e637fcd6ac4..8f234e8209b 100644 --- a/plugins/GigPlayer/GigPlayer.h +++ b/plugins/GigPlayer/GigPlayer.h @@ -42,12 +42,16 @@ #include "gig.h" class GigInstrumentView; -class NotePlayHandle; class PatchesDialog; class QLabel; +namespace lmms +{ +class NotePlayHandle; +} +using namespace lmms; struct GIGPluginData diff --git a/plugins/GigPlayer/PatchesDialog.h b/plugins/GigPlayer/PatchesDialog.h index bb4dedde2d7..b152e6d7826 100644 --- a/plugins/GigPlayer/PatchesDialog.h +++ b/plugins/GigPlayer/PatchesDialog.h @@ -34,6 +34,8 @@ #include #include +using namespace lmms; + //---------------------------------------------------------------------------- // qsynthPresetForm -- UI wrapper form. diff --git a/plugins/HydrogenImport/HydrogenImport.h b/plugins/HydrogenImport/HydrogenImport.h index 1c916f3c342..5e8e9f151a9 100644 --- a/plugins/HydrogenImport/HydrogenImport.h +++ b/plugins/HydrogenImport/HydrogenImport.h @@ -7,6 +7,8 @@ #include "ImportFilter.h" +using namespace lmms; + class HydrogenImport : public ImportFilter { diff --git a/plugins/LadspaEffect/LadspaControlDialog.h b/plugins/LadspaEffect/LadspaControlDialog.h index 9c4f697d004..9a3a1b6f168 100644 --- a/plugins/LadspaEffect/LadspaControlDialog.h +++ b/plugins/LadspaEffect/LadspaControlDialog.h @@ -32,7 +32,13 @@ class QHBoxLayout; class LadspaControls; + +namespace lmms +{ class LedCheckBox; +} + +using namespace lmms; class LadspaControlDialog : public EffectControlDialog diff --git a/plugins/LadspaEffect/LadspaControls.h b/plugins/LadspaEffect/LadspaControls.h index ef9fbdd5cdf..01cf376a85d 100644 --- a/plugins/LadspaEffect/LadspaControls.h +++ b/plugins/LadspaEffect/LadspaControls.h @@ -29,6 +29,8 @@ #include "LadspaControl.h" #include "LadspaControlDialog.h" +using namespace lmms; + typedef QVector control_list_t; diff --git a/plugins/LadspaEffect/LadspaEffect.h b/plugins/LadspaEffect/LadspaEffect.h index fbfcaa8d695..9a38320d411 100644 --- a/plugins/LadspaEffect/LadspaEffect.h +++ b/plugins/LadspaEffect/LadspaEffect.h @@ -32,6 +32,8 @@ #include "LadspaBase.h" #include "LadspaControls.h" +using namespace lmms; + typedef QVector multi_proc_t; diff --git a/plugins/LadspaEffect/LadspaSubPluginFeatures.h b/plugins/LadspaEffect/LadspaSubPluginFeatures.h index adda3439587..8e53739a891 100644 --- a/plugins/LadspaEffect/LadspaSubPluginFeatures.h +++ b/plugins/LadspaEffect/LadspaSubPluginFeatures.h @@ -31,6 +31,8 @@ #include "LadspaManager.h" #include "Plugin.h" +using namespace lmms; + class LadspaSubPluginFeatures : public Plugin::Descriptor::SubPluginFeatures { diff --git a/plugins/MidiExport/MidiExport.h b/plugins/MidiExport/MidiExport.h index d829a8b8ff3..f81b79b32d2 100644 --- a/plugins/MidiExport/MidiExport.h +++ b/plugins/MidiExport/MidiExport.h @@ -31,6 +31,8 @@ #include "MidiFile.hpp" +using namespace lmms; + class MidiExport: public ExportFilter { diff --git a/plugins/MidiImport/MidiImport.h b/plugins/MidiImport/MidiImport.h index d4c7a0f4a58..00b171dc88e 100644 --- a/plugins/MidiImport/MidiImport.h +++ b/plugins/MidiImport/MidiImport.h @@ -32,6 +32,8 @@ #include "MidiEvent.h" #include "ImportFilter.h" +using namespace lmms; + class MidiImport : public ImportFilter { diff --git a/plugins/MultitapEcho/MultitapEcho.h b/plugins/MultitapEcho/MultitapEcho.h index 661fbfaedd2..c59ae4a1640 100644 --- a/plugins/MultitapEcho/MultitapEcho.h +++ b/plugins/MultitapEcho/MultitapEcho.h @@ -33,6 +33,9 @@ #include "lmms_math.h" #include "BasicFilters.h" +using namespace lmms; + + class MultitapEchoEffect : public Effect { public: diff --git a/plugins/MultitapEcho/MultitapEchoControlDialog.h b/plugins/MultitapEcho/MultitapEchoControlDialog.h index c0fdf7c3c92..27e92e3a664 100644 --- a/plugins/MultitapEcho/MultitapEchoControlDialog.h +++ b/plugins/MultitapEcho/MultitapEchoControlDialog.h @@ -29,6 +29,9 @@ #include "EffectControlDialog.h" +using namespace lmms; + + class MultitapEchoControls; class MultitapEchoControlDialog : public EffectControlDialog diff --git a/plugins/MultitapEcho/MultitapEchoControls.h b/plugins/MultitapEcho/MultitapEchoControls.h index a4f78dd31fe..2699da89dc3 100644 --- a/plugins/MultitapEcho/MultitapEchoControls.h +++ b/plugins/MultitapEcho/MultitapEchoControls.h @@ -31,6 +31,8 @@ #include "Knob.h" #include "Graph.h" +using namespace lmms; + class MultitapEchoEffect; diff --git a/plugins/SpectrumAnalyzer/SpectrumAnalyzer.h b/plugins/SpectrumAnalyzer/SpectrumAnalyzer.h index 2cde2ec1e3d..48b0283bac1 100644 --- a/plugins/SpectrumAnalyzer/SpectrumAnalyzer.h +++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzer.h @@ -30,6 +30,8 @@ #include "fft_helpers.h" #include "SpectrumAnalyzerControls.h" +using namespace lmms; + const int MAX_BANDS = 249; diff --git a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.h b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.h index fd940496a11..dedcfc41929 100644 --- a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.h +++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControlDialog.h @@ -27,6 +27,8 @@ #include "EffectControlDialog.h" +using namespace lmms; + class SpectrumAnalyzerControls; diff --git a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.h b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.h index 6d43e29f069..8500b0c6b30 100644 --- a/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.h +++ b/plugins/SpectrumAnalyzer/SpectrumAnalyzerControls.h @@ -29,6 +29,8 @@ #include "SpectrumAnalyzerControlDialog.h" #include "Knob.h" +using namespace lmms; + class SpectrumAnalyzer; diff --git a/plugins/VstEffect/VstEffect.h b/plugins/VstEffect/VstEffect.h index 2584eda4b1d..ccfaef9f5da 100644 --- a/plugins/VstEffect/VstEffect.h +++ b/plugins/VstEffect/VstEffect.h @@ -32,6 +32,8 @@ #include "VstEffectControlDialog.h" #include "VstEffectControls.h" +using namespace lmms; + class VstEffect : public Effect { diff --git a/plugins/VstEffect/VstEffectControlDialog.h b/plugins/VstEffect/VstEffectControlDialog.h index 53173a3935d..82744373c23 100644 --- a/plugins/VstEffect/VstEffectControlDialog.h +++ b/plugins/VstEffect/VstEffectControlDialog.h @@ -34,10 +34,14 @@ class VstEffectControls; -class PixmapButton; class QPixmap; class QPushButton; + +namespace lmms +{ class PixmapButton; +} +using namespace lmms; class VstEffectControlDialog : public EffectControlDialog diff --git a/plugins/VstEffect/VstEffectControls.h b/plugins/VstEffect/VstEffectControls.h index 8c74d9bef79..ae61003fc66 100644 --- a/plugins/VstEffect/VstEffectControls.h +++ b/plugins/VstEffect/VstEffectControls.h @@ -39,6 +39,8 @@ #include #include +using namespace lmms; + class VstEffect; diff --git a/plugins/VstEffect/VstSubPluginFeatures.h b/plugins/VstEffect/VstSubPluginFeatures.h index db2adcfabd6..4bcac43e567 100644 --- a/plugins/VstEffect/VstSubPluginFeatures.h +++ b/plugins/VstEffect/VstSubPluginFeatures.h @@ -29,6 +29,8 @@ #include "Effect.h" +using namespace lmms; + class VstSubPluginFeatures : public Plugin::Descriptor::SubPluginFeatures { @@ -46,7 +48,4 @@ class VstSubPluginFeatures : public Plugin::Descriptor::SubPluginFeatures - - #endif - diff --git a/plugins/audio_file_processor/audio_file_processor.h b/plugins/audio_file_processor/audio_file_processor.h index 988cc53822e..3eb61ef6ea8 100644 --- a/plugins/audio_file_processor/audio_file_processor.h +++ b/plugins/audio_file_processor/audio_file_processor.h @@ -38,6 +38,8 @@ #include "ComboBox.h" +using namespace lmms; + class audioFileProcessor : public Instrument { Q_OBJECT diff --git a/plugins/bit_invader/bit_invader.h b/plugins/bit_invader/bit_invader.h index 475602f47b5..ecd6790aa2f 100644 --- a/plugins/bit_invader/bit_invader.h +++ b/plugins/bit_invader/bit_invader.h @@ -38,6 +38,10 @@ class oscillator; class bitInvaderView; + +using namespace lmms; + + class bSynth { MM_OPERATORS diff --git a/plugins/carlabase/carla.h b/plugins/carlabase/carla.h index b757d09a939..22cc0f74767 100644 --- a/plugins/carlabase/carla.h +++ b/plugins/carlabase/carla.h @@ -32,6 +32,9 @@ class QPushButton; + +using namespace lmms; + class PLUGIN_EXPORT CarlaInstrument : public Instrument { Q_OBJECT diff --git a/plugins/dynamics_processor/dynamics_processor.h b/plugins/dynamics_processor/dynamics_processor.h index cf9d5858662..3328ff4f695 100644 --- a/plugins/dynamics_processor/dynamics_processor.h +++ b/plugins/dynamics_processor/dynamics_processor.h @@ -32,6 +32,9 @@ #include "RmsHelper.h" +using namespace lmms; + + class dynProcEffect : public Effect { public: diff --git a/plugins/dynamics_processor/dynamics_processor_control_dialog.h b/plugins/dynamics_processor/dynamics_processor_control_dialog.h index 9504766d2c9..b5d610174a5 100644 --- a/plugins/dynamics_processor/dynamics_processor_control_dialog.h +++ b/plugins/dynamics_processor/dynamics_processor_control_dialog.h @@ -28,6 +28,8 @@ #include "EffectControlDialog.h" +using namespace lmms; + class dynProcControls; diff --git a/plugins/dynamics_processor/dynamics_processor_controls.h b/plugins/dynamics_processor/dynamics_processor_controls.h index f18c93d93d3..d0a8290f14f 100644 --- a/plugins/dynamics_processor/dynamics_processor_controls.h +++ b/plugins/dynamics_processor/dynamics_processor_controls.h @@ -34,6 +34,9 @@ class dynProcEffect; +using namespace lmms; + + class dynProcControls : public EffectControls { Q_OBJECT diff --git a/plugins/flp_import/FlpImport.h b/plugins/flp_import/FlpImport.h index 18ba3e251db..490b43f2665 100644 --- a/plugins/flp_import/FlpImport.h +++ b/plugins/flp_import/FlpImport.h @@ -37,6 +37,10 @@ class instrument; struct FL_Channel; + +using namespace lmms; + + class FlpImport : public ImportFilter { public: diff --git a/plugins/kicker/KickerOsc.h b/plugins/kicker/KickerOsc.h index bbe0dd584c2..00795f8e4af 100644 --- a/plugins/kicker/KickerOsc.h +++ b/plugins/kicker/KickerOsc.h @@ -34,6 +34,8 @@ #include "MemoryManager.h" +using namespace lmms; + template class KickerOsc { diff --git a/plugins/kicker/kicker.h b/plugins/kicker/kicker.h index c4fd7f41c22..f35916e5755 100644 --- a/plugins/kicker/kicker.h +++ b/plugins/kicker/kicker.h @@ -39,8 +39,13 @@ class kickerInstrumentView; + +namespace lmms +{ class NotePlayHandle; +} +using namespace lmms; class kickerInstrument : public Instrument { diff --git a/plugins/ladspa_browser/ladspa_browser.h b/plugins/ladspa_browser/ladspa_browser.h index fe705b6b86c..aec0b020ecf 100644 --- a/plugins/ladspa_browser/ladspa_browser.h +++ b/plugins/ladspa_browser/ladspa_browser.h @@ -31,8 +31,12 @@ #include "ToolPlugin.h" #include "ToolPluginView.h" +namespace lmms +{ class TabBar; +} +using namespace lmms; class ladspaBrowserView : public ToolPluginView { diff --git a/plugins/ladspa_browser/ladspa_description.h b/plugins/ladspa_browser/ladspa_description.h index 09099b3da5d..27da2c5ba54 100644 --- a/plugins/ladspa_browser/ladspa_description.h +++ b/plugins/ladspa_browser/ladspa_description.h @@ -36,6 +36,8 @@ class QListWidgetItem; class QScrollArea; +using namespace lmms; + class ladspaDescription : public QWidget { Q_OBJECT diff --git a/plugins/ladspa_browser/ladspa_port_dialog.h b/plugins/ladspa_browser/ladspa_port_dialog.h index da14f919330..75ad43bdc4f 100644 --- a/plugins/ladspa_browser/ladspa_port_dialog.h +++ b/plugins/ladspa_browser/ladspa_port_dialog.h @@ -32,6 +32,7 @@ #include "LadspaManager.h" +using namespace lmms; class ladspaPortDialog : public QDialog diff --git a/plugins/lb302/lb302.h b/plugins/lb302/lb302.h index 03cff135d1c..debadd52290 100644 --- a/plugins/lb302/lb302.h +++ b/plugins/lb302/lb302.h @@ -41,10 +41,18 @@ #include "NotePlayHandle.h" #include + +namespace lmms +{ +class NotePlayHandle; +} + +using namespace lmms; + + static const int NUM_FILTERS = 2; class lb302SynthView; -class NotePlayHandle; class lb302FilterKnobState { diff --git a/plugins/lb303/lb303.h b/plugins/lb303/lb303.h index 893cd0acd71..86b6e15e7e0 100644 --- a/plugins/lb303/lb303.h +++ b/plugins/lb303/lb303.h @@ -39,8 +39,15 @@ #include "Knob.h" #include "Mixer.h" -class lb303SynthView; + +namespace lmms +{ class NotePlayHandle; +} + +using namespace lmms; + +class lb303SynthView; class lb303FilterKnobState { diff --git a/plugins/monstro/Monstro.h b/plugins/monstro/Monstro.h index 7061551be0f..6a58cee7ede 100644 --- a/plugins/monstro/Monstro.h +++ b/plugins/monstro/Monstro.h @@ -39,6 +39,8 @@ #include "lmms_math.h" #include "BandLimitedWave.h" +using namespace lmms; + // // UI Macros // diff --git a/plugins/nes/Nes.h b/plugins/nes/Nes.h index 3a75a7c06b2..d14ffc08362 100644 --- a/plugins/nes/Nes.h +++ b/plugins/nes/Nes.h @@ -34,6 +34,8 @@ #include "PixmapButton.h" #include "MemoryManager.h" +using namespace lmms; + #define makeknob( name, x, y, hint, unit, oname ) \ name = new Knob( knobStyled, this ); \ diff --git a/plugins/opl2/opl2instrument.h b/plugins/opl2/opl2instrument.h index b1cce9c3b43..1ee7274a2d3 100644 --- a/plugins/opl2/opl2instrument.h +++ b/plugins/opl2/opl2instrument.h @@ -41,6 +41,9 @@ // The "normal" range for LMMS pitchbends #define DEFAULT_BEND_CENTS 100 + +using namespace lmms; + class opl2instrument : public Instrument { Q_OBJECT diff --git a/plugins/organic/organic.h b/plugins/organic/organic.h index 0cdd49ecdca..50b3907d170 100644 --- a/plugins/organic/organic.h +++ b/plugins/organic/organic.h @@ -35,9 +35,14 @@ class QPixmap; +namespace lmms +{ class Knob; class NotePlayHandle; class PixmapButton; +} + +using namespace lmms; const int NUM_HARMONICS = 18; const QString HARMONIC_NAMES[NUM_HARMONICS] = { diff --git a/plugins/papu/Basic_Gb_Apu.h b/plugins/papu/Basic_Gb_Apu.h index 24b9dc7749d..639fb31a281 100644 --- a/plugins/papu/Basic_Gb_Apu.h +++ b/plugins/papu/Basic_Gb_Apu.h @@ -10,6 +10,8 @@ #include "gb_apu/Multi_Buffer.h" #include "MemoryManager.h" +using namespace lmms; + class Basic_Gb_Apu { MM_OPERATORS public: diff --git a/plugins/papu/papu_instrument.h b/plugins/papu/papu_instrument.h index bf926a40536..ffc418bac65 100644 --- a/plugins/papu/papu_instrument.h +++ b/plugins/papu/papu_instrument.h @@ -33,8 +33,14 @@ #include "Graph.h" class papuInstrumentView; + +namespace lmms +{ class NotePlayHandle; class PixmapButton; +} + +using namespace lmms; class papuInstrument : public Instrument { diff --git a/plugins/patman/patman.h b/plugins/patman/patman.h index c5668262b08..0da475bd71f 100644 --- a/plugins/patman/patman.h +++ b/plugins/patman/patman.h @@ -32,8 +32,12 @@ #include "AutomatableModel.h" #include "MemoryManager.h" +namespace lmms +{ class PixmapButton; +} +using namespace lmms; #define MODES_16BIT ( 1 << 0 ) #define MODES_UNSIGNED ( 1 << 1 ) diff --git a/plugins/peak_controller_effect/peak_controller_effect.h b/plugins/peak_controller_effect/peak_controller_effect.h index cdb24b6f8bf..473124b1935 100644 --- a/plugins/peak_controller_effect/peak_controller_effect.h +++ b/plugins/peak_controller_effect/peak_controller_effect.h @@ -29,6 +29,9 @@ #include "Effect.h" #include "peak_controller_effect_controls.h" + +using namespace lmms; + class PeakControllerEffect : public Effect { public: diff --git a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h index ed832376242..9b4d38d03f3 100644 --- a/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h +++ b/plugins/peak_controller_effect/peak_controller_effect_control_dialog.h @@ -29,9 +29,15 @@ #include "EffectControlDialog.h" class PeakControllerEffectControls; + +namespace lmms +{ class Knob; class LedCheckBox; +} + +using namespace lmms; class PeakControllerEffectControlDialog : public EffectControlDialog { diff --git a/plugins/peak_controller_effect/peak_controller_effect_controls.h b/plugins/peak_controller_effect/peak_controller_effect_controls.h index 9bd671afbec..4cba7b49f17 100644 --- a/plugins/peak_controller_effect/peak_controller_effect_controls.h +++ b/plugins/peak_controller_effect/peak_controller_effect_controls.h @@ -30,8 +30,11 @@ #include "peak_controller_effect_control_dialog.h" #include "Knob.h" + class PeakControllerEffect; +using namespace lmms; + class PeakControllerEffectControls : public EffectControls { Q_OBJECT diff --git a/plugins/sf2_player/patches_dialog.h b/plugins/sf2_player/patches_dialog.h index 3173d9daea9..20bf298dc5d 100644 --- a/plugins/sf2_player/patches_dialog.h +++ b/plugins/sf2_player/patches_dialog.h @@ -33,6 +33,9 @@ #include #include + +using namespace lmms; + //---------------------------------------------------------------------------- // qsynthPresetForm -- UI wrapper form. diff --git a/plugins/sf2_player/sf2_player.h b/plugins/sf2_player/sf2_player.h index 2a6995c01d6..ab839c0bfac 100644 --- a/plugins/sf2_player/sf2_player.h +++ b/plugins/sf2_player/sf2_player.h @@ -41,13 +41,19 @@ class sf2InstrumentView; class sf2Font; -class NotePlayHandle; class patchesDialog; class QLabel; struct SF2PluginData; +namespace lmms +{ +class NotePlayHandle; +} + +using namespace lmms; + class sf2Instrument : public Instrument { Q_OBJECT diff --git a/plugins/sfxr/sfxr.h b/plugins/sfxr/sfxr.h index 4f75c8f16ae..7e7c15eab85 100644 --- a/plugins/sfxr/sfxr.h +++ b/plugins/sfxr/sfxr.h @@ -37,6 +37,8 @@ #include "MemoryManager.h" +using namespace lmms; + enum SfxrWaves { SQR_WAVE, SAW_WAVE, SINE_WAVE, NOISE_WAVE, WAVES_NUM diff --git a/plugins/sid/sid_instrument.h b/plugins/sid/sid_instrument.h index 5e877067510..87ce9e00551 100644 --- a/plugins/sid/sid_instrument.h +++ b/plugins/sid/sid_instrument.h @@ -34,9 +34,16 @@ class sidInstrumentView; + +namespace lmms +{ class NotePlayHandle; class automatableButtonGroup; class PixmapButton; +} + +using namespace lmms; + class voiceObject : public Model { diff --git a/plugins/stereo_enhancer/stereo_enhancer.h b/plugins/stereo_enhancer/stereo_enhancer.h index 931d906a564..4a58559f98e 100644 --- a/plugins/stereo_enhancer/stereo_enhancer.h +++ b/plugins/stereo_enhancer/stereo_enhancer.h @@ -31,6 +31,10 @@ #include "Engine.h" #include "stereoenhancer_controls.h" + +using namespace lmms; + + class stereoEnhancerEffect : public Effect { public: diff --git a/plugins/stereo_enhancer/stereoenhancer_control_dialog.h b/plugins/stereo_enhancer/stereoenhancer_control_dialog.h index 3a98771a278..e43df920bb8 100644 --- a/plugins/stereo_enhancer/stereoenhancer_control_dialog.h +++ b/plugins/stereo_enhancer/stereoenhancer_control_dialog.h @@ -27,6 +27,9 @@ #include "EffectControlDialog.h" +using namespace lmms; + + class stereoEnhancerControls; diff --git a/plugins/stereo_enhancer/stereoenhancer_controls.h b/plugins/stereo_enhancer/stereoenhancer_controls.h index 7448449cf87..e45d14a04c6 100644 --- a/plugins/stereo_enhancer/stereoenhancer_controls.h +++ b/plugins/stereo_enhancer/stereoenhancer_controls.h @@ -29,6 +29,9 @@ #include "stereoenhancer_control_dialog.h" #include "Knob.h" + +using namespace lmms; + class stereoEnhancerEffect; class stereoEnhancerControls : public EffectControls diff --git a/plugins/stereo_matrix/stereo_matrix.h b/plugins/stereo_matrix/stereo_matrix.h index 995d94bf625..3a7386ba877 100644 --- a/plugins/stereo_matrix/stereo_matrix.h +++ b/plugins/stereo_matrix/stereo_matrix.h @@ -29,6 +29,9 @@ #include "Effect.h" #include "stereomatrix_controls.h" + +using namespace lmms; + class stereoMatrixEffect : public Effect { public: diff --git a/plugins/stereo_matrix/stereomatrix_control_dialog.h b/plugins/stereo_matrix/stereomatrix_control_dialog.h index 82d79c59835..c779acbbaee 100644 --- a/plugins/stereo_matrix/stereomatrix_control_dialog.h +++ b/plugins/stereo_matrix/stereomatrix_control_dialog.h @@ -27,6 +27,9 @@ #include "EffectControlDialog.h" +using namespace lmms; + + class stereoMatrixControls; diff --git a/plugins/stereo_matrix/stereomatrix_controls.h b/plugins/stereo_matrix/stereomatrix_controls.h index 8f5443fd100..143e618e083 100644 --- a/plugins/stereo_matrix/stereomatrix_controls.h +++ b/plugins/stereo_matrix/stereomatrix_controls.h @@ -29,8 +29,12 @@ #include "stereomatrix_control_dialog.h" #include "Knob.h" +using namespace lmms; + + class stereoMatrixEffect; + class stereoMatrixControls : public EffectControls { Q_OBJECT diff --git a/plugins/stk/mallets/mallets.h b/plugins/stk/mallets/mallets.h index a194479bf17..dcb7f078fd0 100644 --- a/plugins/stk/mallets/mallets.h +++ b/plugins/stk/mallets/mallets.h @@ -36,6 +36,9 @@ #include "NotePlayHandle.h" #include "LedCheckbox.h" +using namespace lmms; + + // As of Stk 4.4 all classes and types have been moved to the namespace "stk". // However in older versions this namespace does not exist, therefore declare it // so this plugin builds with all versions of Stk. diff --git a/plugins/triple_oscillator/TripleOscillator.h b/plugins/triple_oscillator/TripleOscillator.h index a339fe899a8..f23b89db4db 100644 --- a/plugins/triple_oscillator/TripleOscillator.h +++ b/plugins/triple_oscillator/TripleOscillator.h @@ -31,12 +31,16 @@ #include "Oscillator.h" #include "AutomatableModel.h" - +namespace lmms +{ class automatableButtonGroup; class Knob; class NotePlayHandle; class PixmapButton; class SampleBuffer; +} + +using namespace lmms; const int NUM_OF_OSCILLATORS = 3; diff --git a/plugins/vestige/vestige.h b/plugins/vestige/vestige.h index 328c5e4a5cd..1da724cc8fd 100644 --- a/plugins/vestige/vestige.h +++ b/plugins/vestige/vestige.h @@ -43,9 +43,16 @@ class QPixmap; class QPushButton; -class PixmapButton; class VstPlugin; +namespace lmms +{ +class PixmapButton; +} + +using namespace lmms; + + class vestigeInstrument : public Instrument { diff --git a/plugins/vibed/nine_button_selector.h b/plugins/vibed/nine_button_selector.h index 6adc47b673a..49751c3ef27 100644 --- a/plugins/vibed/nine_button_selector.h +++ b/plugins/vibed/nine_button_selector.h @@ -27,6 +27,7 @@ #include "PixmapButton.h" +using namespace lmms; class nineButtonSelector: public QWidget , public IntModelView { diff --git a/plugins/vibed/string_container.h b/plugins/vibed/string_container.h index 7d15e3dfe1e..cad23ed6d36 100644 --- a/plugins/vibed/string_container.h +++ b/plugins/vibed/string_container.h @@ -29,6 +29,7 @@ #include "vibrating_string.h" #include "MemoryManager.h" +using namespace lmms; class stringContainer { diff --git a/plugins/vibed/vibed.h b/plugins/vibed/vibed.h index e4c8e4a14de..b15e9968cf4 100644 --- a/plugins/vibed/vibed.h +++ b/plugins/vibed/vibed.h @@ -33,7 +33,14 @@ #include "nine_button_selector.h" class vibedView; + +namespace lmms +{ class NotePlayHandle; +} + +using namespace lmms; + class vibed : public Instrument { diff --git a/plugins/vibed/vibrating_string.h b/plugins/vibed/vibrating_string.h index a315a401610..59441ae8eea 100644 --- a/plugins/vibed/vibrating_string.h +++ b/plugins/vibed/vibrating_string.h @@ -29,6 +29,8 @@ #include "lmms_basics.h" +using namespace lmms; + class vibratingString { diff --git a/plugins/vst_base/VstPlugin.h b/plugins/vst_base/VstPlugin.h index 1ce6b9b22cd..344cfe09811 100644 --- a/plugins/vst_base/VstPlugin.h +++ b/plugins/vst_base/VstPlugin.h @@ -36,6 +36,8 @@ #include "JournallingObject.h" #include "communication.h" +using namespace lmms; + class PLUGIN_EXPORT VstPlugin : public QObject, public JournallingObject, public RemotePlugin diff --git a/plugins/vst_base/communication.h b/plugins/vst_base/communication.h index 6786b11896b..6c480258ad8 100644 --- a/plugins/vst_base/communication.h +++ b/plugins/vst_base/communication.h @@ -29,6 +29,7 @@ #include "RemotePlugin.h" +using namespace lmms; struct VstParameterDumpItem { diff --git a/plugins/vst_base/vst_base.cpp b/plugins/vst_base/vst_base.cpp index 70b0f2af249..3cbbdb84de3 100644 --- a/plugins/vst_base/vst_base.cpp +++ b/plugins/vst_base/vst_base.cpp @@ -27,6 +27,7 @@ #include "Plugin.h" #include "embed.h" +using namespace lmms; extern "C" { diff --git a/plugins/watsyn/Watsyn.h b/plugins/watsyn/Watsyn.h index 31e3625db81..f3fb7ff8be1 100644 --- a/plugins/watsyn/Watsyn.h +++ b/plugins/watsyn/Watsyn.h @@ -37,6 +37,7 @@ #include #include "MemoryManager.h" +using namespace lmms; #define makeknob( name, x, y, hint, unit, oname ) \ name = new Knob( knobStyled, this ); \ diff --git a/plugins/waveshaper/waveshaper.h b/plugins/waveshaper/waveshaper.h index a97603f5229..55d3c0436c1 100644 --- a/plugins/waveshaper/waveshaper.h +++ b/plugins/waveshaper/waveshaper.h @@ -30,6 +30,7 @@ #include "Effect.h" #include "waveshaper_controls.h" +using namespace lmms; class waveShaperEffect : public Effect diff --git a/plugins/waveshaper/waveshaper_control_dialog.h b/plugins/waveshaper/waveshaper_control_dialog.h index 37d08b3a7ac..28a9bc0cbe7 100644 --- a/plugins/waveshaper/waveshaper_control_dialog.h +++ b/plugins/waveshaper/waveshaper_control_dialog.h @@ -28,6 +28,7 @@ #include "EffectControlDialog.h" +using namespace lmms; class waveShaperControls; diff --git a/plugins/waveshaper/waveshaper_controls.h b/plugins/waveshaper/waveshaper_controls.h index db54e527336..d2762026c9d 100644 --- a/plugins/waveshaper/waveshaper_controls.h +++ b/plugins/waveshaper/waveshaper_controls.h @@ -31,6 +31,9 @@ #include "Knob.h" #include "Graph.h" +using namespace lmms; + + class waveShaperEffect; diff --git a/plugins/zynaddsubfx/LocalZynAddSubFx.h b/plugins/zynaddsubfx/LocalZynAddSubFx.h index f4e3b8ff314..1110584be0b 100644 --- a/plugins/zynaddsubfx/LocalZynAddSubFx.h +++ b/plugins/zynaddsubfx/LocalZynAddSubFx.h @@ -28,6 +28,8 @@ #include "MidiEvent.h" #include "Note.h" +using namespace lmms; + class Master; class NulEngine; diff --git a/plugins/zynaddsubfx/RemoteZynAddSubFx.h b/plugins/zynaddsubfx/RemoteZynAddSubFx.h index d33ce158505..91e14e5887c 100644 --- a/plugins/zynaddsubfx/RemoteZynAddSubFx.h +++ b/plugins/zynaddsubfx/RemoteZynAddSubFx.h @@ -27,6 +27,8 @@ #include "RemotePlugin.h" +using namespace lmms; + enum ZasfRemoteMessageIDs { IdZasfPresetDirectory = IdUserBase, diff --git a/plugins/zynaddsubfx/ZynAddSubFx.h b/plugins/zynaddsubfx/ZynAddSubFx.h index 76073ce23b2..f0539a83c55 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.h +++ b/plugins/zynaddsubfx/ZynAddSubFx.h @@ -39,9 +39,15 @@ class QPushButton; class LocalZynAddSubFx; class ZynAddSubFxView; + +namespace lmms +{ class NotePlayHandle; class Knob; class LedCheckBox; +} + +using namespace lmms; class ZynAddSubFxRemotePlugin : public QObject, public RemotePlugin From 870ee163d084d64513a996f2b833e2ffcdb86e52 Mon Sep 17 00:00:00 2001 From: Colin Wallace Date: Wed, 20 May 2015 18:56:46 +0000 Subject: [PATCH 6/6] Update theme to work with namespace change --- data/themes/default/style.css | 74 +++++++++++++++++------------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/data/themes/default/style.css b/data/themes/default/style.css index f54b635893e..36000240798 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -11,7 +11,7 @@ QMdiArea { background-image: url(resources:background_artwork.png); } -AutomationEditor { +lmms--AutomationEditor { background-color: rgb(0, 0, 0); color: #e0e0e0; qproperty-vertexColor: #ff77af; @@ -51,7 +51,7 @@ QToolTip { color: #4afd85; } -TextFloat { +lmms--TextFloat { border-radius: 4px; background: qlineargradient(spread:reflect, x1:0.5, y1:0.5, x2:0.5, y2:0, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(50, 50, 50, 220)); opacity: 175; @@ -109,7 +109,7 @@ QMenu::indicator:selected { background-color: #747474; } -PianoRoll { +lmms--PianoRoll { background-color: rgb(0, 0, 0); qproperty-gridColor: rgb( 128, 128, 128 ); qproperty-noteModeColor: rgb( 255, 255, 255 ); @@ -119,14 +119,14 @@ PianoRoll { /* main toolbar oscilloscope - can have transparent bg now */ -VisualizationWidget { +lmms--VisualizationWidget { background: none; border: none; } /* main toolbar cpu load widget - this can have transparent bg now */ -CPULoadWidget { +lmms--CPULoadWidget { border: none; background: url(resources:cpuload_bg.png); } @@ -255,13 +255,13 @@ QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarr /* background for song editor and bb-editor */ -TrackContainerView QFrame{ +lmms--TrackContainerView QFrame { background-color: #49515b; } /* autoscroll, loop, stop behaviour toggle buttons */ -NStateButton { +lmms--NStateButton { max-height: 26px; max-width: 26px; min-height: 26px; @@ -269,7 +269,7 @@ NStateButton { } /* track background colors */ -TrackContentWidget { +lmms--TrackContentWidget { qproperty-darkerColor: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgb( 50, 50, 50 ), stop:0.33 rgb( 20, 20, 20 ), stop:1 rgb( 15, 15, 15 ) ); qproperty-lighterColor: qlineargradient(x1:0, y1:0, x2:0, y2:1, @@ -279,7 +279,7 @@ TrackContentWidget { /* gear button in tracks */ -TrackOperationsWidget > QPushButton { +lmms--TrackOperationsWidget > QPushButton { max-height: 26px; max-width: 26px; min-height: 26px; @@ -288,7 +288,7 @@ TrackOperationsWidget > QPushButton { border:none; } -TrackOperationsWidget > QPushButton::menu-indicator { +lmms--TrackOperationsWidget > QPushButton::menu-indicator { image: url(resources:trackop.png); subcontrol-origin: padding; subcontrol-position: center; @@ -296,13 +296,13 @@ TrackOperationsWidget > QPushButton::menu-indicator { top: 2px; } -TrackOperationsWidget > QPushButton::menu-indicator:hover { +lmms--TrackOperationsWidget > QPushButton::menu-indicator:hover { image: url(resources:trackop_h.png); } -TrackOperationsWidget > QPushButton::menu-indicator:pressed, -TrackOperationsWidget > QPushButton::menu-indicator:checked +lmms--TrackOperationsWidget > QPushButton::menu-indicator:pressed, +lmms--TrackOperationsWidget > QPushButton::menu-indicator:checked { image: url(resources:trackop_c.png); position: relative; @@ -317,13 +317,13 @@ TrackOperationsWidget > QPushButton::menu-indicator:checked /* font sizes */ -nameLabel, effectLabel, sf2InstrumentView > QLabel { +lmms--nameLabel, lmms--effectLabel, sf2InstrumentView > QLabel { font-size:10px; } /* main toolbar sliders (master vol, master pitch) */ -AutomatableSlider::groove:vertical { +lmms--AutomatableSlider::groove:vertical { background: rgba(0,0,0, 128); border: 1px inset rgba(100,100,100, 64); border-radius: 2px; @@ -331,7 +331,7 @@ AutomatableSlider::groove:vertical { margin: 2px 2px; } -AutomatableSlider::handle:vertical { +lmms--AutomatableSlider::handle:vertical { background: none; border-image: url(resources:main_slider.png); width: 26px; @@ -342,13 +342,13 @@ AutomatableSlider::handle:vertical { /* window that shows up when you add effects */ -EffectSelectDialog QScrollArea { +lmms--EffectSelectDialog QScrollArea { background: #5b6571; } /* the inner boxes in LADSPA effect windows */ -EffectControlDialog QGroupBox { +lmms--EffectControlDialog QGroupBox { background: #49515b; margin-top: 1ex; padding: 10px 2px 1px; @@ -358,7 +358,7 @@ EffectControlDialog QGroupBox { /* the inner box titles when present (channel 1, channel 2...) */ -EffectControlDialog QGroupBox::title { +lmms--EffectControlDialog QGroupBox::title { subcontrol-origin: margin; subcontrol-position: top left; background: #7b838d; @@ -436,7 +436,7 @@ QToolButton:checked { /* track label buttons - the part that contains the icon and track title */ -TrackLabelButton { +lmms--TrackLabelButton { background-color: #5b6571; color: #c9c9c9; font-size: 11px; @@ -446,7 +446,7 @@ TrackLabelButton { padding: 2px 1px; } -TrackLabelButton:hover { +lmms--TrackLabelButton:hover { background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 #5b6571, stop:0.75 #7b838d, stop:1 #7b838d ); color: white; border: 1px solid rgba(0,0,0,64); @@ -454,7 +454,7 @@ TrackLabelButton:hover { margin: 0px; } -TrackLabelButton:pressed { +lmms--TrackLabelButton:pressed { background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.3 #5b6571, stop:1 #6b7581 ); color: white; border: 1px solid rgba(0,0,0,64); @@ -462,7 +462,7 @@ TrackLabelButton:pressed { font-weight: bold; } -TrackLabelButton:checked { +lmms--TrackLabelButton:checked { background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.3 #5b6571, stop:1 #6b7581 ); color: white; border: 1px solid rgba(0,0,0,128); @@ -470,31 +470,31 @@ TrackLabelButton:checked { font-weight: bold; } -TrackLabelButton:checked:hover { +lmms--TrackLabelButton:checked:hover { background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:0.5, stop:0 #5b6571, stop:0.75 #7b838d, stop:1 #7b838d ); } -TrackLabelButton:checked:pressed { +lmms--TrackLabelButton:checked:pressed { background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.3 #5b6571, stop:1 #6b7581 ); } /* sidebar, sidebar buttons */ -SideBar { +lmms--SideBar { background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop: 0 #98a2a7, stop: 1.0 #5b646f); } -SideBar QToolButton { +lmms--SideBar QToolButton { font-size: 12px; } /* font sizes for text buttons */ -FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton { +lmms--FxMixerView QPushButton, lmms--EffectRackView QPushButton, lmms--ControllerRackView QPushButton { font-size: 10px; } -FxLine { +lmms--FxLine { background: #5b6571; color: #e0e0e0; qproperty-backgroundActive: qlineargradient(spread:reflect, x1:0, y1:0, x2:1, y2:0, @@ -502,12 +502,12 @@ FxLine { } /* persistent peak markers for fx peak meters */ -Fader { +lmms--Fader { qproperty-peakGreen: rgb( 74, 253, 133); qproperty-peakRed: rgb( 255, 100, 100); } -TimeLine { +lmms--TimeLine { font-size: 8px; } @@ -515,7 +515,7 @@ QTreeView { alternate-background-color: #747474; } -TrackContainerView QLabel +lmms--TrackContainerView QLabel { background: none; } @@ -523,28 +523,28 @@ TrackContainerView QLabel /* Patterns */ /* instrument pattern */ -PatternView { +lmms--PatternView { color: rgb( 119, 199, 216 ); qproperty-fgColor: rgb( 187, 227, 236 ); qproperty-textColor: rgb( 255, 255, 255 ); } /* sample track pattern */ -SampleTCOView { +lmms--SampleTCOView { color: rgb( 74, 253, 133 ); qproperty-fgColor: rgb( 187, 227, 236 ); qproperty-textColor: rgb( 255, 60, 60 ); } /* automation pattern */ -AutomationPatternView { +lmms--AutomationPatternView { color: #99afff; qproperty-fgColor: rgb( 204, 215, 255 ); qproperty-textColor: rgb( 255, 255, 255 ); } /* bb-pattern */ -BBTCOView { +lmms--BBTCOView { color: rgb( 128, 182, 175 ); /* default colour for bb-tracks, used when the colour hasn't been defined by the user */ qproperty-textColor: rgb( 255, 255, 255 ); } @@ -747,7 +747,7 @@ NesInstrumentView Knob { /* palette information */ -LmmsPalette { +lmms--LmmsPalette { qproperty-background: #5b6571; qproperty-windowText: #f0f0f0; qproperty-base: #808080;