mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-05-24 14:47:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

sed: s/( void )/(), s/FALSE/false/, s/TRUE/true

Browse Source 
Replaced remaining occurences of old constants and superfluous "void"
on empty argument list of functions.
(cherry picked from commit 166701f9f3)
This commit is contained in:
Tobias Doerffel
2009-08-24 23:25:26 +02:00
parent 1d5cb23385
commit f4dbb2ff5c
175 changed files with 1130 additions and 1130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/Controller.h
View File

@@ -62,7 +62,7 @@ public:
virtual float currentValue( int _offset );
inline bool isSampleExact( void ) const
inline bool isSampleExact() const
{
return m_sampleExact ||
engine::getMixer()->currentQualitySettings().
@@ -74,26 +74,26 @@ public:
m_sampleExact = _exact;
}
inline ControllerTypes type( void ) const
inline ControllerTypes type() const
{
return( m_type );
}
// return whether this controller updates models frequently - used for
// determining when to update GUI
inline bool frequentUpdates( void ) const
inline bool frequentUpdates() const
{
switch( m_type )
{
case LfoController: return( TRUE );
case PeakController: return( TRUE );
case LfoController: return( true );
case PeakController: return( true );
default:
break;
}
return( FALSE );
return( false );
}
virtual const QString & name( void ) const
virtual const QString & name() const
{
return( m_name );
}
@@ -101,7 +101,7 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
static Controller * create( ControllerTypes _tt, Model * _parent );
static Controller * create( const QDomElement & _this,
@@ -115,8 +115,8 @@ public:
static unsigned int runningFrames();
static float runningTime();
static void triggerFrameCounter( void );
static void resetFrameCounter( void );
static void triggerFrameCounter();
static void resetFrameCounter();
public slots:
@@ -147,7 +147,7 @@ protected:
signals:
// The value changed while the mixer isn't running (i.e: MIDI CC)
void valueChanged( void );
void valueChanged();
friend class ControllerDialog;

14
include/ControllerConnection.h
View File

@@ -50,7 +50,7 @@ public:
virtual ~ControllerConnection();
inline Controller * getController( void )
inline Controller * getController()
{
return m_controller;
}
@@ -66,24 +66,24 @@ public:
inline void setTargetName( const QString & _name );
inline QString targetName( void ) const
inline QString targetName() const
{
return m_targetName;
}
inline bool isFinalized( void )
inline bool isFinalized()
{
return m_controllerId < 0;
}
static void finalizeConnections( void );
static void finalizeConnections();
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
public slots:
void deleteConnection( void );
void deleteConnection();
protected:
//virtual controllerDialog * createDialog( QWidget * _parent );
@@ -97,7 +97,7 @@ protected:
signals:
// The value changed while the mixer isn't running (i.e: MIDI CC)
void valueChanged( void );
void valueChanged();
friend class ControllerConnectionDialog;
};

12
include/ControllerConnectionDialog.h
View File

@@ -56,22 +56,22 @@ public:
const AutomatableModel * _target_model );
virtual ~ControllerConnectionDialog();
Controller * chosenController( void )
Controller * chosenController()
{
return m_controller;
}
public slots:
// void setSelection( const effectKey & _selection );
void selectController( void );
void midiToggled( void );
void userToggled( void );
void autoDetectToggled( void );
void selectController();
void midiToggled();
void userToggled();
void autoDetectToggled();
void enableAutoDetect( QAction * _a );
protected slots:
void midiValueChanged( void );
void midiValueChanged();
private:

14
include/ControllerView.h
View File

@@ -46,22 +46,22 @@ public:
ControllerView( Controller * _controller, QWidget * _parent );
virtual ~ControllerView();
inline Controller * getController( void )
inline Controller * getController()
{
return( castModel<Controller>() );
}
inline const Controller * getController( void ) const
inline const Controller * getController() const
{
return( castModel<Controller>() );
}
public slots:
void editControls( void );
void deleteController( void );
void displayHelp( void );
void closeControls( void );
void editControls();
void deleteController();
void displayHelp();
void closeControls();
signals:
@@ -71,7 +71,7 @@ signals:
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void paintEvent( QPaintEvent * _pe );
virtual void modelChanged( void );
virtual void modelChanged();
virtual void mouseDoubleClickEvent( QMouseEvent * event );

2
include/LadspaControl.h
View File

@@ -40,7 +40,7 @@ class EXPORT LadspaControl : public Model, public JournallingObject
Q_OBJECT
public:
LadspaControl( Model * _parent, port_desc_t * _port,
bool _link = FALSE );
bool _link = false );
~LadspaControl();
LADSPA_Data value();

6
include/MainWindow.h
View File

@@ -146,9 +146,9 @@ private:
struct keyModifiers
{
keyModifiers() :
m_ctrl( FALSE ),
m_shift( FALSE ),
m_alt( FALSE )
m_ctrl( false ),
m_shift( false ),
m_alt( false )
{
}
bool m_ctrl;

4
include/MidiController.h
View File

@@ -54,7 +54,7 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
// Used by controllerConnectionDialog to copy
void subscribeReadablePorts( const MidiPort::Map & _map );
@@ -62,7 +62,7 @@ public:
public slots:
virtual ControllerDialog * createDialog( QWidget * _parent );
void updateName( void );
void updateName();
protected:

4
include/PeakController.h
View File

@@ -51,7 +51,7 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _this );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
static PeakControllerEffectVector s_effects;
static int s_lastEffectId;
@@ -82,7 +82,7 @@ public:
protected:
virtual void contextMenuEvent( QContextMenuEvent * _me );
virtual void paintEvent( QPaintEvent * _pe );
virtual void modelChanged( void );
virtual void modelChanged();
PeakController * m_peakController;

10
include/automatable_button.h
View File

@@ -48,12 +48,12 @@ public:
model()->setJournalling( _on );
}
virtual void modelChanged( void );
virtual void modelChanged();
public slots:
virtual void update( void );
virtual void toggle( void );
virtual void update();
virtual void toggle();
virtual void setChecked( bool _on )
{
// QPushButton::setChecked is called in update-slot
@@ -92,11 +92,11 @@ public:
void activateButton( automatableButton * _btn );
virtual void modelChanged( void );
virtual void modelChanged();
private slots:
void updateButtons( void );
void updateButtons();
private:

6
include/automatable_slider.h
View File

@@ -39,7 +39,7 @@ public:
automatableSlider( QWidget * _parent, const QString & _name = QString::null );
virtual ~automatableSlider();
bool showStatus( void )
bool showStatus()
{
return( m_showStatus );
}
@@ -56,7 +56,7 @@ protected:
virtual void mouseReleaseEvent( QMouseEvent * _me );
virtual void wheelEvent( QWheelEvent * _me );
virtual void modelChanged( void );
virtual void modelChanged();
private:
@@ -66,7 +66,7 @@ private:
private slots:
void changeValue( int _value );
void moveSlider( int _value );
void updateSlider( void );
void updateSlider();
} ;

44
include/automation_editor.h
View File

@@ -52,29 +52,29 @@ class automationEditor : public QWidget, public JournallingObject
public:
void setCurrentPattern( automationPattern * _new_pattern );
inline const automationPattern * currentPattern( void ) const
inline const automationPattern * currentPattern() const
{
return( m_pattern );
}
inline bool validPattern( void ) const
inline bool validPattern() const
{
return( m_pattern != NULL );
}
int quantization( void ) const;
int quantization() const;
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
inline virtual QString nodeName( void ) const
inline virtual QString nodeName() const
{
return( "automationeditor" );
}
public slots:
void update( void );
void update();
protected:
@@ -94,33 +94,33 @@ protected:
static inline void drawValueRect( QPainter & _p, int _x, int _y,
int _width, int _height,
const bool _is_selected );
void removeSelection( void );
void selectAll( void );
void removeSelection();
void selectAll();
void getSelectedValues( timeMap & _selected_values );
void drawLine( int x0, float y0, int x1, float y1 );
protected slots:
void play( void );
void stop( void );
void play();
void stop();
void horScrolled( int _new_pos );
void verScrolled( int _new_pos );
void drawButtonToggled( void );
void eraseButtonToggled( void );
void selectButtonToggled( void );
void moveButtonToggled( void );
void drawButtonToggled();
void eraseButtonToggled();
void selectButtonToggled();
void moveButtonToggled();
void copySelectedValues( void );
void cutSelectedValues( void );
void pasteValues( void );
void deleteSelectedValues( void );
void copySelectedValues();
void cutSelectedValues();
void pasteValues();
void deleteSelectedValues();
void updatePosition( const midiTime & _t );
void zoomingXChanged( void );
void zoomingYChanged( void );
void zoomingXChanged();
void zoomingYChanged();
private:
@@ -154,7 +154,7 @@ private:
static const int VALUES_WIDTH = 64;
automationEditor( void );
automationEditor();
automationEditor( const automationEditor & );
virtual ~automationEditor();
@@ -195,7 +195,7 @@ private:
float m_bottomLevel;
float m_topLevel;
void updateTopBottomLevels( void );
void updateTopBottomLevels();
QScrollBar * m_leftRightScroll;
QScrollBar * m_topBottomScroll;
@@ -231,7 +231,7 @@ private:
bool m_scrollBack;
void drawCross( QPainter & _p );
bool inBBEditor( void );
bool inBBEditor();

22
include/automation_pattern.h
View File

@@ -51,44 +51,44 @@ public:
void addObject( AutomatableModel * _obj, bool _search_dup = true );
const AutomatableModel * firstObject( void ) const;
const AutomatableModel * firstObject() const;
virtual midiTime length( void ) const;
virtual midiTime length() const;
midiTime putValue( const midiTime & _time, const float _value,
const bool _quant_pos = true );
void removeValue( const midiTime & _time );
inline const timeMap & getTimeMap( void ) const
inline const timeMap & getTimeMap() const
{
return m_timeMap;
}
inline timeMap & getTimeMap( void )
inline timeMap & getTimeMap()
{
return m_timeMap;
}
inline bool hasAutomation( void ) const
inline bool hasAutomation() const
{
return m_hasAutomation;
}
float valueAt( const midiTime & _time ) const;
const QString name( void ) const;
const QString name() const;
// settings-management
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
static inline const QString classNodeName( void )
static inline const QString classNodeName()
{
return "automationpattern";
}
inline virtual QString nodeName( void ) const
inline virtual QString nodeName() const
{
return classNodeName();
}
@@ -101,12 +101,12 @@ public:
static bool isAutomated( const AutomatableModel * _m );
static automationPattern * globalAutomationPattern(
AutomatableModel * _m );
static void resolveAllIDs( void );
static void resolveAllIDs();
public slots:
void clear( void );
void openInAutomationEditor( void );
void clear();
void openInAutomationEditor();
void objectDestroyed( jo_id_t );

6
include/automation_pattern_view.h
View File

@@ -40,12 +40,12 @@ public:
public slots:
virtual void update( void );
virtual void update();
protected slots:
void resetName( void );
void changeName( void );
void resetName();
void changeName();
void disconnectObject( QAction * _a );

4
include/automation_track.h
View File

