From 7c02f0a5a3280dbb488103464277f5df5eb65834 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Mon, 30 Jun 2008 16:55:51 +0000
Subject: [PATCH] * removed obsolete static members * more simple
 QPen-initialization for not making Qt leak

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1237 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog          | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 include/track.h    |  4 ----
 src/core/track.cpp | 16 ++--------------
 3 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index efa4c5569..5aaa8a8ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,53 @@
 2008-06-30	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* include/track.h:
+	* src/core/track.cpp:
+	- removed obsolete static members
+	- more simple QPen-initialization for not making Qt leak
+
+	* include/combobox_model.h:
+	pass _default_constructed-parameter to base-class
+
+	* src/gui/lfo_controller_dialog.cpp:
+	renamed constants so one-unit-compiling is possible
+
+	* src/gui/widgets/envelope_and_lfo_view.cpp:
+	* src/core/envelope_and_lfo_parameters.cpp:
+	do not duplicate constants
+
+	* src/gui/widgets/group_box.cpp:
+	make sure LED's default-model is being deleted when changing model
+
+	* src/core/plugin.cpp:
+	made initialization of dummy-plugin pixmap-loder static
+
+	* src/core/mixer.cpp:
+	properly terminate worker-threads at mixer-destruction
+
+	* src/core/main.cpp:
+	fixed various leaks
+
+	* src/core/mmp.cpp:
+	replaced compat-code by proper code in multimediaProject::upgrade()
+
+	* src/core/effect.cpp:
+	added missing initialization of m_processors member variable
+
+	* src/core/instrument_functions.cpp:
+	removed obsolete constants
+
+	* src/core/sample_buffer.cpp:
+	fixed broken logic when updating sample-data
+
+	* src/core/automation_pattern.cpp:
+	in automationPattern::valueAt() check whether the time-map is empty
+
+	* src/core/fx_mixer.cpp:
+	save/load mute-settings for FX-lines
+
+	* src/core/peak_controller.cpp:
+	return default-value if there's no peak-effect
+
 	* configure.in:
 	* Makefile.am:
 	* include/sample_buffer.h:
diff --git a/include/track.h b/include/track.h
index 754227679..14a82c92e 100644
--- a/include/track.h
+++ b/include/track.h
@@ -307,10 +307,6 @@ private slots:
 
 private:
 	static QPixmap * s_grip;
-	static QPixmap * s_muteOffDisabled;
-	static QPixmap * s_muteOffEnabled;
-	static QPixmap * s_muteOnDisabled;
-	static QPixmap * s_muteOnEnabled;
 
 	trackView * m_trackView;
 
diff --git a/src/core/track.cpp b/src/core/track.cpp
index 87e417434..ef9f6d495 100644
--- a/src/core/track.cpp
+++ b/src/core/track.cpp
@@ -1174,7 +1174,7 @@ void trackContentWidget::paintEvent( QPaintEvent * _pe )
 		
 		// draw vertical lines
 		//pmp.setPen( QPen( QBrush( QColor( 80, 84, 96, 192 ) ), 1 ) );
-		pmp.setPen( QPen( QBrush( QColor( 0,0,0, 112 ) ), 1 ) );
+		pmp.setPen( QPen( QColor( 0,0,0, 112 ), 1 ) );
 		for( float x = 0.5; x < w * 2; x += ppt )
 		{
 			pmp.drawLine( QLineF( x, 1.0, x, h-2.0 ) );
@@ -1182,7 +1182,7 @@ void trackContentWidget::paintEvent( QPaintEvent * _pe )
 		//pmp.setPen( QPen( QColor( 255,0,0, 128 ), 1 ) );
 		pmp.drawLine( 0, 1, w*2, 1 );
 
-		pmp.setPen( QPen( QBrush( QColor( 255,255,255, 32 ) ), 1 ) );
+		pmp.setPen( QPen( QColor( 255,255,255, 32 ), 1 ) );
 		for( float x = 1.5; x < w * 2; x += ppt )
 		{
 			pmp.drawLine( QLineF( x, 1.0, x, h-2.0 ) );
@@ -1336,10 +1336,6 @@ midiTime trackContentWidget::endPosition( const midiTime & _pos_start )
 
 
 QPixmap * trackOperationsWidget::s_grip = NULL;     /*!< grip pixmap */
-QPixmap * trackOperationsWidget::s_muteOffDisabled; /*!< Mute off and disabled pixmap */
-QPixmap * trackOperationsWidget::s_muteOffEnabled;  /*!< Mute off but enabled pixmap */
-QPixmap * trackOperationsWidget::s_muteOnDisabled;  /*!< Mute on but disabled pixmap */
-QPixmap * trackOperationsWidget::s_muteOnEnabled;   /*!< Mute on and enabled pixmap */
 
 
 /*! \brief Create a new trackOperationsWidget
@@ -1356,14 +1352,6 @@ trackOperationsWidget::trackOperationsWidget( trackView * _parent ) :
 	{
 		s_grip = new QPixmap( embed::getIconPixmap(
 							"track_op_grip" ) );
-/*		s_muteOffDisabled = new QPixmap( embed::getIconPixmap(
-							"mute_off_disabled" ) );
-		s_muteOffEnabled = new QPixmap( embed::getIconPixmap(
-							"mute_off" ) );
-		s_muteOnDisabled = new QPixmap( embed::getIconPixmap(
-							"mute_on_disabled" ) );
-		s_muteOnEnabled = new QPixmap( embed::getIconPixmap(
-							"mute_on" ) );*/
 	}
 
 	toolTip::add( this, tr( "Press <Ctrl> while clicking on move-grip "