From 7d4f179b4b7dec878826d433efabfbccd6365a73 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Wed, 26 Nov 2014 10:27:25 +0100 Subject: [PATCH] Rename a lot of files * about_dialog -> AboutDialog * bb_editor -> BBEditor * export_project_dialog -> ExportProjectDialog * setup_dialog -> SetupDialog * string_pair_drag -> StringPairDrag --- include/{about_dialog.h => AboutDialog.h} | 2 +- include/{bb_editor.h => BBEditor.h} | 2 +- include/{export_project_dialog.h => ExportProjectDialog.h} | 2 +- include/{setup_dialog.h => SetupDialog.h} | 2 +- include/{string_pair_drag.h => StringPairDrag.h} | 2 +- plugins/audio_file_processor/audio_file_processor.cpp | 2 +- plugins/patman/patman.cpp | 2 +- plugins/vestige/vestige.cpp | 2 +- plugins/zynaddsubfx/ZynAddSubFx.cpp | 2 +- src/core/Engine.cpp | 2 +- src/core/Song.cpp | 4 ++-- src/core/Track.cpp | 4 ++-- src/core/audio/AudioFileDevice.cpp | 2 +- src/gui/{about_dialog.cpp => AboutDialog.cpp} | 4 ++-- src/gui/AutomatableModelView.cpp | 2 +- src/gui/AutomationPatternView.cpp | 2 +- src/gui/{bb_editor.cpp => BBEditor.cpp} | 6 +++--- .../{export_project_dialog.cpp => ExportProjectDialog.cpp} | 4 ++-- src/gui/FileBrowser.cpp | 2 +- src/gui/InstrumentView.cpp | 2 +- src/gui/MainWindow.cpp | 6 +++--- src/gui/PianoView.cpp | 2 +- src/gui/PluginBrowser.cpp | 2 +- src/gui/{setup_dialog.cpp => SetupDialog.cpp} | 4 ++-- src/gui/{string_pair_drag.cpp => StringPairDrag.cpp} | 4 ++-- src/gui/TrackContainerView.cpp | 2 +- src/gui/widgets/AutomatableButton.cpp | 2 +- src/gui/widgets/EnvelopeAndLfoView.cpp | 2 +- src/gui/widgets/Graph.cpp | 2 +- src/gui/widgets/Knob.cpp | 2 +- src/tracks/AutomationTrack.cpp | 2 +- src/tracks/InstrumentTrack.cpp | 2 +- src/tracks/Pattern.cpp | 2 +- src/tracks/SampleTrack.cpp | 2 +- src/tracks/bb_track.cpp | 2 +- 35 files changed, 45 insertions(+), 45 deletions(-) rename include/{about_dialog.h => AboutDialog.h} (95%) rename include/{bb_editor.h => BBEditor.h} (97%) rename include/{export_project_dialog.h => ExportProjectDialog.h} (96%) rename include/{setup_dialog.h => SetupDialog.h} (98%) rename include/{string_pair_drag.h => StringPairDrag.h} (95%) rename src/gui/{about_dialog.cpp => AboutDialog.cpp} (96%) rename src/gui/{bb_editor.cpp => BBEditor.cpp} (98%) rename src/gui/{export_project_dialog.cpp => ExportProjectDialog.cpp} (98%) rename src/gui/{setup_dialog.cpp => SetupDialog.cpp} (99%) rename src/gui/{string_pair_drag.cpp => StringPairDrag.cpp} (96%) diff --git a/include/about_dialog.h b/include/AboutDialog.h similarity index 95% rename from include/about_dialog.h rename to include/AboutDialog.h index afab10727..b2c1f4504 100644 --- a/include/about_dialog.h +++ b/include/AboutDialog.h @@ -1,5 +1,5 @@ /* - * about_dialog.h - declaration of class aboutDialog + * AboutDialog.h - declaration of class aboutDialog * * Copyright (c) 2004-2008 Tobias Doerffel * diff --git a/include/bb_editor.h b/include/BBEditor.h similarity index 97% rename from include/bb_editor.h rename to include/BBEditor.h index adaf8600a..24701b074 100644 --- a/include/bb_editor.h +++ b/include/BBEditor.h @@ -1,5 +1,5 @@ /* - * bb_editor.h - view-component of BB-Editor + * BBEditor.h - view-component of BB-Editor * * Copyright (c) 2004-2014 Tobias Doerffel * diff --git a/include/export_project_dialog.h b/include/ExportProjectDialog.h similarity index 96% rename from include/export_project_dialog.h rename to include/ExportProjectDialog.h index 3de343800..e8ce98b76 100644 --- a/include/export_project_dialog.h +++ b/include/ExportProjectDialog.h @@ -1,5 +1,5 @@ /* - * export_project_dialog.h - declaration of class exportProjectDialog which is + * ExportProjectDialog.h - declaration of class exportProjectDialog which is * responsible for exporting project * * Copyright (c) 2004-2012 Tobias Doerffel diff --git a/include/setup_dialog.h b/include/SetupDialog.h similarity index 98% rename from include/setup_dialog.h rename to include/SetupDialog.h index fd726cf9b..75e0490aa 100644 --- a/include/setup_dialog.h +++ b/include/SetupDialog.h @@ -1,5 +1,5 @@ /* - * setup_dialog.h - dialog for setting up LMMS + * SetupDialog.h - dialog for setting up LMMS * * Copyright (c) 2005-2014 Tobias Doerffel * diff --git a/include/string_pair_drag.h b/include/StringPairDrag.h similarity index 95% rename from include/string_pair_drag.h rename to include/StringPairDrag.h index 733ae14d1..bf3b02a48 100644 --- a/include/string_pair_drag.h +++ b/include/StringPairDrag.h @@ -1,5 +1,5 @@ /* - * string_pair_drag.h - class stringPairDrag which provides general support + * StringPairDrag.h - class stringPairDrag which provides general support * for drag'n'drop of string-pairs * * Copyright (c) 2005-2007 Tobias Doerffel diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp index dc56750e6..582d2cd07 100644 --- a/plugins/audio_file_processor/audio_file_processor.cpp +++ b/plugins/audio_file_processor/audio_file_processor.cpp @@ -39,7 +39,7 @@ #include "interpolation.h" #include "gui_templates.h" #include "ToolTip.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "DataFile.h" #include "embed.cpp" diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp index fc094f4e1..710b1af0b 100644 --- a/plugins/patman/patman.cpp +++ b/plugins/patman/patman.cpp @@ -36,7 +36,7 @@ #include "NotePlayHandle.h" #include "PixmapButton.h" #include "Song.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "ToolTip.h" #include "FileDialog.h" diff --git a/plugins/vestige/vestige.cpp b/plugins/vestige/vestige.cpp index 69349b3bf..92f1b1586 100644 --- a/plugins/vestige/vestige.cpp +++ b/plugins/vestige/vestige.cpp @@ -39,7 +39,7 @@ #include "VstPlugin.h" #include "MainWindow.h" #include "PixmapButton.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "TextFloat.h" #include "ToolTip.h" #include "FileDialog.h" diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp index 4ba6876c9..c551c388a 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.cpp +++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp @@ -39,7 +39,7 @@ #include "InstrumentPlayHandle.h" #include "InstrumentTrack.h" #include "gui_templates.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "RemoteZynAddSubFx.h" #include "LocalZynAddSubFx.h" #include "ControllerConnection.h" diff --git a/src/core/Engine.cpp b/src/core/Engine.cpp index 1d0057fad..d639a85af 100644 --- a/src/core/Engine.cpp +++ b/src/core/Engine.cpp @@ -25,7 +25,7 @@ #include "Engine.h" #include "AutomationEditor.h" -#include "bb_editor.h" +#include "BBEditor.h" #include "BBTrackContainer.h" #include "ConfigManager.h" #include "ControllerRackView.h" diff --git a/src/core/Song.cpp b/src/core/Song.cpp index 42800c7f0..7b5307241 100644 --- a/src/core/Song.cpp +++ b/src/core/Song.cpp @@ -33,7 +33,7 @@ #include "Song.h" #include "AutomationTrack.h" #include "AutomationEditor.h" -#include "bb_editor.h" +#include "BBEditor.h" #include "bb_track.h" #include "BBTrackContainer.h" #include "ConfigManager.h" @@ -41,7 +41,7 @@ #include "ControllerConnection.h" #include "embed.h" #include "EnvelopeAndLfoParameters.h" -#include "export_project_dialog.h" +#include "ExportProjectDialog.h" #include "FxMixer.h" #include "FxMixerView.h" #include "ImportFilter.h" diff --git a/src/core/Track.cpp b/src/core/Track.cpp index e9a0e7e9e..422a5c5a7 100644 --- a/src/core/Track.cpp +++ b/src/core/Track.cpp @@ -49,7 +49,7 @@ #include "AutomationPattern.h" #include "AutomationTrack.h" -#include "bb_editor.h" +#include "BBEditor.h" #include "bb_track.h" #include "BBTrackContainer.h" #include "ConfigManager.h" @@ -64,7 +64,7 @@ #include "ProjectJournal.h" #include "SampleTrack.h" #include "Song.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "templates.h" #include "TextFloat.h" #include "ToolTip.h" diff --git a/src/core/audio/AudioFileDevice.cpp b/src/core/audio/AudioFileDevice.cpp index 813b522e4..8a49080c0 100644 --- a/src/core/audio/AudioFileDevice.cpp +++ b/src/core/audio/AudioFileDevice.cpp @@ -26,7 +26,7 @@ #include #include "AudioFileDevice.h" -#include "export_project_dialog.h" +#include "ExportProjectDialog.h" AudioFileDevice::AudioFileDevice( const sample_rate_t _sample_rate, diff --git a/src/gui/about_dialog.cpp b/src/gui/AboutDialog.cpp similarity index 96% rename from src/gui/about_dialog.cpp rename to src/gui/AboutDialog.cpp index f482f49ee..c02e81acd 100644 --- a/src/gui/about_dialog.cpp +++ b/src/gui/AboutDialog.cpp @@ -1,5 +1,5 @@ /* - * about_dialog.cpp - implementation of about-dialog + * AboutDialog.cpp - implementation of about-dialog * * Copyright (c) 2004-2008 Tobias Doerffel * @@ -24,7 +24,7 @@ #include "lmmsversion.h" -#include "about_dialog.h" +#include "AboutDialog.h" #include "embed.h" #include "Engine.h" #include "MainWindow.h" diff --git a/src/gui/AutomatableModelView.cpp b/src/gui/AutomatableModelView.cpp index 98926f714..23ba71edf 100644 --- a/src/gui/AutomatableModelView.cpp +++ b/src/gui/AutomatableModelView.cpp @@ -31,7 +31,7 @@ #include "ControllerConnection.h" #include "embed.h" #include "MainWindow.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp index 17c1c6fc1..6ffb1c536 100644 --- a/src/gui/AutomationPatternView.cpp +++ b/src/gui/AutomationPatternView.cpp @@ -34,7 +34,7 @@ #include "gui_templates.h" #include "ProjectJournal.h" #include "RenameDialog.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "ToolTip.h" diff --git a/src/gui/bb_editor.cpp b/src/gui/BBEditor.cpp similarity index 98% rename from src/gui/bb_editor.cpp rename to src/gui/BBEditor.cpp index f95c2513e..41e29f9ab 100644 --- a/src/gui/bb_editor.cpp +++ b/src/gui/BBEditor.cpp @@ -1,5 +1,5 @@ /* - * bb_editor.cpp - basic main-window for editing of beats and basslines + * BBEditor.cpp - basic main-window for editing of beats and basslines * * Copyright (c) 2004-2008 Tobias Doerffel * @@ -28,7 +28,7 @@ #include #include -#include "bb_editor.h" +#include "BBEditor.h" #include "BBTrackContainer.h" #include "embed.h" #include "MainWindow.h" @@ -36,7 +36,7 @@ #include "ToolButton.h" #include "ConfigManager.h" #include "DataFile.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "TrackContainer.h" #include "Pattern.h" diff --git a/src/gui/export_project_dialog.cpp b/src/gui/ExportProjectDialog.cpp similarity index 98% rename from src/gui/export_project_dialog.cpp rename to src/gui/ExportProjectDialog.cpp index 931529944..575feced2 100644 --- a/src/gui/export_project_dialog.cpp +++ b/src/gui/ExportProjectDialog.cpp @@ -1,5 +1,5 @@ /* - * export_project_dialog.cpp - implementation of dialog for exporting project + * ExportProjectDialog.cpp - implementation of dialog for exporting project * * Copyright (c) 2004-2013 Tobias Doerffel * @@ -26,7 +26,7 @@ #include #include -#include "export_project_dialog.h" +#include "ExportProjectDialog.h" #include "Song.h" #include "Engine.h" #include "MainWindow.h" diff --git a/src/gui/FileBrowser.cpp b/src/gui/FileBrowser.cpp index 23e37dae9..ba88682bc 100644 --- a/src/gui/FileBrowser.cpp +++ b/src/gui/FileBrowser.cpp @@ -47,7 +47,7 @@ #include "PresetPreviewPlayHandle.h" #include "SamplePlayHandle.h" #include "Song.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "TextFloat.h" diff --git a/src/gui/InstrumentView.cpp b/src/gui/InstrumentView.cpp index 60814ea8b..dedbaef8b 100644 --- a/src/gui/InstrumentView.cpp +++ b/src/gui/InstrumentView.cpp @@ -28,7 +28,7 @@ #include "embed.h" #include "Instrument.h" #include "InstrumentTrack.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" InstrumentView::InstrumentView( Instrument * _Instrument, QWidget * _parent ) : diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 2a6c1195b..e2ca40e49 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -37,7 +37,7 @@ #include "lmmsversion.h" #include "MainWindow.h" -#include "bb_editor.h" +#include "BBEditor.h" #include "SongEditor.h" #include "Song.h" #include "PianoRoll.h" @@ -46,7 +46,7 @@ #include "FxMixerView.h" #include "InstrumentTrack.h" #include "PianoView.h" -#include "about_dialog.h" +#include "AboutDialog.h" #include "ControllerRackView.h" #include "FileBrowser.h" #include "PluginBrowser.h" @@ -55,7 +55,7 @@ #include "Mixer.h" #include "PluginView.h" #include "ProjectNotes.h" -#include "setup_dialog.h" +#include "SetupDialog.h" #include "AudioDummy.h" #include "ToolPlugin.h" #include "ToolButton.h" diff --git a/src/gui/PianoView.cpp b/src/gui/PianoView.cpp index ece836420..225ad83ee 100644 --- a/src/gui/PianoView.cpp +++ b/src/gui/PianoView.cpp @@ -51,7 +51,7 @@ #include "gui_templates.h" #include "InstrumentTrack.h" #include "Knob.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "MainWindow.h" #include "MidiEvent.h" #include "templates.h" diff --git a/src/gui/PluginBrowser.cpp b/src/gui/PluginBrowser.cpp index a768a98a3..bb5da6286 100644 --- a/src/gui/PluginBrowser.cpp +++ b/src/gui/PluginBrowser.cpp @@ -33,7 +33,7 @@ #include "debug.h" #include "templates.h" #include "gui_templates.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" bool pluginBefore( const Plugin::Descriptor& d1, const Plugin::Descriptor& d2 ) diff --git a/src/gui/setup_dialog.cpp b/src/gui/SetupDialog.cpp similarity index 99% rename from src/gui/setup_dialog.cpp rename to src/gui/SetupDialog.cpp index d79ee1ba6..ba1173c0a 100644 --- a/src/gui/setup_dialog.cpp +++ b/src/gui/SetupDialog.cpp @@ -1,5 +1,5 @@ /* - * setup_dialog.cpp - dialog for setting up LMMS + * SetupDialog.cpp - dialog for setting up LMMS * * Copyright (c) 2005-2014 Tobias Doerffel * @@ -31,7 +31,7 @@ #include #include -#include "setup_dialog.h" +#include "SetupDialog.h" #include "TabBar.h" #include "tab_button.h" #include "TabWidget.h" diff --git a/src/gui/string_pair_drag.cpp b/src/gui/StringPairDrag.cpp similarity index 96% rename from src/gui/string_pair_drag.cpp rename to src/gui/StringPairDrag.cpp index d1f84efb6..98b030b19 100644 --- a/src/gui/string_pair_drag.cpp +++ b/src/gui/StringPairDrag.cpp @@ -1,5 +1,5 @@ /* - * string_pair_drag.cpp - class stringPairDrag which provides general support + * StringPairDrag.cpp - class stringPairDrag which provides general support * for drag'n'drop of string-pairs and which is the base * for all drag'n'drop-actions within LMMS * @@ -30,7 +30,7 @@ #include -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "Engine.h" #include "MainWindow.h" diff --git a/src/gui/TrackContainerView.cpp b/src/gui/TrackContainerView.cpp index 364a517d5..d64fe57f3 100644 --- a/src/gui/TrackContainerView.cpp +++ b/src/gui/TrackContainerView.cpp @@ -43,7 +43,7 @@ #include "DataFile.h" #include "Rubberband.h" #include "Song.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "Track.h" diff --git a/src/gui/widgets/AutomatableButton.cpp b/src/gui/widgets/AutomatableButton.cpp index 7680ac894..0a83d1469 100644 --- a/src/gui/widgets/AutomatableButton.cpp +++ b/src/gui/widgets/AutomatableButton.cpp @@ -32,7 +32,7 @@ #include "Engine.h" #include "embed.h" #include "MainWindow.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp index 3571c7455..bbbcd90f7 100644 --- a/src/gui/widgets/EnvelopeAndLfoView.cpp +++ b/src/gui/widgets/EnvelopeAndLfoView.cpp @@ -37,7 +37,7 @@ #include "DataFile.h" #include "Oscillator.h" #include "PixmapButton.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "TempoSyncKnob.h" #include "TextFloat.h" #include "ToolTip.h" diff --git a/src/gui/widgets/Graph.cpp b/src/gui/widgets/Graph.cpp index fa3607906..10a78287c 100644 --- a/src/gui/widgets/Graph.cpp +++ b/src/gui/widgets/Graph.cpp @@ -28,7 +28,7 @@ #include #include "Graph.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "SampleBuffer.h" #include "Oscillator.h" #include "Engine.h" diff --git a/src/gui/widgets/Knob.cpp b/src/gui/widgets/Knob.cpp index da2670302..376f57116 100644 --- a/src/gui/widgets/Knob.cpp +++ b/src/gui/widgets/Knob.cpp @@ -46,7 +46,7 @@ #include "MainWindow.h" #include "ProjectJournal.h" #include "Song.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "templates.h" #include "TextFloat.h" diff --git a/src/tracks/AutomationTrack.cpp b/src/tracks/AutomationTrack.cpp index e82a310f0..27ddd395a 100644 --- a/src/tracks/AutomationTrack.cpp +++ b/src/tracks/AutomationTrack.cpp @@ -29,7 +29,7 @@ #include "Engine.h" #include "embed.h" #include "ProjectJournal.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "TrackContainerView.h" #include "TrackLabelButton.h" diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index 0d288603d..00f94da03 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -72,7 +72,7 @@ #include "PluginView.h" #include "SamplePlayHandle.h" #include "Song.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "TabWidget.h" #include "ToolTip.h" #include "TrackLabelButton.h" diff --git a/src/tracks/Pattern.cpp b/src/tracks/Pattern.cpp index 0752e8eed..f9b65096f 100644 --- a/src/tracks/Pattern.cpp +++ b/src/tracks/Pattern.cpp @@ -47,7 +47,7 @@ #include "Song.h" #include "ToolTip.h" #include "BBTrackContainer.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "MainWindow.h" diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp index 2f90c960d..ecd26a80c 100644 --- a/src/tracks/SampleTrack.cpp +++ b/src/tracks/SampleTrack.cpp @@ -41,7 +41,7 @@ #include "AudioPort.h" #include "SamplePlayHandle.h" #include "SampleRecordHandle.h" -#include "string_pair_drag.h" +#include "StringPairDrag.h" #include "Knob.h" #include "MainWindow.h" #include "EffectRackView.h" diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp index 53f35511a..2d4903c50 100644 --- a/src/tracks/bb_track.cpp +++ b/src/tracks/bb_track.cpp @@ -27,7 +27,7 @@ #include #include -#include "bb_editor.h" +#include "BBEditor.h" #include "bb_track.h" #include "BBTrackContainer.h" #include "embed.h"