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

Replaced remaining occurences of old constants and superfluous "void"
on empty argument list of functions.
(cherry picked from commit 166701f9f3)

include/Controller.h

@@ -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;
 

include/ControllerConnection.h

@@ -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;
 };

include/ControllerConnectionDialog.h

@@ -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:

include/ControllerView.h

@@ -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 );
 
 

include/LadspaControl.h

@@ -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();

include/MainWindow.h

@@ -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;

include/MidiController.h

@@ -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:

include/PeakController.h

@@ -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;
 

include/automatable_button.h

@@ -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:

include/automatable_slider.h

@@ -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();
 
 } ;
 

include/automation_editor.h

@@ -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();
 
 
 

include/automation_pattern.h

@@ -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 );
 
 

include/automation_pattern_view.h

@@ -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 );
 
 

include/automation_track.h

@@ -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" );
 	}

include/basic_filters.h

@@ -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 )

include/bb_editor.h

@@ -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 );

include/bb_track.h

@@ -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:

include/bb_track_container.h

@@ -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:

include/combobox.h

@@ -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>() );
 	}

include/config_mgr.h

@@ -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();
 

include/detuning_helper.h

@@ -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" );
 	}

include/effect_lib.h

@@ -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 ) );

include/embed.h

@@ -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;
 	}

include/endian_handling.h

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

include/fade_button.h

@@ -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();
 
 } ;
 

include/fifo_buffer.h

@@ -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() );
 	}

include/graph.h

@@ -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();

include/group_box.h

@@ -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;

include/inline_automation.h

@@ -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 )
 		{

include/knob.h

@@ -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,

include/ladspa_2_lmms.h

@@ -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;

include/ladspa_manager.h

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

include/led_checkbox.h

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

include/lmms_basics.h

@@ -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;
 }

include/lmms_math.h

@@ -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;

include/midi_time.h

@@ -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 );
 	}

include/mmp.h

@@ -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 );
 

include/note.h

@@ -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();
 
 } ;
 

include/nstate_button.h

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

include/piano_roll.h

@@ -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;
 

include/pixmap_button.h

@@ -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:

include/plugin_browser.h

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

include/rubberband.h

@@ -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;
 
 };
 

include/sample_play_handle.h

@@ -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 );
 	}

include/sample_record_handle.h

@@ -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 );
 
 

include/setup_dialog.h

@@ -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 );

include/shared_object.h

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

include/side_bar.h

@@ -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 )
 			{

include/side_bar_widget.h

@@ -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 );
 	}

include/song.h

@@ -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();
 	}

include/song_editor.h

@@ -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;

include/string_pair_drag.h

@@ -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" );
 	}

include/surround_area.h

@@ -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>() );
 	}

include/tab_bar.h

@@ -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();
 
 } ;
 

include/tab_button.h

@@ -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 );
 	}

include/tab_widget.h

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

include/text_float.h

@@ -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;

include/timeline.h

@@ -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() );
 	}

include/track.h

@@ -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 ---------------

include/track_container_view.h

@@ -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() );
 		}

include/track_label_button.h

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

include/transformable_auto_model.h

@@ -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 );
 	}

include/update_event.h

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

include/visualization_widget.h

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