diff options
Diffstat (limited to 'src/gui/editors')
57 files changed, 58 insertions, 58 deletions
diff --git a/src/gui/editors/eventlist/EventView.h b/src/gui/editors/eventlist/EventView.h index 0adbab0..fb25502 100644 --- a/src/gui/editors/eventlist/EventView.h +++ b/src/gui/editors/eventlist/EventView.h @@ -58,7 +58,7 @@ class Event; class EventView : public EditViewBase, public SegmentObserver { Q_OBJECT - TQ_OBJECT + // Event filters // diff --git a/src/gui/editors/guitar/GuitarChordEditorDialog.h b/src/gui/editors/guitar/GuitarChordEditorDialog.h index 1e8e1e1..ca0cc98 100644 --- a/src/gui/editors/guitar/GuitarChordEditorDialog.h +++ b/src/gui/editors/guitar/GuitarChordEditorDialog.h @@ -42,7 +42,7 @@ class FingeringBox; class GuitarChordEditorDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: GuitarChordEditorDialog(Guitar::Chord&, const Guitar::ChordMap& chordMap, TQWidget *parent=0); diff --git a/src/gui/editors/guitar/GuitarChordSelectorDialog.h b/src/gui/editors/guitar/GuitarChordSelectorDialog.h index bb0e529..63d5ede 100644 --- a/src/gui/editors/guitar/GuitarChordSelectorDialog.h +++ b/src/gui/editors/guitar/GuitarChordSelectorDialog.h @@ -46,7 +46,7 @@ class FingeringBox; class GuitarChordSelectorDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + enum { COMPLEXITY_BEGINNER, COMPLEXITY_COMMON, COMPLEXITY_ALL }; diff --git a/src/gui/editors/matrix/MatrixCanvasView.h b/src/gui/editors/matrix/MatrixCanvasView.h index 440e941..ccba92a 100644 --- a/src/gui/editors/matrix/MatrixCanvasView.h +++ b/src/gui/editors/matrix/MatrixCanvasView.h @@ -48,7 +48,7 @@ class MatrixElement; class MatrixCanvasView : public RosegardenCanvasView { Q_OBJECT - TQ_OBJECT + public: MatrixCanvasView(MatrixStaff&, diff --git a/src/gui/editors/matrix/MatrixMover.h b/src/gui/editors/matrix/MatrixMover.h index 9886bdd..01a6c9a 100644 --- a/src/gui/editors/matrix/MatrixMover.h +++ b/src/gui/editors/matrix/MatrixMover.h @@ -47,7 +47,7 @@ class Event; class MatrixMover : public MatrixTool { Q_OBJECT - TQ_OBJECT + friend class MatrixToolBox; diff --git a/src/gui/editors/matrix/MatrixPainter.h b/src/gui/editors/matrix/MatrixPainter.h index f7e8e6f..0370c44 100644 --- a/src/gui/editors/matrix/MatrixPainter.h +++ b/src/gui/editors/matrix/MatrixPainter.h @@ -47,7 +47,7 @@ class Event; class MatrixPainter : public MatrixTool { Q_OBJECT - TQ_OBJECT + friend class MatrixToolBox; diff --git a/src/gui/editors/matrix/MatrixParameterBox.h b/src/gui/editors/matrix/MatrixParameterBox.h index be69899..e214630 100644 --- a/src/gui/editors/matrix/MatrixParameterBox.h +++ b/src/gui/editors/matrix/MatrixParameterBox.h @@ -47,7 +47,7 @@ class EventSelection; class MatrixParameterBox : public TQFrame { Q_OBJECT - TQ_OBJECT + public: MatrixParameterBox(RosegardenGUIDoc *doc=0, TQWidget *parent=0, const char* name=0); diff --git a/src/gui/editors/matrix/MatrixResizer.h b/src/gui/editors/matrix/MatrixResizer.h index cbbf8cc..a36acb3 100644 --- a/src/gui/editors/matrix/MatrixResizer.h +++ b/src/gui/editors/matrix/MatrixResizer.h @@ -47,7 +47,7 @@ class Event; class MatrixResizer : public MatrixTool { Q_OBJECT - TQ_OBJECT + friend class MatrixToolBox; diff --git a/src/gui/editors/matrix/MatrixSelector.h b/src/gui/editors/matrix/MatrixSelector.h index 1e8a741..c875898 100644 --- a/src/gui/editors/matrix/MatrixSelector.h +++ b/src/gui/editors/matrix/MatrixSelector.h @@ -50,7 +50,7 @@ class EditTool; class MatrixSelector : public MatrixTool { Q_OBJECT - TQ_OBJECT + friend class MatrixToolBox; diff --git a/src/gui/editors/matrix/MatrixTool.h b/src/gui/editors/matrix/MatrixTool.h index fb45920..9596677 100644 --- a/src/gui/editors/matrix/MatrixTool.h +++ b/src/gui/editors/matrix/MatrixTool.h @@ -44,7 +44,7 @@ class SnapGrid; class MatrixTool : public EditTool { Q_OBJECT - TQ_OBJECT + public: // virtual void ready(); diff --git a/src/gui/editors/matrix/MatrixToolBox.h b/src/gui/editors/matrix/MatrixToolBox.h index 2f43206..07593f4 100644 --- a/src/gui/editors/matrix/MatrixToolBox.h +++ b/src/gui/editors/matrix/MatrixToolBox.h @@ -42,7 +42,7 @@ class MatrixStaff; class MatrixToolBox : public EditToolBox { Q_OBJECT - TQ_OBJECT + public: MatrixToolBox(MatrixView* parent); diff --git a/src/gui/editors/matrix/MatrixView.h b/src/gui/editors/matrix/MatrixView.h index 45c43fb..bc72563 100644 --- a/src/gui/editors/matrix/MatrixView.h +++ b/src/gui/editors/matrix/MatrixView.h @@ -82,7 +82,7 @@ class LevelInfo; class MatrixView : public EditView { Q_OBJECT - TQ_OBJECT + friend class MatrixSelector; @@ -675,7 +675,7 @@ protected: // class NoteSender : public TQObject // { // Q_OBJECT -// TQ_OBJECT +// // public: // NoteSender(int i, int p) : m_insid(i), m_pitch(p) { } diff --git a/src/gui/editors/matrix/PianoKeyboard.h b/src/gui/editors/matrix/PianoKeyboard.h index 3d8b583..05f515b 100644 --- a/src/gui/editors/matrix/PianoKeyboard.h +++ b/src/gui/editors/matrix/PianoKeyboard.h @@ -45,7 +45,7 @@ namespace Rosegarden class PianoKeyboard : public PitchRuler { Q_OBJECT - TQ_OBJECT + public: PianoKeyboard(TQWidget *parent, int keys = 88); diff --git a/src/gui/editors/notation/ClefInserter.h b/src/gui/editors/notation/ClefInserter.h index adab546..5571947 100644 --- a/src/gui/editors/notation/ClefInserter.h +++ b/src/gui/editors/notation/ClefInserter.h @@ -48,7 +48,7 @@ class NotationView; class ClefInserter : public NotationTool { Q_OBJECT - TQ_OBJECT + friend class NotationToolBox; diff --git a/src/gui/editors/notation/FontViewFrame.h b/src/gui/editors/notation/FontViewFrame.h index 1d649c4..c285da5 100644 --- a/src/gui/editors/notation/FontViewFrame.h +++ b/src/gui/editors/notation/FontViewFrame.h @@ -43,7 +43,7 @@ namespace Rosegarden class FontViewFrame : public TQFrame { Q_OBJECT - TQ_OBJECT + public: FontViewFrame(int pixelSize, TQWidget *parent = 0, const char *name = 0); diff --git a/src/gui/editors/notation/GuitarChordInserter.h b/src/gui/editors/notation/GuitarChordInserter.h index 166f179..41bc185 100644 --- a/src/gui/editors/notation/GuitarChordInserter.h +++ b/src/gui/editors/notation/GuitarChordInserter.h @@ -48,7 +48,7 @@ class GuitarChordSelectorDialog; class GuitarChordInserter : public NotationTool { Q_OBJECT - TQ_OBJECT + friend class NotationToolBox; diff --git a/src/gui/editors/notation/HeadersGroup.h b/src/gui/editors/notation/HeadersGroup.h index a3fb706..19001f2 100644 --- a/src/gui/editors/notation/HeadersGroup.h +++ b/src/gui/editors/notation/HeadersGroup.h @@ -54,7 +54,7 @@ class TrackHeader; class HeadersGroup : public TQVBox { Q_OBJECT - TQ_OBJECT + public: /** * Create an empty headers group diff --git a/src/gui/editors/notation/NotationCanvasView.h b/src/gui/editors/notation/NotationCanvasView.h index 01f19b2..b06f206 100644 --- a/src/gui/editors/notation/NotationCanvasView.h +++ b/src/gui/editors/notation/NotationCanvasView.h @@ -66,7 +66,7 @@ class LinedStaffManager; class NotationCanvasView : public RosegardenCanvasView { Q_OBJECT - TQ_OBJECT + public: NotationCanvasView(const LinedStaffManager &staffmgr, diff --git a/src/gui/editors/notation/NotationEraser.h b/src/gui/editors/notation/NotationEraser.h index d87f21f..357fa34 100644 --- a/src/gui/editors/notation/NotationEraser.h +++ b/src/gui/editors/notation/NotationEraser.h @@ -47,7 +47,7 @@ class NotationView; class NotationEraser : public NotationTool { Q_OBJECT - TQ_OBJECT + friend class NotationToolBox; diff --git a/src/gui/editors/notation/NotationSelector.h b/src/gui/editors/notation/NotationSelector.h index 85ab92a..8768566 100644 --- a/src/gui/editors/notation/NotationSelector.h +++ b/src/gui/editors/notation/NotationSelector.h @@ -54,7 +54,7 @@ class Event; class NotationSelector : public NotationTool { Q_OBJECT - TQ_OBJECT + friend class NotationToolBox; diff --git a/src/gui/editors/notation/NotationToolBox.h b/src/gui/editors/notation/NotationToolBox.h index 06ef576..8689541 100644 --- a/src/gui/editors/notation/NotationToolBox.h +++ b/src/gui/editors/notation/NotationToolBox.h @@ -47,7 +47,7 @@ class EditTool; class NotationToolBox : public EditToolBox { Q_OBJECT - TQ_OBJECT + public: NotationToolBox(NotationView* parent); diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h index ac8f58c..861a523 100644 --- a/src/gui/editors/notation/NotationView.h +++ b/src/gui/editors/notation/NotationView.h @@ -109,7 +109,7 @@ class NotationView : public EditView, friend class LilyPondExporter; Q_OBJECT - TQ_OBJECT + public: explicit NotationView(RosegardenGUIDoc *doc, diff --git a/src/gui/editors/notation/NoteFontViewer.h b/src/gui/editors/notation/NoteFontViewer.h index 69c62c6..8be1257 100644 --- a/src/gui/editors/notation/NoteFontViewer.h +++ b/src/gui/editors/notation/NoteFontViewer.h @@ -44,7 +44,7 @@ class FontViewFrame; class NoteFontViewer : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: NoteFontViewer(TQWidget *parent, TQString noteFontName, diff --git a/src/gui/editors/notation/NoteInserter.h b/src/gui/editors/notation/NoteInserter.h index 81f035d..6280acb 100644 --- a/src/gui/editors/notation/NoteInserter.h +++ b/src/gui/editors/notation/NoteInserter.h @@ -52,7 +52,7 @@ class Event; class NoteInserter : public NotationTool { Q_OBJECT - TQ_OBJECT + friend class NotationToolBox; diff --git a/src/gui/editors/notation/RestInserter.h b/src/gui/editors/notation/RestInserter.h index 3cac3d3..54f7517 100644 --- a/src/gui/editors/notation/RestInserter.h +++ b/src/gui/editors/notation/RestInserter.h @@ -48,7 +48,7 @@ class Event; class RestInserter : public NoteInserter { Q_OBJECT - TQ_OBJECT + friend class NotationToolBox; diff --git a/src/gui/editors/notation/TextInserter.h b/src/gui/editors/notation/TextInserter.h index b00c4ae..f4d6a4a 100644 --- a/src/gui/editors/notation/TextInserter.h +++ b/src/gui/editors/notation/TextInserter.h @@ -48,7 +48,7 @@ class NotationView; class TextInserter : public NotationTool { Q_OBJECT - TQ_OBJECT + friend class NotationToolBox; diff --git a/src/gui/editors/notation/TrackHeader.h b/src/gui/editors/notation/TrackHeader.h index 85ee067..50047c3 100644 --- a/src/gui/editors/notation/TrackHeader.h +++ b/src/gui/editors/notation/TrackHeader.h @@ -53,7 +53,7 @@ class Segment; class TrackHeader : public TQLabel { Q_OBJECT - TQ_OBJECT + public: /** * Create a new track header for track of id trackId. diff --git a/src/gui/editors/parameters/AudioInstrumentParameterPanel.h b/src/gui/editors/parameters/AudioInstrumentParameterPanel.h index 9b771c7..43c9ff6 100644 --- a/src/gui/editors/parameters/AudioInstrumentParameterPanel.h +++ b/src/gui/editors/parameters/AudioInstrumentParameterPanel.h @@ -47,7 +47,7 @@ class AudioFaderBox; class AudioInstrumentParameterPanel : public InstrumentParameterPanel { Q_OBJECT - TQ_OBJECT + public: AudioInstrumentParameterPanel(RosegardenGUIDoc* doc, TQWidget* parent); diff --git a/src/gui/editors/parameters/InstrumentParameterBox.h b/src/gui/editors/parameters/InstrumentParameterBox.h index 6d03b7b..64d06d1 100644 --- a/src/gui/editors/parameters/InstrumentParameterBox.h +++ b/src/gui/editors/parameters/InstrumentParameterBox.h @@ -53,7 +53,7 @@ class AudioInstrumentParameterPanel; class InstrumentParameterBox : public RosegardenParameterBox { Q_OBJECT - TQ_OBJECT + public: InstrumentParameterBox(RosegardenGUIDoc *doc, diff --git a/src/gui/editors/parameters/InstrumentParameterPanel.h b/src/gui/editors/parameters/InstrumentParameterPanel.h index 1674a74..6c4b475 100644 --- a/src/gui/editors/parameters/InstrumentParameterPanel.h +++ b/src/gui/editors/parameters/InstrumentParameterPanel.h @@ -50,7 +50,7 @@ typedef std::vector<std::pair<int, RotaryPair> > RotaryMap; class InstrumentParameterPanel : public TQFrame { Q_OBJECT - TQ_OBJECT + public: InstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent); diff --git a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h index 1a8db85..ecceb6f 100644 --- a/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h +++ b/src/gui/editors/parameters/MIDIInstrumentParameterPanel.h @@ -52,7 +52,7 @@ class Instrument; class MIDIInstrumentParameterPanel : public InstrumentParameterPanel { Q_OBJECT - TQ_OBJECT + public: MIDIInstrumentParameterPanel(RosegardenGUIDoc *doc, TQWidget* parent); diff --git a/src/gui/editors/parameters/RosegardenParameterArea.h b/src/gui/editors/parameters/RosegardenParameterArea.h index 95eae45..2788048 100644 --- a/src/gui/editors/parameters/RosegardenParameterArea.h +++ b/src/gui/editors/parameters/RosegardenParameterArea.h @@ -52,7 +52,7 @@ class RosegardenParameterBox; class RosegardenParameterArea : public TQWidgetStack { Q_OBJECT - TQ_OBJECT + public: // Create the parameter display area. diff --git a/src/gui/editors/parameters/RosegardenParameterBox.h b/src/gui/editors/parameters/RosegardenParameterBox.h index df21d92..e7fbfef 100644 --- a/src/gui/editors/parameters/RosegardenParameterBox.h +++ b/src/gui/editors/parameters/RosegardenParameterBox.h @@ -51,7 +51,7 @@ namespace Rosegarden class RosegardenParameterBox : public TQFrame { Q_OBJECT - TQ_OBJECT + public: RosegardenParameterBox(const TQString &shortLabel, // e.g. i18n("Track") const TQString &longLabel, // e.g. i18n("Track Parameters") diff --git a/src/gui/editors/parameters/SegmentParameterBox.h b/src/gui/editors/parameters/SegmentParameterBox.h index cfc801a..b1c0db4 100644 --- a/src/gui/editors/parameters/SegmentParameterBox.h +++ b/src/gui/editors/parameters/SegmentParameterBox.h @@ -60,7 +60,7 @@ class SegmentParameterBox : public RosegardenParameterBox, public CompositionObserver { Q_OBJECT - TQ_OBJECT + public: diff --git a/src/gui/editors/parameters/TrackParameterBox.h b/src/gui/editors/parameters/TrackParameterBox.h index 3975813..d42cdb6 100644 --- a/src/gui/editors/parameters/TrackParameterBox.h +++ b/src/gui/editors/parameters/TrackParameterBox.h @@ -57,7 +57,7 @@ class RosegardenGUIDoc; class TrackParameterBox : public RosegardenParameterBox { Q_OBJECT - TQ_OBJECT + public: TrackParameterBox( RosegardenGUIDoc *doc, diff --git a/src/gui/editors/segment/ControlEditorDialog.h b/src/gui/editors/segment/ControlEditorDialog.h index fa481d1..f606210 100644 --- a/src/gui/editors/segment/ControlEditorDialog.h +++ b/src/gui/editors/segment/ControlEditorDialog.h @@ -50,7 +50,7 @@ class MultiViewCommandHistory; class ControlEditorDialog : public KMainWindow { Q_OBJECT - TQ_OBJECT + public: ControlEditorDialog(TQWidget *parent, diff --git a/src/gui/editors/segment/ControlParameterEditDialog.h b/src/gui/editors/segment/ControlParameterEditDialog.h index 727585d..13405bc 100644 --- a/src/gui/editors/segment/ControlParameterEditDialog.h +++ b/src/gui/editors/segment/ControlParameterEditDialog.h @@ -47,7 +47,7 @@ class RosegardenGUIDoc; class ControlParameterEditDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: ControlParameterEditDialog(TQWidget *parent, ControlParameter *control, diff --git a/src/gui/editors/segment/MarkerEditor.h b/src/gui/editors/segment/MarkerEditor.h index 1ddc200..3a03af8 100644 --- a/src/gui/editors/segment/MarkerEditor.h +++ b/src/gui/editors/segment/MarkerEditor.h @@ -51,7 +51,7 @@ class MultiViewCommandHistory; class MarkerEditor : public KMainWindow { Q_OBJECT - TQ_OBJECT + public: MarkerEditor(TQWidget *parent, diff --git a/src/gui/editors/segment/PlayList.h b/src/gui/editors/segment/PlayList.h index cf7b073..ba80075 100644 --- a/src/gui/editors/segment/PlayList.h +++ b/src/gui/editors/segment/PlayList.h @@ -46,7 +46,7 @@ class PlayListView; class PlayList : public TQVBox { Q_OBJECT - TQ_OBJECT + public: PlayList(TQWidget *parent = 0, const char *name = 0); diff --git a/src/gui/editors/segment/PlayListDialog.h b/src/gui/editors/segment/PlayListDialog.h index 0ae205c..754a4df 100644 --- a/src/gui/editors/segment/PlayListDialog.h +++ b/src/gui/editors/segment/PlayListDialog.h @@ -43,7 +43,7 @@ class PlayList; class PlayListDialog : public KDialogBase { Q_OBJECT - TQ_OBJECT + public: PlayListDialog(TQString caption, TQWidget* parent = 0, const char* name = 0); diff --git a/src/gui/editors/segment/TrackButtons.h b/src/gui/editors/segment/TrackButtons.h index 184ed19..729557c 100644 --- a/src/gui/editors/segment/TrackButtons.h +++ b/src/gui/editors/segment/TrackButtons.h @@ -54,7 +54,7 @@ class Instrument; class TrackButtons : public TQFrame { Q_OBJECT - TQ_OBJECT + public: TrackButtons(RosegardenGUIDoc* doc, diff --git a/src/gui/editors/segment/TrackEditor.h b/src/gui/editors/segment/TrackEditor.h index 88dab1d..423f6cc 100644 --- a/src/gui/editors/segment/TrackEditor.h +++ b/src/gui/editors/segment/TrackEditor.h @@ -68,7 +68,7 @@ class StandardRuler; class TrackEditor : public TQWidget, virtual public TrackEditorIface { Q_OBJECT - TQ_OBJECT + public: /** * Create a new TrackEditor representing the document \a doc diff --git a/src/gui/editors/segment/TrackLabel.h b/src/gui/editors/segment/TrackLabel.h index 5369165..93889ab 100644 --- a/src/gui/editors/segment/TrackLabel.h +++ b/src/gui/editors/segment/TrackLabel.h @@ -50,7 +50,7 @@ namespace Rosegarden class TrackLabel : public TQWidgetStack { Q_OBJECT - TQ_OBJECT + public: enum InstrumentTrackLabels diff --git a/src/gui/editors/segment/TriggerSegmentManager.h b/src/gui/editors/segment/TriggerSegmentManager.h index bae2245..0ec42bd 100644 --- a/src/gui/editors/segment/TriggerSegmentManager.h +++ b/src/gui/editors/segment/TriggerSegmentManager.h @@ -50,7 +50,7 @@ class MultiViewCommandHistory; class TriggerSegmentManager : public KMainWindow { Q_OBJECT - TQ_OBJECT + public: TriggerSegmentManager(TQWidget *parent, diff --git a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h index 697259b..71b2546 100644 --- a/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h +++ b/src/gui/editors/segment/segmentcanvas/AudioPreviewUpdater.h @@ -48,7 +48,7 @@ class AudioPreviewThread; class AudioPreviewUpdater : public TQObject { Q_OBJECT - TQ_OBJECT + public: AudioPreviewUpdater(AudioPreviewThread &thread, diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModel.h b/src/gui/editors/segment/segmentcanvas/CompositionModel.h index 1e4bd2f..6fe1952 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionModel.h +++ b/src/gui/editors/segment/segmentcanvas/CompositionModel.h @@ -56,7 +56,7 @@ typedef std::vector<TQImage> PixmapArray; class CompositionModel : public TQObject, public CompositionObserver, public SegmentObserver { Q_OBJECT - TQ_OBJECT + public: struct CompositionItemCompare { diff --git a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h index f2998c3..25092c4 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h +++ b/src/gui/editors/segment/segmentcanvas/CompositionModelImpl.h @@ -62,7 +62,7 @@ class AudioPreviewThread; class CompositionModelImpl : public CompositionModel { Q_OBJECT - TQ_OBJECT + public: CompositionModelImpl(Composition& compo, diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.h b/src/gui/editors/segment/segmentcanvas/CompositionView.h index a1f6f07..0592cfc 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionView.h +++ b/src/gui/editors/segment/segmentcanvas/CompositionView.h @@ -64,7 +64,7 @@ class CompositionRect; class CompositionView : public RosegardenScrollView { Q_OBJECT - TQ_OBJECT + public: CompositionView(RosegardenGUIDoc*, CompositionModel*, TQWidget * parent=0, const char* name=0, WFlags f=0); diff --git a/src/gui/editors/segment/segmentcanvas/SegmentEraser.h b/src/gui/editors/segment/segmentcanvas/SegmentEraser.h index e3bb6b5..c45ea75 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentEraser.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentEraser.h @@ -43,7 +43,7 @@ class CompositionView; class SegmentEraser : public SegmentTool { Q_OBJECT - TQ_OBJECT + friend class SegmentToolBox; diff --git a/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h b/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h index f2fd935..c1b3b0c 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentJoiner.h @@ -43,7 +43,7 @@ class CompositionView; class SegmentJoiner : public SegmentTool { Q_OBJECT - TQ_OBJECT + friend class SegmentToolBox; diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.h b/src/gui/editors/segment/segmentcanvas/SegmentMover.h index 882647e..e247f1d 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentMover.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.h @@ -44,7 +44,7 @@ class CompositionView; class SegmentMover : public SegmentTool { Q_OBJECT - TQ_OBJECT + friend class SegmentToolBox; diff --git a/src/gui/editors/segment/segmentcanvas/SegmentPencil.h b/src/gui/editors/segment/segmentcanvas/SegmentPencil.h index 894babf..dc8fae4 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentPencil.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentPencil.h @@ -47,7 +47,7 @@ class CompositionView; class SegmentPencil : public SegmentTool { Q_OBJECT - TQ_OBJECT + friend class SegmentToolBox; friend class SegmentSelector; diff --git a/src/gui/editors/segment/segmentcanvas/SegmentResizer.h b/src/gui/editors/segment/segmentcanvas/SegmentResizer.h index 809dc34..416c6cf 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentResizer.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentResizer.h @@ -48,7 +48,7 @@ class CompositionView; class SegmentResizer : public SegmentTool { Q_OBJECT - TQ_OBJECT + friend class SegmentToolBox; friend class SegmentSelector; diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.h b/src/gui/editors/segment/segmentcanvas/SegmentSelector.h index db572d0..ad61628 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.h @@ -44,7 +44,7 @@ class CompositionView; class SegmentSelector : public SegmentTool { Q_OBJECT - TQ_OBJECT + friend class SegmentToolBox; friend class SegmentTool; diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h index a2fc1f6..8124edc 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentSplitter.h @@ -45,7 +45,7 @@ class CompositionView; class SegmentSplitter : public SegmentTool { Q_OBJECT - TQ_OBJECT + friend class SegmentToolBox; diff --git a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h index 92306f3..2cddc97 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h +++ b/src/gui/editors/segment/segmentcanvas/SegmentToolBox.h @@ -43,7 +43,7 @@ class CompositionView; class SegmentToolBox : public BaseToolBox { Q_OBJECT - TQ_OBJECT + public: SegmentToolBox(CompositionView* parent, RosegardenGUIDoc*); diff --git a/src/gui/editors/tempo/TempoView.h b/src/gui/editors/tempo/TempoView.h index ad69a32..8f9bdca 100644 --- a/src/gui/editors/tempo/TempoView.h +++ b/src/gui/editors/tempo/TempoView.h @@ -62,7 +62,7 @@ class Composition; class TempoView : public EditViewBase, public CompositionObserver { Q_OBJECT - TQ_OBJECT + enum Filter { |