mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-16 21:18:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

ModelView, Model: coding style improvements

Browse Source
This commit is contained in:
Tobias Doerffel
2014-03-21 10:46:42 +01:00
parent b5eb4f1f7a
commit 729838fa08
3 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/ModelView.cpp
View File

@@ -1,7 +1,7 @@
/*
* ModelView.cpp - implementation of ModelView.cpp
* ModelView.cpp - implementation of ModelView
*
* Copyright (c) 2007-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2007-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -28,9 +28,9 @@
ModelView::ModelView( Model * _model, QWidget * _this ) :
m_widget( _this ),
m_model( _model )
ModelView::ModelView( Model* model, QWidget* widget ) :
m_widget( widget ),
m_model( model )
{
}
@@ -39,7 +39,7 @@ ModelView::ModelView( Model * _model, QWidget * _this ) :
ModelView::~ModelView()
{
if( m_model != NULL && m_model->defaultConstructed() )
if( m_model != NULL && m_model->isDefaultConstructed() )
{
delete m_model;
}
@@ -48,11 +48,11 @@ ModelView::~ModelView()
void ModelView::setModel( Model * _model, bool _old_model_valid )
void ModelView::setModel( Model* model, bool isOldModelValid )
{
if( _old_model_valid && m_model != NULL )
if( isOldModelValid && m_model != NULL )
{
if( m_model->defaultConstructed() )
if( m_model->isDefaultConstructed() )
{
delete m_model;
}
@@ -61,7 +61,8 @@ void ModelView::setModel( Model * _model, bool _old_model_valid )
m_model->disconnect( widget() );
}
}
m_model = _model;
m_model = model;
doConnections();
@@ -77,11 +78,8 @@ void ModelView::doConnections()
{
if( m_model != NULL )
{
QObject::connect( m_model, SIGNAL( dataChanged() ),
widget(), SLOT( update() ) );
QObject::connect( m_model, SIGNAL( propertiesChanged() ),
widget(), SLOT( update() ) );
QObject::connect( m_model, SIGNAL( dataChanged() ), widget(), SLOT( update() ) );
QObject::connect( m_model, SIGNAL( propertiesChanged() ), widget(), SLOT( update() ) );
}
}