diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-17 16:01:45 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-17 16:01:45 -0600 |
| commit | c97367ce4f0e465de236acd5e8e59cef08ada0ce (patch) | |
| tree | 52d33a19bf5ee6018572cd95ef0a32f4246df15c | |
| parent | 6c5563b774ff6d926703282d34031a32d75d0c2f (diff) | |
| download | rosegarden-c97367ce4f0e465de236acd5e8e59cef08ada0ce.tar.gz rosegarden-c97367ce4f0e465de236acd5e8e59cef08ada0ce.zip | |
Remove spurious TQ_OBJECT instances
191 files changed, 192 insertions, 192 deletions
diff --git a/src/commands/edit/EventQuantizeCommand.h b/src/commands/edit/EventQuantizeCommand.h index aa9dd58..fcda69e 100644 --- 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) diff --git a/src/document/MultiViewCommandHistory.h b/src/document/MultiViewCommandHistory.h index 5341f56..0febb10 100644 --- 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(); diff --git a/src/document/RosegardenGUIDoc.h b/src/document/RosegardenGUIDoc.h index c2b348d..32ce73d 100644 --- 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: /** diff --git a/src/gui/application/LircClient.h b/src/gui/application/LircClient.h index 2f8cc82..d4d62e2 100644 --- 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(); diff --git a/src/gui/application/LircCommander.h b/src/gui/application/LircCommander.h index eafbda9..191ad6d 100644 --- 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); diff --git a/src/gui/application/RosegardenApplication.h b/src/gui/application/RosegardenApplication.h index 648ee9d..4fbda57 100644 --- 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) {} diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h index 0349f8b..2c2d57c 100644 --- 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; diff --git a/src/gui/application/RosegardenGUIView.h b/src/gui/application/RosegardenGUIView.h index da52c9f..1f93bfe 100644 --- 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 diff --git a/src/gui/application/StartupTester.h b/src/gui/application/StartupTester.h index 5579eaf..8c74c5d 100644 --- 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(); diff --git a/src/gui/configuration/AudioConfigurationPage.h b/src/gui/configuration/AudioConfigurationPage.h index fe6af51..2540e0d 100644 --- 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, diff --git a/src/gui/configuration/AudioPropertiesPage.h b/src/gui/configuration/AudioPropertiesPage.h index 8ba6484..3e68f37 100644 --- 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); diff --git a/src/gui/configuration/ColourConfigurationPage.h b/src/gui/configuration/ColourConfigurationPage.h index 4bd0499..e43fa4e 100644 --- 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); diff --git a/src/gui/configuration/ConfigurationPage.h b/src/gui/configuration/ConfigurationPage.h index 72a3e3e..bf0ccd9 100644 --- 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, diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.h b/src/gui/configuration/DocumentMetaConfigurationPage.h index 564a2d5..4fb6bad 100644 --- 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); diff --git a/src/gui/configuration/GeneralConfigurationPage.h b/src/gui/configuration/GeneralConfigurationPage.h index 36ca725..51b85bd 100644 --- 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 diff --git a/src/gui/configuration/HeadersConfigurationPage.h b/src/gui/configuration/HeadersConfigurationPage.h index f71b8ab..efba157 100644 --- 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, diff --git a/src/gui/configuration/LatencyConfigurationPage.h b/src/gui/configuration/LatencyConfigurationPage.h index 61fb365..812a9a6 100644 --- 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, diff --git a/src/gui/configuration/MIDIConfigurationPage.h b/src/gui/configuration/MIDIConfigurationPage.h index 2306cad..6b60b38 100644 --- 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, diff --git a/src/gui/configuration/MatrixConfigurationPage.h b/src/gui/configuration/MatrixConfigurationPage.h index bc97a15..215a419 100644 --- 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, diff --git a/src/gui/configuration/NotationConfigurationPage.h b/src/gui/configuration/NotationConfigurationPage.h index fc1e226..0c7d049 100644 --- 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, diff --git a/src/gui/configuration/TabbedConfigurationPage.h b/src/gui/configuration/TabbedConfigurationPage.h index 6f16f8a..ec561c1 100644 --- 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, diff --git a/src/gui/dialogs/AddTracksDialog.h b/src/gui/dialogs/AddTracksDialog.h index 675c263..ec96d15 100644 --- 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); diff --git a/src/gui/dialogs/AudioManagerDialog.h b/src/gui/dialogs/AudioManagerDialog.h index 132b23c..99ebee3 100644 --- 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, diff --git a/src/gui/dialogs/AudioPlayingDialog.h b/src/gui/dialogs/AudioPlayingDialog.h index 1916e58..12de908 100644 --- 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); diff --git a/src/gui/dialogs/AudioPluginDialog.h b/src/gui/dialogs/AudioPluginDialog.h index 39b6560..f563bf5 100644 --- 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, diff --git a/src/gui/dialogs/AudioSplitDialog.h b/src/gui/dialogs/AudioSplitDialog.h index 09b2a29..c4bd28e 100644 --- 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, diff --git a/src/gui/dialogs/BeatsBarsDialog.h b/src/gui/dialogs/BeatsBarsDialog.h index 1915ae5..db13663 100644 --- 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(); diff --git a/src/gui/dialogs/ClefDialog.h b/src/gui/dialogs/ClefDialog.h index 0cae674..ce3e0f6 100644 --- 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 { diff --git a/src/gui/dialogs/CompositionLengthDialog.h b/src/gui/dialogs/CompositionLengthDialog.h index 4140723..52d2fc3 100644 --- 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); diff --git a/src/gui/dialogs/ConfigureDialog.h b/src/gui/dialogs/ConfigureDialog.h index b449236..8709e75 100644 --- 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, diff --git a/src/gui/dialogs/ConfigureDialogBase.h b/src/gui/dialogs/ConfigureDialogBase.h index c970b60..c24ab9a 100644 --- 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, diff --git a/src/gui/dialogs/CountdownBar.h b/src/gui/dialogs/CountdownBar.h index a1d41cd..92f9db9 100644 --- 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); diff --git a/src/gui/dialogs/CountdownDialog.h b/src/gui/dialogs/CountdownDialog.h index aa48f14..9d9dadf 100644 --- 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); diff --git a/src/gui/dialogs/EventEditDialog.h b/src/gui/dialogs/EventEditDialog.h index 800f1ba..99e561c 100644 --- 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: /** diff --git a/src/gui/dialogs/EventFilterDialog.h b/src/gui/dialogs/EventFilterDialog.h index 471c67d..4a78ecc 100644 --- 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: diff --git a/src/gui/dialogs/EventParameterDialog.h b/src/gui/dialogs/EventParameterDialog.h index 9ad189d..efb8505 100644 --- 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, diff --git a/src/gui/dialogs/FileLocateDialog.h b/src/gui/dialogs/FileLocateDialog.h index 990d61d..e61a9da 100644 --- 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, diff --git a/src/gui/dialogs/FileMergeDialog.h b/src/gui/dialogs/FileMergeDialog.h index 94ef70b..0eb40ee 100644 --- 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); diff --git a/src/gui/dialogs/FloatEdit.h b/src/gui/dialogs/FloatEdit.h index 11afc4d..41f324a 100644 --- 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, diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.h b/src/gui/dialogs/IdentifyTextCodecDialog.h index a38f639..6271a88 100644 --- 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); diff --git a/src/gui/dialogs/ImportDeviceDialog.h b/src/gui/dialogs/ImportDeviceDialog.h index 3f15dbd..e512b82 100644 --- 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); diff --git a/src/gui/dialogs/InterpretDialog.h b/src/gui/dialogs/InterpretDialog.h index da06003..504f2b1 100644 --- 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); diff --git a/src/gui/dialogs/IntervalDialog.h b/src/gui/dialogs/IntervalDialog.h index 3306fb4..4e41fd8 100644 --- 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); diff --git a/src/gui/dialogs/KeySignatureDialog.h b/src/gui/dialogs/KeySignatureDialog.h index 8007412..009f74f 100644 --- 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 { diff --git a/src/gui/dialogs/LilyPondOptionsDialog.h b/src/gui/dialogs/LilyPondOptionsDialog.h index f6f151b..3e240fc 100644 --- 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, diff --git a/src/gui/dialogs/LyricEditDialog.h b/src/gui/dialogs/LyricEditDialog.h index f924412..b4f21ff 100644 --- 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); diff --git a/src/gui/dialogs/MakeOrnamentDialog.h b/src/gui/dialogs/MakeOrnamentDialog.h index af7dc99..d09e6b9 100644 --- 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); diff --git a/src/gui/dialogs/ManageMetronomeDialog.h b/src/gui/dialogs/ManageMetronomeDialog.h index 3457251..4c95db5 100644 --- 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); diff --git a/src/gui/dialogs/MarkerModifyDialog.h b/src/gui/dialogs/MarkerModifyDialog.h index 046a464..bb8751d 100644 --- 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, diff --git a/src/gui/dialogs/PasteNotationDialog.h b/src/gui/dialogs/PasteNotationDialog.h index 794661e..e63af23 100644 --- 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, diff --git a/src/gui/dialogs/PitchDialog.h b/src/gui/dialogs/PitchDialog.h index 3e5759c..a30da3e 100644 --- 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); diff --git a/src/gui/dialogs/PitchPickerDialog.h b/src/gui/dialogs/PitchPickerDialog.h index 0ed78f7..199ae88 100644 --- 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: diff --git a/src/gui/dialogs/QuantizeDialog.h b/src/gui/dialogs/QuantizeDialog.h index 24505c9..d6133fa 100644 --- 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); diff --git a/src/gui/dialogs/RescaleDialog.h b/src/gui/dialogs/RescaleDialog.h index 5995585..0028285 100644 --- 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, diff --git a/src/gui/dialogs/ShowSequencerStatusDialog.h b/src/gui/dialogs/ShowSequencerStatusDialog.h index 35385df..71655eb 100644 --- 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); }; diff --git a/src/gui/dialogs/SimpleEventEditDialog.h b/src/gui/dialogs/SimpleEventEditDialog.h index bfaf251..6a6e839 100644 --- 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, diff --git a/src/gui/dialogs/SplitByPitchDialog.h b/src/gui/dialogs/SplitByPitchDialog.h index 87ce40f..1523c82 100644 --- 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); diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.h b/src/gui/dialogs/SplitByRecordingSrcDialog.h index 492e719..7babe1f 100644 --- 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); diff --git a/src/gui/dialogs/TempoDialog.h b/src/gui/dialogs/TempoDialog.h index 31502e4..bc14276 100644 --- 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, diff --git a/src/gui/dialogs/TextEventDialog.h b/src/gui/dialogs/TextEventDialog.h index 28f9cbf..8b42e38 100644 --- 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, diff --git a/src/gui/dialogs/TimeDialog.h b/src/gui/dialogs/TimeDialog.h index 50173f6..2cdb751 100644 --- 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, diff --git a/src/gui/dialogs/TimeSignatureDialog.h b/src/gui/dialogs/TimeSignatureDialog.h index 15dc483..5013d87 100644 --- 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, diff --git a/src/gui/dialogs/TransportDialog.h b/src/gui/dialogs/TransportDialog.h index b305100..91e2a67 100644 --- 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, diff --git a/src/gui/dialogs/TriggerSegmentDialog.h b/src/gui/dialogs/TriggerSegmentDialog.h index 8fcbe6c..f0f51b9 100644 --- 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 *); diff --git a/src/gui/dialogs/TupletDialog.h b/src/gui/dialogs/TupletDialog.h index c81e020..8c4f593 100644 --- 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, diff --git a/src/gui/dialogs/UseOrnamentDialog.h b/src/gui/dialogs/UseOrnamentDialog.h index d5f8200..da36b08 100644 --- 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 *); 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 { diff --git a/src/gui/general/BaseTool.h b/src/gui/general/BaseTool.h index fa3027b..7455dda 100644 --- 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; diff --git a/src/gui/general/BaseToolBox.h b/src/gui/general/BaseToolBox.h index 63fbe51..e0d26be 100644 --- 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); diff --git a/src/gui/general/EditToolBox.h b/src/gui/general/EditToolBox.h index b9b5a01..208e946 100644 --- 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); diff --git a/src/gui/general/EditView.h b/src/gui/general/EditView.h index 57ac833..90097be 100644 --- 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: diff --git a/src/gui/general/EditViewBase.h b/src/gui/general/EditViewBase.h index ef70384..293e7cc 100644 --- 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: diff --git a/src/gui/general/PresetHandlerDialog.h b/src/gui/general/PresetHandlerDialog.h index 685f980..36dad7a 100644 --- 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: diff --git a/src/gui/general/ProgressReporter.h b/src/gui/general/ProgressReporter.h index 6d2f18f..2c591a9 100644 --- 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); diff --git a/src/gui/general/RosegardenCanvasView.h b/src/gui/general/RosegardenCanvasView.h index 01bca28..6b231a3 100644 --- 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); diff --git a/src/gui/general/RosegardenScrollView.h b/src/gui/general/RosegardenScrollView.h index e9fbf70..b55c07d 100644 --- 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); diff --git a/src/gui/kdeext/KLedButton.h b/src/gui/kdeext/KLedButton.h index d3fa1fb..3127cda 100644 --- 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, diff --git a/src/gui/kdeext/KStartupLogo.h b/src/gui/kdeext/KStartupLogo.h index 04e6f73..c8bd627 100644 --- 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(); diff --git a/src/gui/kdeext/klearlook.h b/src/gui/kdeext/klearlook.h index b4c6c6f..43db6b6 100644 --- 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: diff --git a/src/gui/rulers/ChordNameRuler.h b/src/gui/rulers/ChordNameRuler.h index 9177c50..ece69ee 100644 --- 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: /** diff --git a/src/gui/rulers/ControlRuler.h b/src/gui/rulers/ControlRuler.h index 8c8c833..83e9730 100644 --- 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; diff --git a/src/gui/rulers/LoopRuler.h b/src/gui/rulers/LoopRuler.h index f745cd0..6bc9ecb 100644 --- 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, diff --git a/src/gui/rulers/MarkerRuler.h b/src/gui/rulers/MarkerRuler.h index 9d160d8..c121285 100644 --- 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, diff --git a/src/gui/rulers/PercussionPitchRuler.h b/src/gui/rulers/PercussionPitchRuler.h index 1e63b92..81d60d9 100644 --- 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, diff --git a/src/gui/rulers/PitchRuler.h b/src/gui/rulers/PitchRuler.h index 715f1d4..3b74bb3 100644 --- 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); diff --git a/src/gui/rulers/PropertyBox.h b/src/gui/rulers/PropertyBox.h index b5aba14..2610110 100644 --- 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, diff --git a/src/gui/rulers/PropertyViewRuler.h b/src/gui/rulers/PropertyViewRuler.h index f5740fd..79123a0 100644 --- 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, diff --git a/src/gui/rulers/RawNoteRuler.h b/src/gui/rulers/RawNoteRuler.h index 6878785..60b9a26 100644 --- 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, diff --git a/src/gui/rulers/StandardRuler.h b/src/gui/rulers/StandardRuler.h index 327abdb..a76416f 100644 --- 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, diff --git a/src/gui/rulers/TempoRuler.h b/src/gui/rulers/TempoRuler.h index afe1614..e330839 100644 --- 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: /** diff --git a/src/gui/rulers/TextRuler.h b/src/gui/rulers/TextRuler.h index 9edbe20..f9d8e4c 100644 --- 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: /** diff --git a/src/gui/seqmanager/MidiFilterDialog.h b/src/gui/seqmanager/MidiFilterDialog.h index 1050e55..27f0a64 100644 --- 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); diff --git a/src/gui/seqmanager/SequenceManager.h b/src/gui/seqmanager/SequenceManager.h index 8fdf848..051f224 100644 --- 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); diff --git a/src/gui/studio/AudioMixerWindow.h b/src/gui/studio/AudioMixerWindow.h index dee3969..07c707c 100644 --- 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); diff --git a/src/gui/studio/BankEditorDialog.h b/src/gui/studio/BankEditorDialog.h index c418c46..8dbc164 100644 --- 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, diff --git a/src/gui/studio/DeviceEditorDialog.h b/src/gui/studio/DeviceEditorDialog.h index 2c10b0b..578ebe6 100644 --- 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(); diff --git a/src/gui/studio/DeviceManagerDialog.h b/src/gui/studio/DeviceManagerDialog.h index e284983..8bb2c68 100644 --- 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(); diff --git a/src/gui/studio/MidiKeyMappingEditor.h b/src/gui/studio/MidiKeyMappingEditor.h index da45b82..414a6d7 100644 --- 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, diff --git a/src/gui/studio/MidiMixerWindow.h b/src/gui/studio/MidiMixerWindow.h index 2738e93..70d01b7 100644 --- 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); diff --git a/src/gui/studio/MidiProgramsEditor.h b/src/gui/studio/MidiProgramsEditor.h index 3f27b5c..7d40e8e 100644 --- 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, diff --git a/src/gui/studio/MixerWindow.h b/src/gui/studio/MixerWindow.h index cdf36fd..50f5591 100644 --- 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); diff --git a/src/gui/studio/NameSetEditor.h b/src/gui/studio/NameSetEditor.h index d87e428..904ea78 100644 --- 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; diff --git a/src/gui/studio/RemapInstrumentDialog.h b/src/gui/studio/RemapInstrumentDialog.h index 4f0eef8..a4d58ce 100644 --- 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); diff --git a/src/gui/studio/SynthPluginManagerDialog.h b/src/gui/studio/SynthPluginManagerDialog.h index 08cb2d7..3851226 100644 --- 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, diff --git a/src/gui/studio/TimerCallbackAssistant.h b/src/gui/studio/TimerCallbackAssistant.h index 3048f20..c85158e 100644 --- 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); diff --git a/src/gui/widgets/AudioFaderBox.h b/src/gui/widgets/AudioFaderBox.h index caa88c8..4d38c56 100644 --- 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, diff --git a/src/gui/widgets/AudioRouteMenu.h b/src/gui/widgets/AudioRouteMenu.h index ee54862..d1f906d 100644 --- 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 }; diff --git a/src/gui/widgets/CollapsingFrame.h b/src/gui/widgets/CollapsingFrame.h index 8e3bdc0..d743bac 100644 --- 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); diff --git a/src/gui/widgets/ColourTable.h b/src/gui/widgets/ColourTable.h index e1ddd5f..7cca30a 100644 --- 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; diff --git a/src/gui/widgets/CurrentProgressDialog.h b/src/gui/widgets/CurrentProgressDialog.h index 4a1de52..cda304f 100644 --- 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(); diff --git a/src/gui/widgets/DiatonicPitchChooser.h b/src/gui/widgets/DiatonicPitchChooser.h index 26f983a..760b2a8 100644 --- 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, diff --git a/src/gui/widgets/Fader.h b/src/gui/widgets/Fader.h index 7abb3fc..feba8b3 100644 --- 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: /** diff --git a/src/gui/widgets/Label.h b/src/gui/widgets/Label.h index e50f7f2..ca86e23 100644 --- 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) {;} diff --git a/src/gui/widgets/MidiFaderWidget.h b/src/gui/widgets/MidiFaderWidget.h index 57ec254..99a6b2b 100644 --- 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, diff --git a/src/gui/widgets/PitchChooser.h b/src/gui/widgets/PitchChooser.h index bc8e742..74368df 100644 --- 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, diff --git a/src/gui/widgets/PitchDragLabel.h b/src/gui/widgets/PitchDragLabel.h index 3bb0868..95ad747 100644 --- 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); diff --git a/src/gui/widgets/PluginControl.h b/src/gui/widgets/PluginControl.h index 09eb928..1641532 100644 --- 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 diff --git a/src/gui/widgets/ProgressBar.h b/src/gui/widgets/ProgressBar.h index 2a93471..ef17add 100644 --- 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, diff --git a/src/gui/widgets/ProgressDialog.h b/src/gui/widgets/ProgressDialog.h index 890c8b2..5ab6d2c 100644 --- 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, diff --git a/src/gui/widgets/QDeferScrollView.h b/src/gui/widgets/QDeferScrollView.h index f8504ff..1c36fbf 100644 --- 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); diff --git a/src/gui/widgets/QuantizeParameters.h b/src/gui/widgets/QuantizeParameters.h index c9c45b6..a32c745 100644 --- 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 }; diff --git a/src/gui/widgets/Rotary.h b/src/gui/widgets/Rotary.h index 9cc8901..27170f6 100644 --- 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 { diff --git a/src/gui/widgets/ScrollBox.h b/src/gui/widgets/ScrollBox.h index e9dab4d..3683bdb 100644 --- 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 }; diff --git a/src/gui/widgets/ScrollBoxDialog.h b/src/gui/widgets/ScrollBoxDialog.h index a3671bb..06f7800 100644 --- 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, diff --git a/src/gui/widgets/SpinBox.h b/src/gui/widgets/SpinBox.h index 0a9740b..e273b6a 100644 --- 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); diff --git a/src/gui/widgets/TimeWidget.h b/src/gui/widgets/TimeWidget.h index 6daa6a0..91a408b 100644 --- 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 diff --git a/src/gui/widgets/TristateCheckBox.h b/src/gui/widgets/TristateCheckBox.h index ab38db7..4e03142 100644 --- 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) diff --git a/src/gui/widgets/VUMeter.h b/src/gui/widgets/VUMeter.h index c004b7e..20f6d39 100644 --- 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 diff --git a/src/gui/widgets/WheelyButton.h b/src/gui/widgets/WheelyButton.h index 17dd803..d211564 100644 --- 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) { } diff --git a/src/sequencer/RosegardenSequencerApp.h b/src/sequencer/RosegardenSequencerApp.h index 59d3b48..8f5ed00 100644 --- 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(); diff --git a/src/sound/AudioFileManager.h b/src/sound/AudioFileManager.h index 8bc4535..c129ad3 100644 --- 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(); diff --git a/src/sound/AudioFileTimeStretcher.h b/src/sound/AudioFileTimeStretcher.h index 0654b59..63e371d 100644 --- 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); diff --git a/src/sound/MidiFile.h b/src/sound/MidiFile.h index ffdf929..4134dd3 100644 --- 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 diff --git a/src/sound/PeakFile.h b/src/sound/PeakFile.h index 5b4fc1e..86ecc56 100644 --- 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); diff --git a/src/sound/PeakFileManager.h b/src/sound/PeakFileManager.h index 26ced4d..f608bc8 100644 --- 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 |