diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-02 22:38:52 +0000 |
| commit | 458efa7b0c935cbaafa2791021a5f8f7241aa876 (patch) | |
| tree | 624583f2873febe23770bee3fa94b5c24bd59f4f /src/gui/dialogs | |
| parent | 747037b72944ae2c02962b7c5c96e0a7f8852e38 (diff) | |
| download | rosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.tar.gz rosegarden-458efa7b0c935cbaafa2791021a5f8f7241aa876.zip | |
Initial TQt4 port of Rosegarden
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/gui/dialogs')
95 files changed, 725 insertions, 680 deletions
diff --git a/src/gui/dialogs/AddTracksDialog.cpp b/src/gui/dialogs/AddTracksDialog.cpp index 498e010..529174c 100644 --- a/src/gui/dialogs/AddTracksDialog.cpp +++ b/src/gui/dialogs/AddTracksDialog.cpp @@ -42,8 +42,8 @@ namespace Rosegarden { -AddTracksDialog::AddTracksDialog(TQWidget *parent, int currentTrack) : - KDialogBase(parent, 0, true, i18n("Add Tracks"), +AddTracksDialog::AddTracksDialog(TQWidget *tqparent, int currentTrack) : + KDialogBase(tqparent, 0, true, i18n("Add Tracks"), Ok | Cancel), m_currentTrack(currentTrack) { diff --git a/src/gui/dialogs/AddTracksDialog.h b/src/gui/dialogs/AddTracksDialog.h index 495acfa..9de3165 100644 --- a/src/gui/dialogs/AddTracksDialog.h +++ b/src/gui/dialogs/AddTracksDialog.h @@ -37,9 +37,10 @@ namespace Rosegarden class AddTracksDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AddTracksDialog(TQWidget *parent, int currentTrack = -1); + AddTracksDialog(TQWidget *tqparent, int currentTrack = -1); int getTracks(); int getInsertPosition(); diff --git a/src/gui/dialogs/AudioManagerDialog.cpp b/src/gui/dialogs/AudioManagerDialog.cpp index a5c326c..e283126 100644 --- a/src/gui/dialogs/AudioManagerDialog.cpp +++ b/src/gui/dialogs/AudioManagerDialog.cpp @@ -93,9 +93,9 @@ const int AudioManagerDialog::m_maxPreviewWidth = 100; const int AudioManagerDialog::m_previewHeight = 30; const char* const AudioManagerDialog::m_listViewLayoutName = "AudioManagerDialog Layout"; -AudioManagerDialog::AudioManagerDialog(TQWidget *parent, +AudioManagerDialog::AudioManagerDialog(TQWidget *tqparent, RosegardenGUIDoc *doc): - KMainWindow(parent, "audioManagerDialog"), + KMainWindow(tqparent, "audioManagerDialog"), m_doc(doc), m_playingAudioFile(0), m_audioPlayingDialog(0), @@ -129,47 +129,47 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent, TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); TQIconSet icon(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm")); - new KAction(i18n("&Add Audio File..."), "fileopen", 0, this, + new KAction(i18n("&Add Audio File..."), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAdd()), actionCollection(), "add_audio"); - new KAction(i18n("&Unload Audio File"), "editdelete", 0, this, + new KAction(i18n("&Unload Audio File"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(), "remove_audio"); icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/transport-play.xpm")); - new KAction(i18n("&Play Preview"), icon, 0, this, + new KAction(i18n("&Play Preview"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlayPreview()), actionCollection(), "preview_audio"); /*!!! Not actually implemented -- this never worked right! - new KAction(i18n("Re&label"), 0, 0, this, + new KAction(i18n("Re&label"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRename()), actionCollection(), "rename_audio"); */ icon = TQIconSet(TQPixmap(pixmapDir + "/toolbar/insert_audio_into_track.xpm")); new KAction(i18n("&Insert into Selected Audio Track"), - icon, 0, this, TQT_SLOT(slotInsert()), + icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsert()), actionCollection(), "insert_audio"); - new KAction(i18n("Unload &all Audio Files"), 0, 0, this, + new KAction(i18n("Unload &all Audio Files"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveAll()), actionCollection(), "remove_all_audio"); - new KAction(i18n("Unload all &Unused Audio Files"), 0, 0, this, + new KAction(i18n("Unload all &Unused Audio Files"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveAllUnused()), actionCollection(), "remove_all_unused_audio"); - new KAction(i18n("&Delete Unused Audio Files..."), 0, 0, this, + new KAction(i18n("&Delete Unused Audio Files..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteUnused()), actionCollection(), "delete_unused_audio"); - new KAction(i18n("&Export Audio File..."), "fileexport", 0, this, + new KAction(i18n("&Export Audio File..."), "fileexport", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportAudio()), actionCollection(), "export_audio"); /* new KAction(i18n("Distribute Audio on &MIDI"), - 0, 0, this, + 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDistributeOnMidiSegment()), actionCollection(), "distribute_audio"); @@ -184,11 +184,11 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent, m_fileList->addColumn(i18n("Resolution")); // 5 m_fileList->addColumn(i18n("File")); // 6 - m_fileList->setColumnAlignment(1, Qt::AlignHCenter); - m_fileList->setColumnAlignment(2, Qt::AlignHCenter); - m_fileList->setColumnAlignment(3, Qt::AlignHCenter); - m_fileList->setColumnAlignment(4, Qt::AlignHCenter); - m_fileList->setColumnAlignment(5, Qt::AlignHCenter); + m_fileList->setColumnAlignment(1, TQt::AlignHCenter); + m_fileList->setColumnAlignment(2, TQt::AlignHCenter); + m_fileList->setColumnAlignment(3, TQt::AlignHCenter); + m_fileList->setColumnAlignment(4, TQt::AlignHCenter); + m_fileList->setColumnAlignment(5, TQt::AlignHCenter); m_fileList->restoreLayout(kapp->config(), m_listViewLayoutName); @@ -230,7 +230,7 @@ AudioManagerDialog::AudioManagerDialog(TQWidget *parent, connect(m_playTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCancelPlayingAudio())); - KStdAction::close(this, + KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); @@ -326,7 +326,7 @@ AudioManagerDialog::slotPopulateFileList() } catch (Exception e) { audioPixmap->fill(); // white TQPainter p(audioPixmap); - p.setPen(Qt::black); + p.setPen(TQt::black); p.drawText(10, m_previewHeight / 2, TQString("<no preview>")); } @@ -343,7 +343,7 @@ AudioManagerDialog::slotPopulateFileList() // length = (*it)->getLength(); msecs.sprintf("%03d", length.nsec / 1000000); - item->setText(1, TQString("%1.%2s").arg(length.sec).arg(msecs)); + item->setText(1, TQString("%1.%2s").tqarg(length.sec).tqarg(msecs)); // set start time and duration item->setStartTime(RealTime::zeroTime); @@ -361,11 +361,11 @@ AudioManagerDialog::slotPopulateFileList() // Resolution // - item->setText(5, TQString("%1 bits").arg((*it)->getBitsPerSample())); + item->setText(5, TQString("%1 bits").tqarg((*it)->getBitsPerSample())); // Channels // - item->setText(4, TQString("%1").arg((*it)->getChannels())); + item->setText(4, TQString("%1").tqarg((*it)->getChannels())); // Sample rate // @@ -384,7 +384,7 @@ AudioManagerDialog::slotPopulateFileList() findSelection = false; } - // Add children + // Add tqchildren // for (iit = segments.begin(); iit != segments.end(); iit++) { if ((*iit)->getAudioFileId() == (*it)->getId()) { @@ -404,8 +404,8 @@ AudioManagerDialog::slotPopulateFileList() // msecs.sprintf("%03d", segmentDuration.nsec / 1000000); childItem->setText(1, TQString("%1.%2s") - .arg(segmentDuration.sec) - .arg(msecs)); + .tqarg(segmentDuration.sec) + .tqarg(msecs)); try { m_doc->getAudioFileManager(). @@ -433,7 +433,7 @@ AudioManagerDialog::slotPopulateFileList() foundSelection = true; } - // Add children + // Add tqchildren } } } @@ -493,7 +493,7 @@ AudioManagerDialog::slotExportAudio() // Check for a dot extension and append ".wav" if not found // - if (saveFile.contains(".") == 0) + if (saveFile.tqcontains(".") == 0) saveFile += ".wav"; ProgressDialog progressDlg(i18n("Exporting audio file..."), @@ -558,10 +558,10 @@ AudioManagerDialog::slotRemove() if (newItem == 0) newItem = item->itemAbove(); - // Or the parent + // Or the tqparent // if (newItem == 0) - newItem = item->parent(); + newItem = item->tqparent(); // Get the id and segment of the next item so that we can // match against it @@ -607,7 +607,7 @@ AudioManagerDialog::slotRemove() if (haveSegments) { TQString question = i18n("This will unload audio file \"%1\" and remove all associated segments. Are you sure?") - .arg(TQString(audioFile->getFilename().c_str())); + .tqarg(TQString(audioFile->getFilename().c_str())); // Ask the question int reply = KMessageBox::warningContinueCancel(this, question); @@ -885,7 +885,7 @@ AudioManagerDialog::slotDeleteUnused() std::cerr << i << ": " << names[i] << std::endl; TQFile file(names[i]); if (!file.remove()) { - KMessageBox::error(this, i18n("File %1 could not be deleted.").arg(names[i])); + KMessageBox::error(this, i18n("File %1 could not be deleted.").tqarg(names[i])); } else { if (nameMap.find(names[i]) != nameMap.end()) { m_doc->getAudioFileManager().removeFile(nameMap[names[i]]); @@ -894,7 +894,7 @@ AudioManagerDialog::slotDeleteUnused() std::cerr << "WARNING: Audio file name " << names[i] << " not in name map" << std::endl; } - TQFile peakFile(TQString("%1.pk").arg(names[i])); + TQFile peakFile(TQString("%1.pk").tqarg(names[i])); peakFile.remove(); } } @@ -1179,7 +1179,7 @@ AudioManagerDialog::slotClose() } void -AudioManagerDialog::setAudioSubsystemStatus(bool ok) +AudioManagerDialog::setAudioSubsystemtqStatus(bool ok) { // We can do something more fancy in the future but for the moment // this will suffice. @@ -1222,7 +1222,7 @@ AudioManagerDialog::slotDistributeOnMidiSegment() //Composition &comp = m_doc->getComposition(); - QList<RosegardenGUIView>& viewList = m_doc->getViewList(); + TQList<RosegardenGUIView>& viewList = m_doc->getViewList(); RosegardenGUIView *w = 0; SegmentSelection selection; diff --git a/src/gui/dialogs/AudioManagerDialog.h b/src/gui/dialogs/AudioManagerDialog.h index eae07c0..e78eff1 100644 --- a/src/gui/dialogs/AudioManagerDialog.h +++ b/src/gui/dialogs/AudioManagerDialog.h @@ -59,9 +59,10 @@ class AudioFile; class AudioManagerDialog : public KMainWindow { Q_OBJECT + TQ_OBJECT public: - AudioManagerDialog(TQWidget *parent, + AudioManagerDialog(TQWidget *tqparent, RosegardenGUIDoc *doc); ~AudioManagerDialog(); @@ -87,7 +88,7 @@ public: // Can we playback audio currently? // - void setAudioSubsystemStatus(bool ok); + void setAudioSubsystemtqStatus(bool ok); // Return the accelerator object // diff --git a/src/gui/dialogs/AudioPlayingDialog.cpp b/src/gui/dialogs/AudioPlayingDialog.cpp index 524278e..3f94c4d 100644 --- a/src/gui/dialogs/AudioPlayingDialog.cpp +++ b/src/gui/dialogs/AudioPlayingDialog.cpp @@ -36,15 +36,15 @@ namespace Rosegarden { -AudioPlayingDialog::AudioPlayingDialog(TQWidget *parent, +AudioPlayingDialog::AudioPlayingDialog(TQWidget *tqparent, const TQString &name): - KDialogBase(parent, 0, true, + KDialogBase(tqparent, 0, true, i18n("Playing audio file"), Cancel) { TQHBox *w = makeHBoxMainWidget(); TQLabel *label = new - TQLabel(i18n("Playing audio file \"%1\"").arg(name), w); + TQLabel(i18n("Playing audio file \"%1\"").tqarg(name), w); label->setMinimumHeight(80); diff --git a/src/gui/dialogs/AudioPlayingDialog.h b/src/gui/dialogs/AudioPlayingDialog.h index 5cdfaba..928eedd 100644 --- a/src/gui/dialogs/AudioPlayingDialog.h +++ b/src/gui/dialogs/AudioPlayingDialog.h @@ -42,9 +42,10 @@ namespace Rosegarden class AudioPlayingDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AudioPlayingDialog(TQWidget *parent, const TQString &label); + AudioPlayingDialog(TQWidget *tqparent, const TQString &label); signals: diff --git a/src/gui/dialogs/AudioPluginDialog.cpp b/src/gui/dialogs/AudioPluginDialog.cpp index 16e4500..d6d7fce 100644 --- a/src/gui/dialogs/AudioPluginDialog.cpp +++ b/src/gui/dialogs/AudioPluginDialog.cpp @@ -60,14 +60,14 @@ namespace Rosegarden { -AudioPluginDialog::AudioPluginDialog(TQWidget *parent, +AudioPluginDialog::AudioPluginDialog(TQWidget *tqparent, AudioPluginManager *aPM, #ifdef HAVE_LIBLO AudioPluginOSCGUIManager *aGM, #endif PluginContainer *pluginContainer, int index): - KDialogBase(parent, "", false, i18n("Audio Plugin"), + KDialogBase(tqparent, "", false, i18n("Audio Plugin"), #ifdef HAVE_LIBLO Close | Details | Help), #else @@ -86,7 +86,7 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent, { setHelp("studio-plugins"); - setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); #ifdef HAVE_LIBLO @@ -96,8 +96,8 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *pluginSelectionBox = new QGroupBox - (1, Horizontal, i18n("Plugin"), vbox); + TQGroupBox *pluginSelectionBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Plugin"), vbox); makePluginParamsBox(vbox, 0, 10); @@ -125,12 +125,12 @@ AudioPluginDialog::AudioPluginDialog(TQWidget *parent, m_insOuts = new TQLabel(i18n("<ports>"), h); - m_insOuts->setAlignment(AlignRight); + m_insOuts->tqsetAlignment(AlignRight); TQToolTip::add (m_insOuts, i18n("Input and output port counts.")); m_pluginId = new TQLabel(i18n("<id>"), h); - m_pluginId->setAlignment(AlignRight); + m_pluginId->tqsetAlignment(AlignRight); TQToolTip::add (m_pluginId, i18n("Unique ID of plugin.")); @@ -330,10 +330,10 @@ AudioPluginDialog::populatePluginList() } void -AudioPluginDialog::makePluginParamsBox(TQWidget *parent, int portCount, +AudioPluginDialog::makePluginParamsBox(TQWidget *tqparent, int portCount, int tooManyPorts) { - m_pluginParamsBox = new TQFrame(parent); + m_pluginParamsBox = new TQFrame(tqparent); int columns = 2; if (portCount > tooManyPorts) { @@ -383,7 +383,7 @@ AudioPluginDialog::slotPluginSelected(int i) TQString caption = strtoqstr(m_pluginContainer->getName()) + - TQString(" [ %1 ] - ").arg(m_index + 1); + TQString(" [ %1 ] - ").tqarg(m_index + 1); if (number == 0) { setCaption(caption + i18n("<no plugin>")); @@ -402,7 +402,7 @@ AudioPluginDialog::slotPluginSelected(int i) // Destroy old param widgets // - TQWidget* parent = dynamic_cast<TQWidget*>(m_pluginParamsBox->parent()); + TQWidget* tqparent = dynamic_cast<TQWidget*>(m_pluginParamsBox->tqparent()); delete m_pluginParamsBox; m_pluginWidgets.clear(); // The widgets are deleted with the parameter box @@ -418,7 +418,7 @@ AudioPluginDialog::slotPluginSelected(int i) } int tooManyPorts = 96; - makePluginParamsBox(parent, portCount, tooManyPorts); + makePluginParamsBox(tqparent, portCount, tooManyPorts); bool showBounds = (portCount <= 48); if (portCount > tooManyPorts) { @@ -426,7 +426,7 @@ AudioPluginDialog::slotPluginSelected(int i) m_gridLayout->addMultiCellWidget( new TQLabel(i18n("This plugin has too many controls to edit here."), m_pluginParamsBox), - 1, 1, 0, m_gridLayout->numCols() - 1, Qt::AlignCenter); + 1, 1, 0, m_gridLayout->numCols() - 1, TQt::AlignCenter); } AudioPluginInstance *inst = m_pluginContainer->getPlugin(m_index); @@ -435,7 +435,7 @@ AudioPluginDialog::slotPluginSelected(int i) if (plugin) { setCaption(caption + plugin->getName()); - m_pluginId->setText(i18n("Id: %1").arg(plugin->getUniqueId())); + m_pluginId->setText(i18n("Id: %1").tqarg(plugin->getUniqueId())); TQString pluginInfo = plugin->getAuthor() + TQString("\n") + plugin->getCopyright(); @@ -446,7 +446,7 @@ AudioPluginDialog::slotPluginSelected(int i) TQToolTip::add (m_pluginList, pluginInfo); - std::string identifier = plugin->getIdentifier().data(); + std::string identifier = plugin->getIdentifier().ascii(); // Only clear ports &c if this method is accessed by user // action (after the constructor) @@ -491,10 +491,10 @@ AudioPluginDialog::slotPluginSelected(int i) else if (ins == 2 && outs == 2) m_insOuts->setText(i18n("stereo")); else - m_insOuts->setText(i18n("%1 in, %2 out").arg(ins).arg(outs)); + m_insOuts->setText(i18n("%1 in, %2 out").tqarg(ins).tqarg(outs)); TQString shortName(plugin->getName()); - int parenIdx = shortName.find(" ("); + int parenIdx = shortName.tqfind(" ("); if (parenIdx > 0) { shortName = shortName.left(parenIdx); if (shortName == "Null") @@ -503,7 +503,7 @@ AudioPluginDialog::slotPluginSelected(int i) } adjustSize(); - setFixedSize(minimumSizeHint()); + setFixedSize(tqminimumSizeHint()); // tell the sequencer emit pluginSelected(m_containerId, m_index, number - 1); @@ -521,10 +521,10 @@ AudioPluginDialog::slotPluginSelected(int i) m_programCombo->setSizeLimit(20); m_programCombo->insertItem(i18n("<none selected>")); m_gridLayout->addMultiCellWidget(m_programLabel, - 0, 0, 0, 0, Qt::AlignRight); + 0, 0, 0, 0, TQt::AlignRight); m_gridLayout->addMultiCellWidget(m_programCombo, 0, 0, 1, m_gridLayout->numCols() - 1, - Qt::AlignLeft); + TQt::AlignLeft); connect(m_programCombo, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotPluginProgramChanged(const TQString &))); @@ -579,7 +579,7 @@ AudioPluginDialog::slotPluginSelected(int i) } -QStringList +TQStringList AudioPluginDialog::getProgramsForInstance(AudioPluginInstance *inst, int ¤t) { TQStringList list; @@ -604,7 +604,7 @@ AudioPluginDialog::getProgramsForInstance(AudioPluginInstance *inst, int ¤ void AudioPluginDialog::slotPluginPortChanged(float value) { - const TQObject* object = sender(); + const TQObject* object = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); const PluginControl* control = dynamic_cast<const PluginControl*>(object); @@ -707,10 +707,10 @@ AudioPluginDialog::updatePluginProgramList() m_programCombo->setSizeLimit(20); m_programCombo->insertItem(i18n("<none selected>")); m_gridLayout->addMultiCellWidget(m_programLabel, - 0, 0, 0, 0, Qt::AlignRight); + 0, 0, 0, 0, TQt::AlignRight); m_gridLayout->addMultiCellWidget(m_programCombo, 0, 0, 1, m_gridLayout->numCols() - 1, - Qt::AlignLeft); + TQt::AlignLeft); m_programCombo->clear(); m_programCombo->insertItem(i18n("<none selected>")); diff --git a/src/gui/dialogs/AudioPluginDialog.h b/src/gui/dialogs/AudioPluginDialog.h index 5ff5dc4..9ea1e2c 100644 --- a/src/gui/dialogs/AudioPluginDialog.h +++ b/src/gui/dialogs/AudioPluginDialog.h @@ -58,9 +58,10 @@ class AudioPluginInstance; class AudioPluginDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AudioPluginDialog(TQWidget *parent, + AudioPluginDialog(TQWidget *tqparent, AudioPluginManager *aPM, #ifdef HAVE_LIBLO AudioPluginOSCGUIManager *aGM, diff --git a/src/gui/dialogs/AudioSplitDialog.cpp b/src/gui/dialogs/AudioSplitDialog.cpp index b7a1b67..2c1e4ec 100644 --- a/src/gui/dialogs/AudioSplitDialog.cpp +++ b/src/gui/dialogs/AudioSplitDialog.cpp @@ -50,10 +50,10 @@ namespace Rosegarden { -AudioSplitDialog::AudioSplitDialog(TQWidget *parent, +AudioSplitDialog::AudioSplitDialog(TQWidget *tqparent, Segment *segment, RosegardenGUIDoc *doc): - KDialogBase(parent, 0, true, + KDialogBase(tqparent, 0, true, i18n("Autosplit Audio Segment"), Ok | Cancel), m_doc(doc), m_segment(segment), @@ -70,7 +70,7 @@ AudioSplitDialog::AudioSplitDialog(TQWidget *parent, new TQLabel(i18n("AutoSplit Segment \"") + strtoqstr(m_segment->getLabel()) + TQString("\""), w); - m_canvas = new TQCanvas(w); + m_canvas = new TQCanvas(TQT_TQOBJECT(w)); m_canvas->resize(m_canvasWidth, m_canvasHeight); m_canvasView = new TQCanvasView(m_canvas, w); m_canvasView->setFixedWidth(m_canvasWidth); @@ -120,7 +120,7 @@ AudioSplitDialog::drawPreview() rect->setZ(1); rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Dark)); rect->setBrush(kapp->palette().color(TQPalette::Active, TQColorGroup::Base)); - rect->setVisible(true); + rect->tqsetVisible(true); // Get preview in vector form // @@ -143,7 +143,7 @@ AudioSplitDialog::drawPreview() text->setX(30); text->setY(30); text->setZ(4); - text->setVisible(true); + text->tqsetVisible(true); m_canvas->update(); return ; } @@ -192,7 +192,7 @@ AudioSplitDialog::drawPreview() palette().color(TQPalette::Active, TQColorGroup::Shadow)); line->setBrush(kapp-> palette().color(TQPalette::Active, TQColorGroup::Shadow)); - line->setVisible(true); + line->tqsetVisible(true); } @@ -205,15 +205,15 @@ AudioSplitDialog::drawPreview() rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); rect->setBrush(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); rect->setZ(4); - rect->setVisible(true); + rect->tqsetVisible(true); // Start time // char msecs[100]; sprintf(msecs, "%03d", m_segment->getAudioStartTime().msec()); TQString startText = TQString("%1.%2s") - .arg(m_segment->getAudioStartTime().sec) - .arg(msecs); + .tqarg(m_segment->getAudioStartTime().sec) + .tqarg(msecs); TQCanvasText *text = new TQCanvasText(m_canvas); text->setColor( kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); @@ -221,7 +221,7 @@ AudioSplitDialog::drawPreview() text->setX(startX - 20); text->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 35); text->setZ(3); - text->setVisible(true); + text->tqsetVisible(true); rect = new TQCanvasRectangle(m_canvas); rect->setX(startX - 1); @@ -229,14 +229,14 @@ AudioSplitDialog::drawPreview() rect->setSize(1, m_previewHeight + 28); rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); rect->setZ(3); - rect->setVisible(true); + rect->tqsetVisible(true); // End time // sprintf(msecs, "%03d", m_segment->getAudioEndTime().msec()); TQString endText = TQString("%1.%2s") - .arg(m_segment->getAudioEndTime().sec) - .arg(msecs); + .tqarg(m_segment->getAudioEndTime().sec) + .tqarg(msecs); text = new TQCanvasText(m_canvas); text->setColor( kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); @@ -244,7 +244,7 @@ AudioSplitDialog::drawPreview() text->setX(startX + m_previewWidth - 20); text->setY(m_canvasHeight / 2 - m_previewHeight / 2 - 35); text->setZ(3); - text->setVisible(true); + text->tqsetVisible(true); rect = new TQCanvasRectangle(m_canvas); rect->setX(startX + m_previewWidth - 1); @@ -252,7 +252,7 @@ AudioSplitDialog::drawPreview() rect->setSize(1, m_previewHeight + 28); rect->setPen(kapp->palette().color(TQPalette::Active, TQColorGroup::Shadow)); rect->setZ(3); - rect->setVisible(true); + rect->tqsetVisible(true); m_canvas->update(); } @@ -303,7 +303,7 @@ AudioSplitDialog::drawSplits(int threshold) palette().color(TQPalette::Active, TQColorGroup::Mid)); rect->setBrush(kapp-> palette().color(TQPalette::Active, TQColorGroup::Mid)); - rect->setVisible(true); + rect->tqsetVisible(true); tempRects.push_back(rect); } @@ -315,7 +315,7 @@ AudioSplitDialog::drawSplits(int threshold) // clear any previous preview boxes // for (pIt = m_previewBoxes.begin(); pIt != m_previewBoxes.end(); pIt++) { - //(*pIt)->setVisible(false); + //(*pIt)->tqsetVisible(false); delete (*pIt); } m_previewBoxes.erase(m_previewBoxes.begin(), m_previewBoxes.end()); diff --git a/src/gui/dialogs/AudioSplitDialog.h b/src/gui/dialogs/AudioSplitDialog.h index 0d1febf..b4d1cae 100644 --- a/src/gui/dialogs/AudioSplitDialog.h +++ b/src/gui/dialogs/AudioSplitDialog.h @@ -47,8 +47,9 @@ class RosegardenGUIDoc; class AudioSplitDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AudioSplitDialog(TQWidget *parent, + AudioSplitDialog(TQWidget *tqparent, Segment *segment, RosegardenGUIDoc *doc); diff --git a/src/gui/dialogs/BeatsBarsDialog.cpp b/src/gui/dialogs/BeatsBarsDialog.cpp index 8f765a7..6495682 100644 --- a/src/gui/dialogs/BeatsBarsDialog.cpp +++ b/src/gui/dialogs/BeatsBarsDialog.cpp @@ -40,26 +40,26 @@ namespace Rosegarden { -BeatsBarsDialog::BeatsBarsDialog(TQWidget* parent) : - KDialogBase(parent, 0, true, i18n("Audio Segment Duration"), +BeatsBarsDialog::BeatsBarsDialog(TQWidget* tqparent) : + KDialogBase(tqparent, 0, true, i18n("Audio Segment Duration"), Ok | Cancel, Ok) { TQHBox *hbox = makeHBoxMainWidget(); - TQGroupBox *gbox = new TQGroupBox(1, Horizontal, - i18n("The selected audio segment contains:"), hbox); + TQGroupBox *gbox = new TQGroupBox(1, Qt::Horizontal, + i18n("The selected audio segment tqcontains:"), hbox); TQFrame *frame = new TQFrame(gbox); - TQGridLayout *layout = new TQGridLayout(frame, 1, 2, 5, 5); + TQGridLayout *tqlayout = new TQGridLayout(frame, 1, 2, 5, 5); m_spinBox = new TQSpinBox(1, INT_MAX, 1, frame, "glee"); - layout->addWidget(m_spinBox, 0, 0); + tqlayout->addWidget(m_spinBox, 0, 0); m_comboBox = new KComboBox(false, frame); m_comboBox->insertItem(i18n("beat(s)")); m_comboBox->insertItem(i18n("bar(s)")); m_comboBox->setCurrentItem(0); - layout->addWidget(m_comboBox, 0, 1); + tqlayout->addWidget(m_comboBox, 0, 1); } } diff --git a/src/gui/dialogs/BeatsBarsDialog.h b/src/gui/dialogs/BeatsBarsDialog.h index 658a4fb..11c0810 100644 --- a/src/gui/dialogs/BeatsBarsDialog.h +++ b/src/gui/dialogs/BeatsBarsDialog.h @@ -43,10 +43,11 @@ namespace Rosegarden class BeatsBarsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: BeatsBarsDialog(); - BeatsBarsDialog(TQWidget *parent); + BeatsBarsDialog(TQWidget *tqparent); int getQuantity() { return m_spinBox->value(); } int getMode() { return m_comboBox->currentItem(); } diff --git a/src/gui/dialogs/ClefDialog.cpp b/src/gui/dialogs/ClefDialog.cpp index bfb2ee1..588e768 100644 --- a/src/gui/dialogs/ClefDialog.cpp +++ b/src/gui/dialogs/ClefDialog.cpp @@ -46,11 +46,11 @@ namespace Rosegarden { -ClefDialog::ClefDialog(TQWidget *parent, +ClefDialog::ClefDialog(TQWidget *tqparent, NotePixmapFactory *npf, Clef defaultClef, bool showConversionOptions) : - KDialogBase(parent, 0, true, i18n("Clef"), Ok | Cancel | Help), + KDialogBase(tqparent, 0, true, i18n("Clef"), Ok | Cancel | Help), m_notePixmapFactory(npf), m_clef(defaultClef) { @@ -58,11 +58,11 @@ ClefDialog::ClefDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *clefFrame = new QGroupBox - (1, Horizontal, i18n("Clef"), vbox); + TQGroupBox *clefFrame = new TQGroupBox + (1, Qt::Horizontal, i18n("Clef"), vbox); - TQButtonGroup *conversionFrame = new QButtonGroup - (1, Horizontal, i18n("Existing notes following clef change"), vbox); + TQButtonGroup *conversionFrame = new TQButtonGroup + (1, Qt::Horizontal, i18n("Existing notes following clef change"), vbox); TQHBox *clefBox = new TQHBox(clefFrame); @@ -77,7 +77,7 @@ ClefDialog::ClefDialog(TQWidget *parent, (m_octaveUp, i18n("Up an Octave")); m_clefLabel = new TQLabel(i18n("Clef"), clefLabelBox); - m_clefLabel->setAlignment(AlignVCenter | AlignHCenter); + m_clefLabel->tqsetAlignment(AlignVCenter | AlignHCenter); m_octaveDown = new BigArrowButton(clefLabelBox, Qt::DownArrow); TQToolTip::add @@ -88,20 +88,20 @@ ClefDialog::ClefDialog(TQWidget *parent, (clefUp, i18n("Higher clef")); m_clefNameLabel = new TQLabel(i18n("Clef"), clefLabelBox); - m_clefNameLabel->setAlignment(AlignVCenter | AlignHCenter); + m_clefNameLabel->tqsetAlignment(AlignVCenter | AlignHCenter); if (showConversionOptions) { m_noConversionButton = - new QRadioButton + new TQRadioButton (i18n("Maintain current pitches"), conversionFrame); m_changeOctaveButton = - new QRadioButton + new TQRadioButton (i18n("Transpose into appropriate octave"), conversionFrame); m_transposeButton = 0; //!!! why aren't we offering this option? does it not work? too difficult to describe? // m_transposeButton = - // new QRadioButton + // new TQRadioButton // (i18n("Maintain current positions on the staff"), conversionFrame); m_changeOctaveButton->setChecked(true); } else { @@ -219,7 +219,7 @@ ClefDialog::slotOctaveDown() void ClefDialog::redrawClefPixmap() { - TQPixmap pmap = NotePixmapFactory::toQPixmap + TQPixmap pmap = NotePixmapFactory::toTQPixmap (m_notePixmapFactory->makeClefDisplayPixmap(m_clef)); m_clefLabel->setPixmap(pmap); @@ -246,25 +246,25 @@ ClefDialog::redrawClefPixmap() std::string type = m_clef.getClefType(); if (type == Clef::Treble) - name = name.arg(i18n("Treble")); + name = name.tqarg(i18n("Treble")); else if (type == Clef::French) - name = name.arg(i18n("French violin")); + name = name.tqarg(i18n("French violin")); else if (type == Clef::Soprano) - name = name.arg(i18n("Soprano")); + name = name.tqarg(i18n("Soprano")); else if (type == Clef::Mezzosoprano) - name = name.arg(i18n("Mezzo-soprano")); + name = name.tqarg(i18n("Mezzo-soprano")); else if (type == Clef::Alto) - name = name.arg(i18n("Alto")); + name = name.tqarg(i18n("Alto")); else if (type == Clef::Tenor) - name = name.arg(i18n("Tenor")); + name = name.tqarg(i18n("Tenor")); else if (type == Clef::Baritone) - name = name.arg(i18n("C-baritone")); + name = name.tqarg(i18n("C-baritone")); else if (type == Clef::Varbaritone) - name = name.arg(i18n("F-baritone")); + name = name.tqarg(i18n("F-baritone")); else if (type == Clef::Bass) - name = name.arg(i18n("Bass")); + name = name.tqarg(i18n("Bass")); else if (type == Clef::Subbass) - name = name.arg(i18n("Sub-bass")); + name = name.tqarg(i18n("Sub-bass")); m_clefNameLabel->setText(name); } diff --git a/src/gui/dialogs/ClefDialog.h b/src/gui/dialogs/ClefDialog.h index 634e4b9..a88158f 100644 --- a/src/gui/dialogs/ClefDialog.h +++ b/src/gui/dialogs/ClefDialog.h @@ -45,6 +45,7 @@ class NotePixmapFactory; class ClefDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum ConversionType { @@ -53,7 +54,7 @@ public: Transpose, }; - ClefDialog(TQWidget *parent, + ClefDialog(TQWidget *tqparent, NotePixmapFactory *npf, Clef defaultClef, bool showConversionOptions = true); diff --git a/src/gui/dialogs/CompositionLengthDialog.cpp b/src/gui/dialogs/CompositionLengthDialog.cpp index 85d2530..fb5fc21 100644 --- a/src/gui/dialogs/CompositionLengthDialog.cpp +++ b/src/gui/dialogs/CompositionLengthDialog.cpp @@ -39,9 +39,9 @@ namespace Rosegarden { CompositionLengthDialog::CompositionLengthDialog( - TQWidget *parent, + TQWidget *tqparent, Composition *composition): - KDialogBase(parent, 0, true, i18n("Change Composition Length"), + KDialogBase(tqparent, 0, true, i18n("Change Composition Length"), Ok | Cancel), m_composition(composition) { diff --git a/src/gui/dialogs/CompositionLengthDialog.h b/src/gui/dialogs/CompositionLengthDialog.h index 373bf73..03235d5 100644 --- a/src/gui/dialogs/CompositionLengthDialog.h +++ b/src/gui/dialogs/CompositionLengthDialog.h @@ -43,8 +43,9 @@ class Composition; class CompositionLengthDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CompositionLengthDialog(TQWidget *parent, + CompositionLengthDialog(TQWidget *tqparent, Composition *composition); timeT getStartMarker(); diff --git a/src/gui/dialogs/ConfigureDialog.cpp b/src/gui/dialogs/ConfigureDialog.cpp index 2ba63c0..a10a985 100644 --- a/src/gui/dialogs/ConfigureDialog.cpp +++ b/src/gui/dialogs/ConfigureDialog.cpp @@ -54,16 +54,16 @@ static TQPixmap loadIcon(const char *name) return TQPixmap(fileBase + ".xpm"); } TQPixmap pmap = KGlobal::instance()->iconLoader() - ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium); + ->loadIcon(TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium); return pmap; } ConfigureDialog::ConfigureDialog(RosegardenGUIDoc *doc, KConfig* cfg, - TQWidget *parent, + TQWidget *tqparent, const char *name) - : ConfigureDialogBase(parent, i18n("Configure Rosegarden"), name) + : ConfigureDialogBase(tqparent, i18n("Configure Rosegarden"), name) { TQWidget *pageWidget = 0; TQVBoxLayout *vlay = 0; diff --git a/src/gui/dialogs/ConfigureDialog.h b/src/gui/dialogs/ConfigureDialog.h index 7b63ffd..ee004a0 100644 --- a/src/gui/dialogs/ConfigureDialog.h +++ b/src/gui/dialogs/ConfigureDialog.h @@ -42,10 +42,11 @@ class RosegardenGUIDoc; class ConfigureDialog : public ConfigureDialogBase { Q_OBJECT + TQ_OBJECT public: ConfigureDialog(RosegardenGUIDoc *doc, KConfig* cfg, - TQWidget *parent=0, + TQWidget *tqparent=0, const char *name=0); signals: void updateAutoSaveInterval(unsigned int); diff --git a/src/gui/dialogs/ConfigureDialogBase.cpp b/src/gui/dialogs/ConfigureDialogBase.cpp index 017e6a6..65c4856 100644 --- a/src/gui/dialogs/ConfigureDialogBase.cpp +++ b/src/gui/dialogs/ConfigureDialogBase.cpp @@ -35,11 +35,11 @@ namespace Rosegarden { -ConfigureDialogBase::ConfigureDialogBase(TQWidget *parent, +ConfigureDialogBase::ConfigureDialogBase(TQWidget *tqparent, TQString label, const char *name): KDialogBase(IconList, label ? label : i18n("Configure"), Help | Apply | Ok | Cancel, - Ok, parent, name, true) // modal + Ok, tqparent, name, true) // modal { setWFlags(WDestructiveClose); } diff --git a/src/gui/dialogs/ConfigureDialogBase.h b/src/gui/dialogs/ConfigureDialogBase.h index dc02a9c..90ac259 100644 --- a/src/gui/dialogs/ConfigureDialogBase.h +++ b/src/gui/dialogs/ConfigureDialogBase.h @@ -43,8 +43,9 @@ class ConfigurationPage; class ConfigureDialogBase : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ConfigureDialogBase(TQWidget *parent=0, + ConfigureDialogBase(TQWidget *tqparent=0, TQString label = 0, const char *name=0); virtual ~ConfigureDialogBase(); diff --git a/src/gui/dialogs/CountdownBar.cpp b/src/gui/dialogs/CountdownBar.cpp index 8d4d0b8..98eb9ac 100644 --- a/src/gui/dialogs/CountdownBar.cpp +++ b/src/gui/dialogs/CountdownBar.cpp @@ -34,11 +34,11 @@ namespace Rosegarden { -CountdownBar::CountdownBar(TQWidget *parent, int width, int height): - TQFrame(parent), m_width(width), m_height(height), m_position(0) +CountdownBar::CountdownBar(TQWidget *tqparent, int width, int height): + TQFrame(tqparent), m_width(width), m_height(height), m_position(0) { resize(m_width, m_height); - repaint(); + tqrepaint(); } void @@ -61,7 +61,7 @@ void CountdownBar::setPosition(int position) { m_position = position; - repaint(); + tqrepaint(); } } diff --git a/src/gui/dialogs/CountdownBar.h b/src/gui/dialogs/CountdownBar.h index edb17e3..3337b29 100644 --- a/src/gui/dialogs/CountdownBar.h +++ b/src/gui/dialogs/CountdownBar.h @@ -38,11 +38,12 @@ namespace Rosegarden -class CountdownBar : public QFrame +class CountdownBar : public TQFrame { Q_OBJECT + TQ_OBJECT public: - CountdownBar(TQWidget *parent, int width, int height); + CountdownBar(TQWidget *tqparent, int width, int height); void setPosition(int position); protected: diff --git a/src/gui/dialogs/CountdownDialog.cpp b/src/gui/dialogs/CountdownDialog.cpp index 537bc2b..31b3bef 100644 --- a/src/gui/dialogs/CountdownDialog.cpp +++ b/src/gui/dialogs/CountdownDialog.cpp @@ -41,21 +41,21 @@ namespace Rosegarden { -CountdownDialog::CountdownDialog(TQWidget *parent, int seconds): - TQDialog(parent, "", false, WStyle_StaysOnTop | WStyle_DialogBorder), +CountdownDialog::CountdownDialog(TQWidget *tqparent, int seconds): + TQDialog(tqparent, "", false, WStyle_StaysOnTop | WStyle_DialogBorder), m_pastEndMode(false), m_totalTime(seconds), m_progressBarWidth(150), m_progressBarHeight(15) { - TQBoxLayout *layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 10, 14); + TQBoxLayout *tqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 10, 14); setCaption(i18n("Recording...")); TQHBox *hBox = new TQHBox(this); m_label = new TQLabel(hBox); m_time = new TQLabel(hBox); - layout->addWidget(hBox, 0, AlignCenter); + tqlayout->addWidget(hBox, 0, AlignCenter); m_label->setText(i18n("Recording time remaining: ")); m_progressBar = @@ -68,8 +68,8 @@ CountdownDialog::CountdownDialog(TQWidget *parent, int seconds): m_stopButton = new TQPushButton(i18n("Stop"), this); m_stopButton->setFixedWidth(60); - layout->addWidget(m_progressBar, 0, AlignCenter); - layout->addWidget(m_stopButton, 0, AlignRight); + tqlayout->addWidget(m_progressBar, 0, AlignCenter); + tqlayout->addWidget(m_stopButton, 0, AlignRight); connect (m_stopButton, TQT_SIGNAL(released()), this, TQT_SIGNAL(stopped())); @@ -112,10 +112,10 @@ CountdownDialog::setElapsedTime(int elapsedSeconds) if (seconds < 3600) // less than an hour { - m_time->setText(TQString("%1:%2").arg(m).arg(s)); + m_time->setText(TQString("%1:%2").tqarg(m).tqarg(s)); } else if (seconds < 86400) // less than a day { - m_time->setText(TQString("%1:%2:%3").arg(h).arg(m).arg(s)); + m_time->setText(TQString("%1:%2:%3").tqarg(h).tqarg(m).tqarg(s)); } else { m_time->setText(i18n("Just how big is your hard disk?")); } diff --git a/src/gui/dialogs/CountdownDialog.h b/src/gui/dialogs/CountdownDialog.h index fdba289..c4c793d 100644 --- a/src/gui/dialogs/CountdownDialog.h +++ b/src/gui/dialogs/CountdownDialog.h @@ -46,9 +46,10 @@ class CountdownBar; class CountdownDialog : public TQDialog // KDialogBase { Q_OBJECT + TQ_OBJECT public: - CountdownDialog(TQWidget *parent, int seconds = 300); + CountdownDialog(TQWidget *tqparent, int seconds = 300); void setLabel(const TQString &label); void setElapsedTime(int seconds); diff --git a/src/gui/dialogs/DocumentConfigureDialog.cpp b/src/gui/dialogs/DocumentConfigureDialog.cpp index d959a5c..50d06ee 100644 --- a/src/gui/dialogs/DocumentConfigureDialog.cpp +++ b/src/gui/dialogs/DocumentConfigureDialog.cpp @@ -53,15 +53,15 @@ static TQPixmap loadIcon(const char *name) } TQPixmap pmap = KGlobal::instance()->iconLoader() - ->loadIcon(TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium); + ->loadIcon(TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium); return pmap; } DocumentConfigureDialog::DocumentConfigureDialog(RosegardenGUIDoc *doc, - TQWidget *parent, + TQWidget *tqparent, const char *name) - : ConfigureDialogBase(parent, i18n("Document Properties"), name) + : ConfigureDialogBase(tqparent, i18n("Document Properties"), name) { TQWidget *pageWidget = 0; TQVBoxLayout *vlay = 0; @@ -100,7 +100,7 @@ DocumentConfigureDialog::DocumentConfigureDialog(RosegardenGUIDoc *doc, page->setPageIndex(pageIndex(pageWidget)); m_configurationPages.push_back(page); - resize(minimumSize()); + resize(tqminimumSize()); } void diff --git a/src/gui/dialogs/DocumentConfigureDialog.h b/src/gui/dialogs/DocumentConfigureDialog.h index 08f9283..1ed0b70 100644 --- a/src/gui/dialogs/DocumentConfigureDialog.h +++ b/src/gui/dialogs/DocumentConfigureDialog.h @@ -42,7 +42,7 @@ class DocumentConfigureDialog : public ConfigureDialogBase { public: DocumentConfigureDialog(RosegardenGUIDoc *doc, - TQWidget *parent=0, + TQWidget *tqparent=0, const char *name=0); void showAudioPage(); diff --git a/src/gui/dialogs/EventEditDialog.cpp b/src/gui/dialogs/EventEditDialog.cpp index 6446246..fc73f51 100644 --- a/src/gui/dialogs/EventEditDialog.cpp +++ b/src/gui/dialogs/EventEditDialog.cpp @@ -57,10 +57,10 @@ namespace Rosegarden { -EventEditDialog::EventEditDialog(TQWidget *parent, +EventEditDialog::EventEditDialog(TQWidget *tqparent, const Event &event, bool editable) : - KDialogBase(parent, 0, true, i18n(editable ? "Advanced Event Edit" : "Advanced Event Viewer"), + KDialogBase(tqparent, 0, true, i18n(editable ? "Advanced Event Edit" : "Advanced Event Viewer"), (editable ? (Ok | Cancel) : Ok)), m_durationDisplay(0), m_durationDisplayAux(0), @@ -77,10 +77,10 @@ EventEditDialog::EventEditDialog(TQWidget *parent, { TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *intrinsicBox = new QGroupBox - (1, Horizontal, i18n("Intrinsics"), vbox); + TQGroupBox *intrinsicBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Intrinsics"), vbox); - TQGrid *intrinsicGrid = new TQGrid(4, TQGrid::Horizontal, intrinsicBox); + TQGrid *intrinsicGrid = new TQGrid(4, Qt::Horizontal, intrinsicBox); new TQLabel(i18n("Event type: "), intrinsicGrid); new TQLabel("", intrinsicGrid); @@ -91,7 +91,7 @@ EventEditDialog::EventEditDialog(TQWidget *parent, new TQLabel(i18n("Absolute time: "), intrinsicGrid); new TQLabel("", intrinsicGrid); new TQLabel("", intrinsicGrid); - TQSpinBox *absoluteTime = new QSpinBox + TQSpinBox *absoluteTime = new TQSpinBox (INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), intrinsicGrid); absoluteTime->setValue(event.getAbsoluteTime()); TQObject::connect(absoluteTime, TQT_SIGNAL(valueChanged(int)), @@ -104,7 +104,7 @@ EventEditDialog::EventEditDialog(TQWidget *parent, m_durationDisplayAux = new TQLabel("(note)", intrinsicGrid); m_durationDisplayAux->setMinimumWidth(20); - TQSpinBox *duration = new QSpinBox + TQSpinBox *duration = new TQSpinBox (0, INT_MAX, Note(Note::Shortest).getDuration(), intrinsicGrid); duration->setValue(event.getDuration()); TQObject::connect(duration, TQT_SIGNAL(valueChanged(int)), @@ -121,9 +121,9 @@ EventEditDialog::EventEditDialog(TQWidget *parent, this, TQT_SLOT(slotSubOrderingChanged(int))); slotSubOrderingChanged(event.getSubOrdering()); - TQGroupBox *persistentBox = new QGroupBox - (1, Horizontal, i18n("Persistent properties"), vbox); - m_persistentGrid = new TQGrid(4, TQGrid::Horizontal, persistentBox); + TQGroupBox *persistentBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Persistent properties"), vbox); + m_persistentGrid = new TQGrid(4, Qt::Horizontal, persistentBox); TQLabel *label = new TQLabel(i18n("Name"), m_persistentGrid); TQFont font(label->font()); @@ -151,8 +151,8 @@ EventEditDialog::EventEditDialog(TQWidget *parent, m_nonPersistentGrid = 0; } else { - TQGroupBox *nonPersistentBox = new QGroupBox - (1, Horizontal, i18n("Non-persistent properties"), vbox); + TQGroupBox *nonPersistentBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Non-persistent properties"), vbox); new TQLabel(i18n("These are cached values, lost if the event is modified."), nonPersistentBox); @@ -160,8 +160,8 @@ EventEditDialog::EventEditDialog(TQWidget *parent, //m_nonPersistentView->setHScrollBarMode(TQScrollView::AlwaysOff); m_nonPersistentView->setResizePolicy(TQScrollView::AutoOneFit); - m_nonPersistentGrid = new QGrid - (4, TQGrid::Horizontal, m_nonPersistentView->viewport()); + m_nonPersistentGrid = new TQGrid + (4, Qt::Horizontal, m_nonPersistentView->viewport()); m_nonPersistentView->addChild(m_nonPersistentGrid); m_nonPersistentGrid->setSpacing(4); @@ -212,7 +212,7 @@ EventEditDialog::addPersistentProperty(const PropertyName &name) min = 0; max = 127; } - TQSpinBox *spinBox = new QSpinBox + TQSpinBox *spinBox = new TQSpinBox (min, max, 1, m_persistentGrid, strtoqstr(name)); spinBox->setValue(m_originalEvent.get<Int>(name)); TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)), @@ -227,7 +227,7 @@ case UInt: { min = 0; max = 65535; } - TQSpinBox *spinBox = new QSpinBox + TQSpinBox *spinBox = new TQSpinBox (min, max, 1, m_persistentGrid, strtoqstr(name)); spinBox->setValue(m_originalEvent.get<UInt>(name)); TQObject::connect(spinBox, TQT_SIGNAL(valueChanged(int)), @@ -242,7 +242,7 @@ case UInt: { // seconds // - TQSpinBox *spinBox = new QSpinBox + TQSpinBox *spinBox = new TQSpinBox (INT_MIN, INT_MAX, 1, hbox, strtoqstr(name) + "%sec"); spinBox->setValue(realTime.sec); @@ -252,7 +252,7 @@ case UInt: { // nseconds // - spinBox = new QSpinBox + spinBox = new TQSpinBox (INT_MIN, INT_MAX, 1, hbox, strtoqstr(name) + "%nsec"); spinBox->setValue(realTime.nsec); @@ -264,7 +264,7 @@ case UInt: { } case Bool: { - TQCheckBox *checkBox = new QCheckBox + TQCheckBox *checkBox = new TQCheckBox ("", m_persistentGrid, strtoqstr(name)); checkBox->setChecked(m_originalEvent.get<Bool>(name)); TQObject::connect(checkBox, TQT_SIGNAL(activated()), @@ -274,7 +274,7 @@ case UInt: { } case String: { - TQLineEdit *lineEdit = new QLineEdit + TQLineEdit *lineEdit = new TQLineEdit (strtoqstr(m_originalEvent.get<String>(name)), m_persistentGrid, strtoqstr(name)); @@ -325,7 +325,7 @@ EventEditDialog::slotDurationChanged(int value) { timeT error = 0; m_durationDisplay->setPixmap - (NotePixmapFactory::toQPixmap(m_notePixmapFactory.makeNoteMenuPixmap(timeT(value), error))); + (NotePixmapFactory::toTQPixmap(m_notePixmapFactory.makeNoteMenuPixmap(timeT(value), error))); if (error >= value / 2) { m_durationDisplayAux->setText("++ "); @@ -356,7 +356,7 @@ EventEditDialog::slotSubOrderingChanged(int value) void EventEditDialog::slotIntPropertyChanged(int value) { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); const TQSpinBox *spinBox = dynamic_cast<const TQSpinBox *>(s); if (!spinBox) return ; @@ -369,7 +369,7 @@ EventEditDialog::slotIntPropertyChanged(int value) void EventEditDialog::slotRealTimePropertyChanged(int value) { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); const TQSpinBox *spinBox = dynamic_cast<const TQSpinBox *>(s); if (!spinBox) return ; @@ -393,7 +393,7 @@ EventEditDialog::slotRealTimePropertyChanged(int value) void EventEditDialog::slotBoolPropertyChanged() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); const TQCheckBox *checkBox = dynamic_cast<const TQCheckBox *>(s); if (!checkBox) return ; @@ -408,7 +408,7 @@ EventEditDialog::slotBoolPropertyChanged() void EventEditDialog::slotStringPropertyChanged(const TQString &value) { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); const TQLineEdit *lineEdit = dynamic_cast<const TQLineEdit *>(s); if (!lineEdit) return ; @@ -421,7 +421,7 @@ EventEditDialog::slotStringPropertyChanged(const TQString &value) void EventEditDialog::slotPropertyDeleted() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); const TQPushButton *pushButton = dynamic_cast<const TQPushButton *>(s); if (!pushButton) return ; @@ -453,7 +453,7 @@ EventEditDialog::slotPropertyDeleted() void EventEditDialog::slotPropertyMadePersistent() { - const TQObject *s = sender(); + const TQObject *s = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); const TQPushButton *pushButton = dynamic_cast<const TQPushButton *>(s); if (!pushButton) return ; diff --git a/src/gui/dialogs/EventEditDialog.h b/src/gui/dialogs/EventEditDialog.h index 15f83ac..7593c79 100644 --- a/src/gui/dialogs/EventEditDialog.h +++ b/src/gui/dialogs/EventEditDialog.h @@ -48,6 +48,7 @@ class PropertyName; class EventEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** @@ -57,7 +58,7 @@ public: * the resulting edited version can subsequently be queried * through getEvent(). */ - EventEditDialog(TQWidget *parent, + EventEditDialog(TQWidget *tqparent, const Event &event, bool editable = true); diff --git a/src/gui/dialogs/EventFilterDialog.cpp b/src/gui/dialogs/EventFilterDialog.cpp index d2763a6..0f13ad3 100644 --- a/src/gui/dialogs/EventFilterDialog.cpp +++ b/src/gui/dialogs/EventFilterDialog.cpp @@ -61,8 +61,8 @@ namespace Rosegarden { -EventFilterDialog::EventFilterDialog(TQWidget* parent) - : KDialogBase(parent, "eventfilerdialog", true, i18n("Event Filter"), Ok | Cancel, Ok), +EventFilterDialog::EventFilterDialog(TQWidget* tqparent) + : KDialogBase(tqparent, "eventfilerdialog", true, i18n("Event Filter"), Ok | Cancel, Ok), m_standardQuantizations(BasicQuantizer::getStandardQuantizations()) { cfg = kapp->config(); @@ -134,7 +134,7 @@ EventFilterDialog::initDialog() TQT_SLOT(slotPitchFromChanged(int))); m_pitchFromChooserButton = new TQPushButton(i18n("edit"), noteFrame); - m_pitchFromChooserButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0, + m_pitchFromChooserButton->tqsetSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_pitchFromChooserButton-> sizePolicy().hasHeightForWidth())); TQToolTip::add @@ -218,14 +218,14 @@ EventFilterDialog::initDialog() void EventFilterDialog::populateDurationCombos() { - TQPixmap noMap = NotePixmapFactory::toQPixmap + TQPixmap noMap = NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap("menu-no-note")); for (unsigned int i = 0; i < m_standardQuantizations.size(); ++i) { timeT time = m_standardQuantizations[i]; timeT error = 0; TQString label = NotationStrings::makeNoteMenuLabel(time, true, error); - TQPixmap pmap = NotePixmapFactory::toQPixmap + TQPixmap pmap = NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeNoteMenuPixmap(time, error)); m_noteDurationFromComboBox->insertItem(error ? noMap : pmap, label); m_noteDurationToComboBox ->insertItem(error ? noMap : pmap, label); diff --git a/src/gui/dialogs/EventFilterDialog.h b/src/gui/dialogs/EventFilterDialog.h index 207f6e5..c07fa58 100644 --- a/src/gui/dialogs/EventFilterDialog.h +++ b/src/gui/dialogs/EventFilterDialog.h @@ -59,10 +59,11 @@ class Event; class EventFilterDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - EventFilterDialog(TQWidget* parent); + EventFilterDialog(TQWidget* tqparent); ~EventFilterDialog(); KConfig *cfg; @@ -142,7 +143,7 @@ protected slots: private: //---------[ data members ]----------------------------- - TQGridLayout* layout; + TQGridLayout* tqlayout; TQComboBox* m_noteDurationFromComboBox; TQComboBox* m_noteDurationIncludeComboBox; diff --git a/src/gui/dialogs/EventParameterDialog.cpp b/src/gui/dialogs/EventParameterDialog.cpp index 98abb44..6443f48 100644 --- a/src/gui/dialogs/EventParameterDialog.cpp +++ b/src/gui/dialogs/EventParameterDialog.cpp @@ -42,11 +42,11 @@ namespace Rosegarden { EventParameterDialog::EventParameterDialog( - TQWidget *parent, + TQWidget *tqparent, const TQString &name, const PropertyName &property, int startValue): - KDialogBase(parent, 0, true, name, Ok | Cancel), + KDialogBase(tqparent, 0, true, name, Ok | Cancel), m_property(property) { TQVBox *vBox = makeVBoxMainWidget(); @@ -63,23 +63,23 @@ EventParameterDialog::EventParameterDialog( // create options // 0 flat - text = i18n("Flat - set %1 to value").arg(strtoqstr(property)); + text = i18n("Flat - set %1 to value").tqarg(strtoqstr(property)); m_patternCombo->insertItem(text); // 1 alternating - text = i18n("Alternating - set %1 to max and min on alternate events").arg(strtoqstr(property)); + text = i18n("Alternating - set %1 to max and min on alternate events").tqarg(strtoqstr(property)); m_patternCombo->insertItem(text); // 2 crescendo - text = i18n("Crescendo - set %1 rising from min to max").arg(strtoqstr(property)); + text = i18n("Crescendo - set %1 rising from min to max").tqarg(strtoqstr(property)); m_patternCombo->insertItem(text); // 3 diminuendo - text = i18n("Diminuendo - set %1 falling from max to min").arg(strtoqstr(property)); + text = i18n("Diminuendo - set %1 falling from max to min").tqarg(strtoqstr(property)); m_patternCombo->insertItem(text); // 4 ringing - text = i18n("Ringing - set %1 alternating from max to min with both dying to zero").arg(strtoqstr(property)); + text = i18n("Ringing - set %1 alternating from max to min with both dying to zero").tqarg(strtoqstr(property)); m_patternCombo->insertItem(text); connect(m_patternCombo, TQT_SIGNAL(activated(int)), @@ -94,8 +94,8 @@ EventParameterDialog::EventParameterDialog( m_value2Combo = new KComboBox(value2Box); for (unsigned int i = 0; i < 128; i++) { - m_value1Combo->insertItem(TQString("%1").arg(i)); - m_value2Combo->insertItem(TQString("%1").arg(i)); + m_value1Combo->insertItem(TQString("%1").tqarg(i)); + m_value2Combo->insertItem(TQString("%1").tqarg(i)); } m_value1Combo->setCurrentItem(127); diff --git a/src/gui/dialogs/EventParameterDialog.h b/src/gui/dialogs/EventParameterDialog.h index 848e44d..cfc71a9 100644 --- a/src/gui/dialogs/EventParameterDialog.h +++ b/src/gui/dialogs/EventParameterDialog.h @@ -44,9 +44,10 @@ namespace Rosegarden class EventParameterDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - EventParameterDialog(TQWidget *parent, + EventParameterDialog(TQWidget *tqparent, const TQString &name, // name const PropertyName &property, // property int startValue); // start diff --git a/src/gui/dialogs/ExportDeviceDialog.cpp b/src/gui/dialogs/ExportDeviceDialog.cpp index 348a5b8..34260c7 100644 --- a/src/gui/dialogs/ExportDeviceDialog.cpp +++ b/src/gui/dialogs/ExportDeviceDialog.cpp @@ -38,8 +38,8 @@ namespace Rosegarden { -ExportDeviceDialog::ExportDeviceDialog(TQWidget *parent, TQString deviceName) : - KDialogBase(parent, "exportdevicedialog", true, i18n("Export Devices..."), +ExportDeviceDialog::ExportDeviceDialog(TQWidget *tqparent, TQString deviceName) : + KDialogBase(tqparent, "exportdevicedialog", true, i18n("Export Devices..."), Ok | Cancel, Ok) { TQVBox *vbox = makeVBoxMainWidget(); @@ -48,7 +48,7 @@ ExportDeviceDialog::ExportDeviceDialog(TQWidget *parent, TQString deviceName) : vbox); m_exportAll = new TQRadioButton(i18n("Export all devices"), bg); m_exportOne = new TQRadioButton(i18n("Export selected device only"), bg); - new TQLabel(i18n(" (\"%1\")").arg(deviceName), bg); + new TQLabel(i18n(" (\"%1\")").tqarg(deviceName), bg); m_exportOne->setChecked(true); } diff --git a/src/gui/dialogs/ExportDeviceDialog.h b/src/gui/dialogs/ExportDeviceDialog.h index 0b092bc..4526ba2 100644 --- a/src/gui/dialogs/ExportDeviceDialog.h +++ b/src/gui/dialogs/ExportDeviceDialog.h @@ -44,7 +44,7 @@ class ExportDeviceDialog : public KDialogBase public: enum ExportType { ExportOne, ExportAll }; - ExportDeviceDialog(TQWidget *parent, TQString deviceName); + ExportDeviceDialog(TQWidget *tqparent, TQString deviceName); ExportType getExportType(); diff --git a/src/gui/dialogs/FileLocateDialog.cpp b/src/gui/dialogs/FileLocateDialog.cpp index 5b2a370..6a40742 100644 --- a/src/gui/dialogs/FileLocateDialog.cpp +++ b/src/gui/dialogs/FileLocateDialog.cpp @@ -39,10 +39,10 @@ namespace Rosegarden { -FileLocateDialog::FileLocateDialog(TQWidget *parent, +FileLocateDialog::FileLocateDialog(TQWidget *tqparent, const TQString &file, const TQString & /*path*/): - KDialogBase(parent, 0, true, + KDialogBase(tqparent, 0, true, i18n("Locate audio file"), User1 | User2 | User3, Ok, @@ -55,10 +55,10 @@ FileLocateDialog::FileLocateDialog(TQWidget *parent, TQHBox *w = makeHBoxMainWidget(); TQString label = i18n("Can't find file \"%1\".\n" - "Would you like to try and locate this file or skip it?").arg(m_file); + "Would you like to try and locate this file or skip it?").tqarg(m_file); TQLabel *labelW = new TQLabel(label, w); - labelW->setAlignment(Qt::AlignCenter); + labelW->tqsetAlignment(TQt::AlignCenter); labelW->setMinimumHeight(60); } @@ -69,8 +69,8 @@ FileLocateDialog::slotUser3() m_file = KFileDialog::getOpenFileName (":WAVS", i18n("%1|Requested file (%2)\n*.wav|WAV files (*.wav)") - .arg(TQFileInfo(m_file).fileName()) - .arg(TQFileInfo(m_file).fileName()), + .tqarg(TQFileInfo(m_file).fileName()) + .tqarg(TQFileInfo(m_file).fileName()), this, i18n("Select an Audio File")); RG_DEBUG << "FileLocateDialog::slotUser3() : m_file = " << m_file << endl; diff --git a/src/gui/dialogs/FileLocateDialog.h b/src/gui/dialogs/FileLocateDialog.h index a9e3220..7f36591 100644 --- a/src/gui/dialogs/FileLocateDialog.h +++ b/src/gui/dialogs/FileLocateDialog.h @@ -41,9 +41,10 @@ namespace Rosegarden class FileLocateDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FileLocateDialog(TQWidget *parent, + FileLocateDialog(TQWidget *tqparent, const TQString &file, const TQString &path); diff --git a/src/gui/dialogs/FileMergeDialog.cpp b/src/gui/dialogs/FileMergeDialog.cpp index d7d48cf..7d378e6 100644 --- a/src/gui/dialogs/FileMergeDialog.cpp +++ b/src/gui/dialogs/FileMergeDialog.cpp @@ -40,10 +40,10 @@ namespace Rosegarden { -FileMergeDialog::FileMergeDialog(TQWidget *parent, +FileMergeDialog::FileMergeDialog(TQWidget *tqparent, TQString /*fileName*/, bool timingsDiffer) : - KDialogBase(parent, 0, true, i18n("Merge File"), Ok | Cancel | Help) + KDialogBase(tqparent, 0, true, i18n("Merge File"), Ok | Cancel | Help) { setHelp("file-merge"); diff --git a/src/gui/dialogs/FileMergeDialog.h b/src/gui/dialogs/FileMergeDialog.h index 33a8638..5675f59 100644 --- a/src/gui/dialogs/FileMergeDialog.h +++ b/src/gui/dialogs/FileMergeDialog.h @@ -43,9 +43,10 @@ namespace Rosegarden class FileMergeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FileMergeDialog(TQWidget *parent, TQString fileName, bool timingsDiffer); + FileMergeDialog(TQWidget *tqparent, TQString fileName, bool timingsDiffer); int getMergeOptions(); diff --git a/src/gui/dialogs/FloatEdit.cpp b/src/gui/dialogs/FloatEdit.cpp index a4b9788..db2dc43 100644 --- a/src/gui/dialogs/FloatEdit.cpp +++ b/src/gui/dialogs/FloatEdit.cpp @@ -37,17 +37,17 @@ namespace Rosegarden { -FloatEdit::FloatEdit(TQWidget *parent, +FloatEdit::FloatEdit(TQWidget *tqparent, const TQString &title, const TQString &text, float min, float max, float value, float step): - KDialogBase(parent, "rosegardenFloatEdit", true, title, Ok | Cancel, Ok) + KDialogBase(tqparent, "rosegardenFloatEdit", true, title, Ok | Cancel, Ok) { TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *groupBox = new TQGroupBox(1, Horizontal, text, vbox); + TQGroupBox *groupBox = new TQGroupBox(1, Qt::Horizontal, text, vbox); TQVBox *inVbox = new TQVBox(groupBox); // Calculate decimal points according to the step size @@ -59,7 +59,7 @@ FloatEdit::FloatEdit(TQWidget *parent, //std::cout << "CAL DP = " << calDP << ", dps = " << dps << std::endl; m_spin = new HSpinBox(inVbox, value, 1, min, max, dps); - new TQLabel(TQString("(min: %1, max: %2)").arg(min).arg(max), inVbox); + new TQLabel(TQString("(min: %1, max: %2)").tqarg(min).tqarg(max), inVbox); } float diff --git a/src/gui/dialogs/FloatEdit.h b/src/gui/dialogs/FloatEdit.h index dc5a060..4c7ca20 100644 --- a/src/gui/dialogs/FloatEdit.h +++ b/src/gui/dialogs/FloatEdit.h @@ -43,9 +43,10 @@ class HSpinBox; class FloatEdit : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FloatEdit(TQWidget *parent, + FloatEdit(TQWidget *tqparent, const TQString &title, const TQString &text, float min, diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.cpp b/src/gui/dialogs/IdentifyTextCodecDialog.cpp index c07d887..f8deb14 100644 --- a/src/gui/dialogs/IdentifyTextCodecDialog.cpp +++ b/src/gui/dialogs/IdentifyTextCodecDialog.cpp @@ -41,9 +41,9 @@ namespace Rosegarden { -IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *parent, +IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *tqparent, std::string text) : - KDialogBase(parent, 0, true, i18n("Choose Text Encoding"), Ok), + KDialogBase(tqparent, 0, true, i18n("Choose Text Encoding"), Ok), m_text(text) { TQVBox *vbox = makeVBoxMainWidget(); @@ -120,7 +120,7 @@ IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *parent, } if (description != "") { - description = i18n("%1 (%2)").arg(strtoqstr(name)).arg(description); + description = i18n("%1 (%2)").tqarg(strtoqstr(name)).tqarg(description); } else { description = strtoqstr(name); } @@ -144,7 +144,7 @@ IdentifyTextCodecDialog::IdentifyTextCodecDialog(TQWidget *parent, TQFont font; font.setStyleHint(TQFont::TypeWriter); m_example->setFont(font); - m_example->setPaletteForegroundColor(Qt::blue); + m_example->setPaletteForegroundColor(TQt::blue); std::cerr << "calling slotCodecSelected(" << current << ")" << std::endl; if (current < 0) current = 0; codecs->setCurrentItem(current); diff --git a/src/gui/dialogs/IdentifyTextCodecDialog.h b/src/gui/dialogs/IdentifyTextCodecDialog.h index 8b71be4..1d32f79 100644 --- a/src/gui/dialogs/IdentifyTextCodecDialog.h +++ b/src/gui/dialogs/IdentifyTextCodecDialog.h @@ -43,9 +43,10 @@ namespace Rosegarden class IdentifyTextCodecDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - IdentifyTextCodecDialog(TQWidget *parent, std::string text); + IdentifyTextCodecDialog(TQWidget *tqparent, std::string text); std::string getCodec() const { return m_codec; } diff --git a/src/gui/dialogs/ImportDeviceDialog.cpp b/src/gui/dialogs/ImportDeviceDialog.cpp index cde1cac..53f98bc 100644 --- a/src/gui/dialogs/ImportDeviceDialog.cpp +++ b/src/gui/dialogs/ImportDeviceDialog.cpp @@ -54,8 +54,8 @@ namespace Rosegarden { -ImportDeviceDialog::ImportDeviceDialog(TQWidget *parent, KURL url) : - KDialogBase(parent, "importdevicedialog", true, +ImportDeviceDialog::ImportDeviceDialog(TQWidget *tqparent, KURL url) : + KDialogBase(tqparent, "importdevicedialog", true, i18n("Import from Device..."), Ok | Cancel, Ok), m_url(url), @@ -84,26 +84,26 @@ ImportDeviceDialog::doImport() TQString target; if (KIO::NetAccess::download(m_url, target) == false) { - KMessageBox::error(this, i18n("Cannot download file %1").arg(m_url.prettyURL())); + KMessageBox::error(this, i18n("Cannot download file %1").tqarg(m_url.prettyURL())); return false; } bool fileRead = false; - if (SF2PatchExtractor::isSF2File(target.data())) { + if (SF2PatchExtractor::isSF2File(target.ascii())) { fileRead = importFromSF2(target); } else { fileRead = importFromRG(target); } if (!fileRead) { KMessageBox::error - (this, i18n("Cannot open file %1").arg(m_url.prettyURL())); + (this, i18n("Cannot open file %1").tqarg(m_url.prettyURL())); reject(); close(); return false; } if (m_devices.size() == 0) { KMessageBox::sorry - (this, i18n("No devices found in file %1").arg(m_url.prettyURL())); + (this, i18n("No devices found in file %1").tqarg(m_url.prettyURL())); reject(); close(); return false; @@ -137,7 +137,7 @@ ImportDeviceDialog::doImport() if ((*i)->getName() != "") { showRenameOption = true; } else { - (*i)->setName(qstrtostr(i18n("Device %1").arg(count))); + (*i)->setName(qstrtostr(i18n("Device %1").tqarg(count))); } if (m_devices.size() > 1) { m_deviceCombo->insertItem(strtoqstr((*i)->getName())); @@ -149,7 +149,7 @@ ImportDeviceDialog::doImport() TQHBox *optionsBox = new TQHBox(mainFrame); - TQGroupBox *gb = new TQGroupBox(1, Horizontal, i18n("Options"), + TQGroupBox *gb = new TQGroupBox(1, Qt::Horizontal, i18n("Options"), optionsBox); m_importBanks = new TQCheckBox(i18n("Import banks"), gb); @@ -340,7 +340,7 @@ ImportDeviceDialog::importFromSF2(TQString filename) { SF2PatchExtractor::Device sf2device; try { - sf2device = SF2PatchExtractor::read(filename.data()); + sf2device = SF2PatchExtractor::read(filename.ascii()); // These exceptions shouldn't happen -- the isSF2File call before this // one should have weeded them out @@ -364,7 +364,7 @@ ImportDeviceDialog::importFromSF2(TQString filename) MidiBank bank (msb == 1, msb, lsb, - qstrtostr(i18n("Bank %1:%2").arg(msb).arg(lsb))); + qstrtostr(i18n("Bank %1:%2").tqarg(msb).tqarg(lsb))); banks.push_back(bank); diff --git a/src/gui/dialogs/ImportDeviceDialog.h b/src/gui/dialogs/ImportDeviceDialog.h index 122e640..e376f1c 100644 --- a/src/gui/dialogs/ImportDeviceDialog.h +++ b/src/gui/dialogs/ImportDeviceDialog.h @@ -55,9 +55,10 @@ class RosegardenGUIDoc; class ImportDeviceDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ImportDeviceDialog(TQWidget *parent, KURL url); + ImportDeviceDialog(TQWidget *tqparent, KURL url); virtual ~ImportDeviceDialog(); bool doImport(); diff --git a/src/gui/dialogs/InterpretDialog.cpp b/src/gui/dialogs/InterpretDialog.cpp index 3510d1a..75889c6 100644 --- a/src/gui/dialogs/InterpretDialog.cpp +++ b/src/gui/dialogs/InterpretDialog.cpp @@ -40,24 +40,24 @@ namespace Rosegarden { -InterpretDialog::InterpretDialog(TQWidget *parent) : - KDialogBase(parent, 0, true, i18n("Interpret"), Ok | Cancel | Help) +InterpretDialog::InterpretDialog(TQWidget *tqparent) : + KDialogBase(tqparent, 0, true, i18n("Interpret"), Ok | Cancel | Help) { setHelp("nv-interpret"); TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *groupBox = new QGroupBox - (1, Horizontal, i18n("Interpretations to apply"), vbox); + TQGroupBox *groupBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Interpretations to apply"), vbox); - m_applyTextDynamics = new QCheckBox + m_applyTextDynamics = new TQCheckBox (i18n("Apply text dynamics (p, mf, ff etc)"), groupBox); - m_applyHairpins = new QCheckBox + m_applyHairpins = new TQCheckBox (i18n("Apply hairpin dynamics"), groupBox); - m_stressBeats = new QCheckBox + m_stressBeats = new TQCheckBox (i18n("Stress beats"), groupBox); - m_articulate = new QCheckBox + m_articulate = new TQCheckBox (i18n("Articulate slurs, staccato, tenuto etc"), groupBox); - m_allInterpretations = new QCheckBox + m_allInterpretations = new TQCheckBox (i18n("All available interpretations"), groupBox); KConfig *config = kapp->config(); diff --git a/src/gui/dialogs/InterpretDialog.h b/src/gui/dialogs/InterpretDialog.h index 9859259..db5f0ac 100644 --- a/src/gui/dialogs/InterpretDialog.h +++ b/src/gui/dialogs/InterpretDialog.h @@ -41,8 +41,9 @@ namespace Rosegarden class InterpretDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - InterpretDialog(TQWidget *parent); + InterpretDialog(TQWidget *tqparent); // an OR from InterpretCommand's constants int getInterpretations(); diff --git a/src/gui/dialogs/IntervalDialog.cpp b/src/gui/dialogs/IntervalDialog.cpp index da8e4dc..be238d3 100644 --- a/src/gui/dialogs/IntervalDialog.cpp +++ b/src/gui/dialogs/IntervalDialog.cpp @@ -48,8 +48,8 @@ namespace Rosegarden { -IntervalDialog::IntervalDialog(TQWidget *parent, bool askChangeKey, bool askTransposeSegmentBack) : - KDialogBase(parent, 0, true, i18n("Specify Interval"), Ok | Cancel ) +IntervalDialog::IntervalDialog(TQWidget *tqparent, bool askChangeKey, bool askTransposeSegmentBack) : + KDialogBase(tqparent, 0, true, i18n("Specify Interval"), Ok | Cancel ) { TQVBox *vBox = makeVBoxMainWidget(); @@ -61,19 +61,19 @@ IntervalDialog::IntervalDialog(TQWidget *parent, bool askChangeKey, bool askTran intervalChromatic = 0; intervalDiatonic = 0; - //m_intervalPitchLabel = new TQLabel( i18n("Pitch: %1").arg(intervalChromatic), hBox); - //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").arg(intervalDiatonic / 7), hBox); - //m_intervalStepsLabel = new TQLabel( i18n("Steps: %1").arg(intervalDiatonic % 7), hBox); + //m_intervalPitchLabel = new TQLabel( i18n("Pitch: %1").tqarg(intervalChromatic), hBox); + //m_intervalOctavesLabel = new TQLabel( i18n("Octaves: %1").tqarg(intervalDiatonic / 7), hBox); + //m_intervalStepsLabel = new TQLabel( i18n("Steps: %1").tqarg(intervalDiatonic % 7), hBox); m_intervalLabel = new TQLabel( i18n("a perfect unison"), vBox); - m_intervalLabel->setAlignment(Qt::AlignCenter); + m_intervalLabel->tqsetAlignment(TQt::AlignCenter); TQFont font(m_intervalLabel->font()); font.setItalic(true); m_intervalLabel->setFont(font); if (askChangeKey) { - TQButtonGroup *affectKeyGroup = new TQButtonGroup(1, Horizontal, i18n("Effect on Key"), vBox); + TQButtonGroup *affectKeyGroup = new TQButtonGroup(1, Qt::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); @@ -138,7 +138,7 @@ IntervalDialog::getChromaticDistance() return getOctaveDistance() * 12 + getStepDistanceChromatic() + getAccidentalCorrectionChromatic(); } -QString +TQString IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) { // displayInterval: an intervalDiatonic of -3 will yield a displayInterval of 3 and @@ -205,7 +205,7 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) else if (deviation == 0) textIntervalDeviated += i18n("a perfect"); else - textIntervalDeviated += i18n("an (unknown, %1)").arg(deviation); + textIntervalDeviated += i18n("an (unknown, %1)").tqarg(deviation); break; // Then the major/minor: case 1: // second @@ -233,7 +233,7 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) else if (deviation == 0) textIntervalDeviated += i18n("a perfect"); else - textIntervalDeviated += i18n("an (unknown, %1)").arg(deviation); + textIntervalDeviated += i18n("an (unknown, %1)").tqarg(deviation); break; default: textIntervalDeviated += i18n("an (unknown)"); @@ -245,35 +245,35 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) // "1 octave and a diminished octave" is better than // "2 octaves and a diminished unison" if (octaves > 0) { - textInterval += i18n("%1 octave").arg(textIntervalDeviated); + textInterval += i18n("%1 octave").tqarg(textIntervalDeviated); octaves--; } else if (octaves < 0) { - textInterval += i18n("%1 octave").arg(textIntervalDeviated); + textInterval += i18n("%1 octave").tqarg(textIntervalDeviated); octaves++; } else { - textInterval += i18n("%1 unison").arg(textIntervalDeviated); + textInterval += i18n("%1 unison").tqarg(textIntervalDeviated); } break; case 1: - textInterval += i18n("%1 second").arg(textIntervalDeviated); + textInterval += i18n("%1 second").tqarg(textIntervalDeviated); break; case 2: - textInterval += i18n("%1 third").arg(textIntervalDeviated); + textInterval += i18n("%1 third").tqarg(textIntervalDeviated); break; case 3: - textInterval += i18n("%1 fourth").arg(textIntervalDeviated); + textInterval += i18n("%1 fourth").tqarg(textIntervalDeviated); break; case 4: - textInterval += i18n("%1 fifth").arg(textIntervalDeviated); + textInterval += i18n("%1 fifth").tqarg(textIntervalDeviated); break; case 5: - textInterval += i18n("%1 sixth").arg(textIntervalDeviated); + textInterval += i18n("%1 sixth").tqarg(textIntervalDeviated); break; case 6: - textInterval += i18n("%1 seventh").arg(textIntervalDeviated); + textInterval += i18n("%1 seventh").tqarg(textIntervalDeviated); break; default: - textInterval += i18n("%1").arg(textIntervalDeviated); + textInterval += i18n("%1").tqarg(textIntervalDeviated); } } @@ -285,14 +285,14 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) if (showStep) { return i18n("up 1 octave and %1", "up %n octaves and %1", - octaves).arg(textInterval); + octaves).tqarg(textInterval); } else { return i18n("up 1 octave", "up %n octaves", octaves); } } else { - return i18n("up %1").arg(textInterval); + return i18n("up %1").tqarg(textInterval); } } else @@ -301,14 +301,14 @@ IntervalDialog::getIntervalName(int intervalDiatonic, int intervalChromatic) if (showStep) { return i18n("down 1 octave and %1", "down %n octaves and %1", - octaves).arg(textInterval); + octaves).tqarg(textInterval); } else { return i18n("down 1 octave", "down %n octaves", octaves); } } else { - return i18n("down %1").arg(textInterval); + return i18n("down %1").tqarg(textInterval); } } } else { diff --git a/src/gui/dialogs/IntervalDialog.h b/src/gui/dialogs/IntervalDialog.h index f08326b..d464731 100644 --- a/src/gui/dialogs/IntervalDialog.h +++ b/src/gui/dialogs/IntervalDialog.h @@ -47,8 +47,9 @@ class RosegardenGUIDoc; class IntervalDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - IntervalDialog(TQWidget *parent, bool askChangeKey = false, bool askTransposeSegmentBack = false); + IntervalDialog(TQWidget *tqparent, bool askChangeKey = false, bool askTransposeSegmentBack = false); // Distance in semitones int getChromaticDistance(); diff --git a/src/gui/dialogs/KeySignatureDialog.cpp b/src/gui/dialogs/KeySignatureDialog.cpp index f47d71a..a649cc8 100644 --- a/src/gui/dialogs/KeySignatureDialog.cpp +++ b/src/gui/dialogs/KeySignatureDialog.cpp @@ -49,14 +49,14 @@ namespace Rosegarden { -KeySignatureDialog::KeySignatureDialog(TQWidget *parent, +KeySignatureDialog::KeySignatureDialog(TQWidget *tqparent, NotePixmapFactory *npf, Clef clef, Rosegarden::Key defaultKey, bool showApplyToAll, bool showConversionOptions, TQString explanatoryText) : - KDialogBase(parent, 0, true, i18n("Key Change"), Ok | Cancel | Help), + KDialogBase(tqparent, 0, true, i18n("Key Change"), Ok | Cancel | Help), m_notePixmapFactory(npf), m_key(defaultKey), m_clef(clef), @@ -73,17 +73,17 @@ KeySignatureDialog::KeySignatureDialog(TQWidget *parent, TQHBox *keyBox = 0; TQHBox *nameBox = 0; - TQGroupBox *keyFrame = new QGroupBox - (1, Horizontal, i18n("Key signature"), vbox); + TQGroupBox *keyFrame = new TQGroupBox + (1, Qt::Horizontal, i18n("Key signature"), vbox); - TQGroupBox *transposeFrame = new QButtonGroup - (1, Horizontal, i18n("Key transposition"), vbox); + TQGroupBox *transposeFrame = new TQButtonGroup + (1, Qt::Horizontal, i18n("Key transposition"), vbox); - TQGroupBox *buttonFrame = new QButtonGroup - (1, Horizontal, i18n("Scope"), vbox); + TQGroupBox *buttonFrame = new TQButtonGroup + (1, Qt::Horizontal, i18n("Scope"), vbox); - TQButtonGroup *conversionFrame = new QButtonGroup - (1, Horizontal, i18n("Existing notes following key change"), vbox); + TQButtonGroup *conversionFrame = new TQButtonGroup + (1, Qt::Horizontal, i18n("Existing notes following key change"), vbox); keyBox = new TQHBox(keyFrame); nameBox = new TQHBox(keyFrame); @@ -98,7 +98,7 @@ KeySignatureDialog::KeySignatureDialog(TQWidget *parent, (keyDown, i18n("Flatten")); m_keyLabel = new TQLabel(i18n("Key"), keyBox); - m_keyLabel->setAlignment(AlignVCenter | AlignHCenter); + m_keyLabel->tqsetAlignment(AlignVCenter | AlignHCenter); BigArrowButton *keyUp = new BigArrowButton(keyBox, Qt::RightArrow); TQToolTip::add @@ -148,13 +148,13 @@ KeySignatureDialog::KeySignatureDialog(TQWidget *parent, if (showConversionOptions) { m_noConversionButton = - new QRadioButton + new TQRadioButton (i18n("Maintain current pitches"), conversionFrame); m_convertButton = - new QRadioButton + new TQRadioButton (i18n("Maintain current accidentals"), conversionFrame); m_transposeButton = - new QRadioButton + new TQRadioButton (i18n("Transpose into this key"), conversionFrame); m_noConversionButton->setChecked(true); } else { @@ -290,7 +290,7 @@ KeySignatureDialog::regenerateKeyCombo() i != keys.end(); ++i) { TQString name(strtoqstr(i->getName())); - int space = name.find(' '); + int space = name.tqfind(' '); if (space > 0) name = name.left(space); @@ -325,7 +325,7 @@ KeySignatureDialog::redrawKeyPixmap() { if (m_valid) { TQPixmap pmap = - NotePixmapFactory::toQPixmap(m_notePixmapFactory->makeKeyDisplayPixmap(m_key, m_clef)); + NotePixmapFactory::toTQPixmap(m_notePixmapFactory->makeKeyDisplayPixmap(m_key, m_clef)); m_keyLabel->setPixmap(pmap); } else { m_keyLabel->setText(i18n("No such key")); diff --git a/src/gui/dialogs/KeySignatureDialog.h b/src/gui/dialogs/KeySignatureDialog.h index 2047ee7..96448d1 100644 --- a/src/gui/dialogs/KeySignatureDialog.h +++ b/src/gui/dialogs/KeySignatureDialog.h @@ -49,6 +49,7 @@ class NotePixmapFactory; class KeySignatureDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum ConversionType { @@ -57,7 +58,7 @@ public: Transpose }; - KeySignatureDialog(TQWidget *parent, + KeySignatureDialog(TQWidget *tqparent, NotePixmapFactory *npf, Clef clef, Rosegarden::Key defaultKey = diff --git a/src/gui/dialogs/LilyPondOptionsDialog.cpp b/src/gui/dialogs/LilyPondOptionsDialog.cpp index 6af8f86..9fc183e 100644 --- a/src/gui/dialogs/LilyPondOptionsDialog.cpp +++ b/src/gui/dialogs/LilyPondOptionsDialog.cpp @@ -54,11 +54,11 @@ namespace Rosegarden { -LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, +LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *tqparent, RosegardenGUIDoc *doc, TQString windowCaption, TQString heading) : - KDialogBase(parent, 0, true, + KDialogBase(tqparent, 0, true, (windowCaption = "" ? i18n("LilyPond Export/Preview") : windowCaption), Apply | Ok | Cancel), m_doc(doc) @@ -101,27 +101,27 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, // LilyPond export: Basic options // - TQGroupBox *basicOptionsBox = new QGroupBox - (1, Horizontal, + TQGroupBox *basicOptionsBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Basic options"), generalFrame); generalGrid->addWidget(basicOptionsBox, 0, 0); TQFrame *frameBasic = new TQFrame(basicOptionsBox); - TQGridLayout *layoutBasic = new TQGridLayout(frameBasic, 3, 2, 10, 5); + TQGridLayout *tqlayoutBasic = new TQGridLayout(frameBasic, 3, 2, 10, 5); - layoutBasic->addWidget(new TQLabel( + tqlayoutBasic->addWidget(new TQLabel( i18n("Compatibility level"), frameBasic), 0, 0); m_lilyLanguage = new KComboBox(frameBasic); // See also setDefaultLilyPondVersion below - m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.6")); - m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.8")); - m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.10")); - m_lilyLanguage->insertItem(i18n("LilyPond %1").arg("2.12")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.6")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.8")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.10")); + m_lilyLanguage->insertItem(i18n("LilyPond %1").tqarg("2.12")); m_lilyLanguage->setCurrentItem(config->readUnsignedNumEntry("lilylanguage", 0)); - layoutBasic->addWidget(m_lilyLanguage, 0, 1); + tqlayoutBasic->addWidget(m_lilyLanguage, 0, 1); - layoutBasic->addWidget(new TQLabel( + tqlayoutBasic->addWidget(new TQLabel( i18n("Paper size"), frameBasic), 1, 0); TQHBoxLayout *hboxPaper = new TQHBoxLayout( frameBasic ); @@ -146,33 +146,33 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, hboxPaper->addWidget( m_lilyPaperSize ); hboxPaper->addWidget( new TQLabel( " ", frameBasic ) ); // fixed-size spacer hboxPaper->addWidget( m_lilyPaperLandscape ); - layoutBasic->addLayout(hboxPaper, 1, 1); + tqlayoutBasic->addLayout(hboxPaper, 1, 1); - layoutBasic->addWidget(new TQLabel( + tqlayoutBasic->addWidget(new TQLabel( i18n("Font size"), frameBasic), 2, 0); m_lilyFontSize = new KComboBox(frameBasic); int sizes[] = { 11, 13, 16, 19, 20, 23, 26 }; for (int i = 0; i < sizeof(sizes)/sizeof(sizes[0]); ++i) { - m_lilyFontSize->insertItem(i18n("%1 pt").arg(sizes[i])); + m_lilyFontSize->insertItem(i18n("%1 pt").tqarg(sizes[i])); } m_lilyFontSize->setCurrentItem(config->readUnsignedNumEntry ("lilyfontsize", 4)); - layoutBasic->addWidget(m_lilyFontSize, 2, 1); + tqlayoutBasic->addWidget(m_lilyFontSize, 2, 1); // // LilyPond export: Staff level options // - TQGroupBox *staffOptionsBox = new QGroupBox - (1, Horizontal, + TQGroupBox *staffOptionsBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Staff level options"), generalFrame); generalGrid->addWidget(staffOptionsBox, 1, 0); TQFrame *frameStaff = new TQFrame(staffOptionsBox); - TQGridLayout *layoutStaff = new TQGridLayout(frameStaff, 2, 2, 10, 5); + TQGridLayout *tqlayoutStaff = new TQGridLayout(frameStaff, 2, 2, 10, 5); - layoutStaff->addWidget(new TQLabel( + tqlayoutStaff->addWidget(new TQLabel( i18n("Export content"), frameStaff), 0, 0); m_lilyExportSelection = new KComboBox(frameStaff); @@ -182,24 +182,24 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, m_lilyExportSelection->insertItem(i18n("Selected segments")); m_lilyExportSelection->setCurrentItem(config->readUnsignedNumEntry("lilyexportselection", 1)); - layoutStaff->addWidget(m_lilyExportSelection, 0, 1); + tqlayoutStaff->addWidget(m_lilyExportSelection, 0, 1); m_lilyExportStaffMerge = new TQCheckBox( i18n("Merge tracks that have the same name"), frameStaff); m_lilyExportStaffMerge->setChecked(config->readBoolEntry("lilyexportstaffmerge", false)); - layoutStaff->addMultiCellWidget(m_lilyExportStaffMerge, 1, 1, 0, 1); + tqlayoutStaff->addMultiCellWidget(m_lilyExportStaffMerge, 1, 1, 0, 1); // // LilyPond export: Notation options // - TQGroupBox *notationOptionsBox = new QGroupBox - (1, Horizontal, + TQGroupBox *notationOptionsBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Notation options"), generalFrame); generalGrid->addWidget(notationOptionsBox, 2, 0); TQFrame *frameNotation = new TQFrame(notationOptionsBox); - TQGridLayout *layoutNotation = new TQGridLayout(frameNotation, 4, 2, 10, 5); + TQGridLayout *tqlayoutNotation = new TQGridLayout(frameNotation, 4, 2, 10, 5); m_lilyTempoMarks = new KComboBox( frameNotation ); m_lilyTempoMarks->insertItem(i18n("None")); @@ -207,9 +207,9 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, m_lilyTempoMarks->insertItem(i18n("All")); m_lilyTempoMarks->setCurrentItem(config->readUnsignedNumEntry("lilyexporttempomarks", 0)); - layoutNotation->addWidget( new TQLabel( + tqlayoutNotation->addWidget( new TQLabel( i18n("Export tempo marks "), frameNotation), 0, 0 ); - layoutNotation->addWidget(m_lilyTempoMarks, 0, 1); + tqlayoutNotation->addWidget(m_lilyTempoMarks, 0, 1); m_lilyExportLyrics = new TQCheckBox( i18n("Export lyrics"), frameNotation); @@ -219,19 +219,19 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, // fixed, no "- - -" lyrics are generated for an empty lyrics // default again into lyrics - HJJ m_lilyExportLyrics->setChecked(config->readBoolEntry("lilyexportlyrics", true)); - layoutNotation->addMultiCellWidget(m_lilyExportLyrics, 1, 1, 0, 1); + tqlayoutNotation->addMultiCellWidget(m_lilyExportLyrics, 1, 1, 0, 1); m_lilyExportBeams = new TQCheckBox( i18n("Export beamings"), frameNotation); m_lilyExportBeams->setChecked(config->readBoolEntry("lilyexportbeamings", false)); - layoutNotation->addMultiCellWidget(m_lilyExportBeams, 2, 2, 0, 1); + tqlayoutNotation->addMultiCellWidget(m_lilyExportBeams, 2, 2, 0, 1); // recycle this for a new option to ignore the track brackets (so it is less // obnoxious to print single parts where brackets are in place) m_lilyExportStaffGroup = new TQCheckBox( i18n("Export track staff brackets"), frameNotation); m_lilyExportStaffGroup->setChecked(config->readBoolEntry("lilyexportstaffbrackets", true)); - layoutNotation->addMultiCellWidget(m_lilyExportStaffGroup, 3, 3, 0, 1); + tqlayoutNotation->addMultiCellWidget(m_lilyExportStaffGroup, 3, 3, 0, 1); generalGrid->setRowStretch(4, 10); @@ -239,46 +239,46 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, // LilyPond export: Advanced options // - TQGroupBox *advancedLayoutOptionsBox = new QGroupBox - (1, Horizontal, + TQGroupBox *advancedLayoutOptionsBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Layout options"), advancedFrame); advancedGrid->addWidget(advancedLayoutOptionsBox, 0, 0); TQFrame *frameAdvancedLayout = new TQFrame(advancedLayoutOptionsBox); - TQGridLayout *layoutAdvancedLayout = new TQGridLayout(frameAdvancedLayout, 2, 2, 10, 5); + TQGridLayout *tqlayoutAdvancedLayout = new TQGridLayout(frameAdvancedLayout, 2, 2, 10, 5); m_lilyLyricsHAlignment = new KComboBox( frameAdvancedLayout ); m_lilyLyricsHAlignment->insertItem(i18n("Left")); m_lilyLyricsHAlignment->insertItem(i18n("Center")); m_lilyLyricsHAlignment->insertItem(i18n("Right")); - m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshalignment", 0)); + m_lilyLyricsHAlignment->setCurrentItem(config->readUnsignedNumEntry("lilylyricshtqalignment", 0)); - layoutAdvancedLayout->addWidget(new TQLabel( - i18n("Lyrics alignment"), frameAdvancedLayout), 0, 0); - layoutAdvancedLayout->addWidget(m_lilyLyricsHAlignment, 0, 1); + tqlayoutAdvancedLayout->addWidget(new TQLabel( + i18n("Lyrics tqalignment"), frameAdvancedLayout), 0, 0); + tqlayoutAdvancedLayout->addWidget(m_lilyLyricsHAlignment, 0, 1); m_lilyRaggedBottom = new TQCheckBox( i18n("Ragged bottom (systems will not be spread vertically across the page)"), frameAdvancedLayout); m_lilyRaggedBottom->setChecked(config->readBoolEntry("lilyraggedbottom", false)); - layoutAdvancedLayout->addMultiCellWidget(m_lilyRaggedBottom, 1, 2, 0, 1); + tqlayoutAdvancedLayout->addMultiCellWidget(m_lilyRaggedBottom, 1, 2, 0, 1); - TQGroupBox *miscOptionsBox = new QGroupBox - (1, Horizontal, + TQGroupBox *miscOptionsBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Miscellaneous options"), advancedFrame); advancedGrid->addWidget(miscOptionsBox, 1, 0); TQFrame *frameMisc = new TQFrame(miscOptionsBox); - TQGridLayout *layoutMisc = new TQGridLayout(frameMisc, 2, 2, 10, 5); + TQGridLayout *tqlayoutMisc = new TQGridLayout(frameMisc, 2, 2, 10, 5); m_lilyExportPointAndClick = new TQCheckBox( i18n("Enable \"point and click\" debugging"), frameMisc); m_lilyExportPointAndClick->setChecked(config->readBoolEntry("lilyexportpointandclick", false)); - layoutMisc->addMultiCellWidget(m_lilyExportPointAndClick, 0, 0, 0, 1); + tqlayoutMisc->addMultiCellWidget(m_lilyExportPointAndClick, 0, 0, 0, 1); m_lilyExportMidi = new TQCheckBox( i18n("Export \\midi block"), frameMisc); m_lilyExportMidi->setChecked(config->readBoolEntry("lilyexportmidi", false)); - layoutMisc->addMultiCellWidget(m_lilyExportMidi, 1, 1, 0, 1); + tqlayoutMisc->addMultiCellWidget(m_lilyExportMidi, 1, 1, 0, 1); m_lilyMarkerMode = new KComboBox(frameMisc); m_lilyMarkerMode->insertItem(i18n("No markers")); @@ -286,13 +286,13 @@ LilyPondOptionsDialog::LilyPondOptionsDialog(TQWidget *parent, m_lilyMarkerMode->insertItem(i18n("Marker text")); m_lilyMarkerMode->setCurrentItem(config->readUnsignedNumEntry("lilyexportmarkermode", 0)); - layoutMisc->addWidget( new TQLabel( + tqlayoutMisc->addWidget( new TQLabel( i18n("Export markers"), frameMisc),2, 0 ); - layoutMisc->addWidget(m_lilyMarkerMode, 2, 1); + tqlayoutMisc->addWidget(m_lilyMarkerMode, 2, 1); advancedGrid->setRowStretch(2, 10); - resize(minimumSize()); + resize(tqminimumSize()); } void @@ -314,7 +314,7 @@ LilyPondOptionsDialog::slotApply() config->writeEntry("lilyexportbeamings", m_lilyExportBeams->isChecked()); config->writeEntry("lilyexportstaffmerge", m_lilyExportStaffMerge->isChecked()); config->writeEntry("lilyexportstaffbrackets", m_lilyExportStaffGroup->isChecked()); - config->writeEntry("lilylyricshalignment", m_lilyLyricsHAlignment->currentItem()); + config->writeEntry("lilylyricshtqalignment", m_lilyLyricsHAlignment->currentItem()); config->writeEntry("lilyexportmarkermode", m_lilyMarkerMode->currentItem()); m_headersPage->apply(); } diff --git a/src/gui/dialogs/LilyPondOptionsDialog.h b/src/gui/dialogs/LilyPondOptionsDialog.h index 9071818..e0272ca 100644 --- a/src/gui/dialogs/LilyPondOptionsDialog.h +++ b/src/gui/dialogs/LilyPondOptionsDialog.h @@ -45,9 +45,10 @@ class HeadersConfigurationPage; class LilyPondOptionsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - LilyPondOptionsDialog(TQWidget *parent, + LilyPondOptionsDialog(TQWidget *tqparent, RosegardenGUIDoc *doc, TQString windowCaption = "", TQString heading = ""); diff --git a/src/gui/dialogs/LyricEditDialog.cpp b/src/gui/dialogs/LyricEditDialog.cpp index 691f046..faae635 100644 --- a/src/gui/dialogs/LyricEditDialog.cpp +++ b/src/gui/dialogs/LyricEditDialog.cpp @@ -48,9 +48,9 @@ namespace Rosegarden { -LyricEditDialog::LyricEditDialog(TQWidget *parent, +LyricEditDialog::LyricEditDialog(TQWidget *tqparent, Segment *segment) : - KDialogBase(parent, 0, true, i18n("Edit Lyrics"), Ok | Cancel | Help), + KDialogBase(tqparent, 0, true, i18n("Edit Lyrics"), Ok | Cancel | Help), m_segment(segment), m_verseCount(0) { @@ -58,8 +58,8 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent, TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *groupBox = new QGroupBox - (1, Horizontal, i18n("Lyrics for this segment"), vbox); + TQGroupBox *groupBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Lyrics for this segment"), vbox); TQHBox *hbox = new TQHBox(groupBox); hbox->setSpacing(5); @@ -73,7 +73,7 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent, hbox->setStretchFactor(f, 10); m_textEdit = new TQTextEdit(groupBox); - m_textEdit->setTextFormat(Qt::PlainText); + m_textEdit->setTextFormat(TQt::PlainText); m_textEdit->setMinimumWidth(300); m_textEdit->setMinimumHeight(200); @@ -81,7 +81,7 @@ LyricEditDialog::LyricEditDialog(TQWidget *parent, unparse(); for (int i = 0; i < m_verseCount; ++i) { - m_verseNumber->insertItem(i18n("Verse %1").arg(i + 1)); + m_verseNumber->insertItem(i18n("Verse %1").tqarg(i + 1)); } m_currentVerse = 0; if (m_verseCount == 12) m_verseAddButton->setEnabled(false); @@ -103,7 +103,7 @@ LyricEditDialog::slotAddVerse() NOTATION_DEBUG << "LyricEditDialog::slotAddVerse" << endl; m_verseCount++; m_texts.push_back(m_skeleton); - m_verseNumber->insertItem(i18n("Verse %1").arg(m_verseCount)); + m_verseNumber->insertItem(i18n("Verse %1").tqarg(m_verseCount)); m_verseNumber->setCurrentItem(m_verseCount - 1); slotVerseNumberChanged(m_verseCount - 1); if (m_verseCount == 12) m_verseAddButton->setEnabled(false); @@ -148,7 +148,7 @@ LyricEditDialog::unparse() int lastBarNo = comp->getBarNumber(lastTime); std::map<int, bool> haveLyric; - TQString fragment = TQString("[%1] ").arg(lastBarNo + 1); + TQString fragment = TQString("[%1] ").tqarg(lastBarNo + 1); m_skeleton = fragment; m_texts.clear(); @@ -192,7 +192,7 @@ LyricEditDialog::unparse() ++lastBarNo; } - fragment += TQString("\n[%1] ").arg(myBarNo + 1); + fragment += TQString("\n[%1] ").tqarg(myBarNo + 1); m_skeleton += fragment; for (size_t v = 0; v < m_verseCount; ++v) m_texts[v] += fragment; @@ -219,7 +219,7 @@ LyricEditDialog::unparse() (*i)->get<Int>(Text::LyricVersePropertyName, verse); TQString syllable(strtoqstr(ssyllable)); - syllable.replace(TQRegExp("\\s+"), "~"); + syllable.tqreplace(TQRegExp("\\s+"), "~"); m_texts[verse] += " " + syllable; haveLyric[verse] = true; @@ -239,7 +239,7 @@ LyricEditDialog::getVerseCount() const return m_verseCount; } -QString +TQString LyricEditDialog::getLyricData(int verse) const { if (verse == m_verseNumber->currentItem()) { diff --git a/src/gui/dialogs/LyricEditDialog.h b/src/gui/dialogs/LyricEditDialog.h index 6f51e24..fe46882 100644 --- a/src/gui/dialogs/LyricEditDialog.h +++ b/src/gui/dialogs/LyricEditDialog.h @@ -46,9 +46,10 @@ class Segment; class LyricEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - LyricEditDialog(TQWidget *parent, Segment *segment); + LyricEditDialog(TQWidget *tqparent, Segment *segment); int getVerseCount() const; TQString getLyricData(int verse) const; diff --git a/src/gui/dialogs/MakeOrnamentDialog.cpp b/src/gui/dialogs/MakeOrnamentDialog.cpp index 3dfbddb..e403a7d 100644 --- a/src/gui/dialogs/MakeOrnamentDialog.cpp +++ b/src/gui/dialogs/MakeOrnamentDialog.cpp @@ -40,13 +40,13 @@ namespace Rosegarden { -MakeOrnamentDialog::MakeOrnamentDialog(TQWidget *parent, TQString defaultName, +MakeOrnamentDialog::MakeOrnamentDialog(TQWidget *tqparent, TQString defaultName, int defaultBasePitch) : - KDialogBase(parent, "makeornamentdialog", true, i18n("Make Ornament"), + KDialogBase(tqparent, "makeornamentdialog", true, i18n("Make Ornament"), Ok | Cancel, Ok) { TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *nameBox = new TQGroupBox(2, Vertical, i18n("Name"), vbox); + TQGroupBox *nameBox = new TQGroupBox(2, Qt::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); @@ -57,7 +57,7 @@ MakeOrnamentDialog::MakeOrnamentDialog(TQWidget *parent, TQString defaultName, m_pitch = new PitchChooser(i18n("Base pitch"), vbox, defaultBasePitch); } -QString +TQString MakeOrnamentDialog::getName() const { return m_name->text(); diff --git a/src/gui/dialogs/MakeOrnamentDialog.h b/src/gui/dialogs/MakeOrnamentDialog.h index 0a4a00d..4396c18 100644 --- a/src/gui/dialogs/MakeOrnamentDialog.h +++ b/src/gui/dialogs/MakeOrnamentDialog.h @@ -43,9 +43,10 @@ class PitchChooser; class MakeOrnamentDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MakeOrnamentDialog(TQWidget *parent, TQString defaultName, int defaultBasePitch); + MakeOrnamentDialog(TQWidget *tqparent, TQString defaultName, int defaultBasePitch); TQString getName() const; int getBasePitch() const; diff --git a/src/gui/dialogs/ManageMetronomeDialog.cpp b/src/gui/dialogs/ManageMetronomeDialog.cpp index 0b51e26..64b99f7 100644 --- a/src/gui/dialogs/ManageMetronomeDialog.cpp +++ b/src/gui/dialogs/ManageMetronomeDialog.cpp @@ -58,9 +58,9 @@ namespace Rosegarden { -ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent, +ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *tqparent, RosegardenGUIDoc *doc) : - KDialogBase(parent, 0, true, i18n("Metronome"), Ok | Apply | Close | Help), + KDialogBase(tqparent, 0, true, i18n("Metronome"), Ok | Apply | Close | Help), m_doc(doc) { setHelp("studio-metronome"); @@ -73,15 +73,15 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent, TQVBox *vbox = new TQVBox(hbox); - TQGroupBox *deviceBox = new QGroupBox - (1, Horizontal, i18n("Metronome Instrument"), vbox); + TQGroupBox *deviceBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Metronome Instrument"), vbox); TQFrame *frame = new TQFrame(deviceBox); - TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5); + TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 10, 5); - layout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0); + tqlayout->addWidget(new TQLabel(i18n("Device"), frame), 0, 0); m_metronomeDevice = new KComboBox(frame); - layout->addWidget(m_metronomeDevice, 0, 1); + tqlayout->addWidget(m_metronomeDevice, 0, 1); DeviceList *devices = doc->getStudio().getDevices(); DeviceListConstIterator it; @@ -108,47 +108,47 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent, } } - layout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0); + tqlayout->addWidget(new TQLabel(i18n("Instrument"), frame), 1, 0); m_metronomeInstrument = new KComboBox(frame); connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetModified())); connect(m_metronomeInstrument, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInstrumentChanged(int))); - layout->addWidget(m_metronomeInstrument, 1, 1); + tqlayout->addWidget(m_metronomeInstrument, 1, 1); - TQGroupBox *beatBox = new QGroupBox - (1, Horizontal, i18n("Beats"), vbox); + TQGroupBox *beatBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Beats"), vbox); frame = new TQFrame(beatBox); - layout = new TQGridLayout(frame, 4, 2, 10, 5); + tqlayout = new TQGridLayout(frame, 4, 2, 10, 5); - layout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0); + tqlayout->addWidget(new TQLabel(i18n("Resolution"), frame), 0, 0); m_metronomeResolution = new KComboBox(frame); m_metronomeResolution->insertItem(i18n("None")); m_metronomeResolution->insertItem(i18n("Bars only")); m_metronomeResolution->insertItem(i18n("Bars and beats")); m_metronomeResolution->insertItem(i18n("Bars, beats, and divisions")); connect(m_metronomeResolution, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotResolutionChanged(int))); - layout->addWidget(m_metronomeResolution, 0, 1); + tqlayout->addWidget(m_metronomeResolution, 0, 1); - layout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0); + tqlayout->addWidget(new TQLabel(i18n("Bar velocity"), frame), 1, 0); m_metronomeBarVely = new TQSpinBox(frame); m_metronomeBarVely->setMinValue(0); m_metronomeBarVely->setMaxValue(127); connect(m_metronomeBarVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified())); - layout->addWidget(m_metronomeBarVely, 1, 1); + tqlayout->addWidget(m_metronomeBarVely, 1, 1); - layout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0); + tqlayout->addWidget(new TQLabel(i18n("Beat velocity"), frame), 2, 0); m_metronomeBeatVely = new TQSpinBox(frame); m_metronomeBeatVely->setMinValue(0); m_metronomeBeatVely->setMaxValue(127); connect(m_metronomeBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified())); - layout->addWidget(m_metronomeBeatVely, 2, 1); + tqlayout->addWidget(m_metronomeBeatVely, 2, 1); - layout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0); + tqlayout->addWidget(new TQLabel(i18n("Sub-beat velocity"), frame), 3, 0); m_metronomeSubBeatVely = new TQSpinBox(frame); m_metronomeSubBeatVely->setMinValue(0); m_metronomeSubBeatVely->setMaxValue(127); connect(m_metronomeSubBeatVely, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSetModified())); - layout->addWidget(m_metronomeSubBeatVely, 3, 1); + tqlayout->addWidget(m_metronomeSubBeatVely, 3, 1); vbox = new TQVBox(hbox); @@ -162,8 +162,8 @@ ManageMetronomeDialog::ManageMetronomeDialog(TQWidget *parent, m_metronomePitchSelector->insertItem(i18n("for Sub-beat")); connect(m_metronomePitchSelector, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPitchSelectorChanged(int))); - TQGroupBox *enableBox = new QGroupBox - (1, Horizontal, i18n("Metronome Activated"), vbox); + TQGroupBox *enableBox = new TQGroupBox + (1, Qt::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())); @@ -261,7 +261,7 @@ ManageMetronomeDialog::populate(int deviceIndex) } } - // if (used) iname = i18n("%1 [used]").arg(iname); + // if (used) iname = i18n("%1 [used]").tqarg(iname); m_metronomeInstrument->insertItem(iname); diff --git a/src/gui/dialogs/ManageMetronomeDialog.h b/src/gui/dialogs/ManageMetronomeDialog.h index 240c0b8..fbb28f6 100644 --- a/src/gui/dialogs/ManageMetronomeDialog.h +++ b/src/gui/dialogs/ManageMetronomeDialog.h @@ -47,9 +47,10 @@ class InstrumentParameterBox; class ManageMetronomeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ManageMetronomeDialog(TQWidget *parent, RosegardenGUIDoc *doc); + ManageMetronomeDialog(TQWidget *tqparent, RosegardenGUIDoc *doc); void setModified(bool value); diff --git a/src/gui/dialogs/MarkerModifyDialog.cpp b/src/gui/dialogs/MarkerModifyDialog.cpp index 9303b67..c1eefab 100644 --- a/src/gui/dialogs/MarkerModifyDialog.cpp +++ b/src/gui/dialogs/MarkerModifyDialog.cpp @@ -45,20 +45,20 @@ namespace Rosegarden { -MarkerModifyDialog::MarkerModifyDialog(TQWidget *parent, +MarkerModifyDialog::MarkerModifyDialog(TQWidget *tqparent, Composition *composition, int time, const TQString &name, const TQString &des): - KDialogBase(parent, 0, true, i18n("Edit Marker"), Ok | Cancel) + KDialogBase(tqparent, 0, true, i18n("Edit Marker"), Ok | Cancel) { initialise(composition, time, name, des); } -MarkerModifyDialog::MarkerModifyDialog(TQWidget *parent, +MarkerModifyDialog::MarkerModifyDialog(TQWidget *tqparent, Composition *composition, Marker *marker) : - KDialogBase(parent, 0, true, i18n("Edit Marker"), Ok | Cancel) + KDialogBase(tqparent, 0, true, i18n("Edit Marker"), Ok | Cancel) { initialise(composition, marker->getTime(), strtoqstr(marker->getName()), @@ -80,9 +80,9 @@ MarkerModifyDialog::initialise(Composition *composition, /*!!! - layout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0); + tqlayout->addWidget(new TQLabel(i18n("Absolute Time:"), frame), 0, 0); m_timeEdit = new TQSpinBox(frame); - layout->addWidget(m_timeEdit, 0, 1); + tqlayout->addWidget(m_timeEdit, 0, 1); m_timeEdit->setMinValue(INT_MIN); m_timeEdit->setMaxValue(INT_MAX); @@ -90,20 +90,20 @@ MarkerModifyDialog::initialise(Composition *composition, Note(Note::Shortest).getDuration()); m_timeEdit->setValue(time); */ - TQGroupBox *groupBox = new QGroupBox - (1, Horizontal, i18n("Marker Properties"), vbox); + TQGroupBox *groupBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Marker Properties"), vbox); TQFrame *frame = new TQFrame(groupBox); - TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 5, 5); + TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 5, 5); - layout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0); + tqlayout->addWidget(new TQLabel(i18n("Text:"), frame), 0, 0); m_nameEdit = new TQLineEdit(name, frame); - layout->addWidget(m_nameEdit, 0, 1); + tqlayout->addWidget(m_nameEdit, 0, 1); - layout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0); + tqlayout->addWidget(new TQLabel(i18n("Description:"), frame), 1, 0); m_desEdit = new TQLineEdit(des, frame); - layout->addWidget(m_desEdit, 1, 1); + tqlayout->addWidget(m_desEdit, 1, 1); m_nameEdit->selectAll(); m_nameEdit->setFocus(); diff --git a/src/gui/dialogs/MarkerModifyDialog.h b/src/gui/dialogs/MarkerModifyDialog.h index da4894b..2da55ca 100644 --- a/src/gui/dialogs/MarkerModifyDialog.h +++ b/src/gui/dialogs/MarkerModifyDialog.h @@ -45,14 +45,15 @@ class Composition; class MarkerModifyDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - MarkerModifyDialog(TQWidget *parent, + MarkerModifyDialog(TQWidget *tqparent, Composition *composition, int time, const TQString &name, const TQString &des); - MarkerModifyDialog(TQWidget *parent, + MarkerModifyDialog(TQWidget *tqparent, Composition *composition, Marker *marker); diff --git a/src/gui/dialogs/PasteNotationDialog.cpp b/src/gui/dialogs/PasteNotationDialog.cpp index cea3b87..8ea23b0 100644 --- a/src/gui/dialogs/PasteNotationDialog.cpp +++ b/src/gui/dialogs/PasteNotationDialog.cpp @@ -39,17 +39,17 @@ namespace Rosegarden { -PasteNotationDialog::PasteNotationDialog(TQWidget *parent, +PasteNotationDialog::PasteNotationDialog(TQWidget *tqparent, PasteEventsCommand::PasteType defaultType) : - KDialogBase(parent, 0, true, i18n("Paste"), Ok | Cancel | Help ), + KDialogBase(tqparent, 0, true, i18n("Paste"), Ok | Cancel | Help ), m_defaultType(defaultType) { setHelp("nv-paste-types"); TQVBox *vbox = makeVBoxMainWidget(); - TQButtonGroup *pasteTypeGroup = new QButtonGroup - (1, Horizontal, i18n("Paste type"), vbox); + TQButtonGroup *pasteTypeGroup = new TQButtonGroup + (1, Qt::Horizontal, i18n("Paste type"), vbox); PasteEventsCommand::PasteTypeMap pasteTypes = PasteEventsCommand::getPasteTypes(); @@ -65,10 +65,10 @@ PasteNotationDialog::PasteNotationDialog(TQWidget *parent, m_pasteTypeButtons.push_back(button); } - TQButtonGroup *setAsDefaultGroup = new QButtonGroup - (1, Horizontal, i18n("Options"), vbox); + TQButtonGroup *setAsDefaultGroup = new TQButtonGroup + (1, Qt::Horizontal, i18n("Options"), vbox); - m_setAsDefaultButton = new QCheckBox + m_setAsDefaultButton = new TQCheckBox (i18n("Make this the default paste type"), setAsDefaultGroup); m_setAsDefaultButton->setChecked(true); } diff --git a/src/gui/dialogs/PasteNotationDialog.h b/src/gui/dialogs/PasteNotationDialog.h index bff6d7e..d604d0e 100644 --- a/src/gui/dialogs/PasteNotationDialog.h +++ b/src/gui/dialogs/PasteNotationDialog.h @@ -44,9 +44,10 @@ namespace Rosegarden class PasteNotationDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PasteNotationDialog(TQWidget *parent, + PasteNotationDialog(TQWidget *tqparent, PasteEventsCommand::PasteType defaultType); PasteEventsCommand::PasteType getPasteType() const; diff --git a/src/gui/dialogs/PitchDialog.cpp b/src/gui/dialogs/PitchDialog.cpp index c484142..169ff21 100644 --- a/src/gui/dialogs/PitchDialog.cpp +++ b/src/gui/dialogs/PitchDialog.cpp @@ -36,8 +36,8 @@ namespace Rosegarden { -PitchDialog::PitchDialog(TQWidget *parent, TQString title, int defaultPitch) : - KDialogBase(parent, 0, true, title, User1 | Ok) +PitchDialog::PitchDialog(TQWidget *tqparent, TQString title, int defaultPitch) : + KDialogBase(tqparent, 0, true, title, User1 | Ok) { TQVBox *vbox = makeVBoxMainWidget(); m_pitchChooser = new PitchChooser(title, vbox, defaultPitch); diff --git a/src/gui/dialogs/PitchDialog.h b/src/gui/dialogs/PitchDialog.h index 8a4cce7..dd228bf 100644 --- a/src/gui/dialogs/PitchDialog.h +++ b/src/gui/dialogs/PitchDialog.h @@ -42,8 +42,9 @@ class PitchChooser; class PitchDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PitchDialog(TQWidget *parent, TQString title, int defaultPitch = 60); + PitchDialog(TQWidget *tqparent, TQString title, int defaultPitch = 60); int getPitch() const; diff --git a/src/gui/dialogs/PitchPickerDialog.cpp b/src/gui/dialogs/PitchPickerDialog.cpp index dddc2a3..737726c 100644 --- a/src/gui/dialogs/PitchPickerDialog.cpp +++ b/src/gui/dialogs/PitchPickerDialog.cpp @@ -36,17 +36,17 @@ namespace Rosegarden { -PitchPickerDialog::PitchPickerDialog(TQWidget *parent, int initialPitch, TQString text) : - KDialogBase(parent, 0, true, i18n("Pitch Selector"), Ok | Cancel) +PitchPickerDialog::PitchPickerDialog(TQWidget *tqparent, int initialPitch, TQString text) : + KDialogBase(tqparent, 0, true, i18n("Pitch Selector"), Ok | Cancel) { TQVBox *vBox = makeVBoxMainWidget(); TQFrame *frame = new TQFrame(vBox); - TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5); + TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5); m_pitch = new PitchChooser(text, frame, initialPitch); - layout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, Qt::AlignHCenter); + tqlayout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter); } PitchPickerDialog::~PitchPickerDialog() diff --git a/src/gui/dialogs/PitchPickerDialog.h b/src/gui/dialogs/PitchPickerDialog.h index 25fc28f..23125c9 100644 --- a/src/gui/dialogs/PitchPickerDialog.h +++ b/src/gui/dialogs/PitchPickerDialog.h @@ -39,10 +39,11 @@ namespace Rosegarden class PitchPickerDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PitchPickerDialog(TQWidget* parent, int initialPitch, TQString text); + PitchPickerDialog(TQWidget* tqparent, int initialPitch, TQString text); ~PitchPickerDialog(); int getPitch() { return m_pitch->getPitch(); } diff --git a/src/gui/dialogs/QuantizeDialog.cpp b/src/gui/dialogs/QuantizeDialog.cpp index 87d7f79..d893b1c 100644 --- a/src/gui/dialogs/QuantizeDialog.cpp +++ b/src/gui/dialogs/QuantizeDialog.cpp @@ -36,8 +36,8 @@ namespace Rosegarden { -QuantizeDialog::QuantizeDialog(TQWidget *parent, bool inNotation) : - KDialogBase(parent, 0, true, i18n("Quantize"), Ok | Cancel | Details | Help) +QuantizeDialog::QuantizeDialog(TQWidget *tqparent, bool inNotation) : + KDialogBase(tqparent, 0, true, i18n("Quantize"), Ok | Cancel | Details | Help) { setHelp("quantization"); diff --git a/src/gui/dialogs/QuantizeDialog.h b/src/gui/dialogs/QuantizeDialog.h index fa6f07e..1be603a 100644 --- a/src/gui/dialogs/QuantizeDialog.h +++ b/src/gui/dialogs/QuantizeDialog.h @@ -23,8 +23,8 @@ COPYING included with this distribution for more information. */ -#ifndef _RG_QUANTIZEDIALOG_H_ -#define _RG_QUANTIZEDIALOG_H_ +#ifndef _RG_TQUANTIZEDIALOG_H_ +#define _RG_TQUANTIZEDIALOG_H_ #include <kdialogbase.h> @@ -42,9 +42,10 @@ class QuantizeParameters; class QuantizeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - QuantizeDialog(TQWidget *parent, bool inNotation = false); + QuantizeDialog(TQWidget *tqparent, bool inNotation = false); /// Returned quantizer object is on heap -- caller must delete Quantizer *getQuantizer() const; diff --git a/src/gui/dialogs/RescaleDialog.cpp b/src/gui/dialogs/RescaleDialog.cpp index f47cafb..fdf5755 100644 --- a/src/gui/dialogs/RescaleDialog.cpp +++ b/src/gui/dialogs/RescaleDialog.cpp @@ -42,13 +42,13 @@ namespace Rosegarden { -RescaleDialog::RescaleDialog(TQWidget *parent, +RescaleDialog::RescaleDialog(TQWidget *tqparent, Composition *composition, timeT startTime, timeT originalDuration, bool showCloseGapOption, bool constrainToCompositionDuration) : - KDialogBase(parent, 0, true, i18n("Rescale"), User1 | Ok | Cancel) + KDialogBase(tqparent, 0, true, i18n("Rescale"), User1 | Ok | Cancel) { TQVBox *vbox = makeVBoxMainWidget(); @@ -58,7 +58,7 @@ RescaleDialog::RescaleDialog(TQWidget *parent, constrainToCompositionDuration); if (showCloseGapOption) { - TQGroupBox *optionBox = new TQGroupBox(1, Horizontal, i18n("Options"), vbox); + TQGroupBox *optionBox = new TQGroupBox(1, Qt::Horizontal, i18n("Options"), vbox); m_closeGap = new TQCheckBox(i18n("Adjust times of following events accordingly"), optionBox); KConfig *config = kapp->config(); diff --git a/src/gui/dialogs/RescaleDialog.h b/src/gui/dialogs/RescaleDialog.h index dedf1a1..0e6d285 100644 --- a/src/gui/dialogs/RescaleDialog.h +++ b/src/gui/dialogs/RescaleDialog.h @@ -44,9 +44,10 @@ class Composition; class RescaleDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - RescaleDialog(TQWidget *parent, + RescaleDialog(TQWidget *tqparent, Composition *composition, // for TimeWidget calculations timeT startTime, timeT originalDuration, diff --git a/src/gui/dialogs/ShowSequencerStatusDialog.cpp b/src/gui/dialogs/ShowSequencerStatusDialog.cpp index 240adfe..7afccf4 100644 --- a/src/gui/dialogs/ShowSequencerStatusDialog.cpp +++ b/src/gui/dialogs/ShowSequencerStatusDialog.cpp @@ -40,14 +40,14 @@ namespace Rosegarden { -ShowSequencerStatusDialog::ShowSequencerStatusDialog(TQWidget *parent) : - KDialogBase(parent, 0, true, i18n("Sequencer status"), Close) +ShowSequencerStatusDialog::ShowSequencerStatusDialog(TQWidget *tqparent) : + KDialogBase(tqparent, 0, true, i18n("Sequencer status"), Close) { TQVBox *vbox = makeVBoxMainWidget(); new TQLabel(i18n("Sequencer status:"), vbox); - TQString status(i18n("Status not available.")); + TQString status(i18n("tqStatus not available.")); TQCString replyType; TQByteArray replyData; @@ -67,7 +67,7 @@ ShowSequencerStatusDialog::ShowSequencerStatusDialog(TQWidget *parent) : } TQTextEdit *text = new TQTextEdit(vbox); - text->setTextFormat(Qt::PlainText); + text->setTextFormat(TQt::PlainText); text->setReadOnly(true); text->setMinimumWidth(500); text->setMinimumHeight(200); diff --git a/src/gui/dialogs/ShowSequencerStatusDialog.h b/src/gui/dialogs/ShowSequencerStatusDialog.h index 9b7ad41..ce66740 100644 --- a/src/gui/dialogs/ShowSequencerStatusDialog.h +++ b/src/gui/dialogs/ShowSequencerStatusDialog.h @@ -40,8 +40,9 @@ namespace Rosegarden class ShowSequencerStatusDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ShowSequencerStatusDialog(TQWidget *parent); + ShowSequencerStatusDialog(TQWidget *tqparent); }; diff --git a/src/gui/dialogs/SimpleEventEditDialog.cpp b/src/gui/dialogs/SimpleEventEditDialog.cpp index 152748a..98e4c4e 100644 --- a/src/gui/dialogs/SimpleEventEditDialog.cpp +++ b/src/gui/dialogs/SimpleEventEditDialog.cpp @@ -56,11 +56,11 @@ namespace Rosegarden { -SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, +SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *tqparent, RosegardenGUIDoc *doc, const Event &event, bool inserting) : - KDialogBase(parent, 0, true, + KDialogBase(tqparent, 0, true, i18n(inserting ? "Insert Event" : "Edit Event"), Ok | Cancel), m_event(event), m_doc(doc), @@ -71,21 +71,21 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, { TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *groupBox = new QGroupBox - (1, Horizontal, i18n("Event Properties"), vbox); + TQGroupBox *groupBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Event Properties"), vbox); TQFrame *frame = new TQFrame(groupBox); - TQGridLayout *layout = new TQGridLayout(frame, 7, 3, 5, 5); + TQGridLayout *tqlayout = new TQGridLayout(frame, 7, 3, 5, 5); - layout->addWidget(new TQLabel(i18n("Event type:"), frame), 0, 0); + tqlayout->addWidget(new TQLabel(i18n("Event type:"), frame), 0, 0); if (inserting) { m_typeLabel = 0; m_typeCombo = new KComboBox(frame); - layout->addWidget(m_typeCombo, 0, 1); + tqlayout->addWidget(m_typeCombo, 0, 1); m_typeCombo->insertItem(strtoqstr(Note::EventType)); m_typeCombo->insertItem(strtoqstr(Controller::EventType)); @@ -111,15 +111,15 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, m_typeCombo = 0; m_typeLabel = new TQLabel(frame); - layout->addWidget(m_typeLabel, 0, 1); + tqlayout->addWidget(m_typeLabel, 0, 1); } m_timeLabel = new TQLabel(i18n("Absolute time:"), frame); - layout->addWidget(m_timeLabel, 1, 0); + tqlayout->addWidget(m_timeLabel, 1, 0); m_timeSpinBox = new TQSpinBox(INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), frame); m_timeEditButton = new TQPushButton("edit", frame); - layout->addWidget(m_timeSpinBox, 1, 1); - layout->addWidget(m_timeEditButton, 1, 2); + tqlayout->addWidget(m_timeSpinBox, 1, 1); + tqlayout->addWidget(m_timeEditButton, 1, 2); connect(m_timeSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAbsoluteTimeChanged(int))); @@ -127,11 +127,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, TQT_SLOT(slotEditAbsoluteTime())); m_durationLabel = new TQLabel(i18n("Duration:"), frame); - layout->addWidget(m_durationLabel, 2, 0); + tqlayout->addWidget(m_durationLabel, 2, 0); m_durationSpinBox = new TQSpinBox(0, INT_MAX, Note(Note::Shortest).getDuration(), frame); m_durationEditButton = new TQPushButton("edit", frame); - layout->addWidget(m_durationSpinBox, 2, 1); - layout->addWidget(m_durationEditButton, 2, 2); + tqlayout->addWidget(m_durationSpinBox, 2, 1); + tqlayout->addWidget(m_durationEditButton, 2, 2); connect(m_durationSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDurationChanged(int))); @@ -139,11 +139,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, TQT_SLOT(slotEditDuration())); m_pitchLabel = new TQLabel(i18n("Pitch:"), frame); - layout->addWidget(m_pitchLabel, 3, 0); + tqlayout->addWidget(m_pitchLabel, 3, 0); m_pitchSpinBox = new TQSpinBox(frame); m_pitchEditButton = new TQPushButton("edit", frame); - layout->addWidget(m_pitchSpinBox, 3, 1); - layout->addWidget(m_pitchEditButton, 3, 2); + tqlayout->addWidget(m_pitchSpinBox, 3, 1); + tqlayout->addWidget(m_pitchEditButton, 3, 2); connect(m_pitchSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotPitchChanged(int))); @@ -155,15 +155,15 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, m_controllerLabel = new TQLabel(i18n("Controller name:"), frame); m_controllerLabelValue = new TQLabel(i18n("<none>"), frame); - m_controllerLabelValue->setAlignment(TQLabel::AlignRight); + m_controllerLabelValue->tqsetAlignment(TQLabel::AlignRight); - layout->addWidget(m_controllerLabel, 4, 0); - layout->addWidget(m_controllerLabelValue, 4, 1); + tqlayout->addWidget(m_controllerLabel, 4, 0); + tqlayout->addWidget(m_controllerLabelValue, 4, 1); m_velocityLabel = new TQLabel(i18n("Velocity:"), frame); - layout->addWidget(m_velocityLabel, 5, 0); + tqlayout->addWidget(m_velocityLabel, 5, 0); m_velocitySpinBox = new TQSpinBox(frame); - layout->addWidget(m_velocitySpinBox, 5, 1); + tqlayout->addWidget(m_velocitySpinBox, 5, 1); connect(m_velocitySpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotVelocityChanged(int))); @@ -172,14 +172,14 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, m_velocitySpinBox->setMaxValue(MidiMaxValue); m_metaLabel = new TQLabel(i18n("Meta string:"), frame); - layout->addWidget(m_metaLabel, 6, 0); + tqlayout->addWidget(m_metaLabel, 6, 0); m_metaEdit = new TQLineEdit(frame); - layout->addWidget(m_metaEdit, 6, 1); + tqlayout->addWidget(m_metaEdit, 6, 1); m_sysexLoadButton = new TQPushButton(i18n("Load data"), frame); - layout->addWidget(m_sysexLoadButton, 6, 2); + tqlayout->addWidget(m_sysexLoadButton, 6, 2); m_sysexSaveButton = new TQPushButton(i18n("Save data"), frame); - layout->addWidget(m_sysexSaveButton, 4, 2); + tqlayout->addWidget(m_sysexSaveButton, 4, 2); connect(m_metaEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotMetaChanged(const TQString &))); @@ -188,26 +188,26 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, connect(m_sysexSaveButton, TQT_SIGNAL(released()), TQT_SLOT(slotSysexSave())); - m_notationGroupBox = new QGroupBox - (1, Horizontal, i18n("Notation Properties"), vbox); + m_notationGroupBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Notation Properties"), vbox); frame = new TQFrame(m_notationGroupBox); - layout = new TQGridLayout(frame, 3, 3, 5, 5); + tqlayout = new TQGridLayout(frame, 3, 3, 5, 5); m_lockNotationValues = new TQCheckBox(i18n("Lock to changes in performed values"), frame); - layout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2); + tqlayout->addMultiCellWidget(m_lockNotationValues, 0, 0, 0, 2); m_lockNotationValues->setChecked(true); connect(m_lockNotationValues, TQT_SIGNAL(released()), TQT_SLOT(slotLockNotationChanged())); m_notationTimeLabel = new TQLabel(i18n("Notation time:"), frame); - layout->addWidget(m_notationTimeLabel, 1, 0); + tqlayout->addWidget(m_notationTimeLabel, 1, 0); m_notationTimeSpinBox = new TQSpinBox(INT_MIN, INT_MAX, Note(Note::Shortest).getDuration(), frame); m_notationTimeEditButton = new TQPushButton("edit", frame); - layout->addWidget(m_notationTimeSpinBox, 1, 1); - layout->addWidget(m_notationTimeEditButton, 1, 2); + tqlayout->addWidget(m_notationTimeSpinBox, 1, 1); + tqlayout->addWidget(m_notationTimeEditButton, 1, 2); connect(m_notationTimeSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotNotationAbsoluteTimeChanged(int))); @@ -215,11 +215,11 @@ SimpleEventEditDialog::SimpleEventEditDialog(TQWidget *parent, TQT_SLOT(slotEditNotationAbsoluteTime())); m_notationDurationLabel = new TQLabel(i18n("Notation duration:"), frame); - layout->addWidget(m_notationDurationLabel, 2, 0); + tqlayout->addWidget(m_notationDurationLabel, 2, 0); m_notationDurationSpinBox = new TQSpinBox(0, INT_MAX, Note(Note::Shortest).getDuration(), frame); m_notationDurationEditButton = new TQPushButton("edit", frame); - layout->addWidget(m_notationDurationSpinBox, 2, 1); - layout->addWidget(m_notationDurationEditButton, 2, 2); + tqlayout->addWidget(m_notationDurationSpinBox, 2, 1); + tqlayout->addWidget(m_notationDurationEditButton, 2, 2); connect(m_notationDurationSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotNotationDurationChanged(int))); diff --git a/src/gui/dialogs/SimpleEventEditDialog.h b/src/gui/dialogs/SimpleEventEditDialog.h index dcb1c60..5f709e7 100644 --- a/src/gui/dialogs/SimpleEventEditDialog.h +++ b/src/gui/dialogs/SimpleEventEditDialog.h @@ -51,8 +51,9 @@ class RosegardenGUIDoc; class SimpleEventEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SimpleEventEditDialog(TQWidget *parent, + SimpleEventEditDialog(TQWidget *tqparent, RosegardenGUIDoc *doc, const Event &event, bool inserting = false); // inserting or editing diff --git a/src/gui/dialogs/SplitByPitchDialog.cpp b/src/gui/dialogs/SplitByPitchDialog.cpp index 9ff3772..94d34f5 100644 --- a/src/gui/dialogs/SplitByPitchDialog.cpp +++ b/src/gui/dialogs/SplitByPitchDialog.cpp @@ -42,34 +42,34 @@ namespace Rosegarden { -SplitByPitchDialog::SplitByPitchDialog(TQWidget *parent) : - KDialogBase(parent, 0, true, i18n("Split by Pitch"), Ok | Cancel) +SplitByPitchDialog::SplitByPitchDialog(TQWidget *tqparent) : + KDialogBase(tqparent, 0, true, i18n("Split by Pitch"), Ok | Cancel) { TQVBox *vBox = makeVBoxMainWidget(); TQFrame *frame = new TQFrame(vBox); - TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 10, 5); + TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 10, 5); m_pitch = new PitchChooser(i18n("Starting split pitch"), frame, 60); - layout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, Qt::AlignHCenter); + tqlayout->addMultiCellWidget(m_pitch, 0, 0, 0, 2, TQt::AlignHCenter); m_range = new TQCheckBox(i18n("Range up and down to follow music"), frame); - layout->addMultiCellWidget(m_range, + tqlayout->addMultiCellWidget(m_range, 1, 1, // fromRow, toRow 0, 2 // fromCol, toCol ); m_duplicate = new TQCheckBox(i18n("Duplicate non-note events"), frame); - layout->addMultiCellWidget(m_duplicate, 2, 2, 0, 2); + tqlayout->addMultiCellWidget(m_duplicate, 2, 2, 0, 2); - layout->addWidget(new TQLabel(i18n("Clef handling:"), frame), 3, 0); + tqlayout->addWidget(new TQLabel(i18n("Clef handling:"), frame), 3, 0); m_clefs = new KComboBox(frame); m_clefs->insertItem(i18n("Leave clefs alone")); m_clefs->insertItem(i18n("Guess new clefs")); m_clefs->insertItem(i18n("Use treble and bass clefs")); - layout->addMultiCellWidget(m_clefs, 3, 3, 1, 2); + tqlayout->addMultiCellWidget(m_clefs, 3, 3, 1, 2); m_range->setChecked(true); m_duplicate->setChecked(true); diff --git a/src/gui/dialogs/SplitByPitchDialog.h b/src/gui/dialogs/SplitByPitchDialog.h index ada2c24..def9f01 100644 --- a/src/gui/dialogs/SplitByPitchDialog.h +++ b/src/gui/dialogs/SplitByPitchDialog.h @@ -43,8 +43,9 @@ class PitchChooser; class SplitByPitchDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SplitByPitchDialog(TQWidget *parent); + SplitByPitchDialog(TQWidget *tqparent); int getPitch(); diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp index 91b8629..bd3331b 100644 --- a/src/gui/dialogs/SplitByRecordingSrcDialog.cpp +++ b/src/gui/dialogs/SplitByRecordingSrcDialog.cpp @@ -44,31 +44,31 @@ namespace Rosegarden { -SplitByRecordingSrcDialog::SplitByRecordingSrcDialog(TQWidget *parent, RosegardenGUIDoc *doc) : - KDialogBase(parent, 0, true, i18n("Split by Recording Source"), Ok | Cancel ) +SplitByRecordingSrcDialog::SplitByRecordingSrcDialog(TQWidget *tqparent, RosegardenGUIDoc *doc) : + KDialogBase(tqparent, 0, true, i18n("Split by Recording Source"), Ok | Cancel ) { TQVBox *vBox = makeVBoxMainWidget(); - TQGroupBox *groupBox = new QGroupBox - (1, Horizontal, i18n("Recording Source"), vBox); + TQGroupBox *groupBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Recording Source"), vBox); TQFrame *frame = new TQFrame(groupBox); - TQGridLayout *layout = new TQGridLayout(frame, 2, 2, 10, 5); + TQGridLayout *tqlayout = new TQGridLayout(frame, 2, 2, 10, 5); - layout->addWidget(new TQLabel( i18n("Channel:"), frame ), 0, 0); + tqlayout->addWidget(new TQLabel( i18n("Channel:"), frame ), 0, 0); m_channel = new KComboBox( frame ); m_channel->setSizeLimit( 17 ); - layout->addWidget(m_channel, 0, 1); + tqlayout->addWidget(m_channel, 0, 1); TQSpacerItem *spacer = new TQSpacerItem( 1, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); - layout->addItem( spacer, 0, 2 ); + tqlayout->addItem( spacer, 0, 2 ); m_channel->insertItem(i18n("any")); for (int i = 1; i < 17; ++i) { m_channel->insertItem(TQString::number(i)); } - layout->addWidget(new TQLabel( i18n("Device:"), frame ), 1, 0); + tqlayout->addWidget(new TQLabel( i18n("Device:"), frame ), 1, 0); m_device = new KComboBox( frame ); - layout->addMultiCellWidget( m_device, 1, 1, 1, 2 ); + tqlayout->addMultiCellWidget( m_device, 1, 1, 1, 2 ); m_deviceIds.clear(); m_deviceIds.push_back( -1); diff --git a/src/gui/dialogs/SplitByRecordingSrcDialog.h b/src/gui/dialogs/SplitByRecordingSrcDialog.h index 851c3f9..dcf3080 100644 --- a/src/gui/dialogs/SplitByRecordingSrcDialog.h +++ b/src/gui/dialogs/SplitByRecordingSrcDialog.h @@ -44,8 +44,9 @@ class RosegardenGUIDoc; class SplitByRecordingSrcDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SplitByRecordingSrcDialog(TQWidget *parent, RosegardenGUIDoc *doc); + SplitByRecordingSrcDialog(TQWidget *tqparent, RosegardenGUIDoc *doc); int getChannel(); int getDevice(); diff --git a/src/gui/dialogs/TempoDialog.cpp b/src/gui/dialogs/TempoDialog.cpp index 1edab6b..6d2c716 100644 --- a/src/gui/dialogs/TempoDialog.cpp +++ b/src/gui/dialogs/TempoDialog.cpp @@ -51,30 +51,30 @@ namespace Rosegarden { -TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc, +TempoDialog::TempoDialog(TQWidget *tqparent, RosegardenGUIDoc *doc, bool timeEditable): - KDialogBase(parent, 0, true, i18n("Insert Tempo Change"), Ok | Cancel | Help), + KDialogBase(tqparent, 0, true, i18n("Insert Tempo Change"), Ok | Cancel | Help), m_doc(doc), m_tempoTime(0) { setHelp("tempo"); TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *groupBox = new TQGroupBox(1, Horizontal, i18n("Tempo"), vbox); + TQGroupBox *groupBox = new TQGroupBox(1, Qt::Horizontal, i18n("Tempo"), vbox); TQFrame *frame = new TQFrame(groupBox); - TQGridLayout *layout = new TQGridLayout(frame, 4, 3, 5, 5); + TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 3, 5, 5); // Set tempo - layout->addWidget(new TQLabel(i18n("New tempo:"), frame), 0, 1); + tqlayout->addWidget(new TQLabel(i18n("New tempo:"), frame), 0, 1); m_tempoValueSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5); - layout->addWidget(m_tempoValueSpinBox, 0, 2); + tqlayout->addWidget(m_tempoValueSpinBox, 0, 2); connect(m_tempoValueSpinBox, TQT_SIGNAL(valueChanged(const TQString &)), TQT_SLOT(slotTempoChanged(const TQString &))); m_tempoTap= new TQPushButton(i18n("Tap"), frame); - layout->addWidget(m_tempoTap, 0, 3); + tqlayout->addWidget(m_tempoTap, 0, 3); connect(m_tempoTap, TQT_SIGNAL(clicked()), TQT_SLOT(slotTapClicked())); @@ -85,13 +85,13 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc, // m_tempoTargetCheckBox = new TQCheckBox(i18n("Ramping to:"), frame); m_tempoTargetSpinBox = new HSpinBox(frame, 0, 100000, 0.0, 1000.0, 5); - // layout->addMultiCellWidget(m_tempoTargetCheckBox, 1, 1, 0, 1, AlignRight); - // layout->addWidget(m_tempoTargetSpinBox, 1, 2); + // tqlayout->addMultiCellWidget(m_tempoTargetCheckBox, 1, 1, 0, 1, AlignRight); + // tqlayout->addWidget(m_tempoTargetSpinBox, 1, 2); - layout->addMultiCellWidget(m_tempoConstant, 1, 1, 1, 2); - layout->addMultiCellWidget(m_tempoRampToNext, 2, 2, 1, 2); - layout->addWidget(m_tempoRampToTarget, 3, 1); - layout->addWidget(m_tempoTargetSpinBox, 3, 2); + tqlayout->addMultiCellWidget(m_tempoConstant, 1, 1, 1, 2); + tqlayout->addMultiCellWidget(m_tempoRampToNext, 2, 2, 1, 2); + tqlayout->addWidget(m_tempoRampToTarget, 3, 1); + tqlayout->addWidget(m_tempoTargetSpinBox, 3, 2); // connect(m_tempoTargetCheckBox, TQT_SIGNAL(clicked()), // TQT_SLOT(slotTargetCheckBoxClicked())); @@ -105,13 +105,13 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc, TQT_SLOT(slotTargetChanged(const TQString &))); m_tempoBeatLabel = new TQLabel(frame); - layout->addWidget(m_tempoBeatLabel, 0, 4); + tqlayout->addWidget(m_tempoBeatLabel, 0, 4); m_tempoBeat = new TQLabel(frame); - layout->addWidget(m_tempoBeat, 0, 5); + tqlayout->addWidget(m_tempoBeat, 0, 5); m_tempoBeatsPerMinute = new TQLabel(frame); - layout->addWidget(m_tempoBeatsPerMinute, 0, 6); + tqlayout->addWidget(m_tempoBeatsPerMinute, 0, 6); m_timeEditor = 0; @@ -124,7 +124,7 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc, } // Scope Box - TQButtonGroup *scopeGroup = new TQButtonGroup(1, Horizontal, + TQButtonGroup *scopeGroup = new TQButtonGroup(1, Qt::Horizontal, i18n("Scope"), vbox); // new TQLabel(scopeBox); @@ -150,25 +150,25 @@ TempoDialog::TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc, TQVBox *changeWhereVBox = new TQVBox(changeWhereBox); changeWhereBox->setStretchFactor(changeWhereVBox, 20); - m_tempoChangeHere = new QRadioButton + m_tempoChangeHere = new TQRadioButton (i18n("Apply this tempo from here onwards"), changeWhereVBox); - m_tempoChangeBefore = new QRadioButton + m_tempoChangeBefore = new TQRadioButton (i18n("Replace the last tempo change"), changeWhereVBox); m_tempoChangeBeforeAt = new TQLabel(changeWhereVBox); m_tempoChangeBeforeAt->hide(); - m_tempoChangeStartOfBar = new QRadioButton + m_tempoChangeStartOfBar = new TQRadioButton (i18n("Apply this tempo from the start of this bar"), changeWhereVBox); - m_tempoChangeGlobal = new QRadioButton + m_tempoChangeGlobal = new TQRadioButton (i18n("Apply this tempo to the whole composition"), changeWhereVBox); TQHBox *optionHBox = new TQHBox(changeWhereVBox); new TQLabel(" ", optionHBox); - m_defaultBox = new QCheckBox + m_defaultBox = new TQCheckBox (i18n("Also make this the default tempo"), optionHBox); spare = new TQLabel(optionHBox); optionHBox->setStretchFactor(spare, 20); @@ -253,17 +253,17 @@ TempoDialog::populateTempo() RealTime tempoTime = comp.getElapsedRealTime(m_tempoTime); TQString milliSeconds; milliSeconds.sprintf("%03d", tempoTime.msec()); - m_tempoTimeLabel->setText(i18n("%1.%2 s,").arg(tempoTime.sec) - .arg(milliSeconds)); + m_tempoTimeLabel->setText(i18n("%1.%2 s,").tqarg(tempoTime.sec) + .tqarg(milliSeconds)); int barNo = comp.getBarNumber(m_tempoTime); if (comp.getBarStart(barNo) == m_tempoTime) { m_tempoBarLabel->setText - (i18n("at the start of measure %1.").arg(barNo + 1)); + (i18n("at the start of measure %1.").tqarg(barNo + 1)); m_tempoChangeStartOfBar->setEnabled(false); } else { m_tempoBarLabel->setText( - i18n("in the middle of measure %1.").arg(barNo + 1)); + i18n("in the middle of measure %1.").tqarg(barNo + 1)); m_tempoChangeStartOfBar->setEnabled(true); } @@ -282,8 +282,8 @@ TempoDialog::populateTempo() lastms.sprintf("%03d", lastRT.msec()); int lastBar = comp.getBarNumber(lastTempoTime); m_tempoChangeBeforeAt->setText - (i18n(" (at %1.%2 s, in measure %3)").arg(lastRT.sec) - .arg(lastms).arg(lastBar + 1)); + (i18n(" (at %1.%2 s, in measure %3)").tqarg(lastRT.sec) + .tqarg(lastms).tqarg(lastBar + 1)); m_tempoChangeBeforeAt->show(); m_tempoChangeBefore->setEnabled(true); @@ -334,11 +334,11 @@ TempoDialog::updateBeatLabels(double qpm) m_tempoBeatLabel->setText(" "); timeT error = 0; - m_tempoBeat->setPixmap(NotePixmapFactory::toQPixmap + m_tempoBeat->setPixmap(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeNoteMenuPixmap(beat, error))); m_tempoBeat->setMaximumWidth(25); if (error) - m_tempoBeat->setPixmap(NotePixmapFactory::toQPixmap + m_tempoBeat->setPixmap(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeToolbarPixmap ("menu-no-note"))); diff --git a/src/gui/dialogs/TempoDialog.h b/src/gui/dialogs/TempoDialog.h index db26ce7..0131d32 100644 --- a/src/gui/dialogs/TempoDialog.h +++ b/src/gui/dialogs/TempoDialog.h @@ -51,6 +51,7 @@ class HSpinBox; class TempoDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum TempoDialogAction { AddTempo, @@ -60,7 +61,7 @@ public: GlobalTempoWithDefault }; - TempoDialog(TQWidget *parent, RosegardenGUIDoc *doc, + TempoDialog(TQWidget *tqparent, RosegardenGUIDoc *doc, bool timeEditable = false); ~TempoDialog(); diff --git a/src/gui/dialogs/TextEventDialog.cpp b/src/gui/dialogs/TextEventDialog.cpp index ef02fbd..756edf0 100644 --- a/src/gui/dialogs/TextEventDialog.cpp +++ b/src/gui/dialogs/TextEventDialog.cpp @@ -50,11 +50,11 @@ namespace Rosegarden { -TextEventDialog::TextEventDialog(TQWidget *parent, +TextEventDialog::TextEventDialog(TQWidget *tqparent, NotePixmapFactory *npf, Text defaultText, int maxLength) : - KDialogBase(parent, 0, true, i18n("Text"), Ok | Cancel | Help), + KDialogBase(tqparent, 0, true, i18n("Text"), Ok | Cancel | Help), m_notePixmapFactory(npf), m_styles(Text::getUserStyles()) /*, //m_directives(Text::getLilyPondDirectives()) */ @@ -62,12 +62,12 @@ TextEventDialog::TextEventDialog(TQWidget *parent, setHelp("nv-text"); TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *entryBox = new QGroupBox - (1, Horizontal, i18n("Specification"), vbox); - TQGroupBox *exampleBox = new QGroupBox - (1, Horizontal, i18n("Preview"), vbox); + TQGroupBox *entryBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Specification"), vbox); + TQGroupBox *exampleBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Preview"), vbox); - TQGrid *entryGrid = new TQGrid(2, TQGrid::Horizontal, entryBox); + TQGrid *entryGrid = new TQGrid(2, Qt::Horizontal, entryBox); new TQLabel(i18n("Text: "), entryGrid); m_text = new TQLineEdit(entryGrid); @@ -261,20 +261,20 @@ TextEventDialog::TextEventDialog(TQWidget *parent, // not i18nable, because the directive exporter currently depends on the // textual contents of these strings, not some more abstract associated // type label - m_lilyPondDirectiveCombo->insertItem(Text::Segno); - m_lilyPondDirectiveCombo->insertItem(Text::Coda); - m_lilyPondDirectiveCombo->insertItem(Text::Alternate1); - m_lilyPondDirectiveCombo->insertItem(Text::Alternate2); - m_lilyPondDirectiveCombo->insertItem(Text::BarDouble); - m_lilyPondDirectiveCombo->insertItem(Text::BarEnd); - m_lilyPondDirectiveCombo->insertItem(Text::BarDot); - m_lilyPondDirectiveCombo->insertItem(Text::Gliss); - m_lilyPondDirectiveCombo->insertItem(Text::Arpeggio); - // m_lilyPondDirectiveCombo->insertItem(Text::ArpeggioUp); - // m_lilyPondDirectiveCombo->insertItem(Text::ArpeggioDn); - m_lilyPondDirectiveCombo->insertItem(Text::Tiny); - m_lilyPondDirectiveCombo->insertItem(Text::Small); - m_lilyPondDirectiveCombo->insertItem(Text::NormalSize); + m_lilyPondDirectiveCombo->insertItem(Text::Segno.c_str()); + m_lilyPondDirectiveCombo->insertItem(Text::Coda.c_str()); + m_lilyPondDirectiveCombo->insertItem(Text::Alternate1.c_str()); + m_lilyPondDirectiveCombo->insertItem(Text::Alternate2.c_str()); + m_lilyPondDirectiveCombo->insertItem(Text::BarDouble.c_str()); + m_lilyPondDirectiveCombo->insertItem(Text::BarEnd.c_str()); + m_lilyPondDirectiveCombo->insertItem(Text::BarDot.c_str()); + m_lilyPondDirectiveCombo->insertItem(Text::Gliss.c_str()); + m_lilyPondDirectiveCombo->insertItem(Text::Arpeggio.c_str()); + // m_lilyPondDirectiveCombo->insertItem(Text::ArpeggioUp.c_str()); + // m_lilyPondDirectiveCombo->insertItem(Text::ArpeggioDn.c_str()); + m_lilyPondDirectiveCombo->insertItem(Text::Tiny.c_str()); + m_lilyPondDirectiveCombo->insertItem(Text::Small.c_str()); + m_lilyPondDirectiveCombo->insertItem(Text::NormalSize.c_str()); TQVBox *exampleVBox = new TQVBox(exampleBox); @@ -282,18 +282,18 @@ TextEventDialog::TextEventDialog(TQWidget *parent, int mapWidth = 200; TQPixmap map(mapWidth, ls * 5 + 1); - TQBitmap mask(mapWidth, ls * 5 + 1); + TQBitmap tqmask(mapWidth, ls * 5 + 1); map.fill(); - mask.fill(Qt::color0); + tqmask.fill(TQt::color0); TQPainter p, pm; p.begin(&map); - pm.begin(&mask); + pm.begin(&tqmask); - p.setPen(Qt::black); - pm.setPen(Qt::white); + p.setPen(TQt::black); + pm.setPen(TQt::white); for (int i = 0; i < 5; ++i) { @@ -304,7 +304,7 @@ TextEventDialog::TextEventDialog(TQWidget *parent, p.end(); pm.end(); - map.setMask(mask); + map.setMask(tqmask); m_staffAboveLabel = new TQLabel("staff", exampleVBox); m_staffAboveLabel->setPixmap(map); @@ -392,7 +392,7 @@ TextEventDialog::slotTextChanged(const TQString &qtext) Text rtext(text, type); m_textExampleLabel->setPixmap - (NotePixmapFactory::toQPixmap(m_notePixmapFactory->makeTextPixmap(rtext))); + (NotePixmapFactory::toTQPixmap(m_notePixmapFactory->makeTextPixmap(rtext))); } void @@ -409,7 +409,7 @@ TextEventDialog::slotTypeChanged(const TQString &) Text rtext(text, type); m_textExampleLabel->setPixmap - (NotePixmapFactory::toQPixmap(m_notePixmapFactory->makeTextPixmap(rtext))); + (NotePixmapFactory::toTQPixmap(m_notePixmapFactory->makeTextPixmap(rtext))); // // swap widgets in and out, depending on the current text type @@ -417,7 +417,7 @@ TextEventDialog::slotTypeChanged(const TQString &) if (type == Text::Dynamic) { m_dynamicShortcutLabel->show(); m_dynamicShortcutCombo->show(); - slotDynamicShortcutChanged(text); + slotDynamicShortcutChanged(text.c_str()); } else { m_dynamicShortcutLabel->hide(); m_dynamicShortcutCombo->hide(); @@ -426,7 +426,7 @@ TextEventDialog::slotTypeChanged(const TQString &) if (type == Text::Direction) { m_directionShortcutLabel->show(); m_directionShortcutCombo->show(); - slotDirectionShortcutChanged(text); + slotDirectionShortcutChanged(text.c_str()); } else { m_directionShortcutLabel->hide(); m_directionShortcutCombo->hide(); @@ -435,7 +435,7 @@ TextEventDialog::slotTypeChanged(const TQString &) if (type == Text::LocalDirection) { m_localDirectionShortcutLabel->show(); m_localDirectionShortcutCombo->show(); - slotLocalDirectionShortcutChanged(text); + slotLocalDirectionShortcutChanged(text.c_str()); } else { m_localDirectionShortcutLabel->hide(); m_localDirectionShortcutCombo->hide(); @@ -444,7 +444,7 @@ TextEventDialog::slotTypeChanged(const TQString &) if (type == Text::Tempo) { m_tempoShortcutLabel->show(); m_tempoShortcutCombo->show(); - slotTempoShortcutChanged(text); + slotTempoShortcutChanged(text.c_str()); } else { m_tempoShortcutLabel->hide(); m_tempoShortcutCombo->hide(); @@ -453,7 +453,7 @@ TextEventDialog::slotTypeChanged(const TQString &) if (type == Text::LocalTempo) { m_localTempoShortcutLabel->show(); m_localTempoShortcutCombo->show(); - slotLocalTempoShortcutChanged(text); + slotLocalTempoShortcutChanged(text.c_str()); } else { m_localTempoShortcutLabel->hide(); m_localTempoShortcutCombo->hide(); @@ -478,7 +478,7 @@ TextEventDialog::slotTypeChanged(const TQString &) m_staffBelowLabel->show(); m_text->setReadOnly(true); m_text->setEnabled(false); - slotLilyPondDirectiveChanged(text); + slotLilyPondDirectiveChanged(text.c_str()); } else { m_lilyPondDirectiveCombo->hide(); m_directiveLabel->hide(); @@ -537,7 +537,7 @@ void TextEventDialog::slotDynamicShortcutChanged(const TQString &text) { if (text == "" || text == "Sample") { - m_text->setText(strtoqstr(m_dynamicShortcutCombo->currentText())); + m_text->setText((m_dynamicShortcutCombo->currentText())); } else { m_text->setText(text); } @@ -547,7 +547,7 @@ void TextEventDialog::slotDirectionShortcutChanged(const TQString &text) { if (text == "" || text == "Sample") { - m_text->setText(strtoqstr(m_directionShortcutCombo->currentText())); + m_text->setText((m_directionShortcutCombo->currentText())); } else { m_text->setText(text); } @@ -557,7 +557,7 @@ void TextEventDialog::slotLocalDirectionShortcutChanged(const TQString &text) { if (text == "" || text == "Sample") { - m_text->setText(strtoqstr(m_localDirectionShortcutCombo->currentText())); + m_text->setText((m_localDirectionShortcutCombo->currentText())); } else { m_text->setText(text); } @@ -567,7 +567,7 @@ void TextEventDialog::slotTempoShortcutChanged(const TQString &text) { if (text == "" || text == "Sample") { - m_text->setText(strtoqstr(m_tempoShortcutCombo->currentText())); + m_text->setText((m_tempoShortcutCombo->currentText())); } else { m_text->setText(text); } @@ -577,7 +577,7 @@ void TextEventDialog::slotLocalTempoShortcutChanged(const TQString &text) { if (text == "" || text == "Sample") { - m_text->setText(strtoqstr(m_localTempoShortcutCombo->currentText())); + m_text->setText((m_localTempoShortcutCombo->currentText())); } else { m_text->setText(text); } @@ -586,7 +586,7 @@ TextEventDialog::slotLocalTempoShortcutChanged(const TQString &text) void TextEventDialog::slotLilyPondDirectiveChanged(const TQString &) { - m_text->setText(strtoqstr(m_lilyPondDirectiveCombo->currentText())); + m_text->setText((m_lilyPondDirectiveCombo->currentText())); } } diff --git a/src/gui/dialogs/TextEventDialog.h b/src/gui/dialogs/TextEventDialog.h index d74fb00..fa8419c 100644 --- a/src/gui/dialogs/TextEventDialog.h +++ b/src/gui/dialogs/TextEventDialog.h @@ -48,12 +48,13 @@ class NotePixmapFactory; class TextEventDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TextEventDialog(TQWidget *parent, + TextEventDialog(TQWidget *tqparent, NotePixmapFactory *npf, Text defaultText, - int maxLength = -1); // for Qt default + int maxLength = -1); // for TQt default Text getText() const; diff --git a/src/gui/dialogs/TimeDialog.cpp b/src/gui/dialogs/TimeDialog.cpp index d4eb4b6..3dc78e3 100644 --- a/src/gui/dialogs/TimeDialog.cpp +++ b/src/gui/dialogs/TimeDialog.cpp @@ -37,11 +37,11 @@ namespace Rosegarden { -TimeDialog::TimeDialog(TQWidget *parent, TQString title, +TimeDialog::TimeDialog(TQWidget *tqparent, TQString title, Composition *composition, timeT defaultTime, bool constrainToCompositionDuration) : - KDialogBase(parent, 0, true, title, User1 | Ok | Cancel) + KDialogBase(tqparent, 0, true, title, User1 | Ok | Cancel) { TQVBox *vbox = makeVBoxMainWidget(); m_timeWidget = new TimeWidget @@ -53,12 +53,12 @@ TimeDialog::TimeDialog(TQWidget *parent, TQString title, m_timeWidget, TQT_SLOT(slotResetToDefault())); } -TimeDialog::TimeDialog(TQWidget *parent, TQString title, +TimeDialog::TimeDialog(TQWidget *tqparent, TQString title, Composition *composition, timeT startTime, timeT defaultTime, bool constrainToCompositionDuration) : - KDialogBase(parent, 0, true, title, User1 | Ok | Cancel) + KDialogBase(tqparent, 0, true, title, User1 | Ok | Cancel) { TQVBox *vbox = makeVBoxMainWidget(); m_timeWidget = new TimeWidget diff --git a/src/gui/dialogs/TimeDialog.h b/src/gui/dialogs/TimeDialog.h index d418234..ec246d3 100644 --- a/src/gui/dialogs/TimeDialog.h +++ b/src/gui/dialogs/TimeDialog.h @@ -44,13 +44,14 @@ class Composition; class TimeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /// for absolute times - TimeDialog(TQWidget *parent, TQString title, Composition *composition, + TimeDialog(TQWidget *tqparent, TQString title, Composition *composition, timeT defaultTime, bool constrainToCompositionDuration); /// for durations - TimeDialog(TQWidget *parent, TQString title, Composition *composition, + TimeDialog(TQWidget *tqparent, TQString title, Composition *composition, timeT startTime, timeT defaultDuration, bool constrainToCompositionDuration); diff --git a/src/gui/dialogs/TimeSignatureDialog.cpp b/src/gui/dialogs/TimeSignatureDialog.cpp index 1e0dca8..99d4830 100644 --- a/src/gui/dialogs/TimeSignatureDialog.cpp +++ b/src/gui/dialogs/TimeSignatureDialog.cpp @@ -50,13 +50,13 @@ namespace Rosegarden { -TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, +TimeSignatureDialog::TimeSignatureDialog(TQWidget *tqparent, Composition *composition, timeT insertionTime, TimeSignature sig, bool timeEditable, TQString explanatoryText) : - KDialogBase(parent, 0, true, i18n("Time Signature"), Ok | Cancel | Help), + KDialogBase(tqparent, 0, true, i18n("Time Signature"), Ok | Cancel | Help), m_composition(composition), m_timeSignature(sig), m_time(insertionTime), @@ -78,8 +78,8 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, } TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *groupBox = new QGroupBox - (1, Horizontal, i18n("Time signature"), vbox); + TQGroupBox *groupBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Time signature"), vbox); TQHBox *numBox = new TQHBox(groupBox); TQHBox *denomBox = new TQHBox(groupBox); @@ -91,13 +91,13 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, BigArrowButton *numDown = new BigArrowButton(numBox, Qt::LeftArrow); BigArrowButton *denomDown = new BigArrowButton(denomBox, Qt::LeftArrow); - m_numLabel = new QLabel - (TQString("%1").arg(m_timeSignature.getNumerator()), numBox); - m_denomLabel = new QLabel - (TQString("%1").arg(m_timeSignature.getDenominator()), denomBox); + m_numLabel = new TQLabel + (TQString("%1").tqarg(m_timeSignature.getNumerator()), numBox); + m_denomLabel = new TQLabel + (TQString("%1").tqarg(m_timeSignature.getDenominator()), denomBox); - m_numLabel->setAlignment(AlignHCenter | AlignVCenter); - m_denomLabel->setAlignment(AlignHCenter | AlignVCenter); + m_numLabel->tqsetAlignment(AlignHCenter | AlignVCenter); + m_denomLabel->tqsetAlignment(AlignHCenter | AlignVCenter); m_numLabel->setFont(*timeSigFont); m_denomLabel->setFont(*timeSigFont); @@ -126,7 +126,7 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, m_timeEditor = 0; - groupBox = new TQButtonGroup(1, Horizontal, i18n("Scope"), vbox); + groupBox = new TQButtonGroup(1, Qt::Horizontal, i18n("Scope"), vbox); int barNo = composition->getBarNumber(m_time); bool atStartOfBar = (m_time == composition->getBarStart(barNo)); @@ -137,57 +137,57 @@ TimeSignatureDialog::TimeSignatureDialog(TQWidget *parent, if (barNo != 0 || !atStartOfBar) { if (atStartOfBar) { - scopeText = QString + scopeText = TQString (i18n("Insertion point is at start of measure %1.")) - .arg(barNo + 1); + .tqarg(barNo + 1); } else { - scopeText = QString + scopeText = TQString (i18n("Insertion point is in the middle of measure %1.")) - .arg(barNo + 1); + .tqarg(barNo + 1); } } else { - scopeText = QString + scopeText = TQString (i18n("Insertion point is at start of composition.")); } new TQLabel(scopeText, groupBox); - m_asGivenButton = new QRadioButton - (i18n("Start measure %1 here").arg(barNo + 2), groupBox); + m_asGivenButton = new TQRadioButton + (i18n("Start measure %1 here").tqarg(barNo + 2), groupBox); if (!atStartOfBar) { - m_startOfBarButton = new QRadioButton + m_startOfBarButton = new TQRadioButton (i18n("Change time from start of measure %1") - .arg(barNo + 1), groupBox); + .tqarg(barNo + 1), groupBox); m_startOfBarButton->setChecked(true); } else { m_asGivenButton->setChecked(true); } } else { new TQLabel(i18n("Time change will take effect at the start of measure %1.") - .arg(barNo + 1), groupBox); + .tqarg(barNo + 1), groupBox); } } - groupBox = new TQGroupBox(1, Horizontal, i18n("Options"), vbox); + groupBox = new TQGroupBox(1, Qt::Horizontal, i18n("Options"), vbox); KConfig *config = kapp->config(); config->setGroup(GeneralOptionsConfigGroup); - m_hideSignatureButton = new QCheckBox + m_hideSignatureButton = new TQCheckBox (i18n("Hide the time signature"), groupBox); m_hideSignatureButton->setChecked (config->readBoolEntry("timesigdialogmakehidden", false)); - m_hideBarsButton = new QCheckBox + m_hideBarsButton = new TQCheckBox (i18n("Hide the affected bar lines"), groupBox); m_hideBarsButton->setChecked (config->readBoolEntry("timesigdialogmakehiddenbars", false)); - m_commonTimeButton = new QCheckBox + m_commonTimeButton = new TQCheckBox (i18n("Show as common time"), groupBox); m_commonTimeButton->setChecked (config->readBoolEntry("timesigdialogshowcommon", true)); - m_normalizeRestsButton = new QCheckBox + m_normalizeRestsButton = new TQCheckBox (i18n("Correct the durations of following measures"), groupBox); m_normalizeRestsButton->setChecked (config->readBoolEntry("timesigdialognormalize", true)); @@ -231,7 +231,7 @@ TimeSignatureDialog::slotNumDown() int n = m_timeSignature.getNumerator(); if (--n >= 1) { m_timeSignature = TimeSignature(n, m_timeSignature.getDenominator()); - m_numLabel->setText(TQString("%1").arg(n)); + m_numLabel->setText(TQString("%1").tqarg(n)); } slotUpdateCommonTimeButton(); } @@ -242,7 +242,7 @@ TimeSignatureDialog::slotNumUp() int n = m_timeSignature.getNumerator(); if (++n <= 99) { m_timeSignature = TimeSignature(n, m_timeSignature.getDenominator()); - m_numLabel->setText(TQString("%1").arg(n)); + m_numLabel->setText(TQString("%1").tqarg(n)); } slotUpdateCommonTimeButton(); } @@ -253,7 +253,7 @@ TimeSignatureDialog::slotDenomDown() int n = m_timeSignature.getDenominator(); if ((n /= 2) >= 1) { m_timeSignature = TimeSignature(m_timeSignature.getNumerator(), n); - m_denomLabel->setText(TQString("%1").arg(n)); + m_denomLabel->setText(TQString("%1").tqarg(n)); } slotUpdateCommonTimeButton(); } @@ -264,7 +264,7 @@ TimeSignatureDialog::slotDenomUp() int n = m_timeSignature.getDenominator(); if ((n *= 2) <= 64) { m_timeSignature = TimeSignature(m_timeSignature.getNumerator(), n); - m_denomLabel->setText(TQString("%1").arg(n)); + m_denomLabel->setText(TQString("%1").tqarg(n)); } slotUpdateCommonTimeButton(); } diff --git a/src/gui/dialogs/TimeSignatureDialog.h b/src/gui/dialogs/TimeSignatureDialog.h index 5326f71..fd97c69 100644 --- a/src/gui/dialogs/TimeSignatureDialog.h +++ b/src/gui/dialogs/TimeSignatureDialog.h @@ -48,9 +48,10 @@ class Composition; class TimeSignatureDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TimeSignatureDialog(TQWidget *parent, + TimeSignatureDialog(TQWidget *tqparent, Composition *composition, timeT insertionTime, TimeSignature defaultSig = diff --git a/src/gui/dialogs/TransportDialog.cpp b/src/gui/dialogs/TransportDialog.cpp index a632469..85d311b 100644 --- a/src/gui/dialogs/TransportDialog.cpp +++ b/src/gui/dialogs/TransportDialog.cpp @@ -57,10 +57,10 @@ namespace Rosegarden { -TransportDialog::TransportDialog(TQWidget *parent, +TransportDialog::TransportDialog(TQWidget *tqparent, const char *name, WFlags flags): - TQWidget(parent, name, WType_TopLevel | WStyle_DialogBorder | WStyle_Minimize | WStyle_SysMenu | WDestructiveClose), + TQWidget(tqparent, name, WType_TopLevel | WStyle_DialogBorder | WStyle_Minimize | WStyle_SysMenu | WDestructiveClose), m_transport(0), m_lastTenHours(0), m_lastUnitHours(0), @@ -95,22 +95,22 @@ TransportDialog::TransportDialog(TQWidget *parent, // set the LCD frame background to black // - m_transport->LCDBoxFrame->setBackgroundColor(Qt::black); + m_transport->LCDBoxFrame->setBackgroundColor(TQt::black); // set all the pixmap backgrounds to black to avoid // flickering when we update // - m_transport->TenThousandthsPixmap->setBackgroundColor(Qt::black); - m_transport->ThousandthsPixmap->setBackgroundColor(Qt::black); - m_transport->HundredthsPixmap->setBackgroundColor(Qt::black); - m_transport->TenthsPixmap->setBackgroundColor(Qt::black); - m_transport->UnitSecondsPixmap->setBackgroundColor(Qt::black); - m_transport->TenSecondsPixmap->setBackgroundColor(Qt::black); - m_transport->UnitMinutesPixmap->setBackgroundColor(Qt::black); - m_transport->TenMinutesPixmap->setBackgroundColor(Qt::black); - m_transport->UnitHoursPixmap->setBackgroundColor(Qt::black); - m_transport->TenHoursPixmap->setBackgroundColor(Qt::black); - m_transport->NegativePixmap->setBackgroundColor(Qt::black); + m_transport->TenThousandthsPixmap->setBackgroundColor(TQt::black); + m_transport->ThousandthsPixmap->setBackgroundColor(TQt::black); + m_transport->HundredthsPixmap->setBackgroundColor(TQt::black); + m_transport->TenthsPixmap->setBackgroundColor(TQt::black); + m_transport->UnitSecondsPixmap->setBackgroundColor(TQt::black); + m_transport->TenSecondsPixmap->setBackgroundColor(TQt::black); + m_transport->UnitMinutesPixmap->setBackgroundColor(TQt::black); + m_transport->TenMinutesPixmap->setBackgroundColor(TQt::black); + m_transport->UnitHoursPixmap->setBackgroundColor(TQt::black); + m_transport->TenHoursPixmap->setBackgroundColor(TQt::black); + m_transport->NegativePixmap->setBackgroundColor(TQt::black); // unset the negative sign to begin with m_transport->NegativePixmap->clear(); @@ -206,10 +206,10 @@ TransportDialog::TransportDialog(TQWidget *parent, pal.setColor(TQColorGroup::Foreground, TQColor(192, 216, 255)); m_transport->TempoDisplay->setPalette(pal); - m_transport->TempoDisplay->setAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); + m_transport->TempoDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); m_transport->TimeSigDisplay->setPalette(pal); - m_transport->TimeSigDisplay->setAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); + m_transport->TimeSigDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); TQFont localFont(m_transport->OutDisplay->font() ); localFont.setFamily( "lucida" ); @@ -344,7 +344,7 @@ TransportDialog::loadPixmaps() TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); for (int i = 0; i < 10; i++) { - fileName = TQString("%1/transport/led-%2.xpm").arg(pixmapDir).arg(i); + fileName = TQString("%1/transport/led-%2.xpm").tqarg(pixmapDir).tqarg(i); if (!m_lcdList[i].load(fileName)) { std::cerr << "TransportDialog - failed to load pixmap \"" << fileName << "\"" << std::endl; @@ -353,7 +353,7 @@ TransportDialog::loadPixmaps() // Load the "negative" sign pixmap // - fileName = TQString("%1/transport/led--.xpm").arg(pixmapDir); + fileName = TQString("%1/transport/led--.xpm").tqarg(pixmapDir); m_lcdNegative.load(fileName); } @@ -479,7 +479,7 @@ TransportDialog::displayTime() case FrameMode: m_clearMetronomeTimer->stop(); - m_transport->TimeDisplayLabel->setText(TQString("%1").arg(m_sampleRate)); + m_transport->TimeDisplayLabel->setText(TQString("%1").tqarg(m_sampleRate)); m_transport->TimeDisplayLabel->show(); break; } @@ -727,9 +727,9 @@ TransportDialog::displayBarTime(int bar, int beat, int unit) if (m_currentMode == BarMetronomeMode && unit < 2) { if (beat == 1) { - slotSetBackground(Qt::red); + slotSetBackground(TQt::red); } else { - slotSetBackground(Qt::cyan); + slotSetBackground(TQt::cyan); } } else { slotResetBackground(); @@ -916,8 +916,8 @@ TransportDialog::setMidiInLabel(const MappedEvent *mE) MidiPitchLabel mPL(mE->getPitch()); m_transport->InDisplay->setText - (mPL.getQString() + - TQString(" %1").arg(mE->getVelocity())); + (mPL.getTQString() + + TQString(" %1").tqarg(mE->getVelocity())); } break; @@ -976,8 +976,8 @@ TransportDialog::setMidiOutLabel(const MappedEvent *mE) { MidiPitchLabel mPL(mE->getPitch()); m_transport->OutDisplay->setText - (mPL.getQString() + - TQString(" %1").arg(mE->getVelocity())); + (mPL.getTQString() + + TQString(" %1").tqarg(mE->getVelocity())); } break; @@ -1133,8 +1133,8 @@ TransportDialog::slotSetBackground(TQColor c) /* this is a bit more thorough, but too slow and flickery: - const TQObjectList *children = m_transport->LCDBoxFrame->tqchildren(); - TQObjectListIt it(*children); + const TQObjectList *tqchildren = m_transport->LCDBoxFrame->tqchildren(); + TQObjectListIt it(*tqchildren); TQObject *obj; while ((obj = it.current()) != 0) { diff --git a/src/gui/dialogs/TransportDialog.h b/src/gui/dialogs/TransportDialog.h index 48de68c..46eb1a9 100644 --- a/src/gui/dialogs/TransportDialog.h +++ b/src/gui/dialogs/TransportDialog.h @@ -48,14 +48,15 @@ class RealTime; class MappedEvent; -class TransportDialog : public QWidget +class TransportDialog : public TQWidget { Q_OBJECT + TQ_OBJECT public: - TransportDialog(TQWidget *parent=0, + TransportDialog(TQWidget *tqparent=0, const char *name=0, - WFlags flags = /*Qt::WStyle_StaysOnTop |*/ - Qt::WStyle_NormalBorder); + WFlags flags = /*TQt::WStyle_StaysOnTop |*/ + TQt::WStyle_NormalBorder); ~TransportDialog(); enum TimeDisplayMode { RealMode, SMPTEMode, BarMode, BarMetronomeMode, FrameMode }; @@ -113,7 +114,7 @@ protected: public slots: - // These two slots are activated by QTimers + // These two slots are activated by TQTimers // void slotClearMidiInLabel(); void slotClearMidiOutLabel(); diff --git a/src/gui/dialogs/TriggerSegmentDialog.cpp b/src/gui/dialogs/TriggerSegmentDialog.cpp index 85035df..1e92c95 100644 --- a/src/gui/dialogs/TriggerSegmentDialog.cpp +++ b/src/gui/dialogs/TriggerSegmentDialog.cpp @@ -47,36 +47,36 @@ namespace Rosegarden { -TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent, +TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *tqparent, Composition *composition) : - KDialogBase(parent, "triggersegmentdialog", true, i18n("Trigger Segment"), + KDialogBase(tqparent, "triggersegmentdialog", true, i18n("Trigger Segment"), Ok | Cancel, Ok), m_composition(composition) { TQVBox *vbox = makeVBoxMainWidget(); TQFrame *frame = new TQFrame(vbox); - TQGridLayout *layout = new TQGridLayout(frame, 3, 2, 5, 5); + TQGridLayout *tqlayout = new TQGridLayout(frame, 3, 2, 5, 5); TQLabel *label = new TQLabel(i18n("Trigger segment: "), frame); - layout->addWidget(label, 0, 0); + tqlayout->addWidget(label, 0, 0); m_segment = new KComboBox(frame); - layout->addWidget(m_segment, 0, 1); + tqlayout->addWidget(m_segment, 0, 1); int n = 1; for (Composition::triggersegmentcontaineriterator i = m_composition->getTriggerSegments().begin(); i != m_composition->getTriggerSegments().end(); ++i) { m_segment->insertItem - (TQString("%1. %2").arg(n++).arg(strtoqstr((*i)->getSegment()->getLabel()))); + (TQString("%1. %2").tqarg(n++).tqarg(strtoqstr((*i)->getSegment()->getLabel()))); } label = new TQLabel(i18n("Perform with timing: "), frame); - layout->addWidget(label, 1, 0); + tqlayout->addWidget(label, 1, 0); m_adjustTime = new KComboBox(frame); - layout->addWidget(m_adjustTime, 1, 1); + tqlayout->addWidget(m_adjustTime, 1, 1); m_adjustTime->insertItem(i18n("As stored")); m_adjustTime->insertItem(i18n("Truncate if longer than note")); @@ -86,7 +86,7 @@ TriggerSegmentDialog::TriggerSegmentDialog(TQWidget *parent, m_retune = new TQCheckBox(i18n("Adjust pitch to note"), frame); m_retune->setChecked(true); - layout->addWidget(m_retune, 2, 1); + tqlayout->addWidget(m_retune, 2, 1); setupFromConfig(); } @@ -101,7 +101,7 @@ TriggerSegmentDialog::setupFromConfig() std::string timing = qstrtostr (config->readEntry ("triggersegmenttiming", - strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH))); + strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH))); bool retune = config->readBoolEntry("triggersegmentretune", true); if (seg >= 0 && seg < m_segment->count()) @@ -109,7 +109,7 @@ TriggerSegmentDialog::setupFromConfig() if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE) { m_adjustTime->setCurrentItem(0); - } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH) { + } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH) { m_adjustTime->setCurrentItem(3); } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_START) { m_adjustTime->setCurrentItem(1); @@ -157,7 +157,7 @@ TriggerSegmentDialog::getTimeAdjust() const case 2: return BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_END; case 3: - return BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH; + return BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH; default: return BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE; diff --git a/src/gui/dialogs/TriggerSegmentDialog.h b/src/gui/dialogs/TriggerSegmentDialog.h index c71f34c..5dac0bb 100644 --- a/src/gui/dialogs/TriggerSegmentDialog.h +++ b/src/gui/dialogs/TriggerSegmentDialog.h @@ -45,9 +45,10 @@ class Composition; class TriggerSegmentDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TriggerSegmentDialog(TQWidget *parent, Composition *); + TriggerSegmentDialog(TQWidget *tqparent, Composition *); TriggerSegmentId getId() const; bool getRetune() const; diff --git a/src/gui/dialogs/TupletDialog.cpp b/src/gui/dialogs/TupletDialog.cpp index a785097..aaa50da 100644 --- a/src/gui/dialogs/TupletDialog.cpp +++ b/src/gui/dialogs/TupletDialog.cpp @@ -46,16 +46,16 @@ namespace Rosegarden { -TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType, +TupletDialog::TupletDialog(TQWidget *tqparent, Note::Type defaultUnitType, timeT maxDuration) : - KDialogBase(parent, 0, true, i18n("Tuplet"), Ok | Cancel | Help), + KDialogBase(tqparent, 0, true, i18n("Tuplet"), Ok | Cancel | Help), m_maxDuration(maxDuration) { setHelp("nv-tuplets"); TQVBox *vbox = makeVBoxMainWidget(); - TQGroupBox *timingBox = new QGroupBox - (1, Horizontal, i18n("New timing for tuplet group"), vbox); + TQGroupBox *timingBox = new TQGroupBox + (1, Qt::Horizontal, i18n("New timing for tuplet group"), vbox); if (m_maxDuration > 0) { @@ -87,7 +87,7 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType, if (maxDuration > 0 && (2 * duration > maxDuration)) break; timeT e; // error factor, ignore - m_unitCombo->insertItem(NotePixmapFactory::toQPixmap + m_unitCombo->insertItem(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeNoteMenuPixmap(duration, e)), NotationStrings::makeNoteMenuLabel(duration, false, e, true)); if (defaultUnitType == t) { @@ -100,7 +100,7 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType, m_tupledCombo = new KComboBox(timingFrame); timingLayout->addWidget(m_tupledCombo, 1, 1); - m_hasTimingAlready = new QCheckBox + m_hasTimingAlready = new TQCheckBox (i18n("Timing is already correct: update display only"), timingFrame); m_hasTimingAlready->setChecked(false); timingLayout->addMultiCellWidget(m_hasTimingAlready, 2, 2, 0, 2); @@ -110,17 +110,17 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType, updateUntupledCombo(); updateTupledCombo(); - m_timingDisplayBox = new QGroupBox - (1, Horizontal, i18n("Timing calculations"), vbox); + m_timingDisplayBox = new TQGroupBox + (1, Qt::Horizontal, i18n("Timing calculations"), vbox); - TQGrid *timingDisplayGrid = new TQGrid(3, TQGrid::Horizontal, m_timingDisplayBox); + TQGrid *timingDisplayGrid = new TQGrid(3, Qt::Horizontal, m_timingDisplayBox); if (maxDuration > 0) { new TQLabel(i18n("Selected region:"), timingDisplayGrid); new TQLabel("", timingDisplayGrid); m_selectionDurationDisplay = new TQLabel("x", timingDisplayGrid); - m_selectionDurationDisplay->setAlignment(int(TQLabel::AlignVCenter | + m_selectionDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); } else { m_selectionDurationDisplay = 0; @@ -129,28 +129,28 @@ TupletDialog::TupletDialog(TQWidget *parent, Note::Type defaultUnitType, new TQLabel(i18n("Group with current timing:"), timingDisplayGrid); m_untupledDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid); m_untupledDurationDisplay = new TQLabel("x", timingDisplayGrid); - m_untupledDurationDisplay->setAlignment(int(TQLabel::AlignVCenter | + m_untupledDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); new TQLabel(i18n("Group with new timing:"), timingDisplayGrid); m_tupledDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid); m_tupledDurationDisplay = new TQLabel("x", timingDisplayGrid); - m_tupledDurationDisplay->setAlignment(int(TQLabel::AlignVCenter | + m_tupledDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); new TQLabel(i18n("Gap created by timing change:"), timingDisplayGrid); m_newGapDurationCalculationDisplay = new TQLabel("x", timingDisplayGrid); m_newGapDurationDisplay = new TQLabel("x", timingDisplayGrid); - m_newGapDurationDisplay->setAlignment(int(TQLabel::AlignVCenter | + m_newGapDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); if (maxDuration > 0) { new TQLabel(i18n("Unchanged at end of selection:"), timingDisplayGrid); - m_unchangedDurationCalculationDisplay = new QLabel + m_unchangedDurationCalculationDisplay = new TQLabel ("x", timingDisplayGrid); m_unchangedDurationDisplay = new TQLabel("x", timingDisplayGrid); - m_unchangedDurationDisplay->setAlignment(int(TQLabel::AlignVCenter | + m_unchangedDurationDisplay->tqsetAlignment(int(TQLabel::AlignVCenter | TQLabel::AlignRight)); } else { @@ -238,7 +238,7 @@ TupletDialog::updateUntupledCombo() TQString previousText = m_untupledCombo->currentText(); if (previousText.toInt() == 0) { if (maxValue < 3) - previousText = TQString("%1").arg(maxValue); + previousText = TQString("%1").tqarg(maxValue); else previousText = "3"; } @@ -247,7 +247,7 @@ TupletDialog::updateUntupledCombo() bool setText = false; for (int i = 1; i <= maxValue; ++i) { - TQString text = TQString("%1").arg(i); + TQString text = TQString("%1").tqarg(i); m_untupledCombo->insertItem(text); if (m_hasTimingAlready->isChecked()) { if (i == (m_maxDuration * 3) / (Note(getUnitType()).getDuration()*2)) { @@ -278,7 +278,7 @@ TupletDialog::updateTupledCombo() if (previousText.toInt() == 0 || previousText.toInt() > untupled) { if (untupled < 2) - previousText = TQString("%1").arg(untupled); + previousText = TQString("%1").tqarg(untupled); else previousText = "2"; } @@ -286,7 +286,7 @@ TupletDialog::updateTupledCombo() m_tupledCombo->clear(); for (int i = 1; i < untupled; ++i) { - TQString text = TQString("%1").arg(i); + TQString text = TQString("%1").tqarg(i); m_tupledCombo->insertItem(text); if (m_hasTimingAlready->isChecked()) { if (i == m_maxDuration / Note(getUnitType()).getDuration()) { @@ -310,33 +310,33 @@ TupletDialog::updateTimingDisplays() timeT tupledDuration = unitDuration * tupledCount; if (m_selectionDurationDisplay) { - m_selectionDurationDisplay->setText(TQString("%1").arg(m_maxDuration)); + m_selectionDurationDisplay->setText(TQString("%1").tqarg(m_maxDuration)); } m_untupledDurationCalculationDisplay->setText - (TQString(" %1 x %2 = ").arg(untupledCount).arg(unitDuration)); + (TQString(" %1 x %2 = ").tqarg(untupledCount).tqarg(unitDuration)); m_untupledDurationDisplay->setText - (TQString("%1").arg(untupledDuration)); + (TQString("%1").tqarg(untupledDuration)); m_tupledDurationCalculationDisplay->setText - (TQString(" %1 x %2 = ").arg(tupledCount).arg(unitDuration)); + (TQString(" %1 x %2 = ").tqarg(tupledCount).tqarg(unitDuration)); m_tupledDurationDisplay->setText - (TQString("%1").arg(tupledDuration)); + (TQString("%1").tqarg(tupledDuration)); m_newGapDurationCalculationDisplay->setText - (TQString(" %1 - %2 = ").arg(untupledDuration).arg(tupledDuration)); + (TQString(" %1 - %2 = ").tqarg(untupledDuration).tqarg(tupledDuration)); m_newGapDurationDisplay->setText - (TQString("%1").arg(untupledDuration - tupledDuration)); + (TQString("%1").tqarg(untupledDuration - tupledDuration)); if (m_selectionDurationDisplay && m_unchangedDurationDisplay) { if (m_maxDuration != untupledDuration) { m_unchangedDurationCalculationDisplay->setText - (TQString(" %1 - %2 = ").arg(m_maxDuration).arg(untupledDuration)); + (TQString(" %1 - %2 = ").tqarg(m_maxDuration).tqarg(untupledDuration)); } else { m_unchangedDurationCalculationDisplay->setText(""); } m_unchangedDurationDisplay->setText - (TQString("%1").arg(m_maxDuration - untupledDuration)); + (TQString("%1").tqarg(m_maxDuration - untupledDuration)); } } diff --git a/src/gui/dialogs/TupletDialog.h b/src/gui/dialogs/TupletDialog.h index ae57ca9..6ee424a 100644 --- a/src/gui/dialogs/TupletDialog.h +++ b/src/gui/dialogs/TupletDialog.h @@ -47,9 +47,10 @@ namespace Rosegarden class TupletDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TupletDialog(TQWidget *parent, + TupletDialog(TQWidget *tqparent, Note::Type defaultUnitType, timeT maxDuration = 0); diff --git a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp index b15fe07..c55a634 100644 --- a/src/gui/dialogs/UnusedAudioSelectionDialog.cpp +++ b/src/gui/dialogs/UnusedAudioSelectionDialog.cpp @@ -39,11 +39,11 @@ namespace Rosegarden { -UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *parent, +UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *tqparent, TQString introductoryText, std::vector<TQString> fileNames, bool offerCancel) : - KDialogBase(parent, 0, true, i18n("Select Unused Audio Files"), (offerCancel ? (Ok | Cancel) : Ok)) + KDialogBase(tqparent, 0, true, i18n("Select Unused Audio Files"), (offerCancel ? (Ok | Cancel) : Ok)) { TQVBox *vbox = makeVBoxMainWidget(); new TQLabel(introductoryText, vbox); @@ -60,8 +60,8 @@ UnusedAudioSelectionDialog::UnusedAudioSelectionDialog(TQWidget *parent, TQString fileSize = i18n(" (not found) "); TQString fileDate; if (info.exists()) { - fileSize = TQString(" %1 ").arg(info.size()); - fileDate = TQString(" %1 ").arg(info.lastModified().toString()); + fileSize = TQString(" %1 ").tqarg(info.size()); + fileDate = TQString(" %1 ").tqarg(info.lastModified().toString()); } TQListViewItem *item = new KListViewItem (m_listView, fileName, fileSize, fileDate); diff --git a/src/gui/dialogs/UseOrnamentDialog.cpp b/src/gui/dialogs/UseOrnamentDialog.cpp index b644a08..d5f7895 100644 --- a/src/gui/dialogs/UseOrnamentDialog.cpp +++ b/src/gui/dialogs/UseOrnamentDialog.cpp @@ -51,25 +51,25 @@ namespace Rosegarden { -UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent, +UseOrnamentDialog::UseOrnamentDialog(TQWidget *tqparent, Composition *composition) : - KDialogBase(parent, "useornamentdialog", true, i18n("Use Ornament"), + KDialogBase(tqparent, "useornamentdialog", true, i18n("Use Ornament"), Ok | Cancel, Ok), m_composition(composition) { TQVBox *vbox = makeVBoxMainWidget(); TQLabel *label; - TQGroupBox *notationBox = new TQGroupBox(1, Horizontal, i18n("Notation"), vbox); + TQGroupBox *notationBox = new TQGroupBox(1, Qt::Horizontal, i18n("Notation"), vbox); TQFrame *frame = new TQFrame(notationBox); - TQGridLayout *layout = new TQGridLayout(frame, 4, 1, 5, 5); + TQGridLayout *tqlayout = new TQGridLayout(frame, 4, 1, 5, 5); label = new TQLabel(i18n("Display as: "), frame); - layout->addWidget(label, 0, 0); + tqlayout->addWidget(label, 0, 0); m_mark = new KComboBox(frame); - layout->addWidget(m_mark, 0, 1); + tqlayout->addWidget(m_mark, 0, 1); m_marks.push_back(Marks::Trill); m_marks.push_back(Marks::LongTrill); @@ -87,7 +87,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent, }; for (size_t i = 0; i < m_marks.size(); ++i) { - m_mark->insertItem(NotePixmapFactory::toQPixmap + m_mark->insertItem(NotePixmapFactory::toTQPixmap (NotePixmapFactory::makeMarkMenuPixmap(m_marks[i])), markLabels[i]); } @@ -96,35 +96,35 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent, connect(m_mark, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMarkChanged(int))); m_textLabel = new TQLabel(i18n(" Text: "), frame); - layout->addWidget(m_textLabel, 0, 2); + tqlayout->addWidget(m_textLabel, 0, 2); m_text = new TQLineEdit(frame); - layout->addWidget(m_text, 0, 3); + tqlayout->addWidget(m_text, 0, 3); - TQGroupBox *performBox = new TQGroupBox(1, Horizontal, i18n("Performance"), vbox); + TQGroupBox *performBox = new TQGroupBox(1, Qt::Horizontal, i18n("Performance"), vbox); frame = new TQFrame(performBox); - layout = new TQGridLayout(frame, 3, 2, 5, 5); + tqlayout = new TQGridLayout(frame, 3, 2, 5, 5); label = new TQLabel(i18n("Perform using triggered segment: "), frame); - layout->addWidget(label, 0, 0); + tqlayout->addWidget(label, 0, 0); m_ornament = new KComboBox(frame); - layout->addWidget(m_ornament, 0, 1); + tqlayout->addWidget(m_ornament, 0, 1); int n = 1; for (Composition::triggersegmentcontaineriterator i = m_composition->getTriggerSegments().begin(); i != m_composition->getTriggerSegments().end(); ++i) { m_ornament->insertItem - (TQString("%1. %2").arg(n++).arg(strtoqstr((*i)->getSegment()->getLabel()))); + (TQString("%1. %2").tqarg(n++).tqarg(strtoqstr((*i)->getSegment()->getLabel()))); } label = new TQLabel(i18n("Perform with timing: "), frame); - layout->addWidget(label, 1, 0); + tqlayout->addWidget(label, 1, 0); m_adjustTime = new KComboBox(frame); - layout->addWidget(m_adjustTime, 1, 1); + tqlayout->addWidget(m_adjustTime, 1, 1); m_adjustTime->insertItem(i18n("As stored")); m_adjustTime->insertItem(i18n("Truncate if longer than note")); @@ -134,7 +134,7 @@ UseOrnamentDialog::UseOrnamentDialog(TQWidget *parent, m_retune = new TQCheckBox(i18n("Adjust pitch to note"), frame); m_retune->setChecked(true); - layout->addWidget(m_retune, 2, 1); + tqlayout->addWidget(m_retune, 2, 1); setupFromConfig(); } @@ -150,7 +150,7 @@ UseOrnamentDialog::setupFromConfig() std::string timing = qstrtostr (config->readEntry ("useornamenttiming", - strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH))); + strtoqstr(BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH))); bool retune = config->readBoolEntry("useornamentretune", true); size_t i = 0; @@ -172,7 +172,7 @@ UseOrnamentDialog::setupFromConfig() if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE) { m_adjustTime->setCurrentItem(0); - } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH) { + } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH) { m_adjustTime->setCurrentItem(3); } else if (timing == BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_START) { m_adjustTime->setCurrentItem(1); @@ -229,7 +229,7 @@ UseOrnamentDialog::getTimeAdjust() const case 2: return BaseProperties::TRIGGER_SEGMENT_ADJUST_SYNC_END; case 3: - return BaseProperties::TRIGGER_SEGMENT_ADJUST_SQUISH; + return BaseProperties::TRIGGER_SEGMENT_ADJUST_STQUISH; default: return BaseProperties::TRIGGER_SEGMENT_ADJUST_NONE; diff --git a/src/gui/dialogs/UseOrnamentDialog.h b/src/gui/dialogs/UseOrnamentDialog.h index 17e82b9..bbab171 100644 --- a/src/gui/dialogs/UseOrnamentDialog.h +++ b/src/gui/dialogs/UseOrnamentDialog.h @@ -49,9 +49,10 @@ class Composition; class UseOrnamentDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - UseOrnamentDialog(TQWidget *parent, Composition *); + UseOrnamentDialog(TQWidget *tqparent, Composition *); TriggerSegmentId getId() const; Mark getMark() const; |