From dfbbcfd38bb03cf279017cf2b213d7fc7e3462ca Mon Sep 17 00:00:00 2001 From: Dave French Date: Fri, 23 Jan 2015 02:38:17 +0000 Subject: [PATCH] 1416 tidy up --- include/AutomationEditor.h | 1 - include/AutomationTrack.h | 1 - src/gui/editors/AutomationEditor.cpp | 3 +-- src/tracks/AutomationTrack.cpp | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/AutomationEditor.h b/include/AutomationEditor.h index 45abfd932..eca52d2c6 100644 --- a/include/AutomationEditor.h +++ b/include/AutomationEditor.h @@ -70,7 +70,6 @@ public: virtual void saveSettings(QDomDocument & doc, QDomElement & parent); virtual void loadSettings(const QDomElement & parent); - QString nodeName() const { return "automationeditor"; diff --git a/include/AutomationTrack.h b/include/AutomationTrack.h index f805f1344..b8d3da38d 100644 --- a/include/AutomationTrack.h +++ b/include/AutomationTrack.h @@ -52,7 +52,6 @@ public: QDomElement & _parent ); virtual void loadTrackSpecificSettings( const QDomElement & _this ); - private: friend class AutomationTrackView; diff --git a/src/gui/editors/AutomationEditor.cpp b/src/gui/editors/AutomationEditor.cpp index 4558ff7f0..9cfb70b12 100644 --- a/src/gui/editors/AutomationEditor.cpp +++ b/src/gui/editors/AutomationEditor.cpp @@ -241,7 +241,6 @@ void AutomationEditor::loadSettings( const QDomElement & dom_parent) - // qproperty access methods QColor AutomationEditor::gridColor() const @@ -2301,9 +2300,9 @@ void AutomationEditorWindow::dropEvent(QDropEvent *_de) { m_editor->m_pattern->objectDestroyed( m_editor->m_pattern->firstObject()->id() ); } + m_editor->m_pattern->clear(); m_editor->m_pattern->addObject( mod ); setCurrentPattern( m_editor->m_pattern ); - } } diff --git a/src/tracks/AutomationTrack.cpp b/src/tracks/AutomationTrack.cpp index 1b552aba3..2b397862d 100644 --- a/src/tracks/AutomationTrack.cpp +++ b/src/tracks/AutomationTrack.cpp @@ -127,7 +127,6 @@ void AutomationTrack::loadTrackSpecificSettings( const QDomElement & _this ) - AutomationTrackView::AutomationTrackView( AutomationTrack * _at, TrackContainerView* tcv ) : TrackView( _at, tcv ) {