@@ -34,14 +34,14 @@
class automationTrack : public track
{
public:
automationTrack( trackContainer * _tc, bool _hidden = FALSE );
automationTrack( trackContainer * _tc, bool _hidden = false );
virtual ~automationTrack();
virtual bool play( const midiTime & _start, const fpp_t _frames,
const f_cnt_t _frame_base,
Sint16 _tco_num = -1 );
virtual QString nodeName( void ) const
virtual QString nodeName() const
{
return( "automationtrack" );
}

6
include/basic_filters.h
View File

@@ -57,12 +57,12 @@ public:
NumFilters
} ;
static inline float minFreq( void )
static inline float minFreq()
{
return( 0.01f );
}
static inline float minQ( void )
static inline float minQ()
{
return( 0.01f );
}
@@ -104,7 +104,7 @@ public:
delete m_subFilter;
}
inline void clearHistory( void )
inline void clearHistory()
{
// reset in/out history
for( ch_cnt_t _chnl = 0; _chnl < CHANNELS; ++_chnl )

12
include/bb_editor.h
View File

@@ -41,19 +41,19 @@ public:
bbEditor( bbTrackContainer * _tc );
virtual ~bbEditor();
virtual inline bool fixedTCOs( void ) const
virtual inline bool fixedTCOs() const
{
return( TRUE );
return( true );
}
void removeBBView( int _bb );
public slots:
void play( void );
void stop( void );
void updatePosition( void );
void addAutomationTrack( void );
void play();
void stop();
void updatePosition();
void addAutomationTrack();
private:
virtual void keyPressEvent( QKeyEvent * _ke );

22
include/bb_track.h
View File

@@ -44,12 +44,12 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
inline virtual QString nodeName( void ) const
inline virtual QString nodeName() const
{
return( "bbtco" );
}
inline unsigned int color( void ) const
inline unsigned int color() const
{
return( m_color );
}
@@ -74,7 +74,7 @@ public:
bbTCOView( trackContentObject * _tco, trackView * _tv );
virtual ~bbTCOView();
QColor color( void ) const
QColor color() const
{
return( m_bbTCO->m_color );
}
@@ -82,10 +82,10 @@ public:
protected slots:
void openInBBEditor( void );
void resetName( void );
void changeName( void );
void changeColor( void );
void openInBBEditor();
void resetName();
void changeName();
void changeColor();
protected:
@@ -139,7 +139,7 @@ public:
protected:
inline virtual QString nodeName( void ) const
inline virtual QString nodeName() const
{
return( "bbtrack" );
}
@@ -165,16 +165,16 @@ public:
bbTrackView( bbTrack * _bbt, trackContainerView * _tcv );
virtual ~bbTrackView();
virtual bool close( void );
virtual bool close();
const bbTrack * getBBTrack( void ) const
const bbTrack * getBBTrack() const
{
return( m_bbTrack );
}
public slots:
void clickedTrackLabel( void );
void clickedTrackLabel();
private:

20
include/bb_track_container.h
View File

@@ -35,40 +35,40 @@ class EXPORT bbTrackContainer : public trackContainer
Q_OBJECT
mapPropertyFromModel(int,currentBB,setCurrentBB,m_bbComboBoxModel);
public:
bbTrackContainer( void );
bbTrackContainer();
virtual ~bbTrackContainer();
virtual bool play( midiTime _start, const fpp_t _frames,
const f_cnt_t _frame_base,
Sint16 _tco_num = -1 );
virtual void updateAfterTrackAdd( void );
virtual void updateAfterTrackAdd();
inline virtual QString nodeName( void ) const
inline virtual QString nodeName() const
{
return "bbtrackcontainer";
}
tact_t lengthOfBB( int _bb );
inline tact_t lengthOfCurrentBB( void )
inline tact_t lengthOfCurrentBB()
{
return lengthOfBB( currentBB() );
}
int numOfBBs( void ) const;
int numOfBBs() const;
void removeBB( int _bb );
void swapBB( int _bb1, int _bb2 );
void updateBBTrack( trackContentObject * _tco );
void fixIncorrectPositions( void );
void fixIncorrectPositions();
void createTCOsForBB( int _bb );
public slots:
void play( void );
void stop( void );
void updateComboBox( void );
void currentBBChanged( void );
void play();
void stop();
void updateComboBox();
void currentBBChanged();
private:

4
include/combobox.h
View File

@@ -41,12 +41,12 @@ public:
comboBox( QWidget * _parent, const QString & _name = QString() );
virtual ~comboBox();
ComboBoxModel * model( void )
ComboBoxModel * model()
{
return( castModel<ComboBoxModel>() );
}
const ComboBoxModel * model( void ) const
const ComboBoxModel * model() const
{
return( castModel<ComboBoxModel>() );
}

48
include/config_mgr.h
View File

@@ -50,7 +50,7 @@ const QString LOCALE_PATH = "locale/";
class EXPORT configManager
{
public:
static inline configManager * inst( void )
static inline configManager * inst()
{
if( s_instanceOfMe == NULL )
{
@@ -59,106 +59,106 @@ public:
return( s_instanceOfMe );
}
const QString & dataDir( void ) const
const QString & dataDir() const
{
return( m_dataDir );
}
const QString & workingDir( void ) const
const QString & workingDir() const
{
return( m_workingDir );
}
QString userProjectsDir( void ) const
QString userProjectsDir() const
{
return( workingDir() + PROJECTS_PATH );
}
QString userPresetsDir( void ) const
QString userPresetsDir() const
{
return( workingDir() + PRESETS_PATH );
}
QString userSamplesDir( void ) const
QString userSamplesDir() const
{
return( workingDir() + SAMPLES_PATH );
}
QString factoryProjectsDir( void ) const
QString factoryProjectsDir() const
{
return( dataDir() + PROJECTS_PATH );
}
QString factoryPresetsDir( void ) const
QString factoryPresetsDir() const
{
return( dataDir() + PRESETS_PATH );
}
QString factorySamplesDir( void ) const
QString factorySamplesDir() const
{
return( dataDir() + SAMPLES_PATH );
}
QString defaultArtworkDir( void ) const
QString defaultArtworkDir() const
{
return( m_dataDir + DEFAULT_THEME_PATH );
}
QString artworkDir( void ) const
QString artworkDir() const
{
return( m_artworkDir );
}
QString trackIconsDir( void ) const
QString trackIconsDir() const
{
return( m_dataDir + TRACK_ICON_PATH );
}
QString localeDir( void ) const
QString localeDir() const
{
return( m_dataDir + LOCALE_PATH );
}
const QString & pluginDir( void ) const
const QString & pluginDir() const
{
return( m_pluginDir );
}
const QString & vstDir( void ) const
const QString & vstDir() const
{
return( m_vstDir );
}
const QString & flDir( void ) const
const QString & flDir() const
{
return( m_flDir );
}
const QString & ladspaDir( void ) const
const QString & ladspaDir() const
{
return( m_ladDir );
}
#ifdef LMMS_HAVE_STK
const QString & stkDir( void ) const
const QString & stkDir() const
{
return( m_stkDir );
}
#endif
#ifdef LMMS_HAVE_FLUIDSYNTH
const QString & defaultSoundfont( void ) const
const QString & defaultSoundfont() const
{
return( m_defaultSoundfont );
}
#endif
const QString & backgroundArtwork( void ) const
const QString & backgroundArtwork() const
{
return( m_backgroundArtwork );
}
inline const QStringList & recentlyOpenedProjects( void ) const
inline const QStringList & recentlyOpenedProjects() const
{
return( m_recentlyOpenedProjects );
}
@@ -170,8 +170,8 @@ public:
void setValue( const QString & _class, const QString & _attribute,
const QString & _value );
void loadConfigFile( void );
void saveConfigFile( void );
void loadConfigFile();
void saveConfigFile();
void setWorkingDir( const QString & _wd );
@@ -187,7 +187,7 @@ public:
private:
static configManager * s_instanceOfMe;
configManager( void );
configManager();
configManager( const configManager & _c );
~configManager();

8
include/detuning_helper.h
View File

@@ -33,7 +33,7 @@
class detuningHelper : public inlineAutomation
{
public:
detuningHelper( void ) :
detuningHelper() :
inlineAutomation()
{
}
@@ -42,17 +42,17 @@ public:
{
}
virtual float defaultValue( void ) const
virtual float defaultValue() const
{
return( 0 );
}
virtual QString displayName( void ) const
virtual QString displayName() const
{
return( tr( "Note detuning" ) );
}
inline virtual QString nodeName( void ) const
inline virtual QString nodeName() const
{
return( "detuning" );
}

6
include/effect_lib.h
View File

@@ -90,12 +90,12 @@ namespace effectLib
_in_right = m_rightFX.nextSample( _in_right );
}
FXL & leftFX( void )
FXL & leftFX()
{
return( m_leftFX );
}
FXR & rightFX( void )
FXR & rightFX()
{
return( m_rightFX );
}
@@ -303,7 +303,7 @@ namespace effectLib
}
private:
void updateFilter( void )
void updateFilter()
{
m_beta = sqrtf( ( m_a*m_a + 1 ) / m_shape -
powf( m_a - 1, 2 ) );

8
include/embed.h
View File

@@ -74,7 +74,7 @@ public:
{
}
virtual QPixmap pixmap( void ) const
virtual QPixmap pixmap() const
{
if( !m_name.isEmpty() )
{
@@ -88,7 +88,7 @@ public:
{
}
virtual QString pixmapName( void ) const
virtual QString pixmapName() const
{
return m_name;
}
@@ -107,7 +107,7 @@ public:
{
}
virtual QPixmap pixmap( void ) const
virtual QPixmap pixmap() const
{
if( !m_name.isEmpty() )
{
@@ -117,7 +117,7 @@ public:
return( QPixmap() );
}
virtual QString pixmapName( void ) const
virtual QString pixmapName() const
{
return QString( STRINGIFY(PLUGIN_NAME) ) + "::" + m_name;
}

2
include/endian_handling.h
View File

@@ -31,7 +31,7 @@
#include "lmms_basics.h"
inline bool isLittleEndian( void )
inline bool isLittleEndian()
{
return( QSysInfo::ByteOrder == QSysInfo::LittleEndian );
}

4
include/fade_button.h
View File

@@ -42,7 +42,7 @@ public:
public slots:
void activate( void );
void activate();
protected:
@@ -55,7 +55,7 @@ private:
QColor m_normalColor;
QColor m_activatedColor;
void signalUpdate( void );
void signalUpdate();
} ;

4
include/fifo_buffer.h
View File

@@ -57,7 +57,7 @@ public:
m_reader_sem.release();
}
T read( void )
T read()
{
m_reader_sem.acquire();
T element = m_buffer[m_reader_index++];
@@ -66,7 +66,7 @@ public:
return( element );
}
bool available( void )
bool available()
{
return( m_reader_sem.available() );
}

2
include/graph.h
View File

@@ -111,7 +111,7 @@ public:
float _max,
int _size,
:: Model * _parent,
bool _default_constructed = FALSE,
bool _default_constructed = false,
float _step = 0.0 );
virtual ~graphModel();

6
include/group_box.h
View File

@@ -42,9 +42,9 @@ public:
groupBox( const QString & _caption, QWidget * _parent = NULL );
virtual ~groupBox();
virtual void modelChanged( void );
virtual void modelChanged();
pixmapButton * ledButton( void )
pixmapButton * ledButton()
{
return m_led;
}
@@ -56,7 +56,7 @@ protected:
private:
void updatePixmap( void );
void updatePixmap();
pixmapButton * m_led;
QString m_caption;

8
include/inline_automation.h
View File

@@ -33,7 +33,7 @@
class inlineAutomation : public FloatModel, public sharedObject
{
public:
inlineAutomation( void ) :
inlineAutomation() :
FloatModel(),
sharedObject(),
m_autoPattern( NULL )
@@ -48,9 +48,9 @@ public:
}
}
virtual float defaultValue( void ) const = 0;
virtual float defaultValue() const = 0;
inline bool hasAutomation( void ) const
inline bool hasAutomation() const
{
return m_autoPattern != NULL &&
!typeInfo<float>::isEqual(
@@ -58,7 +58,7 @@ public:
defaultValue() );
}
automationPattern * getAutomationPattern( void )
automationPattern * getAutomationPattern()
{
if( m_autoPattern == NULL )
{

32
include/knob.h
View File

@@ -75,28 +75,28 @@ public:
void setTotalAngle( float _angle );
// Begin styled knob accessors
float innerRadius( void ) const;
float innerRadius() const;
void setInnerRadius( float _r );
float outerRadius( void ) const;
float outerRadius() const;
void setOuterRadius( float _r );
QPointF centerPoint( void ) const;
float centerPointX( void ) const;
QPointF centerPoint() const;
float centerPointX() const;
void setCenterPointX( float _c );
float centerPointY( void ) const;
float centerPointY() const;
void setCenterPointY( float _c );
float lineWidth( void ) const;
float lineWidth() const;
void setLineWidth( float _w );
QColor outerColor( void ) const;
QColor outerColor() const;
void setOuterColor( const QColor & _c );
signals:
void sliderPressed( void );
void sliderReleased( void );
void sliderPressed();
void sliderReleased();
void sliderMoved( float value );
@@ -113,15 +113,15 @@ protected:
virtual void wheelEvent( QWheelEvent * _me );
private slots:
virtual void enterValue( void );
void displayHelp( void );
void friendlyUpdate( void );
virtual void enterValue();
void displayHelp();
void friendlyUpdate();
private:
QString displayValue( void ) const;
QString displayValue() const;
virtual void doConnections( void );
virtual void doConnections();
QLineF calculateLine( const QPointF & _mid, float _radius,
float _innerRadius = 1) const;
@@ -129,9 +129,9 @@ private:
void drawKnob( QPainter * _p );
void setPosition( const QPoint & _p );
float getValue( const QPoint & _p );
bool updateAngle( void );
bool updateAngle();
inline float pageSize( void ) const
inline float pageSize() const
{
return( qMax<float>( ( model()->maxValue() -
model()->minValue() ) / 100.0f,

12
include/ladspa_2_lmms.h
View File

@@ -34,27 +34,27 @@ class EXPORT ladspa2LMMS : public ladspaManager
{
public:
inline l_sortable_plugin_t getInstruments( void )
inline l_sortable_plugin_t getInstruments()
{
return( m_instruments );
}
inline l_sortable_plugin_t getValidEffects( void )
inline l_sortable_plugin_t getValidEffects()
{
return( m_validEffects );
}
inline l_sortable_plugin_t getInvalidEffects( void )
inline l_sortable_plugin_t getInvalidEffects()
{
return( m_invalidEffects );
}
inline l_sortable_plugin_t getAnalysisTools( void )
inline l_sortable_plugin_t getAnalysisTools()
{
return( m_analysisTools );
}
inline l_sortable_plugin_t getOthers( void )
inline l_sortable_plugin_t getOthers()
{
return( m_otherPlugins );
}
@@ -62,7 +62,7 @@ public:
QString getShortName( const ladspa_key_t & _key );
private:
ladspa2LMMS( void );
ladspa2LMMS();
virtual ~ladspa2LMMS();
l_sortable_plugin_t m_instruments;

2
include/ladspa_manager.h
View File

@@ -84,7 +84,7 @@ class EXPORT ladspaManager
{
public:
ladspaManager( void );
ladspaManager();
virtual ~ladspaManager();
l_sortable_plugin_t getSortedPlugins();

2
include/led_checkbox.h
View File

@@ -50,7 +50,7 @@ public:
virtual ~ledCheckBox();
inline const QString & text( void )
inline const QString & text()
{
return( m_text );
}

8
include/lmms_basics.h
View File

@@ -72,17 +72,17 @@ typedef Uint32 jo_id_t; // (unique) ID of a journalling object
template<typename T>
struct typeInfo
{
static inline T min( void )
static inline T min()
{
return std::numeric_limits<T>::min();
}
static inline T max( void )
static inline T max()
{
return std::numeric_limits<T>::max();
}
static inline T minEps( void )
static inline T minEps()
{
return 1;
}
@@ -100,7 +100,7 @@ struct typeInfo
template<>
inline float typeInfo<float>::minEps( void )
inline float typeInfo<float>::minEps()
{
return 1.0e-10;
}

2
include/lmms_math.h
View File

@@ -97,7 +97,7 @@ static inline float absFraction( float _x )
#define FAST_RAND_MAX 32767
static inline int fast_rand( void )
static inline int fast_rand()
{
static unsigned long next = 1;
next = next * 1103515245 + 12345;

14
include/midi_time.h
View File

@@ -53,7 +53,7 @@ public:
{
}
inline midiTime toNearestTact( void ) const
inline midiTime toNearestTact() const
{
if( m_ticks % s_ticksPerTact >= s_ticksPerTact/2 )
{
@@ -80,12 +80,12 @@ public:
return *this;
}
inline tact_t getTact( void ) const
inline tact_t getTact() const
{
return m_ticks / s_ticksPerTact;
}
inline tact_t nextFullTact( void ) const
inline tact_t nextFullTact() const
{
if( m_ticks % s_ticksPerTact == 0 )
{
@@ -99,12 +99,12 @@ public:
m_ticks = _t;
}
inline tick_t getTicks( void ) const
inline tick_t getTicks() const
{
return m_ticks;
}
inline operator int( void ) const
inline operator int() const
{
return m_ticks;
}
@@ -128,12 +128,12 @@ public:
}
static tick_t ticksPerTact( void )
static tick_t ticksPerTact()
{
return s_ticksPerTact;
}
static int stepsPerTact( void )
static int stepsPerTact()
{
return qMax( 1, ticksPerTact() / DefaultBeatsPerTact );
}

8
include/mmp.h
View File

@@ -61,16 +61,16 @@ public:
bool writeFile( const QString & _fn );
inline QDomElement & content( void )
inline QDomElement & content()
{
return( m_content );
}
inline QDomElement & head( void )
inline QDomElement & head()
{
return( m_head );
}
inline ProjectTypes type( void ) const
inline ProjectTypes type() const
{
return( m_type );
}
@@ -82,7 +82,7 @@ private:
void cleanMetaNodes( QDomElement _de );
void upgrade( void );
void upgrade();
void loadData( const QByteArray & _data, const QString & _sourceFile );

34
include/note.h
View File

@@ -120,43 +120,43 @@ public:
return (bool) ((int) ( *lhs ).pos() < (int) ( *rhs ).pos());
}
inline bool selected( void ) const
inline bool selected() const
{
return m_selected;
}
inline int oldKey( void ) const
inline int oldKey() const
{
return m_oldKey;
}
inline midiTime oldPos( void ) const
inline midiTime oldPos() const
{
return m_oldPos;
}
inline midiTime oldLength( void ) const
inline midiTime oldLength() const
{
return m_oldLength;
}
inline bool isPlaying( void ) const
inline bool isPlaying() const
{
return m_isPlaying;
}
inline midiTime endPos( void ) const
inline midiTime endPos() const
{
const int l = length();
return pos() + l;
}
inline const midiTime & length( void ) const
inline const midiTime & length() const
{
return m_length;
}
inline const midiTime & pos( void ) const
inline const midiTime & pos() const
{
return m_pos;
}
@@ -167,41 +167,41 @@ public:
return m_pos - bp;
}
inline int key( void ) const
inline int key() const
{
return m_key;
}
inline volume_t getVolume( void ) const
inline volume_t getVolume() const
{
return m_volume;
}
inline panning_t getPanning( void ) const
inline panning_t getPanning() const
{
return m_panning;
}
static QString classNodeName( void )
static QString classNodeName()
{
return "note";
}
inline virtual QString nodeName( void ) const
inline virtual QString nodeName() const
{
return classNodeName();
}
static midiTime quantized( const midiTime & _m, const int _q_grid );
detuningHelper * detuning( void ) const
detuningHelper * detuning() const
{
return m_detuning;
}
void editDetuningPattern( void );
void editDetuningPattern();
bool hasDetuningInfo( void ) const;
bool hasDetuningInfo() const;
protected:
@@ -238,7 +238,7 @@ private:
midiTime m_pos;
detuningHelper * m_detuning;
void createDetuning( void );
void createDetuning();
} ;

2
include/nstate_button.h
View File

@@ -46,7 +46,7 @@ public:
m_generalToolTip = _tooltip;
}
inline int state( void ) const
inline int state() const
{
return( m_curState );
}

56
include/piano_roll.h
View File

@@ -57,35 +57,35 @@ class pianoRoll : public QWidget, public SerializingObject
public:
void setCurrentPattern( pattern * _new_pattern );
inline void stopRecording( void )
inline void stopRecording()
{
m_recording = false;
}
inline bool isRecording( void ) const
inline bool isRecording() const
{
return m_recording;
}
inline const pattern * currentPattern( void ) const
inline const pattern * currentPattern() const
{
return m_pattern;
}
inline bool validPattern( void ) const
inline bool validPattern() const
{
return m_pattern != NULL;
}
song::PlayModes desiredPlayModeForAccompany( void ) const;
song::PlayModes desiredPlayModeForAccompany() const;
int quantization( void ) const;
int quantization() const;
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
inline virtual QString nodeName( void ) const
inline virtual QString nodeName() const
{
return "pianoroll";
}
@@ -107,16 +107,16 @@ protected:
int getKey( int _y ) const;
static inline void drawNoteRect( QPainter & _p, int _x, int _y,
int _width, note * _n );
void removeSelection( void );
void selectAll( void );
void removeSelection();
void selectAll();
void getSelectedNotes( NoteVector & _selected_notes );
protected slots:
void play( void );
void record( void );
void recordAccompany( void );
void stop( void );
void play();
void record();
void recordAccompany();
void stop();
void startRecordNote( const note & _n );
void finishRecordNote( const note & _n );
@@ -124,21 +124,21 @@ protected slots:
void horScrolled( int _new_pos );
void verScrolled( int _new_pos );
void drawButtonToggled( void );
void eraseButtonToggled( void );
void selectButtonToggled( void );
void detuneButtonToggled( void );
void drawButtonToggled();
void eraseButtonToggled();
void selectButtonToggled();
void detuneButtonToggled();
void copySelectedNotes( void );
void cutSelectedNotes( void );
void pasteNotes( void );
void deleteSelectedNotes( void );
void copySelectedNotes();
void cutSelectedNotes();
void pasteNotes();
void deleteSelectedNotes();
void updatePosition( const midiTime & _t );
void updatePositionAccompany( const midiTime & _t );
void zoomingChanged( void );
void quantizeChanged( void );
void zoomingChanged();
void quantizeChanged();
void changeNoteEditMode( int i );
@@ -181,13 +181,13 @@ private:
QMenu * m_noteEditMenu; // when you right click below the key area
QSignalMapper * m_signalMapper; // to keep track of edit mode events
pianoRoll( void );
pianoRoll();
pianoRoll( const pianoRoll & );
virtual ~pianoRoll();
void autoScroll( const midiTime & _t );
midiTime newNoteLen( void ) const;
midiTime newNoteLen() const;
void shiftPos(int amount);
void shiftSemiTone(int amount);
@@ -309,12 +309,12 @@ private:
void copy_to_clipboard( const NoteVector & _notes ) const;
void drawDetuningInfo( QPainter & _p, note * _n, int _x, int _y );
bool mouseOverNote( void );
note * noteUnderMouse( void );
bool mouseOverNote();
note * noteUnderMouse();
// turn a selection rectangle into selected notes
void computeSelectedNotes( bool shift );
void clearSelectedNotes( void );
void clearSelectedNotes();
friend class engine;

4
include/pixmap_button.h
View File

@@ -40,11 +40,11 @@ public:
virtual ~pixmapButton();
void setActiveGraphic( const QPixmap & _pm );
void setInactiveGraphic( const QPixmap & _pm, bool _update = TRUE );
void setInactiveGraphic( const QPixmap & _pm, bool _update = true );
signals:
void doubleClicked( void );
void doubleClicked();
protected:

2
include/plugin_browser.h
View File

@@ -72,7 +72,7 @@ protected:
private slots:
void updateHeight( void );
void updateHeight();
private:

10
include/rubberband.h
View File

@@ -37,7 +37,7 @@ class selectableObject : public QWidget
public:
selectableObject( QWidget * _parent ) :
QWidget( _parent ),
m_selected( FALSE )
m_selected( false )
{
}
@@ -51,14 +51,14 @@ public:
update();
}
inline bool isSelected( void ) const
inline bool isSelected() const
{
return( m_selected );
}
public slots:
virtual void update( void )
virtual void update()
{
QWidget::update();
}
@@ -78,14 +78,14 @@ public:
rubberBand( QWidget * _parent );
virtual ~rubberBand();
QVector<selectableObject *> selectedObjects( void ) const;
QVector<selectableObject *> selectedObjects() const;
protected:
virtual void resizeEvent( QResizeEvent * _re );
private:
QVector<selectableObject *> selectableObjects( void ) const;
QVector<selectableObject *> selectableObjects() const;
};

8
include/sample_play_handle.h
View File

@@ -46,19 +46,19 @@ public:
samplePlayHandle( pattern * _pattern );
virtual ~samplePlayHandle();
virtual inline bool affinityMatters( void ) const
virtual inline bool affinityMatters() const
{
return true;
}
virtual void play( sampleFrame * _working_buffer );
virtual bool done( void ) const;
virtual bool done() const;
virtual bool isFromTrack( const track * _track ) const;
f_cnt_t totalFrames( void ) const;
inline f_cnt_t framesDone( void ) const
f_cnt_t totalFrames() const;
inline f_cnt_t framesDone() const
{
return( m_frame );
}

4
include/sample_record_handle.h
View File

@@ -46,11 +46,11 @@ public:
virtual ~sampleRecordHandle();
virtual void play( sampleFrame * _working_buffer );
virtual bool done( void ) const;
virtual bool done() const;
virtual bool isFromTrack( const track * _track ) const;
f_cnt_t framesRecorded( void ) const;
f_cnt_t framesRecorded() const;
void createSampleBuffer( sampleBuffer * * _sample_buf );

26
include/setup_dialog.h
View File

@@ -59,14 +59,14 @@ public:
protected slots:
virtual void accept( void );
virtual void accept();
private slots:
// general settings widget
void setBufferSize( int _value );
void resetBufSize( void );
void displayBufSizeHelp( void );
void resetBufSize();
void displayBufSizeHelp();
// path settings widget
void setWorkingDir( const QString & _wd );
@@ -80,11 +80,11 @@ private slots:
// audio settings widget
void audioInterfaceChanged( const QString & _driver );
void displayAudioHelp( void );
void displayAudioHelp();
// MIDI settings widget
void midiInterfaceChanged( const QString & _driver );
void displayMIDIHelp( void );
void displayMIDIHelp();
void toggleToolTips( bool _enabled );
@@ -93,14 +93,14 @@ private slots:
void toggleMMPZ( bool _enabled );
void toggleHQAudioDev( bool _enabled );
void openWorkingDir( void );
void openVSTDir( void );
void openArtworkDir( void );
void openFLDir( void );
void openLADSPADir( void );
void openSTKDir( void );
void openDefaultSoundfont( void );
void openBackgroundArtwork( void );
void openWorkingDir();
void openVSTDir();
void openArtworkDir();
void openFLDir();
void openLADSPADir();
void openSTKDir();
void openDefaultSoundfont();
void openBackgroundArtwork();
void toggleDisableChActInd( bool _disabled );
void toggleManualChPiano( bool _enabled );

2
include/shared_object.h
View File

@@ -34,7 +34,7 @@
class sharedObject
{
public:
sharedObject( void ) :
sharedObject() :
m_referenceCount( 1 ),
m_lock()
{

4
include/side_bar.h
View File

@@ -65,9 +65,9 @@ private slots:
QMap<int, QWidget *>::Iterator it;
for( it = m_widgets.begin(); it != m_widgets.end(); ++it )
{
if( it.key() != _id/* && isTabRaised(it.key()) == TRUE*/ )
if( it.key() != _id/* && isTabRaised(it.key()) == true*/ )
{
setTab( it.key(), FALSE );
setTab( it.key(), false );
}
if( m_widgets[it.key()] != NULL )
{

6
include/side_bar_widget.h
View File

@@ -38,11 +38,11 @@ public:
sideBarWidget( const QString & _title, const QPixmap & _icon,
QWidget * _parent );
virtual ~sideBarWidget();
inline const QPixmap & icon( void ) const
inline const QPixmap & icon() const
{
return( m_icon );
}
inline const QString & title( void ) const
inline const QString & title() const
{
return( m_title );
}
@@ -55,7 +55,7 @@ protected:
{
}
inline QWidget * contentParent( void )
inline QWidget * contentParent()
{
return( m_contents );
}

100
include/song.h
View File

@@ -78,7 +78,7 @@ public:
{
m_currentFrame = _f;
}
inline float currentFrame( void ) const
inline float currentFrame() const
{
return m_currentFrame;
}
@@ -92,38 +92,38 @@ public:
void processNextBuffer( void );
void processNextBuffer();
inline bool isPaused( void ) const
inline bool isPaused() const
{
return m_paused;
}
inline bool isPlaying( void ) const
inline bool isPlaying() const
{
return m_playing && m_exporting == false;
}
inline bool isExporting( void ) const
inline bool isExporting() const
{
return m_exporting;
}
inline bool isRecording( void ) const
inline bool isRecording() const
{
return m_recording;
}
bool realTimeTask( void ) const;
bool realTimeTask() const;
inline bool isExportDone( void ) const
inline bool isExportDone() const
{
return m_exporting == true &&
m_playPos[Mode_PlaySong].getTact() >= length() + 1;
}
inline PlayModes playMode( void ) const
inline PlayModes playMode() const
{
return m_playMode;
}
@@ -133,46 +133,46 @@ public:
return m_playPos[_pm];
}
void updateLength( void );
tact_t length( void ) const
void updateLength();
tact_t length() const
{
return m_length;
}
bpm_t getTempo( void );
virtual automationPattern * tempoAutomationPattern( void );
bpm_t getTempo();
virtual automationPattern * tempoAutomationPattern();
automationTrack * globalAutomationTrack( void )
automationTrack * globalAutomationTrack()
{
return m_globalAutomationTrack;
}
// file management
void createNewProject( void );
void createNewProject();
void createNewProjectFromTemplate( const QString & _template );
void loadProject( const QString & _file_name );
bool saveProject( void );
bool saveProject();
bool saveProjectAs( const QString & _file_name );
inline const QString & projectFileName( void ) const
inline const QString & projectFileName() const
{
return m_fileName;
}
inline bool isLoadingProject( void ) const
inline bool isLoadingProject() const
{
return m_loadingProject;
}
inline bool isModified( void ) const
inline bool isModified() const
{
return m_modified;
}
inline virtual QString nodeName( void ) const
inline virtual QString nodeName() const
{
return "song";
}
virtual inline bool fixedTCOs( void ) const
virtual inline bool fixedTCOs() const
{
return false;
}
@@ -181,78 +181,78 @@ public:
void removeController( Controller * _c );
const ControllerVector & controllers( void ) const
const ControllerVector & controllers() const
{
return m_controllers;
}
MeterModel & getTimeSigModel( void )
MeterModel & getTimeSigModel()
{
return m_timeSigModel;
}
public slots:
void play( void );
void record( void );
void playAndRecord( void );
void stop( void );
void play();
void record();
void playAndRecord();
void stop();
void playTrack( track * _trackToPlay );
void playBB( void );
void playBB();
void playPattern( pattern * _patternToPlay, bool _loop = true );
void pause( void );
void resumeFromPause( void );
void pause();
void resumeFromPause();
void importProject( void );
void exportProject( void );
void importProject();
void exportProject();
void startExport( void );
void stopExport( void );
void startExport();
void stopExport();
void setModified( void );
void setModified();
void clearProject( void );
void clearProject();
private slots:
void insertBar( void );
void removeBar( void );
void addBBTrack( void );
void addSampleTrack( void );
void addAutomationTrack( void );
void insertBar();
void removeBar();
void addBBTrack();
void addSampleTrack();
void addAutomationTrack();
void setTempo( void );
void setTimeSignature( void );
void setTempo();
void setTimeSignature();
void masterVolumeChanged( void );
void masterVolumeChanged();
void doActions( void );
void doActions();
void updateFramesPerTick( void );
void updateFramesPerTick();
private:
song( void );
song();
song( const song & );
virtual ~song();
inline int ticksPerTact( void ) const
inline int ticksPerTact() const
{
return DefaultTicksPerTact *
m_timeSigModel.getNumerator() /
m_timeSigModel.getDenominator();
}
inline tact_t currentTact( void ) const
inline tact_t currentTact() const
{
return m_playPos[m_playMode].getTact();
}
inline tick_t currentTick( void ) const
inline tick_t currentTick() const
{
return m_playPos[m_playMode].getTicks();
}

20
include/song_editor.h
View File

@@ -67,31 +67,31 @@ public slots:
private slots:
void setHighQuality( bool );
void play( void );
void record( void );
void recordAccompany( void );
void stop( void );
void play();
void record();
void recordAccompany();
void stop();
void masterVolumeChanged( int _new_val );
void masterVolumePressed( void );
void masterVolumePressed();
void masterVolumeMoved( int _new_val );
void masterVolumeReleased( void );
void masterVolumeReleased();
void masterPitchChanged( int _new_val );
void masterPitchPressed( void );
void masterPitchPressed();
void masterPitchMoved( int _new_val );
void masterPitchReleased( void );
void masterPitchReleased();
void updateScrollBar( int );
void updatePosition( const midiTime & _t );
void zoomingChanged( void );
void zoomingChanged();
private:
virtual void keyPressEvent( QKeyEvent * _ke );
virtual void wheelEvent( QWheelEvent * _we );
virtual bool allowRubberband( void ) const;
virtual bool allowRubberband() const;
song * m_s;

2
include/string_pair_drag.h
View File

@@ -47,7 +47,7 @@ public:
static QString decodeKey( QDropEvent * _de );
static QString decodeValue( QDropEvent * _de );
static const char * mimeType( void )
static const char * mimeType()
{
return( "application/x-lmms-stringpair" );
}

14
include/surround_area.h
View File

@@ -48,7 +48,7 @@ class surroundAreaModel : public Model
mapPropertyFromModel(int,y,setY,m_posY);
public:
surroundAreaModel( Model * _parent,
bool _default_constructed = FALSE );
bool _default_constructed = false );
surroundVolumeVector getVolumeVector( float _v_scale ) const;
@@ -57,20 +57,20 @@ public:
void loadSettings( const QDomElement & _this,
const QString & _name = "surpos" );
inline void prepareJournalEntryFromOldVal( void )
inline void prepareJournalEntryFromOldVal()
{
m_posX.prepareJournalEntryFromOldVal();
m_posY.prepareJournalEntryFromOldVal();
}
inline void addJournalEntryFromOldToCurVal( void )
inline void addJournalEntryFromOldToCurVal()
{
m_posX.addJournalEntryFromOldToCurVal();
m_posY.addJournalEntryFromOldToCurVal();
}
// automationPattern * automationPatternX( void );
// automationPattern * automationPatternY( void );
// automationPattern * automationPatternX();
// automationPattern * automationPatternY();
private:
@@ -89,12 +89,12 @@ public:
virtual ~surroundArea();
surroundAreaModel * model( void )
surroundAreaModel * model()
{
return( castModel<surroundAreaModel>() );
}
const surroundAreaModel * model( void ) const
const surroundAreaModel * model() const
{
return( castModel<surroundAreaModel>() );
}

12
include/tab_bar.h
View File

@@ -45,8 +45,8 @@ public:
virtual ~tabBar();
tabButton * addTab( QWidget * _w, const QString & _text,
int _id, bool _add_stretch = FALSE,
bool _text_is_tooltip = FALSE );
int _id, bool _add_stretch = false,
bool _text_is_tooltip = false );
void removeTab( int _id );
inline void setExclusive( bool _on )
@@ -54,7 +54,7 @@ public:
m_exclusive = _on;
}
int activeTab( void );
int activeTab();
public slots:
@@ -64,7 +64,7 @@ public slots:
protected:
bool tabState( int _id );
void setTabState( int _id, bool _checked );
bool allHidden( void );
bool allHidden();
protected slots:
@@ -79,8 +79,8 @@ private:
signals:
void allWidgetsHidden( void );
void widgetShown( void );
void allWidgetsHidden();
void widgetShown();
} ;

4
include/tab_button.h
View File

@@ -37,7 +37,7 @@ public:
QPushButton( _text, _parent ),
m_id( _id )
{
setCheckable( TRUE );
setCheckable( true );
connect( this, SIGNAL( clicked() ), this,
SLOT( slotClicked() ) );
}
@@ -52,7 +52,7 @@ signals:
protected slots:
void slotClicked( void )
void slotClicked()
{
emit clicked( m_id );
}

2
include/tab_widget.h
View File

@@ -41,7 +41,7 @@ public:
void setActiveTab( int _idx );
inline int activeTab( void ) const
inline int activeTab() const
{
return( m_activeTab );
}

4
include/text_float.h
View File

@@ -35,7 +35,7 @@
class EXPORT textFloat : public QWidget
{
public:
textFloat( void );
textFloat();
virtual ~textFloat()
{
}
@@ -70,7 +70,7 @@ protected:
private:
void updateSize( void );
void updateSize();
QString m_title;
QString m_text;

18
include/timeline.h
View File

@@ -64,33 +64,33 @@ public:
const midiTime & _begin, QWidget * _parent );
virtual ~timeLine();
inline song::playPos & pos( void )
inline song::playPos & pos()
{
return( m_pos );
}
AutoScrollStates autoScroll( void ) const
AutoScrollStates autoScroll() const
{
return m_autoScroll;
}
BehaviourAtStopStates behaviourAtStop( void ) const
BehaviourAtStopStates behaviourAtStop() const
{
return m_behaviourAtStop;
}
bool loopPointsEnabled( void ) const
bool loopPointsEnabled() const
{
return m_loopPoints == LoopPointsEnabled;
}
inline const midiTime & loopBegin( void ) const
inline const midiTime & loopBegin() const
{
return ( m_loopPos[0] < m_loopPos[1] ) ?
m_loopPos[0] : m_loopPos[1];
}
inline const midiTime & loopEnd( void ) const
inline const midiTime & loopEnd() const
{
return ( m_loopPos[0] > m_loopPos[1] ) ?
m_loopPos[0] : m_loopPos[1];
@@ -100,7 +100,7 @@ public:
{
m_savedPos = _pos;
}
inline const midiTime & savedPos( void ) const
inline const midiTime & savedPos() const
{
return m_savedPos;
}
@@ -116,7 +116,7 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
inline virtual QString nodeName( void ) const
inline virtual QString nodeName() const
{
return "timeline";
}
@@ -130,7 +130,7 @@ public:
public slots:
void updatePosition( const midiTime & );
void updatePosition( void )
void updatePosition()
{
updatePosition( midiTime() );
}

4
include/track.h
View File

@@ -184,7 +184,7 @@ protected:
virtual void mouseMoveEvent( QMouseEvent * _me );
virtual void mouseReleaseEvent( QMouseEvent * _me );
void setAutoResizeEnabled( bool _e = FALSE );
void setAutoResizeEnabled( bool _e = false );
float pixelsPerTact();
inline trackView * getTrackView()
@@ -383,7 +383,7 @@ public:
void setSimpleSerializing()
{
m_simpleSerializingMode = TRUE;
m_simpleSerializingMode = true;
}
// -- for usage by trackContentObject only ---------------

4
include/track_container_view.h
View File

@@ -63,7 +63,7 @@ public:
virtual bool fixedTCOs() const
{
return( FALSE );
return( false );
}
inline float pixelsPerTact() const
@@ -84,7 +84,7 @@ public:
inline QVector<selectableObject *> selectedObjects()
{
if( allowRubberband() == TRUE )
if( allowRubberband() == true )
{
return( m_rubberBand->selectedObjects() );
}

2
include/track_label_button.h
View File

@@ -41,7 +41,7 @@ public:
public slots:
void rename( void );
void rename();
protected:

4
include/transformable_auto_model.h
View File

@@ -50,7 +50,7 @@ public:
const T _max = 0,
const T _step = defaultRelStep(),
Model * _parent = NULL,
bool _default_constructed = FALSE ) :
bool _default_constructed = false ) :
AutomatableModel( _val, _min, _max, _step, _parent,
_default_constructed ),
m_transformer( _transformer )
@@ -75,7 +75,7 @@ public:
}
}
inline virtual T value( void ) const
inline virtual T value() const
{
return( m_transformedValue );
}

2
include/update_event.h
View File

@@ -33,7 +33,7 @@
class updateEvent : public QEvent
{
public:
updateEvent( void ) :
updateEvent() :
QEvent( (QEvent::Type)customEvents::GUI_UPDATE )
{
}

2
include/visualization_widget.h
View File

@@ -54,7 +54,7 @@ protected:
protected slots:
void updateAudioBuffer( void );
void updateAudioBuffer();
private:

18
plugins/audio_file_processor/audio_file_processor.h
View File

@@ -54,11 +54,11 @@ public:
virtual void loadFile( const QString & _file );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
virtual Uint32 getBeatLen( notePlayHandle * _n ) const;
virtual f_cnt_t desiredReleaseFrames( void ) const
virtual f_cnt_t desiredReleaseFrames() const
{
return( 128 );
}
@@ -67,13 +67,13 @@ public:
public slots:
void setAudioFile( const QString & _audio_file, bool _rename = TRUE );
void setAudioFile( const QString & _audio_file, bool _rename = true );
private slots:
void reverseModelChanged( void );
void ampModelChanged( void );
void loopPointChanged( void );
void reverseModelChanged();
void ampModelChanged();
void loopPointChanged();
private:
@@ -103,8 +103,8 @@ public:
protected slots:
void sampleUpdated( void );
void openAudioFile( void );
void sampleUpdated();
void openAudioFile();
protected:
@@ -114,7 +114,7 @@ protected:
private:
virtual void modelChanged( void );
virtual void modelChanged();
static QPixmap * s_artwork;

2
plugins/bass_booster/bass_booster.cpp
View File

@@ -72,7 +72,7 @@ bool bassBoosterEffect::processAudioBuffer( sampleFrame * _buf,
{
if( !isEnabled() || !isRunning () )
{
return( FALSE );
return( false );
}
double out_sum = 0.0;

2
plugins/bass_booster/bass_booster.h
View File

@@ -41,7 +41,7 @@ public:
virtual bool processAudioBuffer( sampleFrame * _buf,
const fpp_t _frames );
virtual EffectControls * controls( void )
virtual EffectControls * controls()
{
return( &m_bbControls );
}

2
plugins/bass_booster/bassbooster_control_dialog.cpp
View File

@@ -35,7 +35,7 @@ bassBoosterControlDialog::bassBoosterControlDialog(
bassBoosterControls * _controls ) :
EffectControlDialog( _controls )
{
setAutoFillBackground( TRUE );
setAutoFillBackground( true );
QPalette pal;
pal.setBrush( backgroundRole(),
PLUGIN_NAME::getIconPixmap( "artwork" ) );

6
plugins/bass_booster/bassbooster_controls.cpp
View File

@@ -56,7 +56,7 @@ bassBoosterControls::bassBoosterControls( bassBoosterEffect * _eff ) :
void bassBoosterControls::changeFrequency( void )
void bassBoosterControls::changeFrequency()
{
const sample_t fac = engine::getMixer()->processingSampleRate() /
44100.0f;
@@ -67,7 +67,7 @@ void bassBoosterControls::changeFrequency( void )
void bassBoosterControls::changeGain( void )
void bassBoosterControls::changeGain()
{
m_effect->m_bbFX.leftFX().setGain( m_gainModel.value() );
m_effect->m_bbFX.rightFX().setGain( m_gainModel.value() );
@@ -76,7 +76,7 @@ void bassBoosterControls::changeGain( void )
void bassBoosterControls::changeRatio( void )
void bassBoosterControls::changeRatio()
{
m_effect->m_bbFX.leftFX().setRatio( m_ratioModel.value() );
m_effect->m_bbFX.rightFX().setRatio( m_ratioModel.value() );

12
plugins/bass_booster/bassbooster_controls.h
View File

@@ -44,26 +44,26 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
inline virtual QString nodeName( void ) const
inline virtual QString nodeName() const
{
return( "bassboostercontrols" );
}
virtual int controlCount( void )
virtual int controlCount()
{
return( 3 );
}
virtual EffectControlDialog * createView( void )
virtual EffectControlDialog * createView()
{
return( new bassBoosterControlDialog( this ) );
}
private slots:
void changeFrequency( void );
void changeGain( void );
void changeRatio( void );
void changeFrequency();
void changeGain();
void changeRatio();
private:

62
plugins/bit_invader/bit_invader.cpp
View File

@@ -84,7 +84,7 @@ bSynth::~bSynth()
}
sample_t bSynth::nextStringSample( void )
sample_t bSynth::nextStringSample()
{
float sample_step =
static_cast<float>( sample_length / ( sample_rate / nph->frequency() ) );
@@ -138,8 +138,8 @@ bitInvader::bitInvader( InstrumentTrack * _instrument_track ) :
Instrument( _instrument_track, &bitinvader_plugin_descriptor ),
m_sampleLength( 128, 8, 128, 1, this, tr( "Samplelength" ) ),
m_graph( -1.0f, 1.0f, 128, this ),
m_interpolation( FALSE, this ),
m_normalize( FALSE, this )
m_interpolation( false, this ),
m_normalize( false, this )
{
m_graph.setWaveToSine();
@@ -214,7 +214,7 @@ void bitInvader::loadSettings( const QDomElement & _this )
void bitInvader::lengthChanged( void )
void bitInvader::lengthChanged()
{
m_graph.setLength( (int) m_sampleLength.value() );
@@ -233,7 +233,7 @@ void bitInvader::samplesChanged( int _begin, int _end )
void bitInvader::normalize( void )
void bitInvader::normalize()
{
// analyze
float max = 0;
@@ -249,7 +249,7 @@ void bitInvader::normalize( void )
QString bitInvader::nodeName( void ) const
QString bitInvader::nodeName() const
{
return( bitinvader_plugin_descriptor.name );
}
@@ -324,7 +324,7 @@ bitInvaderView::bitInvaderView( Instrument * _instrument,
QWidget * _parent ) :
InstrumentView( _instrument, _parent )
{
setAutoFillBackground( TRUE );
setAutoFillBackground( true );
QPalette pal;
pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap(
@@ -337,7 +337,7 @@ bitInvaderView::bitInvaderView( Instrument * _instrument,
m_graph = new graph( this, graph::NearestStyle );
m_graph->move(53,118); // 55,120 - 2px border
m_graph->setAutoFillBackground( TRUE );
m_graph->setAutoFillBackground( true );
toolTip::add( m_graph, tr ( "Draw your own waveform here "
"by dragging your mouse on this graph."
@@ -411,7 +411,7 @@ bitInvaderView::bitInvaderView( Instrument * _instrument,
"smooth" ) );
smoothBtn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap(
"smooth" ) );
smoothBtn->setChecked( TRUE );
smoothBtn->setChecked( true );
toolTip::add( smoothBtn,
tr( "Click here to smooth waveform." ) );
@@ -426,21 +426,21 @@ bitInvaderView::bitInvaderView( Instrument * _instrument,
m_normalizeToggle->move( 55, 100 );
connect( sinWaveBtn, SIGNAL (clicked ( void ) ),
this, SLOT ( sinWaveClicked( void ) ) );
connect( triangleWaveBtn, SIGNAL ( clicked ( void ) ),
this, SLOT ( triangleWaveClicked( void ) ) );
connect( sawWaveBtn, SIGNAL (clicked ( void ) ),
this, SLOT ( sawWaveClicked( void ) ) );
connect( sqrWaveBtn, SIGNAL ( clicked ( void ) ),
this, SLOT ( sqrWaveClicked( void ) ) );
connect( whiteNoiseWaveBtn, SIGNAL ( clicked ( void ) ),
this, SLOT ( noiseWaveClicked( void ) ) );
connect( usrWaveBtn, SIGNAL ( clicked ( void ) ),
this, SLOT ( usrWaveClicked( void ) ) );
connect( sinWaveBtn, SIGNAL (clicked () ),
this, SLOT ( sinWaveClicked() ) );
connect( triangleWaveBtn, SIGNAL ( clicked () ),
this, SLOT ( triangleWaveClicked() ) );
connect( sawWaveBtn, SIGNAL (clicked () ),
this, SLOT ( sawWaveClicked() ) );
connect( sqrWaveBtn, SIGNAL ( clicked () ),
this, SLOT ( sqrWaveClicked() ) );
connect( whiteNoiseWaveBtn, SIGNAL ( clicked () ),
this, SLOT ( noiseWaveClicked() ) );
connect( usrWaveBtn, SIGNAL ( clicked () ),
this, SLOT ( usrWaveClicked() ) );
connect( smoothBtn, SIGNAL ( clicked ( void ) ),
this, SLOT ( smoothClicked( void ) ) );
connect( smoothBtn, SIGNAL ( clicked () ),
this, SLOT ( smoothClicked() ) );
connect( m_interpolationToggle, SIGNAL( toggled( bool ) ),
this, SLOT ( interpolationToggled( bool ) ) );
@@ -453,7 +453,7 @@ bitInvaderView::bitInvaderView( Instrument * _instrument,
void bitInvaderView::modelChanged( void )
void bitInvaderView::modelChanged()
{
bitInvader * b = castModel<bitInvader>();
@@ -467,7 +467,7 @@ void bitInvaderView::modelChanged( void )
void bitInvaderView::sinWaveClicked( void )
void bitInvaderView::sinWaveClicked()
{
m_graph->model()->setWaveToSine();
engine::getSong()->setModified();
@@ -476,7 +476,7 @@ void bitInvaderView::sinWaveClicked( void )
void bitInvaderView::triangleWaveClicked( void )
void bitInvaderView::triangleWaveClicked()
{
m_graph->model()->setWaveToTriangle();
engine::getSong()->setModified();
@@ -485,7 +485,7 @@ void bitInvaderView::triangleWaveClicked( void )
void bitInvaderView::sawWaveClicked( void )
void bitInvaderView::sawWaveClicked()
{
m_graph->model()->setWaveToSaw();
engine::getSong()->setModified();
@@ -494,7 +494,7 @@ void bitInvaderView::sawWaveClicked( void )
void bitInvaderView::sqrWaveClicked( void )
void bitInvaderView::sqrWaveClicked()
{
m_graph->model()->setWaveToSquare();
engine::getSong()->setModified();
@@ -503,7 +503,7 @@ void bitInvaderView::sqrWaveClicked( void )
void bitInvaderView::noiseWaveClicked( void )
void bitInvaderView::noiseWaveClicked()
{
m_graph->model()->setWaveToNoise();
engine::getSong()->setModified();
@@ -512,7 +512,7 @@ void bitInvaderView::noiseWaveClicked( void )
void bitInvaderView::usrWaveClicked( void )
void bitInvaderView::usrWaveClicked()
{
/*
m_graph->model()->setWaveToNoise();
@@ -546,7 +546,7 @@ void bitInvaderView::usrWaveClicked( void )
void bitInvaderView::smoothClicked( void )
void bitInvaderView::smoothClicked()
{
m_graph->model()->smooth();
engine::getSong()->setModified();

22
plugins/bit_invader/bit_invader.h
View File

@@ -76,9 +76,9 @@ public:
QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
virtual f_cnt_t desiredReleaseFrames( void ) const
virtual f_cnt_t desiredReleaseFrames() const
{
return( 64 );
}
@@ -86,10 +86,10 @@ public:
virtual PluginView * instantiateView( QWidget * _parent );
protected slots:
void lengthChanged( void );
void lengthChanged();
void samplesChanged( int, int );
void normalize( void );
void normalize();
private:
@@ -123,17 +123,17 @@ protected slots:
void interpolationToggled( bool value );
void normalizeToggled( bool value );
void sinWaveClicked( void );
void triangleWaveClicked( void );
void sqrWaveClicked( void );
void sawWaveClicked( void );
void noiseWaveClicked( void );
void usrWaveClicked( void );
void sinWaveClicked();
void triangleWaveClicked();
void sqrWaveClicked();
void sawWaveClicked();
void noiseWaveClicked();
void usrWaveClicked();
void smoothClicked( void );
private:
virtual void modelChanged( void );
virtual void modelChanged();
knob * m_sampleLengthKnob;
pixmapButton * sinWaveBtn;

18
plugins/flp_import/unrtf/attr.c
View File

@@ -89,7 +89,7 @@ static AttrStack *stack_of_stacks = NULL;
static AttrStack *stack_of_stacks_top = NULL;
void attr_clear_all( void )
void attr_clear_all()
{
stack_of_stacks = NULL;
stack_of_stacks_top = NULL;
@@ -181,12 +181,12 @@ attr_express_begin (int attr, const char* param) {
case ATTR_CAPS:
if (op->simulate_all_caps)
simulate_allcaps = TRUE;
simulate_allcaps = true;
break;
case ATTR_SMALLCAPS:
if (op->simulate_small_caps)
simulate_smallcaps = TRUE;
simulate_smallcaps = true;
else {
if (op->small_caps_begin)
outstring+=QString().sprintf("%s", op->small_caps_begin);
@@ -281,12 +281,12 @@ attr_express_end (int attr, char *param)
case ATTR_CAPS:
if (op->simulate_all_caps)
simulate_allcaps = FALSE;
simulate_allcaps = false;
break;
case ATTR_SMALLCAPS:
if (op->simulate_small_caps)
simulate_smallcaps = FALSE;
simulate_smallcaps = false;
else {
if (op->small_caps_end)
outstring+=QString().sprintf("%s", op->small_caps_end);
@@ -483,7 +483,7 @@ attr_pop (int attr)
if (!stack) {
warning_handler ("no stack to pop attribute from");
return FALSE;
return false;
}
if(stack->tos>=0 && stack->attr_stack[stack->tos]==attr)
@@ -496,10 +496,10 @@ attr_pop (int attr)
stack->tos--;
return TRUE;
return true;
}
else
return FALSE;
return false;
}
@@ -517,7 +517,7 @@ attr_read() {
AttrStack *stack = stack_of_stacks_top;
if (!stack) {
warning_handler ("no stack to read attribute from");
return FALSE;
return false;
}
if(stack->tos>=0)

2
plugins/flp_import/unrtf/attr.h
View File

@@ -70,7 +70,7 @@ enum {
extern void attr_clear_all( void );
extern void attr_clear_all();
extern void attr_push_core (int attr, char* param);

300
plugins/flp_import/unrtf/convert.c
View File

File diff suppressed because it is too large Load Diff

8
plugins/flp_import/unrtf/defs.h
View File

@@ -53,11 +53,11 @@
#endif
#ifndef TRUE /* daved 0.19.0 */
#define TRUE (1)
#ifndef true /* daved 0.19.0 */
#define true (1)
#endif
#ifndef FALSE /* daved 0.19.0 */
#define FALSE (0)
#ifndef false /* daved 0.19.0 */
#define false (0)
#endif
#if 1 /* daved - 0.19.4 */
#define SKIP_ONE_WORD 2

6
plugins/flp_import/unrtf/html.c
View File

@@ -1183,9 +1183,9 @@ html_init (void)
op->numericlist_item_begin = "<li>";
op->numericlist_item_end = "</li>\n";
op->simulate_small_caps = TRUE;
op->simulate_all_caps = TRUE;
op->simulate_word_underline = TRUE;
op->simulate_small_caps = true;
op->simulate_all_caps = true;
op->simulate_word_underline = true;
op->ascii_translation_table = ascii;

38
plugins/flp_import/unrtf/output.c
View File

@@ -131,7 +131,7 @@ op_translate_char (OutputPersonality *op, int charset, CodepageInfo *codepage, i
CHECK_PARAM_NOT_NULL(op);
#if 1 /* daved - 0.20.5 */
if (no_remap_mode == TRUE && ch < 256)
if (no_remap_mode == true && ch < 256)
{
output_buffer[0]=ch;
result=output_buffer;
@@ -229,7 +229,7 @@ void
op_begin_std_fontsize (OutputPersonality *op, int size)
{
size = ( size * 3 ) / 2;
int found_std_expr = FALSE;
int found_std_expr = false;
CHECK_PARAM_NOT_NULL(op);
@@ -239,49 +239,49 @@ op_begin_std_fontsize (OutputPersonality *op, int size)
case 8:
if (op->fontsize8_begin) {
outstring+=QString().sprintf("%s", op->fontsize8_begin);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 10:
if (op->fontsize10_begin) {
outstring+=QString().sprintf("%s", op->fontsize10_begin);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 12:
if (op->fontsize12_begin) {
outstring+=QString().sprintf("%s", op->fontsize12_begin);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 14:
if (op->fontsize14_begin) {
outstring+=QString().sprintf("%s", op->fontsize14_begin);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 18:
if (op->fontsize18_begin) {
outstring+=QString().sprintf("%s", op->fontsize18_begin);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 24:
if (op->fontsize24_begin) {
outstring+=QString().sprintf("%s", op->fontsize24_begin);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 36:
if (op->fontsize36_begin) {
outstring+=QString().sprintf("%s", op->fontsize36_begin);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 48:
if (op->fontsize48_begin) {
outstring+=QString().sprintf("%s", op->fontsize48_begin);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
}
@@ -358,7 +358,7 @@ op_begin_std_fontsize (OutputPersonality *op, int size)
void
op_end_std_fontsize (OutputPersonality *op, int size)
{
int found_std_expr = FALSE;
int found_std_expr = false;
CHECK_PARAM_NOT_NULL(op);
@@ -368,49 +368,49 @@ op_end_std_fontsize (OutputPersonality *op, int size)
case 8:
if (op->fontsize8_end) {
outstring+=QString().sprintf("%s", op->fontsize8_end);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 10:
if (op->fontsize10_end) {
outstring+=QString().sprintf("%s", op->fontsize10_end);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 12:
if (op->fontsize12_end) {
outstring+=QString().sprintf("%s", op->fontsize12_end);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 14:
if (op->fontsize14_end) {
outstring+=QString().sprintf("%s", op->fontsize14_end);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 18:
if (op->fontsize18_end) {
outstring+=QString().sprintf("%s", op->fontsize18_end);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 24:
if (op->fontsize24_end) {
outstring+=QString().sprintf("%s", op->fontsize24_end);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 36:
if (op->fontsize36_end) {
outstring+=QString().sprintf("%s", op->fontsize36_end);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
case 48:
if (op->fontsize48_end) {
outstring+=QString().sprintf("%s", op->fontsize48_end);
found_std_expr = TRUE;
found_std_expr = true;
}
break;
}

24
plugins/flp_import/unrtf/parse.c
View File

@@ -220,7 +220,7 @@ expand_word_buffer ()
memcpy (new_ptr, input_str, old_length);
my_free(input_str);
input_str = new_ptr;
return TRUE;
return true;
}
@@ -243,10 +243,10 @@ read_word (QBuffer*f)
int ch, ch2;
unsigned long ix=0;
#endif
int have_whitespace=FALSE;
int is_control_word=FALSE;
int has_numeric_param=FALSE; /* if is_control_word==TRUE */
int need_unget=FALSE;
int have_whitespace=false;
int is_control_word=false;
int has_numeric_param=false; /* if is_control_word==true */
int need_unget=false;
CHECK_PARAM_NOT_NULL(f);
@@ -269,7 +269,7 @@ read_word (QBuffer*f)
*/
while (ch == ' ') {
ch = my_getchar(f);
have_whitespace=TRUE;
have_whitespace=true;
}
if (have_whitespace) {
my_unget_char (ch);
@@ -330,7 +330,7 @@ read_word (QBuffer*f)
return ix;
}
is_control_word=TRUE;
is_control_word=true;
ix=1;
input_str[0]=ch;
ch=ch2;
@@ -356,7 +356,7 @@ read_word (QBuffer*f)
/* Several chars always ends a word, and we need to save them.
*/
if (ch=='\t' || ch=='{' || ch=='}' || ch=='\\') {
need_unget=TRUE;
need_unget=true;
break;
}
@@ -375,7 +375,7 @@ read_word (QBuffer*f)
*/
if (ch==';') {
if (is_control_word) {
need_unget=TRUE;
need_unget=true;
break;
}
}
@@ -386,7 +386,7 @@ read_word (QBuffer*f)
*/
if (ch==' ') {
if (!is_control_word)
need_unget=TRUE;
need_unget=true;
break;
}
@@ -394,11 +394,11 @@ read_word (QBuffer*f)
*/
if (is_control_word) {
if (!has_numeric_param && (isdigit(ch) || ch=='-'))
has_numeric_param = TRUE;
has_numeric_param = true;
else
if (has_numeric_param && !isdigit(ch)) {
if (ch!=' ')
need_unget=TRUE;
need_unget=true;
break;
}
}

2
plugins/kicker/kicker.cpp
View File

@@ -219,7 +219,7 @@ kickerInstrumentView::kickerInstrumentView( Instrument * _instrument,
m_gainKnob->setHintText( tr( "Gain:" ) + " ", "" );
m_gainKnob->move( 203, 124 );
setAutoFillBackground( TRUE );
setAutoFillBackground( true );
QPalette pal;
pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap(
"artwork" ) );

6
plugins/kicker/kicker.h
View File

@@ -50,9 +50,9 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
virtual f_cnt_t desiredReleaseFrames( void ) const
virtual f_cnt_t desiredReleaseFrames() const
{
return( 512 );
}
@@ -81,7 +81,7 @@ public:
virtual ~kickerInstrumentView();
private:
virtual void modelChanged( void );
virtual void modelChanged();
knob * m_startFreqKnob;
knob * m_endFreqKnob;

14
plugins/ladspa_browser/ladspa_browser.cpp
View File

@@ -104,7 +104,7 @@ ladspaBrowserView::ladspaBrowserView( ToolPlugin * _tool ) :
hlayout->setMargin( 0 );
m_tabBar = new tabBar( this, QBoxLayout::TopToBottom );
m_tabBar->setExclusive( TRUE );
m_tabBar->setExclusive( true );
m_tabBar->setFixedWidth( 72 );
QWidget * ws = new QWidget( this );
@@ -119,21 +119,21 @@ ladspaBrowserView::ladspaBrowserView( ToolPlugin * _tool ) :
m_tabBar->addTab( available, tr( "Available Effects" ),
0, FALSE, TRUE
0, false, true
)->setIcon( embed::getIconPixmap( "setup_audio" ) );
m_tabBar->addTab( unavailable, tr( "Unavailable Effects" ),
1, FALSE, TRUE
1, false, true
)->setIcon( embed::getIconPixmap(
"unavailable_sound" ) );
m_tabBar->addTab( instruments, tr( "Instruments" ),
2, FALSE, TRUE
2, false, true
)->setIcon( embed::getIconPixmap(
"setup_midi" ) );
m_tabBar->addTab( analysis, tr( "Analysis Tools" ),
3, FALSE, TRUE
3, false, true
)->setIcon( embed::getIconPixmap( "analysis" ) );
m_tabBar->addTab( other, tr( "Don't know" ),
4, TRUE, TRUE
4, true, true
)->setIcon( embed::getIconPixmap( "uhoh" ) );
@@ -208,7 +208,7 @@ QWidget * ladspaBrowserView::createTab( QWidget * _parent, const QString & _txt,
const QString type = "<b>" + tr( "Type:" ) + "</b> ";
QLabel * title = new QLabel( type + _txt, tab );
QFont f = title->font();
f.setBold( TRUE );
f.setBold( true );
title->setFont( pointSize<12>( f ) );
layout->addSpacing( 5 );

4
plugins/ladspa_browser/ladspa_description.cpp
View File

@@ -145,7 +145,7 @@ void ladspaDescription::update( const ladspa_key_t & _key )
maker_label->setAlignment( Qt::AlignTop );
QLabel * maker_content = new QLabel( maker );
maker_content->setText( manager->getMaker( _key ) );
maker_content->setWordWrap( TRUE );
maker_content->setWordWrap( true );
makerLayout->addWidget( maker_label );
makerLayout->addWidget( maker_content, 1 );
@@ -161,7 +161,7 @@ void ladspaDescription::update( const ladspa_key_t & _key )
QLabel * copyright_content = new QLabel( copyright );
copyright_content->setText( manager->getCopyright( _key ) );
copyright_content->setWordWrap( TRUE );
copyright_content->setWordWrap( true );
copyrightLayout->addWidget( copyright_label );
copyrightLayout->addWidget( copyright_content, 1 );

2
plugins/ladspa_browser/ladspa_port_dialog.cpp
View File

@@ -40,7 +40,7 @@ ladspaPortDialog::ladspaPortDialog( const ladspa_key_t & _key )
setWindowIcon( embed::getIconPixmap( "ports" ) );
setWindowTitle( tr( "Ports" ) );
setModal( TRUE );
setModal( true );
QVBoxLayout * vlayout = new QVBoxLayout( this );
vlayout->setSpacing( 0 );

4
plugins/ladspa_effect/LadspaSubPluginFeatures.cpp
View File

@@ -64,7 +64,7 @@ void LadspaSubPluginFeatures::fillDescriptionWidget( QWidget * _parent,
maker_label->setAlignment( Qt::AlignTop );
QLabel * maker_content = new QLabel( maker );
maker_content->setText( lm->getMaker( lkey ) );
maker_content->setWordWrap( TRUE );
maker_content->setWordWrap( true );
l->addWidget( maker_label );
l->addWidget( maker_content, 1 );
@@ -80,7 +80,7 @@ void LadspaSubPluginFeatures::fillDescriptionWidget( QWidget * _parent,
QLabel * copyright_content = new QLabel( copyright );
copyright_content->setText( lm->getCopyright( lkey ) );
copyright_content->setWordWrap( TRUE );
copyright_content->setWordWrap( true );
l->addWidget( copyright_label );
l->addWidget( copyright_content, 1 );

2
plugins/ladspa_effect/calf/calf/giface.h
View File

@@ -45,7 +45,7 @@ enum parameter_flags
PF_TYPEMASK = 0x000F, ///< bit mask for type
PF_FLOAT = 0x0000, ///< any float value
PF_INT = 0x0001, ///< integer value (still represented as float)
PF_BOOL = 0x0002, ///< bool value (usually >=0.5f is treated as TRUE, which is inconsistent with LV2 etc. which treats anything >0 as TRUE)
PF_BOOL = 0x0002, ///< bool value (usually >=0.5f is treated as true, which is inconsistent with LV2 etc. which treats anything >0 as true)
PF_ENUM = 0x0003, ///< enum value (min, min+1, ..., max, only guaranteed to work when min = 0)
PF_ENUM_MULTI = 0x0004, ///< SET / multiple-choice
PF_STRING = 0x0005, ///< see: http://lv2plug.in/docs/index.php?title=String_port

2
plugins/ladspa_effect/calf/modules_small.cpp
View File

@@ -753,7 +753,7 @@ public:
}
};
/// 4-input priority multiplexer - without inertia. Outputs the first input if gate_1 is TRUE, else second input if gate_2 is TRUE, else... else "Else" input
/// 4-input priority multiplexer - without inertia. Outputs the first input if gate_1 is true, else second input if gate_2 is true, else... else "Else" input
class prio_mux_c_audio_module: public null_small_audio_module
{
public:

10
plugins/lb302/lb302.h
View File

@@ -147,9 +147,9 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
virtual f_cnt_t desiredReleaseFrames( void ) const
virtual f_cnt_t desiredReleaseFrames() const
{
return 0; //4048;
}
@@ -180,8 +180,8 @@ private:
public slots:
void filterChanged( void );
void db24Toggled( void );
void filterChanged();
void db24Toggled();
private:
// Oscillator
@@ -246,7 +246,7 @@ public:
virtual ~lb302SynthView();
private:
virtual void modelChanged( void );
virtual void modelChanged();
knob * m_vcfCutKnob;
knob * m_vcfResKnob;

18
plugins/lb303/lb303.cpp
View File

@@ -276,10 +276,10 @@ lb303Synth::lb303Synth( InstrumentTrack * _InstrumentTrack ) :
dist_knob( 0.0f, 0.0f, 1.0f, 0.01f, this, tr( "Distortion" ) ),
wave_knob( 0.0f, 0.0f, 5.0f, 1.0f, this, tr( "Waveform" ) ),
slide_dec_knob( 0.6f, 0.0f, 1.0f, 0.005f, this, tr( "Slide Decay" ) ),
slideToggle( FALSE, this, tr( "Slide" ) ),
accentToggle( FALSE, this, tr( "Accent" ) ),
deadToggle( FALSE, this, tr( "Dead" ) ),
db24Toggle( FALSE, this, tr( "24dB/oct Filter" ) )
slideToggle( false, this, tr( "Slide" ) ),
accentToggle( false, this, tr( "Accent" ) ),
deadToggle( false, this, tr( "Dead" ) ),
db24Toggle( false, this, tr( "24dB/oct Filter" ) )
{
@@ -403,7 +403,7 @@ void lb303Synth::loadSettings( const QDomElement & _this )
// TODO: Split into one function per knob. envdecay doesn't require
// recalcFilter.
void lb303Synth::filterChanged( void )
void lb303Synth::filterChanged()
{
fs.cutoff = vcf_cut_knob.value();
fs.reso = vcf_res_knob.value();
@@ -420,7 +420,7 @@ void lb303Synth::filterChanged( void )
}
void lb303Synth::db24Toggled( void )
void lb303Synth::db24Toggled()
{
delete vcf;
if(db24Toggle.value()) {
@@ -434,7 +434,7 @@ void lb303Synth::db24Toggled( void )
QString lb303Synth::nodeName( void ) const
QString lb303Synth::nodeName() const
{
return( lb303_plugin_descriptor.name );
}
@@ -792,7 +792,7 @@ lb303SynthView::lb303SynthView( Instrument * _instrument, QWidget * _parent ) :
m_waveKnob->setLabel( tr( "WAVE"));
setAutoFillBackground( TRUE );
setAutoFillBackground( true );
QPalette pal;
pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap(
"artwork" ) );
@@ -805,7 +805,7 @@ lb303SynthView::~lb303SynthView()
}
void lb303SynthView::modelChanged( void )
void lb303SynthView::modelChanged()
{
lb303Synth * syn = castModel<lb303Synth>();

10
plugins/lb303/lb303.h
View File

@@ -148,9 +148,9 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
virtual f_cnt_t desiredReleaseFrames( void ) const
virtual f_cnt_t desiredReleaseFrames() const
{
return 0; //4048;
}
@@ -181,8 +181,8 @@ private:
public slots:
void filterChanged( void );
void db24Toggled( void );
void filterChanged();
void db24Toggled();
private:
// Oscillator
@@ -247,7 +247,7 @@ public:
virtual ~lb303SynthView();
private:
virtual void modelChanged( void );
virtual void modelChanged();
knob * m_vcfCutKnob;
knob * m_vcfResKnob;

6
plugins/organic/organic.cpp
View File

@@ -379,7 +379,7 @@ organicInstrumentView::organicInstrumentView( Instrument * _instrument,
{
organicInstrument * oi = castModel<organicInstrument>();
setAutoFillBackground( TRUE );
setAutoFillBackground( true );
QPalette pal;
pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap(
"artwork" ) );
@@ -394,7 +394,7 @@ organicInstrumentView::organicInstrumentView( Instrument * _instrument,
// setup volume-knob
m_volKnob = new organicKnob( this );
m_volKnob->setVolumeKnob( TRUE );
m_volKnob->setVolumeKnob( true );
m_volKnob->move( 60, 201 );
m_volKnob->setFixedSize( 37, 47 );
m_volKnob->setHintText( tr( "Volume:" ).arg( 1 ) + " ", "%" );
@@ -455,7 +455,7 @@ void organicInstrumentView::modelChanged()
// setup volume-knob
knob * volKnob = new knob( knobStyled, this );
volKnob->setVolumeKnob( TRUE );
volKnob->setVolumeKnob( true );
volKnob->move( x + i * colWidth, y + rowHeight*1 );
volKnob->setFixedSize( 21, 21 );
volKnob->setHintText( tr( "Osc %1 volume:" ).arg(

14
plugins/organic/organic.h
View File

@@ -67,9 +67,9 @@ private:
private slots:
void oscButtonChanged( void );
void updateVolume( void );
void updateDetuning( void );
void oscButtonChanged();
void updateVolume();
void updateDetuning();
} ;
@@ -89,13 +89,13 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
int intRand( int min, int max );
public slots:
void randomiseSettings( void );
void randomiseSettings();
private:
@@ -126,7 +126,7 @@ private:
virtual PluginView * instantiateView( QWidget * _parent );
private slots:
void updateAllDetuning( void );
void updateAllDetuning();
friend class organicInstrumentView;
} ;
@@ -140,7 +140,7 @@ public:
virtual ~organicInstrumentView();
private:
virtual void modelChanged( void );
virtual void modelChanged();
struct OscillatorKnobs
{

8
plugins/papu/papu_instrument.cpp
View File

@@ -203,7 +203,7 @@ void papuInstrument::loadSettings( const QDomElement & _this )
m_graphModel.setSamples( (float*) dst );
}
QString papuInstrument::nodeName( void ) const
QString papuInstrument::nodeName() const
{
return( papu_plugin_descriptor.name );
}
@@ -211,7 +211,7 @@ QString papuInstrument::nodeName( void ) const
/*f_cnt_t papuInstrument::desiredReleaseFrames( void ) const
/*f_cnt_t papuInstrument::desiredReleaseFrames() const
{
const float samplerate = engine::getMixer()->processingSampleRate();
int maxrel = 0;
@@ -224,7 +224,7 @@ QString papuInstrument::nodeName( void ) const
return f_cnt_t( float(relTime[maxrel])*samplerate/1000.0 );
}*/
f_cnt_t papuInstrument::desiredReleaseFrames( void ) const
f_cnt_t papuInstrument::desiredReleaseFrames() const
{
return f_cnt_t( 1000 );
}
@@ -689,7 +689,7 @@ papuInstrumentView::~papuInstrumentView()
}
void papuInstrumentView::modelChanged( void )
void papuInstrumentView::modelChanged()
{
papuInstrument * p = castModel<papuInstrument>();

14
plugins/papu/papu_instrument.h
View File

@@ -52,16 +52,16 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
virtual f_cnt_t desiredReleaseFrames( void ) const;
virtual f_cnt_t desiredReleaseFrames() const;
virtual PluginView * instantiateView( QWidget * _parent );
/*public slots:
void updateKnobHint( void );
void updateKnobToolTip( void );*/
void updateKnobHint();
void updateKnobToolTip();*/
private:
FloatModel m_ch1SweepTimeModel;
@@ -114,7 +114,7 @@ public:
virtual ~papuInstrumentView();
private:
virtual void modelChanged( void );
virtual void modelChanged();
knob * m_ch1SweepTimeKnob;
pixmapButton * m_ch1SweepDirButton;
@@ -155,8 +155,8 @@ private:
graph * m_graph;
/*protected slots:
void updateKnobHint( void );
void updateKnobToolTip( void );*/
void updateKnobHint();
void updateKnobToolTip();*/
} ;

2
plugins/patman/patman.h
View File

@@ -73,7 +73,7 @@ public:
public slots:
void setFile( const QString & _patch_file, bool _rename = TRUE );
void setFile( const QString & _patch_file, bool _rename = true );
private:

22
plugins/sf2_player/sf2_player.cpp
View File

@@ -92,7 +92,7 @@ sf2Instrument::sf2Instrument( InstrumentTrack * _instrument_track ) :
m_bankNum( 0, 0, 999, this, tr("Bank") ),
m_patchNum( 0, 0, 127, this, tr("Patch") ),
m_gain( 1.0f, 0.0f, 5.0f, 0.01f, this, tr( "Gain" ) ),
m_reverbOn( FALSE, this, tr( "Reverb" ) ),
m_reverbOn( false, this, tr( "Reverb" ) ),
m_reverbRoomSize( FLUID_REVERB_DEFAULT_ROOMSIZE, 0, 1.0, 0.01f,
this, tr( "Reverb Roomsize" ) ),
m_reverbDamping( FLUID_REVERB_DEFAULT_DAMP, 0, 1.0, 0.01,
@@ -101,7 +101,7 @@ sf2Instrument::sf2Instrument( InstrumentTrack * _instrument_track ) :
this, tr( "Reverb Width" ) ),
m_reverbLevel( FLUID_REVERB_DEFAULT_LEVEL, 0, 1.0, 0.01f,
this, tr( "Reverb Level" ) ),
m_chorusOn( FALSE, this, tr( "Chorus" ) ),
m_chorusOn( false, this, tr( "Chorus" ) ),
m_chorusNum( FLUID_CHORUS_DEFAULT_N, 0, 10.0, 1.0,
this, tr( "Chorus Lines" ) ),
m_chorusLevel( FLUID_CHORUS_DEFAULT_LEVEL, 0, 10.0, 0.01,
@@ -309,7 +309,7 @@ void sf2Instrument::freeFont()
{
cout << "Really deleting " << m_filename << endl;
fluid_synth_sfunload( m_synth, m_fontId, TRUE );
fluid_synth_sfunload( m_synth, m_fontId, true );
s_fonts.remove( m_filename );
delete m_font;
}
@@ -360,7 +360,7 @@ void sf2Instrument::openFile( const QString & _sf2File )
// Add to map, if doesn't exist.
else
{
m_fontId = fluid_synth_sfload( m_synth, sf2Ascii, TRUE );
m_fontId = fluid_synth_sfload( m_synth, sf2Ascii, true );
if( fluid_synth_sfcount( m_synth ) > 0 )
{
@@ -807,7 +807,7 @@ sf2InstrumentView::sf2InstrumentView( Instrument * _instrument,
"patches_on" ) );
m_patchDialogButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap(
"patches_off" ) );
m_patchDialogButton->setEnabled( FALSE );
m_patchDialogButton->setEnabled( false );
m_patchDialogButton->move( 217, 125 );
connect( m_patchDialogButton, SIGNAL( clicked() ),
@@ -819,12 +819,12 @@ sf2InstrumentView::sf2InstrumentView( Instrument * _instrument,
m_bankNumLcd = new lcdSpinBox( 3, "21pink", this );
m_bankNumLcd->move(131, 62);
// m_bankNumLcd->addTextForValue( -1, "---" );
// m_bankNumLcd->setEnabled( FALSE );
// m_bankNumLcd->setEnabled( false );
m_patchNumLcd = new lcdSpinBox( 3, "21pink", this );
m_patchNumLcd->move(190, 62);
// m_patchNumLcd->addTextForValue( -1, "---" );
// m_patchNumLcd->setEnabled( FALSE );
// m_patchNumLcd->setEnabled( false );
/*hl->addWidget( m_fileDialogButton );
hl->addWidget( m_bankNumLcd );
@@ -856,7 +856,7 @@ sf2InstrumentView::sf2InstrumentView( Instrument * _instrument,
m_reverbButton = new pixmapButton( this );
m_reverbButton->setCheckable( TRUE );
m_reverbButton->setCheckable( true );
m_reverbButton->move( 24, 176 );
m_reverbButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
"reverb_on" ) );
@@ -898,7 +898,7 @@ sf2InstrumentView::sf2InstrumentView( Instrument * _instrument,
// hl = new QHBoxLayout();
m_chorusButton = new pixmapButton( this );
m_chorusButton->setCheckable( TRUE );
m_chorusButton->setCheckable( true );
m_chorusButton->move( 24, 222 );
m_chorusButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap(
"chorus_on" ) );
@@ -934,7 +934,7 @@ sf2InstrumentView::sf2InstrumentView( Instrument * _instrument,
vl->addLayout( hl );
*/
setAutoFillBackground( TRUE );
setAutoFillBackground( true );
QPalette pal;
pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap(
"artwork" ) );
@@ -1052,7 +1052,7 @@ void sf2InstrumentView::showFileDialog()
if( QFileInfo( f ).isRelative() )
{
f = configManager::inst()->userSamplesDir() + f;
if( QFileInfo( f ).exists() == FALSE )
if( QFileInfo( f ).exists() == false )
{
f = configManager::inst()->factorySamplesDir() +
k->m_filename;

22
plugins/sid/sid_instrument.cpp
View File

@@ -217,7 +217,7 @@ void sidInstrument::loadSettings( const QDomElement & _this )
QString sidInstrument::nodeName( void ) const
QString sidInstrument::nodeName() const
{
return( sid_plugin_descriptor.name );
}
@@ -225,7 +225,7 @@ QString sidInstrument::nodeName( void ) const
f_cnt_t sidInstrument::desiredReleaseFrames( void ) const
f_cnt_t sidInstrument::desiredReleaseFrames() const
{
const float samplerate = engine::getMixer()->processingSampleRate();
int maxrel = 0;
@@ -477,7 +477,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument,
InstrumentView( _instrument, _parent )
{
setAutoFillBackground( TRUE );
setAutoFillBackground( true );
QPalette pal;
pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap( "artwork" ) );
setPalette( pal );
@@ -518,7 +518,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument,
m_passBtnGrp->addButton( lp_btn );
m_offButton = new pixmapButton( this, NULL );
m_offButton->setCheckable( TRUE );
m_offButton->setCheckable( true );
m_offButton->move( 176 + 3*14, 53 );
m_offButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "3offred" ) );
m_offButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "3off" ) );
@@ -624,7 +624,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument,
int syncRingWidth[] = { 3, 1, 2 };
pixmapButton * sync_btn = new pixmapButton( this, NULL );
sync_btn->setCheckable( TRUE );
sync_btn->setCheckable( true );
sync_btn->move( 191, 117 + i*50 );
sync_btn->setActiveGraphic(
PLUGIN_NAME::getIconPixmap( "syncred" ) );
@@ -637,7 +637,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument,
.arg( syncRingWidth[i] ) );
pixmapButton * ringMod_btn = new pixmapButton( this, NULL );
ringMod_btn->setCheckable( TRUE );
ringMod_btn->setCheckable( true );
ringMod_btn->move( 191 + 2*14, 117 + i*50 );
ringMod_btn->setActiveGraphic(
PLUGIN_NAME::getIconPixmap( "ringred" ) );
@@ -650,7 +650,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument,
.arg( syncRingWidth[i] ) );
pixmapButton * filter_btn = new pixmapButton( this, NULL );
filter_btn->setCheckable( TRUE );
filter_btn->setCheckable( true );
filter_btn->move( 191, 131 + i*50 );
filter_btn->setActiveGraphic(
PLUGIN_NAME::getIconPixmap( "filterred" ) );
@@ -663,7 +663,7 @@ sidInstrumentView::sidInstrumentView( Instrument * _instrument,
"it." ).arg( i+1 ) );
pixmapButton * test_btn = new pixmapButton( this, NULL );
test_btn->setCheckable( TRUE );
test_btn->setCheckable( true );
test_btn->move( 191 +2*14, 131 + i*50 );
test_btn->setActiveGraphic(
PLUGIN_NAME::getIconPixmap( "testred" ) );
@@ -683,7 +683,7 @@ sidInstrumentView::~sidInstrumentView()
{
}
void sidInstrumentView::updateKnobHint( void )
void sidInstrumentView::updateKnobHint()
{
sidInstrument * k = castModel<sidInstrument>();
@@ -724,7 +724,7 @@ void sidInstrumentView::updateKnobHint( void )
void sidInstrumentView::updateKnobToolTip( void )
void sidInstrumentView::updateKnobToolTip()
{
sidInstrument * k = castModel<sidInstrument>();
for( int i = 0; i < 3; ++i )
@@ -744,7 +744,7 @@ void sidInstrumentView::updateKnobToolTip( void )
void sidInstrumentView::modelChanged( void )
void sidInstrumentView::modelChanged()
{
sidInstrument * k = castModel<sidInstrument>();

14
plugins/sid/sid_instrument.h
View File

@@ -99,16 +99,16 @@ public:
virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent );
virtual void loadSettings( const QDomElement & _this );
virtual QString nodeName( void ) const;
virtual QString nodeName() const;
virtual f_cnt_t desiredReleaseFrames( void ) const;
virtual f_cnt_t desiredReleaseFrames() const;
virtual PluginView * instantiateView( QWidget * _parent );
/*public slots:
void updateKnobHint( void );
void updateKnobToolTip( void );*/
void updateKnobHint();
void updateKnobToolTip();*/
private:
// voices
@@ -139,7 +139,7 @@ public:
virtual ~sidInstrumentView();
private:
virtual void modelChanged( void );
virtual void modelChanged();
automatableButtonGroup * m_passBtnGrp;
automatableButtonGroup * m_sidTypeBtnGrp;
@@ -194,8 +194,8 @@ private:
pixmapButton * m_offButton;
protected slots:
void updateKnobHint( void );
void updateKnobToolTip( void );
void updateKnobHint();
void updateKnobToolTip();
} ;

2
plugins/spectrum_analyzer/spectrum_analyzer.cpp
View File

@@ -79,7 +79,7 @@ bool spectrumAnalyzer::processAudioBuffer( sampleFrame * _buf,
{
if( !isEnabled() || !isRunning () )
{
return( FALSE );
return( false );
}
fpp_t f = 0;

2
plugins/spectrum_analyzer/spectrum_analyzer.h
View File

@@ -50,7 +50,7 @@ public:
virtual bool processAudioBuffer( sampleFrame * _buf,
const fpp_t _frames );
virtual EffectControls * controls( void )
virtual EffectControls * controls()
{
return( &m_saControls );
}

Some files were not shown because too many files have changed in this diff Show More