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

ResourceModel: made m_db pointer non-modifieable by subclasses

Browse Source 
Subclasses have to call ResourceModel::db() now in order to get the
pointer to the DB, the model is operating on.
This commit is contained in:
Tobias Doerffel
2009-08-17 17:14:03 +02:00
parent 3110e2188d
commit 26be3b0e81
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/ResourceModel.h
View File

@@ -73,6 +73,13 @@ public:
protected:
ResourceDB * db() const
{
return m_db;
}
private:
ResourceDB * m_db;

18
src/core/ResourceTreeModel.cpp
View File

@@ -40,8 +40,6 @@ ResourceTreeModel::ResourceTreeModel( ResourceDB * _db, QObject * _parent ) :
int ResourceTreeModel::rowCount( const QModelIndex & _parent ) const
{
ResourceTreeItem * parentItem;
if( _parent.column() > 0 )
{
return 0;
@@ -49,13 +47,9 @@ int ResourceTreeModel::rowCount( const QModelIndex & _parent ) const
if( !_parent.isValid() )
{
parentItem = m_db->topLevelNode();
return db()->topLevelNode()->rowCount( this );
}
else
{
parentItem = treeItem( _parent );
}
return parentItem->rowCount( this );
return treeItem( _parent )->rowCount( this );
}
@@ -73,7 +67,7 @@ QModelIndex ResourceTreeModel::index( int _row, int _col,
if( !_parent.isValid() )
{
parentItem = m_db->topLevelNode();
parentItem = db()->topLevelNode();
}
else
{
@@ -99,7 +93,7 @@ QModelIndex ResourceTreeModel::parent( const QModelIndex & _idx ) const
ResourceTreeItem * childItem = treeItem( _idx );
ResourceTreeItem * parentItem = childItem->parent();
if( parentItem == m_db->topLevelNode() )
if( parentItem == db()->topLevelNode() )
{
return QModelIndex();
}
@@ -117,8 +111,8 @@ QModelIndex ResourceTreeModel::parent( const QModelIndex & _idx ) const
void ResourceTreeModel::setFilter( const QString & _s )
{
filterItems( m_db->topLevelNode(),
createIndex( 0, 0, m_db->topLevelNode() ),
filterItems( db()->topLevelNode(),
createIndex( 0, 0, db()->topLevelNode() ),
_s.toLower().split( " " ) );
if( _s.isEmpty() )
{