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

fixed compilation issues with GCC 4.3

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms/stable-0.3@690 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-02-11 15:12:42 +00:00
parent f2d1d74cbf
commit f94bb2cb66
26 changed files with 106 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/basic_filters.h
View File

@@ -238,7 +238,7 @@ public:
}
inline void calcFilterCoeffs( float _freq, float _q
void calcFilterCoeffs( float _freq, float _q
/*, const bool _q_is_bandwidth = FALSE*/ )
{
// temp coef vars

4
include/config_mgr.h
View File

@@ -1,7 +1,7 @@
/*
* config_mgr.h - class configManager, a class for managing LMMS-configuration
*
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -73,7 +73,7 @@ class configManager : public QDialog
{
Q_OBJECT
public:
static inline configManager * inst( void )
static configManager * inst( void )
{
if( s_instanceOfMe == NULL )
{

12
include/dummy_effect.h
View File

@@ -55,30 +55,30 @@ public:
class dummyEffect : public effect
{
public:
inline dummyEffect( void ) :
dummyEffect( void ) :
effect( NULL, NULL )
{
}
inline virtual ~dummyEffect()
virtual ~dummyEffect()
{
}
inline virtual void saveSettings( QDomDocument &, QDomElement & )
virtual void FASTCALL saveSettings( QDomDocument &, QDomElement & )
{
}
inline virtual void loadSettings( const QDomElement & )
virtual void FASTCALL loadSettings( const QDomElement & )
{
}
inline virtual QString nodeName( void ) const
virtual QString nodeName( void ) const
{
return( "dummyeffect" );
}
inline virtual effectControlDialog * createControlDialog( track * )
virtual effectControlDialog * createControlDialog( track * )
{
return( new dummyEffectControlDialog( this ) );
}

12
include/dummy_instrument.h
View File

@@ -2,7 +2,7 @@
* dummy_instrument.h - instrument used as fallback if an instrument couldn't
* be loaded
*
* Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -33,25 +33,25 @@
class dummyInstrument : public instrument
{
public:
inline dummyInstrument( instrumentTrack * _channel_track ) :
dummyInstrument( instrumentTrack * _channel_track ) :
instrument( _channel_track, NULL )
{
}
inline virtual ~dummyInstrument()
virtual ~dummyInstrument()
{
}
inline virtual void saveSettings( QDomDocument &, QDomElement & )
virtual void FASTCALL saveSettings( QDomDocument &, QDomElement & )
{
}
inline virtual void loadSettings( const QDomElement & )
virtual void FASTCALL loadSettings( const QDomElement & )
{
}
inline virtual QString nodeName( void ) const
virtual QString nodeName( void ) const
{
return( "dummyinstrument" );
}

12
include/dummy_plugin.h
View File

@@ -2,7 +2,7 @@
* dummy_plugin.h - empty plugin which is used as fallback if a plugin couldn't
* be found
*
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -33,25 +33,25 @@
class dummyPlugin : public plugin
{
public:
inline dummyPlugin( void ) :
dummyPlugin( void ) :
plugin( NULL )
{
}
inline virtual ~dummyPlugin()
virtual ~dummyPlugin()
{
}
inline virtual void saveSettings( QDomDocument &, QDomElement & )
virtual void FASTCALL saveSettings( QDomDocument &, QDomElement & )
{
}
inline virtual void loadSettings( const QDomElement & )
virtual void FASTCALL loadSettings( const QDomElement & )
{
}
inline virtual QString nodeName( void ) const
virtual QString nodeName( void ) const
{
return( "dummyplugin" );
}

4
include/file_browser.h
View File

@@ -1,7 +1,7 @@
/*
* file_browser.h - include file for fileBrowser
*
* Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -223,7 +223,7 @@ public:
const QString & _path );
#endif
inline QString fullName( void ) const
QString fullName( void ) const
{
return( QDir::cleanPath( m_path ) + QDir::separator() +
text( 0 ) );

6
include/instrument_track.h
View File

@@ -106,11 +106,7 @@ public:
void FASTCALL deleteNotePluginData( notePlayHandle * _n );
// name-stuff
inline const QString & name( void ) const
{
return( m_name );
}
void FASTCALL setName( const QString & _new_name );
virtual void setName( const QString & _new_name );
// volume & surround-position-stuff
void FASTCALL setVolume( volume _new_volume );

2
include/journalling_object.h
View File

@@ -115,7 +115,7 @@ public:
journallingObject( void );
virtual ~journallingObject();
inline const jo_id_t id( void ) const
inline jo_id_t id( void ) const
{
return( m_id );
}

6
include/midi_time.h
View File

@@ -2,7 +2,7 @@
* midi_time.h - declaration of class midiTime which provides data-type for
* position- and length-variables
*
* Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -39,7 +39,7 @@ public:
{
}
inline midiTime( const Sint32 _abs = 0 ) :
midiTime( const Sint32 _abs = 0 ) :
m_tact( _abs / 64 ),
m_tact64th( _abs % 64 )
{
@@ -50,7 +50,7 @@ public:
*this = _t;
}
inline midiTime toNearestTact( void ) const
midiTime toNearestTact( void ) const
{
if( m_tact64th >= 32 )
{

4
include/track.h
View File

@@ -2,7 +2,7 @@
* track.h - declaration of classes concerning tracks -> neccessary for all
* track-like objects (beat/bassline, sample-track...)
*
* Copyright (c) 2004-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -498,7 +498,7 @@ public:
{
return( m_name );
}
inline virtual void setName( const QString & _new_name )
virtual void setName( const QString & _new_name )
{
m_name = _new_name;
}

18
include/types.h
View File

@@ -1,7 +1,7 @@
/*
* types.h - typedefs for common types that are used in the whole app
*
* Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2004-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -26,6 +26,8 @@
#ifndef _TYPES_H
#define _TYPES_H
#include <limits>
typedef unsigned char Uint8;
typedef signed char Sint8;
typedef unsigned short Uint16;
@@ -60,13 +62,15 @@ typedef Uint32 jo_id_t; // (unique) ID of a journalling object
template<typename T>
struct valueRanges
{
enum
static inline T min( void )
{
max = static_cast<T>( static_cast<T>( ~0 ) > 0 ?
~0 : ( ( ( T ) 1 << ( sizeof( T ) * 8 - 1 ) ) - 1 ) ),
min = static_cast<T>( static_cast<T>( ~0 ) > 0 ?
0 : ( -max - 1 ) )
} ;
return( std::numeric_limits<T>::min() );
}
static inline T max( void )
{
return( std::numeric_limits<T>::max() );
}
} ;