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

Merge pull request #4344 from mrkline/default-empty-detors

Browse Source 
Default some empty destructors
This commit is contained in:
Colin Wallace
2018-05-08 18:44:48 -07:00
committed by GitHub
parent c1b2728d65 68c9d227d0
commit b4a6ae7bcc
35 changed files with 23 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/AutomatableModelView.h
View File

@@ -36,7 +36,7 @@ class EXPORT AutomatableModelView : public ModelView
{
public:
AutomatableModelView( Model* model, QWidget* _this );
virtual ~AutomatableModelView();
virtual ~AutomatableModelView() = default;
// some basic functions for convenience
AutomatableModel* modelUntyped()

2
include/AutomationPattern.h
View File

@@ -54,7 +54,7 @@ public:
AutomationPattern( AutomationTrack * _auto_track );
AutomationPattern( const AutomationPattern & _pat_to_copy );
virtual ~AutomationPattern();
virtual ~AutomationPattern() = default;
bool addObject( AutomatableModel * _obj, bool _search_dup = true );

4
include/AutomationTrack.h
View File

@@ -35,7 +35,7 @@ class AutomationTrack : public Track
Q_OBJECT
public:
AutomationTrack( TrackContainer* tc, bool _hidden = false );
virtual ~AutomationTrack();
virtual ~AutomationTrack() = default;
virtual bool play( const MidiTime & _start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num = -1 );
@@ -63,7 +63,7 @@ class AutomationTrackView : public TrackView
{
public:
AutomationTrackView( AutomationTrack* at, TrackContainerView* tcv );
virtual ~AutomationTrackView();
virtual ~AutomationTrackView() = default;
virtual void dragEnterEvent( QDragEnterEvent * _dee );
virtual void dropEvent( QDropEvent * _de );

4
include/BBTrack.h
View File

@@ -41,7 +41,7 @@ class BBTCO : public TrackContentObject
{
public:
BBTCO( Track * _track );
virtual ~BBTCO();
virtual ~BBTCO() = default;
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
@@ -90,7 +90,7 @@ class BBTCOView : public TrackContentObjectView
Q_OBJECT
public:
BBTCOView( TrackContentObject * _tco, TrackView * _tv );
virtual ~BBTCOView();
virtual ~BBTCOView() = default;
QColor color() const
{

2
include/Fader.h
View File

@@ -68,7 +68,7 @@ public:
Fader( FloatModel * _model, const QString & _name, QWidget * _parent );
Fader( FloatModel * _model, const QString & _name, QWidget * _parent, QPixmap * back, QPixmap * leds, QPixmap * knob );
virtual ~Fader();
virtual ~Fader() = default;
void init(FloatModel * model, QString const & name);

4
include/FileBrowser.h
View File

@@ -51,7 +51,7 @@ public:
FileBrowser( const QString & directories, const QString & filter,
const QString & title, const QPixmap & pm,
QWidget * parent, bool dirs_as_items = false, bool recurse = false );
virtual ~FileBrowser();
virtual ~FileBrowser() = default;
private slots:
void reloadTree( void );
@@ -85,7 +85,7 @@ class FileBrowserTreeWidget : public QTreeWidget
Q_OBJECT
public:
FileBrowserTreeWidget( QWidget * parent );
virtual ~FileBrowserTreeWidget();
virtual ~FileBrowserTreeWidget() = default;
protected:

4
include/Graph.h
View File

@@ -55,7 +55,7 @@ public:
int _width = 132,
int _height = 104
);
virtual ~Graph();
virtual ~Graph() = default;
void setForeground( const QPixmap & _pixmap );
@@ -122,7 +122,7 @@ public:
bool _default_constructed = false,
float _step = 0.0 );
virtual ~graphModel();
virtual ~graphModel() = default;
// TODO: saveSettings, loadSettings?

2
include/Instrument.h
View File

@@ -57,7 +57,7 @@ public:
Instrument( InstrumentTrack * _instrument_track,
const Descriptor * _descriptor );
virtual ~Instrument();
virtual ~Instrument() = default;
// --------------------------------------------------------------------
// functions that can/should be re-implemented:

2
include/LcdSpinBox.h
View File

@@ -38,7 +38,7 @@ public:
LcdSpinBox( int numDigits, const QString& style, QWidget* parent, const QString& name = QString::null );
virtual ~LcdSpinBox();
virtual ~LcdSpinBox() = default;
virtual void modelChanged()
{

2
include/Pattern.h
View File

@@ -163,7 +163,7 @@ class PatternView : public TrackContentObjectView
public:
PatternView( Pattern* pattern, TrackView* parent );
virtual ~PatternView();
virtual ~PatternView() = default;
Q_PROPERTY(QColor noteFillColor READ getNoteFillColor WRITE setNoteFillColor)
Q_PROPERTY(QColor noteBorderColor READ getNoteBorderColor WRITE setNoteBorderColor)

3
include/Piano.h
View File

@@ -31,7 +31,7 @@
class InstrumentTrack;
class MidiEventProcessor;
class Piano : public Model
class Piano final : public Model
{
public:
enum KeyTypes
@@ -41,7 +41,6 @@ public:
} ;
Piano( InstrumentTrack* track );
virtual ~Piano();
void setKeyState( int key, bool state );

2
include/PianoView.h
View File

@@ -38,7 +38,7 @@ class PianoView : public QWidget, public ModelView
Q_OBJECT
public:
PianoView( QWidget * _parent );
virtual ~PianoView();
virtual ~PianoView() = default;
static int getKeyFromKeyEvent( QKeyEvent * _ke );

3
include/SampleTrack.h
View File

@@ -98,8 +98,7 @@ class SampleTCOView : public TrackContentObjectView
public:
SampleTCOView( SampleTCO * _tco, TrackView * _tv );
virtual ~SampleTCOView();
virtual ~SampleTCOView() = default;
public slots:
void updateSample();

2
include/TabBar.h
View File

@@ -42,7 +42,7 @@ class EXPORT TabBar : public QWidget
public:
TabBar( QWidget * _parent,
QBoxLayout::Direction _dir = QBoxLayout::LeftToRight );
virtual ~TabBar();
virtual ~TabBar() = default;
TabButton * addTab( QWidget * _w, const QString & _text,
int _id, bool _add_stretch = false,

2
include/TabWidget.h
View File

@@ -37,7 +37,7 @@ class TabWidget : public QWidget
Q_OBJECT
public:
TabWidget( const QString & _caption, QWidget * _parent, bool usePixmap = false );
virtual ~TabWidget();
virtual ~TabWidget() = default;
void addTab( QWidget * w, const QString & name, const char *pixmap = NULL, int idx = -1 );

2
include/TimeDisplayWidget.h
View File

@@ -37,7 +37,7 @@ class TimeDisplayWidget : public QWidget
Q_OBJECT
public:
TimeDisplayWidget();
virtual ~TimeDisplayWidget();
virtual ~TimeDisplayWidget() = default;
protected:

2
include/ToolButton.h
View File

@@ -42,7 +42,7 @@ public:
QToolButton(_parent)
{ }
virtual ~ToolButton();
virtual ~ToolButton() = default;
} ;

10
src/core/AutomationPattern.cpp
View File

@@ -98,16 +98,6 @@ AutomationPattern::AutomationPattern( const AutomationPattern & _pat_to_copy ) :
}
}
AutomationPattern::~AutomationPattern()
{
}
bool AutomationPattern::addObject( AutomatableModel * _obj, bool _search_dup )
{
if( _search_dup && m_objects.contains(_obj) )

10
src/core/Instrument.cpp
View File

@@ -34,16 +34,6 @@ Instrument::Instrument( InstrumentTrack * _instrument_track,
{
}
Instrument::~Instrument()
{
}
void Instrument::play( sampleFrame * )
{
}

13
src/core/Piano.cpp
View File

@@ -70,19 +70,6 @@ Piano::Piano( InstrumentTrack* track ) :
}
/*! \brief Destroy this new keyboard display
*
*/
Piano::~Piano()
{
}
/*! \brief Turn a key on or off
*
* \param key the key number to change

10
src/gui/AutomatableModelView.cpp
View File

@@ -50,16 +50,6 @@ AutomatableModelView::AutomatableModelView( ::Model* model, QWidget* _this ) :
widget()->setCursor( QCursor( embed::getIconPixmap( "hand" ), 3, 3 ) );
}
AutomatableModelView::~AutomatableModelView()
{
}
void AutomatableModelView::addDefaultActions( QMenu* menu )
{
AutomatableModel* model = modelUntyped();

20
src/gui/FileBrowser.cpp
View File

@@ -112,16 +112,6 @@ FileBrowser::FileBrowser(const QString & directories, const QString & filter,
show();
}
FileBrowser::~FileBrowser()
{
}
bool FileBrowser::filterItems( const QString & filter, QTreeWidgetItem * item )
{
// call with item=NULL to filter the entire tree
@@ -338,16 +328,6 @@ FileBrowserTreeWidget::FileBrowserTreeWidget(QWidget * parent ) :
}
FileBrowserTreeWidget::~FileBrowserTreeWidget()
{
}
void FileBrowserTreeWidget::contextMenuEvent(QContextMenuEvent * e )
{
FileItem * f = dynamic_cast<FileItem *>( itemAt( e->pos() ) );

13
src/gui/PianoView.cpp
View File

@@ -130,19 +130,6 @@ PianoView::PianoView( QWidget * _parent ) :
}
/*! \brief Destroy this piano display view
*
*/
PianoView::~PianoView()
{
}
/*! \brief Map a keyboard key being pressed to a note in our keyboard view
*
* \param _k The keyboard scan code of the key being pressed.

6
src/gui/widgets/Fader.cpp
View File

@@ -133,12 +133,6 @@ Fader::Fader( FloatModel * model, const QString & name, QWidget * parent, QPixma
init(model, name);
}
Fader::~Fader()
{
}
void Fader::init(FloatModel * model, QString const & name)
{
setWindowTitle( name );

15
src/gui/widgets/Graph.cpp
View File

@@ -56,13 +56,6 @@ Graph::Graph( QWidget * _parent, graphStyle _style, int _width,
this, SLOT( updateGraph( ) ) );
}
Graph::~Graph()
{
}
void Graph::setForeground( const QPixmap &_pixmap )
{
m_foreground = _pixmap;
@@ -470,14 +463,6 @@ graphModel::graphModel( float _min, float _max, int _length,
{
}
graphModel::~graphModel()
{
}
void graphModel::setRange( float _min, float _max )
{
if( _min != m_minValue || _max != m_maxValue )

8
src/gui/widgets/LcdSpinBox.cpp
View File

@@ -58,14 +58,6 @@ LcdSpinBox::LcdSpinBox( int numDigits, const QString& style, QWidget* parent, co
{
}
LcdSpinBox::~LcdSpinBox()
{
}
void LcdSpinBox::update()
{
setValue( model()->value() + m_displayOffset );

5
src/gui/widgets/SideBar.cpp
View File

@@ -41,9 +41,8 @@ public:
m_orientation( _orientation )
{
}
virtual ~SideBarButton()
{
}
virtual ~SideBarButton() = default;
Qt::Orientation orientation() const
{

10
src/gui/widgets/TabBar.cpp
View File

@@ -41,16 +41,6 @@ TabBar::TabBar( QWidget * _parent, QBoxLayout::Direction _dir ) :
setLayout( m_layout );
}
TabBar::~TabBar()
{
}
TabButton * TabBar::addTab( QWidget * _w, const QString & _text, int _id,
bool _add_stretch, bool _text_is_tooltip )
{

6
src/gui/widgets/TabWidget.cpp
View File

@@ -61,12 +61,6 @@ TabWidget::TabWidget( const QString & caption, QWidget * parent, bool usePixmap
}
TabWidget::~TabWidget()
{
}
void TabWidget::addTab( QWidget * w, const QString & name, const char *pixmap, int idx )
{
setFont( pointSize<8>( font() ) );

11
src/gui/widgets/TimeDisplayWidget.cpp
View File

@@ -58,17 +58,6 @@ TimeDisplayWidget::TimeDisplayWidget() :
this, SLOT( updateTime() ) );
}
TimeDisplayWidget::~TimeDisplayWidget()
{
}
void TimeDisplayWidget::setDisplayMode( DisplayMode displayMode )
{
m_displayMode = displayMode;

7
src/gui/widgets/ToolButton.cpp
View File

@@ -41,10 +41,3 @@ ToolButton::ToolButton( const QPixmap & _pixmap, const QString & _tooltip,
ToolTip::add( this, _tooltip );
setIcon( _pixmap );
}
ToolButton::~ToolButton()
{
}

20
src/tracks/AutomationTrack.cpp
View File

@@ -40,16 +40,6 @@ AutomationTrack::AutomationTrack( TrackContainer* tc, bool _hidden ) :
setName( tr( "Automation track" ) );
}
AutomationTrack::~AutomationTrack()
{
}
bool AutomationTrack::play( const MidiTime & time_start, const fpp_t _frames,
const f_cnt_t _frame_base, int _tco_num )
{
@@ -108,16 +98,6 @@ AutomationTrackView::AutomationTrackView( AutomationTrack * _at, TrackContainerV
setModel( _at );
}
AutomationTrackView::~AutomationTrackView()
{
}
void AutomationTrackView::dragEnterEvent( QDragEnterEvent * _dee )
{
StringPairDrag::processDragEnterEvent( _dee, "automatable_model" );

20
src/tracks/BBTrack.cpp
View File

@@ -61,16 +61,6 @@ BBTCO::BBTCO( Track * _track ) :
setAutoResize( false );
}
BBTCO::~BBTCO()
{
}
void BBTCO::saveSettings( QDomDocument & doc, QDomElement & element )
{
element.setAttribute( "name", name() );
@@ -168,16 +158,6 @@ BBTCOView::BBTCOView( TrackContentObject * _tco, TrackView * _tv ) :
setStyle( QApplication::style() );
}
BBTCOView::~BBTCOView()
{
}
void BBTCOView::constructContextMenu( QMenu * _cm )
{
QAction * a = new QAction( embed::getIconPixmap( "bb_track" ),

13
src/tracks/Pattern.cpp
View File

@@ -616,19 +616,6 @@ PatternView::PatternView( Pattern* pattern, TrackView* parent ) :
setStyle( QApplication::style() );
}
PatternView::~PatternView()
{
}
void PatternView::update()
{
ToolTip::add(this, m_pat->name());

10
src/tracks/SampleTrack.cpp
View File

@@ -302,16 +302,6 @@ SampleTCOView::SampleTCOView( SampleTCO * _tco, TrackView * _tv ) :
setStyle( QApplication::style() );
}
SampleTCOView::~SampleTCOView()
{
}
void SampleTCOView::updateSample()
{
update();