Remove spurious TQ_OBJECT instances

13 years ago · c97367ce4f
parent 6c5563b774
commit c97367ce4f
191 changed files with 192 additions and 192 deletions
--- a/src/commands/edit/EventQuantizeCommand.h
+++ b/src/commands/edit/EventQuantizeCommand.h
@ -45,7 +45,7 @@ class EventSelection;
 class EventQuantizeCommand : public TQObject, public BasicCommand
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /// Quantizer must be on heap (EventQuantizeCommand dtor will delete)
--- a/src/document/MultiViewCommandHistory.h
+++ b/src/document/MultiViewCommandHistory.h
@ -56,7 +56,7 @@ namespace Rosegarden
 class MultiViewCommandHistory : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:

    MultiViewCommandHistory();
--- a/src/document/RosegardenGUIDoc.h
+++ b/src/document/RosegardenGUIDoc.h
@ -90,7 +90,7 @@ static const int MERGE_KEEP_NEW_TIMINGS = (1 << 3);
 class RosegardenGUIDoc : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:

    /**
--- a/src/gui/application/LircClient.h
+++ b/src/gui/application/LircClient.h
@ -45,7 +45,7 @@ namespace Rosegarden
 class LircClient : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    LircClient(void);
    ~LircClient();
--- a/src/gui/application/LircCommander.h
+++ b/src/gui/application/LircCommander.h
@ -46,7 +46,7 @@ class LircClient;
 class LircCommander : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    LircCommander(LircClient *lirc, RosegardenGUIApp *rgGUIApp);

--- a/src/gui/application/RosegardenApplication.h
+++ b/src/gui/application/RosegardenApplication.h
@ -49,7 +49,7 @@ namespace Rosegarden
 class RosegardenApplication : public KUniqueApplication
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    RosegardenApplication(): KUniqueApplication(), m_noSequencerMode(false) {}

--- a/src/gui/application/RosegardenGUIApp.h
+++ b/src/gui/application/RosegardenGUIApp.h
@ -110,7 +110,7 @@ class AudioManagerDialog;
 class RosegardenGUIApp : public KDockMainWindow, virtual public RosegardenIface
 {
  Q_OBJECT
-  TQ_OBJECT
+  

  friend class RosegardenGUIView;

--- a/src/gui/application/RosegardenGUIView.h
+++ b/src/gui/application/RosegardenGUIView.h
@ -77,7 +77,7 @@ class LevelInfo;
 class RosegardenGUIView : public TQVBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:

    /**p
--- a/src/gui/application/StartupTester.h
+++ b/src/gui/application/StartupTester.h
@ -40,7 +40,7 @@ namespace Rosegarden
 class StartupTester : public TQObject, public TQThread
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    StartupTester();
--- a/src/gui/configuration/AudioConfigurationPage.h
+++ b/src/gui/configuration/AudioConfigurationPage.h
@ -50,7 +50,7 @@ class RosegardenGUIDoc;
 class AudioConfigurationPage : public TabbedConfigurationPage
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    AudioConfigurationPage(RosegardenGUIDoc *doc,
                               KConfig *cfg,
--- a/src/gui/configuration/AudioPropertiesPage.h
+++ b/src/gui/configuration/AudioPropertiesPage.h
@ -50,7 +50,7 @@ class RosegardenGUIDoc;
 class AudioPropertiesPage : public TabbedConfigurationPage
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    AudioPropertiesPage(RosegardenGUIDoc *doc,
                           TQWidget *parent=0, const char *name=0);
--- a/src/gui/configuration/ColourConfigurationPage.h
+++ b/src/gui/configuration/ColourConfigurationPage.h
@ -50,7 +50,7 @@ class RosegardenGUIDoc;
 class ColourConfigurationPage : public TabbedConfigurationPage
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ColourConfigurationPage(RosegardenGUIDoc *doc,
                            TQWidget *parent=0, const char *name=0);
--- a/src/gui/configuration/ConfigurationPage.h
+++ b/src/gui/configuration/ConfigurationPage.h
@ -48,7 +48,7 @@ class RosegardenGUIDoc;
 class ConfigurationPage : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    ConfigurationPage(RosegardenGUIDoc *doc,
--- a/src/gui/configuration/DocumentMetaConfigurationPage.h
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.h
@ -49,7 +49,7 @@ class HeadersConfigurationPage;
 class DocumentMetaConfigurationPage : public TabbedConfigurationPage
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    DocumentMetaConfigurationPage(RosegardenGUIDoc *doc,
                                  TQWidget *parent = 0, const char *name = 0);
--- a/src/gui/configuration/GeneralConfigurationPage.h
+++ b/src/gui/configuration/GeneralConfigurationPage.h
@ -54,7 +54,7 @@ class RosegardenGUIDoc;
 class GeneralConfigurationPage : public TabbedConfigurationPage
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    enum DoubleClickClient
--- a/src/gui/configuration/HeadersConfigurationPage.h
+++ b/src/gui/configuration/HeadersConfigurationPage.h
@ -41,7 +41,7 @@ class RosegardenGUIDoc;
 class HeadersConfigurationPage : public TQVBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    HeadersConfigurationPage(TQWidget *parent = 0,
--- a/src/gui/configuration/LatencyConfigurationPage.h
+++ b/src/gui/configuration/LatencyConfigurationPage.h
@ -51,7 +51,7 @@ class RosegardenGUIDoc;
 class LatencyConfigurationPage : public TabbedConfigurationPage
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    LatencyConfigurationPage(RosegardenGUIDoc *doc,
--- a/src/gui/configuration/MIDIConfigurationPage.h
+++ b/src/gui/configuration/MIDIConfigurationPage.h
@ -51,7 +51,7 @@ class RosegardenGUIDoc;
 class MIDIConfigurationPage : public TabbedConfigurationPage
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    MIDIConfigurationPage(RosegardenGUIDoc *doc,
                               KConfig *cfg,
--- a/src/gui/configuration/MatrixConfigurationPage.h
+++ b/src/gui/configuration/MatrixConfigurationPage.h
@ -46,7 +46,7 @@ namespace Rosegarden
 class MatrixConfigurationPage : public TabbedConfigurationPage
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    MatrixConfigurationPage(KConfig *cfg,
--- a/src/gui/configuration/NotationConfigurationPage.h
+++ b/src/gui/configuration/NotationConfigurationPage.h
@ -54,7 +54,7 @@ class QuantizeParameters;
 class NotationConfigurationPage : public TabbedConfigurationPage
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    NotationConfigurationPage(KConfig *cfg,
--- a/src/gui/configuration/TabbedConfigurationPage.h
+++ b/src/gui/configuration/TabbedConfigurationPage.h
@ -48,7 +48,7 @@ class RosegardenGUIDoc;
 class TabbedConfigurationPage : public ConfigurationPage
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    TabbedConfigurationPage(RosegardenGUIDoc *doc,
--- a/src/gui/dialogs/AddTracksDialog.h
+++ b/src/gui/dialogs/AddTracksDialog.h
@ -37,7 +37,7 @@ namespace Rosegarden
 class AddTracksDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    AddTracksDialog(TQWidget *parent, int currentTrack = -1);
--- a/src/gui/dialogs/AudioManagerDialog.h
+++ b/src/gui/dialogs/AudioManagerDialog.h
@ -59,7 +59,7 @@ class AudioFile;
 class AudioManagerDialog : public KMainWindow
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    AudioManagerDialog(TQWidget *parent,
--- a/src/gui/dialogs/AudioPlayingDialog.h
+++ b/src/gui/dialogs/AudioPlayingDialog.h
@ -42,7 +42,7 @@ namespace Rosegarden
 class AudioPlayingDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    AudioPlayingDialog(TQWidget *parent, const TQString &label);
--- a/src/gui/dialogs/AudioPluginDialog.h
+++ b/src/gui/dialogs/AudioPluginDialog.h
@ -58,7 +58,7 @@ class AudioPluginInstance;
 class AudioPluginDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    AudioPluginDialog(TQWidget *parent,
--- a/src/gui/dialogs/AudioSplitDialog.h
+++ b/src/gui/dialogs/AudioSplitDialog.h
@ -47,7 +47,7 @@ class RosegardenGUIDoc;
 class AudioSplitDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    AudioSplitDialog(TQWidget *parent,
                     Segment *segment,
--- a/src/gui/dialogs/BeatsBarsDialog.h
+++ b/src/gui/dialogs/BeatsBarsDialog.h
@ -43,7 +43,7 @@ namespace Rosegarden
 class BeatsBarsDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
        
 public:
    BeatsBarsDialog();
--- a/src/gui/dialogs/ClefDialog.h
+++ b/src/gui/dialogs/ClefDialog.h
@ -45,7 +45,7 @@ class NotePixmapFactory;
 class ClefDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    enum ConversionType {
--- a/src/gui/dialogs/CompositionLengthDialog.h
+++ b/src/gui/dialogs/CompositionLengthDialog.h
@ -43,7 +43,7 @@ class Composition;
 class CompositionLengthDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    CompositionLengthDialog(TQWidget *parent,
                            Composition *composition);
--- a/src/gui/dialogs/ConfigureDialog.h
+++ b/src/gui/dialogs/ConfigureDialog.h
@ -42,7 +42,7 @@ class RosegardenGUIDoc;
 class ConfigureDialog : public ConfigureDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ConfigureDialog(RosegardenGUIDoc *doc,
                    KConfig* cfg,
--- a/src/gui/dialogs/ConfigureDialogBase.h
+++ b/src/gui/dialogs/ConfigureDialogBase.h
@ -43,7 +43,7 @@ class ConfigurationPage;
 class ConfigureDialogBase : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ConfigureDialogBase(TQWidget *parent=0,
                        TQString label = 0,
--- a/src/gui/dialogs/CountdownBar.h
+++ b/src/gui/dialogs/CountdownBar.h
@ -41,7 +41,7 @@ namespace Rosegarden
 class CountdownBar : public TQFrame
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    CountdownBar(TQWidget *parent, int width, int height);
    void setPosition(int position);
--- a/src/gui/dialogs/CountdownDialog.h
+++ b/src/gui/dialogs/CountdownDialog.h
@ -46,7 +46,7 @@ class CountdownBar;
 class CountdownDialog : public TQDialog // KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    CountdownDialog(TQWidget *parent, int seconds = 300);
--- a/src/gui/dialogs/EventEditDialog.h
+++ b/src/gui/dialogs/EventEditDialog.h
@ -48,7 +48,7 @@ class PropertyName;
 class EventEditDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /**
--- a/src/gui/dialogs/EventFilterDialog.h
+++ b/src/gui/dialogs/EventFilterDialog.h
@ -59,7 +59,7 @@ class Event;
 class EventFilterDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/src/gui/dialogs/EventParameterDialog.h
+++ b/src/gui/dialogs/EventParameterDialog.h
@ -44,7 +44,7 @@ namespace Rosegarden
 class EventParameterDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    EventParameterDialog(TQWidget *parent,
--- a/src/gui/dialogs/FileLocateDialog.h
+++ b/src/gui/dialogs/FileLocateDialog.h
@ -41,7 +41,7 @@ namespace Rosegarden
 class FileLocateDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    FileLocateDialog(TQWidget *parent,
--- a/src/gui/dialogs/FileMergeDialog.h
+++ b/src/gui/dialogs/FileMergeDialog.h
@ -43,7 +43,7 @@ namespace Rosegarden
 class FileMergeDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    FileMergeDialog(TQWidget *parent, TQString fileName, bool timingsDiffer);
--- a/src/gui/dialogs/FloatEdit.h
+++ b/src/gui/dialogs/FloatEdit.h
@ -43,7 +43,7 @@ class HSpinBox;
 class FloatEdit : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    FloatEdit(TQWidget *parent,
--- a/src/gui/dialogs/IdentifyTextCodecDialog.h
+++ b/src/gui/dialogs/IdentifyTextCodecDialog.h
@ -43,7 +43,7 @@ namespace Rosegarden
 class IdentifyTextCodecDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    
 public:
    IdentifyTextCodecDialog(TQWidget *parent, std::string text);
--- a/src/gui/dialogs/ImportDeviceDialog.h
+++ b/src/gui/dialogs/ImportDeviceDialog.h
@ -55,7 +55,7 @@ class RosegardenGUIDoc;
 class ImportDeviceDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    ImportDeviceDialog(TQWidget *parent, KURL url);
--- a/src/gui/dialogs/InterpretDialog.h
+++ b/src/gui/dialogs/InterpretDialog.h
@ -41,7 +41,7 @@ namespace Rosegarden
 class InterpretDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    InterpretDialog(TQWidget *parent);

--- a/src/gui/dialogs/IntervalDialog.h
+++ b/src/gui/dialogs/IntervalDialog.h
@ -47,7 +47,7 @@ class RosegardenGUIDoc;
 class IntervalDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    IntervalDialog(TQWidget *parent, bool askChangeKey = false, bool askTransposeSegmentBack = false);
    
--- a/src/gui/dialogs/KeySignatureDialog.h
+++ b/src/gui/dialogs/KeySignatureDialog.h
@ -49,7 +49,7 @@ class NotePixmapFactory;
 class KeySignatureDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    enum ConversionType {
--- a/src/gui/dialogs/LilyPondOptionsDialog.h
+++ b/src/gui/dialogs/LilyPondOptionsDialog.h
@ -45,7 +45,7 @@ class HeadersConfigurationPage;
 class LilyPondOptionsDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    LilyPondOptionsDialog(TQWidget *parent,
--- a/src/gui/dialogs/LyricEditDialog.h
+++ b/src/gui/dialogs/LyricEditDialog.h
@ -46,7 +46,7 @@ class Segment;
 class LyricEditDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    LyricEditDialog(TQWidget *parent, Segment *segment);
--- a/src/gui/dialogs/MakeOrnamentDialog.h
+++ b/src/gui/dialogs/MakeOrnamentDialog.h
@ -43,7 +43,7 @@ class PitchChooser;
 class MakeOrnamentDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    MakeOrnamentDialog(TQWidget *parent, TQString defaultName, int defaultBasePitch);
--- a/src/gui/dialogs/ManageMetronomeDialog.h
+++ b/src/gui/dialogs/ManageMetronomeDialog.h
@ -47,7 +47,7 @@ class InstrumentParameterBox;
 class ManageMetronomeDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    ManageMetronomeDialog(TQWidget *parent, RosegardenGUIDoc *doc);
--- a/src/gui/dialogs/MarkerModifyDialog.h
+++ b/src/gui/dialogs/MarkerModifyDialog.h
@ -45,7 +45,7 @@ class Composition;
 class MarkerModifyDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    MarkerModifyDialog(TQWidget *parent,
                       Composition *composition,
--- a/src/gui/dialogs/PasteNotationDialog.h
+++ b/src/gui/dialogs/PasteNotationDialog.h
@ -44,7 +44,7 @@ namespace Rosegarden
 class PasteNotationDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    PasteNotationDialog(TQWidget *parent,
--- a/src/gui/dialogs/PitchDialog.h
+++ b/src/gui/dialogs/PitchDialog.h
@ -42,7 +42,7 @@ class PitchChooser;
 class PitchDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    PitchDialog(TQWidget *parent, TQString title, int defaultPitch = 60);

--- a/src/gui/dialogs/PitchPickerDialog.h
+++ b/src/gui/dialogs/PitchPickerDialog.h
@ -39,7 +39,7 @@ namespace Rosegarden
 class PitchPickerDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/src/gui/dialogs/QuantizeDialog.h
+++ b/src/gui/dialogs/QuantizeDialog.h
@ -42,7 +42,7 @@ class QuantizeParameters;
 class QuantizeDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    QuantizeDialog(TQWidget *parent, bool inNotation = false);
--- a/src/gui/dialogs/RescaleDialog.h
+++ b/src/gui/dialogs/RescaleDialog.h
@ -44,7 +44,7 @@ class Composition;
 class RescaleDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    RescaleDialog(TQWidget *parent,
--- a/src/gui/dialogs/ShowSequencerStatusDialog.h
+++ b/src/gui/dialogs/ShowSequencerStatusDialog.h
@ -40,7 +40,7 @@ namespace Rosegarden
 class ShowSequencerStatusDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ShowSequencerStatusDialog(TQWidget *parent);
 };
--- a/src/gui/dialogs/SimpleEventEditDialog.h
+++ b/src/gui/dialogs/SimpleEventEditDialog.h
@ -51,7 +51,7 @@ class RosegardenGUIDoc;
 class SimpleEventEditDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    SimpleEventEditDialog(TQWidget *parent,
                          RosegardenGUIDoc *doc,
--- a/src/gui/dialogs/SplitByPitchDialog.h
+++ b/src/gui/dialogs/SplitByPitchDialog.h
@ -43,7 +43,7 @@ class PitchChooser;
 class SplitByPitchDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    SplitByPitchDialog(TQWidget *parent);

--- a/src/gui/dialogs/SplitByRecordingSrcDialog.h
+++ b/src/gui/dialogs/SplitByRecordingSrcDialog.h
@ -44,7 +44,7 @@ class RosegardenGUIDoc;
 class SplitByRecordingSrcDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    SplitByRecordingSrcDialog(TQWidget *parent, RosegardenGUIDoc *doc);
    
--- a/src/gui/dialogs/TempoDialog.h
+++ b/src/gui/dialogs/TempoDialog.h
@ -51,7 +51,7 @@ class HSpinBox;
 class TempoDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    enum TempoDialogAction {
        AddTempo,
--- a/src/gui/dialogs/TextEventDialog.h
+++ b/src/gui/dialogs/TextEventDialog.h
@ -48,7 +48,7 @@ class NotePixmapFactory;
 class TextEventDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    TextEventDialog(TQWidget *parent,
--- a/src/gui/dialogs/TimeDialog.h
+++ b/src/gui/dialogs/TimeDialog.h
@ -44,7 +44,7 @@ class Composition;
 class TimeDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    /// for absolute times
    TimeDialog(TQWidget *parent, TQString title, Composition *composition,
--- a/src/gui/dialogs/TimeSignatureDialog.h
+++ b/src/gui/dialogs/TimeSignatureDialog.h
@ -48,7 +48,7 @@ class Composition;
 class TimeSignatureDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    TimeSignatureDialog(TQWidget *parent,
--- a/src/gui/dialogs/TransportDialog.h
+++ b/src/gui/dialogs/TransportDialog.h
@ -51,7 +51,7 @@ class MappedEvent;
 class TransportDialog : public TQWidget
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    TransportDialog(TQWidget *parent=0,
                              const char *name=0,
--- a/src/gui/dialogs/TriggerSegmentDialog.h
+++ b/src/gui/dialogs/TriggerSegmentDialog.h
@ -45,7 +45,7 @@ class Composition;
 class TriggerSegmentDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    TriggerSegmentDialog(TQWidget *parent, Composition *);
--- a/src/gui/dialogs/TupletDialog.h
+++ b/src/gui/dialogs/TupletDialog.h
@ -47,7 +47,7 @@ namespace Rosegarden
 class TupletDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    TupletDialog(TQWidget *parent,
--- a/src/gui/dialogs/UseOrnamentDialog.h
+++ b/src/gui/dialogs/UseOrnamentDialog.h
@ -49,7 +49,7 @@ class Composition;
 class UseOrnamentDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    UseOrnamentDialog(TQWidget *parent, Composition *);
--- 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
    //
--- 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);
--- 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 };
    
--- 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&,
--- 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;

--- 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;

--- 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);
--- 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;

--- 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;

--- 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();
--- 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);

--- 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) { }
--- 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);

--- 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;

--- 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);
--- 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;

--- 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
--- 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,
--- 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;

--- 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;

--- 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);

--- 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,
--- 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,
--- 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;

--- 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;

--- 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;

--- 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.
--- 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);

--- 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,
--- 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);

--- 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);
--- 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.
--- 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")
--- 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:

--- 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,
--- 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,
--- 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,
--- 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,
--- 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);
--- 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);
--- 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,
--- 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
--- 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
--- 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,
--- 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,
--- 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 {
--- 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,
--- 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);
--- 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;

--- 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;

--- 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;

--- 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;
--- 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;
--- 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;
--- 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;

--- 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*);

--- 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
    {
--- a/src/gui/general/BaseTool.h
+++ b/src/gui/general/BaseTool.h
@ -47,7 +47,7 @@ namespace Rosegarden
 class BaseTool : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    
    friend class BaseToolBox;

--- a/src/gui/general/BaseToolBox.h
+++ b/src/gui/general/BaseToolBox.h
@ -48,7 +48,7 @@ class BaseTool;
 class BaseToolBox : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    BaseToolBox(TQWidget* parent);
--- a/src/gui/general/EditToolBox.h
+++ b/src/gui/general/EditToolBox.h
@ -46,7 +46,7 @@ class EditView;
 class EditToolBox : public BaseToolBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    EditToolBox(EditView* parent);

--- a/src/gui/general/EditView.h
+++ b/src/gui/general/EditView.h
@ -69,7 +69,7 @@ class ActiveItem;
 class EditView : public EditViewBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/src/gui/general/EditViewBase.h
+++ b/src/gui/general/EditViewBase.h
@ -60,7 +60,7 @@ class EditViewBase : public KDockMainWindow
 {

    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/src/gui/general/PresetHandlerDialog.h
+++ b/src/gui/general/PresetHandlerDialog.h
@ -48,7 +48,7 @@ class PresetGroup;
 class PresetHandlerDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:

--- a/src/gui/general/ProgressReporter.h
+++ b/src/gui/general/ProgressReporter.h
@ -39,7 +39,7 @@ namespace Rosegarden
 class ProgressReporter : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ProgressReporter(TQObject* parent, const char* name = 0);

--- a/src/gui/general/RosegardenCanvasView.h
+++ b/src/gui/general/RosegardenCanvasView.h
@ -52,7 +52,7 @@ namespace Rosegarden
 class RosegardenCanvasView : public TQCanvasView
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    RosegardenCanvasView(TQCanvas*,
                         TQWidget* parent=0, const char* name=0, WFlags f=0);
--- a/src/gui/general/RosegardenScrollView.h
+++ b/src/gui/general/RosegardenScrollView.h
@ -51,7 +51,7 @@ namespace Rosegarden
 class RosegardenScrollView : public TQScrollView
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    RosegardenScrollView(TQWidget* parent=0, const char* name=0, WFlags f=0);

--- a/src/gui/kdeext/KLedButton.h
+++ b/src/gui/kdeext/KLedButton.h
@ -49,7 +49,7 @@ namespace Rosegarden
 */
 class KLedButton : public KLed  {
   Q_OBJECT
-  TQ_OBJECT
+  
  public: 
   KLedButton(const TQColor &col=TQt::green, TQWidget *parent=0, const char *name=0);
   KLedButton(const TQColor& col, KLed::State st, KLed::Look look, KLed::Shape shape,
--- a/src/gui/kdeext/KStartupLogo.h
+++ b/src/gui/kdeext/KStartupLogo.h
@ -31,7 +31,7 @@
 class KStartupLogo : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    static KStartupLogo* getInstance();
--- a/src/gui/kdeext/klearlook.h
+++ b/src/gui/kdeext/klearlook.h
@ -186,7 +186,7 @@ extern "C" {

 class KlearlookStyle : public KStyle {
        Q_OBJECT
-  TQ_OBJECT
+  

    public:

--- a/src/gui/rulers/ChordNameRuler.h
+++ b/src/gui/rulers/ChordNameRuler.h
@ -57,7 +57,7 @@ class Composition;
 class ChordNameRuler : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /**
--- a/src/gui/rulers/ControlRuler.h
+++ b/src/gui/rulers/ControlRuler.h
@ -63,7 +63,7 @@ class EditViewBase;
 class ControlRuler : public RosegardenCanvasView, public SegmentObserver
 {
    Q_OBJECT
-  TQ_OBJECT
+  

    friend class ControlItem;

--- a/src/gui/rulers/LoopRuler.h
+++ b/src/gui/rulers/LoopRuler.h
@ -54,7 +54,7 @@ class RosegardenGUIDoc;
 class LoopRuler : public TQWidget, public HZoomable
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    LoopRuler(RosegardenGUIDoc *doc,
--- a/src/gui/rulers/MarkerRuler.h
+++ b/src/gui/rulers/MarkerRuler.h
@ -50,7 +50,7 @@ class RosegardenGUIDoc;
 class MarkerRuler : public TQWidget, public HZoomable, public KXMLGUIClient
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    MarkerRuler(RosegardenGUIDoc *doc,
--- a/src/gui/rulers/PercussionPitchRuler.h
+++ b/src/gui/rulers/PercussionPitchRuler.h
@ -47,7 +47,7 @@ class MidiKeyMapping;
 class PercussionPitchRuler : public PitchRuler
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    PercussionPitchRuler(TQWidget *parent,
                         const MidiKeyMapping *mapping,
--- a/src/gui/rulers/PitchRuler.h
+++ b/src/gui/rulers/PitchRuler.h
@ -40,7 +40,7 @@ namespace Rosegarden
 class PitchRuler : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    PitchRuler(TQWidget *parent);

--- a/src/gui/rulers/PropertyBox.h
+++ b/src/gui/rulers/PropertyBox.h
@ -47,7 +47,7 @@ namespace Rosegarden
 class PropertyBox : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    PropertyBox(TQString label,
--- a/src/gui/rulers/PropertyViewRuler.h
+++ b/src/gui/rulers/PropertyViewRuler.h
@ -51,7 +51,7 @@ class RulerScale;
 class PropertyViewRuler : public TQWidget, public HZoomable
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    PropertyViewRuler(RulerScale *rulerScale,
--- a/src/gui/rulers/RawNoteRuler.h
+++ b/src/gui/rulers/RawNoteRuler.h
@ -55,7 +55,7 @@ class DefaultVelocityColour;
 class RawNoteRuler : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    RawNoteRuler(RulerScale *rulerScale,
--- a/src/gui/rulers/StandardRuler.h
+++ b/src/gui/rulers/StandardRuler.h
@ -47,7 +47,7 @@ class SnapGrid;
 class StandardRuler : public TQVBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    StandardRuler(RosegardenGUIDoc *doc,
--- a/src/gui/rulers/TempoRuler.h
+++ b/src/gui/rulers/TempoRuler.h
@ -61,7 +61,7 @@ class Composition;
 class TempoRuler : public TQWidget, public KXMLGUIClient
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /**
--- a/src/gui/rulers/TextRuler.h
+++ b/src/gui/rulers/TextRuler.h
@ -58,7 +58,7 @@ class RulerScale;
 class TextRuler : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /**
--- a/src/gui/seqmanager/MidiFilterDialog.h
+++ b/src/gui/seqmanager/MidiFilterDialog.h
@ -42,7 +42,7 @@ class RosegardenGUIDoc;
 class MidiFilterDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    MidiFilterDialog(TQWidget *parent,
                     RosegardenGUIDoc *doc);
--- a/src/gui/seqmanager/SequenceManager.h
+++ b/src/gui/seqmanager/SequenceManager.h
@ -66,7 +66,7 @@ class AudioManagerDialog;
 class SequenceManager : public TQObject, public CompositionObserver
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    SequenceManager(RosegardenGUIDoc *doc,
                    TransportDialog *transport);
--- a/src/gui/studio/AudioMixerWindow.h
+++ b/src/gui/studio/AudioMixerWindow.h
@ -55,7 +55,7 @@ class AudioRouteMenu;
 class AudioMixerWindow : public MixerWindow
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    AudioMixerWindow(TQWidget *parent, RosegardenGUIDoc *document);
--- a/src/gui/studio/BankEditorDialog.h
+++ b/src/gui/studio/BankEditorDialog.h
@ -61,7 +61,7 @@ class MidiDevice;
 class BankEditorDialog : public KMainWindow
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    BankEditorDialog(TQWidget *parent,
--- a/src/gui/studio/DeviceEditorDialog.h
+++ b/src/gui/studio/DeviceEditorDialog.h
@ -46,7 +46,7 @@ class RosegardenGUIDoc;
 class DeviceEditorDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    DeviceEditorDialog(TQWidget *parent, RosegardenGUIDoc *document);
    ~DeviceEditorDialog();
--- a/src/gui/studio/DeviceManagerDialog.h
+++ b/src/gui/studio/DeviceManagerDialog.h
@ -50,7 +50,7 @@ class MidiDevice;
 class DeviceManagerDialog : public KMainWindow
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    DeviceManagerDialog(TQWidget *parent, RosegardenGUIDoc *document);
    ~DeviceManagerDialog();
--- a/src/gui/studio/MidiKeyMappingEditor.h
+++ b/src/gui/studio/MidiKeyMappingEditor.h
@ -46,7 +46,7 @@ class BankEditorDialog;
 class MidiKeyMappingEditor : public NameSetEditor
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    MidiKeyMappingEditor(BankEditorDialog *bankEditor,
--- a/src/gui/studio/MidiMixerWindow.h
+++ b/src/gui/studio/MidiMixerWindow.h
@ -51,7 +51,7 @@ class Fader;
 class MidiMixerWindow : public MixerWindow
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    MidiMixerWindow(TQWidget *parent, RosegardenGUIDoc *document);
--- a/src/gui/studio/MidiProgramsEditor.h
+++ b/src/gui/studio/MidiProgramsEditor.h
@ -49,7 +49,7 @@ class BankEditorDialog;
 class MidiProgramsEditor : public NameSetEditor
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    MidiProgramsEditor(BankEditorDialog *bankEditor,
                       TQWidget *parent,
--- a/src/gui/studio/MixerWindow.h
+++ b/src/gui/studio/MixerWindow.h
@ -45,7 +45,7 @@ class RosegardenGUIDoc;
 class MixerWindow: public KMainWindow
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    MixerWindow(TQWidget *parent, RosegardenGUIDoc *document);
--- a/src/gui/studio/NameSetEditor.h
+++ b/src/gui/studio/NameSetEditor.h
@ -50,7 +50,7 @@ class BankEditorDialog;
 class NameSetEditor : public TQVGroupBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    virtual void clearAll() = 0;

--- a/src/gui/studio/RemapInstrumentDialog.h
+++ b/src/gui/studio/RemapInstrumentDialog.h
@ -48,7 +48,7 @@ class MultiViewCommandHistory;
 class RemapInstrumentDialog : public KDialogBase
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    RemapInstrumentDialog(TQWidget *parent,
                          RosegardenGUIDoc *doc);
--- a/src/gui/studio/SynthPluginManagerDialog.h
+++ b/src/gui/studio/SynthPluginManagerDialog.h
@ -49,7 +49,7 @@ class AudioPluginManager;
 class SynthPluginManagerDialog : public KMainWindow
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    SynthPluginManagerDialog(TQWidget *parent,
--- a/src/gui/studio/TimerCallbackAssistant.h
+++ b/src/gui/studio/TimerCallbackAssistant.h
@ -42,7 +42,7 @@ namespace Rosegarden
 class TimerCallbackAssistant : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    TimerCallbackAssistant(int ms, void (*callback)(void *data), void *data);
--- a/src/gui/widgets/AudioFaderBox.h
+++ b/src/gui/widgets/AudioFaderBox.h
@ -53,7 +53,7 @@ class AudioRouteMenu;
 class AudioFaderBox : public TQFrame
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    AudioFaderBox(TQWidget *parent,
--- a/src/gui/widgets/AudioRouteMenu.h
+++ b/src/gui/widgets/AudioRouteMenu.h
@ -45,7 +45,7 @@ class Instrument;
 class AudioRouteMenu : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    enum Direction { In, Out };
--- a/src/gui/widgets/CollapsingFrame.h
+++ b/src/gui/widgets/CollapsingFrame.h
@ -43,7 +43,7 @@ namespace Rosegarden
 class CollapsingFrame : public TQFrame
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    CollapsingFrame(TQString label, TQWidget *parent = 0, const char *name = 0);
--- a/src/gui/widgets/ColourTable.h
+++ b/src/gui/widgets/ColourTable.h
@ -47,7 +47,7 @@ class ColourMap;
 class ColourTable : public TQTable
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    typedef std::map<unsigned int, unsigned int, std::less<unsigned int> > ColourList;
--- a/src/gui/widgets/CurrentProgressDialog.h
+++ b/src/gui/widgets/CurrentProgressDialog.h
@ -40,7 +40,7 @@ class ProgressDialog;
 class CurrentProgressDialog : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    static CurrentProgressDialog* getInstance();

--- a/src/gui/widgets/DiatonicPitchChooser.h
+++ b/src/gui/widgets/DiatonicPitchChooser.h
@ -45,7 +45,7 @@ class PitchDragLabel;
 class DiatonicPitchChooser : public TQGroupBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    DiatonicPitchChooser(TQString title,
                           TQWidget *parent,
--- a/src/gui/widgets/Fader.h
+++ b/src/gui/widgets/Fader.h
@ -49,7 +49,7 @@ class TextFloat;
 class Fader : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    /**
--- a/src/gui/widgets/Label.h
+++ b/src/gui/widgets/Label.h
@ -40,7 +40,7 @@ namespace Rosegarden
 class Label : public TQLabel
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    Label(TQWidget *parent = 0, const char *name=0):
        TQLabel(parent, name) {;}
--- a/src/gui/widgets/MidiFaderWidget.h
+++ b/src/gui/widgets/MidiFaderWidget.h
@ -46,7 +46,7 @@ class AudioVUMeter;
 class MidiFaderWidget : public TQFrame
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    MidiFaderWidget(TQWidget *parent,
--- a/src/gui/widgets/PitchChooser.h
+++ b/src/gui/widgets/PitchChooser.h
@ -44,7 +44,7 @@ class PitchDragLabel;
 class PitchChooser : public TQGroupBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    PitchChooser(TQString title,
                           TQWidget *parent,
--- a/src/gui/widgets/PitchDragLabel.h
+++ b/src/gui/widgets/PitchDragLabel.h
@ -45,7 +45,7 @@ class NotePixmapFactory;
 class PitchDragLabel : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    PitchDragLabel(TQWidget *parent,
    	int defaultPitch = 60, bool defaultSharps = true);
--- a/src/gui/widgets/PluginControl.h
+++ b/src/gui/widgets/PluginControl.h
@ -46,7 +46,7 @@ class Studio;
 class PluginControl : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:

    typedef enum
--- a/src/gui/widgets/ProgressBar.h
+++ b/src/gui/widgets/ProgressBar.h
@ -40,7 +40,7 @@ namespace Rosegarden
 class ProgressBar : public KProgress
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    ProgressBar(int totalSteps,
--- a/src/gui/widgets/ProgressDialog.h
+++ b/src/gui/widgets/ProgressDialog.h
@ -44,7 +44,7 @@ namespace Rosegarden
 class ProgressDialog : public KProgressDialog
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    ProgressDialog(TQWidget * creator = 0,
                             const char * name = 0,
--- a/src/gui/widgets/QDeferScrollView.h
+++ b/src/gui/widgets/QDeferScrollView.h
@ -56,7 +56,7 @@ namespace Rosegarden
 class QDeferScrollView : public TQScrollView
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    QDeferScrollView(TQWidget* parent=0, const char *name=0, WFlags f=0);

--- a/src/gui/widgets/QuantizeParameters.h
+++ b/src/gui/widgets/QuantizeParameters.h
@ -50,7 +50,7 @@ class Quantizer;
 class QuantizeParameters : public TQFrame
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    enum QuantizerType { Grid, Legato, Notation };

--- a/src/gui/widgets/Rotary.h
+++ b/src/gui/widgets/Rotary.h
@ -45,7 +45,7 @@ namespace Rosegarden
 class Rotary : public TQWidget
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:

    enum TickMode {
--- a/src/gui/widgets/ScrollBox.h
+++ b/src/gui/widgets/ScrollBox.h
@ -47,7 +47,7 @@ namespace Rosegarden
 class ScrollBox: public TQFrame
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    enum SizeMode { FixWidth, FixHeight };
--- a/src/gui/widgets/ScrollBoxDialog.h
+++ b/src/gui/widgets/ScrollBoxDialog.h
@ -43,7 +43,7 @@ namespace Rosegarden
 class ScrollBoxDialog : public KDialog
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    ScrollBoxDialog(TQWidget *parent = 0,
--- a/src/gui/widgets/SpinBox.h
+++ b/src/gui/widgets/SpinBox.h
@ -46,7 +46,7 @@ namespace Rosegarden
 class SpinBox : public TQSpinBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    SpinBox(TQWidget *parent = 0, const char *name=0);

--- a/src/gui/widgets/TimeWidget.h
+++ b/src/gui/widgets/TimeWidget.h
@ -49,7 +49,7 @@ class Composition;
 class TimeWidget : public TQGroupBox
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    /**
     * Constructor for absolute time widget
--- a/src/gui/widgets/TristateCheckBox.h
+++ b/src/gui/widgets/TristateCheckBox.h
@ -45,7 +45,7 @@ namespace Rosegarden
 class TristateCheckBox : public TQCheckBox
 {
 Q_OBJECT
-  TQ_OBJECT
+  
 public:
    TristateCheckBox(TQWidget *parent=0,
                               const char *name=0):TQCheckBox(parent, name)
--- a/src/gui/widgets/VUMeter.h
+++ b/src/gui/widgets/VUMeter.h
@ -45,7 +45,7 @@ class VelocityColour;
 class VUMeter : public TQLabel
 {
 Q_OBJECT
-  TQ_OBJECT
+  

 public:
    typedef enum
--- a/src/gui/widgets/WheelyButton.h
+++ b/src/gui/widgets/WheelyButton.h
@ -41,7 +41,7 @@ namespace Rosegarden
 class WheelyButton : public TQPushButton
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    WheelyButton(TQWidget *w) : TQPushButton(w) { }
--- a/src/sequencer/RosegardenSequencerApp.h
+++ b/src/sequencer/RosegardenSequencerApp.h
@ -80,7 +80,7 @@ class RosegardenSequencerApp : public KMainWindow,
                               public ExternalTransport
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    RosegardenSequencerApp();
--- a/src/sound/AudioFileManager.h
+++ b/src/sound/AudioFileManager.h
@ -61,7 +61,7 @@ typedef std::vector<AudioFile*>::const_iterator AudioFileManagerIterator;
 class AudioFileManager : public TQObject, public XmlExportable
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    AudioFileManager();
    virtual ~AudioFileManager();
--- a/src/sound/AudioFileTimeStretcher.h
+++ b/src/sound/AudioFileTimeStretcher.h
@ -36,7 +36,7 @@ class AudioFileManager;
 class AudioFileTimeStretcher : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
    
 public:
    AudioFileTimeStretcher(AudioFileManager *mgr);
--- a/src/sound/MidiFile.h
+++ b/src/sound/MidiFile.h
@ -66,7 +66,7 @@ class Studio;
 class MidiFile : public TQObject, public SoundFile
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:

    typedef enum
--- a/src/sound/PeakFile.h
+++ b/src/sound/PeakFile.h
@ -54,7 +54,7 @@ typedef std::pair<RealTime, RealTime> SplitPointPair;
 class PeakFile : public TQObject, public SoundFile
 {
    Q_OBJECT
-  TQ_OBJECT
+  

 public:
    PeakFile(AudioFile *audioFile);
--- a/src/sound/PeakFileManager.h
+++ b/src/sound/PeakFileManager.h
@ -49,7 +49,7 @@ class RealTime;
 class PeakFileManager : public TQObject
 {
    Q_OBJECT
-  TQ_OBJECT
+  
 public:
    // updatePercentage tells this object how often to throw a
    // percentage complete message - active between 0-100 only