Dropped ResourceItem type "TypeSoundFont"

Dropped separate ResourceItem type "TypeSoundFont" as theres no benefit
from distinguishing it from other plugin-specific files. Soundfonts now
are treated as TypePluginSpecificResource.

Furthermore some minor coding style cleanups.

Signed-off-by: Tobias Doerffel <tobias.doerffel@gmail.com>

include/ResourceItem.h

@@ -53,7 +53,6 @@ public:
 		TypeUnknown,
 		TypeDirectory,
 		TypeSample,
-		TypeSoundFont,
 		TypePreset,
 		TypePluginSpecificResource,
 		TypeProject,

include/ResourceTreeItem.h

@@ -55,16 +55,16 @@ public:
 		m_hidden = _h;
 	}
 
-	inline bool isHidden( void ) const
+	inline bool isHidden() const
 	{
 		return m_hidden;
 	}
 
-	int rowCount( void ) const;
+	int rowCount() const;
 
 	ResourceTreeItem * getChild( int _row );
 
-	int row( void ) const;
+	int row() const;
 
 	inline void addChild( ResourceTreeItem * _it )
 	{
@@ -76,12 +76,12 @@ public:
 		m_children.removeAll( _it );
 	}
 
-	inline ResourceTreeItemList & children( void )
+	inline ResourceTreeItemList & children()
 	{
 		return m_children;
 	}
 
-	inline const ResourceTreeItemList & children( void ) const
+	inline const ResourceTreeItemList & children() const
 	{
 		return m_children;
 	}
@@ -89,17 +89,17 @@ public:
 	ResourceTreeItem * findChild( const QString & _name,
 				ResourceItem::BaseDirectory _base_dir );
 
-	inline ResourceItem * item( void )
+	inline ResourceItem * item()
 	{
 		return m_item;
 	}
 
-	inline const ResourceItem * item( void ) const
+	inline const ResourceItem * item() const
 	{
 		return m_item;
 	}
 
-	inline ResourceTreeItem * parent( void )
+	inline ResourceTreeItem * parent()
 	{
 		return m_parent;
 	}
@@ -109,7 +109,7 @@ public:
 		m_parent = _parent;
 	}
 
-	inline bool temporaryMarker( void ) const
+	inline bool temporaryMarker() const
 	{
 		return m_temporaryMarker;
 	}

src/core/ResourceDB.cpp

@@ -46,7 +46,6 @@ ResourceDB::ResourceDB( ResourceProvider * _provider ) :
 		s_typeNames[ResourceItem::TypeUnknown] = "Unknown";
 		s_typeNames[ResourceItem::TypeDirectory] = "Directory";
 		s_typeNames[ResourceItem::TypeSample] = "Sample";
-		s_typeNames[ResourceItem::TypeSoundFont] = "SoundFont";
 		s_typeNames[ResourceItem::TypePreset] = "Preset";
 		s_typeNames[ResourceItem::TypeProject] = "Project";
 		s_typeNames[ResourceItem::TypeMidiFile] = "MidiFile";

src/core/ResourceItem.cpp

@@ -84,7 +84,7 @@ ResourceItem::ResourceItem( const ResourceItem & _item ) :
 
 
 
-void ResourceItem::reload( void )
+void ResourceItem::reload()
 {
 	m_hash.clear();
 	m_size = -1;
@@ -165,7 +165,7 @@ int ResourceItem::equalityLevel( const ResourceItem & _other ) const
 
 
 
-ResourceItem::Type ResourceItem::guessType( void ) const
+ResourceItem::Type ResourceItem::guessType() const
 {
 	static QMap<QString, Type> typeMap;
 	if( typeMap.isEmpty() )
@@ -182,8 +182,6 @@ ResourceItem::Type ResourceItem::guessType( void ) const
 		typeMap["aif"] = TypeSample;
 		typeMap["aiff"] = TypeSample;
 
-		typeMap["sf2"] = TypeSoundFont;
-
 		typeMap["xpf"] = TypePreset;
 
 		typeMap["mmp"] = TypeProject;
@@ -224,7 +222,7 @@ ResourceItem::Type ResourceItem::guessType( void ) const
 
 
 
-void ResourceItem::init( void )
+void ResourceItem::init()
 {
 	// ensure trailing slash for path property
 	if( !m_path.isEmpty() && m_path.right( 1 ) != QDir::separator() )

src/core/ResourcePreviewer.cpp

@@ -93,9 +93,7 @@ void ResourcePreviewer::preview( ResourceItem * _item )
 							midiPort::Disabled );
 			break;
 		case ResourceItem::TypeSample:
-		case ResourceItem::TypeSoundFont:
 		case ResourceItem::TypePluginSpecificResource:
-		{
 			// restore default settings we are going to preview a
 			// sample (which should be played at a default
 			// instrument track)
@@ -104,7 +102,6 @@ void ResourcePreviewer::preview( ResourceItem * _item )
 					firstChild().toElement() );
 			ResourceAction( _item ).loadByPlugin( m_previewTrack );
 			break;
-		}
 		default:
 			handledItem = false;
 			break;

src/core/ResourceTreeItem.cpp

@@ -67,7 +67,7 @@ ResourceTreeItem::~ResourceTreeItem()
 
 
 
-int ResourceTreeItem::rowCount( void ) const
+int ResourceTreeItem::rowCount() const
 {
 	int rc = 0;
 	foreachConstResourceTreeItem( m_children )
@@ -103,7 +103,7 @@ ResourceTreeItem * ResourceTreeItem::getChild( int _row )
 
 
 
-int ResourceTreeItem::row( void ) const
+int ResourceTreeItem::row() const
 {
 	if( !m_parent )
 	{

src/gui/ResourceBrowser.cpp

@@ -200,7 +200,6 @@ void ResourceBrowser::showContextMenu( const QPoint & _pos )
 	switch( item->type() )
 	{
 		case ResourceItem::TypeSample:
-		case ResourceItem::TypeSoundFont:
 		case ResourceItem::TypePreset:
 		case ResourceItem::TypePluginSpecificResource:
 		case ResourceItem::TypePlugin:
@@ -292,7 +291,6 @@ void ResourceBrowser::triggerDefaultAction( const QModelIndex & _idx )
 		case ResourceItem::TypePreset:
 		case ResourceItem::TypePluginSpecificResource:
 		case ResourceItem::TypePlugin:
-		case ResourceItem::TypeSoundFont:
 			action = LoadInNewTrackSongEditor;
 			break;
 		case ResourceItem::TypeProject:

src/gui/track_container_view.cpp

@@ -419,7 +419,6 @@ void trackContainerView::dropEvent( QDropEvent * _de )
 								m_tc ) ) );
 		break;
 	case ResourceItem::TypeSample:
-	case ResourceItem::TypeSoundFont:
 	case ResourceItem::TypePluginSpecificResource:
 		action.loadByPlugin(
 			dynamic_cast<instrumentTrack *>(