hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Replace every use of the foreach macro with a C++11 range-based for loop

Browse Source 
This prevents a race condition with Qt5. A foreach loop makes a copy of its
Qt container, increasing the reference count to the container's internal
data. Qt5 often asserts isDetached(), which requires the reference count to
be <= 1. This assertion fails when the foreach loop increases the reference
count at exactly the wrong moment. Using a range-based for loop prevents an
unnecessary copy from being made and ensures this race condition isn't
triggered.
This commit is contained in:
Fastigium
2016-03-11 16:35:48 +01:00
parent ac67f2adb8
commit 3c7bfbac64
16 changed files with 27 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/MidiExport/MidiExport.cpp
View File

@@ -83,7 +83,7 @@ bool MidiExport::tryExport( const TrackContainer::TrackList &tracks, int tempo,
uint8_t buffer[BUFFER_SIZE];
uint32_t size;
foreach( Track* track, tracks ) if( track->type() == Track::InstrumentTrack ) nTracks++;
for( const Track* track : tracks ) if( track->type() == Track::InstrumentTrack ) nTracks++;
// midi header
MidiFile::MIDIHeader header(nTracks);
@@ -91,7 +91,7 @@ bool MidiExport::tryExport( const TrackContainer::TrackList &tracks, int tempo,
midiout.writeRawData((char *)buffer, size);
// midi tracks
foreach( Track* track, tracks )
for( Track* track : tracks )
{
DataFile dataFile( DataFile::SongProject );
MidiFile::MIDITrack<BUFFER_SIZE> mtrack;

2
plugins/zynaddsubfx/ZynAddSubFx.cpp
View File

@@ -262,7 +262,7 @@ void ZynAddSubFxInstrument::loadSettings( const QDomElement & _this )
m_pluginMutex.unlock();
m_modifiedControllers.clear();
foreach( const QString & c, _this.attribute( "modifiedcontrollers" ).split( ',' ) )
for( const QString & c : _this.attribute( "modifiedcontrollers" ).split( ',' ) )
{
if( !c.isEmpty() )
{