Fix memory leaks

include/AutomationClipView.h

@@ -74,9 +74,6 @@ protected slots:
 	QPixmap m_paintPixmap;
 
 	QStaticText m_staticTextName;
-
-	static QPixmap * s_clip_rec;
-
 	void scaleTimemapToFit( float oldMin, float oldMax );
 } ;
 

include/AutomationEditor.h

@@ -187,13 +187,13 @@ protected slots:
 	AutomationEditor( const AutomationEditor & );
 	~AutomationEditor() override;
 
-	static QPixmap * s_toolDraw;
-	static QPixmap * s_toolErase;
-	static QPixmap * s_toolDrawOut;
-	static QPixmap * s_toolEditTangents;
-	static QPixmap * s_toolMove;
-	static QPixmap * s_toolYFlip;
-	static QPixmap * s_toolXFlip;
+	QPixmap* m_toolDraw;
+	QPixmap* m_toolErase;
+	QPixmap* m_toolDrawOut;
+	QPixmap* m_toolEditTangents;
+	QPixmap* m_toolMove;
+	QPixmap* m_toolYFlip;
+	QPixmap* m_toolXFlip;
 
 	ComboBoxModel m_zoomingXModel;
 	ComboBoxModel m_zoomingYModel;

include/ComboBox.h

@@ -66,9 +66,9 @@ public slots:
 
 
 private:
-	static QPixmap* s_background;
-	static QPixmap* s_arrow;
-	static QPixmap* s_arrowSelected;
+	QPixmap* m_background;
+	QPixmap* m_arrow;
+	QPixmap* m_arrowSelected;
 
 	QMenu m_menu;
 

include/EnvelopeAndLfoView.h

@@ -71,8 +71,8 @@ protected slots:
 
 
 private:
-	static QPixmap * s_envGraph;
-	static QPixmap * s_lfoGraph;
+	QPixmap* m_envGraph;
+	QPixmap* m_lfoGraph;
 
 	EnvelopeAndLfoParameters * m_params;
 

include/Fader.h

@@ -151,10 +151,6 @@ class LMMS_EXPORT Fader : public QWidget, public FloatModelView
 	QElapsedTimer m_lastPeakTimer_L;
 	QElapsedTimer m_lastPeakTimer_R;
 
-	static QPixmap * s_back;
-	static QPixmap * s_leds;
-	static QPixmap * s_knob;
-
 	QPixmap * m_back;
 	QPixmap * m_leds;
 	QPixmap * m_knob;

include/FileBrowser.h

@@ -197,14 +197,12 @@ class Directory : public QTreeWidgetItem
 
 
 private:
-	void initPixmaps();
-
 	bool addItems( const QString & path );
 
 
-	static QPixmap * s_folderPixmap;
-	static QPixmap * s_folderOpenedPixmap;
-	static QPixmap * s_folderLockedPixmap;
+	QPixmap* m_folderPixmap;
+	QPixmap* m_folderOpenedPixmap;
+	QPixmap* m_folderLockedPixmap;
 
 	//! Directories that lead here
 	//! Initially, this is just set to the current path of a directory

include/LedCheckBox.h

@@ -69,8 +69,8 @@ class LMMS_EXPORT LedCheckBox : public AutomatableButton
 
 
 private:
-	QPixmap * m_ledOnPixmap;
-	QPixmap * m_ledOffPixmap;
+	QPixmap* m_ledOnPixmap;
+	QPixmap* m_ledOffPixmap;
 
 	QString m_text;
 

include/MixerLine.h

@@ -94,8 +94,6 @@ class MixerLine : public QWidget
 	QColor m_strokeOuterInactive;
 	QColor m_strokeInnerActive;
 	QColor m_strokeInnerInactive;
-	static QPixmap * s_sendBgArrow;
-	static QPixmap * s_receiveBgArrow;
 	bool m_inRename;
 	QLineEdit * m_renameLineEdit;
 	QGraphicsView * m_view;

