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

Code review changes (#6711)

Browse Source 
Remove underscores and whitespace in the Model files.
This commit is contained in:
Michael Gregorius
2023-06-02 20:31:38 +02:00
parent 43319a8d79
commit fda938fcca
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/Model.h
View File

@@ -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;

20
src/core/Model.cpp
View File

@@ -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;
}