diff data/fileio/MIDIFileReader.cpp @ 1037:bf0e5944289b cxx11

Merge from default branch

--- a/data/fileio/MIDIFileReader.cpp	Mon Feb 09 10:31:07 2015 +0000
+++ b/data/fileio/MIDIFileReader.cpp	Tue Mar 03 09:33:59 2015 +0000
@@ -36,6 +36,7 @@
 #include "model/NoteModel.h"
 
 #include <QString>
+#include <QFileInfo>
 
 #include <sstream>
 
@@ -932,6 +933,7 @@
     if (!model) {
 	model = new NoteModel(m_mainModelSampleRate, 1, 0.0, 0.0, false);
 	model->setValueQuantization(1.0);
+        model->setObjectName(QFileInfo(m_path).fileName());
     }
 
     const MIDITrack &track = m_midiComposition.find(trackToLoad)->second;