include/PianoRoll.h

@@ -339,12 +339,12 @@ protected slots:
 	static const int cm_scrollAmtHoriz = 10;
 	static const int cm_scrollAmtVert = 1;
 
-	static QPixmap * s_toolDraw;
-	static QPixmap * s_toolErase;
-	static QPixmap * s_toolSelect;
-	static QPixmap * s_toolMove;
-	static QPixmap * s_toolOpen;
-	static QPixmap* s_toolKnife;
+	QPixmap* m_toolDraw;
+	QPixmap* m_toolErase;
+	QPixmap* m_toolSelect;
+	QPixmap* m_toolMove;
+	QPixmap* m_toolOpen;
+	QPixmap* m_toolKnife;
 
 	static std::array<KeyType, 12> prKeyOrder;
 

include/PianoView.h

@@ -73,12 +73,12 @@ class PianoView : public QWidget, public ModelView
 	int getKeyHeight(int key_num) const;
 	IntModel *getNearestMarker(int key, QString* title = nullptr);
 
-	static QPixmap * s_whiteKeyPm;
-	static QPixmap * s_blackKeyPm;
-	static QPixmap * s_whiteKeyPressedPm;
-	static QPixmap * s_blackKeyPressedPm;
-	static QPixmap * s_whiteKeyDisabledPm;
-	static QPixmap * s_blackKeyDisabledPm;
+	QPixmap* m_whiteKeyPm;
+	QPixmap* m_blackKeyPm;
+	QPixmap* m_whiteKeyPressedPm;
+	QPixmap* m_blackKeyPressedPm;
+	QPixmap* m_whiteKeyDisabledPm;
+	QPixmap* m_blackKeyDisabledPm;
 
 	Piano * m_piano;
 

include/SendButtonIndicator.h

@@ -53,8 +53,8 @@ class SendButtonIndicator : public QLabel
 
 	MixerLine * m_parent;
 	MixerView * m_mv;
-	static QPixmap * s_qpmOn;
-	static QPixmap * s_qpmOff;
+	QPixmap* m_qpmOn;
+	QPixmap* m_qpmOff;
 
 	FloatModel * getSendModel();
 };

include/TimeLineWidget.h

@@ -205,7 +205,7 @@ public slots:
 
 
 private:
-	static QPixmap * s_posMarkerPixmap;
+	QPixmap* m_posMarkerPixmap;
 
 	QColor m_inactiveLoopColor;
 	QBrush m_inactiveLoopBrush;

plugins/AudioFileProcessor/AudioFileProcessor.cpp

