From 729838fa0853b5529a702a3c7c099feeaa5ea3e1 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Fri, 21 Mar 2014 10:46:42 +0100
Subject: [PATCH] ModelView, Model: coding style improvements

---
 include/Model.h       | 14 +++++++-------
 include/ModelView.h   | 26 +++++++++++++-------------
 src/gui/ModelView.cpp | 28 +++++++++++++---------------
 3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/include/Model.h b/include/Model.h
index dc2ea3895..94883c65d 100644
--- a/include/Model.h
+++ b/include/Model.h
@@ -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;
diff --git a/include/ModelView.h b/include/ModelView.h
index 437c7bd5d..9f8cd9e1e 100644
--- a/include/ModelView.h
+++ b/include/ModelView.h
@@ -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;
 
 } ;
diff --git a/src/gui/ModelView.cpp b/src/gui/ModelView.cpp
index c8be075f4..3d22b09e2 100644
--- a/src/gui/ModelView.cpp
+++ b/src/gui/ModelView.cpp
@@ -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() ) );
 	}
 }