From 11f31c37e5fa4889d9989f10272f44845449cb7b Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 6 Sep 2010 20:59:29 +0000 Subject: Initial TQt conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1172292 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/commands/segment/AddTempoChangeCommand.cpp | 2 +- src/commands/segment/AddTempoChangeCommand.h | 4 ++-- src/commands/segment/AddTimeSignatureCommand.cpp | 2 +- src/commands/segment/AddTimeSignatureCommand.h | 4 ++-- src/commands/segment/AddTracksCommand.cpp | 2 +- src/commands/segment/AddTracksCommand.h | 4 ++-- .../segment/AudioSegmentAutoSplitCommand.cpp | 2 +- src/commands/segment/AudioSegmentAutoSplitCommand.h | 4 ++-- .../segment/AudioSegmentDistributeCommand.cpp | 2 +- src/commands/segment/AudioSegmentDistributeCommand.h | 4 ++-- src/commands/segment/AudioSegmentRescaleCommand.cpp | 20 ++++++++++---------- src/commands/segment/AudioSegmentRescaleCommand.h | 4 ++-- src/commands/segment/AudioSegmentSplitCommand.cpp | 4 ++-- .../segment/ChangeCompositionLengthCommand.cpp | 2 +- .../segment/ChangeCompositionLengthCommand.h | 4 ++-- src/commands/segment/DeleteTracksCommand.cpp | 2 +- src/commands/segment/DeleteTracksCommand.h | 4 ++-- src/commands/segment/ModifyDefaultTempoCommand.cpp | 2 +- src/commands/segment/ModifyDefaultTempoCommand.h | 4 ++-- src/commands/segment/MoveTracksCommand.cpp | 2 +- src/commands/segment/MoveTracksCommand.h | 4 ++-- .../segment/PasteToTriggerSegmentCommand.cpp | 4 ++-- src/commands/segment/PasteToTriggerSegmentCommand.h | 6 +++--- src/commands/segment/RemoveTempoChangeCommand.cpp | 2 +- src/commands/segment/RemoveTempoChangeCommand.h | 4 ++-- src/commands/segment/RemoveTimeSignatureCommand.cpp | 2 +- src/commands/segment/RemoveTimeSignatureCommand.h | 4 ++-- src/commands/segment/RenameTrackCommand.cpp | 2 +- src/commands/segment/RenameTrackCommand.h | 4 ++-- src/commands/segment/SegmentAutoSplitCommand.cpp | 2 +- src/commands/segment/SegmentAutoSplitCommand.h | 4 ++-- .../segment/SegmentChangePlayableRangeCommand.cpp | 4 ++-- .../segment/SegmentChangePlayableRangeCommand.h | 4 ++-- .../segment/SegmentChangeQuantizationCommand.cpp | 6 +++--- .../segment/SegmentChangeQuantizationCommand.h | 4 ++-- .../segment/SegmentChangeTransposeCommand.cpp | 4 ++-- src/commands/segment/SegmentChangeTransposeCommand.h | 4 ++-- src/commands/segment/SegmentColourCommand.cpp | 2 +- src/commands/segment/SegmentColourCommand.h | 4 ++-- src/commands/segment/SegmentColourMapCommand.cpp | 2 +- src/commands/segment/SegmentColourMapCommand.h | 4 ++-- src/commands/segment/SegmentCommand.cpp | 4 ++-- src/commands/segment/SegmentCommand.h | 4 ++-- src/commands/segment/SegmentCommandRepeat.cpp | 2 +- src/commands/segment/SegmentJoinCommand.cpp | 2 +- src/commands/segment/SegmentJoinCommand.h | 4 ++-- src/commands/segment/SegmentLabelCommand.cpp | 4 ++-- src/commands/segment/SegmentLabelCommand.h | 10 +++++----- src/commands/segment/SegmentQuickCopyCommand.cpp | 2 +- src/commands/segment/SegmentQuickCopyCommand.h | 8 ++++---- src/commands/segment/SegmentReconfigureCommand.cpp | 4 ++-- src/commands/segment/SegmentReconfigureCommand.h | 4 ++-- src/commands/segment/SegmentRescaleCommand.cpp | 4 ++-- src/commands/segment/SegmentRescaleCommand.h | 4 ++-- src/commands/segment/SegmentSplitByPitchCommand.cpp | 2 +- src/commands/segment/SegmentSplitByPitchCommand.h | 4 ++-- .../segment/SegmentSplitByRecordingSrcCommand.cpp | 2 +- .../segment/SegmentSplitByRecordingSrcCommand.h | 4 ++-- src/commands/segment/SegmentSplitCommand.cpp | 4 ++-- src/commands/segment/SegmentTransposeCommand.h | 2 +- 60 files changed, 114 insertions(+), 114 deletions(-) (limited to 'src/commands/segment') diff --git a/src/commands/segment/AddTempoChangeCommand.cpp b/src/commands/segment/AddTempoChangeCommand.cpp index 6665215..6e67b00 100644 --- a/src/commands/segment/AddTempoChangeCommand.cpp +++ b/src/commands/segment/AddTempoChangeCommand.cpp @@ -26,7 +26,7 @@ #include "AddTempoChangeCommand.h" #include "base/Composition.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/AddTempoChangeCommand.h b/src/commands/segment/AddTempoChangeCommand.h index 07036dd..c791550 100644 --- a/src/commands/segment/AddTempoChangeCommand.h +++ b/src/commands/segment/AddTempoChangeCommand.h @@ -27,7 +27,7 @@ #define _RG_ADDTEMPOCHANGECOMMAND_H_ #include -#include +#include #include "base/Event.h" #include "base/Composition.h" // for tempoT #include @@ -55,7 +55,7 @@ public: virtual ~AddTempoChangeCommand(); - static QString getGlobalName() { return i18n("Add Te&mpo Change..."); } + static TQString getGlobalName() { return i18n("Add Te&mpo Change..."); } virtual void execute(); virtual void unexecute(); diff --git a/src/commands/segment/AddTimeSignatureCommand.cpp b/src/commands/segment/AddTimeSignatureCommand.cpp index 88f2d07..0687962 100644 --- a/src/commands/segment/AddTimeSignatureCommand.cpp +++ b/src/commands/segment/AddTimeSignatureCommand.cpp @@ -27,7 +27,7 @@ #include "base/Composition.h" #include "base/NotationTypes.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/AddTimeSignatureCommand.h b/src/commands/segment/AddTimeSignatureCommand.h index fbc875d..21a0cd8 100644 --- a/src/commands/segment/AddTimeSignatureCommand.h +++ b/src/commands/segment/AddTimeSignatureCommand.h @@ -28,7 +28,7 @@ #include "base/NotationTypes.h" #include -#include +#include #include "base/Event.h" #include @@ -49,7 +49,7 @@ public: TimeSignature timeSig); virtual ~AddTimeSignatureCommand(); - static QString getGlobalName() { return i18n("Add Time Si&gnature Change..."); } + static TQString getGlobalName() { return i18n("Add Time Si&gnature Change..."); } virtual void execute(); virtual void unexecute(); diff --git a/src/commands/segment/AddTracksCommand.cpp b/src/commands/segment/AddTracksCommand.cpp index 1f09227..094b5cc 100644 --- a/src/commands/segment/AddTracksCommand.cpp +++ b/src/commands/segment/AddTracksCommand.cpp @@ -29,7 +29,7 @@ #include "base/Composition.h" #include "base/MidiProgram.h" #include "base/Track.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/AddTracksCommand.h b/src/commands/segment/AddTracksCommand.h index d3e09ca..dba0e68 100644 --- a/src/commands/segment/AddTracksCommand.h +++ b/src/commands/segment/AddTracksCommand.h @@ -29,7 +29,7 @@ #include "base/MidiProgram.h" #include "base/Composition.h" #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ public: int position); // -1 -> at end virtual ~AddTracksCommand(); - static QString getGlobalName() { return i18n("Add Tracks..."); } + static TQString getGlobalName() { return i18n("Add Tracks..."); } virtual void execute(); virtual void unexecute(); diff --git a/src/commands/segment/AudioSegmentAutoSplitCommand.cpp b/src/commands/segment/AudioSegmentAutoSplitCommand.cpp index d474b64..b450c89 100644 --- a/src/commands/segment/AudioSegmentAutoSplitCommand.cpp +++ b/src/commands/segment/AudioSegmentAutoSplitCommand.cpp @@ -34,7 +34,7 @@ #include "document/RosegardenGUIDoc.h" #include "sound/AudioFileManager.h" #include "sound/PeakFileManager.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/AudioSegmentAutoSplitCommand.h b/src/commands/segment/AudioSegmentAutoSplitCommand.h index a1c4b48..0b11f77 100644 --- a/src/commands/segment/AudioSegmentAutoSplitCommand.h +++ b/src/commands/segment/AudioSegmentAutoSplitCommand.h @@ -27,7 +27,7 @@ #define _RG_AUDIOSEGMENTAUTOSPLITCOMMAND_H_ #include -#include +#include #include #include @@ -54,7 +54,7 @@ public: virtual void execute(); virtual void unexecute(); - static QString getGlobalName() { return i18n("&Split on Silence"); } + static TQString getGlobalName() { return i18n("&Split on Silence"); } private: Segment *m_segment; diff --git a/src/commands/segment/AudioSegmentDistributeCommand.cpp b/src/commands/segment/AudioSegmentDistributeCommand.cpp index 9bdfb97..bde65f6 100644 --- a/src/commands/segment/AudioSegmentDistributeCommand.cpp +++ b/src/commands/segment/AudioSegmentDistributeCommand.cpp @@ -32,7 +32,7 @@ #include "base/Segment.h" #include "base/Selection.h" #include "sound/AudioFile.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/AudioSegmentDistributeCommand.h b/src/commands/segment/AudioSegmentDistributeCommand.h index d325daf..940fc66 100644 --- a/src/commands/segment/AudioSegmentDistributeCommand.h +++ b/src/commands/segment/AudioSegmentDistributeCommand.h @@ -28,7 +28,7 @@ #include "base/Selection.h" #include -#include +#include #include #include @@ -62,7 +62,7 @@ public: virtual ~AudioSegmentDistributeCommand(); - static QString getGlobalName() + static TQString getGlobalName() { return i18n("Distribute Audio Segments over MIDI"); } diff --git a/src/commands/segment/AudioSegmentRescaleCommand.cpp b/src/commands/segment/AudioSegmentRescaleCommand.cpp index 1386783..2786aa9 100644 --- a/src/commands/segment/AudioSegmentRescaleCommand.cpp +++ b/src/commands/segment/AudioSegmentRescaleCommand.cpp @@ -34,7 +34,7 @@ #include "sound/AudioFileTimeStretcher.h" #include "sound/AudioFileManager.h" #include "gui/widgets/ProgressDialog.h" -#include +#include namespace Rosegarden @@ -92,19 +92,19 @@ AudioSegmentRescaleCommand::~AudioSegmentRescaleCommand() void AudioSegmentRescaleCommand::connectProgressDialog(ProgressDialog *dlg) { - QObject::connect(m_stretcher, SIGNAL(setProgress(int)), - dlg->progressBar(), SLOT(setValue(int))); - QObject::connect(dlg, SIGNAL(cancelClicked()), - m_stretcher, SLOT(slotStopTimestretch())); + TQObject::connect(m_stretcher, TQT_SIGNAL(setProgress(int)), + dlg->progressBar(), TQT_SLOT(setValue(int))); + TQObject::connect(dlg, TQT_SIGNAL(cancelClicked()), + m_stretcher, TQT_SLOT(slotStopTimestretch())); } void AudioSegmentRescaleCommand::disconnectProgressDialog(ProgressDialog *dlg) { - QObject::disconnect(m_stretcher, SIGNAL(setProgress(int)), - dlg->progressBar(), SLOT(setValue(int))); - QObject::disconnect(dlg, SIGNAL(cancelClicked()), - m_stretcher, SLOT(slotStopTimestretch())); + TQObject::disconnect(m_stretcher, TQT_SIGNAL(setProgress(int)), + dlg->progressBar(), TQT_SLOT(setValue(int))); + TQObject::disconnect(dlg, TQT_SIGNAL(cancelClicked()), + m_stretcher, TQT_SLOT(slotStopTimestretch())); } void @@ -122,7 +122,7 @@ AudioSegmentRescaleCommand::execute() m_newSegment = new Segment(*m_segment); - QString oldLabel = strtoqstr(m_segment->getLabel()); + TQString oldLabel = strtoqstr(m_segment->getLabel()); if (!oldLabel.endsWith(i18n("(rescaled)"))) { m_newSegment->setLabel(qstrtostr(i18n("%1 (rescaled)").arg (oldLabel))); diff --git a/src/commands/segment/AudioSegmentRescaleCommand.h b/src/commands/segment/AudioSegmentRescaleCommand.h index a4edb13..3243a21 100644 --- a/src/commands/segment/AudioSegmentRescaleCommand.h +++ b/src/commands/segment/AudioSegmentRescaleCommand.h @@ -26,7 +26,7 @@ #define _RG_AUDIOSEGMENTRESCALECOMMAND_H_ #include -#include +#include #include "base/Event.h" #include @@ -59,7 +59,7 @@ public: void connectProgressDialog(ProgressDialog *dlg); void disconnectProgressDialog(ProgressDialog *dlg); - static QString getGlobalName() { return i18n("Stretch or S&quash..."); } + static TQString getGlobalName() { return i18n("Stretch or S&quash..."); } private: AudioFileManager *m_afm; diff --git a/src/commands/segment/AudioSegmentSplitCommand.cpp b/src/commands/segment/AudioSegmentSplitCommand.cpp index f0c462e..6657b7b 100644 --- a/src/commands/segment/AudioSegmentSplitCommand.cpp +++ b/src/commands/segment/AudioSegmentSplitCommand.cpp @@ -31,7 +31,7 @@ #include "base/RealTime.h" #include "base/Composition.h" #include "base/Segment.h" -#include +#include namespace Rosegarden @@ -99,7 +99,7 @@ AudioSegmentSplitCommand::execute() // Set labels // m_segmentLabel = m_segment->getLabel(); - QString newLabel = strtoqstr(m_segmentLabel); + TQString newLabel = strtoqstr(m_segmentLabel); if (!newLabel.endsWith(i18n(" (split)"))) { newLabel = i18n("%1 (split)").arg(newLabel); } diff --git a/src/commands/segment/ChangeCompositionLengthCommand.cpp b/src/commands/segment/ChangeCompositionLengthCommand.cpp index bdeb7a5..6dd50f9 100644 --- a/src/commands/segment/ChangeCompositionLengthCommand.cpp +++ b/src/commands/segment/ChangeCompositionLengthCommand.cpp @@ -26,7 +26,7 @@ #include "ChangeCompositionLengthCommand.h" #include "base/Composition.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/ChangeCompositionLengthCommand.h b/src/commands/segment/ChangeCompositionLengthCommand.h index 9e0db9b..4828c3a 100644 --- a/src/commands/segment/ChangeCompositionLengthCommand.h +++ b/src/commands/segment/ChangeCompositionLengthCommand.h @@ -27,7 +27,7 @@ #define _RG_CHANGECOMPOSITIONLENGTHCOMMAND_H_ #include -#include +#include #include "base/Event.h" #include @@ -49,7 +49,7 @@ public: timeT endTime); virtual ~ChangeCompositionLengthCommand(); - static QString getGlobalName() + static TQString getGlobalName() { return i18n("Change &Composition Start and End..."); } virtual void execute(); diff --git a/src/commands/segment/DeleteTracksCommand.cpp b/src/commands/segment/DeleteTracksCommand.cpp index bad2be0..4d3d72a 100644 --- a/src/commands/segment/DeleteTracksCommand.cpp +++ b/src/commands/segment/DeleteTracksCommand.cpp @@ -28,7 +28,7 @@ #include "misc/Debug.h" #include "base/Composition.h" #include "base/Segment.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/DeleteTracksCommand.h b/src/commands/segment/DeleteTracksCommand.h index d1d2332..d02f5ac 100644 --- a/src/commands/segment/DeleteTracksCommand.h +++ b/src/commands/segment/DeleteTracksCommand.h @@ -27,7 +27,7 @@ #define _RG_DELETETRACKSCOMMAND_H_ #include -#include +#include #include #include #include "base/Track.h" @@ -48,7 +48,7 @@ public: std::vector tracks); virtual ~DeleteTracksCommand(); - static QString getGlobalName() { return i18n("Delete Tracks..."); } + static TQString getGlobalName() { return i18n("Delete Tracks..."); } virtual void execute(); virtual void unexecute(); diff --git a/src/commands/segment/ModifyDefaultTempoCommand.cpp b/src/commands/segment/ModifyDefaultTempoCommand.cpp index 88360a4..2b01d4d 100644 --- a/src/commands/segment/ModifyDefaultTempoCommand.cpp +++ b/src/commands/segment/ModifyDefaultTempoCommand.cpp @@ -26,7 +26,7 @@ #include "ModifyDefaultTempoCommand.h" #include "base/Composition.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/ModifyDefaultTempoCommand.h b/src/commands/segment/ModifyDefaultTempoCommand.h index 50f736d..5ca4252 100644 --- a/src/commands/segment/ModifyDefaultTempoCommand.h +++ b/src/commands/segment/ModifyDefaultTempoCommand.h @@ -27,7 +27,7 @@ #define _RG_MODIFYDEFAULTTEMPOCOMMAND_H_ #include -#include +#include #include #include "base/Composition.h" // for tempoT @@ -48,7 +48,7 @@ public: virtual ~ModifyDefaultTempoCommand() {} - static QString getGlobalName() { return i18n("Modify &Default Tempo..."); } + static TQString getGlobalName() { return i18n("Modify &Default Tempo..."); } virtual void execute(); virtual void unexecute(); diff --git a/src/commands/segment/MoveTracksCommand.cpp b/src/commands/segment/MoveTracksCommand.cpp index 49c089b..bc967d5 100644 --- a/src/commands/segment/MoveTracksCommand.cpp +++ b/src/commands/segment/MoveTracksCommand.cpp @@ -27,7 +27,7 @@ #include "base/Composition.h" #include "base/Track.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/MoveTracksCommand.h b/src/commands/segment/MoveTracksCommand.h index e35af5e..b1a72aa 100644 --- a/src/commands/segment/MoveTracksCommand.h +++ b/src/commands/segment/MoveTracksCommand.h @@ -28,7 +28,7 @@ #include "base/Track.h" #include -#include +#include #include @@ -48,7 +48,7 @@ public: TrackId destTrack); virtual ~MoveTracksCommand(); - static QString getGlobalName() { return i18n("Move Tracks..."); } + static TQString getGlobalName() { return i18n("Move Tracks..."); } virtual void execute(); virtual void unexecute(); diff --git a/src/commands/segment/PasteToTriggerSegmentCommand.cpp b/src/commands/segment/PasteToTriggerSegmentCommand.cpp index 0447c40..1b3838a 100644 --- a/src/commands/segment/PasteToTriggerSegmentCommand.cpp +++ b/src/commands/segment/PasteToTriggerSegmentCommand.cpp @@ -33,7 +33,7 @@ #include "base/NotationTypes.h" #include "base/Segment.h" #include "base/TriggerSegment.h" -#include +#include namespace Rosegarden @@ -41,7 +41,7 @@ namespace Rosegarden PasteToTriggerSegmentCommand::PasteToTriggerSegmentCommand(Composition *composition, Clipboard *clipboard, - QString label, + TQString label, int basePitch, int baseVelocity) : KNamedCommand(i18n("Paste as New Triggered Segment")), diff --git a/src/commands/segment/PasteToTriggerSegmentCommand.h b/src/commands/segment/PasteToTriggerSegmentCommand.h index 32f95e7..adb5fe0 100644 --- a/src/commands/segment/PasteToTriggerSegmentCommand.h +++ b/src/commands/segment/PasteToTriggerSegmentCommand.h @@ -28,7 +28,7 @@ #include "base/TriggerSegment.h" #include -#include +#include @@ -47,7 +47,7 @@ public: /// If basePitch is -1, the first pitch in the selection will be used PasteToTriggerSegmentCommand(Composition *composition, Clipboard *clipboard, - QString label, + TQString label, int basePitch = -1, int baseVelocity = -1); virtual ~PasteToTriggerSegmentCommand(); @@ -58,7 +58,7 @@ public: protected: Composition *m_composition; Clipboard *m_clipboard; - QString m_label; + TQString m_label; int m_basePitch; int m_baseVelocity; Segment *m_segment; diff --git a/src/commands/segment/RemoveTempoChangeCommand.cpp b/src/commands/segment/RemoveTempoChangeCommand.cpp index 11a89ad..72e2ed5 100644 --- a/src/commands/segment/RemoveTempoChangeCommand.cpp +++ b/src/commands/segment/RemoveTempoChangeCommand.cpp @@ -26,7 +26,7 @@ #include "RemoveTempoChangeCommand.h" #include "base/Composition.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/RemoveTempoChangeCommand.h b/src/commands/segment/RemoveTempoChangeCommand.h index 1900a8b..b77f8be 100644 --- a/src/commands/segment/RemoveTempoChangeCommand.h +++ b/src/commands/segment/RemoveTempoChangeCommand.h @@ -27,7 +27,7 @@ #define _RG_REMOVETEMPOCHANGECOMMAND_H_ #include -#include +#include #include "base/Event.h" #include "base/Composition.h" // for tempoT #include @@ -55,7 +55,7 @@ public: virtual ~RemoveTempoChangeCommand() {} - static QString getGlobalName() { return i18n("Remove &Tempo Change..."); } + static TQString getGlobalName() { return i18n("Remove &Tempo Change..."); } virtual void execute(); virtual void unexecute(); diff --git a/src/commands/segment/RemoveTimeSignatureCommand.cpp b/src/commands/segment/RemoveTimeSignatureCommand.cpp index c6b59b1..5e8230b 100644 --- a/src/commands/segment/RemoveTimeSignatureCommand.cpp +++ b/src/commands/segment/RemoveTimeSignatureCommand.cpp @@ -27,7 +27,7 @@ #include "base/Composition.h" #include "base/NotationTypes.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/RemoveTimeSignatureCommand.h b/src/commands/segment/RemoveTimeSignatureCommand.h index d29d666..cc1ee59 100644 --- a/src/commands/segment/RemoveTimeSignatureCommand.h +++ b/src/commands/segment/RemoveTimeSignatureCommand.h @@ -28,7 +28,7 @@ #include "base/NotationTypes.h" #include -#include +#include #include "base/Event.h" #include @@ -55,7 +55,7 @@ public: virtual ~RemoveTimeSignatureCommand() {} - static QString getGlobalName() { return i18n("Remove &Time Signature Change..."); } + static TQString getGlobalName() { return i18n("Remove &Time Signature Change..."); } virtual void execute(); virtual void unexecute(); diff --git a/src/commands/segment/RenameTrackCommand.cpp b/src/commands/segment/RenameTrackCommand.cpp index 62d1d7e..f942e42 100644 --- a/src/commands/segment/RenameTrackCommand.cpp +++ b/src/commands/segment/RenameTrackCommand.cpp @@ -28,7 +28,7 @@ #include "misc/Debug.h" #include "base/Composition.h" #include "base/Track.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/RenameTrackCommand.h b/src/commands/segment/RenameTrackCommand.h index 8e63a88..385cd38 100644 --- a/src/commands/segment/RenameTrackCommand.h +++ b/src/commands/segment/RenameTrackCommand.h @@ -29,7 +29,7 @@ #include "base/Track.h" #include #include -#include +#include #include @@ -49,7 +49,7 @@ public: std::string name); virtual ~RenameTrackCommand(); - static QString getGlobalName() { return i18n("Rename Track"); } + static TQString getGlobalName() { return i18n("Rename Track"); } virtual void execute(); virtual void unexecute(); diff --git a/src/commands/segment/SegmentAutoSplitCommand.cpp b/src/commands/segment/SegmentAutoSplitCommand.cpp index fbd6daa..5f3630f 100644 --- a/src/commands/segment/SegmentAutoSplitCommand.cpp +++ b/src/commands/segment/SegmentAutoSplitCommand.cpp @@ -31,7 +31,7 @@ #include "base/Composition.h" #include "base/NotationTypes.h" #include "base/Segment.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/SegmentAutoSplitCommand.h b/src/commands/segment/SegmentAutoSplitCommand.h index a7e54c7..a9e03f2 100644 --- a/src/commands/segment/SegmentAutoSplitCommand.h +++ b/src/commands/segment/SegmentAutoSplitCommand.h @@ -27,7 +27,7 @@ #define _RG_SEGMENTAUTOSPLITCOMMAND_H_ #include -#include +#include #include #include @@ -50,7 +50,7 @@ public: virtual void execute(); virtual void unexecute(); - static QString getGlobalName() { return i18n("&Split on Silence"); } + static TQString getGlobalName() { return i18n("&Split on Silence"); } private: Segment *m_segment; diff --git a/src/commands/segment/SegmentChangePlayableRangeCommand.cpp b/src/commands/segment/SegmentChangePlayableRangeCommand.cpp index b4d5d3a..026e9e1 100644 --- a/src/commands/segment/SegmentChangePlayableRangeCommand.cpp +++ b/src/commands/segment/SegmentChangePlayableRangeCommand.cpp @@ -27,7 +27,7 @@ #include "base/Segment.h" #include "gui/editors/notation/NotationStrings.h" -#include +#include namespace Rosegarden @@ -70,7 +70,7 @@ SegmentChangePlayableRangeCommand::getGlobalName(int low, int high) if (!unit) { return "Undo change playable range"; } else { - return QString("Change playable range to %1-%2").arg(low, high); + return TQString("Change playable range to %1-%2").arg(low, high); } } diff --git a/src/commands/segment/SegmentChangePlayableRangeCommand.h b/src/commands/segment/SegmentChangePlayableRangeCommand.h index d78aa5c..0370def 100644 --- a/src/commands/segment/SegmentChangePlayableRangeCommand.h +++ b/src/commands/segment/SegmentChangePlayableRangeCommand.h @@ -27,7 +27,7 @@ #define _RG_SEGMENTCHANGEPLAYABLERANGECOMMAND_H_ #include -#include +#include #include #include "base/Event.h" @@ -50,7 +50,7 @@ public: virtual void execute(); virtual void unexecute(); - static QString getGlobalName(int, int); + static TQString getGlobalName(int, int); private: Segment *m_segment; diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.cpp b/src/commands/segment/SegmentChangeQuantizationCommand.cpp index 22d09f4..e26c235 100644 --- a/src/commands/segment/SegmentChangeQuantizationCommand.cpp +++ b/src/commands/segment/SegmentChangeQuantizationCommand.cpp @@ -28,7 +28,7 @@ #include "base/Segment.h" #include "base/BasicQuantizer.h" #include "gui/editors/notation/NotationStrings.h" -#include +#include namespace Rosegarden @@ -107,8 +107,8 @@ SegmentChangeQuantizationCommand::getGlobalName(timeT unit) return "Unquantize"; } else { timeT error = 0; - QString label = NotationStrings::makeNoteMenuLabel(unit, true, error); - return QString("Quantize to %1").arg(label); + TQString label = NotationStrings::makeNoteMenuLabel(unit, true, error); + return TQString("Quantize to %1").arg(label); } } diff --git a/src/commands/segment/SegmentChangeQuantizationCommand.h b/src/commands/segment/SegmentChangeQuantizationCommand.h index e5d7a36..6c69728 100644 --- a/src/commands/segment/SegmentChangeQuantizationCommand.h +++ b/src/commands/segment/SegmentChangeQuantizationCommand.h @@ -27,7 +27,7 @@ #define _RG_SEGMENTCHANGEQUANTIZATIONCOMMAND_H_ #include -#include +#include #include #include "base/Event.h" @@ -52,7 +52,7 @@ public: virtual void execute(); virtual void unexecute(); - static QString getGlobalName(timeT); + static TQString getGlobalName(timeT); private: struct SegmentRec { diff --git a/src/commands/segment/SegmentChangeTransposeCommand.cpp b/src/commands/segment/SegmentChangeTransposeCommand.cpp index 452c2d7..e7a8697 100644 --- a/src/commands/segment/SegmentChangeTransposeCommand.cpp +++ b/src/commands/segment/SegmentChangeTransposeCommand.cpp @@ -27,7 +27,7 @@ #include "base/Segment.h" #include "gui/editors/notation/NotationStrings.h" -#include +#include namespace Rosegarden @@ -65,7 +65,7 @@ SegmentChangeTransposeCommand::getGlobalName(int unit) if (!unit) { return "Undo change transposition"; } else { - return QString("Change transposition to %1").arg(unit); + return TQString("Change transposition to %1").arg(unit); } } diff --git a/src/commands/segment/SegmentChangeTransposeCommand.h b/src/commands/segment/SegmentChangeTransposeCommand.h index 64bd75a..a3c77b7 100644 --- a/src/commands/segment/SegmentChangeTransposeCommand.h +++ b/src/commands/segment/SegmentChangeTransposeCommand.h @@ -27,7 +27,7 @@ #define _RG_SEGMENTCHANGETRANSPOSECOMMAND_H_ #include -#include +#include #include #include "base/Event.h" @@ -50,7 +50,7 @@ public: virtual void execute(); virtual void unexecute(); - static QString getGlobalName(int); + static TQString getGlobalName(int); private: Segment *m_segment; diff --git a/src/commands/segment/SegmentColourCommand.cpp b/src/commands/segment/SegmentColourCommand.cpp index 7dffc8f..c572556 100644 --- a/src/commands/segment/SegmentColourCommand.cpp +++ b/src/commands/segment/SegmentColourCommand.cpp @@ -27,7 +27,7 @@ #include "base/Segment.h" #include "base/Selection.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/SegmentColourCommand.h b/src/commands/segment/SegmentColourCommand.h index 79b7d3d..6a19d63 100644 --- a/src/commands/segment/SegmentColourCommand.h +++ b/src/commands/segment/SegmentColourCommand.h @@ -28,7 +28,7 @@ #include "base/Segment.h" #include -#include +#include #include #include @@ -48,7 +48,7 @@ public: const unsigned int index); virtual ~SegmentColourCommand(); - static QString getGlobalName() + static TQString getGlobalName() { return i18n("Change Segment Color..."); } virtual void execute(); diff --git a/src/commands/segment/SegmentColourMapCommand.cpp b/src/commands/segment/SegmentColourMapCommand.cpp index 0e09d4b..9284e14 100644 --- a/src/commands/segment/SegmentColourMapCommand.cpp +++ b/src/commands/segment/SegmentColourMapCommand.cpp @@ -28,7 +28,7 @@ #include "base/ColourMap.h" #include "base/Segment.h" #include "document/RosegardenGUIDoc.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/SegmentColourMapCommand.h b/src/commands/segment/SegmentColourMapCommand.h index 257cdce..5adb533 100644 --- a/src/commands/segment/SegmentColourMapCommand.h +++ b/src/commands/segment/SegmentColourMapCommand.h @@ -29,7 +29,7 @@ #include "base/ColourMap.h" #include "base/Segment.h" #include -#include +#include #include @@ -48,7 +48,7 @@ public: const ColourMap& map); virtual ~SegmentColourMapCommand(); - static QString getGlobalName() + static TQString getGlobalName() { return i18n("Change Segment Color Map..."); } virtual void execute(); diff --git a/src/commands/segment/SegmentCommand.cpp b/src/commands/segment/SegmentCommand.cpp index 68ff846..7e9c3ab 100644 --- a/src/commands/segment/SegmentCommand.cpp +++ b/src/commands/segment/SegmentCommand.cpp @@ -26,13 +26,13 @@ #include "SegmentCommand.h" #include "base/Segment.h" -#include +#include namespace Rosegarden { -SegmentCommand::SegmentCommand(QString name, const std::vector& segments) +SegmentCommand::SegmentCommand(TQString name, const std::vector& segments) : KNamedCommand(name) { m_segments.resize(segments.size()); diff --git a/src/commands/segment/SegmentCommand.h b/src/commands/segment/SegmentCommand.h index da28a04..45865a1 100644 --- a/src/commands/segment/SegmentCommand.h +++ b/src/commands/segment/SegmentCommand.h @@ -27,7 +27,7 @@ #define _RG_SEGMENTCOMMAND_H_ #include -#include +#include #include @@ -45,7 +45,7 @@ class Segment; class SegmentCommand : public KNamedCommand { public: - SegmentCommand(QString name, const std::vector&); + SegmentCommand(TQString name, const std::vector&); typedef std::vector segmentlist; diff --git a/src/commands/segment/SegmentCommandRepeat.cpp b/src/commands/segment/SegmentCommandRepeat.cpp index 4b707cb..355c004 100644 --- a/src/commands/segment/SegmentCommandRepeat.cpp +++ b/src/commands/segment/SegmentCommandRepeat.cpp @@ -28,7 +28,7 @@ #include #include "base/Segment.h" #include "SegmentCommand.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/SegmentJoinCommand.cpp b/src/commands/segment/SegmentJoinCommand.cpp index 27b1bb8..989384d 100644 --- a/src/commands/segment/SegmentJoinCommand.cpp +++ b/src/commands/segment/SegmentJoinCommand.cpp @@ -30,7 +30,7 @@ #include "base/NotationTypes.h" #include "base/Segment.h" #include "base/Selection.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/SegmentJoinCommand.h b/src/commands/segment/SegmentJoinCommand.h index 97c7924..f7e6907 100644 --- a/src/commands/segment/SegmentJoinCommand.h +++ b/src/commands/segment/SegmentJoinCommand.h @@ -27,7 +27,7 @@ #define _RG_SEGMENTJOINCOMMAND_H_ #include -#include +#include #include #include @@ -50,7 +50,7 @@ public: virtual void execute(); virtual void unexecute(); - static QString getGlobalName() { return i18n("&Join"); } + static TQString getGlobalName() { return i18n("&Join"); } private: std::vector m_oldSegments; diff --git a/src/commands/segment/SegmentLabelCommand.cpp b/src/commands/segment/SegmentLabelCommand.cpp index 8bc0ff4..afffaba 100644 --- a/src/commands/segment/SegmentLabelCommand.cpp +++ b/src/commands/segment/SegmentLabelCommand.cpp @@ -28,7 +28,7 @@ #include "misc/Strings.h" #include "base/Segment.h" #include "base/Selection.h" -#include +#include namespace Rosegarden @@ -36,7 +36,7 @@ namespace Rosegarden SegmentLabelCommand::SegmentLabelCommand( SegmentSelection &segments, - const QString &label): + const TQString &label): KNamedCommand(i18n("Label Segments")), m_newLabel(label) { diff --git a/src/commands/segment/SegmentLabelCommand.h b/src/commands/segment/SegmentLabelCommand.h index 1c55f3b..215b827 100644 --- a/src/commands/segment/SegmentLabelCommand.h +++ b/src/commands/segment/SegmentLabelCommand.h @@ -27,7 +27,7 @@ #define _RG_SEGMENTLABELCOMMAND_H_ #include -#include +#include #include #include @@ -45,10 +45,10 @@ class SegmentLabelCommand : public KNamedCommand { public: SegmentLabelCommand(SegmentSelection &segments, - const QString &label); + const TQString &label); virtual ~SegmentLabelCommand(); - static QString getGlobalName() + static TQString getGlobalName() { return i18n("Re&label..."); } virtual void execute(); @@ -56,8 +56,8 @@ public: protected: std::vector m_segments; - std::vector m_labels; - QString m_newLabel; + std::vector m_labels; + TQString m_newLabel; }; diff --git a/src/commands/segment/SegmentQuickCopyCommand.cpp b/src/commands/segment/SegmentQuickCopyCommand.cpp index 1ce432c..6e118c8 100644 --- a/src/commands/segment/SegmentQuickCopyCommand.cpp +++ b/src/commands/segment/SegmentQuickCopyCommand.cpp @@ -28,7 +28,7 @@ #include "misc/Strings.h" #include "base/Composition.h" #include "base/Segment.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/SegmentQuickCopyCommand.h b/src/commands/segment/SegmentQuickCopyCommand.h index 638b16a..7e97781 100644 --- a/src/commands/segment/SegmentQuickCopyCommand.h +++ b/src/commands/segment/SegmentQuickCopyCommand.h @@ -23,11 +23,11 @@ COPYING included with this distribution for more information. */ -#ifndef _RG_SEGMENTQUICKCOPYCOMMAND_H_ -#define _RG_SEGMENTQUICKCOPYCOMMAND_H_ +#ifndef _RG_SEGMENQUICKCOPYCOMMAND_H_ +#define _RG_SEGMENQUICKCOPYCOMMAND_H_ #include -#include +#include #include @@ -52,7 +52,7 @@ public: // return pointer to new copy Segment* getCopy() { return m_segment; } - static QString getGlobalName() { return i18n("Quick-Copy Segment"); } + static TQString getGlobalName() { return i18n("Quick-Copy Segment"); } private: Composition *m_composition; diff --git a/src/commands/segment/SegmentReconfigureCommand.cpp b/src/commands/segment/SegmentReconfigureCommand.cpp index ec9d1bd..183b4ac 100644 --- a/src/commands/segment/SegmentReconfigureCommand.cpp +++ b/src/commands/segment/SegmentReconfigureCommand.cpp @@ -27,13 +27,13 @@ #include "base/Segment.h" #include "base/Track.h" -#include +#include namespace Rosegarden { -SegmentReconfigureCommand::SegmentReconfigureCommand(QString name) : +SegmentReconfigureCommand::SegmentReconfigureCommand(TQString name) : KNamedCommand(name) {} diff --git a/src/commands/segment/SegmentReconfigureCommand.h b/src/commands/segment/SegmentReconfigureCommand.h index be82e47..ec35725 100644 --- a/src/commands/segment/SegmentReconfigureCommand.h +++ b/src/commands/segment/SegmentReconfigureCommand.h @@ -28,7 +28,7 @@ #include "base/Track.h" #include -#include +#include #include #include "base/Event.h" @@ -48,7 +48,7 @@ class Segment; class SegmentReconfigureCommand : public KNamedCommand { public: - SegmentReconfigureCommand(QString name); + SegmentReconfigureCommand(TQString name); virtual ~SegmentReconfigureCommand(); struct SegmentRec { diff --git a/src/commands/segment/SegmentRescaleCommand.cpp b/src/commands/segment/SegmentRescaleCommand.cpp index d7a7c80..ce8a6d1 100644 --- a/src/commands/segment/SegmentRescaleCommand.cpp +++ b/src/commands/segment/SegmentRescaleCommand.cpp @@ -30,7 +30,7 @@ #include "base/Composition.h" #include "base/NotationTypes.h" #include "base/Segment.h" -#include +#include namespace Rosegarden @@ -98,7 +98,7 @@ SegmentRescaleCommand::execute() m_newSegment = new Segment(); m_newSegment->setTrack(m_segment->getTrack()); - QString oldLabel = strtoqstr(m_segment->getLabel()); + TQString oldLabel = strtoqstr(m_segment->getLabel()); if (oldLabel.endsWith(i18n("(rescaled)"))) { m_newSegment->setLabel(m_segment->getLabel()); } else { diff --git a/src/commands/segment/SegmentRescaleCommand.h b/src/commands/segment/SegmentRescaleCommand.h index 7a34727..bc724be 100644 --- a/src/commands/segment/SegmentRescaleCommand.h +++ b/src/commands/segment/SegmentRescaleCommand.h @@ -27,7 +27,7 @@ #define _RG_SEGMENTRESCALECOMMAND_H_ #include -#include +#include #include "base/Event.h" #include @@ -55,7 +55,7 @@ public: virtual void execute(); virtual void unexecute(); - static QString getGlobalName() { return i18n("Stretch or S&quash..."); } + static TQString getGlobalName() { return i18n("Stretch or S&quash..."); } private: Segment *m_segment; diff --git a/src/commands/segment/SegmentSplitByPitchCommand.cpp b/src/commands/segment/SegmentSplitByPitchCommand.cpp index 2000a35..9510848 100644 --- a/src/commands/segment/SegmentSplitByPitchCommand.cpp +++ b/src/commands/segment/SegmentSplitByPitchCommand.cpp @@ -34,7 +34,7 @@ #include "base/NotationQuantizer.h" #include "base/Segment.h" #include "base/SegmentNotationHelper.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/SegmentSplitByPitchCommand.h b/src/commands/segment/SegmentSplitByPitchCommand.h index e536be6..b935867 100644 --- a/src/commands/segment/SegmentSplitByPitchCommand.h +++ b/src/commands/segment/SegmentSplitByPitchCommand.h @@ -28,7 +28,7 @@ #include "base/Segment.h" #include -#include +#include #include #include "gui/general/ClefIndex.h" @@ -57,7 +57,7 @@ public: ClefHandling clefHandling); virtual ~SegmentSplitByPitchCommand(); - static QString getGlobalName() + static TQString getGlobalName() { return i18n("Split by &Pitch..."); } virtual void execute(); diff --git a/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp b/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp index fbb3c1b..801fc1d 100644 --- a/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp +++ b/src/commands/segment/SegmentSplitByRecordingSrcCommand.cpp @@ -31,7 +31,7 @@ #include "base/Event.h" #include "base/NotationTypes.h" #include "base/Segment.h" -#include +#include namespace Rosegarden diff --git a/src/commands/segment/SegmentSplitByRecordingSrcCommand.h b/src/commands/segment/SegmentSplitByRecordingSrcCommand.h index 3b087ab..03ca3b6 100644 --- a/src/commands/segment/SegmentSplitByRecordingSrcCommand.h +++ b/src/commands/segment/SegmentSplitByRecordingSrcCommand.h @@ -27,7 +27,7 @@ #define _RG_SEGMENTSPLITBYRECORDINGSRCCOMMAND_H_ #include -#include +#include #include #include "gui/application/RosegardenDCOP.h" @@ -48,7 +48,7 @@ public: int channel, int device); virtual ~SegmentSplitByRecordingSrcCommand(); - static QString getGlobalName() + static TQString getGlobalName() { return i18n("Split by &Recording Source..."); } virtual void execute(); diff --git a/src/commands/segment/SegmentSplitCommand.cpp b/src/commands/segment/SegmentSplitCommand.cpp index 450ad3e..9fbcdf6 100644 --- a/src/commands/segment/SegmentSplitCommand.cpp +++ b/src/commands/segment/SegmentSplitCommand.cpp @@ -31,7 +31,7 @@ #include "base/Composition.h" #include "base/NotationTypes.h" #include "base/Segment.h" -#include +#include namespace Rosegarden @@ -131,7 +131,7 @@ SegmentSplitCommand::execute() // Set labels // m_segmentLabel = m_segment->getLabel(); - QString newLabel = strtoqstr(m_segmentLabel); + TQString newLabel = strtoqstr(m_segmentLabel); if (!newLabel.endsWith(i18n(" (split)"))) { newLabel = i18n("%1 (split)").arg(newLabel); } diff --git a/src/commands/segment/SegmentTransposeCommand.h b/src/commands/segment/SegmentTransposeCommand.h index 74af8d4..075ca79 100644 --- a/src/commands/segment/SegmentTransposeCommand.h +++ b/src/commands/segment/SegmentTransposeCommand.h @@ -49,7 +49,7 @@ public: virtual ~SegmentTransposeCommand(); - static QString getGlobalName(int semitones = 0, int step = 0) { + static TQString getGlobalName(int semitones = 0, int step = 0) { switch (semitones) { default: return i18n("Transpose by &Interval..."); } -- cgit v1.2.1