@@ -447,19 +447,12 @@ namespace gui
 {
 
 
-QPixmap * AudioFileProcessorView::s_artwork = nullptr;
 
 
 AudioFileProcessorView::AudioFileProcessorView( Instrument * _instrument,
 							QWidget * _parent ) :
 	InstrumentViewFixedSize( _instrument, _parent )
 {
-	if( s_artwork == nullptr )
-	{
-		s_artwork = new QPixmap( PLUGIN_NAME::getIconPixmap(
-								"artwork" ) );
-	}
-
 	m_openAudioFileButton = new PixmapButton( this );
 	m_openAudioFileButton->setCursor( QCursor( Qt::PointingHandCursor ) );
 	m_openAudioFileButton->move( 227, 72 );
@@ -645,7 +638,8 @@ void AudioFileProcessorView::paintEvent( QPaintEvent * )
 {
 	QPainter p( this );
 
-	p.drawPixmap( 0, 0, *s_artwork );
+	static auto s_artwork = PLUGIN_NAME::getIconPixmap("artwork");
+	p.drawPixmap(0, 0, s_artwork);
 
 	auto a = castModel<AudioFileProcessor>();
 

plugins/AudioFileProcessor/AudioFileProcessor.h

@@ -145,7 +145,6 @@ protected slots:
 private:
 	virtual void modelChanged();
 
-	static QPixmap * s_artwork;
 
 	AudioFileProcessorWaveView * m_waveView;
 	Knob * m_ampKnob;

plugins/Eq/EqControlsDialog.cpp

@@ -72,17 +72,17 @@ EqControlsDialog::EqControlsDialog( EqControls *controls ) :
 	setBand( 6, &controls->m_highShelfActiveModel, &controls->m_highShelfFreqModel, &controls->m_highShelfResModel, &controls->m_highShelfGainModel, QColor(255 ,255, 255), tr( "High-shelf" ), &controls->m_highShelfPeakL, &controls->m_highShelfPeakR,0,0,0,0,0,0 );
 	setBand( 7, &controls->m_lpActiveModel, &controls->m_lpFreqModel, &controls->m_lpResModel, 0, QColor(255 ,255, 255), tr( "LP" ) ,0,0,0,0,0, &controls->m_lp12Model, &controls->m_lp24Model, &controls->m_lp48Model);
 
-	auto faderBg = new QPixmap(PLUGIN_NAME::getIconPixmap("faderback"));
-	auto faderLeds = new QPixmap(PLUGIN_NAME::getIconPixmap("faderleds"));
-	auto faderKnob = new QPixmap(PLUGIN_NAME::getIconPixmap("faderknob"));
+	static auto s_faderBg = PLUGIN_NAME::getIconPixmap("faderback");
+	static auto s_faderLeds = PLUGIN_NAME::getIconPixmap("faderleds");
+	static auto s_faderKnob = PLUGIN_NAME::getIconPixmap("faderknob");
 
-	auto GainFaderIn = new EqFader(&controls->m_inGainModel, tr("Input gain"), this, faderBg, faderLeds, faderKnob,
+	auto GainFaderIn = new EqFader(&controls->m_inGainModel, tr("Input gain"), this, &s_faderBg, &s_faderLeds, &s_faderKnob,
 		&controls->m_inPeakL, &controls->m_inPeakR);
 	GainFaderIn->move( 23, 295 );
 	GainFaderIn->setDisplayConversion( false );
 	GainFaderIn->setHintText( tr( "Gain" ), "dBv");
 
-	auto GainFaderOut = new EqFader(&controls->m_outGainModel, tr("Output gain"), this, faderBg, faderLeds, faderKnob,
+	auto GainFaderOut = new EqFader(&controls->m_outGainModel, tr("Output gain"), this, &s_faderBg, &s_faderLeds, &s_faderKnob,
 		&controls->m_outPeakL, &controls->m_outPeakR);
 	GainFaderOut->move( 453, 295);
 	GainFaderOut->setDisplayConversion( false );
@@ -92,8 +92,8 @@ EqControlsDialog::EqControlsDialog( EqControls *controls ) :
 	int distance = 126;
 	for( int i = 1; i < m_parameterWidget->bandCount() - 1; i++ )
 	{
-		auto gainFader = new EqFader(m_parameterWidget->getBandModels(i)->gain, tr(""), this, faderBg, faderLeds,
-			faderKnob, m_parameterWidget->getBandModels(i)->peakL, m_parameterWidget->getBandModels(i)->peakR);
+		auto gainFader = new EqFader(m_parameterWidget->getBandModels(i)->gain, tr(""), this, &s_faderBg, &s_faderLeds,
+			&s_faderKnob, m_parameterWidget->getBandModels(i)->peakL, m_parameterWidget->getBandModels(i)->peakR);
 		gainFader->move( distance, 295 );
 		distance += 44;
 		gainFader->setMinimumHeight(80);
@@ -242,4 +242,4 @@ EqBand* EqControlsDialog::setBand(int index, BoolModel* active, FloatModel* freq
 }
 
 
-} // namespace lmms::gui
+} // namespace lmms::gui