diff --git a/include/Controller.h b/include/Controller.h index e411dc0b5e..5ca110a538 100644 --- a/include/Controller.h +++ b/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; diff --git a/include/ControllerConnection.h b/include/ControllerConnection.h index f879e31740..20c8817b29 100644 --- a/include/ControllerConnection.h +++ b/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; }; diff --git a/include/ControllerConnectionDialog.h b/include/ControllerConnectionDialog.h index d4881fb3f1..531c2ae945 100644 --- a/include/ControllerConnectionDialog.h +++ b/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: diff --git a/include/ControllerView.h b/include/ControllerView.h index 0e69834f0a..44805bdc11 100644 --- a/include/ControllerView.h +++ b/include/ControllerView.h @@ -46,22 +46,22 @@ public: ControllerView( Controller * _controller, QWidget * _parent ); virtual ~ControllerView(); - inline Controller * getController( void ) + inline Controller * getController() { return( castModel() ); } - inline const Controller * getController( void ) const + inline const Controller * getController() const { return( castModel() ); } 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 ); diff --git a/include/LadspaControl.h b/include/LadspaControl.h index abbd04043a..bf8ccb1ffb 100644 --- a/include/LadspaControl.h +++ b/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(); diff --git a/include/MainWindow.h b/include/MainWindow.h index 6956eef5f5..9bc125dbf0 100644 --- a/include/MainWindow.h +++ b/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; diff --git a/include/MidiController.h b/include/MidiController.h index 539c1211ae..f9d3a0d333 100644 --- a/include/MidiController.h +++ b/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: diff --git a/include/PeakController.h b/include/PeakController.h index 4210da75da..b56c4c1a56 100644 --- a/include/PeakController.h +++ b/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; diff --git a/include/automatable_button.h b/include/automatable_button.h index 40b1c8e111..53084cfec8 100644 --- a/include/automatable_button.h +++ b/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: diff --git a/include/automatable_slider.h b/include/automatable_slider.h index fa02552f41..3a41a77f60 100644 --- a/include/automatable_slider.h +++ b/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(); } ; diff --git a/include/automation_editor.h b/include/automation_editor.h index e1612fa693..bf4826d60f 100644 --- a/include/automation_editor.h +++ b/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(); diff --git a/include/automation_pattern.h b/include/automation_pattern.h index 95665e9965..acae3f29cd 100644 --- a/include/automation_pattern.h +++ b/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 ); diff --git a/include/automation_pattern_view.h b/include/automation_pattern_view.h index 9a2e68f2ec..881180d74a 100644 --- a/include/automation_pattern_view.h +++ b/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 ); diff --git a/include/automation_track.h b/include/automation_track.h index 0fcb2efc74..18d43ede66 100644 --- a/include/automation_track.h +++ b/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" ); } diff --git a/include/basic_filters.h b/include/basic_filters.h index 2c544b1f6d..d3b4569dfb 100644 --- a/include/basic_filters.h +++ b/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 ) diff --git a/include/bb_editor.h b/include/bb_editor.h index 5924a5a79d..957058888f 100644 --- a/include/bb_editor.h +++ b/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 ); diff --git a/include/bb_track.h b/include/bb_track.h index 05f85a812c..d64c8e35bb 100644 --- a/include/bb_track.h +++ b/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: diff --git a/include/bb_track_container.h b/include/bb_track_container.h index 82ee50850b..e600a3cd6d 100644 --- a/include/bb_track_container.h +++ b/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: diff --git a/include/combobox.h b/include/combobox.h index a8a18fc8b4..d4d4326406 100644 --- a/include/combobox.h +++ b/include/combobox.h @@ -41,12 +41,12 @@ public: comboBox( QWidget * _parent, const QString & _name = QString() ); virtual ~comboBox(); - ComboBoxModel * model( void ) + ComboBoxModel * model() { return( castModel() ); } - const ComboBoxModel * model( void ) const + const ComboBoxModel * model() const { return( castModel() ); } diff --git a/include/config_mgr.h b/include/config_mgr.h index bbe16b09dc..ec3babf3c6 100644 --- a/include/config_mgr.h +++ b/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(); diff --git a/include/detuning_helper.h b/include/detuning_helper.h index 554041d2e5..8ddf4eac0c 100644 --- a/include/detuning_helper.h +++ b/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" ); } diff --git a/include/effect_lib.h b/include/effect_lib.h index 0ef1507953..06b8414fce 100644 --- a/include/effect_lib.h +++ b/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 ) ); diff --git a/include/embed.h b/include/embed.h index 0a7dafed71..3aa9c8ab2c 100644 --- a/include/embed.h +++ b/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; } diff --git a/include/endian_handling.h b/include/endian_handling.h index dce9e74bfb..52be0ae31a 100644 --- a/include/endian_handling.h +++ b/include/endian_handling.h @@ -31,7 +31,7 @@ #include "lmms_basics.h" -inline bool isLittleEndian( void ) +inline bool isLittleEndian() { return( QSysInfo::ByteOrder == QSysInfo::LittleEndian ); } diff --git a/include/fade_button.h b/include/fade_button.h index b4001773cf..861595ecb4 100644 --- a/include/fade_button.h +++ b/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(); } ; diff --git a/include/fifo_buffer.h b/include/fifo_buffer.h index 4dc636b12b..3942d348e2 100644 --- a/include/fifo_buffer.h +++ b/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() ); } diff --git a/include/graph.h b/include/graph.h index 3661a462dc..9be552f33c 100644 --- a/include/graph.h +++ b/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(); diff --git a/include/group_box.h b/include/group_box.h index 996a545ff7..5cd5da9fa7 100644 --- a/include/group_box.h +++ b/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; diff --git a/include/inline_automation.h b/include/inline_automation.h index a89a23b42d..4a851b680d 100644 --- a/include/inline_automation.h +++ b/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::isEqual( @@ -58,7 +58,7 @@ public: defaultValue() ); } - automationPattern * getAutomationPattern( void ) + automationPattern * getAutomationPattern() { if( m_autoPattern == NULL ) { diff --git a/include/knob.h b/include/knob.h index 4e7abca304..3e13dec641 100644 --- a/include/knob.h +++ b/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( ( model()->maxValue() - model()->minValue() ) / 100.0f, diff --git a/include/ladspa_2_lmms.h b/include/ladspa_2_lmms.h index 2c172b1504..b85fabe596 100644 --- a/include/ladspa_2_lmms.h +++ b/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; diff --git a/include/ladspa_manager.h b/include/ladspa_manager.h index 5b6c0c974d..eeaecc440c 100644 --- a/include/ladspa_manager.h +++ b/include/ladspa_manager.h @@ -84,7 +84,7 @@ class EXPORT ladspaManager { public: - ladspaManager( void ); + ladspaManager(); virtual ~ladspaManager(); l_sortable_plugin_t getSortedPlugins(); diff --git a/include/led_checkbox.h b/include/led_checkbox.h index 8bdbdec1a5..edb9e40777 100644 --- a/include/led_checkbox.h +++ b/include/led_checkbox.h @@ -50,7 +50,7 @@ public: virtual ~ledCheckBox(); - inline const QString & text( void ) + inline const QString & text() { return( m_text ); } diff --git a/include/lmms_basics.h b/include/lmms_basics.h index 8575148ead..ae26b15851 100644 --- a/include/lmms_basics.h +++ b/include/lmms_basics.h @@ -72,17 +72,17 @@ typedef Uint32 jo_id_t; // (unique) ID of a journalling object template struct typeInfo { - static inline T min( void ) + static inline T min() { return std::numeric_limits::min(); } - static inline T max( void ) + static inline T max() { return std::numeric_limits::max(); } - static inline T minEps( void ) + static inline T minEps() { return 1; } @@ -100,7 +100,7 @@ struct typeInfo template<> -inline float typeInfo::minEps( void ) +inline float typeInfo::minEps() { return 1.0e-10; } diff --git a/include/lmms_math.h b/include/lmms_math.h index 9eac3c94f2..57454ac572 100644 --- a/include/lmms_math.h +++ b/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; diff --git a/include/midi_time.h b/include/midi_time.h index 620738177e..f7f857624e 100644 --- a/include/midi_time.h +++ b/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 ); } diff --git a/include/mmp.h b/include/mmp.h index 82818a8f3c..55f289427e 100644 --- a/include/mmp.h +++ b/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 ); diff --git a/include/note.h b/include/note.h index 2024fdb692..96ba0270a2 100644 --- a/include/note.h +++ b/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(); } ; diff --git a/include/nstate_button.h b/include/nstate_button.h index ffd2068d93..b866653a9e 100644 --- a/include/nstate_button.h +++ b/include/nstate_button.h @@ -46,7 +46,7 @@ public: m_generalToolTip = _tooltip; } - inline int state( void ) const + inline int state() const { return( m_curState ); } diff --git a/include/piano_roll.h b/include/piano_roll.h index 52115af8d3..426fd81702 100644 --- a/include/piano_roll.h +++ b/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; diff --git a/include/pixmap_button.h b/include/pixmap_button.h index f99e69d4a2..d15c4b9115 100644 --- a/include/pixmap_button.h +++ b/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: diff --git a/include/plugin_browser.h b/include/plugin_browser.h index 03f6395227..92e0632b17 100644 --- a/include/plugin_browser.h +++ b/include/plugin_browser.h @@ -72,7 +72,7 @@ protected: private slots: - void updateHeight( void ); + void updateHeight(); private: diff --git a/include/rubberband.h b/include/rubberband.h index e56f0307e8..2e4d303d80 100644 --- a/include/rubberband.h +++ b/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 selectedObjects( void ) const; + QVector selectedObjects() const; protected: virtual void resizeEvent( QResizeEvent * _re ); private: - QVector selectableObjects( void ) const; + QVector selectableObjects() const; }; diff --git a/include/sample_play_handle.h b/include/sample_play_handle.h index 502464529e..2c11617374 100644 --- a/include/sample_play_handle.h +++ b/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 ); } diff --git a/include/sample_record_handle.h b/include/sample_record_handle.h index 4bf40580e5..f07cfd3507 100644 --- a/include/sample_record_handle.h +++ b/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 ); diff --git a/include/setup_dialog.h b/include/setup_dialog.h index 0298408fb5..416543a67b 100644 --- a/include/setup_dialog.h +++ b/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 ); diff --git a/include/shared_object.h b/include/shared_object.h index 095442baa1..a02e933f42 100644 --- a/include/shared_object.h +++ b/include/shared_object.h @@ -34,7 +34,7 @@ class sharedObject { public: - sharedObject( void ) : + sharedObject() : m_referenceCount( 1 ), m_lock() { diff --git a/include/side_bar.h b/include/side_bar.h index fd9f7ade93..29fd4e6bc9 100644 --- a/include/side_bar.h +++ b/include/side_bar.h @@ -65,9 +65,9 @@ private slots: QMap::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 ) { diff --git a/include/side_bar_widget.h b/include/side_bar_widget.h index dd9dfe536b..e29db10ad1 100644 --- a/include/side_bar_widget.h +++ b/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 ); } diff --git a/include/song.h b/include/song.h index 0c94ced81a..52fb367d19 100644 --- a/include/song.h +++ b/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(); } diff --git a/include/song_editor.h b/include/song_editor.h index 8302d795ee..04a3325f34 100644 --- a/include/song_editor.h +++ b/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; diff --git a/include/string_pair_drag.h b/include/string_pair_drag.h index 5a3316e6e2..46b546a5be 100644 --- a/include/string_pair_drag.h +++ b/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" ); } diff --git a/include/surround_area.h b/include/surround_area.h index bd797568c3..6e17747284 100644 --- a/include/surround_area.h +++ b/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() ); } - const surroundAreaModel * model( void ) const + const surroundAreaModel * model() const { return( castModel() ); } diff --git a/include/tab_bar.h b/include/tab_bar.h index 93c9f92060..dd60410526 100644 --- a/include/tab_bar.h +++ b/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(); } ; diff --git a/include/tab_button.h b/include/tab_button.h index 8c7c0b229d..87c0aed1ac 100644 --- a/include/tab_button.h +++ b/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 ); } diff --git a/include/tab_widget.h b/include/tab_widget.h index c06756d0a6..40d7abf4a1 100644 --- a/include/tab_widget.h +++ b/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 ); } diff --git a/include/text_float.h b/include/text_float.h index 191daaf042..b631ca8785 100644 --- a/include/text_float.h +++ b/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; diff --git a/include/timeline.h b/include/timeline.h index d1deca16f7..298f42a7ba 100644 --- a/include/timeline.h +++ b/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() ); } diff --git a/include/track.h b/include/track.h index c0c4f0ab26..074a6dbb95 100644 --- a/include/track.h +++ b/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 --------------- diff --git a/include/track_container_view.h b/include/track_container_view.h index 7256c95a7b..cace6bf8e0 100644 --- a/include/track_container_view.h +++ b/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 selectedObjects() { - if( allowRubberband() == TRUE ) + if( allowRubberband() == true ) { return( m_rubberBand->selectedObjects() ); } diff --git a/include/track_label_button.h b/include/track_label_button.h index d9d90ae3ef..5638cf56ab 100644 --- a/include/track_label_button.h +++ b/include/track_label_button.h @@ -41,7 +41,7 @@ public: public slots: - void rename( void ); + void rename(); protected: diff --git a/include/transformable_auto_model.h b/include/transformable_auto_model.h index c2a4ec41d8..85a64a7bba 100644 --- a/include/transformable_auto_model.h +++ b/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 ); } diff --git a/include/update_event.h b/include/update_event.h index a31cb2d815..fd2deff832 100644 --- a/include/update_event.h +++ b/include/update_event.h @@ -33,7 +33,7 @@ class updateEvent : public QEvent { public: - updateEvent( void ) : + updateEvent() : QEvent( (QEvent::Type)customEvents::GUI_UPDATE ) { } diff --git a/include/visualization_widget.h b/include/visualization_widget.h index 6970f66466..863a0eccad 100644 --- a/include/visualization_widget.h +++ b/include/visualization_widget.h @@ -54,7 +54,7 @@ protected: protected slots: - void updateAudioBuffer( void ); + void updateAudioBuffer(); private: diff --git a/plugins/audio_file_processor/audio_file_processor.h b/plugins/audio_file_processor/audio_file_processor.h index b94122d2e2..1ee286d83c 100644 --- a/plugins/audio_file_processor/audio_file_processor.h +++ b/plugins/audio_file_processor/audio_file_processor.h @@ -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; diff --git a/plugins/bass_booster/bass_booster.cpp b/plugins/bass_booster/bass_booster.cpp index 81328a0b11..1388126d22 100644 --- a/plugins/bass_booster/bass_booster.cpp +++ b/plugins/bass_booster/bass_booster.cpp @@ -72,7 +72,7 @@ bool bassBoosterEffect::processAudioBuffer( sampleFrame * _buf, { if( !isEnabled() || !isRunning () ) { - return( FALSE ); + return( false ); } double out_sum = 0.0; diff --git a/plugins/bass_booster/bass_booster.h b/plugins/bass_booster/bass_booster.h index 089fc547f9..448e161987 100644 --- a/plugins/bass_booster/bass_booster.h +++ b/plugins/bass_booster/bass_booster.h @@ -41,7 +41,7 @@ public: virtual bool processAudioBuffer( sampleFrame * _buf, const fpp_t _frames ); - virtual EffectControls * controls( void ) + virtual EffectControls * controls() { return( &m_bbControls ); } diff --git a/plugins/bass_booster/bassbooster_control_dialog.cpp b/plugins/bass_booster/bassbooster_control_dialog.cpp index 8dfc16400a..70dff37921 100644 --- a/plugins/bass_booster/bassbooster_control_dialog.cpp +++ b/plugins/bass_booster/bassbooster_control_dialog.cpp @@ -35,7 +35,7 @@ bassBoosterControlDialog::bassBoosterControlDialog( bassBoosterControls * _controls ) : EffectControlDialog( _controls ) { - setAutoFillBackground( TRUE ); + setAutoFillBackground( true ); QPalette pal; pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap( "artwork" ) ); diff --git a/plugins/bass_booster/bassbooster_controls.cpp b/plugins/bass_booster/bassbooster_controls.cpp index 2741eb56fd..b6fbee498f 100644 --- a/plugins/bass_booster/bassbooster_controls.cpp +++ b/plugins/bass_booster/bassbooster_controls.cpp @@ -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() ); diff --git a/plugins/bass_booster/bassbooster_controls.h b/plugins/bass_booster/bassbooster_controls.h index d220d26d40..8d2fc4c7b4 100644 --- a/plugins/bass_booster/bassbooster_controls.h +++ b/plugins/bass_booster/bassbooster_controls.h @@ -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: diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp index d2e468dbb5..c8c8e2f1ae 100644 --- a/plugins/bit_invader/bit_invader.cpp +++ b/plugins/bit_invader/bit_invader.cpp @@ -84,7 +84,7 @@ bSynth::~bSynth() } -sample_t bSynth::nextStringSample( void ) +sample_t bSynth::nextStringSample() { float sample_step = static_cast( 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(); @@ -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(); diff --git a/plugins/bit_invader/bit_invader.h b/plugins/bit_invader/bit_invader.h index e0a708b06f..c38eb6b417 100644 --- a/plugins/bit_invader/bit_invader.h +++ b/plugins/bit_invader/bit_invader.h @@ -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; diff --git a/plugins/flp_import/unrtf/attr.c b/plugins/flp_import/unrtf/attr.c index 44e097dde7..1b8001ac90 100644 --- a/plugins/flp_import/unrtf/attr.c +++ b/plugins/flp_import/unrtf/attr.c @@ -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) diff --git a/plugins/flp_import/unrtf/attr.h b/plugins/flp_import/unrtf/attr.h index 04c6f3fb99..5ab23ef70d 100644 --- a/plugins/flp_import/unrtf/attr.h +++ b/plugins/flp_import/unrtf/attr.h @@ -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); diff --git a/plugins/flp_import/unrtf/convert.c b/plugins/flp_import/unrtf/convert.c index 38f5e4e00d..92c3f0061d 100644 --- a/plugins/flp_import/unrtf/convert.c +++ b/plugins/flp_import/unrtf/convert.c @@ -564,11 +564,11 @@ static CodepageInfo * charset_codepage; /* Nested tables aren't supported. */ static int coming_pars_that_are_tabular = 0; -static int within_table = FALSE; -static int have_printed_row_begin=FALSE; -static int have_printed_cell_begin=FALSE; -static int have_printed_row_end=FALSE; -static int have_printed_cell_end=FALSE; +static int within_table = false; +static int have_printed_row_begin=false; +static int have_printed_cell_begin=false; +static int have_printed_row_end=false; +static int have_printed_cell_end=false; /* Previously in word_print_core function @@ -604,7 +604,7 @@ enum { PICT_JPEG, PICT_PNG, }; -static int within_picture=FALSE; +static int within_picture=false; static int picture_file_number=1; static char picture_path[255]; static int picture_width; @@ -615,8 +615,8 @@ static int picture_wmetafile_type; static const char *picture_wmetafile_type_str; -static int have_printed_body=FALSE; -static int within_header=TRUE; +static int have_printed_body=false; +static int within_header=true; @@ -653,8 +653,8 @@ starting_body () outstring+=QString().sprintf("%s", op->header_end); outstring+=QString().sprintf("%s", op->body_begin); } - within_header = FALSE; - have_printed_body = TRUE; + within_header = false; + have_printed_body = true; } } @@ -1180,7 +1180,7 @@ cmd_cf (Word *w, int align, char has_param, int num) { color_table[num].b); attr_push(ATTR_FOREGROUND,str); } - return FALSE; + return false; } @@ -1207,7 +1207,7 @@ cmd_cb (Word *w, int align, char has_param, int num) { color_table[num].b); attr_push(ATTR_BACKGROUND,str); } - return FALSE; + return false; } @@ -1221,7 +1221,7 @@ static int cmd_fs (Word *w, int align, char has_param, int points) { char str[20]; - if (!has_param) return FALSE; + if (!has_param) return false; /* Note, fs20 means 10pt */ points /= 2; @@ -1229,7 +1229,7 @@ cmd_fs (Word *w, int align, char has_param, int points) { sprintf(str,"%d",points); attr_push(ATTR_FONTSIZE,str); - return FALSE; + return false; } @@ -1315,7 +1315,7 @@ cmd_field (Word *w, int align, char has_param, int num) { outstring+=QString().sprintf("%s", op->hyperlink_begin); outstring+=QString().sprintf("%s", s4); outstring+=QString().sprintf("%s", op->hyperlink_end); - return TRUE; + return true; } } @@ -1329,7 +1329,7 @@ cmd_field (Word *w, int align, char has_param, int num) { } w=w->next; } - return TRUE; + return true; } @@ -1346,7 +1346,7 @@ cmd_f (Word *w, int align, char has_param, int num) { /* no param exit early XX */ if (!has_param) - return FALSE; + return false; name = lookup_fontname(num); #if 1 /* daved - 0.19.6 */ @@ -1372,7 +1372,7 @@ cmd_f (Word *w, int align, char has_param, int num) { outstring+=QString().sprintf("", numchar_table); } - return FALSE; + return false; } @@ -1399,7 +1399,7 @@ cmd_highlight (Word *w, int align, char has_param, int num) color_table[num].b); attr_push(ATTR_BACKGROUND,str); } - return FALSE; + return false; } @@ -1427,7 +1427,7 @@ cmd_tab (Word *w, int align, char has_param, int param) need--; } outstring+=QString().sprintf("\n"); - return FALSE; + return false; } @@ -1441,7 +1441,7 @@ cmd_tab (Word *w, int align, char has_param, int param) static int cmd_plain (Word *w, int align, char has_param, int param) { attr_pop_all(); - return FALSE; + return false; } @@ -1454,7 +1454,7 @@ cmd_plain (Word *w, int align, char has_param, int param) { static int cmd_fnil (Word *w, int align, char has_param, int param) { attr_push(ATTR_FONTFACE,FONTNIL_STR); - return FALSE; + return false; } @@ -1468,7 +1468,7 @@ cmd_fnil (Word *w, int align, char has_param, int param) { static int cmd_froman (Word *w, int align, char has_param, int param) { attr_push(ATTR_FONTFACE,FONTROMAN_STR); - return FALSE; + return false; } @@ -1482,7 +1482,7 @@ cmd_froman (Word *w, int align, char has_param, int param) { static int cmd_fswiss (Word *w, int align, char has_param, int param) { attr_push(ATTR_FONTFACE,FONTSWISS_STR); - return FALSE; + return false; } @@ -1496,7 +1496,7 @@ cmd_fswiss (Word *w, int align, char has_param, int param) { static int cmd_fmodern (Word *w, int align, char has_param, int param) { attr_push(ATTR_FONTFACE,FONTMODERN_STR); - return FALSE; + return false; } @@ -1510,7 +1510,7 @@ cmd_fmodern (Word *w, int align, char has_param, int param) { static int cmd_fscript (Word *w, int align, char has_param, int param) { attr_push(ATTR_FONTFACE,FONTSCRIPT_STR); - return FALSE; + return false; } /*======================================================================== @@ -1523,7 +1523,7 @@ cmd_fscript (Word *w, int align, char has_param, int param) { static int cmd_fdecor (Word *w, int align, char has_param, int param) { attr_push(ATTR_FONTFACE,FONTDECOR_STR); - return FALSE; + return false; } /*======================================================================== @@ -1536,7 +1536,7 @@ cmd_fdecor (Word *w, int align, char has_param, int param) { static int cmd_ftech (Word *w, int align, char has_param, int param) { attr_push(ATTR_FONTFACE,FONTTECH_STR); - return FALSE; + return false; } /*======================================================================== @@ -1556,7 +1556,7 @@ cmd_expand (Word *w, int align, char has_param, int param) { else attr_push(ATTR_EXPAND, str); } - return FALSE; + return false; } @@ -1577,7 +1577,7 @@ cmd_emboss (Word *w, int align, char has_param, int param) { sprintf(str, "%d", param); attr_push(ATTR_EMBOSS, str); } - return FALSE; + return false; } @@ -1598,7 +1598,7 @@ cmd_engrave (Word *w, int align, char has_param, int param) { sprintf(str, "%d", param); attr_push(ATTR_ENGRAVE, str); } - return FALSE; + return false; } /*======================================================================== @@ -1614,7 +1614,7 @@ cmd_caps (Word *w, int align, char has_param, int param) { attr_pop(ATTR_CAPS); else attr_push(ATTR_CAPS,NULL); - return FALSE; + return false; } @@ -1630,7 +1630,7 @@ cmd_scaps (Word *w, int align, char has_param, int param) { attr_pop(ATTR_SMALLCAPS); else attr_push(ATTR_SMALLCAPS,NULL); - return FALSE; + return false; } @@ -1646,7 +1646,7 @@ cmd_bullet (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->chars.bullet); ++total_chars_this_line; /* \tab */ } - return FALSE; + return false; } /*======================================================================== @@ -1661,7 +1661,7 @@ cmd_ldblquote (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->chars.left_dbl_quote); ++total_chars_this_line; /* \tab */ } - return FALSE; + return false; } @@ -1678,7 +1678,7 @@ cmd_rdblquote (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->chars.right_dbl_quote); ++total_chars_this_line; /* \tab */ } - return FALSE; + return false; } @@ -1694,7 +1694,7 @@ cmd_lquote (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->chars.left_quote); ++total_chars_this_line; /* \tab */ } - return FALSE; + return false; } @@ -1711,7 +1711,7 @@ cmd_nonbreaking_space (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->chars.nonbreaking_space); ++total_chars_this_line; /* \tab */ } - return FALSE; + return false; } @@ -1728,7 +1728,7 @@ cmd_nonbreaking_hyphen (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->chars.nonbreaking_hyphen); ++total_chars_this_line; /* \tab */ } - return FALSE; + return false; } @@ -1745,7 +1745,7 @@ cmd_optional_hyphen (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->chars.optional_hyphen); ++total_chars_this_line; /* \tab */ } - return FALSE; + return false; } @@ -1761,7 +1761,7 @@ cmd_emdash (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->chars.emdash); ++total_chars_this_line; /* \tab */ } - return FALSE; + return false; } @@ -1778,7 +1778,7 @@ cmd_endash (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->chars.endash); ++total_chars_this_line; /* \tab */ } - return FALSE; + return false; } @@ -1795,7 +1795,7 @@ cmd_rquote (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->chars.right_quote); ++total_chars_this_line; /* \tab */ } - return FALSE; + return false; } @@ -1811,7 +1811,7 @@ cmd_par (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->line_break); total_chars_this_line = 0; /* \tab */ } - return FALSE; + return false; } @@ -1828,7 +1828,7 @@ cmd_line (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->line_break); total_chars_this_line = 0; /* \tab */ } - return FALSE; + return false; } @@ -1844,7 +1844,7 @@ static int cmd_page (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->page_break); total_chars_this_line = 0; /* \tab */ } - return FALSE; + return false; } @@ -1857,7 +1857,7 @@ static int cmd_page (Word *w, int align, char has_param, int param) { static int cmd_intbl (Word *w, int align, char has_param, int param) { ++coming_pars_that_are_tabular; - return FALSE; + return false; } @@ -1869,7 +1869,7 @@ static int cmd_intbl (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_ulnone (Word *w, int align, char has_param, int param) { - int attr, more=TRUE; + int attr, more=true; #ifdef BINARY_ATTRS attr_remove_underlining(); #else @@ -1887,10 +1887,10 @@ static int cmd_ulnone (Word *w, int align, char has_param, int param) { { attr_pop(ATTR_UNDERLINE); } else - more=FALSE; + more=false; } while(more); #endif - return FALSE; + return false; } /*======================================================================== @@ -1906,7 +1906,7 @@ static int cmd_ul (Word *w, int align, char has_param, int param) { } else { attr_push(ATTR_UNDERLINE, NULL); } - return FALSE; + return false; } /*======================================================================== @@ -1918,7 +1918,7 @@ static int cmd_ul (Word *w, int align, char has_param, int param) { static int cmd_uld (Word *w, int align, char has_param, int param) { attr_push(ATTR_DOUBLE_UL, NULL); - return FALSE; + return false; } /*======================================================================== @@ -1930,7 +1930,7 @@ static int cmd_uld (Word *w, int align, char has_param, int param) { static int cmd_uldb (Word *w, int align, char has_param, int param) { attr_push(ATTR_DOT_UL, NULL); - return FALSE; + return false; } @@ -1943,7 +1943,7 @@ static int cmd_uldb (Word *w, int align, char has_param, int param) { static int cmd_uldash (Word *w, int align, char has_param, int param) { attr_push(ATTR_DASH_UL, NULL); - return FALSE; + return false; } @@ -1956,7 +1956,7 @@ static int cmd_uldash (Word *w, int align, char has_param, int param) { static int cmd_uldashd (Word *w, int align, char has_param, int param) { attr_push(ATTR_DOT_DASH_UL,NULL); - return FALSE; + return false; } @@ -1969,7 +1969,7 @@ static int cmd_uldashd (Word *w, int align, char has_param, int param) { static int cmd_uldashdd (Word *w, int align, char has_param, int param) { attr_push(ATTR_2DOT_DASH_UL,NULL); - return FALSE; + return false; } @@ -1982,7 +1982,7 @@ static int cmd_uldashdd (Word *w, int align, char has_param, int param) { static int cmd_ulw (Word *w, int align, char has_param, int param) { attr_push(ATTR_WORD_UL,NULL); - return FALSE; + return false; } @@ -1995,7 +1995,7 @@ static int cmd_ulw (Word *w, int align, char has_param, int param) { static int cmd_ulth (Word *w, int align, char has_param, int param) { attr_push(ATTR_THICK_UL,NULL); - return FALSE; + return false; } @@ -2008,7 +2008,7 @@ static int cmd_ulth (Word *w, int align, char has_param, int param) { static int cmd_ulthd (Word *w, int align, char has_param, int param) { attr_push(ATTR_THICK_UL, NULL); - return FALSE; + return false; } @@ -2021,7 +2021,7 @@ static int cmd_ulthd (Word *w, int align, char has_param, int param) { static int cmd_ulthdash (Word *w, int align, char has_param, int param) { attr_push(ATTR_THICK_UL, NULL); - return FALSE; + return false; } @@ -2034,7 +2034,7 @@ static int cmd_ulthdash (Word *w, int align, char has_param, int param) { static int cmd_ulwave (Word *w, int align, char has_param, int param) { attr_push(ATTR_WAVE_UL,NULL); - return FALSE; + return false; } @@ -2050,7 +2050,7 @@ static int cmd_strike (Word *w, int align, char has_param, int param) { attr_pop(ATTR_STRIKE); else attr_push(ATTR_STRIKE,NULL); - return FALSE; + return false; } /*======================================================================== @@ -2065,7 +2065,7 @@ static int cmd_strikedl (Word *w, int align, char has_param, int param) { attr_pop(ATTR_DBL_STRIKE); else attr_push(ATTR_DBL_STRIKE,NULL); - return FALSE; + return false; } @@ -2081,7 +2081,7 @@ static int cmd_striked (Word *w, int align, char has_param, int param) { attr_pop(ATTR_DBL_STRIKE); else attr_push(ATTR_DBL_STRIKE,NULL); - return FALSE; + return false; } @@ -2093,7 +2093,7 @@ static int cmd_striked (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_rtf (Word *w, int align, char has_param, int param) { - return FALSE; + return false; } @@ -2109,7 +2109,7 @@ static int cmd_up (Word *w, int align, char has_param, int param) { attr_pop(ATTR_SUPER); else attr_push(ATTR_SUPER,NULL); - return FALSE; + return false; } #if 1 /* daved - 0.19.4 */ @@ -2124,7 +2124,7 @@ static int cmd_u (Word *w, int align, char has_param, int param) { short done=0; /*#if DEBUG char *str; - if (has_param == TRUE) + if (has_param == true) { fprintf(stderr,"param is %d (x%x) (0%o)\n", param, param, param); @@ -2208,7 +2208,7 @@ static int cmd_u (Word *w, int align, char has_param, int param) { */ if (done) return(SKIP_ONE_WORD); - return(FALSE); + return(false); } #endif @@ -2224,7 +2224,7 @@ static int cmd_dn (Word *w, int align, char has_param, int param) { attr_pop(ATTR_SUB); else attr_push(ATTR_SUB,NULL); - return FALSE; + return false; } /*======================================================================== @@ -2237,7 +2237,7 @@ static int cmd_dn (Word *w, int align, char has_param, int param) { static int cmd_nosupersub (Word *w, int align, char has_param, int param) { attr_pop(ATTR_SUPER); attr_pop(ATTR_SUB); - return FALSE; + return false; } /*======================================================================== @@ -2252,7 +2252,7 @@ static int cmd_super (Word *w, int align, char has_param, int param) { attr_pop(ATTR_SUPER); else attr_push(ATTR_SUPER,NULL); - return FALSE; + return false; } /*======================================================================== @@ -2267,7 +2267,7 @@ static int cmd_sub (Word *w, int align, char has_param, int param) { attr_pop(ATTR_SUB); else attr_push(ATTR_SUB,NULL); - return FALSE; + return false; } /*======================================================================== @@ -2282,7 +2282,7 @@ static int cmd_shad (Word *w, int align, char has_param, int param) { attr_pop(ATTR_SHADOW); else attr_push(ATTR_SHADOW,NULL); - return FALSE; + return false; } /*======================================================================== @@ -2299,7 +2299,7 @@ cmd_b (Word *w, int align, char has_param, int param) { } else attr_push(ATTR_BOLD,NULL); - return FALSE; + return false; } /*======================================================================== @@ -2314,7 +2314,7 @@ static int cmd_i (Word *w, int align, char has_param, int param) { attr_pop(ATTR_ITALIC); else attr_push(ATTR_ITALIC,NULL); - return FALSE; + return false; } /*======================================================================== @@ -2324,7 +2324,7 @@ static int cmd_i (Word *w, int align, char has_param, int param) { * Returns: Flag, true only if rest of Words on line should be ignored. *=======================================================================*/ static int cmd_s (Word *w, int align, char has_param, int param) { - return FALSE; + return false; } /*======================================================================== @@ -2339,7 +2339,7 @@ static int cmd_sect (Word *w, int align, char has_param, int param) { if (op->paragraph_begin) { outstring+=QString().sprintf("%s", op->paragraph_begin); } - return FALSE; + return false; } /*======================================================================== @@ -2356,7 +2356,7 @@ static int cmd_shp (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("%s", op->comment_end); /* daved 0.20.2 */ } - return FALSE; + return false; } /*======================================================================== @@ -2371,7 +2371,7 @@ static int cmd_outl (Word *w, int align, char has_param, int param) { attr_pop(ATTR_OUTLINE); else attr_push(ATTR_OUTLINE,NULL); - return FALSE; + return false; } /*======================================================================== @@ -2388,7 +2388,7 @@ static int cmd_ansi (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("document uses ANSI character set"); outstring+=QString().sprintf("%s",op->comment_end); } - return FALSE; + return false; } /*======================================================================== @@ -2416,7 +2416,7 @@ static int cmd_ansicpg (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("document uses default ANSI codepage character set"); outstring+=QString().sprintf("%s", op->comment_end); } - return FALSE; + return false; } /*======================================================================== @@ -2433,7 +2433,7 @@ static int cmd_pc (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("document uses PC codepage 437 character set"); outstring+=QString().sprintf("%s",op->comment_end); } - return FALSE; + return false; } /*======================================================================== @@ -2450,7 +2450,7 @@ static int cmd_pca (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("document uses PC codepage 850 character set"); outstring+=QString().sprintf("%s",op->comment_end); } - return FALSE; + return false; } /*======================================================================== @@ -2467,7 +2467,7 @@ static int cmd_mac (Word *w, int align, char has_param, int param) { outstring+=QString().sprintf("document uses Macintosh character set"); outstring+=QString().sprintf("%s",op->comment_end); } - return FALSE; + return false; } /*======================================================================== @@ -2481,7 +2481,7 @@ static int cmd_colortbl (Word *w, int align, char has_param, int param) { if (w->next) { process_color_table(w->next); } - return TRUE; + return true; } /*======================================================================== @@ -2495,7 +2495,7 @@ static int cmd_fonttbl (Word *w, int align, char has_param, int param) { if (w->next) { process_font_table(w->next); } - return TRUE; + return true; } /*======================================================================== @@ -2506,7 +2506,7 @@ static int cmd_fonttbl (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_header (Word *w, int align, char has_param, int param) { - return TRUE; + return true; } /*======================================================================== @@ -2517,7 +2517,7 @@ static int cmd_header (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_headerl (Word *w, int align, char has_param, int param) { - return TRUE; + return true; } /*======================================================================== @@ -2528,7 +2528,7 @@ static int cmd_headerl (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_headerr (Word *w, int align, char has_param, int param) { - return TRUE; + return true; } /*======================================================================== @@ -2539,7 +2539,7 @@ static int cmd_headerr (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_headerf (Word *w, int align, char has_param, int param) { - return TRUE; + return true; } /*======================================================================== @@ -2550,7 +2550,7 @@ static int cmd_headerf (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_footer (Word *w, int align, char has_param, int param) { - return TRUE; + return true; } /*======================================================================== @@ -2561,7 +2561,7 @@ static int cmd_footer (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_footerl (Word *w, int align, char has_param, int param) { - return TRUE; + return true; } /*======================================================================== @@ -2572,7 +2572,7 @@ static int cmd_footerl (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_footerr (Word *w, int align, char has_param, int param) { - return TRUE; + return true; } /*======================================================================== @@ -2583,7 +2583,7 @@ static int cmd_footerr (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_footerf (Word *w, int align, char has_param, int param) { - return TRUE; + return true; } /*======================================================================== @@ -2594,7 +2594,7 @@ static int cmd_footerf (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_ignore (Word *w, int align, char has_param, int param) { - return TRUE; + return true; } /*======================================================================== @@ -2606,7 +2606,7 @@ static int cmd_ignore (Word *w, int align, char has_param, int param) { static int cmd_info (Word *w, int align, char has_param, int param) { process_info_group (w->next); - return TRUE; + return true; } /*======================================================================== @@ -2617,10 +2617,10 @@ static int cmd_info (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_pict (Word *w, int align, char has_param, int param) { - within_picture=TRUE; + within_picture=true; picture_width = picture_height = 0; picture_type = PICT_WB; - return FALSE; + return false; } /*======================================================================== @@ -2631,7 +2631,7 @@ static int cmd_pict (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_bin (Word *w, int align, char has_param, int param) { - return FALSE; + return false; } @@ -2644,7 +2644,7 @@ static int cmd_bin (Word *w, int align, char has_param, int param) { static int cmd_macpict (Word *w, int align, char has_param, int param) { picture_type = PICT_MAC; - return FALSE; + return false; } /*======================================================================== @@ -2656,7 +2656,7 @@ static int cmd_macpict (Word *w, int align, char has_param, int param) { static int cmd_jpegblip (Word *w, int align, char has_param, int param) { picture_type = PICT_JPEG; - return FALSE; + return false; } /*======================================================================== @@ -2668,7 +2668,7 @@ static int cmd_jpegblip (Word *w, int align, char has_param, int param) { static int cmd_pngblip (Word *w, int align, char has_param, int param) { picture_type = PICT_PNG; - return FALSE; + return false; } /*======================================================================== @@ -2680,7 +2680,7 @@ static int cmd_pngblip (Word *w, int align, char has_param, int param) { static int cmd_pnmetafile (Word *w, int align, char has_param, int param) { picture_type = PICT_PM; - return FALSE; + return false; } /*======================================================================== @@ -2706,7 +2706,7 @@ static int cmd_wmetafile (Word *w, int align, char has_param, int param) { default: picture_wmetafile_type_str="default:MM_TEXT"; break; } } - return FALSE; + return false; } /*======================================================================== @@ -2719,7 +2719,7 @@ static int cmd_wmetafile (Word *w, int align, char has_param, int param) { static int cmd_wbmbitspixel (Word *w, int align, char has_param, int param) { if (within_picture && has_param) picture_bits_per_pixel = param; - return FALSE; + return false; } /*======================================================================== @@ -2732,7 +2732,7 @@ static int cmd_wbmbitspixel (Word *w, int align, char has_param, int param) { static int cmd_picw (Word *w, int align, char has_param, int param) { if (within_picture && has_param) picture_width = param; - return FALSE; + return false; } /*======================================================================== @@ -2745,7 +2745,7 @@ static int cmd_picw (Word *w, int align, char has_param, int param) { static int cmd_pich (Word *w, int align, char has_param, int param) { if (within_picture && has_param) picture_height = param; - return FALSE; + return false; } @@ -2758,7 +2758,7 @@ static int cmd_pich (Word *w, int align, char has_param, int param) { static int cmd_xe (Word *w, int align, char has_param, int param) { process_index_entry (w); - return TRUE; + return true; } /*======================================================================== @@ -2769,8 +2769,8 @@ static int cmd_xe (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_tc (Word *w, int align, char has_param, int param) { - process_toc_entry (w, TRUE); - return TRUE; + process_toc_entry (w, true); + return true; } /*======================================================================== @@ -2781,8 +2781,8 @@ static int cmd_tc (Word *w, int align, char has_param, int param) { *=======================================================================*/ static int cmd_tcn (Word *w, int align, char has_param, int param) { - process_toc_entry (w, FALSE); - return TRUE; + process_toc_entry (w, false); + return true; } @@ -3161,11 +3161,11 @@ enum { SMALL=0, BIG=1 }; static void begin_table() { - within_table=TRUE; - have_printed_row_begin = FALSE; - have_printed_cell_begin = FALSE; - have_printed_row_end = FALSE; - have_printed_cell_end = FALSE; + within_table=true; + have_printed_row_begin = false; + have_printed_cell_begin = false; + have_printed_row_end = false; + have_printed_cell_end = false; attrstack_push(); starting_body(); outstring+=QString().sprintf("%s", op->table_begin); @@ -3192,11 +3192,11 @@ end_table () outstring+=QString().sprintf("%s", op->table_row_end); } outstring+=QString().sprintf("%s", op->table_end); - within_table=FALSE; - have_printed_row_begin = FALSE; - have_printed_cell_begin = FALSE; - have_printed_row_end = FALSE; - have_printed_cell_end = FALSE; + within_table=false; + have_printed_row_begin = false; + have_printed_cell_begin = false; + have_printed_row_end = false; + have_printed_cell_end = false; } } @@ -3214,15 +3214,15 @@ starting_text() { if (within_table) { if (!have_printed_row_begin) { outstring+=QString().sprintf("%s", op->table_row_begin); - have_printed_row_begin=TRUE; - have_printed_row_end=FALSE; - have_printed_cell_begin=FALSE; + have_printed_row_begin=true; + have_printed_row_end=false; + have_printed_cell_begin=false; } if (!have_printed_cell_begin) { outstring+=QString().sprintf("%s", op->table_cell_begin); attrstack_express_all(); - have_printed_cell_begin=TRUE; - have_printed_cell_end=FALSE; + have_printed_cell_begin=true; + have_printed_cell_end=false; } } } @@ -3301,8 +3301,8 @@ word_print_core (Word *w) { char *s; FILE *pictfile=NULL; - int is_cell_group=FALSE; - int paragraph_begined=FALSE; + int is_cell_group=false; + int paragraph_begined=false; int paragraph_align=ALIGN_LEFT; CHECK_PARAM_NOT_NULL(w); @@ -3334,7 +3334,7 @@ word_print_core (Word *w) if (!paragraph_begined) { starting_paragraph_align (paragraph_align); - paragraph_begined=TRUE; + paragraph_begined=true; } /*----------------------------------------*/ @@ -3422,7 +3422,7 @@ word_print_core (Word *w) #endif /*---Handle RTF keywords---------------------------*/ else { - int done=FALSE; + int done=false; s++; @@ -3448,12 +3448,12 @@ word_print_core (Word *w) */ ending_paragraph_align(paragraph_align); paragraph_align = ALIGN_LEFT; - paragraph_begined = FALSE; + paragraph_begined = false; } /*----Table keywords---------------------------------------------------------*/ else if (!strcmp (s, "cell")) { - is_cell_group=TRUE; + is_cell_group=true; if (!have_printed_cell_begin) { /* Need this with empty cells */ outstring+=QString().sprintf("%s", op->table_cell_begin); @@ -3461,14 +3461,14 @@ word_print_core (Word *w) } attr_pop_dump(); outstring+=QString().sprintf("%s", op->table_cell_end); - have_printed_cell_begin = FALSE; - have_printed_cell_end=TRUE; + have_printed_cell_begin = false; + have_printed_cell_end=true; } else if (!strcmp (s, "row")) { if (within_table) { outstring+=QString().sprintf("%s", op->table_row_end); - have_printed_row_begin = FALSE; - have_printed_row_end=TRUE; + have_printed_row_begin = false; + have_printed_row_end=true; } else { if (debug_mode) { outstring+=QString().sprintf("%s",op->comment_begin); @@ -3507,16 +3507,16 @@ word_print_core (Word *w) { int ch; int index=0; - int have_param = FALSE, param = 0; + int have_param = false, param = 0; HashItem *hip; char *p; - int match = FALSE; /* Pacify gcc, st001906 - 0.19.6 */ + int match = false; /* Pacify gcc, st001906 - 0.19.6 */ /* Look for a parameter */ p = s; while (*p && (!isdigit(*p) && *p != '-')) p++; if (*p && (isdigit(*p) || *p == '-')) { - have_param = TRUE; + have_param = true; param = atoi(p); } @@ -3536,12 +3536,12 @@ word_print_core (Word *w) } else { while (!done) { - match = FALSE; + match = false; if (have_param) { int len=p-s; if (!hip[index].name[len] && !strncmp(s, hip[index].name, len)) - match = TRUE; + match = true; } else match = !strcmp(s, hip[index].name); @@ -3570,12 +3570,12 @@ word_print_core (Word *w) outstring+=QString().sprintf("%s",op->comment_end); } - done=TRUE; + done=true; } else { index++; if (!hip[index].name) - done = TRUE; + done = true; } } } @@ -3596,7 +3596,7 @@ word_print_core (Word *w) if (!paragraph_begined) { starting_paragraph_align (paragraph_align); - paragraph_begined=TRUE; + paragraph_begined=true; } if (child) @@ -3614,7 +3614,7 @@ word_print_core (Word *w) outstring+=QString().sprintf("%s", picture_path); outstring+=QString().sprintf("%s", op->imagelink_end); } - within_picture=FALSE; + within_picture=false; } /* Undo font attributes UNLESS we're doing table cells @@ -3669,10 +3669,10 @@ word_print (Word *w, QString & _s) outstring+=QString().sprintf("%s", op->header_begin); } - within_header=TRUE; - have_printed_body=FALSE; - within_table=FALSE; - simulate_allcaps=FALSE; + within_header=true; + have_printed_body=false; + within_table=false; + simulate_allcaps=false; word_print_core (w); end_table(); diff --git a/plugins/flp_import/unrtf/defs.h b/plugins/flp_import/unrtf/defs.h index f4c2d5b5bc..b5bc459aaf 100644 --- a/plugins/flp_import/unrtf/defs.h +++ b/plugins/flp_import/unrtf/defs.h @@ -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 diff --git a/plugins/flp_import/unrtf/html.c b/plugins/flp_import/unrtf/html.c index 752c588fc6..0ab1e4afd8 100644 --- a/plugins/flp_import/unrtf/html.c +++ b/plugins/flp_import/unrtf/html.c @@ -1183,9 +1183,9 @@ html_init (void) op->numericlist_item_begin = "
  • "; op->numericlist_item_end = "
    • \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; diff --git a/plugins/flp_import/unrtf/output.c b/plugins/flp_import/unrtf/output.c index e60b786c0f..d30620b36b 100644 --- a/plugins/flp_import/unrtf/output.c +++ b/plugins/flp_import/unrtf/output.c @@ -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; } diff --git a/plugins/flp_import/unrtf/parse.c b/plugins/flp_import/unrtf/parse.c index 2826c76e50..153999f41d 100644 --- a/plugins/flp_import/unrtf/parse.c +++ b/plugins/flp_import/unrtf/parse.c @@ -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; } } diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp index f1a251a52a..1293858fd4 100644 --- a/plugins/kicker/kicker.cpp +++ b/plugins/kicker/kicker.cpp @@ -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" ) ); diff --git a/plugins/kicker/kicker.h b/plugins/kicker/kicker.h index 302cc33f54..1543fac5f4 100644 --- a/plugins/kicker/kicker.h +++ b/plugins/kicker/kicker.h @@ -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; diff --git a/plugins/ladspa_browser/ladspa_browser.cpp b/plugins/ladspa_browser/ladspa_browser.cpp index 1d6ab26f81..be334b0ad8 100644 --- a/plugins/ladspa_browser/ladspa_browser.cpp +++ b/plugins/ladspa_browser/ladspa_browser.cpp @@ -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 = "" + tr( "Type:" ) + " "; 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 ); diff --git a/plugins/ladspa_browser/ladspa_description.cpp b/plugins/ladspa_browser/ladspa_description.cpp index bea1bfacf9..209d0b89ad 100644 --- a/plugins/ladspa_browser/ladspa_description.cpp +++ b/plugins/ladspa_browser/ladspa_description.cpp @@ -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 ); diff --git a/plugins/ladspa_browser/ladspa_port_dialog.cpp b/plugins/ladspa_browser/ladspa_port_dialog.cpp index dcc3e6aa50..3f324dbf41 100644 --- a/plugins/ladspa_browser/ladspa_port_dialog.cpp +++ b/plugins/ladspa_browser/ladspa_port_dialog.cpp @@ -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 ); diff --git a/plugins/ladspa_effect/LadspaSubPluginFeatures.cpp b/plugins/ladspa_effect/LadspaSubPluginFeatures.cpp index 586a4b40df..fd43021dfb 100644 --- a/plugins/ladspa_effect/LadspaSubPluginFeatures.cpp +++ b/plugins/ladspa_effect/LadspaSubPluginFeatures.cpp @@ -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 ); diff --git a/plugins/ladspa_effect/calf/calf/giface.h b/plugins/ladspa_effect/calf/calf/giface.h index 320b04bfb1..60e609f318 100644 --- a/plugins/ladspa_effect/calf/calf/giface.h +++ b/plugins/ladspa_effect/calf/calf/giface.h @@ -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 diff --git a/plugins/ladspa_effect/calf/modules_small.cpp b/plugins/ladspa_effect/calf/modules_small.cpp index 529751a3a2..24e141819b 100644 --- a/plugins/ladspa_effect/calf/modules_small.cpp +++ b/plugins/ladspa_effect/calf/modules_small.cpp @@ -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: diff --git a/plugins/lb302/lb302.h b/plugins/lb302/lb302.h index 6b5d8b7f43..6094c4c53a 100644 --- a/plugins/lb302/lb302.h +++ b/plugins/lb302/lb302.h @@ -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; diff --git a/plugins/lb303/lb303.cpp b/plugins/lb303/lb303.cpp index 886e6e4115..a41d676915 100644 --- a/plugins/lb303/lb303.cpp +++ b/plugins/lb303/lb303.cpp @@ -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(); diff --git a/plugins/lb303/lb303.h b/plugins/lb303/lb303.h index f10e3b0939..0c5beec674 100644 --- a/plugins/lb303/lb303.h +++ b/plugins/lb303/lb303.h @@ -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; diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp index 9d0c0df0c2..48d254334c 100644 --- a/plugins/organic/organic.cpp +++ b/plugins/organic/organic.cpp @@ -379,7 +379,7 @@ organicInstrumentView::organicInstrumentView( Instrument * _instrument, { organicInstrument * oi = castModel(); - 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( diff --git a/plugins/organic/organic.h b/plugins/organic/organic.h index 58e58445ba..14f4c37e6b 100644 --- a/plugins/organic/organic.h +++ b/plugins/organic/organic.h @@ -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 { diff --git a/plugins/papu/papu_instrument.cpp b/plugins/papu/papu_instrument.cpp index 1ab5012cbc..a5c8b0f9f9 100644 --- a/plugins/papu/papu_instrument.cpp +++ b/plugins/papu/papu_instrument.cpp @@ -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(); diff --git a/plugins/papu/papu_instrument.h b/plugins/papu/papu_instrument.h index 0c0626adf0..a4700aad00 100644 --- a/plugins/papu/papu_instrument.h +++ b/plugins/papu/papu_instrument.h @@ -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();*/ } ; diff --git a/plugins/patman/patman.h b/plugins/patman/patman.h index 863562292c..78c0d1ca47 100644 --- a/plugins/patman/patman.h +++ b/plugins/patman/patman.h @@ -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: diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index 58ca833553..6bbd5358f5 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -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; diff --git a/plugins/sid/sid_instrument.cpp b/plugins/sid/sid_instrument.cpp index 1060d6c8c2..8769b9e0a2 100644 --- a/plugins/sid/sid_instrument.cpp +++ b/plugins/sid/sid_instrument.cpp @@ -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(); @@ -724,7 +724,7 @@ void sidInstrumentView::updateKnobHint( void ) -void sidInstrumentView::updateKnobToolTip( void ) +void sidInstrumentView::updateKnobToolTip() { sidInstrument * k = castModel(); 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(); diff --git a/plugins/sid/sid_instrument.h b/plugins/sid/sid_instrument.h index f1e8042665..236b9c7e3b 100644 --- a/plugins/sid/sid_instrument.h +++ b/plugins/sid/sid_instrument.h @@ -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(); } ; diff --git a/plugins/spectrum_analyzer/spectrum_analyzer.cpp b/plugins/spectrum_analyzer/spectrum_analyzer.cpp index e728741306..7e3686d447 100644 --- a/plugins/spectrum_analyzer/spectrum_analyzer.cpp +++ b/plugins/spectrum_analyzer/spectrum_analyzer.cpp @@ -79,7 +79,7 @@ bool spectrumAnalyzer::processAudioBuffer( sampleFrame * _buf, { if( !isEnabled() || !isRunning () ) { - return( FALSE ); + return( false ); } fpp_t f = 0; diff --git a/plugins/spectrum_analyzer/spectrum_analyzer.h b/plugins/spectrum_analyzer/spectrum_analyzer.h index b0e26c709a..de5a34d430 100644 --- a/plugins/spectrum_analyzer/spectrum_analyzer.h +++ b/plugins/spectrum_analyzer/spectrum_analyzer.h @@ -50,7 +50,7 @@ public: virtual bool processAudioBuffer( sampleFrame * _buf, const fpp_t _frames ); - virtual EffectControls * controls( void ) + virtual EffectControls * controls() { return( &m_saControls ); } diff --git a/plugins/spectrum_analyzer/spectrumanalyzer_control_dialog.cpp b/plugins/spectrum_analyzer/spectrumanalyzer_control_dialog.cpp index bcd5b67d4f..6fc1f16e7c 100644 --- a/plugins/spectrum_analyzer/spectrumanalyzer_control_dialog.cpp +++ b/plugins/spectrum_analyzer/spectrumanalyzer_control_dialog.cpp @@ -62,7 +62,7 @@ public: setFixedSize( 249, 151 ); connect( engine::mainWindow(), SIGNAL( periodicUpdate() ), this, SLOT( update() ) ); - setAttribute( Qt::WA_OpaquePaintEvent, TRUE ); + setAttribute( Qt::WA_OpaquePaintEvent, true ); } virtual ~spectrumView() @@ -151,7 +151,7 @@ spectrumAnalyzerControlDialog::spectrumAnalyzerControlDialog( m_logXAxis( PLUGIN_NAME::getIconPixmap( "log_x_axis" ) ), m_logYAxis( PLUGIN_NAME::getIconPixmap( "log_y_axis" ) ) { - setAutoFillBackground( TRUE ); + setAutoFillBackground( true ); QPalette pal; pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap( "background" ) ); diff --git a/plugins/spectrum_analyzer/spectrumanalyzer_controls.cpp b/plugins/spectrum_analyzer/spectrumanalyzer_controls.cpp index 1696a92db3..b85afc527a 100644 --- a/plugins/spectrum_analyzer/spectrumanalyzer_controls.cpp +++ b/plugins/spectrum_analyzer/spectrumanalyzer_controls.cpp @@ -30,8 +30,8 @@ spectrumAnalyzerControls::spectrumAnalyzerControls( spectrumAnalyzer * _eff ) : EffectControls( _eff ), m_effect( _eff ), - m_linearSpec( FALSE, this, tr( "Linear spectrum" ) ), - m_linearYAxis( FALSE, this, tr( "Linear Y-axis" ) ), + m_linearSpec( false, this, tr( "Linear spectrum" ) ), + m_linearYAxis( false, this, tr( "Linear Y-axis" ) ), m_channelMode( spectrumAnalyzer::MergeChannels, spectrumAnalyzer::MergeChannels, spectrumAnalyzer::RightChannel, diff --git a/plugins/spectrum_analyzer/spectrumanalyzer_controls.h b/plugins/spectrum_analyzer/spectrumanalyzer_controls.h index bd2238aee0..e8ece4a140 100644 --- a/plugins/spectrum_analyzer/spectrumanalyzer_controls.h +++ b/plugins/spectrum_analyzer/spectrumanalyzer_controls.h @@ -44,17 +44,17 @@ 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( "spectrumanaylzercontrols" ); } - virtual int controlCount( void ) + virtual int controlCount() { return( 1 ); } - virtual EffectControlDialog * createView( void ) + virtual EffectControlDialog * createView() { return( new spectrumAnalyzerControlDialog( this ) ); } diff --git a/plugins/stereo_enhancer/stereo_enhancer.cpp b/plugins/stereo_enhancer/stereo_enhancer.cpp index fd59757321..5b6b5386c7 100644 --- a/plugins/stereo_enhancer/stereo_enhancer.cpp +++ b/plugins/stereo_enhancer/stereo_enhancer.cpp @@ -93,7 +93,7 @@ bool stereoEnhancerEffect::processAudioBuffer( sampleFrame * _buf, if( !isEnabled() || !isRunning() ) { - return( FALSE ); + return( false ); } const float d = dryLevel(); diff --git a/plugins/stereo_enhancer/stereo_enhancer.h b/plugins/stereo_enhancer/stereo_enhancer.h index 3cc3824256..5b52b41222 100644 --- a/plugins/stereo_enhancer/stereo_enhancer.h +++ b/plugins/stereo_enhancer/stereo_enhancer.h @@ -40,7 +40,7 @@ public: virtual bool processAudioBuffer( sampleFrame * _buf, const fpp_t _frames ); - virtual EffectControls * controls( void ) + virtual EffectControls * controls() { return( &m_bbControls ); } diff --git a/plugins/stereo_enhancer/stereoenhancer_controls.cpp b/plugins/stereo_enhancer/stereoenhancer_controls.cpp index 2a3a8088f0..8f6941156b 100644 --- a/plugins/stereo_enhancer/stereoenhancer_controls.cpp +++ b/plugins/stereo_enhancer/stereoenhancer_controls.cpp @@ -34,15 +34,15 @@ stereoEnhancerControls::stereoEnhancerControls( stereoEnhancerEffect * _eff ) : m_effect( _eff ), m_widthModel(0.0f, 0.0f, 180.0f, 1.0f, this, tr( "Width" ) ) { - connect( &m_widthModel, SIGNAL( dataChanged( void ) ), - this, SLOT( changeWideCoeff( void ) ) ); + connect( &m_widthModel, SIGNAL( dataChanged() ), + this, SLOT( changeWideCoeff() ) ); changeWideCoeff(); } -void stereoEnhancerControls::changeWideCoeff( void ) +void stereoEnhancerControls::changeWideCoeff() { m_effect->m_seFX.setWideCoeff( m_widthModel.value() ); } diff --git a/plugins/stereo_enhancer/stereoenhancer_controls.h b/plugins/stereo_enhancer/stereoenhancer_controls.h index 7c796e5a03..ba13e354ca 100644 --- a/plugins/stereo_enhancer/stereoenhancer_controls.h +++ b/plugins/stereo_enhancer/stereoenhancer_controls.h @@ -42,24 +42,24 @@ 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( "stereoenhancercontrols" ); } - virtual int controlCount( void ) + virtual int controlCount() { return( 1 ); } - virtual EffectControlDialog * createView( void ) + virtual EffectControlDialog * createView() { return new stereoEnhancerControlDialog( this ); } private slots: - void changeWideCoeff( void ); + void changeWideCoeff(); private: diff --git a/plugins/stereo_matrix/stereo_matrix.cpp b/plugins/stereo_matrix/stereo_matrix.cpp index 58cb03da30..246763eff3 100644 --- a/plugins/stereo_matrix/stereo_matrix.cpp +++ b/plugins/stereo_matrix/stereo_matrix.cpp @@ -74,7 +74,7 @@ bool stereoMatrixEffect::processAudioBuffer( sampleFrame * _buf, // audio with this effect if( !isEnabled() || !isRunning() ) { - return( FALSE ); + return( false ); } double out_sum = 0.0; diff --git a/plugins/stereo_matrix/stereo_matrix.h b/plugins/stereo_matrix/stereo_matrix.h index ba6a0d2cea..a9b99c25c0 100644 --- a/plugins/stereo_matrix/stereo_matrix.h +++ b/plugins/stereo_matrix/stereo_matrix.h @@ -38,7 +38,7 @@ public: virtual bool processAudioBuffer( sampleFrame * _buf, const fpp_t _frames ); - virtual EffectControls * controls( void ) + virtual EffectControls * controls() { return( &m_smControls ); } diff --git a/plugins/stereo_matrix/stereomatrix_control_dialog.cpp b/plugins/stereo_matrix/stereomatrix_control_dialog.cpp index 7aacf87233..fa067279b8 100644 --- a/plugins/stereo_matrix/stereomatrix_control_dialog.cpp +++ b/plugins/stereo_matrix/stereomatrix_control_dialog.cpp @@ -40,7 +40,7 @@ stereoMatrixControlDialog::stereoMatrixControlDialog( setFixedSize( 105, 115); - setAutoFillBackground( TRUE ); + setAutoFillBackground( true ); QPalette pal; pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap( "artwork" ) ); diff --git a/plugins/stereo_matrix/stereomatrix_controls.cpp b/plugins/stereo_matrix/stereomatrix_controls.cpp index 6e75c1da66..6353063fdc 100644 --- a/plugins/stereo_matrix/stereomatrix_controls.cpp +++ b/plugins/stereo_matrix/stereomatrix_controls.cpp @@ -37,21 +37,21 @@ stereoMatrixControls::stereoMatrixControls( stereoMatrixEffect * _eff ) : m_rlModel( 0.0f, -1.0f, 1.0f, 0.01f, this, tr( "Right to Left" ) ), m_rrModel( 1.0f, -1.0f, 1.0f, 0.01f, this, tr( "Right to Right" ) ) { - connect( &m_llModel, SIGNAL( dataChanged( void ) ), - this, SLOT( changeMatrix( void ) ) ); - connect( &m_lrModel, SIGNAL( dataChanged( void ) ), - this, SLOT( changeMatrix( void ) ) ); - connect( &m_rlModel, SIGNAL( dataChanged( void ) ), - this, SLOT( changeMatrix( void ) ) ); - connect( &m_rrModel, SIGNAL( dataChanged( void ) ), - this, SLOT( changeMatrix( void ) ) ); + connect( &m_llModel, SIGNAL( dataChanged() ), + this, SLOT( changeMatrix() ) ); + connect( &m_lrModel, SIGNAL( dataChanged() ), + this, SLOT( changeMatrix() ) ); + connect( &m_rlModel, SIGNAL( dataChanged() ), + this, SLOT( changeMatrix() ) ); + connect( &m_rrModel, SIGNAL( dataChanged() ), + this, SLOT( changeMatrix() ) ); changeMatrix(); } -void stereoMatrixControls::changeMatrix( void ) +void stereoMatrixControls::changeMatrix() { } diff --git a/plugins/stereo_matrix/stereomatrix_controls.h b/plugins/stereo_matrix/stereomatrix_controls.h index dd1d8cc0af..5166c5caaa 100644 --- a/plugins/stereo_matrix/stereomatrix_controls.h +++ b/plugins/stereo_matrix/stereomatrix_controls.h @@ -42,24 +42,24 @@ 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( "stereomatrixcontrols" ); } - virtual int controlCount( void ) + virtual int controlCount() { return( 1 ); } - virtual EffectControlDialog * createView( void ) + virtual EffectControlDialog * createView() { return new stereoMatrixControlDialog( this ); } private slots: - void changeMatrix( void ); + void changeMatrix(); private: diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp index accd0470aa..d4d21222a6 100644 --- a/plugins/stk/mallets/mallets.cpp +++ b/plugins/stk/mallets/mallets.cpp @@ -73,7 +73,7 @@ malletsInstrument::malletsInstrument( InstrumentTrack * _instrument_track ): m_pressureModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Pressure" )), m_motionModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Motion" )), m_velocityModel(64.0f, 0.0f, 128.0f, 0.1f, this, tr( "Speed" )), - m_strikeModel( FALSE, this, tr( "Bowed" ) ), + m_strikeModel( false, this, tr( "Bowed" ) ), m_presetsModel(this), m_spreadModel(0, 0, 255, 1, this, tr( "Spread" )), m_filesMissing( !QDir( configManager::inst()->stkDir() ).exists() || @@ -195,7 +195,7 @@ void malletsInstrument::loadSettings( const QDomElement & _this ) -QString malletsInstrument::nodeName( void ) const +QString malletsInstrument::nodeName() const { return( malletsstk_plugin_descriptor.name ); } @@ -342,7 +342,7 @@ malletsInstrumentView::~malletsInstrumentView() void malletsInstrumentView::setWidgetBackground( QWidget * _widget, const QString & _pic ) { - _widget->setAutoFillBackground( TRUE ); + _widget->setAutoFillBackground( true ); QPalette pal; pal.setBrush( _widget->backgroundRole(), PLUGIN_NAME::getIconPixmap( _pic.toAscii().constData() ) ); @@ -459,7 +459,7 @@ QWidget * malletsInstrumentView::setupBandedWGControls( QWidget * _parent ) -void malletsInstrumentView::modelChanged( void ) +void malletsInstrumentView::modelChanged() { malletsInstrument * inst = castModel(); m_hardnessKnob->setModel( &inst->m_hardnessModel ); diff --git a/plugins/stk/mallets/mallets.h b/plugins/stk/mallets/mallets.h index 97c2b26f31..937d6686c5 100644 --- a/plugins/stk/mallets/mallets.h +++ b/plugins/stk/mallets/mallets.h @@ -76,14 +76,14 @@ public: const Uint8 _delay, const sample_rate_t _sample_rate ); - inline ~malletsSynth( void ) + inline ~malletsSynth() { m_voice->noteOff( 0.0 ); delete[] m_delay; delete m_voice; } - inline sample_t nextSampleLeft( void ) + inline sample_t nextSampleLeft() { if( m_voice == NULL ) { @@ -98,7 +98,7 @@ public: } } - inline sample_t nextSampleRight( void ) + inline sample_t nextSampleRight() { StkFloat s = m_delay[m_delayRead]; m_delayRead++; @@ -129,7 +129,7 @@ class malletsInstrument : public Instrument { public: malletsInstrument( InstrumentTrack * _instrument_track ); - virtual ~malletsInstrument( void ); + virtual ~malletsInstrument(); virtual void playNote( notePlayHandle * _n, sampleFrame * _working_buffer ); @@ -139,7 +139,7 @@ public: virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent ); virtual void loadSettings( const QDomElement & _this ); - virtual QString nodeName( void ) const; + virtual QString nodeName() const; virtual PluginView * instantiateView( QWidget * _parent ); @@ -183,13 +183,13 @@ class malletsInstrumentView: public InstrumentView public: malletsInstrumentView( malletsInstrument * _instrument, QWidget * _parent ); - virtual ~malletsInstrumentView( void ); + virtual ~malletsInstrumentView(); public slots: - void changePreset( void ); + void changePreset(); private: - virtual void modelChanged( void ); + virtual void modelChanged(); void setWidgetBackground( QWidget * _widget, const QString & _pic ); QWidget * setupModalBarControls( QWidget * _parent ); diff --git a/plugins/triple_oscillator/TripleOscillator.cpp b/plugins/triple_oscillator/TripleOscillator.cpp index 63ac7e66f7..d356a4ced4 100644 --- a/plugins/triple_oscillator/TripleOscillator.cpp +++ b/plugins/triple_oscillator/TripleOscillator.cpp @@ -421,7 +421,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, QWidget * _parent ) : InstrumentView( _instrument, _parent ) { - setAutoFillBackground( TRUE ); + setAutoFillBackground( true ); QPalette pal; pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap( "artwork" ) ); @@ -552,7 +552,7 @@ TripleOscillatorView::TripleOscillatorView( Instrument * _instrument, // setup volume-knob knob * vk = new knob( knobStyled, this ); - vk->setVolumeKnob( TRUE ); + vk->setVolumeKnob( true ); vk->setFixedSize( 28, 35 ); vk->move( 6, knob_y ); vk->setHintText( tr( "Osc %1 volume:" ).arg( diff --git a/plugins/vibed/nine_button_selector.cpp b/plugins/vibed/nine_button_selector.cpp index 65feba9c26..9e9a4ee0d9 100644 --- a/plugins/vibed/nine_button_selector.cpp +++ b/plugins/vibed/nine_button_selector.cpp @@ -55,7 +55,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, QWidget * _parent ): QWidget( _parent ), IntModelView( new nineButtonSelectorModel(0, 8, _default, NULL, - QString::null, TRUE ), this ) + QString::null, true ), this ) { setFixedSize( 50, 50 ); move( _x, _y ); @@ -64,85 +64,85 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, m_button->move( 1, 1 ); m_button->setActiveGraphic( _button0_on ); m_button->setInactiveGraphic( _button0_off ); - m_button->setChecked( FALSE ); - connect( m_button, SIGNAL ( clicked ( void ) ), - this, SLOT ( button0Clicked( void ) ) ); + m_button->setChecked( false ); + connect( m_button, SIGNAL ( clicked () ), + this, SLOT ( button0Clicked() ) ); m_buttons.append( m_button ); m_button = new pixmapButton( this, NULL ); m_button->move( 18, 1 ); m_button->setActiveGraphic( _button1_on ); m_button->setInactiveGraphic( _button1_off ); - m_button->setChecked( FALSE ); - connect( m_button, SIGNAL ( clicked ( void ) ), - this, SLOT ( button1Clicked( void ) ) ); + m_button->setChecked( false ); + connect( m_button, SIGNAL ( clicked () ), + this, SLOT ( button1Clicked() ) ); m_buttons.append( m_button ); m_button = new pixmapButton( this, NULL ); m_button->move( 35, 1 ); m_button->setActiveGraphic( _button2_on ); m_button->setInactiveGraphic( _button2_off ); - m_button->setChecked( FALSE ); - connect( m_button, SIGNAL ( clicked ( void ) ), - this, SLOT ( button2Clicked( void ) ) ); + m_button->setChecked( false ); + connect( m_button, SIGNAL ( clicked () ), + this, SLOT ( button2Clicked() ) ); m_buttons.append( m_button ); m_button = new pixmapButton( this, NULL ); m_button->move( 1, 18 ); m_button->setActiveGraphic( _button3_on ); m_button->setInactiveGraphic( _button3_off ); - m_button->setChecked( FALSE ); - connect( m_button, SIGNAL ( clicked ( void ) ), - this, SLOT ( button3Clicked( void ) ) ); + m_button->setChecked( false ); + connect( m_button, SIGNAL ( clicked () ), + this, SLOT ( button3Clicked() ) ); m_buttons.append( m_button ); m_button = new pixmapButton( this, NULL ); m_button->move( 18, 18 ); m_button->setActiveGraphic( _button4_on ); m_button->setInactiveGraphic( _button4_off ); - m_button->setChecked( FALSE ); - connect( m_button, SIGNAL ( clicked ( void ) ), - this, SLOT ( button4Clicked( void ) ) ); + m_button->setChecked( false ); + connect( m_button, SIGNAL ( clicked () ), + this, SLOT ( button4Clicked() ) ); m_buttons.append( m_button ); m_button = new pixmapButton( this, NULL ); m_button->move( 35, 18 ); m_button->setActiveGraphic( _button5_on ); m_button->setInactiveGraphic( _button5_off ); - m_button->setChecked( FALSE ); - connect( m_button, SIGNAL ( clicked ( void ) ), - this, SLOT ( button5Clicked( void ) ) ); + m_button->setChecked( false ); + connect( m_button, SIGNAL ( clicked () ), + this, SLOT ( button5Clicked() ) ); m_buttons.append( m_button ); m_button = new pixmapButton( this, NULL ); m_button->move( 1, 35 ); m_button->setActiveGraphic( _button6_on ); m_button->setInactiveGraphic( _button6_off ); - m_button->setChecked( FALSE ); - connect( m_button, SIGNAL ( clicked ( void ) ), - this, SLOT ( button6Clicked( void ) ) ); + m_button->setChecked( false ); + connect( m_button, SIGNAL ( clicked () ), + this, SLOT ( button6Clicked() ) ); m_buttons.append( m_button ); m_button = new pixmapButton( this, NULL ); m_button->move( 18, 35 ); m_button->setActiveGraphic( _button7_on ); m_button->setInactiveGraphic( _button7_off ); - m_button->setChecked( FALSE ); - connect( m_button, SIGNAL ( clicked ( void ) ), - this, SLOT ( button7Clicked( void ) ) ); + m_button->setChecked( false ); + connect( m_button, SIGNAL ( clicked () ), + this, SLOT ( button7Clicked() ) ); m_buttons.append( m_button ); m_button = new pixmapButton( this, NULL ); m_button->move( 35, 35 ); m_button->setActiveGraphic( _button8_on ); m_button->setInactiveGraphic( _button8_off ); - m_button->setChecked( FALSE ); - connect( m_button, SIGNAL ( clicked ( void ) ), - this, SLOT ( button8Clicked( void ) ) ); + m_button->setChecked( false ); + connect( m_button, SIGNAL ( clicked () ), + this, SLOT ( button8Clicked() ) ); m_buttons.append( m_button ); m_lastBtn = m_buttons[_default]; - m_lastBtn->setChecked( TRUE ); + m_lastBtn->setChecked( true ); } @@ -157,7 +157,7 @@ nineButtonSelector::~ nineButtonSelector() -void nineButtonSelector::button0Clicked( void ) +void nineButtonSelector::button0Clicked() { setSelected( 0 ); } @@ -165,7 +165,7 @@ void nineButtonSelector::button0Clicked( void ) -void nineButtonSelector::button1Clicked( void ) +void nineButtonSelector::button1Clicked() { setSelected( 1 ); } @@ -173,7 +173,7 @@ void nineButtonSelector::button1Clicked( void ) -void nineButtonSelector::button2Clicked( void ) +void nineButtonSelector::button2Clicked() { setSelected( 2 ); } @@ -181,7 +181,7 @@ void nineButtonSelector::button2Clicked( void ) -void nineButtonSelector::button3Clicked( void ) +void nineButtonSelector::button3Clicked() { setSelected( 3 ); } @@ -189,7 +189,7 @@ void nineButtonSelector::button3Clicked( void ) -void nineButtonSelector::button4Clicked( void ) +void nineButtonSelector::button4Clicked() { setSelected( 4 ); } @@ -197,7 +197,7 @@ void nineButtonSelector::button4Clicked( void ) -void nineButtonSelector::button5Clicked( void ) +void nineButtonSelector::button5Clicked() { setSelected( 5 ); } @@ -205,7 +205,7 @@ void nineButtonSelector::button5Clicked( void ) -void nineButtonSelector::button6Clicked( void ) +void nineButtonSelector::button6Clicked() { setSelected( 6 ); } @@ -213,7 +213,7 @@ void nineButtonSelector::button6Clicked( void ) -void nineButtonSelector::button7Clicked( void ) +void nineButtonSelector::button7Clicked() { setSelected( 7 ); } @@ -221,12 +221,12 @@ void nineButtonSelector::button7Clicked( void ) -void nineButtonSelector::button8Clicked( void ) +void nineButtonSelector::button8Clicked() { setSelected( 8 ); } -void nineButtonSelector::modelChanged( void ) +void nineButtonSelector::modelChanged() { updateButton( model()->value() ); } @@ -239,11 +239,11 @@ void nineButtonSelector::setSelected( Uint8 _new_button ) void nineButtonSelector::updateButton( Uint8 _new_button ) { - m_lastBtn->setChecked( FALSE ); + m_lastBtn->setChecked( false ); m_lastBtn->update(); m_lastBtn = m_buttons[_new_button]; - m_lastBtn->setChecked( TRUE ); + m_lastBtn->setChecked( true ); m_lastBtn->update(); emit nineButtonSelection( _new_button ); @@ -260,7 +260,7 @@ void nineButtonSelector::contextMenuEvent( QContextMenuEvent * ) -void nineButtonSelector::displayHelp( void ) +void nineButtonSelector::displayHelp() { QWhatsThis::showText( mapToGlobal( rect().bottomRight() ), whatsThis() ); diff --git a/plugins/vibed/nine_button_selector.h b/plugins/vibed/nine_button_selector.h index f22b9e7fc1..3532abd507 100644 --- a/plugins/vibed/nine_button_selector.h +++ b/plugins/vibed/nine_button_selector.h @@ -64,23 +64,23 @@ protected: void setSelected( Uint8 _new_button ); public slots: - void button0Clicked( void ); - void button1Clicked( void ); - void button2Clicked( void ); - void button3Clicked( void ); - void button4Clicked( void ); - void button5Clicked( void ); - void button6Clicked( void ); - void button7Clicked( void ); - void button8Clicked( void ); + void button0Clicked(); + void button1Clicked(); + void button2Clicked(); + void button3Clicked(); + void button4Clicked(); + void button5Clicked(); + void button6Clicked(); + void button7Clicked(); + void button8Clicked(); void contextMenuEvent( QContextMenuEvent * ); - void displayHelp( void ); + void displayHelp(); signals: void nineButtonSelection( Uint8 ); private: - virtual void modelChanged( void ); + virtual void modelChanged(); void updateButton( Uint8 ); QList m_buttons; diff --git a/plugins/vibed/string_container.cpp b/plugins/vibed/string_container.cpp index ca57af6d97..14532e87ed 100644 --- a/plugins/vibed/string_container.cpp +++ b/plugins/vibed/string_container.cpp @@ -35,7 +35,7 @@ stringContainer::stringContainer(const float _pitch, { for( Uint8 i = 0; i < _strings; i++ ) { - m_exists.append( FALSE ); + m_exists.append( false ); } } @@ -98,5 +98,5 @@ void stringContainer::addString(Uint8 _harm, _string_loss, _detune, _state ) ); - m_exists[_id] = TRUE; + m_exists[_id] = true; } diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp index f772bcddbe..f6630ec582 100644 --- a/plugins/vibed/vibed.cpp +++ b/plugins/vibed/vibed.cpp @@ -105,7 +105,7 @@ vibed::vibed( InstrumentTrack * _instrumentTrack ) : tr( "Length %1" ).arg( harm+1 ) ); m_lengthKnobs.append( knob ); - led = new BoolModel( FALSE, this, + led = new BoolModel( false, this, tr( "Impulse %1" ).arg( harm+1 ) ); m_impulses.append( led ); @@ -264,7 +264,7 @@ void vibed::loadSettings( const QDomElement & _this ) -QString vibed::nodeName( void ) const +QString vibed::nodeName() const { return( vibedstrings_plugin_descriptor.name ); } @@ -355,14 +355,14 @@ vibedView::vibedView( Instrument * _instrument, QWidget * _parent ) : InstrumentView( _instrument, _parent ) { - setAutoFillBackground( TRUE ); + setAutoFillBackground( true ); QPalette pal; pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap( "artwork" ) ); setPalette( pal ); m_volumeKnob = new knob( knobBright_26, this ); - m_volumeKnob->setVolumeKnob( TRUE ); + m_volumeKnob->setVolumeKnob( true ); m_volumeKnob->move( 103, 142 ); m_volumeKnob->setHintText( tr( "Volume:" ) + " ", "" ); m_volumeKnob->setWhatsThis( tr( "The 'V' knob sets the volume " @@ -561,8 +561,8 @@ vibedView::vibedView( Instrument * _instrument, toolTip::add( m_sinWaveBtn, tr( "Use a sine-wave for " "current oscillator." ) ); - connect( m_sinWaveBtn, SIGNAL (clicked ( void ) ), - this, SLOT ( sinWaveClicked( void ) ) ); + connect( m_sinWaveBtn, SIGNAL (clicked () ), + this, SLOT ( sinWaveClicked() ) ); m_triangleWaveBtn = new pixmapButton( this, tr( "Triangle wave" ) ); @@ -574,7 +574,7 @@ vibedView::vibedView( Instrument * _instrument, toolTip::add( m_triangleWaveBtn, tr( "Use a triangle-wave " "for current oscillator." ) ); - connect( m_triangleWaveBtn, SIGNAL ( clicked ( void ) ), + connect( m_triangleWaveBtn, SIGNAL ( clicked () ), this, SLOT ( triangleWaveClicked( ) ) ); @@ -587,8 +587,8 @@ vibedView::vibedView( Instrument * _instrument, toolTip::add( m_sawWaveBtn, tr( "Use a saw-wave for " "current oscillator." ) ); - connect( m_sawWaveBtn, SIGNAL (clicked ( void ) ), - this, SLOT ( sawWaveClicked( void ) ) ); + connect( m_sawWaveBtn, SIGNAL (clicked () ), + this, SLOT ( sawWaveClicked() ) ); m_sqrWaveBtn = new pixmapButton( this, tr( "Square wave" ) ); @@ -600,8 +600,8 @@ vibedView::vibedView( Instrument * _instrument, toolTip::add( m_sqrWaveBtn, tr( "Use a square-wave for " "current oscillator." ) ); - connect( m_sqrWaveBtn, SIGNAL ( clicked ( void ) ), - this, SLOT ( sqrWaveClicked( void ) ) ); + connect( m_sqrWaveBtn, SIGNAL ( clicked () ), + this, SLOT ( sqrWaveClicked() ) ); m_whiteNoiseWaveBtn = new pixmapButton( this, tr( "White noise wave" ) ); @@ -613,8 +613,8 @@ vibedView::vibedView( Instrument * _instrument, toolTip::add( m_whiteNoiseWaveBtn, tr( "Use white-noise for " "current oscillator." ) ); - connect( m_whiteNoiseWaveBtn, SIGNAL ( clicked ( void ) ), - this, SLOT ( noiseWaveClicked( void ) ) ); + connect( m_whiteNoiseWaveBtn, SIGNAL ( clicked () ), + this, SLOT ( noiseWaveClicked() ) ); m_usrWaveBtn = new pixmapButton( this, tr( "User defined wave" ) ); @@ -626,8 +626,8 @@ vibedView::vibedView( Instrument * _instrument, toolTip::add( m_usrWaveBtn, tr( "Use a user-defined " "waveform for current oscillator." ) ); - connect( m_usrWaveBtn, SIGNAL ( clicked ( void ) ), - this, SLOT ( usrWaveClicked( void ) ) ); + connect( m_usrWaveBtn, SIGNAL ( clicked () ), + this, SLOT ( usrWaveClicked() ) ); m_smoothBtn = new pixmapButton( this, tr( "Smooth" ) ); @@ -636,11 +636,11 @@ vibedView::vibedView( Instrument * _instrument, "smooth_active" ) ); m_smoothBtn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_inactive" ) ); - m_smoothBtn->setChecked( FALSE ); + m_smoothBtn->setChecked( false ); toolTip::add( m_smoothBtn, tr( "Click here to smooth waveform." ) ); - connect( m_smoothBtn, SIGNAL ( clicked ( void ) ), - this, SLOT ( smoothClicked( void ) ) ); + connect( m_smoothBtn, SIGNAL ( clicked () ), + this, SLOT ( smoothClicked() ) ); m_normalizeBtn = new pixmapButton( this, tr( "Normalize" ) ); m_normalizeBtn->move( 96, 129 ); @@ -648,19 +648,19 @@ vibedView::vibedView( Instrument * _instrument, "normalize_active" ) ); m_normalizeBtn->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "normalize_inactive" ) ); - m_normalizeBtn->setChecked( FALSE ); + m_normalizeBtn->setChecked( false ); toolTip::add( m_normalizeBtn, tr( "Click here to normalize waveform." ) ); - connect( m_normalizeBtn, SIGNAL ( clicked ( void ) ), - this, SLOT ( normalizeClicked( void ) ) ); + connect( m_normalizeBtn, SIGNAL ( clicked () ), + this, SLOT ( normalizeClicked() ) ); } -void vibedView::modelChanged( void ) +void vibedView::modelChanged() { showString( 0 ); } @@ -690,7 +690,7 @@ void vibedView::showString( Uint8 _string ) -void vibedView::sinWaveClicked( void ) +void vibedView::sinWaveClicked() { m_graph->model()->setWaveToSine(); engine::getSong()->setModified(); @@ -698,7 +698,7 @@ void vibedView::sinWaveClicked( void ) -void vibedView::triangleWaveClicked( void ) +void vibedView::triangleWaveClicked() { m_graph->model()->setWaveToTriangle(); engine::getSong()->setModified(); @@ -706,7 +706,7 @@ void vibedView::triangleWaveClicked( void ) -void vibedView::sawWaveClicked( void ) +void vibedView::sawWaveClicked() { m_graph->model()->setWaveToSaw(); engine::getSong()->setModified(); @@ -714,7 +714,7 @@ void vibedView::sawWaveClicked( void ) -void vibedView::sqrWaveClicked( void ) +void vibedView::sqrWaveClicked() { m_graph->model()->setWaveToSquare(); engine::getSong()->setModified(); @@ -722,7 +722,7 @@ void vibedView::sqrWaveClicked( void ) -void vibedView::noiseWaveClicked( void ) +void vibedView::noiseWaveClicked() { m_graph->model()->setWaveToNoise(); engine::getSong()->setModified(); @@ -730,7 +730,7 @@ void vibedView::noiseWaveClicked( void ) -void vibedView::usrWaveClicked( void ) +void vibedView::usrWaveClicked() { // TODO: load file //m_graph->model()->setWaveToUser(); @@ -739,7 +739,7 @@ void vibedView::usrWaveClicked( void ) -void vibedView::smoothClicked( void ) +void vibedView::smoothClicked() { m_graph->model()->smooth(); engine::getSong()->setModified(); @@ -747,7 +747,7 @@ void vibedView::smoothClicked( void ) -void vibedView::normalizeClicked( void ) +void vibedView::normalizeClicked() { m_graph->model()->normalize(); engine::getSong()->setModified(); @@ -769,7 +769,7 @@ void vibedView::contextMenuEvent( QContextMenuEvent * ) -void vibedView::displayHelp( void ) +void vibedView::displayHelp() { QWhatsThis::showText( mapToGlobal( rect().bottomRight() ), whatsThis() ); diff --git a/plugins/vibed/vibed.h b/plugins/vibed/vibed.h index 077f85c273..4d315400bc 100644 --- a/plugins/vibed/vibed.h +++ b/plugins/vibed/vibed.h @@ -51,9 +51,9 @@ public: virtual void saveSettings( QDomDocument & _doc, QDomElement & _parent ); virtual void loadSettings( const QDomElement & _this ); - virtual QString nodeName( void ) const; + virtual QString nodeName() const; - inline virtual bool isBendable( void ) const + inline virtual bool isBendable() const { return( false ); } @@ -93,20 +93,20 @@ public: public slots: void showString( Uint8 _string ); void contextMenuEvent( QContextMenuEvent * ); - void displayHelp( void ); + void displayHelp(); protected slots: - void sinWaveClicked( void ); - void triangleWaveClicked( void ); - void sawWaveClicked( void ); - void sqrWaveClicked( void ); - void noiseWaveClicked( void ); - void usrWaveClicked( void ); - void smoothClicked( void ); - void normalizeClicked( void ); + void sinWaveClicked(); + void triangleWaveClicked(); + void sawWaveClicked(); + void sqrWaveClicked(); + void noiseWaveClicked(); + void usrWaveClicked(); + void smoothClicked(); + void normalizeClicked(); private: - virtual void modelChanged( void ); + virtual void modelChanged(); // String-related diff --git a/plugins/vibed/vibrating_string.h b/plugins/vibed/vibrating_string.h index c509db78e6..d266d26395 100644 --- a/plugins/vibed/vibrating_string.h +++ b/plugins/vibed/vibrating_string.h @@ -45,7 +45,7 @@ public: float _detune, bool _state ); - inline ~vibratingString( void ) + inline ~vibratingString() { delete[] m_outsamp; delete[] m_impulse; @@ -53,7 +53,7 @@ public: vibratingString::freeDelayLine( m_toBridge ); } - inline sample_t nextSample( void ) + inline sample_t nextSample() { sample_t ym0; sample_t ypM; diff --git a/plugins/zynaddsubfx/fltk/CMake/PlatformTests.cxx b/plugins/zynaddsubfx/fltk/CMake/PlatformTests.cxx index bfe97ac951..9e92850a73 100644 --- a/plugins/zynaddsubfx/fltk/CMake/PlatformTests.cxx +++ b/plugins/zynaddsubfx/fltk/CMake/PlatformTests.cxx @@ -29,7 +29,7 @@ int main() { struct jpeg_decompress_struct cinfo; jpeg_create_decompress(&cinfo); - jpeg_read_header(&cinfo, TRUE); + jpeg_read_header(&cinfo, true); return 1; } diff --git a/plugins/zynaddsubfx/fltk/src/Fl_Double_Window.cxx b/plugins/zynaddsubfx/fltk/src/Fl_Double_Window.cxx index f26951e4df..8e31149c36 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_Double_Window.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_Double_Window.cxx @@ -128,7 +128,7 @@ HDC fl_makeDC(HBITMAP bitmap) { SetTextAlign(new_gc, TA_BASELINE|TA_LEFT); SetBkMode(new_gc, TRANSPARENT); #if USE_COLORMAP - if (fl_palette) SelectPalette(new_gc, fl_palette, FALSE); + if (fl_palette) SelectPalette(new_gc, fl_palette, false); #endif SelectObject(new_gc, bitmap); return new_gc; diff --git a/plugins/zynaddsubfx/fltk/src/Fl_File_Input.cxx b/plugins/zynaddsubfx/fltk/src/Fl_File_Input.cxx index d46c984521..6ed5a07594 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_File_Input.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_File_Input.cxx @@ -144,7 +144,7 @@ void Fl_File_Input::update_buttons() { \param[in] str new string value \param[in] len lengh of value */ -int // O - TRUE on success +int // O - true on success Fl_File_Input::value(const char *str, // I - New string value int len) { // I - Length of value damage(FL_DAMAGE_BAR); @@ -157,7 +157,7 @@ Fl_File_Input::value(const char *str, // I - New string value Returns non 0 on success. \param[in] str new string value */ -int // O - TRUE on success +int // O - true on success Fl_File_Input::value(const char *str) { // I - New string value damage(FL_DAMAGE_BAR); return Fl_Input::value(str); @@ -187,7 +187,7 @@ void Fl_File_Input::draw() { Return non zero if event is handled. \param[in] event */ -int // O - TRUE if we handled event +int // O - true if we handled event Fl_File_Input::handle(int event) // I - Event { // printf("handle(event = %d)\n", event); @@ -230,7 +230,7 @@ Fl_File_Input::handle(int event) // I - Event Return non zero if event is handled. \param[in] event */ -int // O - TRUE if we handled event +int // O - true if we handled event Fl_File_Input::handle_button(int event) // I - Event { int i, // Looping var diff --git a/plugins/zynaddsubfx/fltk/src/Fl_win32.cxx b/plugins/zynaddsubfx/fltk/src/Fl_win32.cxx index 3b9fe186de..be96d311ff 100644 --- a/plugins/zynaddsubfx/fltk/src/Fl_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/Fl_win32.cxx @@ -398,7 +398,7 @@ int fl_wait(double time_to_wait) { time_to_wait = (time_to_wait > 10000 ? 10000 : time_to_wait); int t_msec = (int) (time_to_wait * 1000.0 + 0.5); - MsgWaitForMultipleObjects(0, NULL, FALSE, t_msec, QS_ALLINPUT); + MsgWaitForMultipleObjects(0, NULL, false, t_msec, QS_ALLINPUT); fl_lock_function(); @@ -1127,7 +1127,7 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar #if USE_COLORMAP case WM_QUERYNEWPALETTE : fl_GetDC(hWnd); - if (fl_select_palette()) InvalidateRect(hWnd, NULL, FALSE); + if (fl_select_palette()) InvalidateRect(hWnd, NULL, false); break; case WM_PALETTECHANGED: @@ -1215,7 +1215,7 @@ int Fl_X::fake_X_wm(const Fl_Window* w,int &X,int &Y, int &bt,int &bx, int &by) r.right = w->x()+w->w(); r.bottom = w->y()+w->h(); // get the decoration rectangle for the desired client rectangle - BOOL ok = AdjustWindowRectEx(&r, style, FALSE, exstyle); + BOOL ok = AdjustWindowRectEx(&r, style, false, exstyle); if (ok) { X = r.left; Y = r.top; @@ -1557,7 +1557,7 @@ Fl_X* Fl_X::make(Fl_Window* w) { CoCreateInstance(CLSID_CActiveIMM, NULL, CLSCTX_INPROC_SERVER, IID_IActiveIMMApp, (void**) &fl_aimm); if (fl_aimm) { - fl_aimm->Activate(TRUE); + fl_aimm->Activate(true); } } #endif // !__GNUC__ || __GNUC__ >= 3 diff --git a/plugins/zynaddsubfx/fltk/src/fl_color_win32.cxx b/plugins/zynaddsubfx/fltk/src/fl_color_win32.cxx index 48ce3a9fe7..a1564628cc 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_color_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_color_win32.cxx @@ -241,7 +241,7 @@ fl_select_palette(void) fl_palette = CreatePalette(pPal); } if (fl_palette) { - SelectPalette(fl_gc, fl_palette, FALSE); + SelectPalette(fl_gc, fl_palette, false); RealizePalette(fl_gc); } return fl_palette; diff --git a/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx b/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx index 133bb7ae63..084b87d637 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_dnd_win32.cxx @@ -343,7 +343,7 @@ public: } HRESULT __stdcall Next(ULONG celt, FORMATETC * rgelt, ULONG *pceltFetched) { - if (n > 0) return S_FALSE; + if (n > 0) return S_false; for (ULONG i = 0; i < celt; i++) { n++; rgelt->cfFormat = CF_HDROP; @@ -358,7 +358,7 @@ public: HRESULT __stdcall Skip(ULONG celt) { n += celt; - return (n == 0) ? S_OK : S_FALSE; + return (n == 0) ? S_OK : S_false; } HRESULT __stdcall Reset(void) { @@ -434,14 +434,14 @@ public: // df->pFiles = sizeof(DROPFILES); // df->pt.x = 0; // df->pt.y = 0; -// df->fNC = FALSE; +// df->fNC = false; // for (int i = 0; i < fl_selection_length[0]; i++) { // if (fl_selection_buffer[0][i] == '\n') { // fl_selection_buffer[0][i] = '\0'; // } // } // -// df->fWide = TRUE; +// df->fWide = true; // l = fl_utf2unicode((unsigned char*)fl_selection_buffer[0], // fl_selection_length[0], (xchar*)(((char*)pMem) // + sizeof(DROPFILES))); diff --git a/plugins/zynaddsubfx/fltk/src/fl_font_win32.cxx b/plugins/zynaddsubfx/fltk/src/fl_font_win32.cxx index fc708a8caf..db7ef6b3c4 100644 --- a/plugins/zynaddsubfx/fltk/src/fl_font_win32.cxx +++ b/plugins/zynaddsubfx/fltk/src/fl_font_win32.cxx @@ -44,8 +44,8 @@ Fl_Font_Descriptor::Fl_Font_Descriptor(const char* name, Fl_Fontsize size) { fl_angle_*10, // base-line orientation angle weight, italic, - FALSE, // underline attribute flag - FALSE, // strikeout attribute flag + false, // underline attribute flag + false, // strikeout attribute flag DEFAULT_CHARSET, // character set identifier OUT_DEFAULT_PRECIS, // output precision CLIP_DEFAULT_PRECIS,// clipping precision diff --git a/plugins/zynaddsubfx/fltk/src/screen_xywh.cxx b/plugins/zynaddsubfx/fltk/src/screen_xywh.cxx index fa7e1e139d..adfaa1dd93 100644 --- a/plugins/zynaddsubfx/fltk/src/screen_xywh.cxx +++ b/plugins/zynaddsubfx/fltk/src/screen_xywh.cxx @@ -58,7 +58,7 @@ static fl_gmi_func fl_gmi = NULL; // used to get a proc pointer for GetMonitorIn static RECT screens[16]; static BOOL CALLBACK screen_cb(HMONITOR mon, HDC, LPRECT r, LPARAM) { - if (num_screens >= 16) return TRUE; + if (num_screens >= 16) return true; MONITORINFO mi; mi.cbSize = sizeof(mi); @@ -69,7 +69,7 @@ static BOOL CALLBACK screen_cb(HMONITOR mon, HDC, LPRECT r, LPARAM) { screens[num_screens] = mi.rcWork; num_screens ++; } - return TRUE; + return true; } static void screen_init() { diff --git a/plugins/zynaddsubfx/mxml/mxml-private.c b/plugins/zynaddsubfx/mxml/mxml-private.c index fa5258056c..3d115ab9fa 100644 --- a/plugins/zynaddsubfx/mxml/mxml-private.c +++ b/plugins/zynaddsubfx/mxml/mxml-private.c @@ -208,7 +208,7 @@ DllMain(HINSTANCE hinst, /* I - DLL module handle */ { case DLL_PROCESS_ATTACH : /* Called on library initialization */ if ((_mxml_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) - return (FALSE); + return (false); break; case DLL_THREAD_DETACH : /* Called when a thread terminates */ @@ -227,7 +227,7 @@ DllMain(HINSTANCE hinst, /* I - DLL module handle */ break; } - return (TRUE); + return (true); } diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp index e414713ee5..f65d9bee51 100644 --- a/src/core/Controller.cpp +++ b/src/core/Controller.cpp @@ -114,7 +114,7 @@ float Controller::runningTime() -void Controller::triggerFrameCounter( void ) +void Controller::triggerFrameCounter() { for( int i = 0; i < s_controllers.size(); ++i ) { @@ -131,7 +131,7 @@ void Controller::triggerFrameCounter( void ) -void Controller::resetFrameCounter( void ) +void Controller::resetFrameCounter() { s_frames = 0; } @@ -239,7 +239,7 @@ void Controller::loadSettings( const QDomElement & _this ) } -QString Controller::nodeName( void ) const +QString Controller::nodeName() const { return( "Controller" ); } diff --git a/src/core/ControllerConnection.cpp b/src/core/ControllerConnection.cpp index 097ec79fd6..0b346fd83d 100644 --- a/src/core/ControllerConnection.cpp +++ b/src/core/ControllerConnection.cpp @@ -40,7 +40,7 @@ ControllerConnectionVector ControllerConnection::s_connections; ControllerConnection::ControllerConnection( Controller * _controller ) : m_controllerId( -1 ), - m_ownsController( FALSE ) + m_ownsController( false ) { if( _controller != NULL ) { @@ -60,7 +60,7 @@ ControllerConnection::ControllerConnection( Controller * _controller ) : ControllerConnection::ControllerConnection( int _controllerId ) : m_controller( Controller::create( Controller::DummyController, NULL ) ), m_controllerId( _controllerId ), - m_ownsController( FALSE ) + m_ownsController( false ) { s_connections.append( this ); } @@ -141,7 +141,7 @@ inline void ControllerConnection::setTargetName( const QString & _name ) * controllers. So, we remember the controller-ID and use a dummyController * instead. Once the song is loaded, finalizeConnections() connects to the proper controllers */ -void ControllerConnection::finalizeConnections( void ) +void ControllerConnection::finalizeConnections() { for( int i = 0; i < s_connections.size(); ++i ) { @@ -203,12 +203,12 @@ void ControllerConnection::loadSettings( const QDomElement & _this ) } -void ControllerConnection::deleteConnection( void ) +void ControllerConnection::deleteConnection() { delete this; } -QString ControllerConnection::nodeName( void ) const +QString ControllerConnection::nodeName() const { return( "connection" ); } diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp index 53d0340c72..435991ba9b 100644 --- a/src/core/FxMixer.cpp +++ b/src/core/FxMixer.cpp @@ -141,7 +141,7 @@ void FxMixer::processChannel( fx_ch_t _ch, sampleFrame * _buf ) -void FxMixer::prepareMasterMix( void ) +void FxMixer::prepareMasterMix() { engine::getMixer()->clearAudioBuffer( m_fxChannels[0]->m_buffer, engine::getMixer()->framesPerPeriod() ); diff --git a/src/core/LfoController.cpp b/src/core/LfoController.cpp index 706476f978..94d6cc687a 100644 --- a/src/core/LfoController.cpp +++ b/src/core/LfoController.cpp @@ -171,7 +171,7 @@ float LfoController::value( int _offset ) -void LfoController::updateSampleFunction( void ) +void LfoController::updateSampleFunction() { switch( m_waveModel.value() ) { @@ -231,7 +231,7 @@ void LfoController::loadSettings( const QDomElement & _this ) -QString LfoController::nodeName( void ) const +QString LfoController::nodeName() const { return( "lfocontroller" ); } diff --git a/src/core/Oscillator.cpp b/src/core/Oscillator.cpp index b9b466269f..ed00ef6430 100644 --- a/src/core/Oscillator.cpp +++ b/src/core/Oscillator.cpp @@ -306,7 +306,7 @@ void Oscillator::updateFM( sampleFrame * _ab, const fpp_t _frames, // should be called every time phase-offset is changed... -inline void Oscillator::recalcPhase( void ) +inline void Oscillator::recalcPhase() { if( !typeInfo::isEqual( m_phaseOffset, m_ext_phaseOffset ) ) { diff --git a/src/core/Plugin.cpp b/src/core/Plugin.cpp index 3615df109e..5117a13489 100644 --- a/src/core/Plugin.cpp +++ b/src/core/Plugin.cpp @@ -96,7 +96,7 @@ Plugin * Plugin::instantiate( const QString & _plugin_name, Model * _parent, { QLibrary plugin_lib( configManager::inst()->pluginDir() + _plugin_name ); - if( plugin_lib.load() == FALSE ) + if( plugin_lib.load() == false ) { if( engine::hasGUI() ) { @@ -151,7 +151,7 @@ void Plugin::getDescriptorsOfAvailPlugins( QVector & _plugin_descs ) foreach( const QFileInfo & f, list ) { QLibrary plugin_lib( f.absoluteFilePath() ); - if( plugin_lib.load() == FALSE || + if( plugin_lib.load() == false || plugin_lib.resolve( "lmms_plugin_main" ) == NULL ) { continue; diff --git a/src/core/TempoSyncKnobModel.cpp b/src/core/TempoSyncKnobModel.cpp index d317f99fa8..c54e43b1e2 100644 --- a/src/core/TempoSyncKnobModel.cpp +++ b/src/core/TempoSyncKnobModel.cpp @@ -108,7 +108,7 @@ void TempoSyncKnobModel::calculateTempoSyncTime( bpm_t _bpm ) break; default: ; } - bool journalling = testAndSetJournalling( FALSE ); + bool journalling = testAndSetJournalling( false ); float oneUnit = 60000.0 / ( _bpm * conversionFactor * m_scale ); setValue( oneUnit * maxValue() ); setJournalling( journalling ); diff --git a/src/core/automation_pattern.cpp b/src/core/automation_pattern.cpp index 03cbe0cc1a..b5ff646d94 100644 --- a/src/core/automation_pattern.cpp +++ b/src/core/automation_pattern.cpp @@ -117,7 +117,7 @@ void automationPattern::addObject( AutomatableModel * _obj, bool _search_dup ) -const AutomatableModel * automationPattern::firstObject( void ) const +const AutomatableModel * automationPattern::firstObject() const { AutomatableModel * m; if( !m_objects.isEmpty() && ( m = m_objects.first() ) != NULL ) @@ -134,7 +134,7 @@ const AutomatableModel * automationPattern::firstObject( void ) const //TODO: Improve this -midiTime automationPattern::length( void ) const +midiTime automationPattern::length() const { tick_t max_length = 0; @@ -349,7 +349,7 @@ void automationPattern::loadSettings( const QDomElement & _this ) -const QString automationPattern::name( void ) const +const QString automationPattern::name() const { if( !trackContentObject::name().isEmpty() ) { @@ -464,7 +464,7 @@ automationPattern * automationPattern::globalAutomationPattern( -void automationPattern::resolveAllIDs( void ) +void automationPattern::resolveAllIDs() { trackContainer::trackList l = engine::getSong()->tracks() + engine::getBBTrackContainer()->tracks(); @@ -504,7 +504,7 @@ void automationPattern::resolveAllIDs( void ) -void automationPattern::clear( void ) +void automationPattern::clear() { const float val = firstObject()->value(); m_timeMap.clear(); @@ -520,7 +520,7 @@ void automationPattern::clear( void ) -void automationPattern::openInAutomationEditor( void ) +void automationPattern::openInAutomationEditor() { engine::getAutomationEditor()->setCurrentPattern( this ); engine::getAutomationEditor()->parentWidget()->show(); diff --git a/src/core/bb_track_container.cpp b/src/core/bb_track_container.cpp index 6a75f6c70a..d44d7c09f0 100644 --- a/src/core/bb_track_container.cpp +++ b/src/core/bb_track_container.cpp @@ -32,7 +32,7 @@ -bbTrackContainer::bbTrackContainer( void ) : +bbTrackContainer::bbTrackContainer() : trackContainer(), m_bbComboBoxModel( this ) { @@ -58,10 +58,10 @@ bool bbTrackContainer::play( midiTime _start, fpp_t _frames, f_cnt_t _offset, Sint16 _tco_num ) { - bool played_a_note = FALSE; + bool played_a_note = false; if( lengthOfBB( _tco_num ) <= 0 ) { - return( FALSE ); + return( false ); } _start = _start % ( lengthOfBB( _tco_num ) * midiTime::ticksPerTact() ); @@ -71,7 +71,7 @@ bool bbTrackContainer::play( midiTime _start, fpp_t _frames, { if( ( *it )->play( _start, _frames, _offset, _tco_num ) ) { - played_a_note = TRUE; + played_a_note = true; } } @@ -81,7 +81,7 @@ bool bbTrackContainer::play( midiTime _start, fpp_t _frames, -void bbTrackContainer::updateAfterTrackAdd( void ) +void bbTrackContainer::updateAfterTrackAdd() { // make sure, new track(s) have TCOs for every beat/bassline for( int i = 0; i < qMax( 1, numOfBBs() ); ++i ) @@ -110,7 +110,7 @@ tact_t bbTrackContainer::lengthOfBB( int _bb ) -int bbTrackContainer::numOfBBs( void ) const +int bbTrackContainer::numOfBBs() const { return( engine::getSong()->countTracks( track::BBTrack ) ); } @@ -161,7 +161,7 @@ void bbTrackContainer::updateBBTrack( trackContentObject * _tco ) -void bbTrackContainer::fixIncorrectPositions( void ) +void bbTrackContainer::fixIncorrectPositions() { trackList tl = tracks(); for( trackList::iterator it = tl.begin(); it != tl.end(); ++it ) @@ -176,7 +176,7 @@ void bbTrackContainer::fixIncorrectPositions( void ) -void bbTrackContainer::play( void ) +void bbTrackContainer::play() { if( engine::getSong()->isPlaying() ) { @@ -204,7 +204,7 @@ void bbTrackContainer::play( void ) -void bbTrackContainer::stop( void ) +void bbTrackContainer::stop() { engine::getSong()->stop(); } @@ -212,7 +212,7 @@ void bbTrackContainer::stop( void ) -void bbTrackContainer::updateComboBox( void ) +void bbTrackContainer::updateComboBox() { const int cur_bb = currentBB(); @@ -229,7 +229,7 @@ void bbTrackContainer::updateComboBox( void ) -void bbTrackContainer::currentBBChanged( void ) +void bbTrackContainer::currentBBChanged() { // first make sure, all channels have a TCO at current BB createTCOsForBB( currentBB() ); diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp index e899bd390a..05159e292a 100644 --- a/src/core/config_mgr.cpp +++ b/src/core/config_mgr.cpp @@ -49,7 +49,7 @@ static inline QString ensureTrailingSlash( const QString & _s ) configManager * configManager::s_instanceOfMe = NULL; -configManager::configManager( void ) : +configManager::configManager() : m_lmmsRcFile( QDir::home().absolutePath() + QDir::separator() + ".lmmsrc.xml" ), m_workingDir( QDir::home().absolutePath() + QDir::separator() + @@ -212,7 +212,7 @@ void configManager::setValue( const QString & _class, -void configManager::loadConfigFile( void ) +void configManager::loadConfigFile() { // read the XML file and create DOM tree QFile cfg_file( m_lmmsRcFile ); @@ -352,7 +352,7 @@ void configManager::loadConfigFile( void ) -void configManager::saveConfigFile( void ) +void configManager::saveConfigFile() { setValue( "paths", "artwork", m_artworkDir ); setValue( "paths", "workingdir", m_workingDir ); diff --git a/src/core/engine.cpp b/src/core/engine.cpp index 4daccc894d..7898ed975e 100644 --- a/src/core/engine.cpp +++ b/src/core/engine.cpp @@ -84,7 +84,7 @@ void engine::init( const bool _has_gui ) s_ladspaManager = new ladspa2LMMS; - s_projectJournal->setJournalling( TRUE ); + s_projectJournal->setJournalling( true ); s_mixer->initDevices(); diff --git a/src/core/ladspa_2_lmms.cpp b/src/core/ladspa_2_lmms.cpp index eb832cf893..7aa11d3c70 100644 --- a/src/core/ladspa_2_lmms.cpp +++ b/src/core/ladspa_2_lmms.cpp @@ -27,7 +27,7 @@ #include "ladspa_2_lmms.h" -ladspa2LMMS::ladspa2LMMS( void ) +ladspa2LMMS::ladspa2LMMS() { l_sortable_plugin_t plugins = getSortedPlugins(); diff --git a/src/core/ladspa_manager.cpp b/src/core/ladspa_manager.cpp index 922a3e95d5..80d184ceb1 100644 --- a/src/core/ladspa_manager.cpp +++ b/src/core/ladspa_manager.cpp @@ -35,7 +35,7 @@ -ladspaManager::ladspaManager( void ) +ladspaManager::ladspaManager() { QStringList ladspaDirectories = QString( getenv( "LADSPA_PATH" ) ). split( ',' ); @@ -72,7 +72,7 @@ ladspaManager::ladspaManager( void ) QLibrary plugin_lib( f.absoluteFilePath() ); - if( plugin_lib.load() == TRUE ) + if( plugin_lib.load() == true ) { LADSPA_Descriptor_Function descriptorFunction = ( LADSPA_Descriptor_Function ) plugin_lib.resolve( @@ -269,7 +269,7 @@ bool ladspaManager::hasRealTimeDependency( } else { - return( FALSE ); + return( false ); } } @@ -289,7 +289,7 @@ bool ladspaManager::isInplaceBroken( const ladspa_key_t & _plugin ) } else { - return( FALSE ); + return( false ); } } @@ -310,7 +310,7 @@ bool ladspaManager::isRealTimeCapable( } else { - return( FALSE ); + return( false ); } } @@ -414,7 +414,7 @@ bool ladspaManager::isPortInput( const ladspa_key_t & _plugin, } else { - return( FALSE ); + return( false ); } } @@ -438,7 +438,7 @@ bool ladspaManager::isPortOutput( const ladspa_key_t & _plugin, } else { - return( FALSE ); + return( false ); } } @@ -462,7 +462,7 @@ bool ladspaManager::isPortAudio( const ladspa_key_t & _plugin, } else { - return( FALSE ); + return( false ); } } @@ -486,7 +486,7 @@ bool ladspaManager::isPortControl( const ladspa_key_t & _plugin, } else { - return( FALSE ); + return( false ); } } @@ -511,7 +511,7 @@ bool ladspaManager::areHintsSampleRateDependent( } else { - return( FALSE ); + return( false ); } } @@ -596,7 +596,7 @@ bool ladspaManager::isPortToggled( const ladspa_key_t & _plugin, } else { - return( FALSE ); + return( false ); } } @@ -707,7 +707,7 @@ bool ladspaManager::isLogarithmic( const ladspa_key_t & _plugin, } else { - return( FALSE ); + return( false ); } } @@ -731,7 +731,7 @@ bool ladspaManager::isInteger( const ladspa_key_t & _plugin, } else { - return( FALSE ); + return( false ); } } @@ -843,10 +843,10 @@ bool ladspaManager::connectPort( const ladspa_key_t & _plugin, { ( descriptor->connect_port ) ( _instance, _port, _data_location ); - return( TRUE ); + return( true ); } } - return( FALSE ); + return( false ); } @@ -865,10 +865,10 @@ bool ladspaManager::activate( const ladspa_key_t & _plugin, if( descriptor->activate != NULL ) { ( descriptor->activate ) ( _instance ); - return( TRUE ); + return( true ); } } - return( FALSE ); + return( false ); } @@ -888,10 +888,10 @@ bool ladspaManager::run( const ladspa_key_t & _plugin, if( descriptor->run != NULL ) { ( descriptor->run ) ( _instance, _sample_count ); - return( TRUE ); + return( true ); } } - return( FALSE ); + return( false ); } @@ -912,10 +912,10 @@ bool ladspaManager::runAdding( const ladspa_key_t & _plugin, descriptor->set_run_adding_gain != NULL ) { ( descriptor->run_adding ) ( _instance, _sample_count ); - return( TRUE ); + return( true ); } } - return( FALSE ); + return( false ); } @@ -937,10 +937,10 @@ bool ladspaManager::setRunAddingGain( const ladspa_key_t & _plugin, { ( descriptor->set_run_adding_gain ) ( _instance, _gain ); - return( TRUE ); + return( true ); } } - return( FALSE ); + return( false ); } @@ -959,10 +959,10 @@ bool ladspaManager::deactivate( const ladspa_key_t & _plugin, if( descriptor->deactivate != NULL ) { ( descriptor->deactivate ) ( _instance ); - return( TRUE ); + return( true ); } } - return( FALSE ); + return( false ); } @@ -981,8 +981,8 @@ bool ladspaManager::cleanup( const ladspa_key_t & _plugin, if( descriptor->cleanup != NULL ) { ( descriptor->cleanup ) ( _instance ); - return( TRUE ); + return( true ); } } - return( FALSE ); + return( false ); } diff --git a/src/core/midi/MidiController.cpp b/src/core/midi/MidiController.cpp index eead69b83c..7552580ce1 100644 --- a/src/core/midi/MidiController.cpp +++ b/src/core/midi/MidiController.cpp @@ -63,7 +63,7 @@ float MidiController::value( int _offset ) -void MidiController::updateName( void ) +void MidiController::updateName() { setName( QString("MIDI ch%1 ctrl%2"). arg( m_midiPort.inputChannel() ). @@ -137,7 +137,7 @@ void MidiController::loadSettings( const QDomElement & _this ) -QString MidiController::nodeName( void ) const +QString MidiController::nodeName() const { return( "Midicontroller" ); } diff --git a/src/core/mmp.cpp b/src/core/mmp.cpp index 8f48beee24..13a70c7abc 100644 --- a/src/core/mmp.cpp +++ b/src/core/mmp.cpp @@ -263,7 +263,7 @@ void multimediaProject::cleanMetaNodes( QDomElement _de ) -void multimediaProject::upgrade( void ) +void multimediaProject::upgrade() { projectVersion version = documentElement().attribute( "creatorversion" ). diff --git a/src/core/note.cpp b/src/core/note.cpp index ee68c33626..1759da9d9f 100644 --- a/src/core/note.cpp +++ b/src/core/note.cpp @@ -50,8 +50,8 @@ note::note( const midiTime & _length, const midiTime & _pos, m_pos( _pos ), m_detuning( NULL ) { - //saveJournallingState( FALSE ); -// setJournalling( FALSE ); + //saveJournallingState( false ); +// setJournalling( false ); if( _detuning ) { m_detuning = sharedObject::ref( _detuning ); @@ -221,7 +221,7 @@ void note::loadSettings( const QDomElement & _this ) /*void note::undoStep( journalEntry & _je ) { - saveJournallingState( FALSE ); + saveJournallingState( false ); switch( static_cast( _je.actionID() ) ) { case ChangeKey: @@ -259,7 +259,7 @@ void note::redoStep( journalEntry & _je ) -void note::editDetuningPattern( void ) +void note::editDetuningPattern() { m_detuning->getAutomationPattern()->openInAutomationEditor(); } @@ -267,7 +267,7 @@ void note::editDetuningPattern( void ) -void note::createDetuning( void ) +void note::createDetuning() { m_detuning = new detuningHelper; (void) m_detuning->getAutomationPattern(); @@ -277,7 +277,7 @@ void note::createDetuning( void ) -bool note::hasDetuningInfo( void ) const +bool note::hasDetuningInfo() const { return m_detuning && m_detuning->hasAutomation(); } diff --git a/src/core/sample_play_handle.cpp b/src/core/sample_play_handle.cpp index 2e088c4e25..ab594e926d 100644 --- a/src/core/sample_play_handle.cpp +++ b/src/core/sample_play_handle.cpp @@ -140,7 +140,7 @@ void samplePlayHandle::play( sampleFrame * _working_buffer ) -bool samplePlayHandle::done( void ) const +bool samplePlayHandle::done() const { return( framesDone() >= totalFrames() && m_doneMayReturnTrue == true ); } @@ -156,7 +156,7 @@ bool samplePlayHandle::isFromTrack( const track * _track ) const -f_cnt_t samplePlayHandle::totalFrames( void ) const +f_cnt_t samplePlayHandle::totalFrames() const { return( ( m_sampleBuffer->endFrame() - m_sampleBuffer->startFrame() ) * ( engine::getMixer()->processingSampleRate() / diff --git a/src/core/sample_record_handle.cpp b/src/core/sample_record_handle.cpp index 22e5734883..667ac7c554 100644 --- a/src/core/sample_record_handle.cpp +++ b/src/core/sample_record_handle.cpp @@ -84,7 +84,7 @@ void sampleRecordHandle::play( sampleFrame * /*_working_buffer*/ ) -bool sampleRecordHandle::done( void ) const +bool sampleRecordHandle::done() const { return false; } @@ -100,7 +100,7 @@ bool sampleRecordHandle::isFromTrack( const track * _track ) const -f_cnt_t sampleRecordHandle::framesRecorded( void ) const +f_cnt_t sampleRecordHandle::framesRecorded() const { return( m_framesRecorded ); } diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp index 13c664cc71..f3dc59d6fd 100644 --- a/src/core/timeline.cpp +++ b/src/core/timeline.cpp @@ -53,7 +53,7 @@ timeLine::timeLine( const int _xoff, const int _yoff, const float _ppt, m_autoScroll( AutoScrollEnabled ), m_loopPoints( LoopPointsDisabled ), m_behaviourAtStop( BackToZero ), - m_changedPosition( TRUE ), + m_changedPosition( true ), m_xOffset( _xoff ), m_posMarkerX( 0 ), m_ppt( _ppt ), @@ -182,7 +182,7 @@ void timeLine::updatePosition( const midiTime & ) if( new_x != m_posMarkerX ) { m_posMarkerX = new_x; - m_changedPosition = TRUE; + m_changedPosition = true; emit positionChanged( m_pos ); update(); } diff --git a/src/core/track_container.cpp b/src/core/track_container.cpp index fe61202ce7..d9266f4488 100644 --- a/src/core/track_container.cpp +++ b/src/core/track_container.cpp @@ -225,7 +225,7 @@ DummyTrackContainer::DummyTrackContainer() : trackContainer(), m_dummyInstrumentTrack( NULL ) { - setJournalling( FALSE ); + setJournalling( false ); m_dummyInstrumentTrack = dynamic_cast( track::create( track::InstrumentTrack, this ) ); diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp index eeef7e2f87..05458085ed 100644 --- a/src/gui/LfoControllerDialog.cpp +++ b/src/gui/LfoControllerDialog.cpp @@ -228,7 +228,7 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent setModel( _model ); - setAutoFillBackground( TRUE ); + setAutoFillBackground( true ); QPalette pal; pal.setBrush( backgroundRole(), embed::getIconPixmap( "lfo_controller_artwork" ) ); @@ -278,7 +278,7 @@ void lfoControllerDialog::paintEvent( QPaintEvent * _pe ) */ -void LfoControllerDialog::modelChanged( void ) +void LfoControllerDialog::modelChanged() { m_lfo = castModel(); diff --git a/src/gui/PeakControllerDialog.cpp b/src/gui/PeakControllerDialog.cpp index f2ca2beab1..06fb770f59 100644 --- a/src/gui/PeakControllerDialog.cpp +++ b/src/gui/PeakControllerDialog.cpp @@ -70,7 +70,7 @@ PeakControllerDialog::~PeakControllerDialog() /* -void effectView::displayHelp( void ) +void effectView::displayHelp() { QWhatsThis::showText( mapToGlobal( rect().bottomRight() ), whatsThis() ); @@ -79,10 +79,10 @@ void effectView::displayHelp( void ) -void effectView::closeEffects( void ) +void effectView::closeEffects() { m_subWindow->hide(); - m_show = TRUE; + m_show = true; } */ @@ -101,7 +101,7 @@ void PeakControllerDialog::paintEvent( QPaintEvent * ) -void PeakControllerDialog::modelChanged( void ) +void PeakControllerDialog::modelChanged() { m_peakController = castModel(); } diff --git a/src/gui/automation_editor.cpp b/src/gui/automation_editor.cpp index 87d626034a..1dc8a8bfc9 100644 --- a/src/gui/automation_editor.cpp +++ b/src/gui/automation_editor.cpp @@ -72,7 +72,7 @@ QPixmap * automationEditor::s_toolSelect = NULL; QPixmap * automationEditor::s_toolMove = NULL; -automationEditor::automationEditor( void ) : +automationEditor::automationEditor() : QWidget(), m_zoomingXModel(), m_zoomingYModel(), @@ -450,7 +450,7 @@ inline void automationEditor::drawValueRect( QPainter & _p, -void automationEditor::removeSelection( void ) +void automationEditor::removeSelection() { m_selectStartTick = 0; m_selectedTick = 0; @@ -1670,7 +1670,7 @@ float automationEditor::getLevel( int _y ) -inline bool automationEditor::inBBEditor( void ) +inline bool automationEditor::inBBEditor() { return( m_pattern->getTrack()->getTrackContainer() == engine::getBBTrackContainer() ); @@ -1679,7 +1679,7 @@ inline bool automationEditor::inBBEditor( void ) -void automationEditor::play( void ) +void automationEditor::play() { if( validPattern() == FALSE ) { @@ -1753,7 +1753,7 @@ void automationEditor::play( void ) -void automationEditor::stop( void ) +void automationEditor::stop() { if( !validPattern() ) { @@ -1795,7 +1795,7 @@ void automationEditor::verScrolled( int _new_pos ) -void automationEditor::drawButtonToggled( void ) +void automationEditor::drawButtonToggled() { m_editMode = DRAW; removeSelection(); @@ -1805,7 +1805,7 @@ void automationEditor::drawButtonToggled( void ) -void automationEditor::eraseButtonToggled( void ) +void automationEditor::eraseButtonToggled() { m_editMode = ERASE; removeSelection(); @@ -1815,7 +1815,7 @@ void automationEditor::eraseButtonToggled( void ) -void automationEditor::selectButtonToggled( void ) +void automationEditor::selectButtonToggled() { m_editMode = SELECT; removeSelection(); @@ -1825,7 +1825,7 @@ void automationEditor::selectButtonToggled( void ) -void automationEditor::moveButtonToggled( void ) +void automationEditor::moveButtonToggled() { m_editMode = MOVE; m_selValuesForMove.clear(); @@ -1836,7 +1836,7 @@ void automationEditor::moveButtonToggled( void ) -void automationEditor::selectAll( void ) +void automationEditor::selectAll() { if( validPattern() == FALSE ) { @@ -1918,7 +1918,7 @@ void automationEditor::getSelectedValues( timeMap & _selected_values ) -void automationEditor::copySelectedValues( void ) +void automationEditor::copySelectedValues() { m_valuesToCopy.clear(); @@ -1942,7 +1942,7 @@ void automationEditor::copySelectedValues( void ) -void automationEditor::cutSelectedValues( void ) +void automationEditor::cutSelectedValues() { if( validPattern() == FALSE ) { @@ -1973,7 +1973,7 @@ void automationEditor::cutSelectedValues( void ) -void automationEditor::pasteValues( void ) +void automationEditor::pasteValues() { if( validPattern() == FALSE ) { @@ -2000,7 +2000,7 @@ void automationEditor::pasteValues( void ) -void automationEditor::deleteSelectedValues( void ) +void automationEditor::deleteSelectedValues() { if( validPattern() == FALSE ) { @@ -2056,7 +2056,7 @@ void automationEditor::updatePosition( const midiTime & _t ) -void automationEditor::zoomingXChanged( void ) +void automationEditor::zoomingXChanged() { const QString & zfac = m_zoomingXModel.currentText(); m_ppt = zfac.left( zfac.length() - 1 ).toInt() * DEFAULT_PPT / 100; @@ -2070,7 +2070,7 @@ void automationEditor::zoomingXChanged( void ) -void automationEditor::zoomingYChanged( void ) +void automationEditor::zoomingYChanged() { const QString & zfac = m_zoomingYModel.currentText(); m_y_auto = zfac == "Auto"; @@ -2088,7 +2088,7 @@ void automationEditor::zoomingYChanged( void ) -int automationEditor::quantization( void ) const +int automationEditor::quantization() const { return( DefaultTicksPerTact / m_quantizeComboBox->model()->currentText().right( @@ -2099,7 +2099,7 @@ int automationEditor::quantization( void ) const -void automationEditor::updateTopBottomLevels( void ) +void automationEditor::updateTopBottomLevels() { if( m_y_auto ) { @@ -2146,7 +2146,7 @@ void automationEditor::updateTopBottomLevels( void ) -void automationEditor::update( void ) +void automationEditor::update() { QWidget::update(); // Note detuning? diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp index 08cce140d9..66ee5281a8 100644 --- a/src/gui/bb_editor.cpp +++ b/src/gui/bb_editor.cpp @@ -45,7 +45,7 @@ bbEditor::bbEditor( bbTrackContainer * _tc ) : m_toolBar = new QWidget; m_toolBar->setFixedHeight( 32 ); m_toolBar->move( 0, 0 ); - m_toolBar->setAutoFillBackground( TRUE ); + m_toolBar->setAutoFillBackground( true ); QPalette pal; pal.setBrush( m_toolBar->backgroundRole(), embed::getIconPixmap( "toolbar_bg" ) ); @@ -113,7 +113,7 @@ bbEditor::bbEditor( bbTrackContainer * _tc ) : tb_layout->addSpacing( 15 ); engine::mainWindow()->workspace()->addSubWindow( this ); - parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE ); + parentWidget()->setAttribute( Qt::WA_DeleteOnClose, false ); parentWidget()->layout()->setSizeConstraint( QLayout::SetMinimumSize ); parentWidget()->resize( minimumWidth(), 300 ); parentWidget()->move( 610, 5 ); @@ -147,7 +147,7 @@ void bbEditor::removeBBView( int _bb ) -void bbEditor::play( void ) +void bbEditor::play() { if( engine::getSong()->isPlaying() ) { @@ -181,7 +181,7 @@ void bbEditor::play( void ) -void bbEditor::stop( void ) +void bbEditor::stop() { engine::getSong()->stop(); m_playButton->setIcon( embed::getIconPixmap( "play" ) ); @@ -191,7 +191,7 @@ void bbEditor::stop( void ) -void bbEditor::updatePosition( void ) +void bbEditor::updatePosition() { //realignTracks(); emit positionChanged( m_currentPosition ); @@ -200,7 +200,7 @@ void bbEditor::updatePosition( void ) -void bbEditor::addAutomationTrack( void ) +void bbEditor::addAutomationTrack() { (void) track::create( track::AutomationTrack, model() ); } diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp index b4c7cba370..3cc8e8b035 100644 --- a/src/gui/song_editor.cpp +++ b/src/gui/song_editor.cpp @@ -74,7 +74,7 @@ void positionLine::paintEvent( QPaintEvent * _pe ) songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : trackContainerView( _song ), m_s( _song ), - m_scrollBack( FALSE ) + m_scrollBack( false ) { _engine_ptr = this; @@ -222,7 +222,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : // create own toolbar m_toolBar = new QWidget( this ); m_toolBar->setFixedHeight( 32 ); - m_toolBar->setAutoFillBackground( TRUE ); + m_toolBar->setAutoFillBackground( true ); QPalette pal; pal.setBrush( m_toolBar->backgroundRole(), embed::getIconPixmap( "toolbar_bg" ) ); @@ -286,19 +286,19 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : "edit_draw" ), tr( "Draw mode" ), NULL, NULL, m_toolBar ); - m_drawModeButton->setCheckable( TRUE ); - m_drawModeButton->setChecked( TRUE ); + m_drawModeButton->setCheckable( true ); + m_drawModeButton->setChecked( true ); m_editModeButton = new toolButton( embed::getIconPixmap( "edit_select" ), tr( "Edit mode (select and move)" ), NULL, NULL, m_toolBar ); - m_editModeButton->setCheckable( TRUE ); + m_editModeButton->setCheckable( true ); QButtonGroup * tool_button_group = new QButtonGroup( this ); tool_button_group->addButton( m_drawModeButton ); tool_button_group->addButton( m_editModeButton ); - tool_button_group->setExclusive( TRUE ); + tool_button_group->setExclusive( true ); #if 0 #warning TODO @@ -338,7 +338,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : m_zoomingComboBox->model()->setInitValue( m_zoomingComboBox->model()->findText( "100%" ) ); connect( m_zoomingComboBox->model(), SIGNAL( dataChanged() ), - this, SLOT( zoomingChanged( void ) ) ); + this, SLOT( zoomingChanged() ) ); tb_layout->addSpacing( 5 ); @@ -375,7 +375,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : engine::mainWindow()->workspace()->addSubWindow( this ); - parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE ); + parentWidget()->setAttribute( Qt::WA_DeleteOnClose, false ); parentWidget()->resize( 600, 300 ); parentWidget()->move( 5, 5 ); parentWidget()->show(); @@ -410,7 +410,7 @@ void songEditor::scrolled( int _new_pos ) -void songEditor::play( void ) +void songEditor::play() { m_s->play(); engine::getPianoRoll()->stopRecording(); @@ -427,7 +427,7 @@ void songEditor::play( void ) -void songEditor::record( void ) +void songEditor::record() { m_s->record(); } @@ -435,7 +435,7 @@ void songEditor::record( void ) -void songEditor::recordAccompany( void ) +void songEditor::recordAccompany() { m_s->playAndRecord(); } @@ -443,7 +443,7 @@ void songEditor::recordAccompany( void ) -void songEditor::stop( void ) +void songEditor::stop() { m_s->stop(); engine::getPianoRoll()->stopRecording(); @@ -647,7 +647,7 @@ void songEditor::updatePosition( const midiTime & _t ) { if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong && m_timeLine->autoScroll() == timeLine::AutoScrollEnabled) || - m_scrollBack == TRUE ) + m_scrollBack == true ) { const int w = width() - DEFAULT_SETTINGS_WIDGET_WIDTH - TRACK_OP_WIDTH; @@ -664,7 +664,7 @@ void songEditor::updatePosition( const midiTime & _t ) 0 ); m_leftRightScroll->setValue( t.getTact() ); } - m_scrollBack = FALSE; + m_scrollBack = false; } const int x = m_s->m_playPos[song::Mode_PlaySong].m_timeLine-> @@ -685,7 +685,7 @@ void songEditor::updatePosition( const midiTime & _t ) -void songEditor::zoomingChanged( void ) +void songEditor::zoomingChanged() { const QString & zfac = m_zoomingComboBox->model()->currentText(); setPixelsPerTact( zfac.left( zfac.length() - 1 ).toInt() * @@ -698,7 +698,7 @@ void songEditor::zoomingChanged( void ) -bool songEditor::allowRubberband( void ) const +bool songEditor::allowRubberband() const { return( m_editModeButton->isChecked() ); } diff --git a/src/gui/widgets/ControllerRackView.cpp b/src/gui/widgets/ControllerRackView.cpp index ae26c11dfb..2e4cd4e6e9 100644 --- a/src/gui/widgets/ControllerRackView.cpp +++ b/src/gui/widgets/ControllerRackView.cpp @@ -63,11 +63,11 @@ ControllerRackView::ControllerRackView( ) : QWidget * w = new QWidget(); m_scrollArea->setWidget( w ); - connect( m_addButton, SIGNAL( clicked( void ) ), - this, SLOT( addController( void ) ) ); + connect( m_addButton, SIGNAL( clicked() ), + this, SLOT( addController() ) ); - connect( engine::getSong(), SIGNAL( dataChanged( void ) ), - this, SLOT( update( void ) ) ); + connect( engine::getSong(), SIGNAL( dataChanged() ), + this, SLOT( update() ) ); QVBoxLayout * layout = new QVBoxLayout(); layout->addWidget( m_scrollArea ); @@ -85,7 +85,7 @@ ControllerRackView::ControllerRackView( ) : subWin->layout()->setSizeConstraint( QLayout::SetMaximumSize ); - parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE ); + parentWidget()->setAttribute( Qt::WA_DeleteOnClose, false ); parentWidget()->move( 880, 310 ); } @@ -132,7 +132,7 @@ void ControllerRackView::deleteController( ControllerView * _view ) -void ControllerRackView::update( void ) +void ControllerRackView::update() { QWidget * w = m_scrollArea->widget(); song * s = engine::getSong(); @@ -167,7 +167,7 @@ void ControllerRackView::update( void ) } -void ControllerRackView::addController( void ) +void ControllerRackView::addController() { // TODO: Eventually let the user pick from available controller types diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp index fdbfc549de..42002c34e7 100644 --- a/src/gui/widgets/EnvelopeAndLfoView.cpp +++ b/src/gui/widgets/EnvelopeAndLfoView.cpp @@ -294,7 +294,7 @@ EnvelopeAndLfoView::EnvelopeAndLfoView( QWidget * _parent ) : tr( "control envelope-amount by this LFO" ) ); - setAcceptDrops( TRUE ); + setAcceptDrops( true ); } @@ -339,7 +339,7 @@ void EnvelopeAndLfoView::mousePressEvent( QMouseEvent * _me ) } if( QRect( ENV_GRAPH_X, ENV_GRAPH_Y, s_envGraph->width(), - s_envGraph->height() ).contains( _me->pos() ) == TRUE ) + s_envGraph->height() ).contains( _me->pos() ) == true ) { if( m_amountKnob->value() < 1.0f ) { @@ -351,7 +351,7 @@ void EnvelopeAndLfoView::mousePressEvent( QMouseEvent * _me ) } } else if( QRect( LFO_GRAPH_X, LFO_GRAPH_Y, s_lfoGraph->width(), - s_lfoGraph->height() ).contains( _me->pos() ) == TRUE ) + s_lfoGraph->height() ).contains( _me->pos() ) == true ) { if( m_lfoAmountKnob->value() < 1.0f ) { @@ -385,7 +385,7 @@ void EnvelopeAndLfoView::dropEvent( QDropEvent * _de ) { m_params->m_userWave.setAudioFile( stringPairDrag::decodeValue( _de ) ); - m_userLfoBtn->model()->setValue( TRUE ); + m_userLfoBtn->model()->setValue( true ); _de->accept(); } else if( type == QString( "tco_%1" ).arg( track::SampleTrack ) ) @@ -394,7 +394,7 @@ void EnvelopeAndLfoView::dropEvent( QDropEvent * _de ) m_params->m_userWave.setAudioFile( mmp.content().firstChild().toElement(). attribute( "src" ) ); - m_userLfoBtn->model()->setValue( TRUE ); + m_userLfoBtn->model()->setValue( true ); _de->accept(); } } diff --git a/src/gui/widgets/InstrumentFunctionViews.cpp b/src/gui/widgets/InstrumentFunctionViews.cpp index 35c940ac31..a8e6c32b41 100644 --- a/src/gui/widgets/InstrumentFunctionViews.cpp +++ b/src/gui/widgets/InstrumentFunctionViews.cpp @@ -88,7 +88,7 @@ ChordCreatorView::~ChordCreatorView() -void ChordCreatorView::modelChanged( void ) +void ChordCreatorView::modelChanged() { m_cc = castModel(); m_chordsGroupBox->setModel( &m_cc->m_chordsEnabledModel ); @@ -187,7 +187,7 @@ ArpeggiatorView::~ArpeggiatorView() -void ArpeggiatorView::modelChanged( void ) +void ArpeggiatorView::modelChanged() { m_a = castModel(); m_arpGroupBox->setModel( &m_a->m_arpEnabledModel ); diff --git a/src/gui/widgets/InstrumentSoundShapingView.cpp b/src/gui/widgets/InstrumentSoundShapingView.cpp index 98c5741c5a..298094249c 100644 --- a/src/gui/widgets/InstrumentSoundShapingView.cpp +++ b/src/gui/widgets/InstrumentSoundShapingView.cpp @@ -129,7 +129,7 @@ InstrumentSoundShapingView::~InstrumentSoundShapingView() -void InstrumentSoundShapingView::modelChanged( void ) +void InstrumentSoundShapingView::modelChanged() { m_ss = castModel(); m_filterGroupBox->setModel( &m_ss->m_filterEnabledModel ); diff --git a/src/gui/widgets/caption_menu.cpp b/src/gui/widgets/caption_menu.cpp index c3bea5eba9..ebb13d5e64 100644 --- a/src/gui/widgets/caption_menu.cpp +++ b/src/gui/widgets/caption_menu.cpp @@ -32,7 +32,7 @@ captionMenu::captionMenu( const QString & _title, QWidget * _parent ) : QMenu( _title, _parent ) { QAction * caption = addAction( _title ); - caption->setEnabled( FALSE ); + caption->setEnabled( false ); } diff --git a/src/gui/widgets/cpuload_widget.cpp b/src/gui/widgets/cpuload_widget.cpp index 079b2c8e80..5856bfd6f1 100644 --- a/src/gui/widgets/cpuload_widget.cpp +++ b/src/gui/widgets/cpuload_widget.cpp @@ -38,7 +38,7 @@ cpuloadWidget::cpuloadWidget( QWidget * _parent ) : m_temp(), m_background( embed::getIconPixmap( "cpuload_bg" ) ), m_leds( embed::getIconPixmap( "cpuload_leds" ) ), - m_changed( TRUE ), + m_changed( true ), m_updateTimer() { setAttribute( Qt::WA_OpaquePaintEvent, true ); @@ -63,9 +63,9 @@ cpuloadWidget::~cpuloadWidget() void cpuloadWidget::paintEvent( QPaintEvent * ) { - if( m_changed == TRUE ) + if( m_changed == true ) { - m_changed = FALSE; + m_changed = false; QPainter p( &m_temp ); p.drawPixmap( 0, 0, m_background ); @@ -94,7 +94,7 @@ void cpuloadWidget::updateCpuLoad() if( new_load != m_currentLoad ) { m_currentLoad = new_load; - m_changed = TRUE; + m_changed = true; update(); } } diff --git a/src/gui/widgets/fade_button.cpp b/src/gui/widgets/fade_button.cpp index 287d90c9ab..2dc8f6cd75 100644 --- a/src/gui/widgets/fade_button.cpp +++ b/src/gui/widgets/fade_button.cpp @@ -58,7 +58,7 @@ fadeButton::~fadeButton() -void fadeButton::activate( void ) +void fadeButton::activate() { m_stateTimer.restart(); signalUpdate(); @@ -110,7 +110,7 @@ void fadeButton::paintEvent( QPaintEvent * _pe ) -void fadeButton::signalUpdate( void ) +void fadeButton::signalUpdate() { QApplication::postEvent( this, new updateEvent() ); } diff --git a/src/gui/widgets/lcd_spinbox.cpp b/src/gui/widgets/lcd_spinbox.cpp index 8949d43d7d..9ce515492c 100644 --- a/src/gui/widgets/lcd_spinbox.cpp +++ b/src/gui/widgets/lcd_spinbox.cpp @@ -192,7 +192,7 @@ void lcdSpinBox::paintEvent( QPaintEvent * _me ) -void lcdSpinBox::update( void ) +void lcdSpinBox::update() { QString s = m_textForValue[model()->value()]; if( s == "" ) diff --git a/src/gui/widgets/led_checkbox.cpp b/src/gui/widgets/led_checkbox.cpp index 1ebba3c705..37b91bf6b6 100644 --- a/src/gui/widgets/led_checkbox.cpp +++ b/src/gui/widgets/led_checkbox.cpp @@ -43,7 +43,7 @@ ledCheckBox::ledCheckBox( const QString & _text, QWidget * _parent, automatableButton( _parent, _name ), m_text( _text ) { - setCheckable( TRUE ); + setCheckable( true ); if( _color >= NumColors || _color < Yellow ) { @@ -76,7 +76,7 @@ void ledCheckBox::paintEvent( QPaintEvent * ) QPainter p( this ); p.setFont( pointSize<7>( font() ) ); - if( model()->value() == TRUE ) + if( model()->value() == true ) { p.drawPixmap( 0, 0, *m_ledOnPixmap ); } diff --git a/src/gui/widgets/pixmap_button.cpp b/src/gui/widgets/pixmap_button.cpp index c2d99f3eb1..0320b4932a 100644 --- a/src/gui/widgets/pixmap_button.cpp +++ b/src/gui/widgets/pixmap_button.cpp @@ -37,10 +37,10 @@ pixmapButton::pixmapButton( QWidget * _parent, const QString & _name ) : automatableButton( _parent, _name ), m_activePixmap(), m_inactivePixmap(), - m_pressed( FALSE ) + m_pressed( false ) { setActiveGraphic( embed::getIconPixmap( "led_yellow" ) ); - setInactiveGraphic( embed::getIconPixmap( "led_off" ), FALSE ); + setInactiveGraphic( embed::getIconPixmap( "led_off" ), false ); } @@ -79,7 +79,7 @@ void pixmapButton::mousePressEvent( QMouseEvent * _me ) // Show pressing graphics if this isn't checkable if( !isCheckable() ) { - m_pressed = TRUE; + m_pressed = true; update(); } @@ -95,7 +95,7 @@ void pixmapButton::mouseReleaseEvent( QMouseEvent * _me ) if( !isCheckable() ) { - m_pressed = FALSE; + m_pressed = false; update(); } } diff --git a/src/gui/widgets/project_notes.cpp b/src/gui/widgets/project_notes.cpp index 678cec8ba0..fb16a35c93 100644 --- a/src/gui/widgets/project_notes.cpp +++ b/src/gui/widgets/project_notes.cpp @@ -44,7 +44,7 @@ -projectNotes::projectNotes( void ) : +projectNotes::projectNotes() : QMainWindow( engine::mainWindow()->workspace() ) { m_edit = new QTextEdit( this ); @@ -87,7 +87,7 @@ projectNotes::~projectNotes() -void projectNotes::clear( void ) +void projectNotes::clear() { m_edit->setHtml( tr( "Put down your project notes here." ) ); m_edit->selectAll(); @@ -147,7 +147,7 @@ void projectNotes::setupActions() tb = addToolBar( tr( "Format Actions" ) ); m_comboFont = new QComboBox( tb ); - m_comboFont->setEditable( TRUE ); + m_comboFont->setEditable( true ); QFontDatabase db; m_comboFont->addItems( db.families() ); connect( m_comboFont, SIGNAL( activated( const QString & ) ), @@ -155,7 +155,7 @@ void projectNotes::setupActions() m_comboFont->lineEdit()->setText( QApplication::font().family() ); m_comboSize = new QComboBox( tb ); - m_comboSize->setEditable( TRUE ); + m_comboSize->setEditable( true ); QList sizes = db.standardSizes(); QList::Iterator it = sizes.begin(); for ( ; it != sizes.end(); ++it ) @@ -170,14 +170,14 @@ void projectNotes::setupActions() m_actionTextBold = new QAction( embed::getIconPixmap( "text_bold" ), tr( "&Bold" ), this ); m_actionTextBold->setShortcut( tr( "Ctrl+B" ) ); - m_actionTextBold->setCheckable( TRUE ); + m_actionTextBold->setCheckable( true ); connect( m_actionTextBold, SIGNAL( triggered() ), this, SLOT( textBold() ) ); m_actionTextItalic = new QAction( embed::getIconPixmap( "text_italic" ), tr( "&Italic" ), this ); m_actionTextItalic->setShortcut( tr( "Ctrl+I" ) ); - m_actionTextItalic->setCheckable( TRUE ); + m_actionTextItalic->setCheckable( true ); connect( m_actionTextItalic, SIGNAL( triggered() ), this, SLOT( textItalic() ) ); @@ -185,7 +185,7 @@ void projectNotes::setupActions() "text_under" ), tr( "&Underline" ), this ); m_actionTextUnderline->setShortcut( tr( "Ctrl+U" ) ); - m_actionTextUnderline->setCheckable( TRUE ); + m_actionTextUnderline->setCheckable( true ); connect( m_actionTextUnderline, SIGNAL( triggered() ), this, SLOT( textUnderline() ) ); @@ -197,7 +197,7 @@ void projectNotes::setupActions() m_actionAlignLeft = new QAction( embed::getIconPixmap( "text_left" ), tr( "&Left" ), m_edit ); m_actionAlignLeft->setShortcut( tr( "Ctrl+L" ) ); - m_actionAlignLeft->setCheckable( TRUE ); + m_actionAlignLeft->setCheckable( true ); grp->addAction( m_actionAlignLeft ); m_actionAlignCenter = new QAction( embed::getIconPixmap( @@ -205,21 +205,21 @@ void projectNotes::setupActions() tr( "C&enter" ), m_edit ); m_actionAlignCenter->setShortcutContext( Qt::WidgetShortcut ); m_actionAlignCenter->setShortcut( tr( "Ctrl+E" ) ); - m_actionAlignCenter->setCheckable( TRUE ); + m_actionAlignCenter->setCheckable( true ); grp->addAction( m_actionAlignCenter ); m_actionAlignRight = new QAction( embed::getIconPixmap( "text_right" ), tr( "&Right" ), m_edit ); m_actionAlignRight->setShortcutContext( Qt::WidgetShortcut ); m_actionAlignRight->setShortcut( tr( "Ctrl+R" ) ); - m_actionAlignRight->setCheckable( TRUE ); + m_actionAlignRight->setCheckable( true ); grp->addAction( m_actionAlignRight ); m_actionAlignJustify = new QAction( embed::getIconPixmap( "text_block" ), tr( "&Justify" ), m_edit ); m_actionAlignJustify->setShortcut( tr( "Ctrl+J" ) ); - m_actionAlignJustify->setCheckable( TRUE ); + m_actionAlignJustify->setCheckable( true ); grp->addAction( m_actionAlignJustify ); @@ -356,19 +356,19 @@ void projectNotes::alignmentChanged( int _a ) { if ( _a & Qt::AlignLeft ) { - m_actionAlignLeft->setChecked( TRUE ); + m_actionAlignLeft->setChecked( true ); } else if ( ( _a & Qt::AlignHCenter ) ) { - m_actionAlignCenter->setChecked( TRUE ); + m_actionAlignCenter->setChecked( true ); } else if ( ( _a & Qt::AlignRight ) ) { - m_actionAlignRight->setChecked( TRUE ); + m_actionAlignRight->setChecked( true ); } else if ( ( _a & Qt::AlignJustify ) ) { - m_actionAlignJustify->setChecked( TRUE ); + m_actionAlignJustify->setChecked( true ); } engine::getSong()->setModified(); } diff --git a/src/gui/widgets/rubberband.cpp b/src/gui/widgets/rubberband.cpp index 583c44ada8..1c139628d0 100644 --- a/src/gui/widgets/rubberband.cpp +++ b/src/gui/widgets/rubberband.cpp @@ -43,13 +43,13 @@ rubberBand::~rubberBand() -QVector rubberBand::selectedObjects( void ) const +QVector rubberBand::selectedObjects() const { QVector so = selectableObjects(); for( QVector::iterator it = so.begin(); it != so.end(); ) { - if( ( *it )->isSelected() == FALSE ) + if( ( *it )->isSelected() == false ) { so.erase( it ); } @@ -81,7 +81,7 @@ void rubberBand::resizeEvent( QResizeEvent * _re ) -QVector rubberBand::selectableObjects( void ) const +QVector rubberBand::selectableObjects() const { QVector so; if( parentWidget() == NULL ) diff --git a/src/gui/widgets/side_bar_widget.cpp b/src/gui/widgets/side_bar_widget.cpp index fea3491b2b..73ecc1097b 100644 --- a/src/gui/widgets/side_bar_widget.cpp +++ b/src/gui/widgets/side_bar_widget.cpp @@ -62,7 +62,7 @@ void sideBarWidget::paintEvent( QPaintEvent * ) p.fillRect( 0, 0, width(), 27, palette().highlight().color() ); QFont f = p.font(); - f.setBold( TRUE ); + f.setBold( true ); p.setFont( pointSize( f ) ); p.setPen( palette().highlightedText().color() ); diff --git a/src/gui/widgets/tab_bar.cpp b/src/gui/widgets/tab_bar.cpp index d4f9f77613..3739332299 100644 --- a/src/gui/widgets/tab_bar.cpp +++ b/src/gui/widgets/tab_bar.cpp @@ -33,7 +33,7 @@ tabBar::tabBar( QWidget * _parent, QBoxLayout::Direction _dir ) : QWidget( _parent ), m_layout( new QBoxLayout( _dir, this ) ), - m_exclusive( FALSE ) + m_exclusive( false ) { m_layout->setMargin( 8 ); m_layout->setSpacing( 0 ); @@ -119,7 +119,7 @@ void tabBar::removeTab( int _id ) void tabBar::setActiveTab( int _id ) { - setTabState( _id, TRUE ); + setTabState( _id, true ); hideAll( _id ); if( allHidden() ) { @@ -134,12 +134,12 @@ void tabBar::setActiveTab( int _id ) -int tabBar::activeTab( void ) +int tabBar::activeTab() { QMap >::iterator it; for( it = m_tabs.begin(); it != m_tabs.end(); ++it ) { - if( tabState( it.key() ) == TRUE ) + if( tabState( it.key() ) == true ) { return( it.key() ); } @@ -154,7 +154,7 @@ bool tabBar::tabState( int _id ) { if( m_tabs.find( _id ) == m_tabs.end() ) { - return( FALSE ); + return( false ); } return( m_tabs[_id].first->isChecked() ); } @@ -180,7 +180,7 @@ void tabBar::hideAll( int _exception ) { if( it.key() != _exception ) { - setTabState( it.key(), FALSE ); + setTabState( it.key(), false ); } it.value().second->hide(); } @@ -202,7 +202,7 @@ void tabBar::hideAll( int _exception ) void tabBar::tabClicked( int _id ) { - if( m_exclusive == TRUE && activeTab() == -1 ) + if( m_exclusive == true && activeTab() == -1 ) { setActiveTab( _id ); } @@ -212,11 +212,11 @@ void tabBar::tabClicked( int _id ) // disable tabbar-buttons except the one clicked hideAll( _id ); bool now_hidden = allHidden(); - if( all_hidden_before == TRUE && now_hidden == FALSE ) + if( all_hidden_before == true && now_hidden == false ) { emit widgetShown(); } - else if( all_hidden_before == FALSE && now_hidden == TRUE ) + else if( all_hidden_before == false && now_hidden == true ) { emit allWidgetsHidden(); } @@ -226,17 +226,17 @@ void tabBar::tabClicked( int _id ) -bool tabBar::allHidden( void ) +bool tabBar::allHidden() { QMap >::iterator it; for( it = m_tabs.begin(); it != m_tabs.end(); ++it ) { if( !it.value().second->isHidden() ) { - return( FALSE ); + return( false ); } } - return( TRUE ); + return( true ); } diff --git a/src/gui/widgets/text_float.cpp b/src/gui/widgets/text_float.cpp index b65f7cad8a..eede3884f0 100644 --- a/src/gui/widgets/text_float.cpp +++ b/src/gui/widgets/text_float.cpp @@ -33,7 +33,7 @@ -textFloat::textFloat( void ) : +textFloat::textFloat() : QWidget( engine::mainWindow(), Qt::ToolTip ), m_title( "" ), m_text( "" ), @@ -101,7 +101,7 @@ textFloat * textFloat::displayMessage( const QString & _msg, int _timeout, tf->show(); if( _timeout > 0 ) { - tf->setAttribute( Qt::WA_DeleteOnClose, TRUE ); + tf->setAttribute( Qt::WA_DeleteOnClose, true ); QTimer::singleShot( _timeout, tf, SLOT( close() ) ); } return( tf ); @@ -145,14 +145,14 @@ void textFloat::paintEvent( QPaintEvent * _pe ) else { int text_x = 2; - if( m_pixmap.isNull() == FALSE ) + if( m_pixmap.isNull() == false ) { p.drawPixmap( 5, 5, m_pixmap ); text_x += m_pixmap.width() + 8; } p.drawText( text_x, 28, m_text ); QFont f = p.font(); - f.setBold( TRUE ); + f.setBold( true ); p.setFont( f ); p.drawText( text_x, 12, m_title ); } @@ -169,14 +169,14 @@ void textFloat::mousePressEvent( QMouseEvent * ) -void textFloat::updateSize( void ) +void textFloat::updateSize() { QFontMetrics metrics( pointSize<8>( font() ) ); QRect textBound = metrics.boundingRect( m_text ); if( m_title != "" ) { QFont f = pointSize<8>( font() ); - f.setBold( TRUE ); + f.setBold( true ); int title_w = QFontMetrics( f ).boundingRect( m_title ).width(); if( title_w > textBound.width() ) { @@ -184,7 +184,7 @@ void textFloat::updateSize( void ) } textBound.setHeight( textBound.height() * 2 + 14 ); } - if( m_pixmap.isNull() == FALSE ) + if( m_pixmap.isNull() == false ) { textBound.setWidth( textBound.width() + m_pixmap.width() + 10 ); } diff --git a/src/gui/widgets/tool_button.cpp b/src/gui/widgets/tool_button.cpp index 128cf721c1..0939180e96 100644 --- a/src/gui/widgets/tool_button.cpp +++ b/src/gui/widgets/tool_button.cpp @@ -39,7 +39,7 @@ toolButton::toolButton( const QPixmap & _pixmap, const QString & _tooltip, m_colorStandard( s_stdColor ), m_colorHighlighted( s_hlColor ) { - setAutoFillBackground( FALSE ); + setAutoFillBackground( false ); QPalette pal = palette(); pal.setColor( backgroundRole(), m_colorStandard ); pal.setColor( QPalette::Window, m_colorStandard ); @@ -94,7 +94,7 @@ void toolButton::leaveEvent( QEvent * ) void toolButton::toggledBool( bool _on ) { - if( _on == TRUE ) + if( _on == true ) { emit( clicked() ); } diff --git a/src/gui/widgets/track_label_button.cpp b/src/gui/widgets/track_label_button.cpp index 1376e1f375..1d264ebd72 100644 --- a/src/gui/widgets/track_label_button.cpp +++ b/src/gui/widgets/track_label_button.cpp @@ -65,7 +65,7 @@ trackLabelButton::~trackLabelButton() -void trackLabelButton::rename( void ) +void trackLabelButton::rename() { QString txt = m_trackView->getTrack()->name(); renameDialog rename_dlg( txt ); diff --git a/src/gui/widgets/visualization_widget.cpp b/src/gui/widgets/visualization_widget.cpp index e6f3d71ca5..8ad8e9110b 100644 --- a/src/gui/widgets/visualization_widget.cpp +++ b/src/gui/widgets/visualization_widget.cpp @@ -67,7 +67,7 @@ visualizationWidget::~visualizationWidget() -void visualizationWidget::updateAudioBuffer( void ) +void visualizationWidget::updateAudioBuffer() { if( !engine::getSong()->isExporting() ) { diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp index 0b06817ff5..11a933bb21 100644 --- a/src/tracks/bb_track.cpp +++ b/src/tracks/bb_track.cpp @@ -53,7 +53,7 @@ bbTCO::bbTCO( track * _track, unsigned int _color ) : bbTrack::numOfBBTrack( getTrack() ) ); if( t > 0 ) { - saveJournallingState( FALSE ); + saveJournallingState( false ); changeLength( midiTime( t, 0 ) ); restoreJournallingState(); } @@ -177,7 +177,7 @@ void bbTCOView::paintEvent( QPaintEvent * ) { col = QColor( 160, 160, 160 ); } - if( isSelected() == TRUE ) + if( isSelected() == true ) { col = QColor( qMax( col.red() - 128, 0 ), qMax( col.green() - 128, 0 ), 255 ); @@ -221,7 +221,7 @@ void bbTCOView::paintEvent( QPaintEvent * ) -void bbTCOView::openInBBEditor( void ) +void bbTCOView::openInBBEditor() { engine::getBBTrackContainer()->setCurrentBB( bbTrack::numOfBBTrack( m_bbTCO->getTrack() ) ); @@ -232,7 +232,7 @@ void bbTCOView::openInBBEditor( void ) -void bbTCOView::resetName( void ) +void bbTCOView::resetName() { m_bbTCO->setName( m_bbTCO->getTrack()->name() ); } @@ -240,7 +240,7 @@ void bbTCOView::resetName( void ) -void bbTCOView::changeName( void ) +void bbTCOView::changeName() { QString s = m_bbTCO->name(); renameDialog rename_dlg( s ); @@ -251,7 +251,7 @@ void bbTCOView::changeName( void ) -void bbTCOView::changeColor( void ) +void bbTCOView::changeColor() { QColor _new_color = QColorDialog::getColor( m_bbTCO->m_color ); if( !_new_color.isValid() ) @@ -346,7 +346,7 @@ bool bbTrack::play( const midiTime & _start, const fpp_t _frames, { if( isMuted() ) { - return( FALSE ); + return( false ); } if( _tco_num >= 0 ) @@ -362,7 +362,7 @@ bool bbTrack::play( const midiTime & _start, const fpp_t _frames, if( tcos.size() == 0 ) { - return( FALSE ); + return( false ); } midiTime lastPosition; @@ -385,7 +385,7 @@ bool bbTrack::play( const midiTime & _start, const fpp_t _frames, _offset, s_infoMap[this] ) ); } - return( FALSE ); + return( false ); } @@ -542,7 +542,7 @@ bbTrackView::bbTrackView( bbTrack * _bbt, trackContainerView * _tcv ) : setFixedHeight( 32 ); // drag'n'drop with bb-tracks only causes troubles (and makes no sense // too), so disable it - setAcceptDrops( FALSE ); + setAcceptDrops( false ); m_trackLabel = new trackLabelButton( this, getTrackSettingsWidget() ); m_trackLabel->setIcon( embed::getIconPixmap( "bb_track" ) ); @@ -564,7 +564,7 @@ bbTrackView::~bbTrackView() -bool bbTrackView::close( void ) +bool bbTrackView::close() { engine::getBBEditor()->removeBBView( bbTrack::s_infoMap[m_bbTrack] ); return( trackView::close() ); @@ -573,7 +573,7 @@ bool bbTrackView::close( void ) -void bbTrackView::clickedTrackLabel( void ) +void bbTrackView::clickedTrackLabel() { engine::getBBTrackContainer()->setCurrentBB( bbTrack::numOfBBTrack( m_bbTrack ) ); diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp index a4ce567b2d..8110555fbe 100644 --- a/src/tracks/pattern.cpp +++ b/src/tracks/pattern.cpp @@ -112,7 +112,7 @@ pattern::~pattern() -void pattern::init( void ) +void pattern::init() { connect( engine::getSong(), SIGNAL( timeSignatureChanged( int, int ) ), this, SLOT( changeTimeSignature() ) ); @@ -127,7 +127,7 @@ void pattern::init( void ) -midiTime pattern::length( void ) const +midiTime pattern::length() const { if( m_patternType == BeatPattern ) { @@ -152,7 +152,7 @@ midiTime pattern::length( void ) const -midiTime pattern::beatPatternLength( void ) const +midiTime pattern::beatPatternLength() const { tick_t max_length = midiTime::ticksPerTact(); @@ -266,7 +266,7 @@ note * pattern::rearrangeNote( const note * _note_to_proc, -void pattern::rearrangeAllNotes( void ) +void pattern::rearrangeAllNotes() { // sort notes by start time qSort(m_notes.begin(), m_notes.end(), note::lessThan ); @@ -274,7 +274,7 @@ void pattern::rearrangeAllNotes( void ) -void pattern::clearNotes( void ) +void pattern::clearNotes() { engine::getMixer()->lock(); for( NoteVector::Iterator it = m_notes.begin(); it != m_notes.end(); @@ -321,7 +321,7 @@ void pattern::setType( PatternTypes _new_pattern_type ) -void pattern::checkType( void ) +void pattern::checkType() { NoteVector::Iterator it = m_notes.begin(); while( it != m_notes.end() ) @@ -427,7 +427,7 @@ void pattern::loadSettings( const QDomElement & _this ) -void pattern::clear( void ) +void pattern::clear() { clearNotes(); ensureBeatNotes(); @@ -436,7 +436,7 @@ void pattern::clear( void ) -void pattern::freeze( void ) +void pattern::freeze() { if( engine::getSong()->isPlaying() ) { @@ -464,7 +464,7 @@ void pattern::freeze( void ) -void pattern::unfreeze( void ) +void pattern::unfreeze() { if( m_frozenPattern != NULL ) { @@ -477,7 +477,7 @@ void pattern::unfreeze( void ) -void pattern::abortFreeze( void ) +void pattern::abortFreeze() { m_freezeAborted = true; } @@ -531,7 +531,7 @@ trackContentObjectView * pattern::createView( trackView * _tv ) -void pattern::ensureBeatNotes( void ) +void pattern::ensureBeatNotes() { // make sure, that all step-note exist for( int i = 0; i < m_steps; ++i ) @@ -561,7 +561,7 @@ void pattern::ensureBeatNotes( void ) -void pattern::updateBBTrack( void ) +void pattern::updateBBTrack() { if( getTrack()->getTrackContainer() == engine::getBBTrackContainer() ) { @@ -572,7 +572,7 @@ void pattern::updateBBTrack( void ) -bool pattern::empty( void ) +bool pattern::empty() { for( NoteVector::ConstIterator it = m_notes.begin(); it != m_notes.end(); ++it ) @@ -588,7 +588,7 @@ bool pattern::empty( void ) -void pattern::changeTimeSignature( void ) +void pattern::changeTimeSignature() { midiTime last_pos = midiTime::ticksPerTact(); for( NoteVector::ConstIterator cit = m_notes.begin(); @@ -684,7 +684,7 @@ void patternFreezeStatusDialog::closeEvent( QCloseEvent * _ce ) -void patternFreezeStatusDialog::cancelBtnClicked( void ) +void patternFreezeStatusDialog::cancelBtnClicked() { emit( aborted() ); done( -1 ); @@ -693,7 +693,7 @@ void patternFreezeStatusDialog::cancelBtnClicked( void ) -void patternFreezeStatusDialog::updateProgress( void ) +void patternFreezeStatusDialog::updateProgress() { if( m_progress < 0 ) { @@ -734,7 +734,7 @@ patternFreezeThread::~patternFreezeThread() -void patternFreezeThread::run( void ) +void patternFreezeThread::run() { // create and install audio-sample-recorder bool b; @@ -866,7 +866,7 @@ patternView::~patternView() -void patternView::update( void ) +void patternView::update() { m_needsUpdate = true; m_pat->changeLength( m_pat->length() ); @@ -876,7 +876,7 @@ void patternView::update( void ) -void patternView::openInPianoRoll( void ) +void patternView::openInPianoRoll() { engine::getPianoRoll()->setCurrentPattern( m_pat ); engine::getPianoRoll()->parentWidget()->show(); @@ -886,7 +886,7 @@ void patternView::openInPianoRoll( void ) -void patternView::resetName( void ) +void patternView::resetName() { m_pat->setName( m_pat->m_instrumentTrack->name() ); } @@ -894,7 +894,7 @@ void patternView::resetName( void ) -void patternView::changeName( void ) +void patternView::changeName() { QString s = m_pat->name(); renameDialog rename_dlg( s );