From fda938fccaf543a480561c7c4e759731690ee299 Mon Sep 17 00:00:00 2001
From: Michael Gregorius <michael.gregorius.git@arcor.de>
Date: Fri, 2 Jun 2023 20:31:38 +0200
Subject: [PATCH] Code review changes (#6711)

Remove underscores and whitespace in the Model files.
---
 include/Model.h    |  4 ++--
 src/core/Model.cpp | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/include/Model.h b/include/Model.h
index 6db8f9f30..e481fbdf1 100644
--- a/include/Model.h
+++ b/include/Model.h
@@ -37,8 +37,8 @@ class LMMS_EXPORT Model : public QObject
 {
 	Q_OBJECT
 public:
-	Model(Model * _parent, QString _display_name = QString(),
-		  bool _default_constructed = false );
+	Model(Model * parent, QString displayName = QString(),
+		  bool defaultConstructed = false );
 
 	~Model() override = default;
 
diff --git a/src/core/Model.cpp b/src/core/Model.cpp
index 83602bd08..c59887702 100644
--- a/src/core/Model.cpp
+++ b/src/core/Model.cpp
@@ -27,10 +27,10 @@
 namespace lmms
 {
 
-Model::Model(Model * _parent, QString _display_name, bool _default_constructed) :
-	QObject( _parent ),
-	m_displayName( _display_name ),
-	m_defaultConstructed( _default_constructed )
+Model::Model(Model * parent, QString displayName, bool defaultConstructed) :
+	QObject(parent),
+	m_displayName(displayName),
+	m_defaultConstructed(defaultConstructed)
 {
 }
 
@@ -41,7 +41,7 @@ bool Model::isDefaultConstructed() const
 
 Model* Model::parentModel() const
 {
-	return dynamic_cast<Model *>( parent() );
+	return dynamic_cast<Model *>(parent());
 }
 
 QString Model::displayName() const
@@ -57,19 +57,23 @@ void Model::setDisplayName( const QString& displayName )
 QString Model::fullDisplayName() const
 {
 	const QString & n = displayName();
-	if( parentModel() ) 
+
+	if(parentModel())
 	{
 		const QString p = parentModel()->fullDisplayName();
-		if( n.isEmpty() && p.isEmpty() )
+
+		if(n.isEmpty() && p.isEmpty())
 		{
 			return QString();
 		}
-		else if( p.isEmpty() )
+		else if(p.isEmpty())
 		{
 			return n;
 		}
+
 		return p + ">" + n;
 	}
+
 	return n;
 }