diff options
71 files changed, 170 insertions, 170 deletions
diff --git a/src/gui/application/RosegardenGUIApp.cpp b/src/gui/application/RosegardenGUIApp.cpp index 467d176..fe74f3f 100644 --- a/src/gui/application/RosegardenGUIApp.cpp +++ b/src/gui/application/RosegardenGUIApp.cpp @@ -1295,7 +1295,7 @@ void RosegardenGUIApp::initZoomToolbar() TQString maxZoom = TQString("%1%").arg(factors[(sizeof(factors) / sizeof(factors[0])) - 1] * 100.0); m_zoomSlider = new ZoomSlider<double> - (zoomSizes, -1, Qt::Horizontal, zoomToolbar, "tde toolbar widget"); + (zoomSizes, -1, TQt::Horizontal, zoomToolbar, "tde toolbar widget"); m_zoomSlider->setTracking(true); m_zoomSlider->setFocusPolicy(TQWidget::NoFocus); m_zoomLabel = new TQLabel(minZoom, zoomToolbar, "tde toolbar widget"); diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp index 1a1c967..b1cb0d4 100644 --- a/src/gui/configuration/HeadersConfigurationPage.cpp +++ b/src/gui/configuration/HeadersConfigurationPage.cpp @@ -57,7 +57,7 @@ HeadersConfigurationPage::HeadersConfigurationPage(TQWidget *parent, // TQGroupBox *headersBox = new TQGroupBox - (1, Qt::Horizontal, + (1, TQt::Horizontal, i18n("Printable headers"), this); TQFrame *frameHeaders = new TQFrame(headersBox); TQGridLayout *layoutHeaders = new TQGridLayout(frameHeaders, 10, 6, 10, 5); diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp index 51be09c..8c22d36 100644 --- a/src/gui/dialogs/AudioPluginDialog.cpp +++ b/src/gui/dialogs/AudioPluginDialog.cpp @@ -95,7 +95,7 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); TQGroupBox *pluginSelectionBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Plugin"), vbox); + (1, TQt::Horizontal, i18n("Plugin"), vbox); makePluginParamsBox(vbox, 0, 10); diff --git a/src/gui/dialogs/BeatsBarsDialog.cpp b/src/gui/dialogs/BeatsBarsDialog.cpp index 4a91159..ccea4e3 100644 --- a/src/gui/dialogs/BeatsBarsDialog.cpp +++ b/src/gui/dialogs/BeatsBarsDialog.cpp @@ -44,7 +44,7 @@ BeatsBarsDialog::BeatsBarsDialog(TQWidget* parent) : { TQHBox *hbox = makeHBoxMainWidget(); - TQGroupBox *gbox = new TQGroupBox(1, Qt::Horizontal, + TQGroupBox *gbox = new TQGroupBox(1, TQt::Horizontal, i18n("The selected audio segment contains:"), hbox); TQFrame *frame = new TQFrame(gbox); diff --git a/src/gui/dialogs/ClefDialog.cpp b/src/gui/dialogs/ClefDialog.cpp index 3fb4029..7f5886d 100644 --- a/src/gui/dialogs/ClefDialog.cpp +++ b/src/gui/dialogs/ClefDialog.cpp @@ -57,31 +57,31 @@ ClefDialog::ClefDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); TQGroupBox *clefFrame = new TQGroupBox - (1, Qt::Horizontal, i18n("Clef"), vbox); + (1, TQt::Horizontal, i18n("Clef"), vbox); TQButtonGroup *conversionFrame = new TQButtonGroup - (1, Qt::Horizontal, i18n("Existing notes following clef change"), vbox); + (1, TQt::Horizontal, i18n("Existing notes following clef change"), vbox); TQHBox *clefBox = new TQHBox(clefFrame); - BigArrowButton *clefDown = new BigArrowButton(clefBox, Qt::LeftArrow); + BigArrowButton *clefDown = new BigArrowButton(clefBox, TQt::LeftArrow); TQToolTip::add (clefDown, i18n("Lower clef")); TQHBox *clefLabelBox = new TQVBox(clefBox); - m_octaveUp = new BigArrowButton(clefLabelBox, Qt::UpArrow); + m_octaveUp = new BigArrowButton(clefLabelBox, TQt::UpArrow); TQToolTip::add (m_octaveUp, i18n("Up an Octave")); m_clefLabel = new TQLabel(i18n("Clef"), clefLabelBox); m_clefLabel->setAlignment(AlignVCenter | AlignHCenter); - m_octaveDown = new BigArrowButton(clefLabelBox, Qt::DownArrow); + m_octaveDown = new BigArrowButton(clefLabelBox, TQt::DownArrow); TQToolTip::add (m_octaveDown, i18n("Down an Octave")); - BigArrowButton *clefUp = new BigArrowButton(clefBox, Qt::RightArrow); + BigArrowButton *clefUp = new BigArrowButton(clefBox, TQt::RightArrow); TQToolTip::add (clefUp, i18n("Higher clef")); diff --git a/src/gui/dialogs/EventEditDialog.cpp b/src/gui/dialogs/EventEditDialog.cpp index 8f214c2..2a865d7 100644 --- a/src/gui/dialogs/EventEditDialog.cpp +++ b/src/gui/dialogs/EventEditDialog.cpp @@ -76,9 +76,9 @@ EventEditDialog::EventEditDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); TQGroupBox *intrinsicBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Intrinsics"), vbox); + (1, TQt::Horizontal, i18n("Intrinsics"), vbox); - TQGrid *intrinsicGrid = new TQGrid(4, Qt::Horizontal, intrinsicBox); + TQGrid *intrinsicGrid = new TQGrid(4, TQt::Horizontal, intrinsicBox); new TQLabel(i18n("Event type: "), intrinsicGrid); new TQLabel("", intrinsicGrid); @@ -120,8 +120,8 @@ EventEditDialog::EventEditDialog(TQWidget *parent, slotSubOrderingChanged(event.getSubOrdering()); TQGroupBox *persistentBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Persistent properties"), vbox); - m_persistentGrid = new TQGrid(4, Qt::Horizontal, persistentBox); + (1, TQt::Horizontal, i18n("Persistent properties"), vbox); + m_persistentGrid = new TQGrid(4, TQt::Horizontal, persistentBox); TQLabel *label = new TQLabel(i18n("Name"), m_persistentGrid); TQFont font(label->font()); @@ -150,7 +150,7 @@ EventEditDialog::EventEditDialog(TQWidget *parent, } else { TQGroupBox *nonPersistentBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Non-persistent properties"), vbox); + (1, TQt::Horizontal, i18n("Non-persistent properties"), vbox); new TQLabel(i18n("These are cached values, lost if the event is modified."), nonPersistentBox); @@ -159,7 +159,7 @@ EventEditDialog::EventEditDialog(TQWidget *parent, m_nonPersistentView->setResizePolicy(TQScrollView::AutoOneFit); m_nonPersistentGrid = new TQGrid - (4, Qt::Horizontal, m_nonPersistentView->viewport()); + (4, TQt::Horizontal, m_nonPersistentView->viewport()); m_nonPersistentView->addChild(m_nonPersistentGrid); m_nonPersistentGrid->setSpacing(4); diff --git a/src/gui/dialogs/ExportDeviceDialog.cpp b/src/gui/dialogs/ExportDeviceDialog.cpp index ca3672c..7de3ee8 100644 --- a/src/gui/dialogs/ExportDeviceDialog.cpp +++ b/src/gui/dialogs/ExportDeviceDialog.cpp @@ -41,7 +41,7 @@ ExportDeviceDialog::ExportDeviceDialog(TQWidget *parent, TQString deviceName) : Ok | Cancel, Ok) { TQVBox *vbox = makeVBoxMainWidget(); - TQButtonGroup *bg = new TQButtonGroup(1, Qt::Horizontal, + TQButtonGroup *bg = new TQButtonGroup(1, TQt::Horizontal, i18n("Export devices"), vbox); m_exportAll = new TQRadioButton(i18n("Export all devices"), bg); diff --git a/src/gui/dialogs/FloatEdit.cpp b/src/gui/dialogs/FloatEdit.cpp index 0bcc674..22b38d2 100644 --- a/src/gui/dialogs/FloatEdit.cpp +++ b/src/gui/dialogs/FloatEdit.cpp @@ -45,7 +45,7 @@ FloatEdit::FloatEdit(TQWidget *parent, KDialogBase(parent, "rosegardenFloatEdit", true, title, Ok | Cancel, Ok) { TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *groupBox = new TQGroupBox(1, Qt::Horizontal, text, vbox); + TQGroupBox *groupBox = new TQGroupBox(1, TQt::Horizontal, text, vbox); TQVBox *inVbox = new TQVBox(groupBox); // Calculate decimal points according to the step size diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp index 4aa4916..d9beacb 100644 --- a/src/gui/dialogs/ImportDeviceDialog.cpp +++ b/src/gui/dialogs/ImportDeviceDialog.cpp @@ -107,7 +107,7 @@ ImportDeviceDialog::doImport() return false; } - TQGroupBox *groupBox = new TQGroupBox(2, Qt::Horizontal, + TQGroupBox *groupBox = new TQGroupBox(2, TQt::Horizontal, i18n("Source device"), mainFrame); @@ -147,7 +147,7 @@ ImportDeviceDialog::doImport() TQHBox *optionsBox = new TQHBox(mainFrame); - TQGroupBox *gb = new TQGroupBox(1, Qt::Horizontal, i18n("Options"), + TQGroupBox *gb = new TQGroupBox(1, TQt::Horizontal, i18n("Options"), optionsBox); m_importBanks = new TQCheckBox(i18n("Import banks"), gb); @@ -160,7 +160,7 @@ ImportDeviceDialog::doImport() m_rename = 0; } - m_buttonGroup = new TQButtonGroup(1, Qt::Horizontal, + m_buttonGroup = new TQButtonGroup(1, TQt::Horizontal, i18n("Bank import behavior"), optionsBox); m_mergeBanks = new TQRadioButton(i18n("Merge banks"), m_buttonGroup); diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp index b95e240..645d537 100644 --- a/src/gui/dialogs/InterpretDialog.cpp +++ b/src/gui/dialogs/InterpretDialog.cpp @@ -45,7 +45,7 @@ InterpretDialog::InterpretDialog(TQWidget *parent) : TQVBox *vbox = makeVBoxMainWidget(); TQGroupBox *groupBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Interpretations to apply"), vbox); + (1, TQt::Horizontal, i18n("Interpretations to apply"), vbox); m_applyTextDynamics = new TQCheckBox (i18n("Apply text dynamics (p, mf, ff etc)"), groupBox); diff --git a/src/gui/dialogs/IntervalDialog.cpp b/src/gui/dialogs/IntervalDialog.cpp index 16a6a1e..b226004 100644 --- a/src/gui/dialogs/IntervalDialog.cpp +++ b/src/gui/dialogs/IntervalDialog.cpp @@ -71,7 +71,7 @@ IntervalDialog::IntervalDialog(TQWidget *parent, bool askChangeKey, bool askTran if (askChangeKey) { - TQButtonGroup *affectKeyGroup = new TQButtonGroup(1, Qt::Horizontal, i18n("Effect on Key"), vBox); + TQButtonGroup *affectKeyGroup = new TQButtonGroup(1, TQt::Horizontal, i18n("Effect on Key"), vBox); m_transposeWithinKey = new TQRadioButton(i18n("Transpose within key"), affectKeyGroup); m_transposeWithinKey->setChecked(true); m_transposeChangingKey = new TQRadioButton(i18n("Change key for selection"), affectKeyGroup); diff --git a/src/gui/dialogs/KeySignatureDialog.cpp b/src/gui/dialogs/KeySignatureDialog.cpp index 95d60ce..b0d42f1 100644 --- a/src/gui/dialogs/KeySignatureDialog.cpp +++ b/src/gui/dialogs/KeySignatureDialog.cpp @@ -72,16 +72,16 @@ KeySignatureDialog::KeySignatureDialog(TQWidget *parent, TQHBox *nameBox = 0; TQGroupBox *keyFrame = new TQGroupBox - (1, Qt::Horizontal, i18n("Key signature"), vbox); + (1, TQt::Horizontal, i18n("Key signature"), vbox); TQGroupBox *transposeFrame = new TQButtonGroup - (1, Qt::Horizontal, i18n("Key transposition"), vbox); + (1, TQt::Horizontal, i18n("Key transposition"), vbox); TQGroupBox *buttonFrame = new TQButtonGroup - (1, Qt::Horizontal, i18n("Scope"), vbox); + (1, TQt::Horizontal, i18n("Scope"), vbox); TQButtonGroup *conversionFrame = new TQButtonGroup - (1, Qt::Horizontal, i18n("Existing notes following key change"), vbox); + (1, TQt::Horizontal, i18n("Existing notes following key change"), vbox); keyBox = new TQHBox(keyFrame); nameBox = new TQHBox(keyFrame); @@ -91,14 +91,14 @@ KeySignatureDialog::KeySignatureDialog(TQWidget *parent, explanatoryLabel = new TQLabel(explanatoryText, keyFrame); } - BigArrowButton *keyDown = new BigArrowButton(keyBox, Qt::LeftArrow); + BigArrowButton *keyDown = new BigArrowButton(keyBox, TQt::LeftArrow); TQToolTip::add (keyDown, i18n("Flatten")); m_keyLabel = new TQLabel(i18n("Key"), keyBox); m_keyLabel->setAlignment(AlignVCenter | AlignHCenter); - BigArrowButton *keyUp = new BigArrowButton(keyBox, Qt::RightArrow); + BigArrowButton *keyUp = new BigArrowButton(keyBox, TQt::RightArrow); TQToolTip::add (keyUp, i18n("Sharpen")); diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp index 7afa7f2..ac52212 100644 --- a/src/gui/dialogs/LilyPondOptionsDialog.cpp +++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp @@ -100,7 +100,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, // TQGroupBox *basicOptionsBox = new TQGroupBox - (1, Qt::Horizontal, + (1, TQt::Horizontal, i18n("Basic options"), generalFrame); generalGrid->addWidget(basicOptionsBox, 0, 0); @@ -163,7 +163,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, // TQGroupBox *staffOptionsBox = new TQGroupBox - (1, Qt::Horizontal, + (1, TQt::Horizontal, i18n("Staff level options"), generalFrame); generalGrid->addWidget(staffOptionsBox, 1, 0); @@ -192,7 +192,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, // TQGroupBox *notationOptionsBox = new TQGroupBox - (1, Qt::Horizontal, + (1, TQt::Horizontal, i18n("Notation options"), generalFrame); generalGrid->addWidget(notationOptionsBox, 2, 0); @@ -238,7 +238,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, // TQGroupBox *advancedLayoutOptionsBox = new TQGroupBox - (1, Qt::Horizontal, + (1, TQt::Horizontal, i18n("Layout options"), advancedFrame); advancedGrid->addWidget(advancedLayoutOptionsBox, 0, 0); @@ -261,7 +261,7 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, layoutAdvancedLayout->addMultiCellWidget(m_lilyRaggedBottom, 1, 2, 0, 1); TQGroupBox *miscOptionsBox = new TQGroupBox - (1, Qt::Horizontal, + (1, TQt::Horizontal, i18n("Miscellaneous options"), advancedFrame); advancedGrid->addWidget(miscOptionsBox, 1, 0); diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp index 421ca66..9501925 100644 --- a/src/gui/dialogs/LyricEditDialog.cpp +++ b/src/gui/dialogs/LyricEditDialog.cpp @@ -57,7 +57,7 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); TQGroupBox *groupBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Lyrics for this segment"), vbox); + (1, TQt::Horizontal, i18n("Lyrics for this segment"), vbox); TQHBox *hbox = new TQHBox(groupBox); hbox->setSpacing(5); diff --git a/src/gui/dialogs/MakeOrnamentDialog.cpp b/src/gui/dialogs/MakeOrnamentDialog.cpp index 3da45bc..83ec7f0 100644 --- a/src/gui/dialogs/MakeOrnamentDialog.cpp +++ b/src/gui/dialogs/MakeOrnamentDialog.cpp @@ -44,7 +44,7 @@ MakeOrnamentDialog::MakeOrnamentDialog(TQWidget *parent, TQString defaultName, Ok | Cancel, Ok) { TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *nameBox = new TQGroupBox(2, Qt::Vertical, i18n("Name"), vbox); + TQGroupBox *nameBox = new TQGroupBox(2, TQt::Vertical, i18n("Name"), vbox); new TQLabel(i18n("The name is used to identify both the ornament\nand the triggered segment that stores\nthe ornament's notes."), nameBox); diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp index 6fe7afc..b54d27d 100644 --- a/src/gui/dialogs/ManageMetronomeDialog.cpp +++ b/src/gui/dialogs/ManageMetronomeDialog.cpp @@ -72,7 +72,7 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent, TQVBox *vbox = new TQVBox(hbox); TQGroupBox *deviceBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Metronome Instrument"), vbox); + (1, TQt::Horizontal, i18n("Metronome Instrument"), vbox); TQFrame *frame = new TQFrame(deviceBox); TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5); @@ -113,7 +113,7 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent, layout->addWidget(m_metronomeInstrument, 1, 1); TQGroupBox *beatBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Beats"), vbox); + (1, TQt::Horizontal, i18n("Beats"), vbox); frame = new TQFrame(beatBox); layout = new TQGridLayout(frame, 4, 2, 10, 5); @@ -161,7 +161,7 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent, connect(m_metronomePitchSelector, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPitchSelectorChanged(int))); TQGroupBox *enableBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Metronome Activated"), vbox); + (1, TQt::Horizontal, i18n("Metronome Activated"), vbox); m_playEnabled = new TQCheckBox(i18n("Playing"), enableBox); m_recordEnabled = new TQCheckBox(i18n("Recording"), enableBox); connect(m_playEnabled, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSetModified())); diff --git a/src/gui/dialogs/MarkerModifyDialog.cpp b/src/gui/dialogs/MarkerModifyDialog.cpp index d987d65..f86276f 100644 --- a/src/gui/dialogs/MarkerModifyDialog.cpp +++ b/src/gui/dialogs/MarkerModifyDialog.cpp @@ -89,7 +89,7 @@ MarkerModifyDialog::initialise(Composition *composition, m_timeEdit->setValue(time); */ TQGroupBox *groupBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Marker Properties"), vbox); + (1, TQt::Horizontal, i18n("Marker Properties"), vbox); TQFrame *frame = new TQFrame(groupBox); diff --git a/src/gui/dialogs/PasteNotationDialog.cpp b/src/gui/dialogs/PasteNotationDialog.cpp index 124d272..7fe3d7f 100644 --- a/src/gui/dialogs/PasteNotationDialog.cpp +++ b/src/gui/dialogs/PasteNotationDialog.cpp @@ -47,7 +47,7 @@ PasteNotationDialog::PasteNotationDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); TQButtonGroup *pasteTypeGroup = new TQButtonGroup - (1, Qt::Horizontal, i18n("Paste type"), vbox); + (1, TQt::Horizontal, i18n("Paste type"), vbox); PasteEventsCommand::PasteTypeMap pasteTypes = PasteEventsCommand::getPasteTypes(); @@ -64,7 +64,7 @@ PasteNotationDialog::PasteNotationDialog(TQWidget *parent, } TQButtonGroup *setAsDefaultGroup = new TQButtonGroup - (1, Qt::Horizontal, i18n("Options"), vbox); + (1, TQt::Horizontal, i18n("Options"), vbox); m_setAsDefaultButton = new TQCheckBox (i18n("Make this the default paste type"), setAsDefaultGroup); diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp index 20beaa1..ee52826 100644 --- a/src/gui/dialogs/RescaleDialog.cpp +++ b/src/gui/dialogs/RescaleDialog.cpp @@ -56,7 +56,7 @@ RescaleDialog::RescaleDialog(TQWidget *parent, constrainToCompositionDuration); if (showCloseGapOption) { - TQGroupBox *optionBox = new TQGroupBox(1, Qt::Horizontal, i18n("Options"), vbox); + TQGroupBox *optionBox = new TQGroupBox(1, TQt::Horizontal, i18n("Options"), vbox); m_closeGap = new TQCheckBox(i18n("Adjust times of following events accordingly"), optionBox); TDEConfig *config = kapp->config(); diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp index e1fcbf8..9591d00 100644 --- a/src/gui/dialogs/SimpleEventEditDialog.cpp +++ b/src/gui/dialogs/SimpleEventEditDialog.cpp @@ -70,7 +70,7 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); TQGroupBox *groupBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Event Properties"), vbox); + (1, TQt::Horizontal, i18n("Event Properties"), vbox); TQFrame *frame = new TQFrame(groupBox); @@ -187,7 +187,7 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, TQT_SLOT(slotSysexSave())); m_notationGroupBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Notation Properties"), vbox); + (1, TQt::Horizontal, i18n("Notation Properties"), vbox); frame = new TQFrame(m_notationGroupBox); diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp index 8a94d69..c522481 100644 --- a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp +++ b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp @@ -48,7 +48,7 @@ SplitByRecordingSrcDialog::SplitByRecordingSrcDialog(TQWidget *parent, Rosegarde TQVBox *vBox = makeVBoxMainWidget(); TQGroupBox *groupBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Recording Source"), vBox); + (1, TQt::Horizontal, i18n("Recording Source"), vBox); TQFrame *frame = new TQFrame(groupBox); TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5); diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp index 868ffd5..40843d1 100644 --- a/src/gui/dialogs/TempoDialog.cpp +++ b/src/gui/dialogs/TempoDialog.cpp @@ -58,7 +58,7 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc, setHelp("tempo"); TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *groupBox = new TQGroupBox(1, Qt::Horizontal, i18n("Tempo"), vbox); + TQGroupBox *groupBox = new TQGroupBox(1, TQt::Horizontal, i18n("Tempo"), vbox); TQFrame *frame = new TQFrame(groupBox); TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 5, 5); @@ -122,7 +122,7 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc, } // Scope Box - TQButtonGroup *scopeGroup = new TQButtonGroup(1, Qt::Horizontal, + TQButtonGroup *scopeGroup = new TQButtonGroup(1, TQt::Horizontal, i18n("Scope"), vbox); // new TQLabel(scopeBox); diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp index eb135cd..fb6908f 100644 --- a/src/gui/dialogs/TextEventDialog.cpp +++ b/src/gui/dialogs/TextEventDialog.cpp @@ -61,11 +61,11 @@ TextEventDialog::TextEventDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); TQGroupBox *entryBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Specification"), vbox); + (1, TQt::Horizontal, i18n("Specification"), vbox); TQGroupBox *exampleBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Preview"), vbox); + (1, TQt::Horizontal, i18n("Preview"), vbox); - TQGrid *entryGrid = new TQGrid(2, Qt::Horizontal, entryBox); + TQGrid *entryGrid = new TQGrid(2, TQt::Horizontal, entryBox); new TQLabel(i18n("Text: "), entryGrid); m_text = new TQLineEdit(entryGrid); diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp index 46369cf..797b5ab 100644 --- a/src/gui/dialogs/TimeSignatureDialog.cpp +++ b/src/gui/dialogs/TimeSignatureDialog.cpp @@ -77,7 +77,7 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); TQGroupBox *groupBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Time signature"), vbox); + (1, TQt::Horizontal, i18n("Time signature"), vbox); TQHBox *numBox = new TQHBox(groupBox); TQHBox *denomBox = new TQHBox(groupBox); @@ -86,8 +86,8 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, explanatoryLabel = new TQLabel(explanatoryText, groupBox); } - BigArrowButton *numDown = new BigArrowButton(numBox, Qt::LeftArrow); - BigArrowButton *denomDown = new BigArrowButton(denomBox, Qt::LeftArrow); + BigArrowButton *numDown = new BigArrowButton(numBox, TQt::LeftArrow); + BigArrowButton *denomDown = new BigArrowButton(denomBox, TQt::LeftArrow); m_numLabel = new TQLabel (TQString("%1").arg(m_timeSignature.getNumerator()), numBox); @@ -100,8 +100,8 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, m_numLabel->setFont(*timeSigFont); m_denomLabel->setFont(*timeSigFont); - BigArrowButton *numUp = new BigArrowButton(numBox, Qt::RightArrow); - BigArrowButton *denomUp = new BigArrowButton(denomBox, Qt::RightArrow); + BigArrowButton *numUp = new BigArrowButton(numBox, TQt::RightArrow); + BigArrowButton *denomUp = new BigArrowButton(denomBox, TQt::RightArrow); TQObject::connect(numDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNumDown())); TQObject::connect(numUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNumUp())); @@ -124,7 +124,7 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, m_timeEditor = 0; - groupBox = new TQButtonGroup(1, Qt::Horizontal, i18n("Scope"), vbox); + groupBox = new TQButtonGroup(1, TQt::Horizontal, i18n("Scope"), vbox); int barNo = composition->getBarNumber(m_time); bool atStartOfBar = (m_time == composition->getBarStart(barNo)); @@ -166,7 +166,7 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, } } - groupBox = new TQGroupBox(1, Qt::Horizontal, i18n("Options"), vbox); + groupBox = new TQGroupBox(1, TQt::Horizontal, i18n("Options"), vbox); TDEConfig *config = kapp->config(); config->setGroup(GeneralOptionsConfigGroup); diff --git a/src/gui/dialogs/TupletDialog.cpp b/src/gui/dialogs/TupletDialog.cpp index f813e30..c6e70ab 100644 --- a/src/gui/dialogs/TupletDialog.cpp +++ b/src/gui/dialogs/TupletDialog.cpp @@ -53,7 +53,7 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType, TQVBox *vbox = makeVBoxMainWidget(); TQGroupBox *timingBox = new TQGroupBox - (1, Qt::Horizontal, i18n("New timing for tuplet group"), vbox); + (1, TQt::Horizontal, i18n("New timing for tuplet group"), vbox); if (m_maxDuration > 0) { @@ -109,9 +109,9 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType, updateTupledCombo(); m_timingDisplayBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Timing calculations"), vbox); + (1, TQt::Horizontal, i18n("Timing calculations"), vbox); - TQGrid *timingDisplayGrid = new TQGrid(3, Qt::Horizontal, m_timingDisplayBox); + TQGrid *timingDisplayGrid = new TQGrid(3, TQt::Horizontal, m_timingDisplayBox); if (maxDuration > 0) { diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp index d1a2056..48bb828 100644 --- a/src/gui/dialogs/UseOrnamentDialog.cpp +++ b/src/gui/dialogs/UseOrnamentDialog.cpp @@ -58,7 +58,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); TQLabel *label; - TQGroupBox *notationBox = new TQGroupBox(1, Qt::Horizontal, i18n("Notation"), vbox); + TQGroupBox *notationBox = new TQGroupBox(1, TQt::Horizontal, i18n("Notation"), vbox); TQFrame *frame = new TQFrame(notationBox); TQGridLayout *layout = new TQGridLayout(frame, 4, 1, 5, 5); @@ -99,7 +99,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent, m_text = new TQLineEdit(frame); layout->addWidget(m_text, 0, 3); - TQGroupBox *performBox = new TQGroupBox(1, Qt::Horizontal, i18n("Performance"), vbox); + TQGroupBox *performBox = new TQGroupBox(1, TQt::Horizontal, i18n("Performance"), vbox); frame = new TQFrame(performBox); layout = new TQGridLayout(frame, 3, 2, 5, 5); diff --git a/src/gui/editors/eventlist/EventView.cpp b/src/gui/editors/eventlist/EventView.cpp index 699d19b..8f527d6 100644 --- a/src/gui/editors/eventlist/EventView.cpp +++ b/src/gui/editors/eventlist/EventView.cpp @@ -124,7 +124,7 @@ EventView::EventView(RosegardenGUIDoc *doc, // define some note filtering buttons in a group // m_filterGroup = - new TQButtonGroup(1, Qt::Horizontal, i18n("Event filters"), getCentralWidget()); + new TQButtonGroup(1, TQt::Horizontal, i18n("Event filters"), getCentralWidget()); m_noteCheckBox = new TQCheckBox(i18n("Note"), m_filterGroup); m_programCheckBox = new TQCheckBox(i18n("Program Change"), m_filterGroup); @@ -156,7 +156,7 @@ EventView::EventView(RosegardenGUIDoc *doc, segments[0]->getComposition()->getTriggerSegmentRec(id); TQGroupBox *groupBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Triggered Segment Properties"), getCentralWidget()); + (1, TQt::Horizontal, i18n("Triggered Segment Properties"), getCentralWidget()); TQFrame *frame = new TQFrame(groupBox); TQGridLayout *layout = new TQGridLayout(frame, 5, 3, 5, 5); diff --git a/src/gui/editors/guitar/FingeringBox.cpp b/src/gui/editors/guitar/FingeringBox.cpp index a8db91e..ccba5ff 100644 --- a/src/gui/editors/guitar/FingeringBox.cpp +++ b/src/gui/editors/guitar/FingeringBox.cpp @@ -181,7 +181,7 @@ FingeringBox::mousePressEvent(TQMouseEvent *event) if (!m_editable) return; - if((event->button() == Qt::LeftButton) && m_editable) { + if((event->button() == TQt::LeftButton) && m_editable) { // Find string position m_press_string_num = getStringNumber(event->pos()); diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp index f91d69b..091d995 100644 --- a/src/gui/editors/matrix/MatrixView.cpp +++ b/src/gui/editors/matrix/MatrixView.cpp @@ -1396,7 +1396,7 @@ void MatrixView::slotMousePressed(timeT time, int pitch, m_tool->handleMousePress(time, pitch, 0, e, el); - if (e->button() != Qt::RightButton) { + if (e->button() != TQt::RightButton) { getCanvasView()->startAutoScroll(); } @@ -2215,7 +2215,7 @@ MatrixView::initZoomToolbar() } m_hZoomSlider = new ZoomSlider<double> - (zoomSizes, -1, Qt::Horizontal, zoomToolbar, "tde toolbar widget"); + (zoomSizes, -1, TQt::Horizontal, zoomToolbar, "tde toolbar widget"); m_hZoomSlider->setTracking(true); m_hZoomSlider->setFocusPolicy(TQWidget::NoFocus); diff --git a/src/gui/editors/matrix/PianoKeyboard.cpp b/src/gui/editors/matrix/PianoKeyboard.cpp index b099f48..7123695 100644 --- a/src/gui/editors/matrix/PianoKeyboard.cpp +++ b/src/gui/editors/matrix/PianoKeyboard.cpp @@ -256,7 +256,7 @@ void PianoKeyboard::mouseMoveEvent(TQMouseEvent* e) } } - if (e->state() & Qt::LeftButton) { + if (e->state() & TQt::LeftButton) { if (m_selecting) emit keySelected(e->y(), true); else @@ -272,7 +272,7 @@ void PianoKeyboard::mousePressEvent(TQMouseEvent *e) { TQt::ButtonState bs = e->state(); - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { m_mouseDown = true; m_selecting = (bs & TQt::ShiftButton); m_lastKeyPressed = e->y(); @@ -286,7 +286,7 @@ void PianoKeyboard::mousePressEvent(TQMouseEvent *e) void PianoKeyboard::mouseReleaseEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { m_mouseDown = false; m_selecting = false; emit keyReleased(e->y(), false); diff --git a/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp b/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp index d20d3b4..b434cf0 100644 --- a/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp +++ b/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp @@ -50,7 +50,7 @@ TQPointArray QCanvasMatrixDiamond::areaPoints() const int pw = (pen().width() + 1) / 2; if ( pw < 1 ) pw = 1; - if ( pen() == Qt::NoPen ) + if ( pen() == TQt::NoPen ) pw = 0; pa[0] = TQPoint((int)x() - height() / 2 - pw, (int)y() - pw); pa[1] = pa[0] + TQPoint(height() + pw * 2, 0); diff --git a/src/gui/editors/notation/NoteFont.cpp b/src/gui/editors/notation/NoteFont.cpp index af8dd46..60157ca 100644 --- a/src/gui/editors/notation/NoteFont.cpp +++ b/src/gui/editors/notation/NoteFont.cpp @@ -202,7 +202,7 @@ NoteFont::lookupDrawRep(TQPixmap *pixmap) const return 0; if (image.depth() > 1) { - image = image.convertDepth(1, Qt::MonoOnly | Qt::ThresholdDither); + image = image.convertDepth(1, TQt::MonoOnly | TQt::ThresholdDither); } NoteCharacterDrawRep *a = new NoteCharacterDrawRep(); diff --git a/src/gui/editors/notation/NotePixmapFactory.cpp b/src/gui/editors/notation/NotePixmapFactory.cpp index 22c22f7..9268121 100644 --- a/src/gui/editors/notation/NotePixmapFactory.cpp +++ b/src/gui/editors/notation/NotePixmapFactory.cpp @@ -2921,7 +2921,7 @@ NotePixmapFactory::drawOttavaAux(int length, int octavesUp, m_p->drawLine(x0, y0, x1, y0); - pen.setStyle(Qt::SolidLine); + pen.setStyle(TQt::SolidLine); m_p->painter().setPen(pen); // if (!m_inPrinterMethod) m_p->maskPainter().setPen(pen); diff --git a/src/gui/editors/notation/NotePixmapPainter.h b/src/gui/editors/notation/NotePixmapPainter.h index 62118af..4e5ca12 100644 --- a/src/gui/editors/notation/NotePixmapPainter.h +++ b/src/gui/editors/notation/NotePixmapPainter.h @@ -42,8 +42,8 @@ public: m_externalPainter = painter; m_useMask = false; - painter->setPen(TQPen(Qt::black, 1, Qt::SolidLine, - Qt::RoundCap, Qt::RoundJoin)); + painter->setPen(TQPen(TQt::black, 1, TQt::SolidLine, + TQt::RoundCap, TQt::RoundJoin)); if (m_externalPainter) { m_painter = m_externalPainter; diff --git a/src/gui/editors/segment/ControlParameterEditDialog.cpp b/src/gui/editors/segment/ControlParameterEditDialog.cpp index 731c37e..3c3c76b 100644 --- a/src/gui/editors/segment/ControlParameterEditDialog.cpp +++ b/src/gui/editors/segment/ControlParameterEditDialog.cpp @@ -66,7 +66,7 @@ ControlParameterEditDialog::ControlParameterEditDialog( TQVBox *vbox = makeVBoxMainWidget(); TQGroupBox *groupBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Control Event Properties"), vbox); + (1, TQt::Horizontal, i18n("Control Event Properties"), vbox); TQFrame *frame = new TQFrame(groupBox); diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp index b3e6057..a0b6f3c 100644 --- a/src/gui/editors/segment/MarkerEditor.cpp +++ b/src/gui/editors/segment/MarkerEditor.cpp @@ -89,7 +89,7 @@ MarkerEditor::MarkerEditor(TQWidget *parent, for (int i = 0; i < 3; ++i) m_listView->setColumnAlignment(i, TQt::AlignHCenter); - TQGroupBox *posGroup = new TQGroupBox(2, Qt::Horizontal, + TQGroupBox *posGroup = new TQGroupBox(2, TQt::Horizontal, i18n("Pointer position"), mainFrame); new TQLabel(i18n("Absolute time:"), posGroup); diff --git a/src/gui/editors/segment/TrackHeader.cpp b/src/gui/editors/segment/TrackHeader.cpp index 4e0e498..1e17f8f 100644 --- a/src/gui/editors/segment/TrackHeader.cpp +++ b/src/gui/editors/segment/TrackHeader.cpp @@ -40,7 +40,7 @@ TrackHeader::paintEvent(TQPaintEvent *e) { TQPainter p( this ); p.setPen( colorGroup().buttonText() ); - int pos = (orientation() == Qt::Horizontal) + int pos = (orientation() == TQt::Horizontal) ? e->rect().left() : e->rect().top(); int id = mapToIndex( sectionAt( pos + offset() ) ); @@ -52,8 +52,8 @@ TrackHeader::paintEvent(TQPaintEvent *e) for ( int i = id; i < count(); i++ ) { TQRect r = sRect( i ); paintSection( &p, i, r ); - if ( orientation() == Qt::Horizontal && r. right() >= e->rect().right() || - orientation() == Qt::Vertical && r. bottom() >= e->rect().bottom() ) + if ( orientation() == TQt::Horizontal && r. right() >= e->rect().right() || + orientation() == TQt::Vertical && r. bottom() >= e->rect().bottom() ) return ; } diff --git a/src/gui/editors/segment/TrackLabel.cpp b/src/gui/editors/segment/TrackLabel.cpp index 8ccf44e..108fb7e 100644 --- a/src/gui/editors/segment/TrackLabel.cpp +++ b/src/gui/editors/segment/TrackLabel.cpp @@ -142,12 +142,12 @@ TrackLabel::setSelected(bool on) void TrackLabel::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { emit clicked(); emit changeToInstrumentList(); - } else if (e->button() == Qt::LeftButton) { + } else if (e->button() == TQt::LeftButton) { // start a timer on this hold m_pressTimer->start(200, true); // 200ms, single shot @@ -161,7 +161,7 @@ TrackLabel::mouseReleaseEvent(TQMouseEvent *e) if (m_pressTimer->isActive()) m_pressTimer->stop(); - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { emit clicked(); } } @@ -169,7 +169,7 @@ TrackLabel::mouseReleaseEvent(TQMouseEvent *e) void TrackLabel::mouseDoubleClickEvent(TQMouseEvent *e) { - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) return ; // Highlight this label alone and cheat using diff --git a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp index be654e7..3d09344 100644 --- a/src/gui/editors/segment/segmentcanvas/CompositionView.cpp +++ b/src/gui/editors/segment/segmentcanvas/CompositionView.cpp @@ -878,7 +878,7 @@ void CompositionView::drawAreaAudioPreviews(TQPainter * p, const TQRect& clipRec // << " - preResizeOrigin : " << api->preResizeOrigin << endl; p->drawImage(drawBasePoint, api->pixmap[idx], localRect, - Qt::ColorOnly | Qt::ThresholdDither | Qt::AvoidDither); + TQt::ColorOnly | TQt::ThresholdDither | TQt::AvoidDither); ++idx; if (idx >= api->pixmap.size()) @@ -1361,8 +1361,8 @@ void CompositionView::contentsMousePressEvent(TQMouseEvent* e) slotSetPencilOverExisting((bs & TQt::AltButton + TQt::ControlButton) != 0); switch (e->button()) { - case Qt::LeftButton: - case Qt::MidButton: + case TQt::LeftButton: + case TQt::MidButton: startAutoScroll(); if (m_tool) @@ -1371,7 +1371,7 @@ void CompositionView::contentsMousePressEvent(TQMouseEvent* e) RG_DEBUG << "CompositionView::contentsMousePressEvent() :" << this << " no tool\n"; break; - case Qt::RightButton: + case TQt::RightButton: if (m_tool) m_tool->handleRightButtonPress(e); else @@ -1392,8 +1392,8 @@ void CompositionView::contentsMouseReleaseEvent(TQMouseEvent* e) if (!m_tool) return ; - if (e->button() == Qt::LeftButton || - e->button() == Qt::MidButton ) + if (e->button() == TQt::LeftButton || + e->button() == TQt::MidButton ) m_tool->handleMouseButtonRelease(e); } diff --git a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp index 3843ba6..ae2c2aa 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentMover.cpp @@ -76,7 +76,7 @@ void SegmentMover::slotCanvasScrolled(int newX, int newY) { TQMouseEvent tmpEvent(TQEvent::MouseMove, m_canvas->viewport()->mapFromGlobal(TQCursor::pos()) + TQPoint(newX, newY), - Qt::NoButton, Qt::NoButton); + TQt::NoButton, TQt::NoButton); handleMouseMove(&tmpEvent); } diff --git a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp index 67ad3d3..38bdf31 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentPencil.cpp @@ -78,13 +78,13 @@ void SegmentPencil::slotCanvasScrolled(int newX, int newY) { TQMouseEvent tmpEvent(TQEvent::MouseMove, m_canvas->viewport()->mapFromGlobal(TQCursor::pos()) + TQPoint(newX, newY), - Qt::NoButton, Qt::NoButton); + TQt::NoButton, TQt::NoButton); handleMouseMove(&tmpEvent); } void SegmentPencil::handleMouseButtonPress(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) return; // is user holding Ctrl+Alt? (ugly, but we are running short on available @@ -151,7 +151,7 @@ void SegmentPencil::handleMouseButtonPress(TQMouseEvent *e) void SegmentPencil::handleMouseButtonRelease(TQMouseEvent* e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) return ; setContextHelpFor(e->pos()); diff --git a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp index 671e04c..505ce3e 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentResizer.cpp @@ -83,7 +83,7 @@ void SegmentResizer::slotCanvasScrolled(int newX, int newY) { TQMouseEvent tmpEvent(TQEvent::MouseMove, m_canvas->viewport()->mapFromGlobal(TQCursor::pos()) + TQPoint(newX, newY), - Qt::NoButton, Qt::NoButton); + TQt::NoButton, TQt::NoButton); handleMouseMove(&tmpEvent); } diff --git a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp index 54d973c..cb20975 100644 --- a/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp +++ b/src/gui/editors/segment/segmentcanvas/SegmentSelector.cpp @@ -86,7 +86,7 @@ void SegmentSelector::slotCanvasScrolled(int newX, int newY) { TQMouseEvent tmpEvent(TQEvent::MouseMove, m_canvas->viewport()->mapFromGlobal(TQCursor::pos()) + TQPoint(newX, newY), - Qt::NoButton, Qt::NoButton); + TQt::NoButton, TQt::NoButton); handleMouseMove(&tmpEvent); } @@ -172,8 +172,8 @@ SegmentSelector::handleMouseButtonPress(TQMouseEvent *e) // Add on middle button or ctrl+left - bounding box on rest // - if (e->button() == Qt::MidButton || - (e->button() == Qt::LeftButton && (e->state() & ControlButton))) { + if (e->button() == TQt::MidButton || + (e->button() == TQt::LeftButton && (e->state() & ControlButton))) { m_dispatchTool = getToolBox()->getTool(SegmentPencil::ToolName); diff --git a/src/gui/editors/tempo/TempoView.cpp b/src/gui/editors/tempo/TempoView.cpp index 9643228..001b610 100644 --- a/src/gui/editors/tempo/TempoView.cpp +++ b/src/gui/editors/tempo/TempoView.cpp @@ -84,7 +84,7 @@ TempoView::TempoView(RosegardenGUIDoc *doc, TQWidget *parent, timeT openTime): // define some note filtering buttons in a group // m_filterGroup = - new TQButtonGroup(1, Qt::Horizontal, i18n("Filter"), getCentralWidget()); + new TQButtonGroup(1, TQt::Horizontal, i18n("Filter"), getCentralWidget()); m_tempoCheckBox = new TQCheckBox(i18n("Tempo"), m_filterGroup); m_timeSigCheckBox = new TQCheckBox(i18n("Time Signature"), m_filterGroup); diff --git a/src/gui/general/EditTool.cpp b/src/gui/general/EditTool.cpp index a9ca0d9..3aa9086 100644 --- a/src/gui/general/EditTool.cpp +++ b/src/gui/general/EditTool.cpp @@ -54,7 +54,7 @@ void EditTool::handleMousePress(timeT time, switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: if (e->type() == TQEvent::MouseButtonDblClick) { RG_DEBUG << "EditTool::handleMousePress: it's a double-click" << endl; @@ -66,11 +66,11 @@ void EditTool::handleMousePress(timeT time, } break; - case Qt::RightButton: + case TQt::RightButton: handleRightButtonPress(time, height, staffNo, e, el); break; - case Qt::MidButton: + case TQt::MidButton: handleMidButtonPress(time, height, staffNo, e, el); break; diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp index 18ed4af..3c9e100 100644 --- a/src/gui/general/PresetHandlerDialog.cpp +++ b/src/gui/general/PresetHandlerDialog.cpp @@ -96,7 +96,7 @@ PresetHandlerDialog::initDialog() m_playerCombo->insertItem(i18n("Professional")); TQGroupBox *scopeBox = new TQButtonGroup - (1, Qt::Horizontal, i18n("Scope"), frame); + (1, TQt::Horizontal, i18n("Scope"), frame); if (m_fromNotation) { TQRadioButton *onlySelectedSegments = new TQRadioButton(i18n("Only selected segments"), scopeBox); diff --git a/src/gui/kdeext/KLedButton.cpp b/src/gui/kdeext/KLedButton.cpp index e2f2165..face32a 100644 --- a/src/gui/kdeext/KLedButton.cpp +++ b/src/gui/kdeext/KLedButton.cpp @@ -48,7 +48,7 @@ KLedButton::~KLedButton() void KLedButton::mousePressEvent( TQMouseEvent *e ) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { toggle(); emit stateChanged( state() ); } diff --git a/src/gui/kdeext/RGLed.cpp b/src/gui/kdeext/RGLed.cpp index f266a08..1126e3d 100644 --- a/src/gui/kdeext/RGLed.cpp +++ b/src/gui/kdeext/RGLed.cpp @@ -292,7 +292,7 @@ KLed::paintFlat() // paint a ROUND FLAT led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn with a thin grey "border" (pen) - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); brush.setColor( color ); pen.setWidth( 1 ); @@ -337,7 +337,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn first - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); brush.setColor( color ); paint.setBrush( brush ); // Assign the brush to the painter @@ -387,7 +387,7 @@ KLed::paintRound() // paint a ROUND RAISED led lamp color = colorGroup().dark(); pen.setColor( color ); // Set the pen accordingly paint.setPen( pen ); // Select pen for drawing - brush.setStyle( Qt::NoBrush ); // Switch off the brush + brush.setStyle( TQt::NoBrush ); // Switch off the brush paint.setBrush( brush ); // This avoids filling of the ellipse paint.drawEllipse( 1, 1, width, width ); @@ -457,7 +457,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp // Set the brush to SolidPattern, this fills the entire area // of the ellipse which is drawn first - brush.setStyle( Qt::SolidPattern ); + brush.setStyle( TQt::SolidPattern ); brush.setColor( color ); paint.setBrush( brush ); // Assign the brush to the painter @@ -504,7 +504,7 @@ KLed::paintSunken() // paint a ROUND SUNKEN led lamp // from the upper left. pen.setWidth( 2 * scale + 1 ); // ### shouldn't this value be smaller for smaller LEDs? - brush.setStyle( Qt::NoBrush ); // Switch off the brush + brush.setStyle( TQt::NoBrush ); // Switch off the brush paint.setBrush( brush ); // This avoids filling of the ellipse // Set the initial color value to colorGroup().light() (bright) and start diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp index d4b5d1d..e05620e 100644 --- a/src/gui/kdeext/klearlook.cpp +++ b/src/gui/kdeext/klearlook.cpp @@ -2771,10 +2771,10 @@ void KlearlookStyle::drawControl( TQPixmap pixmap = *mi->pixmap(); if ( 1 == pixmap.depth() ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); p->drawPixmap( ir.x(), ( ir.height() - pixmap.height() ) >> 1, pixmap ); if ( pixmap.depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } if ( mi->popup() ) @@ -3307,7 +3307,7 @@ void KlearlookStyle::drawComplexControl( ( hw && HOVER_SB_SUB == hover ? Style_MouseOver : Style_Default ) | Style_Enabled | ( ( active == SC_ScrollBarSubLine ) ? Style_Down : Style_Default ) | - ( ( scrollbar->orientation() == Qt::Horizontal ) ? Style_Horizontal : Style_Default ) + ( ( scrollbar->orientation() == TQt::Horizontal ) ? Style_Horizontal : Style_Default ) ); if ( ( controls & SC_ScrollBarAddLine ) && addline.isValid() ) drawPrimitive( @@ -3315,34 +3315,34 @@ void KlearlookStyle::drawComplexControl( ( hw && HOVER_SB_ADD == hover ? Style_MouseOver : Style_Default ) | Style_Enabled | ( ( active == SC_ScrollBarAddLine ) ? Style_Down : Style_Default ) | - ( ( scrollbar->orientation() == Qt::Horizontal ) ? Style_Horizontal : Style_Default ) + ( ( scrollbar->orientation() == TQt::Horizontal ) ? Style_Horizontal : Style_Default ) ); if ( ( controls & SC_ScrollBarSubPage ) && subpage.isValid() ) drawPrimitive( PE_ScrollBarSubPage, p, ceData, elementFlags, subpage, cg, Style_Enabled | ( ( active == SC_ScrollBarSubPage ) ? Style_Down : Style_Default ) | - ( ( scrollbar->orientation() == Qt::Horizontal ) ? Style_Horizontal : Style_Default ) ); + ( ( scrollbar->orientation() == TQt::Horizontal ) ? Style_Horizontal : Style_Default ) ); if ( ( controls & SC_ScrollBarAddPage ) && addpage.isValid() ) drawPrimitive( PE_ScrollBarAddPage, p, ceData, elementFlags, addpage, cg, ( ( scrollbar->minValue() == scrollbar->maxValue() ) ? Style_Default : Style_Enabled ) | ( ( active == SC_ScrollBarAddPage ) ? Style_Down : Style_Default ) | - ( ( scrollbar->orientation() == Qt::Horizontal ) ? Style_Horizontal : Style_Default ) ); + ( ( scrollbar->orientation() == TQt::Horizontal ) ? Style_Horizontal : Style_Default ) ); if ( ( controls & SC_ScrollBarFirst ) && first.isValid() ) drawPrimitive( PE_ScrollBarFirst, p, ceData, elementFlags, first, cg, Style_Enabled | ( ( active == SC_ScrollBarFirst ) ? Style_Down : Style_Default ) | - ( ( scrollbar->orientation() == Qt::Horizontal ) ? Style_Horizontal : Style_Default ) ); + ( ( scrollbar->orientation() == TQt::Horizontal ) ? Style_Horizontal : Style_Default ) ); if ( ( controls & SC_ScrollBarLast ) && last.isValid() ) drawPrimitive( PE_ScrollBarLast, p, ceData, elementFlags, last, cg, Style_Enabled | ( ( active == SC_ScrollBarLast ) ? Style_Down : Style_Default ) | - ( ( scrollbar->orientation() == Qt::Horizontal ) ? Style_Horizontal : Style_Default ) ); + ( ( scrollbar->orientation() == TQt::Horizontal ) ? Style_Horizontal : Style_Default ) ); if ( ( controls & SC_ScrollBarSlider ) && slider.isValid() ) { drawPrimitive( PE_ScrollBarSlider, p, ceData, elementFlags, slider, cg, ( hw && HOVER_SB_SLIDER == hover ? Style_MouseOver : Style_Default ) | Style_Enabled | ( ( active == SC_ScrollBarSlider ) ? Style_Down : Style_Default ) | - ( ( scrollbar->orientation() == Qt::Horizontal ) ? Style_Horizontal : Style_Default ) ); + ( ( scrollbar->orientation() == TQt::Horizontal ) ? Style_Horizontal : Style_Default ) ); // ### perhaps this should not be able to accept focus if maxedOut? if ( scrollbar->hasFocus() ) @@ -3855,7 +3855,7 @@ void KlearlookStyle::drawSliderGroove drawPrimitive( PE_FocusRect, p, ceData, elementFlags, fr, TQColorGroup() ); } - if ( Qt::Horizontal == slider->orientation() ) { + if ( TQt::Horizontal == slider->orientation() ) { int dh = ( groove.height() - 5 ) >> 1; groove.addCoords( 0, dh, 0, -dh ); diff --git a/src/gui/rulers/ControlRuler.cpp b/src/gui/rulers/ControlRuler.cpp index cf79f33..57a2d17 100644 --- a/src/gui/rulers/ControlRuler.cpp +++ b/src/gui/rulers/ControlRuler.cpp @@ -162,7 +162,7 @@ ControlRuler::segmentDeleted(const Segment *) void ControlRuler::contentsMousePressEvent(TQMouseEvent* e) { - if (e->button() != Qt::LeftButton) { + if (e->button() != TQt::LeftButton) { m_numberFloat->hide(); m_selecting = false; return ; @@ -243,7 +243,7 @@ void ControlRuler::contentsMousePressEvent(TQMouseEvent* e) void ControlRuler::contentsMouseReleaseEvent(TQMouseEvent* e) { - if (e->button() != Qt::LeftButton) { + if (e->button() != TQt::LeftButton) { m_numberFloat->hide(); m_selecting = false; return ; diff --git a/src/gui/rulers/ControllerEventsRuler.cpp b/src/gui/rulers/ControllerEventsRuler.cpp index 789a503..b65d7b0 100644 --- a/src/gui/rulers/ControllerEventsRuler.cpp +++ b/src/gui/rulers/ControllerEventsRuler.cpp @@ -340,7 +340,7 @@ void ControllerEventsRuler::startControlLine() void ControllerEventsRuler::contentsMousePressEvent(TQMouseEvent *e) { if (!m_controlLineShowing) { - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) m_lastEventPos = inverseMapPoint(e->pos()); ControlRuler::contentsMousePressEvent(e); // send super @@ -349,7 +349,7 @@ void ControllerEventsRuler::contentsMousePressEvent(TQMouseEvent *e) } // cancel control line mode - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { m_controlLineShowing = false; m_controlLine->hide(); @@ -357,7 +357,7 @@ void ControllerEventsRuler::contentsMousePressEvent(TQMouseEvent *e) return ; } - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { TQPoint p = inverseMapPoint(e->pos()); m_controlLine->show(); @@ -371,7 +371,7 @@ void ControllerEventsRuler::contentsMousePressEvent(TQMouseEvent *e) void ControllerEventsRuler::contentsMouseReleaseEvent(TQMouseEvent *e) { if (!m_controlLineShowing) { - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) insertControllerEvent(); ControlRuler::contentsMouseReleaseEvent(e); // send super @@ -407,7 +407,7 @@ void ControllerEventsRuler::contentsMouseMoveEvent(TQMouseEvent *e) if (!m_controlLineShowing) { // Don't send super if we're using the middle button // - if (e->button() == Qt::MidButton) { + if (e->button() == TQt::MidButton) { m_lastEventPos = inverseMapPoint(e->pos()); return ; } diff --git a/src/gui/rulers/LoopRuler.cpp b/src/gui/rulers/LoopRuler.cpp index 2d7d7f0..bcfe726 100644 --- a/src/gui/rulers/LoopRuler.cpp +++ b/src/gui/rulers/LoopRuler.cpp @@ -256,7 +256,7 @@ LoopRuler::mousePressEvent(TQMouseEvent *mE) TQt::ButtonState bs = mE->state(); setLoopingMode((bs & TQt::ShiftButton) != 0); - if (mE->button() == Qt::LeftButton) { + if (mE->button() == TQt::LeftButton) { double x = mE->pos().x() / getHScaleFactor() - m_currentXOffset - m_xorigin; if (m_loopingMode) { @@ -278,7 +278,7 @@ LoopRuler::mousePressEvent(TQMouseEvent *mE) void LoopRuler::mouseReleaseEvent(TQMouseEvent *mE) { - if (mE->button() == Qt::LeftButton) { + if (mE->button() == TQt::LeftButton) { if (m_loopingMode) { // Cancel the loop if there was no drag // @@ -319,7 +319,7 @@ LoopRuler::mouseDoubleClickEvent(TQMouseEvent *mE) RG_DEBUG << "LoopRuler::mouseDoubleClickEvent: x = " << x << ", looping = " << m_loopingMode << endl; - if (mE->button() == Qt::LeftButton && !m_loopingMode) + if (mE->button() == TQt::LeftButton && !m_loopingMode) emit setPlayPosition(m_grid->snapX(x)); } diff --git a/src/gui/rulers/MarkerRuler.cpp b/src/gui/rulers/MarkerRuler.cpp index 2bf99ec..ec7bdd8 100644 --- a/src/gui/rulers/MarkerRuler.cpp +++ b/src/gui/rulers/MarkerRuler.cpp @@ -430,7 +430,7 @@ MarkerRuler::mousePressEvent(TQMouseEvent *e) // if right-click, show popup menu // - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { if (!m_menu) createMenu(); if (m_menu) { diff --git a/src/gui/rulers/PercussionPitchRuler.cpp b/src/gui/rulers/PercussionPitchRuler.cpp index 22520e8..d93b4c7 100644 --- a/src/gui/rulers/PercussionPitchRuler.cpp +++ b/src/gui/rulers/PercussionPitchRuler.cpp @@ -178,7 +178,7 @@ void PercussionPitchRuler::mousePressEvent(TQMouseEvent *e) { TQt::ButtonState bs = e->state(); - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { m_mouseDown = true; m_selecting = (bs & TQt::ShiftButton); @@ -192,7 +192,7 @@ void PercussionPitchRuler::mousePressEvent(TQMouseEvent *e) void PercussionPitchRuler::mouseReleaseEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { m_mouseDown = false; m_selecting = false; } diff --git a/src/gui/rulers/PropertyControlRuler.cpp b/src/gui/rulers/PropertyControlRuler.cpp index 0c232be..0f0324f 100644 --- a/src/gui/rulers/PropertyControlRuler.cpp +++ b/src/gui/rulers/PropertyControlRuler.cpp @@ -236,7 +236,7 @@ PropertyControlRuler::contentsMousePressEvent(TQMouseEvent *e) RG_DEBUG << "PropertyControlRuler::contentsMousePressEvent\n"; if (!m_propertyLineShowing) { - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) m_lastEventPos = inverseMapPoint(e->pos()); ControlRuler::contentsMousePressEvent(e); // send super @@ -245,7 +245,7 @@ PropertyControlRuler::contentsMousePressEvent(TQMouseEvent *e) } // cancel control line mode - if (e->button() == Qt::RightButton) { + if (e->button() == TQt::RightButton) { m_propertyLineShowing = false; m_propertyLine->hide(); @@ -253,7 +253,7 @@ PropertyControlRuler::contentsMousePressEvent(TQMouseEvent *e) return ; } - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { TQPoint p = inverseMapPoint(e->pos()); m_propertyLine->show(); @@ -319,7 +319,7 @@ PropertyControlRuler::contentsMouseMoveEvent(TQMouseEvent *e) if (!m_propertyLineShowing) { // Don't send super if we're using the middle button // - if (e->button() == Qt::MidButton) { + if (e->button() == TQt::MidButton) { m_lastEventPos = inverseMapPoint(e->pos()); return ; } diff --git a/src/gui/rulers/TempoRuler.cpp b/src/gui/rulers/TempoRuler.cpp index 6b36bc8..5f31a90 100644 --- a/src/gui/rulers/TempoRuler.cpp +++ b/src/gui/rulers/TempoRuler.cpp @@ -239,7 +239,7 @@ TempoRuler::slotScrollHoriz(int x) void TempoRuler::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { if (e->type() == TQEvent::MouseButtonDblClick) { timeT t = m_rulerScale->getTimeForX @@ -291,7 +291,7 @@ TempoRuler::mousePressEvent(TQMouseEvent *e) m_dragHoriz = false; } - } else if (e->button() == Qt::RightButton) { + } else if (e->button() == TQt::RightButton) { m_clickX = e->x(); if (!m_menu) diff --git a/src/gui/seqmanager/MidiFilterDialog.cpp b/src/gui/seqmanager/MidiFilterDialog.cpp index 0a47bf8..839371f 100644 --- a/src/gui/seqmanager/MidiFilterDialog.cpp +++ b/src/gui/seqmanager/MidiFilterDialog.cpp @@ -52,7 +52,7 @@ MidiFilterDialog::MidiFilterDialog(TQWidget *parent, m_thruBox = new TQButtonGroup(1, - Qt::Horizontal, + TQt::Horizontal, i18n("THRU events to ignore"), hBox); TQCheckBox *noteThru = new TQCheckBox(i18n("Note"), m_thruBox); @@ -88,7 +88,7 @@ MidiFilterDialog::MidiFilterDialog(TQWidget *parent, m_recordBox = new TQButtonGroup(1, - Qt::Horizontal, + TQt::Horizontal, i18n("RECORD events to ignore"), hBox); TQCheckBox *noteRecord = new TQCheckBox(i18n("Note"), m_recordBox); diff --git a/src/gui/studio/DeviceManagerDialog.cpp b/src/gui/studio/DeviceManagerDialog.cpp index ce9eb49..34579e0 100644 --- a/src/gui/studio/DeviceManagerDialog.cpp +++ b/src/gui/studio/DeviceManagerDialog.cpp @@ -93,7 +93,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, setCaption(i18n("Manage MIDI Devices")); - TQGroupBox *groupBox = new TQGroupBox(2, Qt::Horizontal, i18n("Play devices"), mainBox); + TQGroupBox *groupBox = new TQGroupBox(2, TQt::Horizontal, i18n("Play devices"), mainBox); m_playTable = new TQTable(0, 2, groupBox); m_playTable->setSorting(false); @@ -109,7 +109,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, TQFrame *frame = new TQFrame(groupBox); TQVBoxLayout *vlayout = new TQVBoxLayout(frame); - TQGrid *buttons = new TQGrid(2, Qt::Horizontal, frame); + TQGrid *buttons = new TQGrid(2, TQt::Horizontal, frame); TQPushButton *addButton = new TQPushButton(i18n("New"), buttons); m_deletePlayButton = new TQPushButton(i18n("Delete"), buttons); m_importButton = new TQPushButton(i18n("Import..."), buttons); @@ -151,7 +151,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, this, TQT_SLOT(slotPlayDeviceSelected (int, int))); mainLayout->addWidget(groupBox); - groupBox = new TQGroupBox(2, Qt::Horizontal, i18n("Record devices"), mainBox); + groupBox = new TQGroupBox(2, TQt::Horizontal, i18n("Record devices"), mainBox); m_recordTable = new TQTable(0, 3, groupBox); m_recordTable->setSorting(false); @@ -168,7 +168,7 @@ DeviceManagerDialog::DeviceManagerDialog(TQWidget *parent, frame = new TQFrame(groupBox); vlayout = new TQVBoxLayout(frame); - buttons = new TQGrid(2, Qt::Horizontal, frame); + buttons = new TQGrid(2, TQt::Horizontal, frame); addButton = new TQPushButton(i18n("New"), buttons); m_deleteRecordButton = new TQPushButton(i18n("Delete"), buttons); vlayout->addWidget(buttons); diff --git a/src/gui/studio/NameSetEditor.cpp b/src/gui/studio/NameSetEditor.cpp index 7443fd3..0abd9b8 100644 --- a/src/gui/studio/NameSetEditor.cpp +++ b/src/gui/studio/NameSetEditor.cpp @@ -62,7 +62,7 @@ NameSetEditor::NameSetEditor(BankEditorDialog* bankEditor, // Librarian // TQGroupBox *groupBox = new TQGroupBox(2, - Qt::Horizontal, + TQt::Horizontal, i18n("Librarian"), m_mainFrame); m_mainLayout->addMultiCellWidget(groupBox, 0, 2, 3, 5); diff --git a/src/gui/studio/RemapInstrumentDialog.cpp b/src/gui/studio/RemapInstrumentDialog.cpp index a3017fd..90fa599 100644 --- a/src/gui/studio/RemapInstrumentDialog.cpp +++ b/src/gui/studio/RemapInstrumentDialog.cpp @@ -56,7 +56,7 @@ RemapInstrumentDialog::RemapInstrumentDialog(TQWidget *parent, { TQVBox *vBox = makeVBoxMainWidget(); - m_buttonGroup = new TQButtonGroup(1, Qt::Horizontal, + m_buttonGroup = new TQButtonGroup(1, TQt::Horizontal, i18n("Device or Instrument"), vBox); @@ -68,7 +68,7 @@ RemapInstrumentDialog::RemapInstrumentDialog(TQWidget *parent, connect(m_buttonGroup, TQT_SIGNAL(released(int)), this, TQT_SLOT(slotRemapReleased(int))); - TQGroupBox *groupBox = new TQGroupBox(2, Qt::Horizontal, + TQGroupBox *groupBox = new TQGroupBox(2, TQt::Horizontal, i18n("Choose Source and Destination"), vBox); diff --git a/src/gui/studio/SynthPluginManagerDialog.cpp b/src/gui/studio/SynthPluginManagerDialog.cpp index 4feb191..fb3f77b 100644 --- a/src/gui/studio/SynthPluginManagerDialog.cpp +++ b/src/gui/studio/SynthPluginManagerDialog.cpp @@ -73,7 +73,7 @@ SynthPluginManagerDialog::SynthPluginManagerDialog(TQWidget *parent, TQVBoxLayout *mainLayout = new TQVBoxLayout(mainBox, 10, 10); - TQGroupBox *groupBox = new TQGroupBox(1, Qt::Horizontal, i18n("Synth plugins"), mainBox); + TQGroupBox *groupBox = new TQGroupBox(1, TQt::Horizontal, i18n("Synth plugins"), mainBox); mainLayout->addWidget(groupBox); TQFrame *pluginFrame = new TQFrame(groupBox); diff --git a/src/gui/widgets/BigArrowButton.h b/src/gui/widgets/BigArrowButton.h index 10205c5..f7972c7 100644 --- a/src/gui/widgets/BigArrowButton.h +++ b/src/gui/widgets/BigArrowButton.h @@ -30,7 +30,7 @@ namespace Rosegarden { class BigArrowButton : public KArrowButton { public: - BigArrowButton(TQWidget *parent = 0, Qt::ArrowType arrow = Qt::UpArrow, + BigArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0) : KArrowButton(parent, arrow, name) { } virtual ~BigArrowButton() { } diff --git a/src/gui/widgets/DiatonicPitchChooser.cpp b/src/gui/widgets/DiatonicPitchChooser.cpp index 830568f..aae228b 100644 --- a/src/gui/widgets/DiatonicPitchChooser.cpp +++ b/src/gui/widgets/DiatonicPitchChooser.cpp @@ -45,7 +45,7 @@ DiatonicPitchChooser::DiatonicPitchChooser(TQString title, int defaultNote, int defaultPitch, int defaultOctave) : - TQGroupBox(1, Qt::Horizontal, title, parent), + TQGroupBox(1, TQt::Horizontal, title, parent), m_defaultPitch(defaultPitch) { m_pitchDragLabel = new PitchDragLabel(this, defaultPitch); diff --git a/src/gui/widgets/Fader.cpp b/src/gui/widgets/Fader.cpp index 91e416f..d7a24ea 100644 --- a/src/gui/widgets/Fader.cpp +++ b/src/gui/widgets/Fader.cpp @@ -318,7 +318,7 @@ Fader::mousePressEvent(TQMouseEvent *e) { m_clickMousePos = -1; - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { if (e->type() == TQEvent::MouseButtonDblClick) { setFader(0); diff --git a/src/gui/widgets/PitchChooser.cpp b/src/gui/widgets/PitchChooser.cpp index 543ec42..d56b028 100644 --- a/src/gui/widgets/PitchChooser.cpp +++ b/src/gui/widgets/PitchChooser.cpp @@ -40,7 +40,7 @@ namespace Rosegarden PitchChooser::PitchChooser(TQString title, TQWidget *parent, int defaultPitch) : - TQGroupBox(1, Qt::Horizontal, title, parent), + TQGroupBox(1, TQt::Horizontal, title, parent), m_defaultPitch(defaultPitch) { m_pitchDragLabel = new PitchDragLabel(this, defaultPitch); diff --git a/src/gui/widgets/PitchDragLabel.cpp b/src/gui/widgets/PitchDragLabel.cpp index 33f2751..2eb2d36 100644 --- a/src/gui/widgets/PitchDragLabel.cpp +++ b/src/gui/widgets/PitchDragLabel.cpp @@ -82,7 +82,7 @@ PitchDragLabel::slotSetPitch(int pitch, int octave, int step) void PitchDragLabel::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { m_clickedY = e->y(); m_clickedPitch = m_pitch; m_clicked = true; diff --git a/src/gui/widgets/QuantizeParameters.cpp b/src/gui/widgets/QuantizeParameters.cpp index ac8446f..c28e331 100644 --- a/src/gui/widgets/QuantizeParameters.cpp +++ b/src/gui/widgets/QuantizeParameters.cpp @@ -75,7 +75,7 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent, } TQGroupBox *quantizerBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Quantizer"), this); + (1, TQt::Horizontal, i18n("Quantizer"), this); m_mainLayout->addWidget(quantizerBox, zero, 0); TQFrame *typeFrame = new TQFrame(quantizerBox); @@ -99,7 +99,7 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent, m_mainLayout->addWidget(parameterBox, zero + 1, 0); m_notationBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Notation parameters"), parameterBox); + (1, TQt::Horizontal, i18n("Notation parameters"), parameterBox); TQFrame *notationFrame = new TQFrame(m_notationBox); layout = new TQGridLayout(notationFrame, 4, 2, 5, 3); @@ -140,7 +140,7 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent, layout->addMultiCellWidget(m_counterpoint, 3, 3, 0, 1); m_gridBox = new TQGroupBox - (1, Qt::Horizontal, i18n("Grid parameters"), parameterBox); + (1, TQt::Horizontal, i18n("Grid parameters"), parameterBox); TQFrame *gridFrame = new TQFrame(m_gridBox); layout = new TQGridLayout(gridFrame, 4, 2, 5, 3); @@ -164,7 +164,7 @@ QuantizeParameters::QuantizeParameters(TQWidget *parent, layout->addMultiCellWidget(m_durationCheckBox, 3, 3, 0, 1); m_postProcessingBox = new TQGroupBox - (1, Qt::Horizontal, i18n("After quantization"), this); + (1, TQt::Horizontal, i18n("After quantization"), this); if (!preamble.isNull()) { m_mainLayout->addMultiCellWidget(m_postProcessingBox, diff --git a/src/gui/widgets/Rotary.cpp b/src/gui/widgets/Rotary.cpp index a9c24e8..4b5134f 100644 --- a/src/gui/widgets/Rotary.cpp +++ b/src/gui/widgets/Rotary.cpp @@ -371,17 +371,17 @@ Rotary::snapPosition() void Rotary::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { m_buttonPressed = true; m_lastY = e->y(); m_lastX = e->x(); - } else if (e->button() == Qt::MidButton) // reset to default + } else if (e->button() == TQt::MidButton) // reset to default { m_position = m_initialPosition; snapPosition(); update(); emit valueChanged(m_snapPosition); - } else if (e->button() == Qt::RightButton) // reset to centre position + } else if (e->button() == TQt::RightButton) // reset to centre position { m_position = (m_maxValue + m_minValue) / 2.0; snapPosition(); @@ -405,7 +405,7 @@ Rotary::mousePressEvent(TQMouseEvent *e) // std::cerr << "Rotary::mousePressEvent: logarithmic = " << m_logarithmic // << ", position = " << m_position << std::endl; - if (e->button() == Qt::RightButton || e->button() == Qt::MidButton) { + if (e->button() == TQt::RightButton || e->button() == TQt::MidButton) { // one shot, 500ms _floatTimer->start(500, true); } @@ -453,7 +453,7 @@ Rotary::mouseDoubleClickEvent(TQMouseEvent * /*e*/) void Rotary::mouseReleaseEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { m_buttonPressed = false; m_lastY = 0; m_lastX = 0; diff --git a/src/gui/widgets/ScrollBox.cpp b/src/gui/widgets/ScrollBox.cpp index c7e3efd..5f07495 100644 --- a/src/gui/widgets/ScrollBox.cpp +++ b/src/gui/widgets/ScrollBox.cpp @@ -51,15 +51,15 @@ ScrollBox::ScrollBox(TQWidget* parent, SizeMode sizeMode, const char* name) : void ScrollBox::mousePressEvent(TQMouseEvent* e) { m_mouse = e->pos(); - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) emit button3Pressed(); - if (e->button() == Qt::MidButton) + if (e->button() == TQt::MidButton) emit button2Pressed(); } void ScrollBox::mouseMoveEvent(TQMouseEvent* e) { - if (e->state() != Qt::LeftButton) + if (e->state() != TQt::LeftButton) return ; int dx = (e->pos().x() - m_mouse.x()) * m_pagesize.width() / width(); diff --git a/src/gui/widgets/TimeWidget.cpp b/src/gui/widgets/TimeWidget.cpp index b3d09e3..9fdddf6 100644 --- a/src/gui/widgets/TimeWidget.cpp +++ b/src/gui/widgets/TimeWidget.cpp @@ -51,7 +51,7 @@ TimeWidget::TimeWidget(TQString title, timeT absTime, bool editable, bool constrainToCompositionDuration) : - TQGroupBox(1, Qt::Horizontal, title, parent), + TQGroupBox(1, TQt::Horizontal, title, parent), m_composition(composition), m_isDuration(false), m_constrain(constrainToCompositionDuration), @@ -69,7 +69,7 @@ TimeWidget::TimeWidget(TQString title, timeT duration, bool editable, bool constrainToCompositionDuration) : - TQGroupBox(1, Qt::Horizontal, title, parent), + TQGroupBox(1, TQt::Horizontal, title, parent), m_composition(composition), m_isDuration(true), m_constrain(constrainToCompositionDuration), diff --git a/src/gui/widgets/ZoomSlider.h b/src/gui/widgets/ZoomSlider.h index 4375dc6..8c713cc 100644 --- a/src/gui/widgets/ZoomSlider.h +++ b/src/gui/widgets/ZoomSlider.h @@ -57,7 +57,7 @@ public: * to the user as a nice continuous range. */ ZoomSlider(const std::vector<T> &sizes, T defaultValue, - Qt::Orientation, TQWidget * parent, const char * name=0); + TQt::Orientation, TQWidget * parent, const char * name=0); virtual ~ZoomSlider(); @@ -81,7 +81,7 @@ protected: template<class T> ZoomSlider<T>::ZoomSlider(const std::vector<T> &sizes, - T initialSize, Qt::Orientation o, + T initialSize, TQt::Orientation o, TQWidget *parent, const char *name) : TQSlider(0, sizes.size()-1, 1, getIndex(sizes, initialSize), o, parent, name), |