diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:51:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:51:32 -0600 |
| commit | 5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb (patch) | |
| tree | 7fdeb64e5bef896a23bdf46847e3ffd3ec460cda /src/gui/seqmanager | |
| parent | 3f02581883759395fcd3935ec1d88ddca4895f32 (diff) | |
| download | rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.tar.gz rosegarden-5459fb4c7fae55b0f5ce4826d7bee2c32069d4cb.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/seqmanager')
| -rw-r--r-- | src/gui/seqmanager/CompositionMmapper.cpp | 2 | ||||
| -rw-r--r-- | src/gui/seqmanager/ControlBlockMmapper.cpp | 2 | ||||
| -rw-r--r-- | src/gui/seqmanager/MetronomeMmapper.cpp | 2 | ||||
| -rw-r--r-- | src/gui/seqmanager/MidiFilterDialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/seqmanager/SequenceManager.cpp | 6 | ||||
| -rw-r--r-- | src/gui/seqmanager/SpecialSegmentMmapper.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/seqmanager/CompositionMmapper.cpp b/src/gui/seqmanager/CompositionMmapper.cpp index 543959d..c86fbab 100644 --- a/src/gui/seqmanager/CompositionMmapper.cpp +++ b/src/gui/seqmanager/CompositionMmapper.cpp @@ -33,7 +33,7 @@ #include "gui/application/RosegardenApplication.h" #include "SegmentMmapperFactory.h" #include "SegmentMmapper.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <tqdir.h> #include <tqfile.h> #include <tqstring.h> diff --git a/src/gui/seqmanager/ControlBlockMmapper.cpp b/src/gui/seqmanager/ControlBlockMmapper.cpp index 2d64c57..ec4810b 100644 --- a/src/gui/seqmanager/ControlBlockMmapper.cpp +++ b/src/gui/seqmanager/ControlBlockMmapper.cpp @@ -34,7 +34,7 @@ #include "base/Track.h" #include "document/RosegardenGUIDoc.h" #include "sound/ControlBlock.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <tqfile.h> #include <tqstring.h> #include <sys/types.h> diff --git a/src/gui/seqmanager/MetronomeMmapper.cpp b/src/gui/seqmanager/MetronomeMmapper.cpp index ab46191..196c481 100644 --- a/src/gui/seqmanager/MetronomeMmapper.cpp +++ b/src/gui/seqmanager/MetronomeMmapper.cpp @@ -41,7 +41,7 @@ #include "SegmentMmapper.h" #include "sound/MappedEvent.h" #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqstring.h> #include <algorithm> diff --git a/src/gui/seqmanager/MidiFilterDialog.cpp b/src/gui/seqmanager/MidiFilterDialog.cpp index 0227eff..1988f2a 100644 --- a/src/gui/seqmanager/MidiFilterDialog.cpp +++ b/src/gui/seqmanager/MidiFilterDialog.cpp @@ -25,7 +25,7 @@ #include "MidiFilterDialog.h" -#include <klocale.h> +#include <tdelocale.h> #include "base/MidiProgram.h" #include "base/NotationTypes.h" #include "document/RosegardenGUIDoc.h" diff --git a/src/gui/seqmanager/SequenceManager.cpp b/src/gui/seqmanager/SequenceManager.cpp index e0b0b2d..cc6d52b 100644 --- a/src/gui/seqmanager/SequenceManager.cpp +++ b/src/gui/seqmanager/SequenceManager.cpp @@ -61,11 +61,11 @@ #include "sound/SoundDriver.h" #include "TempoSegmentMmapper.h" #include "TimeSigSegmentMmapper.h" -#include <klocale.h> +#include <tdelocale.h> #include <kstddirs.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <tqapplication.h> #include <tqcstring.h> #include <tqcursor.h> diff --git a/src/gui/seqmanager/SpecialSegmentMmapper.cpp b/src/gui/seqmanager/SpecialSegmentMmapper.cpp index e556820..45a87fd 100644 --- a/src/gui/seqmanager/SpecialSegmentMmapper.cpp +++ b/src/gui/seqmanager/SpecialSegmentMmapper.cpp @@ -31,7 +31,7 @@ #include "base/TriggerSegment.h" #include "document/RosegardenGUIDoc.h" #include "SegmentMmapper.h" -#include <kglobal.h> +#include <tdeglobal.h> #include <tqstring.h> |