Separated out ResourcesDB::Item and ResourcesDB::TreeItem into

ResourcesItem and ResourcesTreeItem in own header- and source-files
This commit is contained in:
Tobias Doerffel
2009-02-27 11:25:39 +01:00
parent d2f82ce3c0
commit f49274cac2
11 changed files with 879 additions and 689 deletions

View File

@@ -23,7 +23,6 @@
*/
#include <QtCore/QCryptographicHash>
#include <QtCore/QDir>
#include "resources_db.h"
@@ -33,259 +32,12 @@
void ResourcesDB::Item::reload( void )
{
m_hash.clear();
m_size = -1;
init();
}
bool ResourcesDB::Item::operator==( const Item & _other ) const
{
return m_nameHash == _other.m_nameHash &&
m_name == _other.m_name &&
m_type == _other.m_type &&
m_path == _other.m_path &&
m_hash == _other.m_hash &&
m_size == _other.m_size &&
m_tags == _other.m_tags;
}
int ResourcesDB::Item::equalityLevel( const Item & _other ) const
{
int l = 0;
if( m_nameHash == _other.m_nameHash &&
m_name == _other.m_name &&
m_path == _other.m_path )
{
l += 40;
}
else if( m_nameHash == _other.m_nameHash && m_name == _other.m_name )
{
l += 30;
}
else if( m_path == _other.m_path )
{
l += 10;
}
if( m_type == _other.m_type )
{
l += 5;
}
if( !m_tags.isEmpty() && !_other.m_tags.isEmpty() )
{
QStringList my_tags = m_tags.split( " " );
QStringList o_tags = _other.m_tags.split( " " );
foreach( const QString & tag, o_tags )
{
if( my_tags.contains( tag ) )
{
l += 10;
}
}
}
if( m_size == _other.m_size )
{
l += 20;
}
if( m_hash == _other.m_hash )
{
l += 100;
}
return l;
}
ResourcesDB::Item::Types ResourcesDB::Item::guessType( void ) const
{
static QMap<QString, Types> typeMap;
if( typeMap.isEmpty() )
{
typeMap["wav"] = TypeSample;
typeMap["ogg"] = TypeSample;
typeMap["mp3"] = TypeSample;
typeMap["ds"] = TypeSample;
typeMap["flac"] = TypeSample;
typeMap["spx"] = TypeSample;
typeMap["voc"] = TypeSample;
typeMap["au"] = TypeSample;
typeMap["raw"] = TypeSample;
typeMap["aif"] = TypeSample;
typeMap["aiff"] = TypeSample;
typeMap["sf2"] = TypeSoundFont;
typeMap["xpf"] = TypePreset;
typeMap["mmp"] = TypeProject;
typeMap["mmpz"] = TypeProject;
typeMap["mid"] = TypeMidiFile;
typeMap["flp"] = TypeForeignProject;
typeMap["dll"] = TypePlugin;
typeMap["so"] = TypePlugin;
typeMap["png"] = TypeImage;
typeMap["jpg"] = TypeImage;
typeMap["jpeg"] = TypeImage;
}
const QString s = QFileInfo( fullName() ).suffix().toLower();
QMap<QString, Types>::ConstIterator it = typeMap.find( s );
if( it != typeMap.end() )
{
return it.value();
}
return TypeUnknown;
}
void ResourcesDB::Item::init( void )
{
if( m_name.isEmpty() )
{
return;
}
// ensure trailing slash for path property
if( !m_path.isEmpty() && m_path.right( 1 ) != QDir::separator() )
{
m_path += QDir::separator();
}
if( m_type == TypeUnknown )
{
m_type = guessType();
}
// if item is a directory, ensure a trailing slash
if( m_type == TypeDirectory )
{
if( !m_name.isEmpty() &&
m_name.right( 1 ) != QDir::separator() )
{
m_name += QDir::separator();
}
if( m_hash.isEmpty() )
{
QCryptographicHash h( QCryptographicHash::Sha1 );
h.addData( fullName().toUtf8() );
m_hash = h.result().toHex();
}
}
// only stat file if we really need to
else if( ( m_hash.isEmpty() || m_size < 0 ) &&
QFile::exists( fullName() ) )
{
if( m_size < 0 )
{
m_size = QFileInfo( fullName() ).size();
}
if( m_hash.isEmpty() )
{
QCryptographicHash h( QCryptographicHash::Sha1 );
QFile f( fullName() );
f.open( QFile::ReadOnly );
const int chunkSize = 1024*1024; // 1 MB
for( int i = 0; i < f.size() / chunkSize; ++i )
{
h.addData( f.read( chunkSize ) );
}
h.addData( f.readAll() );
m_hash = h.result().toHex();
}
}
m_nameHash = qHash( m_name );
}
QString ResourcesDB::Item::getBaseDirectory( BaseDirectories _bd )
{
QString d;
switch( _bd )
{
case BaseRoot:
d = QDir::rootPath();
break;
case BaseWorkingDir:
d = configManager::inst()->workingDir();
break;
case BaseDataDir:
d = configManager::inst()->dataDir();
break;
case BaseHome:
default:
d = QDir::homePath();
break;
}
if( !d.isEmpty() && d.right( 1 ) != QDir::separator() )
{
d += QDir::separator();
}
return d;
}
ResourcesDB::TreeItem * ResourcesDB::TreeItem::findChild(
const QString & _name,
Item::BaseDirectories _base_dir )
{
if( _name.isNull() || _name.isEmpty() )
{
return NULL;
}
const int hash = qHash( _name );
foreachTreeItem( m_children )
{
TreeItem * ti = *it;
if( ti->item() &&
ti->item()->nameHash() == hash &&
ti->item()->name() == _name &&
ti->item()->baseDir() == _base_dir )
{
return ti;
}
}
return NULL;
}
ResourcesDB::ResourcesDB( const QString & _db_file ) :
m_watcher( this ),
m_dbFile( _db_file )
{
m_folders += qMakePair( Item::BaseDataDir, QString() );
m_folders += qMakePair( Item::BaseWorkingDir, QString() );
m_folders += qMakePair( ResourcesItem::BaseDataDir, QString() );
m_folders += qMakePair( ResourcesItem::BaseWorkingDir, QString() );
if( QFile::exists( m_dbFile ) )
{
@@ -333,17 +85,18 @@ void ResourcesDB::save( void )
void ResourcesDB::saveTreeItem( const TreeItem * _i, QDomDocument & _doc,
void ResourcesDB::saveTreeItem( const ResourcesTreeItem * _i,
QDomDocument & _doc,
QDomElement & _de )
{
QDomElement e = _i->item() ? _doc.createElement( "item" ) : _de;
foreachConstTreeItem( _i->children() )
foreachConstResourcesTreeItem( _i->children() )
{
saveTreeItem( *it, _doc, e );
}
if( _i->item() )
{
const Item * it = _i->item();
const ResourcesItem * it = _i->item();
e.setAttribute( "name", it->name() );
e.setAttribute( "type", it->type() );
e.setAttribute( "basedir", it->baseDir() );
@@ -360,7 +113,7 @@ void ResourcesDB::saveTreeItem( const TreeItem * _i, QDomDocument & _doc,
void ResourcesDB::loadTreeItem( TreeItem * _i, QDomElement & _de )
void ResourcesDB::loadTreeItem( ResourcesTreeItem * _i, QDomElement & _de )
{
QDomNode node = _de.firstChild();
while( !node.isNull() )
@@ -371,22 +124,23 @@ void ResourcesDB::loadTreeItem( TreeItem * _i, QDomElement & _de )
const QString h = e.attribute( "hash" );
if( !h.isEmpty() )
{
Item * item = new Item( e.attribute( "name" ),
static_cast<Item::Types>( e.attribute( "type" ).toInt() ),
static_cast<Item::BaseDirectories>( e.attribute( "basedir" ).toInt() ),
ResourcesItem * item = new ResourcesItem( e.attribute( "name" ),
static_cast<ResourcesItem::Type>( e.attribute( "type" ).toInt() ),
static_cast<ResourcesItem::BaseDirectory>(
e.attribute( "basedir" ).toInt() ),
e.attribute( "path" ),
h,
e.attribute( "tags" ),
e.attribute( "size" ).toInt(),
QDateTime::fromString( e.attribute( "lastmod" ), Qt::ISODate ) );
replaceItem( item );
TreeItem * treeItem = new TreeItem( _i, item );
if( item->type() == Item::TypeDirectory &&
QFileInfo( item->fullPath() ).isDir() )
{
m_watcher.addPath( item->fullPath() );
}
loadTreeItem( treeItem, e );
replaceItem( item );
ResourcesTreeItem * treeItem = new ResourcesTreeItem( _i, item );
if( item->type() == ResourcesItem::TypeDirectory &&
QFileInfo( item->fullPath() ).isDir() )
{
m_watcher.addPath( item->fullPath() );
}
loadTreeItem( treeItem, e );
}
}
node = node.nextSibling();
@@ -408,7 +162,7 @@ void ResourcesDB::scanResources( void )
const ResourcesDB::Item * ResourcesDB::nearestMatch( const Item & _item )
const ResourcesItem * ResourcesDB::nearestMatch( const ResourcesItem & _item )
{
if( !_item.hash().isEmpty() )
{
@@ -420,9 +174,9 @@ const ResourcesDB::Item * ResourcesDB::nearestMatch( const Item & _item )
}
int max_level = -1;
const Item * max_item = NULL;
const ResourcesItem * max_item = NULL;
foreach( const Item * it, m_items )
foreach( const ResourcesItem * it, m_items )
{
const int l = it->equalityLevel( _item );
if( l > max_level )
@@ -441,12 +195,12 @@ const ResourcesDB::Item * ResourcesDB::nearestMatch( const Item & _item )
void ResourcesDB::reloadDirectory( const QString & _path )
{
TreeItem * dirTreeItem = NULL;
ResourcesTreeItem * dirTreeItem = NULL;
foreach( Item * it, m_items )
foreach( ResourcesItem * it, m_items )
{
if( it->type() == Item::TypeDirectory &&
it->fullPath() == _path )
if( it->type() == ResourcesItem::TypeDirectory &&
it->fullPath() == _path )
{
dirTreeItem = it->treeItem();
}
@@ -454,7 +208,7 @@ void ResourcesDB::reloadDirectory( const QString & _path )
if( dirTreeItem )
{
Item * dirItem = dirTreeItem->item();
ResourcesItem * dirItem = dirTreeItem->item();
if( dirItem )
{
m_scannedFolders.clear();
@@ -470,19 +224,19 @@ void ResourcesDB::reloadDirectory( const QString & _path )
void ResourcesDB::replaceItem( Item * newItem )
void ResourcesDB::replaceItem( ResourcesItem * newItem )
{
const QString hash = newItem->hash();
Item * oldItem = m_items[hash];
ResourcesItem * oldItem = m_items[hash];
if( oldItem )
{
TreeItem * oldTreeItem = oldItem->treeItem();
ResourcesTreeItem * oldTreeItem = oldItem->treeItem();
if( oldTreeItem )
{
recursiveRemoveItems( oldTreeItem, false );
delete oldTreeItem;
}
if( oldItem->type() == Item::TypeDirectory )
if( oldItem->type() == ResourcesItem::TypeDirectory )
{
m_watcher.removePath( oldItem->fullPath() );
}
@@ -495,7 +249,7 @@ void ResourcesDB::replaceItem( Item * newItem )
void ResourcesDB::recursiveRemoveItems( TreeItem * parent,
void ResourcesDB::recursiveRemoveItems( ResourcesTreeItem * parent,
bool removeTopLevelParent )
{
if( !parent )
@@ -510,7 +264,7 @@ void ResourcesDB::recursiveRemoveItems( TreeItem * parent,
if( removeTopLevelParent && parent->item() )
{
if( parent->item()->type() == Item::TypeDirectory )
if( parent->item()->type() == ResourcesItem::TypeDirectory )
{
m_watcher.removePath( parent->item()->fullPath() );
}
@@ -526,8 +280,8 @@ void ResourcesDB::recursiveRemoveItems( TreeItem * parent,
void ResourcesDB::readDir( const QString & _dir, TreeItem * _parent,
Item::BaseDirectories _base_dir )
void ResourcesDB::readDir( const QString & _dir, ResourcesTreeItem * _parent,
ResourcesItem::BaseDirectory _base_dir )
{
#ifdef LMMS_BUILD_LINUX
if( _dir.startsWith( "/dev" ) ||
@@ -538,18 +292,18 @@ void ResourcesDB::readDir( const QString & _dir, TreeItem * _parent,
}
#endif
QDir d( Item::getBaseDirectory( _base_dir ) + _dir );
QDir d( ResourcesItem::getBaseDirectory( _base_dir ) + _dir );
m_scannedFolders << d.canonicalPath();
Item * parentItem;
TreeItem * curParent = _parent->findChild( d.dirName() +
ResourcesItem * parentItem;
ResourcesTreeItem * curParent = _parent->findChild( d.dirName() +
QDir::separator(),
_base_dir );
printf("read dir: %s\n", d.canonicalPath().toAscii().constData() );
if( curParent )
{
parentItem = curParent->item();
foreachTreeItem( curParent->children() )
foreachResourcesTreeItem( curParent->children() )
{
(*it)->setTemporaryMarker( false );
}
@@ -557,15 +311,17 @@ printf("read dir: %s\n", d.canonicalPath().toAscii().constData() );
else
{
// create new item for current dir
parentItem = new Item( d.dirName(), Item::TypeDirectory,
_base_dir, _parent->item() ?
parentItem = new ResourcesItem( d.dirName(),
ResourcesItem::TypeDirectory,
_base_dir,
_parent->item() ?
_parent->item()->path() + d.dirName() +
QDir::separator() :
QString::null );
parentItem->setLastMod( QFileInfo(
d.canonicalPath() ).lastModified() );
replaceItem( parentItem );
curParent = new TreeItem( _parent, parentItem );
curParent = new ResourcesTreeItem( _parent, parentItem );
curParent->setTemporaryMarker( true );
m_watcher.addPath( parentItem->fullPath() );
}
@@ -587,7 +343,8 @@ printf("read dir: %s\n", d.canonicalPath().toAscii().constData() );
{
fname += QDir::separator();
}
TreeItem * curChild = curParent->findChild( fname, _base_dir );
ResourcesTreeItem * curChild =
curParent->findChild( fname, _base_dir );
if( curChild )
{
curChild->setTemporaryMarker( true );
@@ -597,7 +354,7 @@ printf("read dir: %s\n", d.canonicalPath().toAscii().constData() );
curChild->item()->setLastMod(
f.lastModified() );
if( curChild->item()->type() ==
Item::TypeDirectory )
ResourcesItem::TypeDirectory )
{
readDir( _dir + fname, curParent,
_base_dir );
@@ -619,20 +376,21 @@ printf("read dir: %s\n", d.canonicalPath().toAscii().constData() );
}
else if( f.isFile() )
{
Item * newItem =
new Item( f.fileName(),
Item::TypeUnknown,
ResourcesItem * newItem =
new ResourcesItem( f.fileName(),
ResourcesItem::TypeUnknown,
_base_dir, _dir );
newItem->setLastMod( f.lastModified() );
replaceItem( newItem );
TreeItem * ti = new TreeItem( curParent,
ResourcesTreeItem * ti =
new ResourcesTreeItem( curParent,
newItem );
ti->setTemporaryMarker( true );
}
}
}
for( TreeItemList::Iterator it = curParent->children().begin();
for( ResourcesTreeItemList::Iterator it = curParent->children().begin();
it != curParent->children().end(); )
{
if( (*it)->temporaryMarker() == false )

295
src/core/resources_item.cpp Normal file
View File

@@ -0,0 +1,295 @@
/*
* resources_item.cpp - implementation of ResourcesItem
*
* Copyright (c) 2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program (see COPYING); if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
*/
#include <QtCore/QCryptographicHash>
#include <QtCore/QHash>
#include <QtCore/QDir>
#include "resources_item.h"
#include "config_mgr.h"
ResourcesItem::ResourcesItem() :
m_name(),
m_nameHash( 0 ),
m_type( TypeUnknown ),
m_baseDir( BaseRoot ),
m_path(),
m_hash(),
m_size( -1 ),
m_lastMod(),
m_tags(),
m_treeItem( NULL )
{
init();
}
ResourcesItem::ResourcesItem( const QString & _name,
Type _type,
BaseDirectory _base_dir,
const QString & _path,
const QString & _hash,
const QString & _tags,
int _size,
const QDateTime & _last_mod ) :
m_name( _name ),
m_nameHash( 0 ),
m_type( _type ),
m_baseDir( _base_dir ),
m_path( _path ),
m_hash( _hash ),
m_size( _size ),
m_lastMod( _last_mod ),
m_tags( _tags ),
m_treeItem( NULL )
{
init();
}
void ResourcesItem::reload( void )
{
m_hash.clear();
m_size = -1;
init();
}
bool ResourcesItem::operator==( const ResourcesItem & _other ) const
{
return m_nameHash == _other.m_nameHash &&
m_name == _other.m_name &&
m_type == _other.m_type &&
m_path == _other.m_path &&
m_hash == _other.m_hash &&
m_size == _other.m_size &&
m_tags == _other.m_tags;
}
int ResourcesItem::equalityLevel( const ResourcesItem & _other ) const
{
int l = 0;
if( m_nameHash == _other.m_nameHash &&
m_name == _other.m_name &&
m_path == _other.m_path )
{
l += 40;
}
else if( m_nameHash == _other.m_nameHash && m_name == _other.m_name )
{
l += 30;
}
else if( m_path == _other.m_path )
{
l += 10;
}
if( m_type == _other.m_type )
{
l += 5;
}
if( !m_tags.isEmpty() && !_other.m_tags.isEmpty() )
{
QStringList my_tags = m_tags.split( " " );
QStringList o_tags = _other.m_tags.split( " " );
foreach( const QString & tag, o_tags )
{
if( my_tags.contains( tag ) )
{
l += 10;
}
}
}
if( m_size == _other.m_size )
{
l += 20;
}
if( m_hash == _other.m_hash )
{
l += 100;
}
return l;
}
ResourcesItem::Type ResourcesItem::guessType( void ) const
{
static QMap<QString, Type> typeMap;
if( typeMap.isEmpty() )
{
typeMap["wav"] = TypeSample;
typeMap["ogg"] = TypeSample;
typeMap["mp3"] = TypeSample;
typeMap["ds"] = TypeSample;
typeMap["flac"] = TypeSample;
typeMap["spx"] = TypeSample;
typeMap["voc"] = TypeSample;
typeMap["au"] = TypeSample;
typeMap["raw"] = TypeSample;
typeMap["aif"] = TypeSample;
typeMap["aiff"] = TypeSample;
typeMap["sf2"] = TypeSoundFont;
typeMap["xpf"] = TypePreset;
typeMap["mmp"] = TypeProject;
typeMap["mmpz"] = TypeProject;
typeMap["mid"] = TypeMidiFile;
typeMap["flp"] = TypeForeignProject;
typeMap["dll"] = TypePlugin;
typeMap["so"] = TypePlugin;
typeMap["png"] = TypeImage;
typeMap["jpg"] = TypeImage;
typeMap["jpeg"] = TypeImage;
}
const QString s = QFileInfo( fullName() ).suffix().toLower();
QMap<QString, Type>::ConstIterator it = typeMap.find( s );
if( it != typeMap.end() )
{
return it.value();
}
return TypeUnknown;
}
void ResourcesItem::init( void )
{
if( m_name.isEmpty() )
{
return;
}
// ensure trailing slash for path property
if( !m_path.isEmpty() && m_path.right( 1 ) != QDir::separator() )
{
m_path += QDir::separator();
}
if( m_type == TypeUnknown )
{
m_type = guessType();
}
// if item is a directory, ensure a trailing slash
if( m_type == TypeDirectory )
{
if( !m_name.isEmpty() &&
m_name.right( 1 ) != QDir::separator() )
{
m_name += QDir::separator();
}
if( m_hash.isEmpty() )
{
QCryptographicHash h( QCryptographicHash::Sha1 );
h.addData( fullName().toUtf8() );
m_hash = h.result().toHex();
}
}
// only stat file if we really need to
else if( ( m_hash.isEmpty() || m_size < 0 ) &&
QFile::exists( fullName() ) )
{
if( m_size < 0 )
{
m_size = QFileInfo( fullName() ).size();
}
if( m_hash.isEmpty() )
{
QCryptographicHash h( QCryptographicHash::Sha1 );
QFile f( fullName() );
f.open( QFile::ReadOnly );
const int chunkSize = 1024*1024; // 1 MB
for( int i = 0; i < f.size() / chunkSize; ++i )
{
h.addData( f.read( chunkSize ) );
}
h.addData( f.readAll() );
m_hash = h.result().toHex();
}
}
m_nameHash = qHash( m_name );
}
QString ResourcesItem::getBaseDirectory( BaseDirectory _bd )
{
QString d;
switch( _bd )
{
case BaseRoot:
d = QDir::rootPath();
break;
case BaseWorkingDir:
d = configManager::inst()->workingDir();
break;
case BaseDataDir:
d = configManager::inst()->dataDir();
break;
case BaseHome:
default:
d = QDir::homePath();
break;
}
if( !d.isEmpty() && d.right( 1 ) != QDir::separator() )
{
d += QDir::separator();
}
return d;
}

View File

@@ -0,0 +1,156 @@
/*
* resources_tree_item.cpp - implementation of ResourcesTreeItem
*
* Copyright (c) 2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program (see COPYING); if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
*/
#include <QtCore/QHash>
#include "resources_tree_item.h"
ResourcesTreeItem::ResourcesTreeItem( ResourcesTreeItem * _parent,
ResourcesItem * _item ) :
m_parent( _parent ),
m_hidden( false ),
m_temporaryMarker( false ),
m_item( _item )
{
if( m_parent )
{
m_parent->addChild( this );
}
if( m_item )
{
m_item->setTreeItem( this );
}
}
ResourcesTreeItem::~ResourcesTreeItem()
{
foreachResourcesTreeItem( m_children )
{
delete *it;
}
if( m_item )
{
m_item->setTreeItem( NULL );
}
if( m_parent )
{
m_parent->removeChild( this );
}
}
int ResourcesTreeItem::rowCount( void ) const
{
int rc = 0;
foreachConstResourcesTreeItem( m_children )
{
if( !(*it)->isHidden() )
{
++rc;
}
}
return rc;
}
ResourcesTreeItem * ResourcesTreeItem::getChild( int _row )
{
int rc = 0;
foreachResourcesTreeItem( m_children )
{
if( !(*it)->isHidden() )
{
if( rc == _row )
{
return *it;
}
++rc;
}
}
return NULL;
}
int ResourcesTreeItem::row( void ) const
{
if( !m_parent )
{
return 0;
}
int row = 0;
foreachConstResourcesTreeItem( m_parent->m_children )
{
if( !(*it)->isHidden() )
{
if( *it == this )
{
return row;
}
++row;
}
}
return 0;
}
ResourcesTreeItem * ResourcesTreeItem::findChild(
const QString & _name,
ResourcesItem::BaseDirectory _base_dir )
{
if( _name.isNull() || _name.isEmpty() )
{
return NULL;
}
const int hash = qHash( _name );
foreachResourcesTreeItem( m_children )
{
ResourcesTreeItem * rti = *it;
if( rti->item() &&
rti->item()->nameHash() == hash &&
rti->item()->name() == _name &&
rti->item()->baseDir() == _base_dir )
{
return rti;
}
}
return NULL;
}

View File

@@ -42,8 +42,8 @@ QVariant ResourcesTreeModel::data( const QModelIndex & _idx, int _role ) const
{
if( _idx.isValid() )
{
ResourcesDB::TreeItem * item =
static_cast<ResourcesDB::TreeItem *>(
ResourcesTreeItem * item =
static_cast<ResourcesTreeItem *>(
_idx.internalPointer() );
if( _role == Qt::DisplayRole )
{
@@ -51,9 +51,9 @@ QVariant ResourcesTreeModel::data( const QModelIndex & _idx, int _role ) const
{
switch( item->item()->baseDir() )
{
case ResourcesDB::Item::BaseWorkingDir:
case ResourcesItem::BaseWorkingDir:
return tr( "My LMMS files" );
case ResourcesDB::Item::BaseDataDir:
case ResourcesItem::BaseDataDir:
return tr( "Shipped LMMS files" );
default:
break;
@@ -67,9 +67,9 @@ QVariant ResourcesTreeModel::data( const QModelIndex & _idx, int _role ) const
{
switch( item->item()->baseDir() )
{
case ResourcesDB::Item::BaseWorkingDir:
case ResourcesItem::BaseWorkingDir:
return embed::getIconPixmap( "mimetypes/folder-workingdir", 24, 24 );
case ResourcesDB::Item::BaseDataDir:
case ResourcesItem::BaseDataDir:
return embed::getIconPixmap( "mimetypes/folder-datadir", 24, 24 );
default:
break;
@@ -77,19 +77,19 @@ QVariant ResourcesTreeModel::data( const QModelIndex & _idx, int _role ) const
}
switch( item->item()->type() )
{
case ResourcesDB::Item::TypeDirectory:
case ResourcesItem::TypeDirectory:
return embed::getIconPixmap( "mimetypes/folder", 24, 24 );
case ResourcesDB::Item::TypeSample:
case ResourcesItem::TypeSample:
return embed::getIconPixmap( "mimetypes/sample", 24, 24 );
case ResourcesDB::Item::TypePreset:
case ResourcesItem::TypePreset:
return embed::getIconPixmap( "mimetypes/preset", 24, 24 );
case ResourcesDB::Item::TypeProject:
case ResourcesItem::TypeProject:
return embed::getIconPixmap( "project_file", 24, 24 );
case ResourcesDB::Item::TypeMidiFile:
case ResourcesItem::TypeMidiFile:
return embed::getIconPixmap( "mimetypes/midi", 24, 24 );
case ResourcesDB::Item::TypeImage:
case ResourcesItem::TypeImage:
return embed::getIconPixmap( "mimetypes/image", 24, 24 );
case ResourcesDB::Item::TypePlugin:
case ResourcesItem::TypePlugin:
return embed::getIconPixmap( "mimetypes/plugin", 24, 24 );
default:
return embed::getIconPixmap( "mimetypes/unknown", 24, 24 );
@@ -104,7 +104,7 @@ default:
int ResourcesTreeModel::rowCount( const QModelIndex & _parent ) const
{
ResourcesDB::TreeItem * parentItem;
ResourcesTreeItem * parentItem;
if( _parent.column() > 0 )
{
@@ -117,7 +117,7 @@ int ResourcesTreeModel::rowCount( const QModelIndex & _parent ) const
}
else
{
parentItem = static_cast<ResourcesDB::TreeItem *>(
parentItem = static_cast<ResourcesTreeItem *>(
_parent.internalPointer() );
}
return parentItem->rowCount();
@@ -134,7 +134,7 @@ QModelIndex ResourcesTreeModel::index( int _row, int _col,
return QModelIndex();
}
ResourcesDB::TreeItem * parentItem;
ResourcesTreeItem * parentItem;
if( !_parent.isValid() )
{
@@ -142,7 +142,7 @@ QModelIndex ResourcesTreeModel::index( int _row, int _col,
}
else
{
parentItem = static_cast<ResourcesDB::TreeItem *>(
parentItem = static_cast<ResourcesTreeItem *>(
_parent.internalPointer() );
}
@@ -163,10 +163,10 @@ QModelIndex ResourcesTreeModel::parent( const QModelIndex & _idx ) const
return QModelIndex();
}
ResourcesDB::TreeItem * childItem =
static_cast<ResourcesDB::TreeItem *>(
ResourcesTreeItem * childItem =
static_cast<ResourcesTreeItem *>(
_idx.internalPointer() );
ResourcesDB::TreeItem * parentItem = childItem->parent();
ResourcesTreeItem * parentItem = childItem->parent();
if( parentItem == m_db->topLevelNode() )
{
return QModelIndex();
@@ -197,13 +197,13 @@ void ResourcesTreeModel::setFilter( const QString & _s )
bool ResourcesTreeModel::filterItems( ResourcesDB::TreeItem * _item,
bool ResourcesTreeModel::filterItems( ResourcesTreeItem * _item,
const QModelIndex & _parent,
const QStringList & _keywords )
{
if( _item->item() )
{
ResourcesDB::Item * i = _item->item();
ResourcesItem * i = _item->item();
bool accept = true;
for( QStringList::ConstIterator it = _keywords.begin();
it != _keywords.end(); ++it )
@@ -225,7 +225,7 @@ bool ResourcesTreeModel::filterItems( ResourcesDB::TreeItem * _item,
int row = 0;
bool hide = true;
for( ResourcesDB::TreeItemList::Iterator it = _item->children().begin();
for( ResourcesTreeItemList::Iterator it = _item->children().begin();
it != _item->children().end(); ++it )
{
QModelIndex idx = createIndex( row, 0, *it );
@@ -243,14 +243,14 @@ bool ResourcesTreeModel::filterItems( ResourcesDB::TreeItem * _item,
void ResourcesTreeModel::setHidden( ResourcesDB::TreeItem * _item,
void ResourcesTreeModel::setHidden( ResourcesTreeItem * _item,
const QModelIndex & _parent,
bool _hide, bool _recursive )
{
if( _recursive )
{
int row = 0;
for( ResourcesDB::TreeItemList::Iterator it =
for( ResourcesTreeItemList::Iterator it =
_item->children().begin();
it != _item->children().end(); ++it )
{