hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 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

14
include/Model.h
View File

@@ -1,7 +1,7 @@
/*
* Model.h - declaration of Model base class
*
* 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
*
@@ -22,8 +22,8 @@
*
*/
#ifndef _MODEL_H
#define _MODEL_H
#ifndef MODEL_H
#define MODEL_H
#include <QtCore/QObject>
#include <QtCore/QPointer>
@@ -47,12 +47,12 @@ public:
{
}
inline bool defaultConstructed()
bool isDefaultConstructed()
{
return m_defaultConstructed;
}
inline Model * parentModel() const
Model* parentModel() const
{
return static_cast<Model *>( parent() );
}
@@ -62,9 +62,9 @@ public:
return m_displayName;
}
virtual void setDisplayName( const QString & _display_name )
virtual void setDisplayName( const QString& displayName )
{
m_displayName = _display_name;
m_displayName = displayName;
}
virtual QString fullDisplayName() const;

26
include/ModelView.h
View File

@@ -1,7 +1,7 @@
/*
* ModelView.h - declaration of ModelView base class
*
* 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
*
@@ -22,8 +22,8 @@
*
*/
#ifndef _MODEL_VIEW_H
#define _MODEL_VIEW_H
#ifndef MODEL_VIEW_H
#define MODEL_VIEW_H
#include "Model.h"
@@ -31,31 +31,31 @@
class EXPORT ModelView
{
public:
ModelView( Model * _model, QWidget * _this );
ModelView( Model* model, QWidget* widget );
virtual ~ModelView();
virtual void setModel( Model * _model, bool _old_model_valid = true );
virtual void setModel( Model* model, bool isOldModelValid = true );
inline Model * model()
Model* model()
{
return m_model;
}
inline const Model * model() const
const Model* model() const
{
return m_model;
}
template<class T>
T * castModel()
T* castModel()
{
return dynamic_cast<T *>( model() );
return dynamic_cast<T*>( model() );
}
template<class T>
const T * castModel() const
const T* castModel() const
{
return dynamic_cast<const T *>( model() );
return dynamic_cast<const T*>( model() );
}
@@ -65,7 +65,7 @@ protected:
{
}
QWidget * widget()
QWidget* widget()
{
return m_widget;
}
@@ -74,7 +74,7 @@ protected:
private:
QWidget * m_widget;
QWidget* m_widget;
QPointer<Model> m_model;
} ;

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() ) );
}
}