diff options
Diffstat (limited to 'src/gui/general/EditView.cpp')
-rw-r--r-- | src/gui/general/EditView.cpp | 248 |
1 files changed, 124 insertions, 124 deletions
diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp index a36b385..e37cbfc 100644 --- a/src/gui/general/EditView.cpp +++ b/src/gui/general/EditView.cpp @@ -24,7 +24,7 @@ #include "EditView.h" -#include <qlayout.h> +#include <tqlayout.h> #include "base/BaseProperties.h" #include <klocale.h> @@ -87,20 +87,20 @@ #include <kstddirs.h> #include <ktabwidget.h> #include <kxmlguiclient.h> -#include <qaccel.h> -#include <qbutton.h> -#include <qdialog.h> -#include <qframe.h> -#include <qinputdialog.h> -#include <qlabel.h> -#include <qobjectlist.h> -#include <qpopupmenu.h> -#include <qsize.h> -#include <qstring.h> -#include <qtabwidget.h> -#include <qvbox.h> -#include <qwidget.h> -#include <qwmatrix.h> +#include <tqaccel.h> +#include <tqbutton.h> +#include <tqdialog.h> +#include <tqframe.h> +#include <tqinputdialog.h> +#include <tqlabel.h> +#include <tqobjectlist.h> +#include <tqpopupmenu.h> +#include <tqsize.h> +#include <tqstring.h> +#include <tqtabwidget.h> +#include <tqvbox.h> +#include <tqwidget.h> +#include <tqwmatrix.h> namespace Rosegarden @@ -119,15 +119,15 @@ static int FeatureShowVelocity = 0x00001; // show the velocity ruler EditView::EditView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, unsigned int cols, - QWidget *parent, const char *name) : + TQWidget *parent, const char *name) : EditViewBase(doc, segments, cols, parent, name), m_currentEventSelection(0), m_activeItem(0), m_canvasView(0), - m_rulerBox(new QVBoxLayout), // top ruler box - added to grid later on + m_rulerBox(new TQVBoxLayout), // top ruler box - added to grid later on m_rulerBoxFiller(0), // On the left of m_rulerBox - m_controlBox(new QVBoxLayout), // top control ruler box - added to grid later on - m_bottomBox(new QVBox(this, "bottomframe")), // bottom box - added to bottom of canvas view by setCanvasView() + m_controlBox(new TQVBoxLayout), // top control ruler box - added to grid later on + m_bottomBox(new TQVBox(this, "bottomframe")), // bottom box - added to bottom of canvas view by setCanvasView() m_topStandardRuler(0), m_bottomStandardRuler(0), m_controlRuler(0), @@ -135,19 +135,19 @@ EditView::EditView(RosegardenGUIDoc *doc, { m_controlRulers->setHoverCloseButton(true); m_controlRulers->setHoverCloseButtonDelayed(false); - connect(m_controlRulers, SIGNAL(closeRequest(QWidget*)), - this, SLOT(slotRemoveControlRuler(QWidget*))); + connect(m_controlRulers, TQT_SIGNAL(closeRequest(TQWidget*)), + this, TQT_SLOT(slotRemoveControlRuler(TQWidget*))); - (dynamic_cast<QBoxLayout*>(m_bottomBox->layout()))->setDirection(QBoxLayout::BottomToTop); + (dynamic_cast<TQBoxLayout*>(m_bottomBox->layout()))->setDirection(TQBoxLayout::BottomToTop); // m_rulerBoxFiller is a white label used to keep m_rulerBox exactly // above the scrolling part of the view (and never above the // RosegardenCanvasView::m_leftWidget). - QGridLayout * gl = new QGridLayout(1, 2); + TQGridLayout * gl = new TQGridLayout(1, 2); gl->setColStretch(0, 0); gl->setColStretch(1, 1); gl->addLayout(m_rulerBox, 0, 1); - m_rulerBoxFiller = new QLabel(getCentralWidget()); + m_rulerBoxFiller = new TQLabel(getCentralWidget()); gl->addWidget(m_rulerBoxFiller, 0, 0); m_rulerBoxFiller->hide(); @@ -158,7 +158,7 @@ EditView::EditView(RosegardenGUIDoc *doc, // m_grid->addWidget(m_controlRulers, CONTROLRULER_ROW, 2); m_controlRulers->hide(); - m_controlRulers->setTabPosition(QTabWidget::Bottom); + m_controlRulers->setTabPosition(TQTabWidget::Bottom); } EditView::~EditView() @@ -174,7 +174,7 @@ void EditView::updateBottomWidgetGeometry() getCanvasView()->updateBottomWidgetGeometry(); } -void EditView::paintEvent(QPaintEvent* e) +void EditView::paintEvent(TQPaintEvent* e) { RG_DEBUG << "EditView::paintEvent()\n"; EditViewBase::paintEvent(e); @@ -185,8 +185,8 @@ void EditView::paintEvent(QPaintEvent* e) getCanvasView()->slotUpdate(); // update rulers - QLayoutIterator it = m_rulerBox->iterator(); - QLayoutItem *child; + TQLayoutIterator it = m_rulerBox->iterator(); + TQLayoutItem *child; while ( (child = it.current()) != 0 ) { if (child->widget()) child->widget()->update(); @@ -218,7 +218,7 @@ void EditView::updateControlRulers(bool updateHPos) } } -void EditView::setControlRulersZoom(QWMatrix zoomMatrix) +void EditView::setControlRulersZoom(TQWMatrix zoomMatrix) { m_currentRulerZoomMatrix = zoomMatrix; @@ -266,12 +266,12 @@ void EditView::setControlRulersCurrentSegment() */ } -void EditView::setTopStandardRuler(StandardRuler* w, QWidget *leftBox) +void EditView::setTopStandardRuler(StandardRuler* w, TQWidget *leftBox) { delete m_topStandardRuler; m_topStandardRuler = w; - QGridLayout * gl = new QGridLayout(1, 2); + TQGridLayout * gl = new TQGridLayout(1, 2); gl->setColStretch(0, 0); gl->setColStretch(1, 1); @@ -283,10 +283,10 @@ void EditView::setTopStandardRuler(StandardRuler* w, QWidget *leftBox) m_grid->addLayout(gl, TOPBARBUTTONS_ROW, m_mainCol); if (m_canvasView) { - connect(m_canvasView->horizontalScrollBar(), SIGNAL(valueChanged(int)), - m_topStandardRuler, SLOT(slotScrollHoriz(int))); - connect(m_canvasView->horizontalScrollBar(), SIGNAL(sliderMoved(int)), - m_topStandardRuler, SLOT(slotScrollHoriz(int))); + connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), + m_topStandardRuler, TQT_SLOT(slotScrollHoriz(int))); + connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)), + m_topStandardRuler, TQT_SLOT(slotScrollHoriz(int))); } } @@ -298,30 +298,30 @@ void EditView::setBottomStandardRuler(StandardRuler* w) // m_bottomBox->insertWidget(0, w); if (m_canvasView) { - connect(m_canvasView->horizontalScrollBar(), SIGNAL(valueChanged(int)), - m_bottomStandardRuler, SLOT(slotScrollHoriz(int))); - connect(m_canvasView->horizontalScrollBar(), SIGNAL(sliderMoved(int)), - m_bottomStandardRuler, SLOT(slotScrollHoriz(int))); + connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), + m_bottomStandardRuler, TQT_SLOT(slotScrollHoriz(int))); + connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)), + m_bottomStandardRuler, TQT_SLOT(slotScrollHoriz(int))); } } void EditView::setRewFFwdToAutoRepeat() { - QWidget* transportToolbar = factory()->container("Transport Toolbar", this); + TQWidget* transportToolbar = factory()->container("Transport Toolbar", this); if (transportToolbar) { - QObjectList *l = transportToolbar->queryList(); - QObjectListIt it(*l); // iterate over the buttons - QObject *obj; + TQObjectList *l = transportToolbar->queryList(); + TQObjectListIt it(*l); // iterate over the buttons + TQObject *obj; while ( (obj = it.current()) != 0 ) { // for each found object... ++it; // RG_DEBUG << "EditView::setRewFFwdToAutoRepeat() : obj name : " << obj->name() << endl; - QString objName = obj->name(); + TQString objName = obj->name(); if (objName.endsWith("playback_pointer_back_bar") || objName.endsWith("playback_pointer_forward_bar")) { - QButton* btn = dynamic_cast<QButton*>(obj); + TQButton* btn = dynamic_cast<TQButton*>(obj); if (!btn) { RG_DEBUG << "Very strange - found widgets in Transport Toolbar which aren't buttons\n"; @@ -340,19 +340,19 @@ void EditView::setRewFFwdToAutoRepeat() } -void EditView::addRuler(QWidget* w) +void EditView::addRuler(TQWidget* w) { m_rulerBox->addWidget(w); if (m_canvasView) { - connect(m_canvasView->horizontalScrollBar(), SIGNAL(valueChanged(int)), - w, SLOT(slotScrollHoriz(int))); - connect(m_canvasView->horizontalScrollBar(), SIGNAL(sliderMoved(int)), - w, SLOT(slotScrollHoriz(int))); + connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), + w, TQT_SLOT(slotScrollHoriz(int))); + connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)), + w, TQT_SLOT(slotScrollHoriz(int))); } } -void EditView::addPropertyBox(QWidget *w) +void EditView::addPropertyBox(TQWidget *w) { m_controlBox->addWidget(w); } @@ -365,19 +365,19 @@ void EditView::addControlRuler(ControlRuler* ruler) m_controlRulers->showPage(ruler); if (m_canvasView) { - connect(m_canvasView->horizontalScrollBar(), SIGNAL(valueChanged(int)), - ruler->horizontalScrollBar(), SIGNAL(valueChanged(int))); - connect(m_canvasView->horizontalScrollBar(), SIGNAL(sliderMoved(int)), - ruler->horizontalScrollBar(), SIGNAL(sliderMoved(int))); + connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), + ruler->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int))); + connect(m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)), + ruler->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int))); } - connect(ruler, SIGNAL(stateChange(const QString&, bool)), - this, SLOT(slotStateChanged(const QString&, bool))); + connect(ruler, TQT_SIGNAL(stateChange(const TQString&, bool)), + this, TQT_SLOT(slotStateChanged(const TQString&, bool))); stateChanged("have_control_ruler", KXMLGUIClient::StateReverse); } -void EditView::readjustViewSize(QSize requestedSize, bool exact) +void EditView::readjustViewSize(TQSize requestedSize, bool exact) { Profiler profiler("EditView::readjustViewSize", true); @@ -396,7 +396,7 @@ void EditView::readjustViewSize(QSize requestedSize, bool exact) windowWidth = width(), windowHeight = height(); - QSize newSize; + TQSize newSize; newSize.setWidth(((requestedWidth / windowWidth) + 1) * windowWidth); newSize.setHeight(((requestedHeight / windowHeight) + 1) * windowHeight); @@ -426,10 +426,10 @@ void EditView::setCanvasView(RosegardenCanvasView *canvasView) // m_horizontalScrollBar->setSteps(m_canvasView->horizontalScrollBar()->lineStep(), // m_canvasView->horizontalScrollBar()->pageStep()); - // connect(m_horizontalScrollBar, SIGNAL(valueChanged(int)), - // m_canvasView->horizontalScrollBar(), SIGNAL(valueChanged(int))); - // connect(m_horizontalScrollBar, SIGNAL(sliderMoved(int)), - // m_canvasView->horizontalScrollBar(), SIGNAL(sliderMoved(int))); + // connect(m_horizontalScrollBar, TQT_SIGNAL(valueChanged(int)), + // m_canvasView->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int))); + // connect(m_horizontalScrollBar, TQT_SIGNAL(sliderMoved(int)), + // m_canvasView->horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int))); } @@ -469,8 +469,8 @@ EditView::getInsertionTime(Clef &clef, return t; } -void EditView::slotActiveItemPressed(QMouseEvent* e, - QCanvasItem* item) +void EditView::slotActiveItemPressed(TQMouseEvent* e, + TQCanvasItem* item) { if (!item) return ; @@ -723,137 +723,137 @@ EditView::setupActions() // // Tempo and time signature changes // - QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); - QCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-tempo.png"); - QIconSet icon = QIconSet(pixmap); + TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQCanvasPixmap pixmap(pixmapDir + "/toolbar/event-insert-tempo.png"); + TQIconSet icon = TQIconSet(pixmap); new KAction(AddTempoChangeCommand::getGlobalName(), icon, 0, - this, SLOT(slotAddTempo()), + this, TQT_SLOT(slotAddTempo()), actionCollection(), "add_tempo"); pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.png"); - icon = QIconSet(pixmap); + icon = TQIconSet(pixmap); new KAction(AddTimeSignatureCommand::getGlobalName(), icon, 0, - this, SLOT(slotAddTimeSignature()), + this, TQT_SLOT(slotAddTimeSignature()), actionCollection(), "add_time_signature"); // // Transforms // new KAction(i18n("&Halve Durations"), Key_H + CTRL, this, - SLOT(slotHalveDurations()), actionCollection(), + TQT_SLOT(slotHalveDurations()), actionCollection(), "halve_durations"); new KAction(i18n("&Double Durations"), Key_H + CTRL + SHIFT, this, - SLOT(slotDoubleDurations()), actionCollection(), + TQT_SLOT(slotDoubleDurations()), actionCollection(), "double_durations"); new KAction(RescaleCommand::getGlobalName(), 0, this, - SLOT(slotRescale()), actionCollection(), + TQT_SLOT(slotRescale()), actionCollection(), "rescale"); new KAction(TransposeCommand::getGlobalName(1), 0, Key_Up, this, - SLOT(slotTransposeUp()), actionCollection(), + TQT_SLOT(slotTransposeUp()), actionCollection(), "transpose_up"); new KAction(TransposeCommand::getGlobalName(12), 0, Key_Up + CTRL, this, - SLOT(slotTransposeUpOctave()), actionCollection(), + TQT_SLOT(slotTransposeUpOctave()), actionCollection(), "transpose_up_octave"); new KAction(TransposeCommand::getGlobalName( -1), 0, Key_Down, this, - SLOT(slotTransposeDown()), actionCollection(), + TQT_SLOT(slotTransposeDown()), actionCollection(), "transpose_down"); new KAction(TransposeCommand::getGlobalName( -12), 0, Key_Down + CTRL, this, - SLOT(slotTransposeDownOctave()), actionCollection(), + TQT_SLOT(slotTransposeDownOctave()), actionCollection(), "transpose_down_octave"); new KAction(TransposeCommand::getGlobalName(0), 0, this, - SLOT(slotTranspose()), actionCollection(), + TQT_SLOT(slotTranspose()), actionCollection(), "general_transpose"); new KAction(TransposeCommand::getDiatonicGlobalName(0,0), 0, this, - SLOT(slotDiatonicTranspose()), actionCollection(), + TQT_SLOT(slotDiatonicTranspose()), actionCollection(), "general_diatonic_transpose"); new KAction(InvertCommand::getGlobalName(0), 0, this, - SLOT(slotInvert()), actionCollection(), + TQT_SLOT(slotInvert()), actionCollection(), "invert"); new KAction(RetrogradeCommand::getGlobalName(0), 0, this, - SLOT(slotRetrograde()), actionCollection(), + TQT_SLOT(slotRetrograde()), actionCollection(), "retrograde"); new KAction(RetrogradeInvertCommand::getGlobalName(0), 0, this, - SLOT(slotRetrogradeInvert()), actionCollection(), + TQT_SLOT(slotRetrogradeInvert()), actionCollection(), "retrograde_invert"); new KAction(i18n("Jog &Left"), Key_Left + ALT, this, - SLOT(slotJogLeft()), actionCollection(), + TQT_SLOT(slotJogLeft()), actionCollection(), "jog_left"); new KAction(i18n("Jog &Right"), Key_Right + ALT, this, - SLOT(slotJogRight()), actionCollection(), + TQT_SLOT(slotJogRight()), actionCollection(), "jog_right"); // Control rulers // new KAction(i18n("Show Velocity Property Ruler"), 0, this, - SLOT(slotShowVelocityControlRuler()), actionCollection(), + TQT_SLOT(slotShowVelocityControlRuler()), actionCollection(), "show_velocity_control_ruler"); /* new KAction(i18n("Show Controllers Events Ruler"), 0, this, - SLOT(slotShowControllerEventsRuler()), actionCollection(), + TQT_SLOT(slotShowControllerEventsRuler()), actionCollection(), "show_controller_events_ruler"); */ // Disabled for now // // new KAction(i18n("Add Control Ruler..."), 0, this, - // SLOT(slotShowPropertyControlRuler()), actionCollection(), + // TQT_SLOT(slotShowPropertyControlRuler()), actionCollection(), // "add_control_ruler"); // // Control Ruler context menu // new KAction(i18n("Insert item"), 0, this, - SLOT(slotInsertControlRulerItem()), actionCollection(), + TQT_SLOT(slotInsertControlRulerItem()), actionCollection(), "insert_control_ruler_item"); // This was on Key_Delete, but that conflicts with existing Delete commands // on individual edit views new KAction(i18n("Erase selected items"), 0, this, - SLOT(slotEraseControlRulerItem()), actionCollection(), + TQT_SLOT(slotEraseControlRulerItem()), actionCollection(), "erase_control_ruler_item"); new KAction(i18n("Clear ruler"), 0, this, - SLOT(slotClearControlRulerItem()), actionCollection(), + TQT_SLOT(slotClearControlRulerItem()), actionCollection(), "clear_control_ruler_item"); new KAction(i18n("Insert line of controllers"), 0, this, - SLOT(slotStartControlLineItem()), actionCollection(), + TQT_SLOT(slotStartControlLineItem()), actionCollection(), "start_control_line_item"); new KAction(i18n("Flip forward"), Key_BracketRight, this, - SLOT(slotFlipForwards()), actionCollection(), + TQT_SLOT(slotFlipForwards()), actionCollection(), "flip_control_events_forward"); new KAction(i18n("Flip backwards"), Key_BracketLeft, this, - SLOT(slotFlipBackwards()), actionCollection(), + TQT_SLOT(slotFlipBackwards()), actionCollection(), "flip_control_events_back"); new KAction(i18n("Draw property line"), 0, this, - SLOT(slotDrawPropertyLine()), actionCollection(), + TQT_SLOT(slotDrawPropertyLine()), actionCollection(), "draw_property_line"); new KAction(i18n("Select all property values"), 0, this, - SLOT(slotSelectAllProperties()), actionCollection(), + TQT_SLOT(slotSelectAllProperties()), actionCollection(), "select_all_properties"); } @@ -862,7 +862,7 @@ EditView::setupAddControlRulerMenu() { RG_DEBUG << "EditView::setupAddControlRulerMenu" << endl; - QPopupMenu* addControlRulerMenu = dynamic_cast<QPopupMenu*> + TQPopupMenu* addControlRulerMenu = dynamic_cast<TQPopupMenu*> (factory()->container("add_control_ruler", this)); if (addControlRulerMenu) { @@ -883,12 +883,12 @@ EditView::setupAddControlRulerMenu() const ControlList &list = c->getControlParameters(); int i = 0; - QString itemStr; + TQString itemStr; for (ControlList::const_iterator it = list.begin(); it != list.end(); ++it) { if (it->getType() == Controller::EventType) { - QString hexValue; + TQString hexValue; hexValue.sprintf("(0x%x)", it->getControllerValue()); itemStr = i18n("%1 Controller %2 %3").arg(strtoqstr(it->getName())) @@ -903,8 +903,8 @@ EditView::setupAddControlRulerMenu() addControlRulerMenu->insertItem(itemStr, i++); } - connect(addControlRulerMenu, SIGNAL(activated(int)), - SLOT(slotAddControlRuler(int))); + connect(addControlRulerMenu, TQT_SIGNAL(activated(int)), + TQT_SLOT(slotAddControlRuler(int))); } } @@ -1015,7 +1015,7 @@ EditView::slotAddControlRuler(int controller) getDocument()->slotDocumentModified(); } -void EditView::slotRemoveControlRuler(QWidget* w) +void EditView::slotRemoveControlRuler(TQWidget* w) { ControllerEventsRuler* ruler = dynamic_cast<ControllerEventsRuler*>(w); @@ -1062,12 +1062,12 @@ void EditView::slotRemoveControlRuler(QWidget* w) void EditView::createInsertPitchActionMenu() { - QString notePitchNames[] = { + TQString notePitchNames[] = { i18n("I"), i18n("II"), i18n("III"), i18n("IV"), i18n("V"), i18n("VI"), i18n("VII"), i18n("VIII") }; - QString flat = i18n("%1 flat"); - QString sharp = i18n("%1 sharp"); + TQString flat = i18n("%1 flat"); + TQString sharp = i18n("%1 sharp"); const Key notePitchKeys[3][7] = { { @@ -1102,7 +1102,7 @@ EditView::createInsertPitchActionMenu() KAction *insertPitchAction = 0; - QString octaveSuffix; + TQString octaveSuffix; if (octave == 1) octaveSuffix = "_high"; else if (octave == 2) @@ -1116,8 +1116,8 @@ EditView::createInsertPitchActionMenu() new KAction (flat.arg(notePitchNames[i]), CTRL + SHIFT + notePitchKeys[octave][i], - this, SLOT(slotInsertNoteFromAction()), actionCollection(), - QString("insert_%1_flat%2").arg(i).arg(octaveSuffix)); + this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), + TQString("insert_%1_flat%2").arg(i).arg(octaveSuffix)); menu->insert(insertPitchAction); } @@ -1126,8 +1126,8 @@ EditView::createInsertPitchActionMenu() new KAction (notePitchNames[i], notePitchKeys[octave][i], - this, SLOT(slotInsertNoteFromAction()), actionCollection(), - QString("insert_%1%2").arg(i).arg(octaveSuffix)); + this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), + TQString("insert_%1%2").arg(i).arg(octaveSuffix)); menu->insert(insertPitchAction); @@ -1139,8 +1139,8 @@ EditView::createInsertPitchActionMenu() new KAction (sharp.arg(notePitchNames[i]), SHIFT + notePitchKeys[octave][i], - this, SLOT(slotInsertNoteFromAction()), actionCollection(), - QString("insert_%1_sharp%2").arg(i).arg(octaveSuffix)); + this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), + TQString("insert_%1_sharp%2").arg(i).arg(octaveSuffix)); menu->insert(insertPitchAction); } @@ -1154,7 +1154,7 @@ EditView::createInsertPitchActionMenu() } int -EditView::getPitchFromNoteInsertAction(QString name, +EditView::getPitchFromNoteInsertAction(TQString name, Accidental &accidental, const Clef &clef, const ::Rosegarden::Key &key) @@ -1220,12 +1220,12 @@ void EditView::slotAddTempo() TempoDialog tempoDlg(this, getDocument()); connect(&tempoDlg, - SIGNAL(changeTempo(timeT, + TQT_SIGNAL(changeTempo(timeT, tempoT, tempoT, TempoDialog::TempoDialogAction)), this, - SIGNAL(changeTempo(timeT, + TQT_SIGNAL(changeTempo(timeT, tempoT, tempoT, TempoDialog::TempoDialogAction))); @@ -1268,7 +1268,7 @@ void EditView::slotAddTimeSignature() i18n("Estimated time signature shown")); } - if (dialog->exec() == QDialog::Accepted) { + if (dialog->exec() == TQDialog::Accepted) { insertionTime = dialog->getTime(); @@ -1354,7 +1354,7 @@ void EditView::slotShowPropertyControlRuler() new QListBoxRGProperty(propList, BaseProperties::VELOCITY.c_str()); int rc = propChooserDialog.exec(); - if (rc == QDialog::Accepted) { + if (rc == TQDialog::Accepted) { // fix for KDE 3.0 //QListBoxRGProperty* item = dynamic_cast<QListBoxRGProperty*>(propList->selectedItem()); QListBoxRGProperty* item = dynamic_cast<QListBoxRGProperty*> @@ -1465,7 +1465,7 @@ EditView::slotRescale() true, true); - if (dialog.exec() == QDialog::Accepted) { + if (dialog.exec() == TQDialog::Accepted) { KTmpStatusMsg msg(i18n("Rescaling..."), this); addCommandToHistory(new RescaleCommand (*m_currentEventSelection, @@ -1674,11 +1674,11 @@ ControlRuler* EditView::findRuler(const ControlParameter& controller, int &index PropertyControlRuler* EditView::makePropertyControlRuler(PropertyName propertyName) { - QCanvas* controlRulerCanvas = new QCanvas(this); - QSize viewSize = getViewSize(); + TQCanvas* controlRulerCanvas = new TQCanvas(this); + TQSize viewSize = getViewSize(); controlRulerCanvas->resize(viewSize.width(), ControlRuler::DefaultRulerHeight); // TODO - keep it in sync with main canvas size -// QCanvas* controlRulerCanvas = ControlRulerCanvasRepository::getCanvas(getCurrentSegment(), propertyName, +// TQCanvas* controlRulerCanvas = ControlRulerCanvasRepository::getCanvas(getCurrentSegment(), propertyName, // getViewSize()); PropertyControlRuler* controlRuler = new PropertyControlRuler @@ -1692,10 +1692,10 @@ PropertyControlRuler* EditView::makePropertyControlRuler(PropertyName propertyNa ControllerEventsRuler* EditView::makeControllerEventRuler(const ControlParameter *controller) { - QCanvas* controlRulerCanvas = new QCanvas(this); - QSize viewSize = getViewSize(); + TQCanvas* controlRulerCanvas = new TQCanvas(this); + TQSize viewSize = getViewSize(); controlRulerCanvas->resize(viewSize.width(), ControlRuler::DefaultRulerHeight); // TODO - keep it in sync with main canvas size -// QCanvas* controlRulerCanvas = ControlRulerCanvasRepository::getCanvas(getCurrentSegment(), controller, +// TQCanvas* controlRulerCanvas = ControlRulerCanvasRepository::getCanvas(getCurrentSegment(), controller, // getViewSize()); |