From 47831c99c539ddc94533a02cc302765147394ee8 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sun, 2 Nov 2014 01:08:27 +0100 Subject: [PATCH] Rename ConfigManager files (2) --- include/BandLimitedWave.h | 2 +- plugins/LadspaEffect/LadspaEffect.cpp | 2 +- plugins/MidiImport/MidiImport.cpp | 2 +- plugins/flp_import/FlpImport.cpp | 2 +- src/core/ConfigManager.cpp | 4 ++-- src/core/DataFile.cpp | 2 +- src/core/Effect.cpp | 2 +- src/core/Mixer.cpp | 2 +- src/core/NotePlayHandle.cpp | 2 +- src/core/Plugin.cpp | 2 +- src/core/RemotePlugin.cpp | 2 +- src/core/SampleBuffer.cpp | 2 +- src/core/VstSyncController.cpp | 2 +- src/core/audio/AudioAlsa.cpp | 2 +- src/core/audio/AudioDevice.cpp | 2 +- src/core/audio/AudioJack.cpp | 2 +- src/core/audio/AudioOss.cpp | 2 +- src/core/audio/AudioPortAudio.cpp | 2 +- src/core/audio/AudioPulseAudio.cpp | 2 +- src/core/audio/AudioSdl.cpp | 2 +- src/core/engine.cpp | 2 +- src/core/ladspa_manager.cpp | 2 +- src/core/main.cpp | 2 +- src/core/midi/MidiAlsaRaw.cpp | 2 +- src/core/midi/MidiAlsaSeq.cpp | 2 +- src/core/midi/MidiOss.cpp | 2 +- src/core/midi/MidiWinMM.cpp | 2 +- src/core/song.cpp | 2 +- src/core/track.cpp | 2 +- src/gui/FileBrowser.cpp | 2 +- src/gui/MainWindow.cpp | 2 +- src/gui/PianoRoll.cpp | 2 +- src/gui/SongEditor.cpp | 3 +-- src/gui/bb_editor.cpp | 2 +- src/gui/dialogs/FileDialog.cpp | 2 +- src/gui/embed.cpp | 2 +- src/gui/setup_dialog.cpp | 2 +- src/gui/widgets/fader.cpp | 2 +- src/gui/widgets/knob.cpp | 2 +- src/gui/widgets/tooltip.cpp | 2 +- src/gui/widgets/track_label_button.cpp | 2 +- src/gui/widgets/visualization_widget.cpp | 2 +- src/tracks/InstrumentTrack.cpp | 2 +- src/tracks/SampleTrack.cpp | 2 +- 44 files changed, 45 insertions(+), 46 deletions(-) diff --git a/include/BandLimitedWave.h b/include/BandLimitedWave.h index ca83b21b6..330cd37fd 100644 --- a/include/BandLimitedWave.h +++ b/include/BandLimitedWave.h @@ -30,7 +30,7 @@ #include #include -#include "config_mgr.h" +#include "ConfigManager.h" #include "export.h" #include "interpolation.h" #include "lmms_basics.h" diff --git a/plugins/LadspaEffect/LadspaEffect.cpp b/plugins/LadspaEffect/LadspaEffect.cpp index c9063e1bf..f70ea7444 100644 --- a/plugins/LadspaEffect/LadspaEffect.cpp +++ b/plugins/LadspaEffect/LadspaEffect.cpp @@ -29,7 +29,7 @@ #include "LadspaEffect.h" #include "DataFile.h" #include "AudioDevice.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "ladspa_2_lmms.h" #include "LadspaControl.h" #include "LadspaSubPluginFeatures.h" diff --git a/plugins/MidiImport/MidiImport.cpp b/plugins/MidiImport/MidiImport.cpp index b2bc12164..2dad0cb82 100644 --- a/plugins/MidiImport/MidiImport.cpp +++ b/plugins/MidiImport/MidiImport.cpp @@ -34,7 +34,7 @@ #include "InstrumentTrack.h" #include "AutomationTrack.h" #include "AutomationPattern.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "Pattern.h" #include "Instrument.h" #include "MainWindow.h" diff --git a/plugins/flp_import/FlpImport.cpp b/plugins/flp_import/FlpImport.cpp index 2884dce4e..95c476944 100644 --- a/plugins/flp_import/FlpImport.cpp +++ b/plugins/flp_import/FlpImport.cpp @@ -36,7 +36,7 @@ #include "bb_track.h" #include "bb_track_container.h" #include "combobox.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "debug.h" #include "Effect.h" #include "engine.h" diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp index ca6cd9ddf..c70cc142a 100644 --- a/src/core/ConfigManager.cpp +++ b/src/core/ConfigManager.cpp @@ -1,5 +1,5 @@ /* - * config_mgr.cpp - implementation of class ConfigManager + * ConfigManager.cpp - implementation of class ConfigManager * * Copyright (c) 2005-2014 Tobias Doerffel * @@ -29,7 +29,7 @@ #include #include "lmmsversion.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "MainWindow.h" diff --git a/src/core/DataFile.cpp b/src/core/DataFile.cpp index 8a3ef79ed..5204b7829 100644 --- a/src/core/DataFile.cpp +++ b/src/core/DataFile.cpp @@ -35,7 +35,7 @@ #include -#include "config_mgr.h" +#include "ConfigManager.h" #include "project_version.h" #include "SongEditor.h" #include "Effect.h" diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp index 40f300444..1717dbd45 100644 --- a/src/core/Effect.cpp +++ b/src/core/Effect.cpp @@ -31,7 +31,7 @@ #include "EffectControls.h" #include "EffectView.h" -#include "config_mgr.h" +#include "ConfigManager.h" Effect::Effect( const Plugin::Descriptor * _desc, diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp index aa98c59ad..4aa9faa5b 100644 --- a/src/core/Mixer.cpp +++ b/src/core/Mixer.cpp @@ -35,7 +35,7 @@ #include "InstrumentTrack.h" #include "debug.h" #include "engine.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "SamplePlayHandle.h" #include "PianoRoll.h" #include "atomic_int.h" diff --git a/src/core/NotePlayHandle.cpp b/src/core/NotePlayHandle.cpp index 63caabdf0..27c858158 100644 --- a/src/core/NotePlayHandle.cpp +++ b/src/core/NotePlayHandle.cpp @@ -25,7 +25,7 @@ #include "NotePlayHandle.h" #include "basic_filters.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "DetuningHelper.h" #include "InstrumentSoundShaping.h" #include "InstrumentTrack.h" diff --git a/src/core/Plugin.cpp b/src/core/Plugin.cpp index e562bde07..f9500586d 100644 --- a/src/core/Plugin.cpp +++ b/src/core/Plugin.cpp @@ -31,7 +31,7 @@ #include "embed.h" #include "engine.h" #include "Mixer.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "DummyPlugin.h" #include "AutomatableModel.h" diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp index c0fada212..a1ed77c42 100644 --- a/src/core/RemotePlugin.cpp +++ b/src/core/RemotePlugin.cpp @@ -31,7 +31,7 @@ #include "RemotePlugin.h" #include "Mixer.h" #include "engine.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include diff --git a/src/core/SampleBuffer.cpp b/src/core/SampleBuffer.cpp index d78817a15..51d268206 100644 --- a/src/core/SampleBuffer.cpp +++ b/src/core/SampleBuffer.cpp @@ -52,7 +52,7 @@ #include "base64.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "debug.h" #include "drumsynth.h" #include "endian_handling.h" diff --git a/src/core/VstSyncController.cpp b/src/core/VstSyncController.cpp index f30c794b3..c98d93e7a 100644 --- a/src/core/VstSyncController.cpp +++ b/src/core/VstSyncController.cpp @@ -25,7 +25,7 @@ #include -#include "config_mgr.h" +#include "ConfigManager.h" #include "engine.h" #include "lmmsconfig.h" #include "Mixer.h" diff --git a/src/core/audio/AudioAlsa.cpp b/src/core/audio/AudioAlsa.cpp index 167527802..0d2ee4b93 100644 --- a/src/core/audio/AudioAlsa.cpp +++ b/src/core/audio/AudioAlsa.cpp @@ -30,7 +30,7 @@ #ifdef LMMS_HAVE_ALSA #include "endian_handling.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "engine.h" #include "LcdSpinBox.h" #include "gui_templates.h" diff --git a/src/core/audio/AudioDevice.cpp b/src/core/audio/AudioDevice.cpp index b3602d7ff..26a790e3e 100644 --- a/src/core/audio/AudioDevice.cpp +++ b/src/core/audio/AudioDevice.cpp @@ -25,7 +25,7 @@ #include #include "AudioDevice.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "debug.h" diff --git a/src/core/audio/AudioJack.cpp b/src/core/audio/AudioJack.cpp index 9ee091ebf..809da7d95 100644 --- a/src/core/audio/AudioJack.cpp +++ b/src/core/audio/AudioJack.cpp @@ -36,7 +36,7 @@ #include "engine.h" #include "templates.h" #include "gui_templates.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "LcdSpinBox.h" #include "AudioPort.h" #include "MainWindow.h" diff --git a/src/core/audio/AudioOss.cpp b/src/core/audio/AudioOss.cpp index b36f45d7b..958983fe3 100644 --- a/src/core/audio/AudioOss.cpp +++ b/src/core/audio/AudioOss.cpp @@ -58,7 +58,7 @@ #endif -#include "config_mgr.h" +#include "ConfigManager.h" #ifndef _PATH_DEV_DSP diff --git a/src/core/audio/AudioPortAudio.cpp b/src/core/audio/AudioPortAudio.cpp index 071285e42..2f6219785 100644 --- a/src/core/audio/AudioPortAudio.cpp +++ b/src/core/audio/AudioPortAudio.cpp @@ -43,7 +43,7 @@ void AudioPortAudioSetupUtil::updateChannels() #include "engine.h" #include "debug.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "gui_templates.h" #include "templates.h" #include "combobox.h" diff --git a/src/core/audio/AudioPulseAudio.cpp b/src/core/audio/AudioPulseAudio.cpp index 9cf0913d5..142c105d6 100644 --- a/src/core/audio/AudioPulseAudio.cpp +++ b/src/core/audio/AudioPulseAudio.cpp @@ -30,7 +30,7 @@ #ifdef LMMS_HAVE_PULSEAUDIO #include "endian_handling.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "LcdSpinBox.h" #include "gui_templates.h" #include "templates.h" diff --git a/src/core/audio/AudioSdl.cpp b/src/core/audio/AudioSdl.cpp index a31ba7acd..2222da372 100644 --- a/src/core/audio/AudioSdl.cpp +++ b/src/core/audio/AudioSdl.cpp @@ -31,7 +31,7 @@ #include "engine.h" #include "debug.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "gui_templates.h" #include "templates.h" diff --git a/src/core/engine.cpp b/src/core/engine.cpp index 08947b585..d7dc0ef87 100644 --- a/src/core/engine.cpp +++ b/src/core/engine.cpp @@ -27,7 +27,7 @@ #include "AutomationEditor.h" #include "bb_editor.h" #include "bb_track_container.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "ControllerRackView.h" #include "FxMixer.h" #include "FxMixerView.h" diff --git a/src/core/ladspa_manager.cpp b/src/core/ladspa_manager.cpp index 0f6a65cbc..40f79162c 100644 --- a/src/core/ladspa_manager.cpp +++ b/src/core/ladspa_manager.cpp @@ -32,7 +32,7 @@ #include -#include "config_mgr.h" +#include "ConfigManager.h" #include "ladspa_manager.h" diff --git a/src/core/main.cpp b/src/core/main.cpp index 5c5e524da..1b4ee81be 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -56,7 +56,7 @@ #include #endif -#include "config_mgr.h" +#include "ConfigManager.h" #include "embed.h" #include "engine.h" #include "LmmsStyle.h" diff --git a/src/core/midi/MidiAlsaRaw.cpp b/src/core/midi/MidiAlsaRaw.cpp index 142ad68dd..82e2457f1 100644 --- a/src/core/midi/MidiAlsaRaw.cpp +++ b/src/core/midi/MidiAlsaRaw.cpp @@ -26,7 +26,7 @@ #include #include "MidiAlsaRaw.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "gui_templates.h" diff --git a/src/core/midi/MidiAlsaSeq.cpp b/src/core/midi/MidiAlsaSeq.cpp index e23458bce..d1cdc1a16 100644 --- a/src/core/midi/MidiAlsaSeq.cpp +++ b/src/core/midi/MidiAlsaSeq.cpp @@ -26,7 +26,7 @@ #include #include "MidiAlsaSeq.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "engine.h" #include "gui_templates.h" #include "song.h" diff --git a/src/core/midi/MidiOss.cpp b/src/core/midi/MidiOss.cpp index 72d3176e3..9a7f685e0 100644 --- a/src/core/midi/MidiOss.cpp +++ b/src/core/midi/MidiOss.cpp @@ -37,7 +37,7 @@ #endif -#include "config_mgr.h" +#include "ConfigManager.h" #include "gui_templates.h" diff --git a/src/core/midi/MidiWinMM.cpp b/src/core/midi/MidiWinMM.cpp index 2c0d7c9ea..f5f717ad0 100644 --- a/src/core/midi/MidiWinMM.cpp +++ b/src/core/midi/MidiWinMM.cpp @@ -26,7 +26,7 @@ #include #include "MidiWinMM.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "engine.h" #include "gui_templates.h" #include "MidiPort.h" diff --git a/src/core/song.cpp b/src/core/song.cpp index 3372444dc..9601dcd7a 100644 --- a/src/core/song.cpp +++ b/src/core/song.cpp @@ -36,7 +36,7 @@ #include "bb_editor.h" #include "bb_track.h" #include "bb_track_container.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "ControllerRackView.h" #include "ControllerConnection.h" #include "embed.h" diff --git a/src/core/track.cpp b/src/core/track.cpp index 9a4747d6d..960540bf6 100644 --- a/src/core/track.cpp +++ b/src/core/track.cpp @@ -52,7 +52,7 @@ #include "bb_editor.h" #include "bb_track.h" #include "bb_track_container.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "Clipboard.h" #include "embed.h" #include "engine.h" diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp index a7e1b2b8c..794a8e33f 100644 --- a/src/gui/FileBrowser.cpp +++ b/src/gui/FileBrowser.cpp @@ -34,7 +34,7 @@ #include "FileBrowser.h" #include "bb_track_container.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "debug.h" #include "embed.h" #include "engine.h" diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 30e915a6e..b44f2e2df 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -51,7 +51,7 @@ #include "FileBrowser.h" #include "plugin_browser.h" #include "SideBar.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "Mixer.h" #include "PluginView.h" #include "project_notes.h" diff --git a/src/gui/PianoRoll.cpp b/src/gui/PianoRoll.cpp index 0d4724a18..e87412325 100644 --- a/src/gui/PianoRoll.cpp +++ b/src/gui/PianoRoll.cpp @@ -45,7 +45,7 @@ #include #include -#include "config_mgr.h" +#include "ConfigManager.h" #include "PianoRoll.h" #include "bb_track_container.h" #include "Clipboard.h" diff --git a/src/gui/SongEditor.cpp b/src/gui/SongEditor.cpp index 391ef42b6..ae033fbec 100644 --- a/src/gui/SongEditor.cpp +++ b/src/gui/SongEditor.cpp @@ -38,7 +38,7 @@ #include "SongEditor.h" #include "automatable_slider.h" #include "combobox.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "cpuload_widget.h" #include "embed.h" #include "LcdSpinBox.h" @@ -52,7 +52,6 @@ #include "TimeDisplayWidget.h" #include "AudioDevice.h" #include "PianoRoll.h" -#include "config_mgr.h" diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp index cf082e266..df0f918ed 100644 --- a/src/gui/bb_editor.cpp +++ b/src/gui/bb_editor.cpp @@ -34,7 +34,7 @@ #include "MainWindow.h" #include "song.h" #include "tool_button.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "DataFile.h" #include "string_pair_drag.h" diff --git a/src/gui/dialogs/FileDialog.cpp b/src/gui/dialogs/FileDialog.cpp index 58687019c..c2e9c5672 100644 --- a/src/gui/dialogs/FileDialog.cpp +++ b/src/gui/dialogs/FileDialog.cpp @@ -27,7 +27,7 @@ #include #include -#include "config_mgr.h" +#include "ConfigManager.h" #include "FileDialog.h" diff --git a/src/gui/embed.cpp b/src/gui/embed.cpp index bad16f928..9ea1b088f 100644 --- a/src/gui/embed.cpp +++ b/src/gui/embed.cpp @@ -28,7 +28,7 @@ #include #include #include "embed.h" -#include "config_mgr.h" +#include "ConfigManager.h" #ifndef PLUGIN_NAME namespace embed diff --git a/src/gui/setup_dialog.cpp b/src/gui/setup_dialog.cpp index 24a7caeb5..de6a62e8f 100644 --- a/src/gui/setup_dialog.cpp +++ b/src/gui/setup_dialog.cpp @@ -38,7 +38,7 @@ #include "gui_templates.h" #include "Mixer.h" #include "ProjectJournal.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "embed.h" #include "engine.h" #include "debug.h" diff --git a/src/gui/widgets/fader.cpp b/src/gui/widgets/fader.cpp index cb4371894..eeadaecd2 100644 --- a/src/gui/widgets/fader.cpp +++ b/src/gui/widgets/fader.cpp @@ -54,7 +54,7 @@ #include "embed.h" #include "engine.h" #include "caption_menu.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "text_float.h" #include "MainWindow.h" diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp index 88e37d610..6f9404988 100644 --- a/src/gui/widgets/knob.cpp +++ b/src/gui/widgets/knob.cpp @@ -38,7 +38,7 @@ #include "lmms_math.h" #include "knob.h" #include "caption_menu.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "ControllerConnection.h" #include "embed.h" #include "engine.h" diff --git a/src/gui/widgets/tooltip.cpp b/src/gui/widgets/tooltip.cpp index d310c7594..2b501c338 100644 --- a/src/gui/widgets/tooltip.cpp +++ b/src/gui/widgets/tooltip.cpp @@ -26,7 +26,7 @@ #include #include "tooltip.h" -#include "config_mgr.h" +#include "ConfigManager.h" void toolTip::add( QWidget * _w, const QString & _txt ) diff --git a/src/gui/widgets/track_label_button.cpp b/src/gui/widgets/track_label_button.cpp index fbf2c831e..184175962 100644 --- a/src/gui/widgets/track_label_button.cpp +++ b/src/gui/widgets/track_label_button.cpp @@ -33,7 +33,7 @@ #include "rename_dialog.h" #include "InstrumentTrack.h" #include "Instrument.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "engine.h" diff --git a/src/gui/widgets/visualization_widget.cpp b/src/gui/widgets/visualization_widget.cpp index 545826b52..2533380ea 100644 --- a/src/gui/widgets/visualization_widget.cpp +++ b/src/gui/widgets/visualization_widget.cpp @@ -34,7 +34,7 @@ #include "tooltip.h" #include "song.h" -#include "config_mgr.h" +#include "ConfigManager.h" diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index 65b92ed2e..f54c9901b 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -42,7 +42,7 @@ #include "AudioPort.h" #include "AutomationPattern.h" #include "bb_track.h" -#include "config_mgr.h" +#include "ConfigManager.h" #include "ControllerConnection.h" #include "debug.h" #include "EffectChain.h" diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp index 7d412e2c5..97beed1dd 100644 --- a/src/tracks/SampleTrack.cpp +++ b/src/tracks/SampleTrack.cpp @@ -46,7 +46,7 @@ #include "MainWindow.h" #include "EffectRackView.h" #include "track_label_button.h" -#include "config_mgr.h" +#include "ConfigManager.h" SampleTCO::SampleTCO( track * _track ) :