From 20d323dbbfc6fd6b6ecb6de707e7cf86d2b0a4ed Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:56:23 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- src/CMakeLists.txt | 4 ++-- src/commands/edit/EventQuantizeCommand.cpp | 2 +- src/document/RoseXmlHandler.cpp | 2 +- src/document/RosegardenGUIDoc.cpp | 2 +- src/document/io/LilyPondExporter.cpp | 2 +- src/gui/application/RosegardenApplication.cpp | 2 +- src/gui/application/RosegardenGUIApp.cpp | 6 +++--- src/gui/application/RosegardenGUIApp.cpp.orig | 6 +++--- src/gui/application/RosegardenGUIView.cpp | 2 +- src/gui/application/main.cpp | 2 +- src/gui/configuration/AudioConfigurationPage.cpp | 4 ++-- src/gui/configuration/AudioPropertiesPage.cpp | 8 ++++---- src/gui/configuration/ColourConfigurationPage.cpp | 2 +- src/gui/configuration/ConfigurationPage.cpp | 2 +- src/gui/configuration/DocumentMetaConfigurationPage.cpp | 2 +- src/gui/configuration/GeneralConfigurationPage.cpp | 4 ++-- src/gui/configuration/HeadersConfigurationPage.cpp | 2 +- src/gui/configuration/LatencyConfigurationPage.cpp | 2 +- src/gui/configuration/MIDIConfigurationPage.cpp | 4 ++-- src/gui/configuration/MatrixConfigurationPage.cpp | 2 +- src/gui/configuration/NotationConfigurationPage.cpp | 2 +- src/gui/configuration/TabbedConfigurationPage.cpp | 2 +- src/gui/dialogs/AddTracksDialog.cpp | 2 +- src/gui/dialogs/AudioManagerDialog.cpp | 4 ++-- src/gui/dialogs/ConfigureDialog.cpp | 2 +- src/gui/dialogs/EventFilterDialog.cpp | 2 +- src/gui/dialogs/EventFilterDialog.h | 2 +- src/gui/dialogs/FileLocateDialog.cpp | 2 +- src/gui/dialogs/ImportDeviceDialog.cpp | 4 ++-- src/gui/dialogs/InterpretDialog.cpp | 2 +- src/gui/dialogs/LilyPondOptionsDialog.cpp | 2 +- src/gui/dialogs/RescaleDialog.cpp | 2 +- src/gui/dialogs/SimpleEventEditDialog.cpp | 2 +- src/gui/dialogs/TextEventDialog.cpp | 2 +- src/gui/dialogs/TimeSignatureDialog.cpp | 2 +- src/gui/dialogs/TransportDialog.cpp | 2 +- src/gui/dialogs/TriggerSegmentDialog.cpp | 2 +- src/gui/dialogs/UseOrnamentDialog.cpp | 2 +- src/gui/editors/eventlist/EventView.cpp | 2 +- src/gui/editors/matrix/MatrixSelector.cpp | 2 +- src/gui/editors/matrix/MatrixView.cpp | 2 +- src/gui/editors/notation/NotationEraser.cpp | 2 +- src/gui/editors/notation/NotationHLayout.cpp | 2 +- src/gui/editors/notation/NotationStaff.cpp | 2 +- src/gui/editors/notation/NotationStrings.cpp | 2 +- src/gui/editors/notation/NotationView.cpp | 2 +- src/gui/editors/notation/NoteFontFactory.cpp | 2 +- src/gui/editors/notation/NoteInserter.cpp | 2 +- src/gui/editors/notation/NotePixmapFactory.cpp | 2 +- src/gui/editors/parameters/SegmentParameterBox.cpp | 2 +- src/gui/editors/parameters/TrackParameterBox.cpp | 2 +- src/gui/editors/segment/MarkerEditor.cpp | 2 +- src/gui/editors/segment/PlayList.cpp | 4 ++-- src/gui/editors/segment/TrackEditor.cpp | 2 +- src/gui/editors/segment/TriggerSegmentManager.cpp | 2 +- .../editors/segment/segmentcanvas/AudioPreviewPainter.cpp | 2 +- src/gui/editors/segment/segmentcanvas/CompositionView.cpp | 2 +- src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp | 2 +- src/gui/editors/tempo/TempoView.cpp | 2 +- src/gui/general/EditView.cpp | 2 +- src/gui/general/EditViewBase.cpp | 2 +- src/gui/general/GUIPalette.cpp | 2 +- src/gui/general/MidiPitchLabel.cpp | 2 +- src/gui/general/PresetHandlerDialog.cpp | 2 +- src/gui/general/PresetHandlerDialog.h | 2 +- src/gui/kdeext/KStartupLogo.cpp | 2 +- src/gui/seqmanager/MetronomeMmapper.cpp | 2 +- src/gui/seqmanager/SequenceManager.cpp | 2 +- src/gui/studio/BankEditorDialog.cpp | 2 +- src/gui/studio/ChangeRecordDeviceCommand.cpp | 2 +- src/gui/studio/DeviceManagerDialog.cpp | 2 +- src/gui/widgets/CollapsingFrame.cpp | 2 +- src/gui/widgets/QuantizeParameters.cpp | 2 +- src/misc/stableheaders.h | 8 ++++---- src/sound/AudioFileManager.cpp | 2 +- 75 files changed, 92 insertions(+), 92 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index be17cc0..ab52cdd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -129,7 +129,7 @@ tde_add_library( RosegardenSegmentCanvas STATIC AUTOMOC tde_add_executable( rosegarden AUTOMOC SOURCES gui/application/main.cpp - LINK dl pthread fontconfig tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon + LINK dl pthread fontconfig tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} tdeio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon DESTINATION ${BIN_INSTALL_DIR} ) @@ -157,7 +157,7 @@ if( WANT_TEST ) tde_add_executable( RosegardenTestDriver AUTOMOC SOURCES RosegardenTestDriver.cpp ${tests_SRCS} - LINK dl tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} kio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon + LINK dl tdecore-shared ${LIBLO_LIBS} ${LRDF_LIBS} ${FFTW3F_LIBS} ${XFT_LIBS} ${LIRC_LIBS} ${JACK_LIBS} tdeio-shared tdeui-shared tdeprint-shared RosegardenExtended RosegardenSegmentCanvas RosegardenCommands RosegardenCommon DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/src/commands/edit/EventQuantizeCommand.cpp b/src/commands/edit/EventQuantizeCommand.cpp index 965f550..713562a 100644 --- a/src/commands/edit/EventQuantizeCommand.cpp +++ b/src/commands/edit/EventQuantizeCommand.cpp @@ -36,7 +36,7 @@ #include "base/SegmentNotationHelper.h" #include "base/Selection.h" #include "document/BasicCommand.h" -#include +#include #include #include "base/BaseProperties.h" #include "gui/application/RosegardenApplication.h" diff --git a/src/document/RoseXmlHandler.cpp b/src/document/RoseXmlHandler.cpp index 87ed1f6..29f209c 100644 --- a/src/document/RoseXmlHandler.cpp +++ b/src/document/RoseXmlHandler.cpp @@ -59,7 +59,7 @@ #include "gui/widgets/ProgressDialog.h" #include "RosegardenGUIDoc.h" #include "sound/AudioFileManager.h" -#include +#include #include #include #include diff --git a/src/document/RosegardenGUIDoc.cpp b/src/document/RosegardenGUIDoc.cpp index edc086c..6d38f5c 100644 --- a/src/document/RosegardenGUIDoc.cpp +++ b/src/document/RosegardenGUIDoc.cpp @@ -91,7 +91,7 @@ #include "sound/PluginIdentifier.h" #include "sound/SoundDriver.h" #include -#include +#include #include #include #include diff --git a/src/document/io/LilyPondExporter.cpp b/src/document/io/LilyPondExporter.cpp index 38b0fea..e7292f7 100644 --- a/src/document/io/LilyPondExporter.cpp +++ b/src/document/io/LilyPondExporter.cpp @@ -66,7 +66,7 @@ #include "gui/editors/guitar/Chord.h" #include "gui/general/ProgressReporter.h" #include "gui/widgets/CurrentProgressDialog.h" -#include +#include #include #include #include diff --git a/src/gui/application/RosegardenApplication.cpp b/src/gui/application/RosegardenApplication.cpp index f358c2a..10add69 100644 --- a/src/gui/application/RosegardenApplication.cpp +++ b/src/gui/application/RosegardenApplication.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp index b4e0c6f..8e529d4 100644 --- a/src/gui/application/RosegardenGUIApp.cpp +++ b/src/gui/application/RosegardenGUIApp.cpp @@ -176,14 +176,14 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/src/gui/application/RosegardenGUIApp.cpp.orig b/src/gui/application/RosegardenGUIApp.cpp.orig index 7d82eda..4007322 100644 --- a/src/gui/application/RosegardenGUIApp.cpp.orig +++ b/src/gui/application/RosegardenGUIApp.cpp.orig @@ -176,14 +176,14 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/src/gui/application/RosegardenGUIView.cpp b/src/gui/application/RosegardenGUIView.cpp index 878df77..ea12c38 100644 --- a/src/gui/application/RosegardenGUIView.cpp +++ b/src/gui/application/RosegardenGUIView.cpp @@ -80,7 +80,7 @@ #include "sound/AudioFileManager.h" #include "sound/MappedEvent.h" #include -#include +#include #include #include #include diff --git a/src/gui/application/main.cpp b/src/gui/application/main.cpp index 1269353..538e71b 100644 --- a/src/gui/application/main.cpp +++ b/src/gui/application/main.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gui/configuration/AudioConfigurationPage.cpp b/src/gui/configuration/AudioConfigurationPage.cpp index f740dd5..43c143a 100644 --- a/src/gui/configuration/AudioConfigurationPage.cpp +++ b/src/gui/configuration/AudioConfigurationPage.cpp @@ -39,8 +39,8 @@ #include "sound/MappedEvent.h" #include "TabbedConfigurationPage.h" #include -#include -#include +#include +#include #include #include #include diff --git a/src/gui/configuration/AudioPropertiesPage.cpp b/src/gui/configuration/AudioPropertiesPage.cpp index 8713cd0..d076ad5 100644 --- a/src/gui/configuration/AudioPropertiesPage.cpp +++ b/src/gui/configuration/AudioPropertiesPage.cpp @@ -32,10 +32,10 @@ #include "gui/studio/AudioPluginManager.h" #include "sound/AudioFileManager.h" #include "TabbedConfigurationPage.h" -#include +#include #include -#include -#include +#include +#include #include #include #include @@ -93,7 +93,7 @@ AudioPropertiesPage::AudioPropertiesPage(RosegardenGUIDoc *doc, void AudioPropertiesPage::calculateStats() { - // This stolen from KDE libs kfile/kpropertiesdialog.cpp + // This stolen from KDE libs tdefile/kpropertiesdialog.cpp // TQString mountPoint = TDEIO::findPathMountPoint(m_path->text()); KDiskFreeSp * job = new KDiskFreeSp; diff --git a/src/gui/configuration/ColourConfigurationPage.cpp b/src/gui/configuration/ColourConfigurationPage.cpp index 18c5576..45191f2 100644 --- a/src/gui/configuration/ColourConfigurationPage.cpp +++ b/src/gui/configuration/ColourConfigurationPage.cpp @@ -37,7 +37,7 @@ #include "gui/widgets/ColourTable.h" #include "TabbedConfigurationPage.h" #include -#include +#include #include #include #include diff --git a/src/gui/configuration/ConfigurationPage.cpp b/src/gui/configuration/ConfigurationPage.cpp index d0e2369..31d13f0 100644 --- a/src/gui/configuration/ConfigurationPage.cpp +++ b/src/gui/configuration/ConfigurationPage.cpp @@ -26,7 +26,7 @@ #include "ConfigurationPage.h" #include "document/RosegardenGUIDoc.h" -#include +#include #include #include diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.cpp b/src/gui/configuration/DocumentMetaConfigurationPage.cpp index 2261ba2..c554633 100644 --- a/src/gui/configuration/DocumentMetaConfigurationPage.cpp +++ b/src/gui/configuration/DocumentMetaConfigurationPage.cpp @@ -42,7 +42,7 @@ #include "gui/configuration/HeadersConfigurationPage.h" #include "gui/general/GUIPalette.h" #include "TabbedConfigurationPage.h" -#include +#include #include #include #include diff --git a/src/gui/configuration/GeneralConfigurationPage.cpp b/src/gui/configuration/GeneralConfigurationPage.cpp index 3b7864a..0dff640 100644 --- a/src/gui/configuration/GeneralConfigurationPage.cpp +++ b/src/gui/configuration/GeneralConfigurationPage.cpp @@ -36,8 +36,8 @@ #include "sound/SoundDriver.h" #include "TabbedConfigurationPage.h" #include -#include -#include +#include +#include #include #include #include diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp index 2282261..98780b0 100644 --- a/src/gui/configuration/HeadersConfigurationPage.cpp +++ b/src/gui/configuration/HeadersConfigurationPage.cpp @@ -32,7 +32,7 @@ #include "misc/Strings.h" #include -#include +#include #include #include #include diff --git a/src/gui/configuration/LatencyConfigurationPage.cpp b/src/gui/configuration/LatencyConfigurationPage.cpp index dd7bf19..09a940f 100644 --- a/src/gui/configuration/LatencyConfigurationPage.cpp +++ b/src/gui/configuration/LatencyConfigurationPage.cpp @@ -30,7 +30,7 @@ #include "ConfigurationPage.h" #include "document/RosegardenGUIDoc.h" #include "TabbedConfigurationPage.h" -#include +#include #include #include #include diff --git a/src/gui/configuration/MIDIConfigurationPage.cpp b/src/gui/configuration/MIDIConfigurationPage.cpp index 9cbfd82..6f521b0 100644 --- a/src/gui/configuration/MIDIConfigurationPage.cpp +++ b/src/gui/configuration/MIDIConfigurationPage.cpp @@ -39,8 +39,8 @@ #include "sound/MappedEvent.h" #include "TabbedConfigurationPage.h" #include -#include -#include +#include +#include #include #include #include diff --git a/src/gui/configuration/MatrixConfigurationPage.cpp b/src/gui/configuration/MatrixConfigurationPage.cpp index 0178e3e..6e49433 100644 --- a/src/gui/configuration/MatrixConfigurationPage.cpp +++ b/src/gui/configuration/MatrixConfigurationPage.cpp @@ -31,7 +31,7 @@ #include "document/ConfigGroups.h" #include "gui/editors/matrix/MatrixView.h" #include "TabbedConfigurationPage.h" -#include +#include #include #include #include diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp index 191abac..85625d7 100644 --- a/src/gui/configuration/NotationConfigurationPage.cpp +++ b/src/gui/configuration/NotationConfigurationPage.cpp @@ -44,7 +44,7 @@ #include "gui/widgets/QuantizeParameters.h" #include "TabbedConfigurationPage.h" #include -#include +#include #include #include #include diff --git a/src/gui/configuration/TabbedConfigurationPage.cpp b/src/gui/configuration/TabbedConfigurationPage.cpp index fa26a5c..ae13d21 100644 --- a/src/gui/configuration/TabbedConfigurationPage.cpp +++ b/src/gui/configuration/TabbedConfigurationPage.cpp @@ -27,7 +27,7 @@ #include "ConfigurationPage.h" #include "document/RosegardenGUIDoc.h" -#include +#include #include #include #include diff --git a/src/gui/dialogs/AddTracksDialog.cpp b/src/gui/dialogs/AddTracksDialog.cpp index d088b9c..a41d10b 100644 --- a/src/gui/dialogs/AddTracksDialog.cpp +++ b/src/gui/dialogs/AddTracksDialog.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "document/ConfigGroups.h" diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp index 14e727d..ce5d518 100644 --- a/src/gui/dialogs/AudioManagerDialog.cpp +++ b/src/gui/dialogs/AudioManagerDialog.cpp @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include #include @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp index 24e004f..118f5ba 100644 --- a/src/gui/dialogs/ConfigureDialog.cpp +++ b/src/gui/dialogs/ConfigureDialog.cpp @@ -33,7 +33,7 @@ #include "gui/configuration/NotationConfigurationPage.h" #include "gui/configuration/AudioConfigurationPage.h" #include "gui/configuration/MIDIConfigurationPage.h" -#include +#include #include #include #include diff --git a/src/gui/dialogs/EventFilterDialog.cpp b/src/gui/dialogs/EventFilterDialog.cpp index 331fe29..cd1d889 100644 --- a/src/gui/dialogs/EventFilterDialog.cpp +++ b/src/gui/dialogs/EventFilterDialog.cpp @@ -38,7 +38,7 @@ #include "gui/editors/notation/NotePixmapFactory.h" #include "document/ConfigGroups.h" #include -#include +#include #include #include #include diff --git a/src/gui/dialogs/EventFilterDialog.h b/src/gui/dialogs/EventFilterDialog.h index 60ca24f..db75b34 100644 --- a/src/gui/dialogs/EventFilterDialog.h +++ b/src/gui/dialogs/EventFilterDialog.h @@ -123,7 +123,7 @@ protected slots: // set widget values to include nothing void slotToggleNone(); - // write out settings to kconfig data for next time and call accept() + // write out settings to tdeconfig data for next time and call accept() virtual void slotOk(); // update note name text display and ensure From <= To diff --git a/src/gui/dialogs/FileLocateDialog.cpp b/src/gui/dialogs/FileLocateDialog.cpp index cd85b8d..04c3c20 100644 --- a/src/gui/dialogs/FileLocateDialog.cpp +++ b/src/gui/dialogs/FileLocateDialog.cpp @@ -28,7 +28,7 @@ #include #include "misc/Debug.h" #include -#include +#include #include #include #include diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp index ab7cb17..42b6881 100644 --- a/src/gui/dialogs/ImportDeviceDialog.cpp +++ b/src/gui/dialogs/ImportDeviceDialog.cpp @@ -35,11 +35,11 @@ #include "document/RosegardenGUIDoc.h" #include "sound/SF2PatchExtractor.h" #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp index 62ceeec..ce5ba1a 100644 --- a/src/gui/dialogs/InterpretDialog.cpp +++ b/src/gui/dialogs/InterpretDialog.cpp @@ -29,7 +29,7 @@ #include #include "document/ConfigGroups.h" #include "commands/notation/InterpretCommand.h" -#include +#include #include #include #include diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp index dedc702..0d5d27a 100644 --- a/src/gui/dialogs/LilyPondOptionsDialog.cpp +++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp @@ -35,7 +35,7 @@ #include "misc/Strings.h" #include #include -#include +#include #include #include #include diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp index fe75a35..45c2fb4 100644 --- a/src/gui/dialogs/RescaleDialog.cpp +++ b/src/gui/dialogs/RescaleDialog.cpp @@ -29,7 +29,7 @@ #include "document/ConfigGroups.h" #include "base/Composition.h" #include "gui/widgets/TimeWidget.h" -#include +#include #include #include #include diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp index 5ff0791..7597e69 100644 --- a/src/gui/dialogs/SimpleEventEditDialog.cpp +++ b/src/gui/dialogs/SimpleEventEditDialog.cpp @@ -37,7 +37,7 @@ #include "TimeDialog.h" #include #include -#include +#include #include #include #include diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp index 7e88fc6..dbba02f 100644 --- a/src/gui/dialogs/TextEventDialog.cpp +++ b/src/gui/dialogs/TextEventDialog.cpp @@ -32,7 +32,7 @@ #include "base/NotationTypes.h" #include "gui/editors/notation/NotePixmapFactory.h" #include -#include +#include #include #include #include diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp index e814f28..2573752 100644 --- a/src/gui/dialogs/TimeSignatureDialog.cpp +++ b/src/gui/dialogs/TimeSignatureDialog.cpp @@ -32,7 +32,7 @@ #include "base/NotationTypes.h" #include "gui/widgets/TimeWidget.h" #include "gui/widgets/BigArrowButton.h" -#include +#include #include #include #include diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp index aec2f52..f1297e3 100644 --- a/src/gui/dialogs/TransportDialog.cpp +++ b/src/gui/dialogs/TransportDialog.cpp @@ -37,7 +37,7 @@ #include "gui/widgets/Label.h" #include "sound/MappedEvent.h" #include "document/ConfigGroups.h" -#include +#include #include #include #include diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp index c4fc333..c0ff424 100644 --- a/src/gui/dialogs/TriggerSegmentDialog.cpp +++ b/src/gui/dialogs/TriggerSegmentDialog.cpp @@ -33,7 +33,7 @@ #include "base/Composition.h" #include "base/TriggerSegment.h" #include -#include +#include #include #include #include diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp index f21a85d..3c37239 100644 --- a/src/gui/dialogs/UseOrnamentDialog.cpp +++ b/src/gui/dialogs/UseOrnamentDialog.cpp @@ -36,7 +36,7 @@ #include "base/TriggerSegment.h" #include "gui/editors/notation/NotePixmapFactory.h" #include -#include +#include #include #include #include diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp index c902a93..b804d17 100644 --- a/src/gui/editors/eventlist/EventView.cpp +++ b/src/gui/editors/eventlist/EventView.cpp @@ -60,7 +60,7 @@ #include "gui/kdeext/KTmpStatusMsg.h" #include "gui/dialogs/EventFilterDialog.h" #include -#include +#include #include #include #include diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp index 5b3dd26..c9c3b32 100644 --- a/src/gui/editors/matrix/MatrixSelector.cpp +++ b/src/gui/editors/matrix/MatrixSelector.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp index 5f69a39..f7665c9 100644 --- a/src/gui/editors/matrix/MatrixView.cpp +++ b/src/gui/editors/matrix/MatrixView.cpp @@ -106,7 +106,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gui/editors/notation/NotationEraser.cpp b/src/gui/editors/notation/NotationEraser.cpp index 50929f4..c12d87a 100644 --- a/src/gui/editors/notation/NotationEraser.cpp +++ b/src/gui/editors/notation/NotationEraser.cpp @@ -35,7 +35,7 @@ #include "NotationView.h" #include "NotePixmapFactory.h" #include -#include +#include #include #include diff --git a/src/gui/editors/notation/NotationHLayout.cpp b/src/gui/editors/notation/NotationHLayout.cpp index 32a47e2..50fb0f6 100644 --- a/src/gui/editors/notation/NotationHLayout.cpp +++ b/src/gui/editors/notation/NotationHLayout.cpp @@ -46,7 +46,7 @@ #include "NotationProperties.h" #include "NotationStaff.h" #include "NotePixmapFactory.h" -#include +#include #include #include diff --git a/src/gui/editors/notation/NotationStaff.cpp b/src/gui/editors/notation/NotationStaff.cpp index 3be47ae..f49b632 100644 --- a/src/gui/editors/notation/NotationStaff.cpp +++ b/src/gui/editors/notation/NotationStaff.cpp @@ -62,7 +62,7 @@ #include "NotePixmapFactory.h" #include "NotePixmapParameters.h" #include "NoteStyleFactory.h" -#include +#include #include #include #include diff --git a/src/gui/editors/notation/NotationStrings.cpp b/src/gui/editors/notation/NotationStrings.cpp index f81ad1e..24d5c9d 100644 --- a/src/gui/editors/notation/NotationStrings.cpp +++ b/src/gui/editors/notation/NotationStrings.cpp @@ -32,7 +32,7 @@ #include "base/Exception.h" #include "base/NotationTypes.h" #include "gui/configuration/GeneralConfigurationPage.h" -#include +#include #include diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index 032b8cb..02b8539 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -182,7 +182,7 @@ #include "HeadersGroup.h" #include #include -#include +#include #include #include #include diff --git a/src/gui/editors/notation/NoteFontFactory.cpp b/src/gui/editors/notation/NoteFontFactory.cpp index 9099b58..9760734 100644 --- a/src/gui/editors/notation/NoteFontFactory.cpp +++ b/src/gui/editors/notation/NoteFontFactory.cpp @@ -35,7 +35,7 @@ #include "gui/kdeext/KStartupLogo.h" #include "NoteFont.h" #include "NoteFontMap.h" -#include +#include #include #include #include diff --git a/src/gui/editors/notation/NoteInserter.cpp b/src/gui/editors/notation/NoteInserter.cpp index a2b6b56..3db308f 100644 --- a/src/gui/editors/notation/NoteInserter.cpp +++ b/src/gui/editors/notation/NoteInserter.cpp @@ -51,7 +51,7 @@ #include "NoteStyleFactory.h" #include #include -#include +#include #include #include #include diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp index 7474d4e..f34eeaa 100644 --- a/src/gui/editors/notation/NotePixmapFactory.cpp +++ b/src/gui/editors/notation/NotePixmapFactory.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include "misc/Strings.h" #include "document/ConfigGroups.h" #include "base/Exception.h" diff --git a/src/gui/editors/parameters/SegmentParameterBox.cpp b/src/gui/editors/parameters/SegmentParameterBox.cpp index 2eb39f8..4562520 100644 --- a/src/gui/editors/parameters/SegmentParameterBox.cpp +++ b/src/gui/editors/parameters/SegmentParameterBox.cpp @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gui/editors/parameters/TrackParameterBox.cpp b/src/gui/editors/parameters/TrackParameterBox.cpp index d627b01..62920b4 100644 --- a/src/gui/editors/parameters/TrackParameterBox.cpp +++ b/src/gui/editors/parameters/TrackParameterBox.cpp @@ -61,7 +61,7 @@ #include "sound/PluginIdentifier.h" #include #include -#include +#include #include #include #include diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp index 0f25aeb..c6c2dd8 100644 --- a/src/gui/editors/segment/MarkerEditor.cpp +++ b/src/gui/editors/segment/MarkerEditor.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "misc/Debug.h" #include "misc/Strings.h" #include "base/Composition.h" diff --git a/src/gui/editors/segment/PlayList.cpp b/src/gui/editors/segment/PlayList.cpp index 9bd2079..58d59cc 100644 --- a/src/gui/editors/segment/PlayList.cpp +++ b/src/gui/editors/segment/PlayList.cpp @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/gui/editors/segment/TrackEditor.cpp b/src/gui/editors/segment/TrackEditor.cpp index cb8db68..6be14b5 100644 --- a/src/gui/editors/segment/TrackEditor.cpp +++ b/src/gui/editors/segment/TrackEditor.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include "misc/Debug.h" #include "document/ConfigGroups.h" diff --git a/src/gui/editors/segment/TriggerSegmentManager.cpp b/src/gui/editors/segment/TriggerSegmentManager.cpp index 60dde0c..8bfb621 100644 --- a/src/gui/editors/segment/TriggerSegmentManager.cpp +++ b/src/gui/editors/segment/TriggerSegmentManager.cpp @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp index 3515e16..b6f7518 100644 --- a/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp +++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewPainter.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include namespace Rosegarden { diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp index fe52f26..89290fa 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp index c1b1f4b..02f3670 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp @@ -47,7 +47,7 @@ #include "SegmentTool.h" #include "SegmentToolBox.h" #include -#include +#include #include #include #include diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp index 7d7346f..4386cb2 100644 --- a/src/gui/editors/tempo/TempoView.cpp +++ b/src/gui/editors/tempo/TempoView.cpp @@ -46,7 +46,7 @@ #include "TempoListItem.h" #include #include -#include +#include #include #include #include diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp index c8e36eb..661236c 100644 --- a/src/gui/general/EditView.cpp +++ b/src/gui/general/EditView.cpp @@ -28,7 +28,7 @@ #include "base/BaseProperties.h" #include -#include +#include #include "misc/Debug.h" #include "misc/Strings.h" #include "ActiveItem.h" diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp index 0795b5f..ca8211a 100644 --- a/src/gui/general/EditViewBase.cpp +++ b/src/gui/general/EditViewBase.cpp @@ -46,7 +46,7 @@ #include "gui/kdeext/KTmpStatusMsg.h" #include #include -#include +#include #include #include #include diff --git a/src/gui/general/GUIPalette.cpp b/src/gui/general/GUIPalette.cpp index e43d1de..0a3bd91 100644 --- a/src/gui/general/GUIPalette.cpp +++ b/src/gui/general/GUIPalette.cpp @@ -28,7 +28,7 @@ #include "base/Colour.h" #include "document/ConfigGroups.h" -#include +#include #include diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp index 17138df..7b46812 100644 --- a/src/gui/general/MidiPitchLabel.cpp +++ b/src/gui/general/MidiPitchLabel.cpp @@ -27,7 +27,7 @@ #include #include "document/ConfigGroups.h" -#include +#include #include #include diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp index 79124e4..a5f77d9 100644 --- a/src/gui/general/PresetHandlerDialog.cpp +++ b/src/gui/general/PresetHandlerDialog.cpp @@ -37,7 +37,7 @@ #include "PresetElement.h" #include "PresetGroup.h" #include -#include +#include #include #include #include diff --git a/src/gui/general/PresetHandlerDialog.h b/src/gui/general/PresetHandlerDialog.h index 83c617f..6d7b3b6 100644 --- a/src/gui/general/PresetHandlerDialog.h +++ b/src/gui/general/PresetHandlerDialog.h @@ -97,7 +97,7 @@ protected slots: // changes. void slotCategoryIndexChanged(int index); - // write out settings to kconfig data for next time and call accept() + // write out settings to tdeconfig data for next time and call accept() void slotOk(); }; // PresetHandlerDialog diff --git a/src/gui/kdeext/KStartupLogo.cpp b/src/gui/kdeext/KStartupLogo.cpp index d1b4870..da473e9 100644 --- a/src/gui/kdeext/KStartupLogo.cpp +++ b/src/gui/kdeext/KStartupLogo.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include "KStartupLogo.h" diff --git a/src/gui/seqmanager/MetronomeMmapper.cpp b/src/gui/seqmanager/MetronomeMmapper.cpp index 672bc90..5e79b3e 100644 --- a/src/gui/seqmanager/MetronomeMmapper.cpp +++ b/src/gui/seqmanager/MetronomeMmapper.cpp @@ -40,7 +40,7 @@ #include "document/RosegardenGUIDoc.h" #include "SegmentMmapper.h" #include "sound/MappedEvent.h" -#include +#include #include #include #include diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp index c21b001..a8d6e30 100644 --- a/src/gui/seqmanager/SequenceManager.cpp +++ b/src/gui/seqmanager/SequenceManager.cpp @@ -63,7 +63,7 @@ #include "TimeSigSegmentMmapper.h" #include #include -#include +#include #include #include #include diff --git a/src/gui/studio/BankEditorDialog.cpp b/src/gui/studio/BankEditorDialog.cpp index 8c0b885..1f34ce7 100644 --- a/src/gui/studio/BankEditorDialog.cpp +++ b/src/gui/studio/BankEditorDialog.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gui/studio/ChangeRecordDeviceCommand.cpp b/src/gui/studio/ChangeRecordDeviceCommand.cpp index e9ee7f5..fb819ea 100644 --- a/src/gui/studio/ChangeRecordDeviceCommand.cpp +++ b/src/gui/studio/ChangeRecordDeviceCommand.cpp @@ -27,7 +27,7 @@ #include "document/ConfigGroups.h" #include "sound/MappedEvent.h" #include -#include +#include namespace Rosegarden { diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp index bb4e1f3..149a245 100644 --- a/src/gui/studio/DeviceManagerDialog.cpp +++ b/src/gui/studio/DeviceManagerDialog.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/gui/widgets/CollapsingFrame.cpp b/src/gui/widgets/CollapsingFrame.cpp index eec56da..2fe179f 100644 --- a/src/gui/widgets/CollapsingFrame.cpp +++ b/src/gui/widgets/CollapsingFrame.cpp @@ -26,7 +26,7 @@ #include "CollapsingFrame.h" #include #include -#include +#include #include #include #include diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp index 01a7cc5..a51f099 100644 --- a/src/gui/widgets/QuantizeParameters.cpp +++ b/src/gui/widgets/QuantizeParameters.cpp @@ -36,7 +36,7 @@ #include "gui/editors/notation/NotationStrings.h" #include "gui/editors/notation/NotePixmapFactory.h" #include -#include +#include #include #include #include diff --git a/src/misc/stableheaders.h b/src/misc/stableheaders.h index 2e70ea6..53db99e 100644 --- a/src/misc/stableheaders.h +++ b/src/misc/stableheaders.h @@ -153,7 +153,7 @@ #include #include #include -#include +#include #include #include #include @@ -163,15 +163,15 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include +#include #include #include #include diff --git a/src/sound/AudioFileManager.cpp b/src/sound/AudioFileManager.cpp index 49c6fd3..a237380 100644 --- a/src/sound/AudioFileManager.cpp +++ b/src/sound/AudioFileManager.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include