diff --git a/include/instrument.h b/include/instrument.h index 3d5f2b6f8..a436f6e38 100644 --- a/include/instrument.h +++ b/include/instrument.h @@ -2,8 +2,8 @@ * instrument.h - declaration of class instrument, which provides a * standard interface for all instrument plugins * - * Copyright (c) 2005-2008 Tobias Doerffel - * + * Copyright (c) 2005-2009 Tobias Doerffel + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -23,7 +23,6 @@ * */ - #ifndef _INSTRUMENT_H #define _INSTRUMENT_H @@ -80,20 +79,20 @@ public: // if no envelope is active - such instruments can re-implement this // method for returning how many frames they at least like to have for // release - virtual f_cnt_t desiredReleaseFrames( void ) const + virtual f_cnt_t desiredReleaseFrames() const { return 0; } // return false if instrument is not bendable - inline virtual bool isBendable( void ) const + inline virtual bool isBendable() const { return true; } // return true if instruments reacts to MIDI events passed to // handleMidiEvent() rather than playNote() & Co - inline virtual bool isMidiBased( void ) const + inline virtual bool isMidiBased() const { return false; } @@ -106,7 +105,7 @@ public: return false; } - virtual QString fullDisplayName( void ) const; + virtual QString fullDisplayName() const; // -------------------------------------------------------------------- // provided functions: @@ -121,7 +120,7 @@ public: protected: - inline instrumentTrack * getInstrumentTrack( void ) const + inline instrumentTrack * getInstrumentTrack() const { return m_instrumentTrack; } @@ -137,5 +136,4 @@ private: } ; - #endif diff --git a/include/midi.h b/include/midi.h index de67654a6..1db19d27d 100644 --- a/include/midi.h +++ b/include/midi.h @@ -2,7 +2,7 @@ * midi.h - constants, structs etc. concerning MIDI * * Copyright (c) 2005-2009 Tobias Doerffel - * + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -22,7 +22,6 @@ * */ - #ifndef _MIDI_H #define _MIDI_H diff --git a/include/sample_buffer.h b/include/sample_buffer.h index c8f6b9d61..a54b8a4a7 100644 --- a/include/sample_buffer.h +++ b/include/sample_buffer.h @@ -2,7 +2,7 @@ * sample_buffer.h - container-class sampleBuffer * * Copyright (c) 2005-2009 Tobias Doerffel - * + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -47,14 +47,14 @@ class EXPORT sampleBuffer : public QObject, public sharedObject Q_OBJECT public: static const char * supportedExts[]; - + QString niceListOfExts() const; - + class EXPORT handleState { public: - handleState( bool _varying_pitch = FALSE ); + handleState( bool _varying_pitch = false ); virtual ~handleState(); @@ -71,16 +71,16 @@ public: // constructor which either loads sample _audio_file or decodes // base64-data out of string sampleBuffer( const QString & _audio_file = QString(), - bool _is_base64_data = FALSE ); + bool _is_base64_data = false ); sampleBuffer( const sampleFrame * _data, const f_cnt_t _frames ); sampleBuffer( const f_cnt_t _frames ); - + virtual ~sampleBuffer(); bool play( sampleFrame * _ab, handleState * _state, const fpp_t _frames, const float _freq, - const bool _looped = FALSE ); + const bool _looped = false ); void visualize( QPainter & _p, const QRect & _dr, const QRect & _clip ); inline void visualize( QPainter & _p, const QRect & _dr ) @@ -88,17 +88,17 @@ public: visualize( _p, _dr, _dr ); } - inline const QString & audioFile( void ) const + inline const QString & audioFile() const { return m_audioFile; } - inline f_cnt_t startFrame( void ) const + inline f_cnt_t startFrame() const { return m_startFrame; } - inline f_cnt_t endFrame( void ) const + inline f_cnt_t endFrame() const { return m_endFrame; } @@ -117,22 +117,22 @@ public: m_varLock.unlock(); } - inline f_cnt_t frames( void ) const + inline f_cnt_t frames() const { return m_frames; } - inline float amplification( void ) const + inline float amplification() const { return m_amplification; } - inline bool reversed( void ) const + inline bool reversed() const { return m_reversed; } - inline float frequency( void ) const + inline float frequency() const { return m_frequency; } @@ -151,12 +151,12 @@ public: m_varLock.unlock(); } - inline const sampleFrame * data( void ) const + inline const sampleFrame * data() const { return m_data; } - QString openAudioFile( void ) const; + QString openAudioFile() const; QString & toBase64( QString & _dst ) const; @@ -175,7 +175,7 @@ public: } void normalizeSampleRate( const sample_rate_t _src_sr, - bool _keep_settings = FALSE ); + bool _keep_settings = false ); inline sample_t userWaveSample( const float _sample ) const { @@ -212,7 +212,7 @@ public slots: private: - void update( bool _keep_settings = FALSE ); + void update( bool _keep_settings = false ); f_cnt_t decodeSampleSF( const char * _f, int_sample_t * & _buf, @@ -227,7 +227,7 @@ private: ch_cnt_t & _channels, sample_rate_t & _sample_rate ); - f_cnt_t decodeSampleMp3( QString & file, int_sample_t * & _buf, + f_cnt_t decodeSampleMp3( QString & file, int_sample_t * & _buf, ch_cnt_t & _channels, sample_rate_t & _samplerate ); QString m_audioFile; @@ -252,7 +252,7 @@ private: signals: - void sampleUpdated( void ); + void sampleUpdated(); } ; diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp index 982e4c8ad..93aeb26bb 100644 --- a/plugins/audio_file_processor/audio_file_processor.cpp +++ b/plugins/audio_file_processor/audio_file_processor.cpp @@ -42,8 +42,6 @@ #include "string_pair_drag.h" #include "mmp.h" - -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" @@ -215,12 +213,13 @@ pluginView * audioFileProcessor::instantiateView( QWidget * _parent ) void audioFileProcessor::setAudioFile( const QString & _audio_file, - bool _rename ) + bool _rename ) { // is current channel-name equal to previous-filename?? - if( _rename && ( getInstrumentTrack()->name() == - QFileInfo( m_sampleBuffer.audioFile() ).fileName() || - m_sampleBuffer.audioFile() == "" ) ) + if( _rename && + ( getInstrumentTrack()->name() == + QFileInfo( m_sampleBuffer.audioFile() ).fileName() || + m_sampleBuffer.audioFile().isEmpty() ) ) { // then set it to new one getInstrumentTrack()->setName( QFileInfo( _audio_file).fileName() ); diff --git a/plugins/bass_booster/bass_booster.cpp b/plugins/bass_booster/bass_booster.cpp index 1d9600618..229f7c590 100644 --- a/plugins/bass_booster/bass_booster.cpp +++ b/plugins/bass_booster/bass_booster.cpp @@ -1,7 +1,7 @@ /* * bass_booster.cpp - bass-booster-effect-plugin * - * Copyright (c) 2006-2008 Tobias Doerffel + * Copyright (c) 2006-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -25,8 +25,6 @@ #include "bass_booster.h" - -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/bit_invader/bit_invader.cpp b/plugins/bit_invader/bit_invader.cpp index 33049bd7d..cc151ffa4 100644 --- a/plugins/bit_invader/bit_invader.cpp +++ b/plugins/bit_invader/bit_invader.cpp @@ -39,7 +39,6 @@ #include "tooltip.h" #include "song.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" extern "C" diff --git a/plugins/flp_import/flp_import.cpp b/plugins/flp_import/flp_import.cpp index 59053813c..d636ae7ff 100644 --- a/plugins/flp_import/flp_import.cpp +++ b/plugins/flp_import/flp_import.cpp @@ -1,10 +1,10 @@ /* * flp_import.cpp - support for importing FLP-files * - * Copyright (c) 2006-2008 Tobias Doerffel + * Copyright (c) 2006-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public * License as published by the Free Software Foundation; either @@ -22,7 +22,6 @@ * */ - #include #include #include @@ -1877,9 +1876,8 @@ p->putValue( jt->pos, value, false ); continue; } effectChain * ec = &engine::getFxMixer()-> - getEffectChannel( it->fxChannel )-> - m_fxChain; - printf("adding %s to %d\n", effName.toAscii().constData(), + getEffectChannel( it->fxChannel )->m_fxChain; + printf("adding %s to %d\n", effName.toUtf8().constData(), it->fxChannel ); for( effectKeyList::iterator jt = effKeys.begin(); jt != effKeys.end(); ++jt ) diff --git a/plugins/kicker/kicker.cpp b/plugins/kicker/kicker.cpp index 031c93ece..30ebe5481 100644 --- a/plugins/kicker/kicker.cpp +++ b/plugins/kicker/kicker.cpp @@ -1,7 +1,7 @@ /* * kicker.cpp - bassdrum-synthesizer * - * Copyright (c) 2006-2008 Tobias Doerffel + * Copyright (c) 2006-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -33,7 +33,6 @@ #include "note_play_handle.h" #include "sweep_oscillator.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/ladspa_browser/ladspa_browser.cpp b/plugins/ladspa_browser/ladspa_browser.cpp index 0ba6993eb..b83d0b03d 100644 --- a/plugins/ladspa_browser/ladspa_browser.cpp +++ b/plugins/ladspa_browser/ladspa_browser.cpp @@ -37,13 +37,10 @@ #include "tab_bar.h" #include "tab_button.h" - -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" - extern "C" { diff --git a/plugins/ladspa_effect/ladspa_effect.cpp b/plugins/ladspa_effect/ladspa_effect.cpp index 3a1ddfe37..4dad658f8 100644 --- a/plugins/ladspa_effect/ladspa_effect.cpp +++ b/plugins/ladspa_effect/ladspa_effect.cpp @@ -38,8 +38,6 @@ #include "automation_pattern.h" #include "controller_connection.h" - -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/lb302/lb302.cpp b/plugins/lb302/lb302.cpp index 693c3261d..57bb80de5 100644 --- a/plugins/lb302/lb302.cpp +++ b/plugins/lb302/lb302.cpp @@ -44,7 +44,6 @@ #include "templates.h" #include "tooltip.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" #include "moc_lb302.cxx" diff --git a/plugins/lb303/lb303.cpp b/plugins/lb303/lb303.cpp index f511974ef..a8f8b0d26 100644 --- a/plugins/lb303/lb303.cpp +++ b/plugins/lb303/lb303.cpp @@ -40,7 +40,6 @@ #include "templates.h" #include "audio_port.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" #include "moc_lb303.cxx" diff --git a/plugins/lv2_browser/lv2_browser.cpp b/plugins/lv2_browser/lv2_browser.cpp index 5fc3b440b..f3d5cb8a0 100644 --- a/plugins/lv2_browser/lv2_browser.cpp +++ b/plugins/lv2_browser/lv2_browser.cpp @@ -37,13 +37,10 @@ #include "tab_bar.h" #include "tab_button.h" - -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" - extern "C" { diff --git a/plugins/organic/organic.cpp b/plugins/organic/organic.cpp index d36ae4042..550afe2ad 100644 --- a/plugins/organic/organic.cpp +++ b/plugins/organic/organic.cpp @@ -39,7 +39,6 @@ #include "templates.h" #include "tooltip.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/papu/papu_instrument.cpp b/plugins/papu/papu_instrument.cpp index 79ba1f9f9..2e77d4d28 100644 --- a/plugins/papu/papu_instrument.cpp +++ b/plugins/papu/papu_instrument.cpp @@ -36,7 +36,6 @@ #include "tooltip.h" #include "graph.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" extern "C" diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp index d2fa522b9..6981155c4 100644 --- a/plugins/patman/patman.cpp +++ b/plugins/patman/patman.cpp @@ -23,7 +23,6 @@ * */ - #include "patman.h" #include @@ -42,7 +41,6 @@ #include "string_pair_drag.h" #include "tooltip.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/peak_controller_effect/peak_controller_effect.cpp b/plugins/peak_controller_effect/peak_controller_effect.cpp index d3312f095..38963a146 100644 --- a/plugins/peak_controller_effect/peak_controller_effect.cpp +++ b/plugins/peak_controller_effect/peak_controller_effect.cpp @@ -1,5 +1,5 @@ /* - * stereo_matrix.cpp - stereo-matrix-effect-plugin + * peak_controller_effect.cpp - PeakController effect plugin * * Copyright (c) 2008 Paul Giblock * @@ -28,8 +28,6 @@ #include "peak_controller.h" #include "peak_controller_effect.h" - -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/peak_controller_effect/peak_controller_effect.h b/plugins/peak_controller_effect/peak_controller_effect.h index 626c0def6..344c86546 100644 --- a/plugins/peak_controller_effect/peak_controller_effect.h +++ b/plugins/peak_controller_effect/peak_controller_effect.h @@ -1,5 +1,5 @@ /* - * stereo_matrix.h - stereo-matrix-effect-plugin + * peak_controller_effect.h - PeakController effect plugin * * Copyright (c) 2008 Paul Giblock * diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index eee6837dc..f7ce20090 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -45,7 +45,6 @@ #include "lcd_spinbox.h" #include "panning.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" #define SF2_PANNING_SUPPORT diff --git a/plugins/sid/sid_instrument.cpp b/plugins/sid/sid_instrument.cpp index 60dd35e24..a9d40bf84 100644 --- a/plugins/sid/sid_instrument.cpp +++ b/plugins/sid/sid_instrument.cpp @@ -40,7 +40,6 @@ #include "pixmap_button.h" #include "tooltip.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" #define C64_PAL_CYCLES_PER_SEC 985248 diff --git a/plugins/spectrum_analyzer/spectrum_analyzer.cpp b/plugins/spectrum_analyzer/spectrum_analyzer.cpp index 110e10805..39aedb144 100644 --- a/plugins/spectrum_analyzer/spectrum_analyzer.cpp +++ b/plugins/spectrum_analyzer/spectrum_analyzer.cpp @@ -1,7 +1,7 @@ /* * spectrum_analyzer.cpp - spectrum analyzer plugin * - * Copyright (c) 2008 Tobias Doerffel + * Copyright (c) 2008-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -22,11 +22,8 @@ * */ - #include "spectrum_analyzer.h" - -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/stereo_enhancer/stereo_enhancer.cpp b/plugins/stereo_enhancer/stereo_enhancer.cpp index 5827394bf..99bb8ee13 100644 --- a/plugins/stereo_enhancer/stereo_enhancer.cpp +++ b/plugins/stereo_enhancer/stereo_enhancer.cpp @@ -1,7 +1,7 @@ /* * stereo_enhancer.cpp - stereo-enhancer-effect-plugin * - * Copyright (c) 2006-2008 Tobias Doerffel + * Copyright (c) 2006-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -25,8 +25,6 @@ #include "stereo_enhancer.h" - -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/stereo_matrix/stereo_matrix.cpp b/plugins/stereo_matrix/stereo_matrix.cpp index 950b57b5b..6db7b1113 100644 --- a/plugins/stereo_matrix/stereo_matrix.cpp +++ b/plugins/stereo_matrix/stereo_matrix.cpp @@ -25,8 +25,6 @@ #include "stereo_matrix.h" - -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp index ecf59d15e..476111de5 100644 --- a/plugins/stk/mallets/mallets.cpp +++ b/plugins/stk/mallets/mallets.cpp @@ -22,7 +22,6 @@ * */ - #include "mallets.h" #include @@ -36,7 +35,6 @@ #include "gui_templates.h" #include "instrument_track.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/triple_oscillator/triple_oscillator.cpp b/plugins/triple_oscillator/triple_oscillator.cpp index 504ac80ef..b2e6ab423 100644 --- a/plugins/triple_oscillator/triple_oscillator.cpp +++ b/plugins/triple_oscillator/triple_oscillator.cpp @@ -40,8 +40,6 @@ #include "song_editor.h" #include "tooltip.h" - -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index 51633f307..44433529e 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -22,7 +22,6 @@ * */ - #include "vestige.h" #include @@ -43,7 +42,6 @@ #include "text_float.h" #include "tooltip.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp index ae06e8148..5d4e17bd6 100644 --- a/plugins/vibed/vibed.cpp +++ b/plugins/vibed/vibed.cpp @@ -22,7 +22,6 @@ * */ - #include #include #include @@ -40,7 +39,6 @@ #include "volume.h" #include "song.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/vst_base/vst_plugin.cpp b/plugins/vst_base/vst_plugin.cpp index 8f6831fad..2e6df51d8 100644 --- a/plugins/vst_base/vst_plugin.cpp +++ b/plugins/vst_base/vst_plugin.cpp @@ -245,7 +245,7 @@ void vstPlugin::loadSettings( const QDomElement & _this ) if( _this.hasAttribute( "chunk" ) ) { loadChunk( QByteArray::fromBase64( - _this.attribute( "chunk" ).toAscii() ) ); + _this.attribute( "chunk" ).toUtf8() ) ); } else if( num_params > 0 ) { diff --git a/plugins/vst_effect/vst_effect.cpp b/plugins/vst_effect/vst_effect.cpp index 94cfe74ef..637c5ea1b 100644 --- a/plugins/vst_effect/vst_effect.cpp +++ b/plugins/vst_effect/vst_effect.cpp @@ -1,7 +1,7 @@ /* * vst_effect.cpp - class for handling VST effect plugins * - * Copyright (c) 2006-2008 Tobias Doerffel + * Copyright (c) 2006-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -22,7 +22,6 @@ * */ - #include "vst_effect.h" #include @@ -31,8 +30,6 @@ #include "text_float.h" #include "vst_subplugin_features.h" - -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" diff --git a/plugins/zynaddsubfx/zynaddsubfx.cpp b/plugins/zynaddsubfx/zynaddsubfx.cpp index aeecdd09c..ad3cc7474 100644 --- a/plugins/zynaddsubfx/zynaddsubfx.cpp +++ b/plugins/zynaddsubfx/zynaddsubfx.cpp @@ -41,7 +41,6 @@ #include "string_pair_drag.h" #include "remote_zynaddsubfx.h" -#undef SINGLE_SOURCE_COMPILE #include "embed.cpp" #include "moc_zynaddsubfx.cxx" diff --git a/src/core/LocalResourceProvider.cpp b/src/core/LocalResourceProvider.cpp index 427bf871c..0f27dff39 100644 --- a/src/core/LocalResourceProvider.cpp +++ b/src/core/LocalResourceProvider.cpp @@ -165,7 +165,7 @@ void LocalResourceProvider::readDir( const QString & _dir, ResourceTreeItem * curParent = _parent->findChild( d.dirName() + QDir::separator(), m_baseDir ); -printf("read dir: %s\n", d.canonicalPath().toAscii().constData() ); +printf("read dir: %s\n", d.canonicalPath().toUtf8().constData() ); if( curParent ) { parentItem = curParent->item(); diff --git a/src/core/audio/audio_file_device.cpp b/src/core/audio/audio_file_device.cpp index 1e18817cc..2102b5513 100644 --- a/src/core/audio/audio_file_device.cpp +++ b/src/core/audio/audio_file_device.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * audio_file_device.cpp - base-class for audio-device-classes which write * their output into a file @@ -90,4 +88,3 @@ Sint32 audioFileDevice::writeData( const void * _data, Sint32 _len ) -#endif diff --git a/src/core/audio/audio_file_ogg.cpp b/src/core/audio/audio_file_ogg.cpp index 157def365..542242f7e 100644 --- a/src/core/audio/audio_file_ogg.cpp +++ b/src/core/audio/audio_file_ogg.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * audio_file_ogg.cpp - audio-device which encodes wave-stream and writes it * into an OGG-file. This is used for song-export. @@ -270,4 +268,3 @@ void audioFileOgg::finishEncoding( void ) #endif -#endif diff --git a/src/core/audio/audio_portaudio.cpp b/src/core/audio/audio_portaudio.cpp index fe2b13437..0079e4185 100644 --- a/src/core/audio/audio_portaudio.cpp +++ b/src/core/audio/audio_portaudio.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * audio_portaudio.cpp - device-class that performs PCM-output via PortAudio * @@ -538,4 +536,3 @@ void audioPortAudio::setupWidget::saveSettings( void ) #include "moc_audio_portaudio.cxx" -#endif diff --git a/src/core/audio/audio_sample_recorder.cpp b/src/core/audio/audio_sample_recorder.cpp index 08296517d..0faa32556 100644 --- a/src/core/audio/audio_sample_recorder.cpp +++ b/src/core/audio/audio_sample_recorder.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * audio_sample_recorder.cpp - device-class that implements recording * surround-audio-buffers into RAM, maybe later @@ -116,4 +114,3 @@ void audioSampleRecorder::writeBuffer( const surroundSampleFrame * _ab, -#endif diff --git a/src/core/base64.cpp b/src/core/base64.cpp index 5df45ea5e..973a2c498 100644 --- a/src/core/base64.cpp +++ b/src/core/base64.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * base64.cpp - namespace base64 with methods for encoding/decoding binary data * to/from base64 @@ -76,4 +74,3 @@ QVariant decode( const QString & _b64, QVariant::Type _force_type ) } ; -#endif diff --git a/src/core/clipboard.cpp b/src/core/clipboard.cpp index b404f99d2..c2130a11e 100644 --- a/src/core/clipboard.cpp +++ b/src/core/clipboard.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * clipboard.cpp - the clipboard for patterns, notes etc. * @@ -59,4 +57,3 @@ const QDomElement * clipboard::getContent( const QString & _node_name ) -#endif diff --git a/src/core/controller.cpp b/src/core/controller.cpp index f3e8c582e..335c0b0c4 100644 --- a/src/core/controller.cpp +++ b/src/core/controller.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * controller.cpp - implementation of class controller which handles * remote-control of automatableModels @@ -259,4 +257,3 @@ controllerDialog * controller::createDialog( QWidget * _parent ) #include "moc_controller.cxx" -#endif diff --git a/src/core/controller_connection.cpp b/src/core/controller_connection.cpp index 3a0683157..1bf64e2f7 100644 --- a/src/core/controller_connection.cpp +++ b/src/core/controller_connection.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * controller_connection.cpp - implementation of class controller connection * which handles the link between automatableModels and controllers @@ -228,4 +226,3 @@ controllerDialog * controller::createDialog( QWidget * _parent ) #include "moc_controller_connection.cxx" -#endif diff --git a/src/core/effect.cpp b/src/core/effect.cpp index bb0cd321c..e3aa634ba 100644 --- a/src/core/effect.cpp +++ b/src/core/effect.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * effect.cpp - base-class for effects * @@ -206,4 +204,3 @@ void effect::resample( int _i, const sampleFrame * _src_buf, } -#endif diff --git a/src/core/effect_chain.cpp b/src/core/effect_chain.cpp index 6211ec766..b1951bef6 100644 --- a/src/core/effect_chain.cpp +++ b/src/core/effect_chain.cpp @@ -2,7 +2,7 @@ * effect_chain.cpp - class for processing and effects chain * * Copyright (c) 2006-2008 Danny McRae - * Copyright (c) 2008 Tobias Doerffel + * Copyright (c) 2008-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -201,7 +201,7 @@ bool effectChain::processAudioBuffer( sampleFrame * _buf, const fpp_t _frames ) it = m_effects.end()-1; printf( "numerical overflow after processing " "plugin \"%s\"\n", ( *it )-> - publicName().toAscii().constData() ); + publicName().toUtf8().constData() ); break; } } diff --git a/src/core/envelope_and_lfo_parameters.cpp b/src/core/envelope_and_lfo_parameters.cpp index b487cef9e..850c10aa4 100644 --- a/src/core/envelope_and_lfo_parameters.cpp +++ b/src/core/envelope_and_lfo_parameters.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * envelope_and_lfo_parameters.cpp - class envelopeAndLFOParameters * @@ -499,4 +497,3 @@ void envelopeAndLFOParameters::updateSampleVars( void ) #include "moc_envelope_and_lfo_parameters.cxx" -#endif diff --git a/src/core/import_filter.cpp b/src/core/import_filter.cpp index 640b26e4d..17535845e 100644 --- a/src/core/import_filter.cpp +++ b/src/core/import_filter.cpp @@ -1,9 +1,7 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * import_filter.cpp - base-class for all import-filters (MIDI, FLP etc) * - * Copyright (c) 2006-2008 Tobias Doerffel + * Copyright (c) 2006-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -59,7 +57,7 @@ void importFilter::import( const QString & _file_to_import, bool successful = FALSE; - char * s = qstrdup( _file_to_import.toAscii().constData() ); + char * s = qstrdup( _file_to_import.toUtf8().constData() ); // do not record changes while importing files const bool j = engine::getProjectJournal()->isJournalling(); @@ -127,5 +125,3 @@ bool importFilter::openFile( void ) - -#endif diff --git a/src/core/instrument.cpp b/src/core/instrument.cpp index 80200f757..56a4d69ef 100644 --- a/src/core/instrument.cpp +++ b/src/core/instrument.cpp @@ -120,7 +120,7 @@ void instrument::applyRelease( sampleFrame * buf, const notePlayHandle * _n ) -QString instrument::fullDisplayName( void ) const +QString instrument::fullDisplayName() const { return getInstrumentTrack()->displayName(); } diff --git a/src/core/instrument_sound_shaping.cpp b/src/core/instrument_sound_shaping.cpp index 3a65d751e..fcaaf1de1 100644 --- a/src/core/instrument_sound_shaping.cpp +++ b/src/core/instrument_sound_shaping.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * instrument_sound_shaping.cpp - class instrumentSoundShaping * @@ -423,4 +421,3 @@ void instrumentSoundShaping::loadSettings( const QDomElement & _this ) #include "moc_instrument_sound_shaping.cxx" -#endif diff --git a/src/core/journalling_object.cpp b/src/core/journalling_object.cpp index 29a8e5920..0241b2c0c 100644 --- a/src/core/journalling_object.cpp +++ b/src/core/journalling_object.cpp @@ -1,9 +1,7 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * journalling_object.cpp - implementation of journalling-object related stuff * - * Copyright (c) 2006-2008 Tobias Doerffel + * Copyright (c) 2006-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -37,11 +35,11 @@ -journallingObject::journallingObject( void ) : +journallingObject::journallingObject() : m_id( engine::getProjectJournal()->allocID( this ) ), m_journalEntries(), m_currentJournalEntry( m_journalEntries.end() ), - m_journalling( TRUE ), + m_journalling( true ), m_journallingStateStack() { } @@ -60,9 +58,9 @@ journallingObject::~journallingObject() -void journallingObject::undo( void ) +void journallingObject::undo() { - if( m_journalEntries.empty() == TRUE ) + if( m_journalEntries.empty() == true ) { return; } @@ -76,9 +74,9 @@ void journallingObject::undo( void ) -void journallingObject::redo( void ) +void journallingObject::redo() { - if( m_journalEntries.empty() == TRUE ) + if( m_journalEntries.empty() == true ) { return; } @@ -97,7 +95,7 @@ QDomElement journallingObject::saveState( QDomDocument & _doc, { QDomElement _this = serializingObject::saveState( _doc, _parent ); saveJournal( _doc, _this ); - return( _this ); + return _this; } @@ -107,7 +105,7 @@ void journallingObject::restoreState( const QDomElement & _this ) { serializingObject::restoreState( _this ); - saveJournallingState( FALSE ); + saveJournallingState( false ); // search for journal-node QDomNode node = _this.firstChild(); @@ -118,7 +116,7 @@ void journallingObject::restoreState( const QDomElement & _this ) loadJournal( node.toElement() ); } node = node.nextSibling(); - } + } restoreJournallingState(); } @@ -158,7 +156,7 @@ void journallingObject::changeID( jo_id_t _id ) displayName(); } fprintf( stderr, "JO-ID %d already in use by %s!\n", - (int) _id, used_by.toAscii().constData() ); + (int) _id, used_by.toUtf8().constData() ); return; } engine::getProjectJournal()->forgetAboutID( id() ); @@ -183,7 +181,7 @@ void journallingObject::saveJournal( QDomDocument & _doc, journal_de.setAttribute( "entries", m_journalEntries.size() ); journal_de.setAttribute( "curentry", (int)( m_currentJournalEntry - m_journalEntries.begin() ) ); - journal_de.setAttribute( "metadata", TRUE ); + journal_de.setAttribute( "metadata", true ); for( journalEntryVector::const_iterator it = m_journalEntries.begin(); it != m_journalEntries.end(); ++it ) @@ -236,5 +234,3 @@ void journallingObject::loadJournal( const QDomElement & _this ) } - -#endif diff --git a/src/core/lfo_controller.cpp b/src/core/lfo_controller.cpp index 94b9901a2..8c3184046 100644 --- a/src/core/lfo_controller.cpp +++ b/src/core/lfo_controller.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * lfo_controller.cpp - implementation of class controller which handles * remote-control of automatableModels @@ -250,5 +248,3 @@ controllerDialog * lfoController::createDialog( QWidget * _parent ) #include "moc_lfo_controller.cxx" -#endif - diff --git a/src/core/main.cpp b/src/core/main.cpp index 7bded2737..bbc01cdd1 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * main.cpp - just main.cpp which is starting up app... * @@ -196,7 +194,7 @@ int main( int argc, char * * argv ) QFile f( argv[i + 1] ); f.open( QIODevice::ReadOnly ); QString d = qUncompress( f.readAll() ); - printf( "%s\n", d.toAscii().constData() ); + printf( "%s\n", d.toUtf8().constData() ); return( 0 ); } else if( argc > i && ( QString( argv[i] ) == "--render" || @@ -521,6 +519,4 @@ int main( int argc, char * * argv ) } -#endif - /* vim: set tw=0 noexpandtab: */ diff --git a/src/core/midi/midi_alsa_raw.cpp b/src/core/midi/midi_alsa_raw.cpp index e5d286367..a344c8ebf 100644 --- a/src/core/midi/midi_alsa_raw.cpp +++ b/src/core/midi/midi_alsa_raw.cpp @@ -1,10 +1,8 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * midi_alsa_raw.cpp - midi-client for RawMIDI via ALSA * - * Copyright (c) 2005-2008 Tobias Doerffel - * + * Copyright (c) 2005-2009 Tobias Doerffel + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -24,11 +22,9 @@ * */ - #include #include - #include "midi_alsa_raw.h" #include "config_mgr.h" #include "gui_templates.h" @@ -210,5 +206,3 @@ void midiALSARaw::setupWidget::saveSettings( void ) #endif -#endif - diff --git a/src/core/midi/midi_alsa_seq.cpp b/src/core/midi/midi_alsa_seq.cpp index d8090cf9f..550149670 100644 --- a/src/core/midi/midi_alsa_seq.cpp +++ b/src/core/midi/midi_alsa_seq.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * midi_alsa_seq.cpp - ALSA-sequencer-client * @@ -655,4 +653,3 @@ void midiALSASeq::setupWidget::saveSettings( void ) #endif -#endif diff --git a/src/core/midi/midi_client.cpp b/src/core/midi/midi_client.cpp index e74f0fc4b..0b7175cf0 100644 --- a/src/core/midi/midi_client.cpp +++ b/src/core/midi/midi_client.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * midi_client.cpp - base-class for MIDI-clients like ALSA-sequencer-client * @@ -338,4 +336,3 @@ Uint8 midiClientRaw::eventLength( const Uint8 _event ) } -#endif diff --git a/src/core/midi/midi_oss.cpp b/src/core/midi/midi_oss.cpp index 6e0b8b461..3f5c7afc3 100644 --- a/src/core/midi/midi_oss.cpp +++ b/src/core/midi/midi_oss.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * midi_oss.cpp - OSS-raw-midi-client * @@ -148,4 +146,3 @@ void midiOSS::setupWidget::saveSettings( void ) #endif -#endif diff --git a/src/core/mmp.cpp b/src/core/mmp.cpp index 4013cffec..541ba4d24 100644 --- a/src/core/mmp.cpp +++ b/src/core/mmp.cpp @@ -193,7 +193,7 @@ bool multimediaProject::writeFile( const QString & _fn ) QString xml = "\n" + toString( 2 ); if( fn.section( '.', -1 ) == "mmpz" ) { - outfile.write( qCompress( xml.toAscii() ) ); + outfile.write( qCompress( xml.toUtf8() ) ); } else { @@ -670,7 +670,7 @@ void multimediaProject::upgrade( void ) { m_head.setAttribute( "mastervol", 100 ); } -//printf("%s\n", toString( 2 ).toAscii().constData()); +//printf("%s\n", toString( 2 ).toUtf8().constData()); } diff --git a/src/core/note.cpp b/src/core/note.cpp index cf3c6530a..5bf1b8320 100644 --- a/src/core/note.cpp +++ b/src/core/note.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * note.cpp - implementation of class note * @@ -235,7 +233,7 @@ void note::loadSettings( const QDomElement & _this ) break; case ChangePanning: - setVolume( getPanning() - _je.data().toInt() ); + setPanning( getPanning() - _je.data().toInt() ); break; case ChangeLength: @@ -287,4 +285,3 @@ bool note::hasDetuningInfo( void ) const -#endif diff --git a/src/core/oscillator.cpp b/src/core/oscillator.cpp index 91d84a57a..e3253c569 100644 --- a/src/core/oscillator.cpp +++ b/src/core/oscillator.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * oscillator.cpp - implementation of powerful oscillator-class * @@ -552,4 +550,3 @@ inline sample_t oscillator::getSample( -#endif diff --git a/src/core/peak_controller.cpp b/src/core/peak_controller.cpp index 11eaa6e97..ed14e65ff 100644 --- a/src/core/peak_controller.cpp +++ b/src/core/peak_controller.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * lfo_controller.cpp - implementation of class controller which handles * remote-control of automatableModels @@ -134,6 +132,3 @@ controllerDialog * peakController::createDialog( QWidget * _parent ) #include "moc_peak_controller.cxx" - -#endif - diff --git a/src/core/plugin.cpp b/src/core/plugin.cpp index 07964b3d7..7932310aa 100644 --- a/src/core/plugin.cpp +++ b/src/core/plugin.cpp @@ -164,13 +164,13 @@ void plugin::getDescriptorsOfAvailPlugins( QVector & _plugin_descs ) } descriptor * plugin_desc = (descriptor *) plugin_lib.resolve( - desc_name.toAscii().constData() ); + desc_name.toUtf8().constData() ); if( plugin_desc == NULL ) { printf( "LMMS-plugin %s does not have a " "plugin-descriptor named %s!\n", - f.absoluteFilePath().toAscii().constData(), - desc_name.toAscii().constData() ); + f.absoluteFilePath().toUtf8().constData(), + desc_name.toUtf8().constData() ); continue; } _plugin_descs.push_back( *plugin_desc ); diff --git a/src/core/project_journal.cpp b/src/core/project_journal.cpp index 0bf0a6c0f..951b51a74 100644 --- a/src/core/project_journal.cpp +++ b/src/core/project_journal.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * project_journal.cpp - implementation of project-journal * @@ -171,4 +169,3 @@ void projectJournal::clearJournal( void ) -#endif diff --git a/src/core/project_version.cpp b/src/core/project_version.cpp index 525af341a..f746ce6b6 100644 --- a/src/core/project_version.cpp +++ b/src/core/project_version.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * project_version.cpp - compare versions in import upgrades * @@ -81,4 +79,3 @@ int projectVersion::compare( const projectVersion & _v1, -#endif diff --git a/src/core/sample_buffer.cpp b/src/core/sample_buffer.cpp index 7f935a543..100c431d3 100644 --- a/src/core/sample_buffer.cpp +++ b/src/core/sample_buffer.cpp @@ -1,10 +1,8 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * sample_buffer.cpp - container-class sampleBuffer * * Copyright (c) 2005-2009 Tobias Doerffel - * + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -66,19 +64,19 @@ #include "lame_library.h" -const char * sampleBuffer::supportedExts[] = { - "wav", - "ogg", - "ds", - "spx", - "au", - "voc", - "aif", +const char * sampleBuffer::supportedExts[] = { + "wav", + "ogg", + "ds", + "spx", + "au", + "voc", + "aif", "aiff", - "flac", - "raw", + "flac", + "raw", "mp3", - NULL + NULL }; sampleBuffer::sampleBuffer( const QString & _audio_file, @@ -194,10 +192,10 @@ void sampleBuffer::update( bool _keep_settings ) m_loopEndFrame = m_endFrame = m_frames; } } - else if( m_audioFile != "" ) + else if( !m_audioFile.isEmpty() ) { QString file = tryToMakeAbsolute( m_audioFile ); - char * f = qstrdup( file.toAscii().constData() ); + char * f = qstrdup( file.toUtf8().constData() ); int_sample_t * buf = NULL; ch_cnt_t channels = DEFAULT_CHANNELS; sample_rate_t samplerate = engine::getMixer()->baseSampleRate(); @@ -215,12 +213,12 @@ void sampleBuffer::update( bool _keep_settings ) m_frames = decodeSampleSF( f, buf, channels, samplerate ); #ifdef LMMS_HAVE_OGGVORBIS if( m_frames == 0 ) - m_frames = decodeSampleOGGVorbis(f, buf, channels, samplerate); + m_frames = decodeSampleOGGVorbis( f, buf, channels, samplerate ); #endif if( m_frames == 0 ) m_frames = decodeSampleDS( f, buf, channels, samplerate ); - // MP3 + // MP3 if( m_frames == 0 ) m_frames = decodeSampleMp3( file, buf, channels, samplerate ); @@ -311,20 +309,24 @@ void sampleBuffer::update( bool _keep_settings ) } + + QString sampleBuffer::niceListOfExts() const { - QString ret = ""; + QString ret; for( const char * * i = supportedExts; *i; ++i ) { - ret.append(*i); + ret.append( *i ); if( *(i+1) ) - ret.append(", "); + ret.append( ", " ); } - + return ret; } + + void sampleBuffer::normalizeSampleRate( const sample_rate_t _src_sr, bool _keep_settings ) { @@ -530,7 +532,7 @@ f_cnt_t sampleBuffer::decodeSampleOGGVorbis( const char * _f, #endif -int lame_decode_fromfile(QFile &in, short pcm_l[], short pcm_r[], +int lame_decode_fromfile(QFile &in, short pcm_l[], short pcm_r[], mp3data_struct * mp3data, LameLibrary &lame) { int ret = 0; @@ -574,12 +576,12 @@ f_cnt_t sampleBuffer::decodeSampleMp3( QString & file, int_sample_t * & _buf, { // create instance of LameLibrary to decode LameLibrary lame; - + // open the file QFile in(file); if( ! in.open(QIODevice::ReadOnly) ){ - printf("sampleBuffer::decodeSampleMp3: error opening %s for reading\n", + printf("sampleBuffer::decodeSampleMp3: error opening %s for reading\n", file.toStdString().c_str()); return 0; } @@ -599,7 +601,7 @@ f_cnt_t sampleBuffer::decodeSampleMp3( QString & file, int_sample_t * & _buf, while(1) { int ret = lame_decode_fromfile(in, pcm_l, pcm_r, &mp3data, lame); - + if( ret == -1 ){ delete[] _buf; printf("error decoding mp3\n"); @@ -620,11 +622,11 @@ f_cnt_t sampleBuffer::decodeSampleMp3( QString & file, int_sample_t * & _buf, // process header _samplerate = mp3data.samplerate; _channels = mp3data.stereo; - _buf = new int_sample_t[mp3data.totalframes * + _buf = new int_sample_t[mp3data.totalframes * mp3data.framesize * _channels]; initBuf = true; } - } + } // convert the decoded PCM into sample for(int i = 0; i( _client_data )->write_buffer->write( (const char *) sframe, sizeof( sframe ) ); - } + } return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE; } @@ -1220,14 +1222,14 @@ void sampleBuffer::loadFromBase64( const QString & _data ) orig_data = ba_writer.buffer(); printf("%d\n", (int) orig_data.size() ); - m_origFrames = orig_data.size() / sizeof( sampleFrame ); + m_origFrames = orig_data.size() / sizeof( sampleFrame ); delete[] m_origData; m_origData = new sampleFrame[m_origFrames]; memcpy( m_origData, orig_data.data(), orig_data.size() ); #else /* LMMS_HAVE_FLAC_STREAM_DECODER_H */ - m_origFrames = dsize / sizeof( sampleFrame ); + m_origFrames = dsize / sizeof( sampleFrame ); delete[] m_origData; m_origData = new sampleFrame[m_origFrames]; memcpy( m_origData, dst, dsize ); @@ -1236,7 +1238,7 @@ void sampleBuffer::loadFromBase64( const QString & _data ) delete[] dst; - m_audioFile = ""; + m_audioFile = QString(); update(); } @@ -1357,6 +1359,4 @@ sampleBuffer::handleState::~handleState() #include "moc_sample_buffer.cxx" -#endif - /* vim: set tw=0 noexpandtab: */ diff --git a/src/core/sample_play_handle.cpp b/src/core/sample_play_handle.cpp index 45ff07fa1..fa576cee8 100644 --- a/src/core/sample_play_handle.cpp +++ b/src/core/sample_play_handle.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * sample_play_handle.cpp - implementation of class samplePlayHandle * @@ -169,4 +167,3 @@ f_cnt_t samplePlayHandle::totalFrames( void ) const -#endif diff --git a/src/core/sample_record_handle.cpp b/src/core/sample_record_handle.cpp index 0cb8114f4..35469b5d2 100644 --- a/src/core/sample_record_handle.cpp +++ b/src/core/sample_record_handle.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * sample_record_handle.cpp - implementation of class sampleRecordHandle * @@ -154,4 +152,3 @@ void sampleRecordHandle::writeBuffer( const sampleFrame * _ab, -#endif diff --git a/src/core/surround_area.cpp b/src/core/surround_area.cpp index d096341cd..cb7fe45b1 100644 --- a/src/core/surround_area.cpp +++ b/src/core/surround_area.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * surround_area.cpp - a widget for setting position of a channel + * calculation of volume for each speaker @@ -285,4 +283,3 @@ automationPattern * surroundAreaModel::automationPatternY( void ) #include "moc_surround_area.cxx" -#endif diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp index 4ed3a14a6..718510e11 100644 --- a/src/core/timeline.cpp +++ b/src/core/timeline.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * timeline.cpp - class timeLine, representing a time-line with position marker * @@ -386,4 +384,3 @@ void timeLine::mouseReleaseEvent( QMouseEvent * _me ) #include "moc_timeline.cxx" -#endif diff --git a/src/core/tool.cpp b/src/core/tool.cpp index 286eb2c86..c7cf082bd 100644 --- a/src/core/tool.cpp +++ b/src/core/tool.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * tool.cpp - base class for all tool plugins (graphs, extensions, etc) * @@ -82,4 +80,3 @@ toolView::toolView( tool * _tool ) : } -#endif diff --git a/src/core/track.cpp b/src/core/track.cpp index 73da385a0..6a9df6f76 100644 --- a/src/core/track.cpp +++ b/src/core/track.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * track.cpp - implementation of classes concerning tracks -> neccessary for * all track-like objects (beat/bassline, sample-track...) @@ -2420,4 +2418,3 @@ void trackView::createTCOView( trackContentObject * _tco ) #include "moc_track.cxx" -#endif diff --git a/src/gui/automation_editor.cpp b/src/gui/automation_editor.cpp index 366cb79dd..e0881b56d 100644 --- a/src/gui/automation_editor.cpp +++ b/src/gui/automation_editor.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * automation_editor.cpp - implementation of automationEditor which is used for * actual setting of dynamic values @@ -2158,4 +2156,3 @@ void automationEditor::update( void ) #include "moc_automation_editor.cxx" -#endif diff --git a/src/gui/controller_connection_dialog.cpp b/src/gui/controller_connection_dialog.cpp index 9ac981dc7..f447a6915 100644 --- a/src/gui/controller_connection_dialog.cpp +++ b/src/gui/controller_connection_dialog.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * controller_connection_dialog.cpp - dialog allowing the user to create and * modify links between controllers and models @@ -433,4 +431,3 @@ void controllerConnectionDialog::enableAutoDetect( QAction * _a ) #include "moc_controller_connection_dialog.cxx" -#endif diff --git a/src/gui/controller_dialog.cpp b/src/gui/controller_dialog.cpp index dcf53e0a4..e2539da0d 100644 --- a/src/gui/controller_dialog.cpp +++ b/src/gui/controller_dialog.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * controller_dialog.cpp - per-controller-specific view for changing a * controller's settings @@ -55,4 +53,3 @@ void controllerDialog::closeEvent( QCloseEvent * _ce ) #include "moc_controller_dialog.cxx" -#endif diff --git a/src/gui/effect_control_dialog.cpp b/src/gui/effect_control_dialog.cpp index 48184514d..2ce9b53f3 100644 --- a/src/gui/effect_control_dialog.cpp +++ b/src/gui/effect_control_dialog.cpp @@ -1,11 +1,9 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * effect_control_dialog.cpp - base-class for effect-dialogs for displaying * and editing control port values * - * Copyright (c) 2006-2008 Tobias Doerffel - * + * Copyright (c) 2006-2009 Tobias Doerffel + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -25,7 +23,6 @@ * */ - #include #include @@ -56,13 +53,10 @@ effectControlDialog::~effectControlDialog() void effectControlDialog::closeEvent( QCloseEvent * _ce ) { _ce->ignore(); - emit( closed() ); + emit closed(); } - #include "moc_effect_control_dialog.cxx" -#endif - diff --git a/src/gui/effect_select_dialog.cpp b/src/gui/effect_select_dialog.cpp index 1ac1f101d..0af07aaf4 100644 --- a/src/gui/effect_select_dialog.cpp +++ b/src/gui/effect_select_dialog.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * effect_select_dialog.cpp - dialog to choose effect plugin * @@ -316,4 +314,3 @@ void effectListWidget::updateSelection( void ) #include "moc_effect_select_dialog.cxx" -#endif diff --git a/src/gui/embed.cpp b/src/gui/embed.cpp index d56f7c3ca..9c7795039 100644 --- a/src/gui/embed.cpp +++ b/src/gui/embed.cpp @@ -1,9 +1,7 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * embed.cpp - misc stuff for using embedded resources (linked into binary) * - * Copyright (c) 2004-2008 Tobias Doerffel + * Copyright (c) 2004-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -81,7 +79,7 @@ QPixmap getIconPixmap( const char * _name, int _w, int _h ) if( p.isNull() ) { const embed::descriptor & e = findEmbeddedData( - name.toAscii().constData() ); + name.toUtf8().constData() ); // found? if( QString( e.name ) == name ) { @@ -113,4 +111,3 @@ QString getText( const char * _name ) } -#endif diff --git a/src/gui/export_project_dialog.cpp b/src/gui/export_project_dialog.cpp index 45af89dc3..be2014d3f 100644 --- a/src/gui/export_project_dialog.cpp +++ b/src/gui/export_project_dialog.cpp @@ -1,10 +1,8 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * export_project_dialog.cpp - implementation of dialog for exporting project * - * Copyright (c) 2004-2008 Tobias Doerffel - * + * Copyright (c) 2004-2009 Tobias Doerffel + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -24,11 +22,9 @@ * */ - #include #include - #include "export_project_dialog.h" #include "engine.h" #include "main_window.h" @@ -47,10 +43,12 @@ exportProjectDialog::exportProjectDialog( const QString & _file_name, QFileInfo( _file_name ).fileName() ) ); // get the extension of the chosen file - QStringList parts = _file_name.split("."); - QString file_ext = ""; + QStringList parts = _file_name.split( '.' ); + QString file_ext; if( parts.size() > 0 ) + { file_ext = parts[parts.size()-1]; + } int cbIndex = 0; for( int i = 0; i < projectRenderer::NumFileFormats; ++i ) @@ -91,7 +89,7 @@ exportProjectDialog::~exportProjectDialog() -void exportProjectDialog::reject( void ) +void exportProjectDialog::reject() { if( m_renderer == NULL ) { @@ -118,7 +116,7 @@ void exportProjectDialog::closeEvent( QCloseEvent * _ce ) -void exportProjectDialog::startBtnClicked( void ) +void exportProjectDialog::startBtnClicked() { projectRenderer::ExportFileFormats ft = projectRenderer::NumFileFormats; @@ -197,7 +195,4 @@ void exportProjectDialog::updateTitleBar( int _prog ) #include "moc_export_project_dialog.cxx" -#endif - - /* vim: set tw=0 noexpandtab: */ diff --git a/src/gui/lfo_controller_dialog.cpp b/src/gui/lfo_controller_dialog.cpp index cb626fe3c..6c7bec21f 100644 --- a/src/gui/lfo_controller_dialog.cpp +++ b/src/gui/lfo_controller_dialog.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * lfo_controller_dialog.cpp - per-controller-specific view for changing a * controller's settings @@ -313,4 +311,3 @@ void lfoControllerDialog::modelChanged( void ) } -#endif diff --git a/src/gui/peak_controller_dialog.cpp b/src/gui/peak_controller_dialog.cpp index 7872c8d88..df465fb63 100644 --- a/src/gui/peak_controller_dialog.cpp +++ b/src/gui/peak_controller_dialog.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * lfo_controller_dialog.cpp - per-controller-specific view for changing a * controller's settings @@ -110,4 +108,3 @@ void peakControllerDialog::modelChanged( void ) } -#endif diff --git a/src/gui/plugin_browser.cpp b/src/gui/plugin_browser.cpp index a2ccec7af..be7bd41b2 100644 --- a/src/gui/plugin_browser.cpp +++ b/src/gui/plugin_browser.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * plugin_browser.cpp - implementation of the plugin-browser * @@ -225,4 +223,3 @@ void pluginDescWidget::updateHeight( void ) #include "moc_plugin_browser.cxx" -#endif diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp index 6b90b3b6e..e523259fd 100644 --- a/src/gui/song_editor.cpp +++ b/src/gui/song_editor.cpp @@ -1,10 +1,8 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * song_editor.cpp - basic window for song-editing * * Copyright (c) 2004-2009 Tobias Doerffel - * + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -24,7 +22,6 @@ * */ - #include #include #include @@ -495,6 +492,4 @@ bool songEditor::allowRubberband( void ) const #include "moc_song_editor.cxx" -#endif - /* vim: set tw=0 noexpandtab: */ diff --git a/src/gui/string_pair_drag.cpp b/src/gui/string_pair_drag.cpp index 3a2bdfe58..a3ac182e9 100644 --- a/src/gui/string_pair_drag.cpp +++ b/src/gui/string_pair_drag.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * string_pair_drag.cpp - class stringPairDrag which provides general support * for drag'n'drop of string-pairs and which is the base @@ -121,4 +119,3 @@ QString stringPairDrag::decodeValue( QDropEvent * _de ) } -#endif diff --git a/src/gui/widgets/automatable_button.cpp b/src/gui/widgets/automatable_button.cpp index 17bfa15aa..24c669aef 100644 --- a/src/gui/widgets/automatable_button.cpp +++ b/src/gui/widgets/automatable_button.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * automatable_button.cpp - implementation of class automatableButton and * automatableButtonGroup @@ -275,4 +273,3 @@ void automatableButtonGroup::updateButtons( void ) #include "moc_automatable_button.cxx" -#endif diff --git a/src/gui/widgets/automatable_slider.cpp b/src/gui/widgets/automatable_slider.cpp index b8e1f1fe9..3515f6b88 100644 --- a/src/gui/widgets/automatable_slider.cpp +++ b/src/gui/widgets/automatable_slider.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * automatable_slider.cpp - implementation of class automatableSlider * @@ -149,4 +147,3 @@ void automatableSlider::updateSlider( void ) #include "moc_automatable_slider.cxx" -#endif diff --git a/src/gui/widgets/caption_menu.cpp b/src/gui/widgets/caption_menu.cpp index 7cd245bf9..c3bea5eba 100644 --- a/src/gui/widgets/caption_menu.cpp +++ b/src/gui/widgets/caption_menu.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * caption_menu.cpp - context menu with a caption * @@ -50,4 +48,3 @@ captionMenu::~captionMenu() #include "moc_caption_menu.cxx" -#endif diff --git a/src/gui/widgets/combobox.cpp b/src/gui/widgets/combobox.cpp index 46362f496..0e3c97b5c 100644 --- a/src/gui/widgets/combobox.cpp +++ b/src/gui/widgets/combobox.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * combobox.cpp - implementation of LMMS-combobox * @@ -251,4 +249,3 @@ void comboBox::setItem( QAction * _item ) #include "moc_combobox.cxx" -#endif diff --git a/src/gui/widgets/controller_rack_view.cpp b/src/gui/widgets/controller_rack_view.cpp index 6f3b08aeb..e074fbc9a 100644 --- a/src/gui/widgets/controller_rack_view.cpp +++ b/src/gui/widgets/controller_rack_view.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * controller_rack_view.cpp - view for song's controllers * @@ -183,4 +181,3 @@ void controllerRackView::addController( void ) #include "moc_controller_rack_view.cxx" -#endif diff --git a/src/gui/widgets/controller_view.cpp b/src/gui/widgets/controller_view.cpp index 1ab53f36f..e660a3cde 100644 --- a/src/gui/widgets/controller_view.cpp +++ b/src/gui/widgets/controller_view.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * controller_view.cpp - view-component for an controller * @@ -210,4 +208,3 @@ void controllerView::displayHelp( void ) #include "moc_controller_view.cxx" -#endif diff --git a/src/gui/widgets/cpuload_widget.cpp b/src/gui/widgets/cpuload_widget.cpp index ce533b1be..079b2c8e8 100644 --- a/src/gui/widgets/cpuload_widget.cpp +++ b/src/gui/widgets/cpuload_widget.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * cpuload_widget.cpp - widget for displaying CPU-load (partly based on * Hydrogen's CPU-load-widget) @@ -106,4 +104,3 @@ void cpuloadWidget::updateCpuLoad() #include "moc_cpuload_widget.cxx" -#endif diff --git a/src/gui/widgets/effect_rack_view.cpp b/src/gui/widgets/effect_rack_view.cpp index 1a0df38b9..c16c57fdd 100644 --- a/src/gui/widgets/effect_rack_view.cpp +++ b/src/gui/widgets/effect_rack_view.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * effect_rack_view.cpp - view for effectChain-model * @@ -259,4 +257,3 @@ void effectRackView::modelChanged( void ) #include "moc_effect_rack_view.cxx" -#endif diff --git a/src/gui/widgets/envelope_and_lfo_view.cpp b/src/gui/widgets/envelope_and_lfo_view.cpp index 9825aaf41..d9bc4fc08 100644 --- a/src/gui/widgets/envelope_and_lfo_view.cpp +++ b/src/gui/widgets/envelope_and_lfo_view.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * envelope_and_lfo_view.cpp - widget which is m_used by envelope/lfo/filter- * tab of channel-window @@ -584,4 +582,3 @@ void envelopeAndLFOView::lfoUserWaveChanged( void ) #include "moc_envelope_and_lfo_view.cxx" -#endif diff --git a/src/gui/widgets/fade_button.cpp b/src/gui/widgets/fade_button.cpp index 3af7ffe04..287d90c9a 100644 --- a/src/gui/widgets/fade_button.cpp +++ b/src/gui/widgets/fade_button.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * fade_button.cpp - implementation of fade-button * @@ -123,4 +121,3 @@ void fadeButton::signalUpdate( void ) #include "moc_fade_button.cxx" -#endif diff --git a/src/gui/widgets/group_box.cpp b/src/gui/widgets/group_box.cpp index 64df7b0c7..8f6d71802 100644 --- a/src/gui/widgets/group_box.cpp +++ b/src/gui/widgets/group_box.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * group_box.cpp - groupbox for LMMS * @@ -147,4 +145,3 @@ void groupBox::updatePixmap( void ) #include "moc_group_box.cxx" -#endif diff --git a/src/gui/widgets/instrument_function_views.cpp b/src/gui/widgets/instrument_function_views.cpp index 64dc1cc4f..3b6530a85 100644 --- a/src/gui/widgets/instrument_function_views.cpp +++ b/src/gui/widgets/instrument_function_views.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * instrument_function_views.cpp - view for instrument-functions-tab * @@ -206,4 +204,3 @@ void arpeggiatorView::modelChanged( void ) #include "moc_instrument_function_views.cxx" -#endif diff --git a/src/gui/widgets/instrument_sound_shaping_view.cpp b/src/gui/widgets/instrument_sound_shaping_view.cpp index 357b3e8a1..479bc3de1 100644 --- a/src/gui/widgets/instrument_sound_shaping_view.cpp +++ b/src/gui/widgets/instrument_sound_shaping_view.cpp @@ -76,7 +76,7 @@ instrumentSoundShapingView::instrumentSoundShapingView( QWidget * _parent ) : m_envLFOViews[i] = new envelopeAndLFOView( m_targetsTabWidget ); m_targetsTabWidget->addTab( m_envLFOViews[i], tr( __targetNames[i][0] - .toAscii().constData() ) ); + .toUtf8().constData() ) ); } diff --git a/src/gui/widgets/kmultitabbar.cpp b/src/gui/widgets/kmultitabbar.cpp index 04c7ad850..750065a1c 100644 --- a/src/gui/widgets/kmultitabbar.cpp +++ b/src/gui/widgets/kmultitabbar.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * kmultitabbar.cpp - widget for horizontal and vertical tabs * @@ -917,4 +915,3 @@ QList* KMultiTabBar::buttons() {return &m_buttons;} -#endif diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp index 44f487867..f2cf31c90 100644 --- a/src/gui/widgets/knob.cpp +++ b/src/gui/widgets/knob.cpp @@ -1,9 +1,7 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * knob.cpp - powerful knob-widget * - * Copyright (c) 2004-2008 Tobias Doerffel + * Copyright (c) 2004-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -81,7 +79,7 @@ knob::knob( int _knob_num, QWidget * _parent, const QString & _name ) : if( m_knobNum != knobStyled ) { m_knobPixmap = new QPixmap( embed::getIconPixmap( QString( "knob0" + - QString::number( m_knobNum + 1 ) ).toAscii().constData() ) ); + QString::number( m_knobNum + 1 ) ).toUtf8().constData() ) ); setFixedSize( m_knobPixmap->width(), m_knobPixmap->height() ); } @@ -692,5 +690,3 @@ void knob::displayHelp( void ) #include "moc_knob.cxx" - -#endif diff --git a/src/gui/widgets/lcd_spinbox.cpp b/src/gui/widgets/lcd_spinbox.cpp index a368c9755..d912ddf1f 100644 --- a/src/gui/widgets/lcd_spinbox.cpp +++ b/src/gui/widgets/lcd_spinbox.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * lcd_spinbox.cpp - class lcdSpinBox, an improved QLCDNumber * @@ -83,7 +81,7 @@ lcdSpinBox::lcdSpinBox( int _num_digits, const QString & _lcd_style, // We should make a factory for these or something. m_lcdPixmap = new QPixmap( embed::getIconPixmap( QString( "lcd_" + - _lcd_style ).toAscii().constData() ) ); + _lcd_style ).toUtf8().constData() ) ); m_cellWidth = m_lcdPixmap->size().width() / lcdSpinBox::charsPerPixmap; m_cellHeight = m_lcdPixmap->size().height() / 2; @@ -341,5 +339,3 @@ void lcdSpinBox::wheelEvent( QWheelEvent * _we ) #include "moc_lcd_spinbox.cxx" - -#endif diff --git a/src/gui/widgets/led_checkbox.cpp b/src/gui/widgets/led_checkbox.cpp index 494e8d9cc..c95e3fc61 100644 --- a/src/gui/widgets/led_checkbox.cpp +++ b/src/gui/widgets/led_checkbox.cpp @@ -1,9 +1,7 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * led_checkbox.cpp - class ledCheckBox, an improved QCheckBox * - * Copyright (c) 2005-2008 Tobias Doerffel + * Copyright (c) 2005-2009 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -52,7 +50,7 @@ ledCheckBox::ledCheckBox( const QString & _text, QWidget * _parent, _color = Yellow; } m_ledOnPixmap = new QPixmap( embed::getIconPixmap( - names[_color].toAscii().constData() ) ); + names[_color].toUtf8().constData() ) ); m_ledOffPixmap = new QPixmap( embed::getIconPixmap( "led_off" ) ); setFont( pointSize<7>( font() ) ); @@ -97,4 +95,3 @@ void ledCheckBox::paintEvent( QPaintEvent * ) #include "moc_led_checkbox.cxx" -#endif diff --git a/src/gui/widgets/nstate_button.cpp b/src/gui/widgets/nstate_button.cpp index de78fbc62..e77c98996 100644 --- a/src/gui/widgets/nstate_button.cpp +++ b/src/gui/widgets/nstate_button.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * nstate_button.cpp - implementation of n-state-button * @@ -105,4 +103,3 @@ void nStateButton::mousePressEvent( QMouseEvent * _me ) #include "moc_nstate_button.cxx" -#endif diff --git a/src/gui/widgets/pixmap_button.cpp b/src/gui/widgets/pixmap_button.cpp index e2f80c09a..1ef8f9b8c 100644 --- a/src/gui/widgets/pixmap_button.cpp +++ b/src/gui/widgets/pixmap_button.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * pixmap_button.cpp - implementation of pixmap-button (often used as "themed" * checkboxes/radiobuttons etc) @@ -138,4 +136,3 @@ void pixmapButton::setInactiveGraphic( const QPixmap & _pm, bool _update ) #include "moc_pixmap_button.cxx" -#endif diff --git a/src/gui/widgets/project_notes.cpp b/src/gui/widgets/project_notes.cpp index cf162580e..724198d35 100644 --- a/src/gui/widgets/project_notes.cpp +++ b/src/gui/widgets/project_notes.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * project_notes.cpp - implementation of project-notes-editor * @@ -399,4 +397,3 @@ void projectNotes::loadSettings( const QDomElement & _this ) #include "moc_project_notes.cxx" -#endif diff --git a/src/gui/widgets/rubberband.cpp b/src/gui/widgets/rubberband.cpp index 991a0ec14..583c44ada 100644 --- a/src/gui/widgets/rubberband.cpp +++ b/src/gui/widgets/rubberband.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * rubberband.cpp - rubberband - either own implementation for Qt3 or wrapper * for Qt4 @@ -107,4 +105,3 @@ QVector rubberBand::selectableObjects( void ) const #include "moc_rubberband.cxx" -#endif diff --git a/src/gui/widgets/tab_bar.cpp b/src/gui/widgets/tab_bar.cpp index f9c656c34..d4f9f7761 100644 --- a/src/gui/widgets/tab_bar.cpp +++ b/src/gui/widgets/tab_bar.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * tab_bar.cpp - implementation of tab-bar * @@ -248,4 +246,3 @@ bool tabBar::allHidden( void ) #include "moc_tab_button.cxx" -#endif diff --git a/src/gui/widgets/tab_widget.cpp b/src/gui/widgets/tab_widget.cpp index bd6f637e4..cbe9ac5d8 100644 --- a/src/gui/widgets/tab_widget.cpp +++ b/src/gui/widgets/tab_widget.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * tab_widget.cpp - tabwidget for LMMS * @@ -234,4 +232,3 @@ void tabWidget::wheelEvent( QWheelEvent * _we ) #include "moc_tab_widget.cxx" -#endif diff --git a/src/gui/widgets/tempo_sync_knob.cpp b/src/gui/widgets/tempo_sync_knob.cpp index f35f2dabe..95719064a 100644 --- a/src/gui/widgets/tempo_sync_knob.cpp +++ b/src/gui/widgets/tempo_sync_knob.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * tempo_sync_knob.cpp - adds bpm to ms conversion for knob class * @@ -491,4 +489,3 @@ void tempoSyncKnob::showCustom( void ) #include "moc_tempo_sync_knob.cxx" -#endif diff --git a/src/gui/widgets/text_float.cpp b/src/gui/widgets/text_float.cpp index 3dfc86232..cf0d6cc8a 100644 --- a/src/gui/widgets/text_float.cpp +++ b/src/gui/widgets/text_float.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * text_float.cpp - class textFloat, a floating text-label * @@ -197,4 +195,3 @@ void textFloat::updateSize( void ) -#endif diff --git a/src/gui/widgets/tool_button.cpp b/src/gui/widgets/tool_button.cpp index 3cf1cf87a..128cf721c 100644 --- a/src/gui/widgets/tool_button.cpp +++ b/src/gui/widgets/tool_button.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * tool_button.cpp - implementation of LMMS-tool-button for common (cool) look * @@ -107,4 +105,3 @@ void toolButton::toggledBool( bool _on ) #include "moc_tool_button.cxx" -#endif diff --git a/src/gui/widgets/tooltip.cpp b/src/gui/widgets/tooltip.cpp index 3c6a183ac..6f0796236 100644 --- a/src/gui/widgets/tooltip.cpp +++ b/src/gui/widgets/tooltip.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * tooltip.cpp - namespace toolTip, a tooltip-wrapper for LMMS * @@ -40,4 +38,3 @@ void toolTip::add( QWidget * _w, const QString & _txt ) } -#endif diff --git a/src/gui/widgets/visualization_widget.cpp b/src/gui/widgets/visualization_widget.cpp index b2783a53c..36aa8ad70 100644 --- a/src/gui/widgets/visualization_widget.cpp +++ b/src/gui/widgets/visualization_widget.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * visualization_widget.cpp - widget for visualization of sound-data * @@ -198,4 +196,3 @@ void visualizationWidget::mousePressEvent( QMouseEvent * _me ) #include "moc_visualization_widget.cxx" -#endif diff --git a/src/tracks/automation_track.cpp b/src/tracks/automation_track.cpp index 233715cdf..c9411b548 100644 --- a/src/tracks/automation_track.cpp +++ b/src/tracks/automation_track.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * automation_track.cpp - automationTrack handles automation of objects without * a track @@ -199,4 +197,3 @@ void automationTrackView::dropEvent( QDropEvent * _de ) -#endif diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp index c05fef43f..efb815de0 100644 --- a/src/tracks/bb_track.cpp +++ b/src/tracks/bb_track.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * bb_track.cpp - implementation of class bbTrack and bbTCO * @@ -596,4 +594,3 @@ void bbTrackView::clickedTrackLabel( void ) #include "moc_bb_track.cxx" -#endif diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp index 561910257..a52c1e8b9 100644 --- a/src/tracks/pattern.cpp +++ b/src/tracks/pattern.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * pattern.cpp - implementation of class pattern which holds notes * @@ -1338,4 +1336,3 @@ void patternView::paintEvent( QPaintEvent * ) #include "moc_pattern.cxx" -#endif diff --git a/src/tracks/sample_track.cpp b/src/tracks/sample_track.cpp index 48466ec6b..b002c783f 100644 --- a/src/tracks/sample_track.cpp +++ b/src/tracks/sample_track.cpp @@ -1,5 +1,3 @@ -#ifndef SINGLE_SOURCE_COMPILE - /* * sample_track.cpp - implementation of class sampleTrack, a track which * provides arrangement of samples @@ -568,4 +566,3 @@ void sampleTrackView::showEffects( void ) #include "moc_sample_track.cxx" -#endif