diff options
Diffstat (limited to 'src/gui/general')
35 files changed, 313 insertions, 304 deletions
diff --git a/src/gui/general/BarLine.cpp b/src/gui/general/BarLine.cpp index 5b5973d..df610ac 100644 --- a/src/gui/general/BarLine.cpp +++ b/src/gui/general/BarLine.cpp @@ -113,7 +113,7 @@ BarLine::drawShape(TQPainter &painter) } } -QPointArray +TQPointArray BarLine::areaPoints() const { int bx = int(x()); diff --git a/src/gui/general/BarLine.h b/src/gui/general/BarLine.h index 3523c8a..02157f1 100644 --- a/src/gui/general/BarLine.h +++ b/src/gui/general/BarLine.h @@ -31,27 +31,27 @@ namespace Rosegarden { -class BarLine : public QCanvasPolygonalItem +class BarLine : public TQCanvasPolygonalItem { public: - BarLine(TQCanvas *canvas, double layoutX, + BarLine(TQCanvas *canvas, double tqlayoutX, int barLineHeight, int baseBarThickness, int lineSpacing, int inset, LinedStaff::BarStyle style) : TQCanvasPolygonalItem(canvas), - m_layoutX(layoutX), + m_tqlayoutX(tqlayoutX), m_barLineHeight(barLineHeight), m_baseBarThickness(baseBarThickness), m_lineSpacing(lineSpacing), m_inset(inset), m_style(style) { } - double getLayoutX() const { return m_layoutX; } + double getLayoutX() const { return m_tqlayoutX; } virtual TQPointArray areaPoints() const; virtual void drawShape(TQPainter &); protected: - double m_layoutX; + double m_tqlayoutX; int m_barLineHeight; int m_baseBarThickness; int m_lineSpacing; diff --git a/src/gui/general/BaseTool.cpp b/src/gui/general/BaseTool.cpp index 75202ac..ee95231 100644 --- a/src/gui/general/BaseTool.cpp +++ b/src/gui/general/BaseTool.cpp @@ -36,11 +36,11 @@ namespace Rosegarden { -BaseTool::BaseTool(const TQString& menuName, KXMLGUIFactory* factory, TQObject* parent) - : TQObject(parent), +BaseTool::BaseTool(const TQString& menuName, KXMLGUIFactory* factory, TQObject* tqparent) + : TQObject(tqparent), m_menuName(menuName), m_menu(0), - m_parentFactory(factory) + m_tqparentFactory(factory) {} BaseTool::~BaseTool() @@ -48,7 +48,7 @@ BaseTool::~BaseTool() RG_DEBUG << "BaseTool::~BaseTool()\n"; // delete m_menu; - // m_parentView->factory()->removeClient(this); + // m_tqparentView->factory()->removeClient(this); // m_instance = 0; } diff --git a/src/gui/general/BaseTool.h b/src/gui/general/BaseTool.h index 6dd6820..29ef8dd 100644 --- a/src/gui/general/BaseTool.h +++ b/src/gui/general/BaseTool.h @@ -44,9 +44,10 @@ namespace Rosegarden * handling by a BaseToolBox * */ -class BaseTool : public QObject +class BaseTool : public TQObject { Q_OBJECT + TQ_OBJECT friend class BaseToolBox; @@ -55,14 +56,14 @@ public: virtual ~BaseTool(); /** - * Is called by the parent View (EditView or SegmentCanvas) when + * Is called by the tqparent View (EditView or SegmentCanvas) when * the tool is set as current. - * Add any setup here (e.g. setting the mouse cursor shape) + * Add any setup here (e.g. setting the mouse cursor tqshape) */ virtual void ready(); /** - * Is called by the parent View (EditView or SegmentCanvas) after + * Is called by the tqparent View (EditView or SegmentCanvas) after * the tool is put away. * Add any cleanup here */ @@ -87,7 +88,7 @@ protected: * * \a menuName : the name of the menu defined in the XML rc file */ - BaseTool(const TQString& menuName, KXMLGUIFactory*, TQObject* parent); + BaseTool(const TQString& menuName, KXMLGUIFactory*, TQObject* tqparent); virtual void createMenu() = 0; virtual bool hasMenu() { return false; } @@ -100,7 +101,7 @@ protected: TQString m_menuName; TQPopupMenu* m_menu; - KXMLGUIFactory* m_parentFactory; + KXMLGUIFactory* m_tqparentFactory; TQString m_contextHelp; }; diff --git a/src/gui/general/BaseToolBox.cpp b/src/gui/general/BaseToolBox.cpp index e4c2a5f..70cf3bd 100644 --- a/src/gui/general/BaseToolBox.cpp +++ b/src/gui/general/BaseToolBox.cpp @@ -34,9 +34,9 @@ namespace Rosegarden { -BaseToolBox::BaseToolBox(TQWidget* parent) - : TQObject(parent), - m_tools(17, // default size, from the Qt docs +BaseToolBox::BaseToolBox(TQWidget* tqparent) + : TQObject(tqparent), + m_tools(17, // default size, from the TQt docs false) // but we want it to be case insensitive { //m_tools.setAutoDelete(true); diff --git a/src/gui/general/BaseToolBox.h b/src/gui/general/BaseToolBox.h index d061938..faf2b3a 100644 --- a/src/gui/general/BaseToolBox.h +++ b/src/gui/general/BaseToolBox.h @@ -45,12 +45,13 @@ class BaseTool; * * Tools are fetched from a name */ -class BaseToolBox : public QObject +class BaseToolBox : public TQObject { Q_OBJECT + TQ_OBJECT public: - BaseToolBox(TQWidget* parent); + BaseToolBox(TQWidget* tqparent); virtual BaseTool* getTool(const TQString& toolName); diff --git a/src/gui/general/CanvasCursor.h b/src/gui/general/CanvasCursor.h index a53e39f..8770165 100644 --- a/src/gui/general/CanvasCursor.h +++ b/src/gui/general/CanvasCursor.h @@ -37,7 +37,7 @@ namespace Rosegarden -class CanvasCursor : public QCanvasRectangle +class CanvasCursor : public TQCanvasRectangle { public: CanvasCursor(TQCanvas*, int width); diff --git a/src/gui/general/CanvasItemGC.h b/src/gui/general/CanvasItemGC.h index 681e021..50bd21f 100644 --- a/src/gui/general/CanvasItemGC.h +++ b/src/gui/general/CanvasItemGC.h @@ -52,10 +52,10 @@ namespace Rosegarden * * However, if the SegmentItem deletes its repeat rectangle, then when * the SegmentCanvas destruction occurs, the SegmentCanvas dtor will - * get a list of all its children (TQCanvas::allItems()), containing + * get a list of all its tqchildren (TQCanvas::allItems()), containing * both SegmentItems and their repeat rectangles. Deleting a * SegmentItem will delete its repeat rectangle, which will still be - * present in the all children list which the SegmentCanvas dtor is + * present in the all tqchildren list which the SegmentCanvas dtor is * iterating over. * * So a solution is simply to push to-be-deleted repeat rectangles on diff --git a/src/gui/general/EditTool.cpp b/src/gui/general/EditTool.cpp index f48017c..8a07fe8 100644 --- a/src/gui/general/EditTool.cpp +++ b/src/gui/general/EditTool.cpp @@ -41,8 +41,8 @@ namespace Rosegarden { EditTool::EditTool(const TQString& menuName, EditView* view) - : BaseTool(menuName, view->factory(), view), - m_parentView(view) + : BaseTool(menuName, view->factory(), TQT_TQOBJECT(view)), + m_tqparentView(view) {} void EditTool::handleMousePress(timeT time, @@ -123,9 +123,9 @@ void EditTool::createMenu() RG_DEBUG << "BaseTool::createMenu() " << m_rcFileName << " - " << m_menuName << endl; setXMLFile(m_rcFileName); - m_parentFactory->addClient(this); + m_tqparentFactory->addClient(this); - TQWidget* tmp = m_parentFactory->container(m_menuName, this); + TQWidget* tmp = m_tqparentFactory->container(m_menuName, this); if (!tmp) RG_DEBUG << "BaseTool::createMenu(" << m_rcFileName diff --git a/src/gui/general/EditTool.h b/src/gui/general/EditTool.h index 7fda27f..f38bfa1 100644 --- a/src/gui/general/EditTool.h +++ b/src/gui/general/EditTool.h @@ -157,7 +157,7 @@ protected: //--------------- Data members --------------------------------- TQString m_rcFileName; - EditView* m_parentView; + EditView* m_tqparentView; }; diff --git a/src/gui/general/EditToolBox.cpp b/src/gui/general/EditToolBox.cpp index 48fa7e4..c19a076 100644 --- a/src/gui/general/EditToolBox.cpp +++ b/src/gui/general/EditToolBox.cpp @@ -35,9 +35,9 @@ namespace Rosegarden { -EditToolBox::EditToolBox(EditView *parent) - : BaseToolBox(parent), - m_parentView(parent) +EditToolBox::EditToolBox(EditView *tqparent) + : BaseToolBox(tqparent), + m_tqparentView(tqparent) { } diff --git a/src/gui/general/EditToolBox.h b/src/gui/general/EditToolBox.h index c1287b8..1818b35 100644 --- a/src/gui/general/EditToolBox.h +++ b/src/gui/general/EditToolBox.h @@ -46,8 +46,9 @@ class EditView; class EditToolBox : public BaseToolBox { Q_OBJECT + TQ_OBJECT public: - EditToolBox(EditView* parent); + EditToolBox(EditView* tqparent); virtual EditTool* getTool(const TQString& toolName); @@ -56,7 +57,7 @@ protected: //--------------- Data members --------------------------------- - EditView* m_parentView; + EditView* m_tqparentView; }; diff --git a/src/gui/general/EditView.cpp b/src/gui/general/EditView.cpp index e37cbfc..f216dad 100644 --- a/src/gui/general/EditView.cpp +++ b/src/gui/general/EditView.cpp @@ -112,15 +112,15 @@ const unsigned int EditView::TOPBARBUTTONS_ROW = RULERS_ROW + 1; const unsigned int EditView::CANVASVIEW_ROW = TOPBARBUTTONS_ROW + 1; const unsigned int EditView::CONTROLRULER_ROW = CANVASVIEW_ROW + 1; -// Just some simple features we might want to show - make them bit maskable +// Just some simple features we might want to show - make them bit tqmaskable // static int FeatureShowVelocity = 0x00001; // show the velocity ruler EditView::EditView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, unsigned int cols, - TQWidget *parent, const char *name) : - EditViewBase(doc, segments, cols, parent, name), + TQWidget *tqparent, const char *name) : + EditViewBase(doc, segments, cols, tqparent, name), m_currentEventSelection(0), m_activeItem(0), m_canvasView(0), @@ -138,7 +138,7 @@ EditView::EditView(RosegardenGUIDoc *doc, connect(m_controlRulers, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(slotRemoveControlRuler(TQWidget*))); - (dynamic_cast<TQBoxLayout*>(m_bottomBox->layout()))->setDirection(TQBoxLayout::BottomToTop); + (dynamic_cast<TQBoxLayout*>(m_bottomBox->tqlayout()))->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 @@ -154,7 +154,7 @@ EditView::EditView(RosegardenGUIDoc *doc, m_grid->addLayout(gl, RULERS_ROW, m_mainCol); m_grid->addMultiCellLayout(m_controlBox, CONTROLS_ROW, CONTROLS_ROW, 0, 1); - m_controlBox->setAlignment(AlignRight); + m_controlBox->tqsetAlignment(AlignRight); // m_grid->addWidget(m_controlRulers, CONTROLRULER_ROW, 2); m_controlRulers->hide(); @@ -169,7 +169,7 @@ EditView::~EditView() void EditView::updateBottomWidgetGeometry() { - getBottomWidget()->layout()->invalidate(); + getBottomWidget()->tqlayout()->tqinvalidate(); getBottomWidget()->updateGeometry(); getCanvasView()->updateBottomWidgetGeometry(); } @@ -728,82 +728,82 @@ EditView::setupActions() TQIconSet icon = TQIconSet(pixmap); new KAction(AddTempoChangeCommand::getGlobalName(), icon, 0, - this, TQT_SLOT(slotAddTempo()), + TQT_TQOBJECT(this), TQT_SLOT(slotAddTempo()), actionCollection(), "add_tempo"); pixmap.load(pixmapDir + "/toolbar/event-insert-timesig.png"); icon = TQIconSet(pixmap); new KAction(AddTimeSignatureCommand::getGlobalName(), icon, 0, - this, TQT_SLOT(slotAddTimeSignature()), + TQT_TQOBJECT(this), TQT_SLOT(slotAddTimeSignature()), actionCollection(), "add_time_signature"); // // Transforms // - new KAction(i18n("&Halve Durations"), Key_H + CTRL, this, + new KAction(i18n("&Halve Durations"), Key_H + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotHalveDurations()), actionCollection(), "halve_durations"); - new KAction(i18n("&Double Durations"), Key_H + CTRL + SHIFT, this, + new KAction(i18n("&Double Durations"), Key_H + CTRL + SHIFT, TQT_TQOBJECT(this), TQT_SLOT(slotDoubleDurations()), actionCollection(), "double_durations"); - new KAction(RescaleCommand::getGlobalName(), 0, this, + new KAction(RescaleCommand::getGlobalName(), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRescale()), actionCollection(), "rescale"); new KAction(TransposeCommand::getGlobalName(1), 0, - Key_Up, this, + Key_Up, TQT_TQOBJECT(this), TQT_SLOT(slotTransposeUp()), actionCollection(), "transpose_up"); new KAction(TransposeCommand::getGlobalName(12), 0, - Key_Up + CTRL, this, + Key_Up + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransposeUpOctave()), actionCollection(), "transpose_up_octave"); new KAction(TransposeCommand::getGlobalName( -1), 0, - Key_Down, this, + Key_Down, TQT_TQOBJECT(this), TQT_SLOT(slotTransposeDown()), actionCollection(), "transpose_down"); new KAction(TransposeCommand::getGlobalName( -12), 0, - Key_Down + CTRL, this, + Key_Down + CTRL, TQT_TQOBJECT(this), TQT_SLOT(slotTransposeDownOctave()), actionCollection(), "transpose_down_octave"); - new KAction(TransposeCommand::getGlobalName(0), 0, this, + new KAction(TransposeCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTranspose()), actionCollection(), "general_transpose"); - new KAction(TransposeCommand::getDiatonicGlobalName(0,0), 0, this, + new KAction(TransposeCommand::getDiatonicGlobalName(0,0), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDiatonicTranspose()), actionCollection(), "general_diatonic_transpose"); - new KAction(InvertCommand::getGlobalName(0), 0, this, + new KAction(InvertCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInvert()), actionCollection(), "invert"); - new KAction(RetrogradeCommand::getGlobalName(0), 0, this, + new KAction(RetrogradeCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRetrograde()), actionCollection(), "retrograde"); - new KAction(RetrogradeInvertCommand::getGlobalName(0), 0, this, + new KAction(RetrogradeInvertCommand::getGlobalName(0), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRetrogradeInvert()), actionCollection(), "retrograde_invert"); - new KAction(i18n("Jog &Left"), Key_Left + ALT, this, + new KAction(i18n("Jog &Left"), Key_Left + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotJogLeft()), actionCollection(), "jog_left"); - new KAction(i18n("Jog &Right"), Key_Right + ALT, this, + new KAction(i18n("Jog &Right"), Key_Right + ALT, TQT_TQOBJECT(this), TQT_SLOT(slotJogRight()), actionCollection(), "jog_right"); // Control rulers // - new KAction(i18n("Show Velocity Property Ruler"), 0, this, + new KAction(i18n("Show Velocity Property Ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowVelocityControlRuler()), actionCollection(), "show_velocity_control_ruler"); @@ -822,37 +822,37 @@ EditView::setupActions() // // Control Ruler context menu // - new KAction(i18n("Insert item"), 0, this, + new KAction(i18n("Insert item"), 0, TQT_TQOBJECT(this), 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, + new KAction(i18n("Erase selected items"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotEraseControlRulerItem()), actionCollection(), "erase_control_ruler_item"); - new KAction(i18n("Clear ruler"), 0, this, + new KAction(i18n("Clear ruler"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotClearControlRulerItem()), actionCollection(), "clear_control_ruler_item"); - new KAction(i18n("Insert line of controllers"), 0, this, + new KAction(i18n("Insert line of controllers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStartControlLineItem()), actionCollection(), "start_control_line_item"); - new KAction(i18n("Flip forward"), Key_BracketRight, this, + new KAction(i18n("Flip forward"), Key_BracketRight, TQT_TQOBJECT(this), TQT_SLOT(slotFlipForwards()), actionCollection(), "flip_control_events_forward"); - new KAction(i18n("Flip backwards"), Key_BracketLeft, this, + new KAction(i18n("Flip backwards"), Key_BracketLeft, TQT_TQOBJECT(this), TQT_SLOT(slotFlipBackwards()), actionCollection(), "flip_control_events_back"); - new KAction(i18n("Draw property line"), 0, this, + new KAction(i18n("Draw property line"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDrawPropertyLine()), actionCollection(), "draw_property_line"); - new KAction(i18n("Select all property values"), 0, this, + new KAction(i18n("Select all property values"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSelectAllProperties()), actionCollection(), "select_all_properties"); } @@ -891,9 +891,9 @@ EditView::setupAddControlRulerMenu() TQString hexValue; hexValue.sprintf("(0x%x)", it->getControllerValue()); - itemStr = i18n("%1 Controller %2 %3").arg(strtoqstr(it->getName())) - .arg(it->getControllerValue()) - .arg(hexValue); + itemStr = i18n("%1 Controller %2 %3").tqarg(strtoqstr(it->getName())) + .tqarg(it->getControllerValue()) + .tqarg(hexValue); } else if (it->getType() == PitchBend::EventType) itemStr = i18n("Pitch Bend"); @@ -1082,18 +1082,18 @@ EditView::createInsertPitchActionMenu() }; KActionMenu *insertPitchActionMenu = - new KActionMenu(i18n("&Insert Note"), this, "insert_note_actionmenu"); + new KActionMenu(i18n("&Insert Note"), TQT_TQOBJECT(this), "insert_note_actionmenu"); for (int octave = 0; octave <= 2; ++octave) { KActionMenu *menu = insertPitchActionMenu; if (octave == 1) { - menu = new KActionMenu(i18n("&Upper Octave"), this, + menu = new KActionMenu(i18n("&Upper Octave"), TQT_TQOBJECT(this), "insert_note_actionmenu_upper_octave"); - insertPitchActionMenu->insert(new KActionSeparator(this)); + insertPitchActionMenu->insert(new KActionSeparator(TQT_TQOBJECT(this))); insertPitchActionMenu->insert(menu); } else if (octave == 2) { - menu = new KActionMenu(i18n("&Lower Octave"), this, + menu = new KActionMenu(i18n("&Lower Octave"), TQT_TQOBJECT(this), "insert_note_actionmenu_lower_octave"); insertPitchActionMenu->insert(menu); } @@ -1114,10 +1114,10 @@ EditView::createInsertPitchActionMenu() insertPitchAction = new KAction - (flat.arg(notePitchNames[i]), + (flat.tqarg(notePitchNames[i]), CTRL + SHIFT + notePitchKeys[octave][i], - this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), - TQString("insert_%1_flat%2").arg(i).arg(octaveSuffix)); + TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), + TQString("insert_%1_flat%2").tqarg(i).tqarg(octaveSuffix)); menu->insert(insertPitchAction); } @@ -1126,8 +1126,8 @@ EditView::createInsertPitchActionMenu() new KAction (notePitchNames[i], notePitchKeys[octave][i], - this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), - TQString("insert_%1%2").arg(i).arg(octaveSuffix)); + TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), + TQString("insert_%1%2").tqarg(i).tqarg(octaveSuffix)); menu->insert(insertPitchAction); @@ -1137,16 +1137,16 @@ EditView::createInsertPitchActionMenu() insertPitchAction = new KAction - (sharp.arg(notePitchNames[i]), + (sharp.tqarg(notePitchNames[i]), SHIFT + notePitchKeys[octave][i], - this, TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), - TQString("insert_%1_sharp%2").arg(i).arg(octaveSuffix)); + TQT_TQOBJECT(this), TQT_SLOT(slotInsertNoteFromAction()), actionCollection(), + TQString("insert_%1_sharp%2").tqarg(i).tqarg(octaveSuffix)); menu->insert(insertPitchAction); } if (i < 6) - menu->insert(new KActionSeparator(this)); + menu->insert(new KActionSeparator(TQT_TQOBJECT(this))); } } @@ -1351,13 +1351,13 @@ void EditView::slotShowPropertyControlRuler() KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok); KListBox* propList = new KListBox(propChooserDialog.makeVBoxMainWidget()); - new QListBoxRGProperty(propList, BaseProperties::VELOCITY.c_str()); + new TQListBoxRGProperty(propList, BaseProperties::VELOCITY.c_str()); int rc = propChooserDialog.exec(); if (rc == TQDialog::Accepted) { // fix for KDE 3.0 - //QListBoxRGProperty* item = dynamic_cast<QListBoxRGProperty*>(propList->selectedItem()); - QListBoxRGProperty* item = dynamic_cast<QListBoxRGProperty*> + //TQListBoxRGProperty* item = dynamic_cast<TQListBoxRGProperty*>(propList->selectedItem()); + TQListBoxRGProperty* item = dynamic_cast<TQListBoxRGProperty*> (propList->item(propList->currentItem())); if (item) { @@ -1484,7 +1484,7 @@ void EditView::slotTranspose() int dialogDefault = m_config->readNumEntry("lasttransposition", 0); bool ok = false; - int semitones = QInputDialog::getInteger + int semitones = TQInputDialog::getInteger (i18n("Transpose"), i18n("By number of semitones: "), dialogDefault, -127, 127, 1, &ok, this); @@ -1674,7 +1674,7 @@ ControlRuler* EditView::findRuler(const ControlParameter& controller, int &index PropertyControlRuler* EditView::makePropertyControlRuler(PropertyName propertyName) { - TQCanvas* controlRulerCanvas = new TQCanvas(this); + TQCanvas* controlRulerCanvas = new TQCanvas(TQT_TQOBJECT(this)); TQSize viewSize = getViewSize(); controlRulerCanvas->resize(viewSize.width(), ControlRuler::DefaultRulerHeight); // TODO - keep it in sync with main canvas size @@ -1692,7 +1692,7 @@ PropertyControlRuler* EditView::makePropertyControlRuler(PropertyName propertyNa ControllerEventsRuler* EditView::makeControllerEventRuler(const ControlParameter *controller) { - TQCanvas* controlRulerCanvas = new TQCanvas(this); + TQCanvas* controlRulerCanvas = new TQCanvas(TQT_TQOBJECT(this)); TQSize viewSize = getViewSize(); controlRulerCanvas->resize(viewSize.width(), ControlRuler::DefaultRulerHeight); // TODO - keep it in sync with main canvas size // TQCanvas* controlRulerCanvas = ControlRulerCanvasRepository::getCanvas(getCurrentSegment(), controller, diff --git a/src/gui/general/EditView.h b/src/gui/general/EditView.h index e927281..ecbfb6a 100644 --- a/src/gui/general/EditView.h +++ b/src/gui/general/EditView.h @@ -69,6 +69,7 @@ class ActiveItem; class EditView : public EditViewBase { Q_OBJECT + TQ_OBJECT public: @@ -81,7 +82,7 @@ public: EditView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, unsigned int cols, - TQWidget *parent, + TQWidget *tqparent, const char *name = 0); virtual ~EditView(); @@ -140,7 +141,7 @@ public slots: * Called when a mouse press occurred on an active canvas item * * @see ActiveItem - * @see QCanvasItem#setActive + * @see TQCanvasItem#setActive */ virtual void slotActiveItemPressed(TQMouseEvent*, TQCanvasItem*); diff --git a/src/gui/general/EditViewBase.cpp b/src/gui/general/EditViewBase.cpp index 84bdef0..15852c8 100644 --- a/src/gui/general/EditViewBase.cpp +++ b/src/gui/general/EditViewBase.cpp @@ -77,8 +77,8 @@ const unsigned int EditViewBase::NbLayoutRows = 6; EditViewBase::EditViewBase(RosegardenGUIDoc *doc, std::vector<Segment *> segments, unsigned int cols, - TQWidget *parent, const char *name) : - KDockMainWindow(parent, name), + TQWidget *tqparent, const char *name) : + KDockMainWindow(tqparent, name), m_viewNumber( -1), m_viewLocalPropertyPrefix(makeViewLocalPropertyPrefix()), m_config(kapp->config()), @@ -158,33 +158,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard) // Actions all edit views will have - KStdAction::showToolbar(this, TQT_SLOT(slotToggleToolBar()), + KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleToolBar()), actionCollection(), "options_show_toolbar"); - KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()), + KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleStatusBar()), actionCollection(), "options_show_statusbar"); - KStdAction::preferences(this, + KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); - KStdAction::keyBindings(this, + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(this, + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection()); // File menu - KStdAction::save (this, TQT_SIGNAL(saveFile()), actionCollection()); - KStdAction::close(this, TQT_SLOT(slotCloseWindow()), actionCollection()); + KStdAction::save (TQT_TQOBJECT(this), TQT_SIGNAL(saveFile()), actionCollection()); + KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotCloseWindow()), actionCollection()); if (haveClipboard) { - KStdAction::cut (this, TQT_SLOT(slotEditCut()), actionCollection()); - KStdAction::copy (this, TQT_SLOT(slotEditCopy()), actionCollection()); - KStdAction::paste (this, TQT_SLOT(slotEditPaste()), actionCollection()); + KStdAction::cut (TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); + KStdAction::copy (TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); + KStdAction::paste (TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); } new KToolBarPopupAction(i18n("Und&o"), @@ -203,33 +203,33 @@ void EditViewBase::setupActions(TQString rcFileName, bool haveClipboard) TQCanvasPixmap pixmap(pixmapDir + "/toolbar/matrix.png"); TQIconSet icon = TQIconSet(pixmap); - new KAction(i18n("Open in Matri&x Editor"), icon, 0, this, + new KAction(i18n("Open in Matri&x Editor"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInMatrix()), actionCollection(), "open_in_matrix"); pixmap.load(pixmapDir + "/toolbar/matrix-percussion.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, this, + new KAction(i18n("Open in &Percussion Matrix Editor"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInPercussionMatrix()), actionCollection(), "open_in_percussion_matrix"); pixmap.load(pixmapDir + "/toolbar/notation.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Notation Editor"), icon, 0, this, + new KAction(i18n("Open in &Notation Editor"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInNotation()), actionCollection(), "open_in_notation"); pixmap.load(pixmapDir + "/toolbar/eventlist.png"); icon = TQIconSet(pixmap); - new KAction(i18n("Open in &Event List Editor"), icon, 0, this, + new KAction(i18n("Open in &Event List Editor"), icon, 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInEventList()), actionCollection(), "open_in_event_list"); - new KAction(i18n("Set Segment Start Time..."), 0, this, + new KAction(i18n("Set Segment Start Time..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSegmentStartTime()), actionCollection(), "set_segment_start"); - new KAction(i18n("Set Segment Duration..."), 0, this, + new KAction(i18n("Set Segment Duration..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetSegmentDuration()), actionCollection(), "set_segment_duration"); @@ -311,7 +311,7 @@ EditViewBase::makeViewLocalPropertyPrefix() void EditViewBase::paintEvent(TQPaintEvent* e) { // It is possible for this function to be called re-entrantly, - // because a re-layout procedure may deliberately ask the event + // because a re-tqlayout procedure may deliberately ask the event // loop to process some more events so as to keep the GUI looking // responsive. If that happens, we remember the events that came // in in the middle of one paintEvent call and process their union @@ -362,7 +362,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e) // // If we have more than one segment modified, we need to update // them all at once with the same time range, otherwise we can run - // into problems when the layout of one depends on the others. So + // into problems when the tqlayout of one depends on the others. So // we use updateStart/End to calculate a bounding range for all // modifications. @@ -374,12 +374,12 @@ void EditViewBase::paintEvent(TQPaintEvent* e) Segment* segment = m_segments[i]; unsigned int refreshStatusId = m_segmentsRefreshStatusIds[i]; - SegmentRefreshStatus &refreshStatus = - segment->getRefreshStatus(refreshStatusId); + SegmentRefreshtqStatus &refreshtqStatus = + segment->getRefreshtqStatus(refreshStatusId); - if (refreshStatus.needsRefresh() && isCompositionModified()) { + if (refreshtqStatus.needsRefresh() && isCompositionModified()) { - // if composition is also modified, relayout everything + // if composition is also modified, retqlayout everything refreshSegment(0); segmentsToUpdate = 0; break; @@ -392,10 +392,10 @@ void EditViewBase::paintEvent(TQPaintEvent* e) m_timeSigNotifier->reset(); break; - } else if (refreshStatus.needsRefresh()) { + } else if (refreshtqStatus.needsRefresh()) { - timeT startTime = refreshStatus.from(), - endTime = refreshStatus.to(); + timeT startTime = refreshtqStatus.from(), + endTime = refreshtqStatus.to(); if (segmentsToUpdate == 0 || startTime < updateStart) { updateStart = startTime; @@ -406,7 +406,7 @@ void EditViewBase::paintEvent(TQPaintEvent* e) singleSegment = segment; ++segmentsToUpdate; - refreshStatus.setNeedsRefresh(false); + refreshtqStatus.setNeedsRefresh(false); m_needUpdate = true; } } @@ -518,13 +518,13 @@ void EditViewBase::initSegmentRefreshStatusIds() bool EditViewBase::isCompositionModified() { - return getDocument()->getComposition().getRefreshStatus + return getDocument()->getComposition().getRefreshtqStatus (m_compositionRefreshStatusId).needsRefresh(); } void EditViewBase::setCompositionModified(bool c) { - getDocument()->getComposition().getRefreshStatus + getDocument()->getComposition().getRefreshtqStatus (m_compositionRefreshStatusId).setNeedsRefresh(c); } diff --git a/src/gui/general/EditViewBase.h b/src/gui/general/EditViewBase.h index f263795..9d18d3b 100644 --- a/src/gui/general/EditViewBase.h +++ b/src/gui/general/EditViewBase.h @@ -60,6 +60,7 @@ class EditViewBase : public KDockMainWindow { Q_OBJECT + TQ_OBJECT public: @@ -72,7 +73,7 @@ public: EditViewBase(RosegardenGUIDoc *doc, std::vector<Segment *> segments, unsigned int cols, - TQWidget *parent, + TQWidget *tqparent, const char *name = 0); virtual ~EditViewBase(); @@ -310,7 +311,7 @@ protected: protected slots: /** * save general Options like all bar positions and status as well - * as the geometry and the recent file list to the configuration + * as the tqgeometry and the recent file list to the configuration * file */ virtual void slotSaveOptions(); diff --git a/src/gui/general/GUIPalette.cpp b/src/gui/general/GUIPalette.cpp index a58886e..fec72ca 100644 --- a/src/gui/general/GUIPalette.cpp +++ b/src/gui/general/GUIPalette.cpp @@ -59,10 +59,10 @@ TQColor GUIPalette::convertColour(const Colour& input) GUIPalette::GUIPalette() { - m_defaultsMap[ActiveRecordTrack] = Qt::red; + m_defaultsMap[ActiveRecordTrack] = TQt::red; m_defaultsMap[SegmentCanvas] = TQColor(230, 230, 230); - m_defaultsMap[SegmentBorder] = Qt::black; + m_defaultsMap[SegmentBorder] = TQt::black; // 1.0 colors // m_defaultsMap[RecordingInternalSegmentBlock] = TQColor(255, 182, 193); @@ -74,22 +74,22 @@ GUIPalette::GUIPalette() // audio recording preview (pale red) m_defaultsMap[RecordingAudioSegmentBlock] = TQColor(255, 182, 193); - m_defaultsMap[RecordingSegmentBorder] = Qt::black; + m_defaultsMap[RecordingSegmentBorder] = TQt::black; m_defaultsMap[RepeatSegmentBorder] = TQColor(130, 133, 170); m_defaultsMap[SegmentAudioPreview] = TQColor(39, 71, 22); - m_defaultsMap[SegmentInternalPreview] = Qt::white; - m_defaultsMap[SegmentLabel] = Qt::black; - m_defaultsMap[SegmentSplitLine] = Qt::black; + m_defaultsMap[SegmentInternalPreview] = TQt::white; + m_defaultsMap[SegmentLabel] = TQt::black; + m_defaultsMap[SegmentSplitLine] = TQt::black; - m_defaultsMap[MatrixElementBorder] = Qt::black; + m_defaultsMap[MatrixElementBorder] = TQt::black; m_defaultsMap[MatrixElementBlock] = TQColor(98, 128, 232); - m_defaultsMap[MatrixOverlapBlock] = Qt::black; + m_defaultsMap[MatrixOverlapBlock] = TQt::black; m_defaultsMap[LoopRulerBackground] = TQColor(120, 120, 120); - m_defaultsMap[LoopRulerForeground] = Qt::white; - m_defaultsMap[LoopHighlight] = Qt::white; + m_defaultsMap[LoopRulerForeground] = TQt::white; + m_defaultsMap[LoopHighlight] = TQt::white; m_defaultsMap[TempoBase] = TQColor(197, 211, 125); @@ -97,13 +97,13 @@ GUIPalette::GUIPalette() // m_defaultsMap[TextRulerBackground] = TQColor(120, 90, 238, TQColor::Hsv); // m_defaultsMap[TextRulerBackground] = TQColor(210, 220, 140); m_defaultsMap[TextRulerBackground] = TQColor(226, 232, 187); - m_defaultsMap[TextRulerForeground] = Qt::white; + m_defaultsMap[TextRulerForeground] = TQt::white; m_defaultsMap[ChordNameRulerBackground] = TQColor(230, 230, 230); - m_defaultsMap[ChordNameRulerForeground] = Qt::black; + m_defaultsMap[ChordNameRulerForeground] = TQt::black; m_defaultsMap[RawNoteRulerBackground] = TQColor(240, 240, 240); - m_defaultsMap[RawNoteRulerForeground] = Qt::black; + m_defaultsMap[RawNoteRulerForeground] = TQt::black; m_defaultsMap[LevelMeterGreen] = TQColor(0, 200, 0); m_defaultsMap[LevelMeterOrange] = TQColor(255, 165, 0); @@ -116,14 +116,14 @@ GUIPalette::GUIPalette() // m_defaultsMap[LevelMeterSolidRed] = TQColor(255, 50, 50); m_defaultsMap[LevelMeterSolidRed] = TQColor(255, 0, 0); - m_defaultsMap[BarLine] = Qt::black; + m_defaultsMap[BarLine] = TQt::black; m_defaultsMap[BarLineIncorrect] = TQColor(211, 0, 31); m_defaultsMap[BeatLine] = TQColor(100, 100, 100); m_defaultsMap[SubBeatLine] = TQColor(212, 212, 212); m_defaultsMap[StaffConnectingLine] = TQColor(192, 192, 192); m_defaultsMap[StaffConnectingTerminatingLine] = TQColor(128, 128, 128); - m_defaultsMap[Pointer] = Qt::darkBlue; + m_defaultsMap[Pointer] = TQt::darkBlue; m_defaultsMap[PointerRuler] = TQColor(100, 100, 100); m_defaultsMap[InsertCursor] = TQColor(160, 104, 186); @@ -151,12 +151,12 @@ GUIPalette::GUIPalette() m_defaultsMap[TextLilyPondDirectiveBackground] = TQColor(95, 157, 87); - m_defaultsMap[AudioCountdownBackground] = Qt::darkGray; - m_defaultsMap[AudioCountdownForeground] = Qt::red; + m_defaultsMap[AudioCountdownBackground] = TQt::darkGray; + m_defaultsMap[AudioCountdownForeground] = TQt::red; -// m_defaultsMap[RotaryFloatBackground] = Qt::cyan; +// m_defaultsMap[RotaryFloatBackground] = TQt::cyan; m_defaultsMap[RotaryFloatBackground] = TQColor(182, 222, 255); - m_defaultsMap[RotaryFloatForeground] = Qt::black; + m_defaultsMap[RotaryFloatForeground] = TQt::black; m_defaultsMap[RotaryPastelBlue] = TQColor(205, 212, 255); m_defaultsMap[RotaryPastelRed] = TQColor(255, 168, 169); @@ -174,7 +174,7 @@ GUIPalette::GUIPalette() m_defaultsMap[MarkerBackground] = TQColor(185, 255, 248); - m_defaultsMap[QuickMarker] = Qt::red; + m_defaultsMap[QuickMarker] = TQt::red; // m_defaultsMap[MuteTrackLED] = TQColor(218, 190, 230, TQColor::Hsv); m_defaultsMap[MuteTrackLED] = TQColor(211, 194, 238, TQColor::Hsv); diff --git a/src/gui/general/LinedStaff.cpp b/src/gui/general/LinedStaff.cpp index 5a4fbb6..5ca0c90 100644 --- a/src/gui/general/LinedStaff.cpp +++ b/src/gui/general/LinedStaff.cpp @@ -436,15 +436,15 @@ LinedStaff::getHeightAtCanvasCoords(double x, int y) const } } -QRect +TQRect LinedStaff::getBarExtents(double x, int y) const { int row = getRowForCanvasCoords(x, y); for (int i = 1; i < m_barLines.size(); ++i) { - double layoutX = m_barLines[i]->getLayoutX(); - int barRow = getRowForLayoutX(layoutX); + double tqlayoutX = m_barLines[i]->getLayoutX(); + int barRow = getRowForLayoutX(tqlayoutX); if (m_pageMode != LinearMode && (barRow < row)) continue; @@ -572,7 +572,7 @@ LinedStaff::getCanvasXForLeftOfRow(int row) const } void -LinedStaff::sizeStaff(HorizontalLayoutEngine &layout) +LinedStaff::sizeStaff(HorizontalLayoutEngine &tqlayout) { Profiler profiler("LinedStaff::sizeStaff", true); @@ -582,19 +582,19 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &layout) // RG_DEBUG << "LinedStaff::sizeStaff" << endl; - int lastBar = layout.getLastVisibleBarOnStaff(*this); + int lastBar = tqlayout.getLastVisibleBarOnStaff(*this); double xleft = 0, xright = 0; bool haveXLeft = false; - xright = layout.getBarPosition(lastBar) - 1; + xright = tqlayout.getBarPosition(lastBar) - 1; TimeSignature currentTimeSignature; - for (int barNo = layout.getFirstVisibleBarOnStaff(*this); + for (int barNo = tqlayout.getFirstVisibleBarOnStaff(*this); barNo <= lastBar; ++barNo) { - double x = layout.getBarPosition(barNo); + double x = tqlayout.getBarPosition(barNo); if (!haveXLeft) { xleft = x; @@ -603,7 +603,7 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &layout) double timeSigX = 0; TimeSignature timeSig; - bool isNew = layout.getTimeSignaturePosition(*this, barNo, timeSig, timeSigX); + bool isNew = tqlayout.getTimeSignaturePosition(*this, barNo, timeSig, timeSigX); if (isNew && barNo < lastBar) { currentTimeSignature = timeSig; @@ -619,8 +619,8 @@ LinedStaff::sizeStaff(HorizontalLayoutEngine &layout) insertBar(x, ((barNo == lastBar) ? 0 : - (layout.getBarPosition(barNo + 1) - x)), - layout.isBarCorrectOnStaff(*this, barNo - 1), + (tqlayout.getBarPosition(barNo + 1) - x)), + tqlayout.isBarCorrectOnStaff(*this, barNo - 1), currentTimeSignature, barNo, showBarNo); @@ -667,41 +667,41 @@ LinedStaff::deleteBars() } void -LinedStaff::insertBar(double layoutX, double width, bool isCorrect, +LinedStaff::insertBar(double tqlayoutX, double width, bool isCorrect, const TimeSignature &timeSig, int barNo, bool showBarNo) { - // RG_DEBUG << "insertBar: " << layoutX << ", " << width + // RG_DEBUG << "insertBar: " << tqlayoutX << ", " << width // << ", " << isCorrect << endl; int barThickness = m_lineThickness * 5 / 4; // hack to ensure the bar line appears on the correct row in - // notation page layouts, with a conditional to prevent us from + // notation page tqlayouts, with a conditional to prevent us from // moving the bar and beat lines in the matrix if (!showBeatLines()) { if (width > 0.01) { // not final bar in staff - layoutX += 1; + tqlayoutX += 1; } else { - layoutX -= 1; + tqlayoutX -= 1; } } - int row = getRowForLayoutX(layoutX); - double x = getCanvasXForLayoutX(layoutX); + int row = getRowForLayoutX(tqlayoutX); + double x = getCanvasXForLayoutX(tqlayoutX); int y = getCanvasYForTopLine(row); bool firstBarInRow = false, lastBarInRow = false; if (m_pageMode != LinearMode && - (getRowForLayoutX(layoutX) > - getRowForLayoutX(layoutX - getMargin() - 2))) + (getRowForLayoutX(tqlayoutX) > + getRowForLayoutX(tqlayoutX - getMargin() - 2))) firstBarInRow = true; if (m_pageMode != LinearMode && width > 0.01 && // width == 0 for final bar in staff - (getRowForLayoutX(layoutX) < - getRowForLayoutX(layoutX + width + getMargin() + 2))) + (getRowForLayoutX(tqlayoutX) < + getRowForLayoutX(tqlayoutX + width + getMargin() + 2))) lastBarInRow = true; BarStyle style = getBarStyle(barNo); @@ -710,7 +710,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect, style = RepeatStartBar; if (firstBarInRow) - insertRepeatedClefAndKey(layoutX, barNo); + insertRepeatedClefAndKey(tqlayoutX, barNo); // If we're supposed to be hiding bar lines, we do just that -- // create them as normal, then hide them. We can't simply not @@ -725,7 +725,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect, inset = getBarInset(barNo, firstBarInRow); } - BarLine *line = new BarLine(m_canvas, layoutX, + BarLine *line = new BarLine(m_canvas, tqlayoutX, getBarLineHeight(), barThickness, getLineSpacing(), (int)inset, style); @@ -745,7 +745,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect, else line->show(); - // The bar lines have to be in order of layout-x (there's no + // The bar lines have to be in order of tqlayout-x (there's no // such interesting stipulation for beat or connecting lines) BarLineList::iterator insertPoint = lower_bound (m_barLines.begin(), m_barLines.end(), line, compareBars); @@ -758,7 +758,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect, if (style == RepeatBothBar) style = RepeatEndBar; - BarLine *eline = new BarLine(m_canvas, layoutX, + BarLine *eline = new BarLine(m_canvas, tqlayoutX, getBarLineHeight(), barThickness, getLineSpacing(), 0, style); eline->moveBy(xe, y); @@ -782,7 +782,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect, TQFont font; font.setPixelSize(m_resolution * 3 / 2); TQFontMetrics metrics(font); - TQString text = TQString("%1").arg(barNo + 1); + TQString text = TQString("%1").tqarg(barNo + 1); TQCanvasItem *barNoText = new TQCanvasText(text, font, m_canvas); barNoText->setX(x); @@ -814,7 +814,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect, for (int gridLine = hidden ? 0 : 1; gridLine < gridLines; ++gridLine) { - rect = new QCanvasRectangle + rect = new TQCanvasRectangle (0, 0, barThickness, getBarLineHeight(), m_canvas); rect->moveBy(x + gridLine * dx, y); @@ -834,14 +834,14 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect, rect->setZ( -1); rect->show(); // show beat lines even if the bar lines are hidden - LineRec beatLine(layoutX + gridLine * dx, rect); + LineRec beatLine(tqlayoutX + gridLine * dx, rect); m_beatLines.push_back(beatLine); } } if (m_connectingLineLength > 0) { - rect = new QCanvasRectangle + rect = new TQCanvasRectangle (0, 0, barThickness, m_connectingLineLength, m_canvas); rect->moveBy(x, y); @@ -854,7 +854,7 @@ LinedStaff::insertBar(double layoutX, double width, bool isCorrect, else rect->show(); - LineRec connectingLine(layoutX, rect); + LineRec connectingLine(tqlayoutX, rect); m_barConnectingLines.push_back(connectingLine); } } @@ -1009,7 +1009,7 @@ LinedStaff::resizeStaffLineRow(int row, double x, double length) // rather arbitrary (dup in insertBar) int barThickness = m_resolution / 12 + 1; y = getCanvasYForTopLine(row); - TQCanvasRectangle *line = new QCanvasRectangle + TQCanvasRectangle *line = new TQCanvasRectangle (int(x + length), y, barThickness, m_connectingLineLength, m_canvas); line->setPen(GUIPalette::getColour(GUIPalette::StaffConnectingTerminatingLine)); line->setBrush(GUIPalette::getColour(GUIPalette::StaffConnectingTerminatingLine)); @@ -1046,7 +1046,7 @@ LinedStaff::resizeStaffLineRow(int row, double x, double length) m_staffLines[row][lineIndex] = 0; if (m_lineThickness > 1) { - TQCanvasRectangle *rline = new QCanvasRectangle + TQCanvasRectangle *rline = new TQCanvasRectangle (int(x), y, int(length), m_lineThickness, m_canvas); rline->setPen(lineColour); rline->setBrush(lineColour); @@ -1110,10 +1110,10 @@ LinedStaff::getLayoutXOfInsertCursor() const } timeT -LinedStaff::getInsertCursorTime(HorizontalLayoutEngine &layout) const +LinedStaff::getInsertCursorTime(HorizontalLayoutEngine &tqlayout) const { if (m_insertCursorTimeValid) return m_insertCursorTime; - return layout.getTimeForX(getLayoutXOfInsertCursor()); + return tqlayout.getTimeForX(getLayoutXOfInsertCursor()); } void @@ -1141,16 +1141,16 @@ LinedStaff::setPointerPosition(double canvasX, int canvasY) } void -LinedStaff::setPointerPosition(HorizontalLayoutEngine &layout, +LinedStaff::setPointerPosition(HorizontalLayoutEngine &tqlayout, timeT time) { - setPointerPosition(layout.getXForTime(time)); + setPointerPosition(tqlayout.getXForTime(time)); } void -LinedStaff::setPointerPosition(double layoutX) +LinedStaff::setPointerPosition(double tqlayoutX) { - LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(layoutX, 0); + LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(tqlayoutX, 0); setPointerPosition(coords.first, coords.second); } @@ -1176,10 +1176,10 @@ LinedStaff::setInsertCursorPosition(double canvasX, int canvasY) } void -LinedStaff::setInsertCursorPosition(HorizontalLayoutEngine &layout, +LinedStaff::setInsertCursorPosition(HorizontalLayoutEngine &tqlayout, timeT time) { - double x = layout.getXForTime(time); + double x = tqlayout.getXForTime(time); LinedStaffCoords coords = getCanvasCoordsForLayoutCoords(x, 0); setInsertCursorPosition(coords.first, coords.second); m_insertCursorTime = time; diff --git a/src/gui/general/LinedStaff.h b/src/gui/general/LinedStaff.h index 359becf..e7dab8f 100644 --- a/src/gui/general/LinedStaff.h +++ b/src/gui/general/LinedStaff.h @@ -87,7 +87,7 @@ public: protected: /** * Create a new LinedStaff for the given Segment, with a - * linear layout. + * linear tqlayout. * * \a id is an arbitrary id for the staff in its view, * not used within the LinedStaff implementation but @@ -104,7 +104,7 @@ protected: /** * Create a new LinedStaff for the given Segment, with a - * page layout. + * page tqlayout. * * \a id is an arbitrary id for the staff in its view, * not used within the LinedStaff implementation but @@ -117,7 +117,7 @@ protected: * staff line should be * * \a pageWidth is the width of a page, to determine - * when to break lines for page layout + * when to break lines for page tqlayout * * \a rowsPerPage is the number of rows to a page, or zero * for a single continuous page @@ -131,7 +131,7 @@ protected: /** * Create a new LinedStaff for the given Segment, with - * either page or linear layout. + * either page or linear tqlayout. */ LinedStaff(TQCanvas *, Segment *, SnapGrid *, int id, int resolution, int lineThickness, PageMode pageMode, @@ -304,14 +304,14 @@ public: virtual int getTitleHeight() const; /** - * Returns the width of the entire staff after layout. Call + * Returns the width of the entire staff after tqlayout. Call * this only after you've done the full sizeStaff/positionElements * procedure. */ virtual double getTotalWidth() const; /** - * Returns the height of the entire staff after layout. Call + * Returns the height of the entire staff after tqlayout. Call * this only after you've done the full sizeStaff/positionElements * procedure. If there are multiple rows, this will be the * height of all rows, including any space between rows that @@ -383,26 +383,26 @@ public: virtual void setCurrent(bool current); /** - * Move the playback pointer to the layout-X coordinate + * Move the playback pointer to the tqlayout-X coordinate * corresponding to the given time, and show it. */ virtual void setPointerPosition (HorizontalLayoutEngine&, timeT); /** - * Move the playback pointer to the layout-X coordinate + * Move the playback pointer to the tqlayout-X coordinate * corresponding to the given canvas coordinates, and show it. */ virtual void setPointerPosition(double x, int y); /** - * Move the playback pointer to the given layout-X + * Move the playback pointer to the given tqlayout-X * coordinate, and show it. */ virtual void setPointerPosition(double x); /** - * Returns the layout-X coordinate corresponding to the current + * Returns the tqlayout-X coordinate corresponding to the current * position of the playback pointer. */ virtual double getLayoutXOfPointer() const; @@ -419,19 +419,19 @@ public: virtual void hidePointer(); /** - * Move the insertion cursor to the layout-X coordinate + * Move the insertion cursor to the tqlayout-X coordinate * corresponding to the given time, and show it. */ virtual void setInsertCursorPosition(HorizontalLayoutEngine&, timeT); /** - * Move the insertion cursor to the layout-X coordinate + * Move the insertion cursor to the tqlayout-X coordinate * corresponding to the given canvas coordinates, and show it. */ virtual void setInsertCursorPosition(double x, int y); /** - * Returns the layout-X coordinate corresponding to the current + * Returns the tqlayout-X coordinate corresponding to the current * position of the insertion cursor. Returns -1 if this staff * is not current or there is some other problem. */ @@ -454,8 +454,8 @@ public: virtual void hideInsertCursor(); /** - * Query the given horizontal layout object (which is assumed to - * have just completed its layout procedure) to determine the + * Query the given horizontal tqlayout object (which is assumed to + * have just completed its tqlayout procedure) to determine the * required extents of the staff and the positions of the bars, * and create the bars and staff lines accordingly. It may be * called either before or after renderElements and/or @@ -464,7 +464,7 @@ public: * No bars or staff lines will appear unless this method has * been called. */ - virtual void sizeStaff(HorizontalLayoutEngine& layout); + virtual void sizeStaff(HorizontalLayoutEngine& tqlayout); /** * Generate or re-generate sprites for all the elements between @@ -486,9 +486,9 @@ public: /** * Assign suitable coordinates to the elements on the staff - * between the start and end times, based entirely on the layout + * between the start and end times, based entirely on the tqlayout * X and Y coordinates they were given by the horizontal and - * vertical layout processes. + * vertical tqlayout processes. * * The implementation is free to render any elements it * chooses in this method as well. @@ -519,21 +519,21 @@ public: * Also return the clef and key in force at these coordinates. * * The default implementation should suit for subclasses that only - * show a single element per layout X coordinate. + * show a single element per tqlayout X coordinate. */ virtual ViewElementList::iterator getClosestElementToCanvasCoords (double x, int y, Event *&clef, Event *&key, bool notesAndRestsOnly = false, int proximityThreshold = 10) { - LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(x, y); + LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(x, y); return getClosestElementToLayoutX - (layoutCoords.first, clef, key, + (tqlayoutCoords.first, clef, key, notesAndRestsOnly, proximityThreshold); } /** * Return an iterator pointing to the nearest view element to the - * given layout x-coordinate. + * given tqlayout x-coordinate. * * If notesAndRestsOnly is true, do not return any view element * other than a note or rest. @@ -564,12 +564,12 @@ public: * * * The default implementation should suit for subclasses that only - * show a single element per layout X coordinate. + * show a single element per tqlayout X coordinate. */ virtual ViewElementList::iterator getElementUnderCanvasCoords (double x, int y, Event *&clef, Event *&key) { - LinedStaffCoords layoutCoords = getLayoutCoordsForCanvasCoords(x, y); - return getElementUnderLayoutX(layoutCoords.first, clef, key); + LinedStaffCoords tqlayoutCoords = getLayoutCoordsForCanvasCoords(x, y); + return getElementUnderLayoutX(tqlayoutCoords.first, clef, key); } /** @@ -627,13 +627,13 @@ public: protected: // Methods that the subclass may (indeed, should) use to convert - // between the layout coordinates of elements and their canvas + // between the tqlayout coordinates of elements and their canvas // coordinates. These are deliberately not virtual. - // Note that even linear-layout staffs have multiple rows; their + // Note that even linear-tqlayout staffs have multiple rows; their // rows all have the same y coordinate but increasing x // coordinates, instead of the other way around. (The only reason - // for this is that it seems to be more efficient from the QCanvas + // for this is that it seems to be more efficient from the TQCanvas // perspective to create and manipulate many relatively short // canvas lines rather than a smaller number of very long ones.) @@ -682,7 +682,7 @@ protected: // signatures, override the deleteTimeSignatures and // insertTimeSignature methods. For repeated clefs and keys at // the start of each row, override deleteRepeatedClefsAndKeys - // and insertRepeatedClefAndKey, but note that your layout class + // and insertRepeatedClefAndKey, but note that your tqlayout class // will need to allot the space for them separately. virtual void resizeStaffLines(); @@ -690,18 +690,18 @@ protected: virtual void resizeStaffLineRow(int row, double offset, double length); virtual void deleteBars(); - virtual void insertBar(double layoutX, double width, bool isCorrect, + virtual void insertBar(double tqlayoutX, double width, bool isCorrect, const TimeSignature &, int barNo, bool showBarNo); // The default implementations of the following two are empty. virtual void deleteTimeSignatures(); - virtual void insertTimeSignature(double layoutX, + virtual void insertTimeSignature(double tqlayoutX, const TimeSignature &); // The default implementations of the following two are empty. virtual void deleteRepeatedClefsAndKeys(); - virtual void insertRepeatedClefAndKey(double layoutX, int barNo); + virtual void insertRepeatedClefAndKey(double tqlayoutX, int barNo); void initCursors(); @@ -737,7 +737,7 @@ protected: ItemMatrix m_staffLines; ItemList m_staffConnectingLines; - typedef std::pair<double, TQCanvasItem *> LineRec; // layout-x, line + typedef std::pair<double, TQCanvasItem *> LineRec; // tqlayout-x, line typedef FastVector<LineRec> LineRecList; typedef FastVector<BarLine *> BarLineList;//!!! should be multiset I reckon static bool compareBars(const BarLine *, const BarLine *); diff --git a/src/gui/general/MidiPitchLabel.cpp b/src/gui/general/MidiPitchLabel.cpp index f2d714d..a103234 100644 --- a/src/gui/general/MidiPitchLabel.cpp +++ b/src/gui/general/MidiPitchLabel.cpp @@ -55,7 +55,7 @@ MidiPitchLabel::MidiPitchLabel(int pitch) int baseOctave = config->readNumEntry("midipitchoctave", -2); int octave = (int)(((float)pitch) / 12.0) + baseOctave; - m_midiNote = notes[pitch % 12].arg(octave); + m_midiNote = notes[pitch % 12].tqarg(octave); } } @@ -65,8 +65,8 @@ MidiPitchLabel::getString() const return std::string(m_midiNote.utf8().data()); } -QString -MidiPitchLabel::getQString() const +TQString +MidiPitchLabel::getTQString() const { return m_midiNote; } diff --git a/src/gui/general/MidiPitchLabel.h b/src/gui/general/MidiPitchLabel.h index 4bc5253..b5fe4c8 100644 --- a/src/gui/general/MidiPitchLabel.h +++ b/src/gui/general/MidiPitchLabel.h @@ -43,7 +43,7 @@ public: MidiPitchLabel(int pitch); std::string getString() const; - TQString getQString() const; + TQString getTQString() const; private: TQString m_midiNote; diff --git a/src/gui/general/PixmapFunctions.cpp b/src/gui/general/PixmapFunctions.cpp index f61ff11..50dff1a 100644 --- a/src/gui/general/PixmapFunctions.cpp +++ b/src/gui/general/PixmapFunctions.cpp @@ -36,8 +36,8 @@ namespace Rosegarden { -QBitmap -PixmapFunctions::generateMask(const TQPixmap &map, const QRgb &px) +TQBitmap +PixmapFunctions::generateMask(const TQPixmap &map, const TQRgb &px) { TQImage i(map.convertToImage()); TQImage im(i.width(), i.height(), 1, 2, TQImage::LittleEndian); @@ -57,18 +57,18 @@ PixmapFunctions::generateMask(const TQPixmap &map, const QRgb &px) return m; } -QBitmap +TQBitmap PixmapFunctions::generateMask(const TQPixmap &map) { TQImage i(map.convertToImage()); TQImage im(i.width(), i.height(), 1, 2, TQImage::LittleEndian); - QRgb px0(i.pixel(0, 0)); - QRgb px1(i.pixel(i.width() - 1, 0)); - QRgb px2(i.pixel(i.width() - 1, i.height() - 1)); - QRgb px3(i.pixel(0, i.height() - 1)); + TQRgb px0(i.pixel(0, 0)); + TQRgb px1(i.pixel(i.width() - 1, 0)); + TQRgb px2(i.pixel(i.width() - 1, i.height() - 1)); + TQRgb px3(i.pixel(0, i.height() - 1)); - QRgb px(px0); + TQRgb px(px0); if (px0 != px2 && px1 == px3) px = px1; @@ -87,7 +87,7 @@ PixmapFunctions::generateMask(const TQPixmap &map) return m; } -QPixmap +TQPixmap PixmapFunctions::colourPixmap(const TQPixmap &map, int hue, int minValue) { // assumes pixmap is currently in shades of grey; maps black -> @@ -132,7 +132,7 @@ PixmapFunctions::colourPixmap(const TQPixmap &map, int hue, int minValue) return rmap; } -QPixmap +TQPixmap PixmapFunctions::shadePixmap(const TQPixmap &map) { TQImage image = map.convertToImage(); @@ -161,7 +161,7 @@ PixmapFunctions::shadePixmap(const TQPixmap &map) return rmap; } -QPixmap +TQPixmap PixmapFunctions::flipVertical(const TQPixmap &map) { TQPixmap rmap; @@ -178,7 +178,7 @@ PixmapFunctions::flipVertical(const TQPixmap &map) return rmap; } -QPixmap +TQPixmap PixmapFunctions::flipHorizontal(const TQPixmap &map) { TQPixmap rmap; @@ -249,7 +249,7 @@ PixmapFunctions::drawPixmapMasked(TQPixmap &dest, TQBitmap &destMask, if (ism.depth() == 1 && ism.pixel(x, y) == 0) continue; - if (ism.pixel(x, y) == Qt::white.rgb()) + if (ism.pixel(x, y) == TQt::white.rgb()) continue; int x1 = x + x0; diff --git a/src/gui/general/PixmapFunctions.h b/src/gui/general/PixmapFunctions.h index ea05693..22b743b 100644 --- a/src/gui/general/PixmapFunctions.h +++ b/src/gui/general/PixmapFunctions.h @@ -40,9 +40,9 @@ class PixmapFunctions { public: /** - * Generate a heuristic mask for the given pixmap. Unlike - * TQPixmap::createHeuristicMask, this removes from the mask all - * pixels that are apparently "background" even if they appear in + * Generate a heuristic tqmask for the given pixmap. Unlike + * TQPixmap::createHeuristicMask, this removes from the tqmask all + * pixels that are aptqparently "background" even if they appear in * holes in the middle of the image. This is more usually what we * want than the default behaviour of createHeuristicMask. * @@ -50,12 +50,12 @@ public: * * This function is slow. */ - static TQBitmap generateMask(const TQPixmap &map, const QRgb &rgb); + static TQBitmap generateMask(const TQPixmap &map, const TQRgb &rgb); /** - * Generate a heuristic mask for the given pixmap. Unlike - * TQPixmap::createHeuristicMask, this removes from the mask all - * pixels that are apparently "background" even if they appear in + * Generate a heuristic tqmask for the given pixmap. Unlike + * TQPixmap::createHeuristicMask, this removes from the tqmask all + * pixels that are aptqparently "background" even if they appear in * holes in the middle of the image. This is more usually what we * want than the default behaviour of createHeuristicMask. * @@ -78,23 +78,23 @@ public: */ static TQPixmap shadePixmap(const TQPixmap &map); - /// Return a TQPixmap that is a mirror image of map (including mask) + /// Return a TQPixmap that is a mirror image of map (including tqmask) static TQPixmap flipVertical(const TQPixmap &map); - /// Return a TQPixmap that is a mirror image of map (including mask) + /// Return a TQPixmap that is a mirror image of map (including tqmask) static TQPixmap flipHorizontal(const TQPixmap &map); - /// Return left and right parts of the QPixmap + /// Return left and right parts of the TQPixmap static std::pair<TQPixmap, TQPixmap> splitPixmap(const TQPixmap &original, int x); /** * Using TQPainter::drawPixmap to draw one pixmap on another does - * not appear to take the mask into account properly. Background + * not appear to take the tqmask into account properly. Background * pixels in the second pixmap erase foreground pixels in the - * first one, regardless of whether they're masked or not. This + * first one, regardless of whether they're tqmasked or not. This * function does what I expect. * - * Note that the source pixmap _must_ have a mask. + * Note that the source pixmap _must_ have a tqmask. */ static void drawPixmapMasked(TQPixmap &dest, TQBitmap &destMask, int x, int y, diff --git a/src/gui/general/PresetGroup.cpp b/src/gui/general/PresetGroup.cpp index bd5974f..050c487 100644 --- a/src/gui/general/PresetGroup.cpp +++ b/src/gui/general/PresetGroup.cpp @@ -70,22 +70,22 @@ PresetGroup::PresetGroup() : TQString language = KGlobal::locale()->language(); TQString presetFileName = TQString("%1/presets-%2.xml") - .arg(m_presetDirectory).arg(language); + .tqarg(m_presetDirectory).tqarg(language); if (!TQFileInfo(presetFileName).isReadable()) { RG_DEBUG << "Failed to open " << presetFileName << endl; - language.replace(TQRegExp("_.*$"), ""); + language.tqreplace(TQRegExp("_.*$"), ""); presetFileName = TQString("%1/presets-%2.xml") - .arg(m_presetDirectory).arg(language); + .tqarg(m_presetDirectory).tqarg(language); if (!TQFileInfo(presetFileName).isReadable()) { RG_DEBUG << "Failed to open " << presetFileName << endl; presetFileName = TQString("%1/presets.xml") - .arg(m_presetDirectory); + .tqarg(m_presetDirectory); if (!TQFileInfo(presetFileName).isReadable()) { @@ -247,10 +247,10 @@ PresetGroup::error(const TQXmlParseException& exception) RG_DEBUG << "PresetGroup::error(): jubilation and glee, we have an error, whee!" << endl; m_errorString = TQString("%1 at line %2, column %3: %4") - .arg(exception.message()) - .arg(exception.lineNumber()) - .arg(exception.columnNumber()) - .arg(m_errorString); + .tqarg(exception.message()) + .tqarg(exception.lineNumber()) + .tqarg(exception.columnNumber()) + .tqarg(m_errorString); return TQXmlDefaultHandler::error(exception); } @@ -259,10 +259,10 @@ PresetGroup::fatalError(const TQXmlParseException& exception) { RG_DEBUG << "PresetGroup::fatalError(): double your jubilation, and triple your glee, a fatal error doth it be!" << endl; m_errorString = TQString("%1 at line %2, column %3: %4") - .arg(exception.message()) - .arg(exception.lineNumber()) - .arg(exception.columnNumber()) - .arg(m_errorString); + .tqarg(exception.message()) + .tqarg(exception.lineNumber()) + .tqarg(exception.columnNumber()) + .tqarg(m_errorString); return TQXmlDefaultHandler::fatalError(exception); } diff --git a/src/gui/general/PresetGroup.h b/src/gui/general/PresetGroup.h index 5397838..03298b2 100644 --- a/src/gui/general/PresetGroup.h +++ b/src/gui/general/PresetGroup.h @@ -46,7 +46,7 @@ namespace Rosegarden * Read presets.xml from disk and store a collection of PresetElement objects * which can then be used to populate and run the chooser GUI */ -class PresetGroup : public QXmlDefaultHandler +class PresetGroup : public TQXmlDefaultHandler { public: typedef Exception PresetFileReadFailed; diff --git a/src/gui/general/PresetHandlerDialog.cpp b/src/gui/general/PresetHandlerDialog.cpp index 383a2b6..a4144f0 100644 --- a/src/gui/general/PresetHandlerDialog.cpp +++ b/src/gui/general/PresetHandlerDialog.cpp @@ -52,8 +52,8 @@ namespace Rosegarden { -PresetHandlerDialog::PresetHandlerDialog(TQWidget *parent, bool fromNotation) - : KDialogBase(parent, "presethandlerdialog", true, i18n("Load track parameters preset"), Ok | Cancel, Ok), +PresetHandlerDialog::PresetHandlerDialog(TQWidget *tqparent, bool fromNotation) + : KDialogBase(tqparent, "presethandlerdialog", true, i18n("Load track parameters preset"), Ok | Cancel, Ok), m_config(kapp->config()), m_fromNotation(fromNotation) { @@ -81,7 +81,7 @@ PresetHandlerDialog::initDialog() TQFrame *frame = new TQFrame(vBox); - TQGridLayout *layout = new TQGridLayout(frame, 6, 5, 10, 5); + TQGridLayout *tqlayout = new TQGridLayout(frame, 6, 5, 10, 5); TQLabel *title = new TQLabel(i18n("Select preset track parameters for:"), frame); if (m_fromNotation) title->setText(i18n("Create appropriate notation for:")); @@ -97,8 +97,8 @@ PresetHandlerDialog::initDialog() m_playerCombo->insertItem(i18n("Amateur")); m_playerCombo->insertItem(i18n("Professional")); - TQGroupBox *scopeBox = new QButtonGroup - (1, Horizontal, i18n("Scope"), frame); + TQGroupBox *scopeBox = new TQButtonGroup + (1, Qt::Horizontal, i18n("Scope"), frame); if (m_fromNotation) { TQRadioButton *onlySelectedSegments = new TQRadioButton(i18n("Only selected segments"), scopeBox); @@ -114,14 +114,14 @@ PresetHandlerDialog::initDialog() onlyNewSegments->setChecked(true); } - layout->addMultiCellWidget(title, 0, 0, 0, 1, AlignLeft); - layout->addWidget(catlabel, 1, 0, AlignRight); - layout->addWidget(m_categoryCombo, 1, 1); - layout->addWidget(inslabel, 2, 0, AlignRight); - layout->addWidget(m_instrumentCombo, 2, 1); - layout->addWidget(plylabel, 3, 0, AlignRight); - layout->addWidget(m_playerCombo, 3, 1); - layout->addMultiCellWidget(scopeBox, 4, 4, 0, 1, AlignLeft); + tqlayout->addMultiCellWidget(title, 0, 0, 0, 1, AlignLeft); + tqlayout->addWidget(catlabel, 1, 0, AlignRight); + tqlayout->addWidget(m_categoryCombo, 1, 1); + tqlayout->addWidget(inslabel, 2, 0, AlignRight); + tqlayout->addWidget(m_instrumentCombo, 2, 1); + tqlayout->addWidget(plylabel, 3, 0, AlignRight); + tqlayout->addWidget(m_playerCombo, 3, 1); + tqlayout->addMultiCellWidget(scopeBox, 4, 4, 0, 1, AlignLeft); populateCategoryCombo(); // try to set to same category used previously @@ -151,7 +151,7 @@ PresetHandlerDialog::initDialog() TQT_SLOT(slotCategoryIndexChanged(int))); } -QString +TQString PresetHandlerDialog::getName() { return m_instrumentCombo->currentText(); diff --git a/src/gui/general/PresetHandlerDialog.h b/src/gui/general/PresetHandlerDialog.h index c91d733..c28e85a 100644 --- a/src/gui/general/PresetHandlerDialog.h +++ b/src/gui/general/PresetHandlerDialog.h @@ -48,10 +48,11 @@ class PresetGroup; class PresetHandlerDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PresetHandlerDialog(TQWidget* parent, bool fromNotation = false); + PresetHandlerDialog(TQWidget* tqparent, bool fromNotation = false); ~PresetHandlerDialog(); PresetGroup *m_presets; diff --git a/src/gui/general/ProgressReporter.cpp b/src/gui/general/ProgressReporter.cpp index 3fdfacc..94fbb40 100644 --- a/src/gui/general/ProgressReporter.cpp +++ b/src/gui/general/ProgressReporter.cpp @@ -31,8 +31,8 @@ namespace Rosegarden { -ProgressReporter::ProgressReporter(TQObject* parent, const char* name) - : TQObject(parent, name), m_isCancelled(false) +ProgressReporter::ProgressReporter(TQObject* tqparent, const char* name) + : TQObject(tqparent, name), m_isCancelled(false) {} diff --git a/src/gui/general/ProgressReporter.h b/src/gui/general/ProgressReporter.h index 3e87ba0..7039e92 100644 --- a/src/gui/general/ProgressReporter.h +++ b/src/gui/general/ProgressReporter.h @@ -36,24 +36,25 @@ namespace Rosegarden -class ProgressReporter : public QObject +class ProgressReporter : public TQObject { Q_OBJECT + TQ_OBJECT public: - ProgressReporter(TQObject* parent, const char* name = 0); + ProgressReporter(TQObject* tqparent, const char* name = 0); // exception class for cancellations class Cancelled { }; protected: /** - * Call this at appropriate times if you know Qt isn't in the stack + * Call this at appropriate times if you know TQt isn't in the stack */ void throwIfCancelled(); /* We have to use these accessors rather than throwing directly - from slotCancel() because Qt is generally compiled without + from slotCancel() because TQt is generally compiled without exception support, so we can't throw from a slot. */ bool isOperationCancelled() const { return m_isCancelled; } diff --git a/src/gui/general/RosegardenCanvasView.cpp b/src/gui/general/RosegardenCanvasView.cpp index 4893147..0798140 100644 --- a/src/gui/general/RosegardenCanvasView.cpp +++ b/src/gui/general/RosegardenCanvasView.cpp @@ -42,9 +42,9 @@ namespace Rosegarden { RosegardenCanvasView::RosegardenCanvasView(TQCanvas* canvas, - TQWidget* parent, + TQWidget* tqparent, const char* name, WFlags f) - : TQCanvasView(canvas, parent, name, f), + : TQCanvasView(canvas, tqparent, name, f), m_bottomWidget(0), m_currentBottomWidgetHeight( -1), m_leftWidget(0), @@ -84,10 +84,10 @@ void RosegardenCanvasView::setBottomFixedWidget(TQWidget* w) { m_bottomWidget = w; if (m_bottomWidget) { - int lww = m_leftWidget ? m_leftWidget->sizeHint().width() : 0; + int lww = m_leftWidget ? m_leftWidget->tqsizeHint().width() : 0; m_bottomWidget->reparent(this, 0, TQPoint(0, 0)); - m_bottomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); - setMargins(lww, 0, 0, m_bottomWidget->sizeHint().height()); + m_bottomWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); + setMargins(lww, 0, 0, m_bottomWidget->tqsizeHint().height()); } } @@ -399,7 +399,7 @@ void RosegardenCanvasView::updateBottomWidgetGeometry() if (!m_bottomWidget) return ; - int bottomWidgetHeight = m_bottomWidget->sizeHint().height(); + int bottomWidgetHeight = m_bottomWidget->tqsizeHint().height(); int leftWidgetWidth = 0; if (m_leftWidget && m_leftWidget->isVisible()) { @@ -447,10 +447,10 @@ void RosegardenCanvasView::setLeftFixedWidget(TQWidget* w) { m_leftWidget = w; if (m_leftWidget) { - int bwh = m_bottomWidget ? m_bottomWidget->sizeHint().height() : 0; + int bwh = m_bottomWidget ? m_bottomWidget->tqsizeHint().height() : 0; m_leftWidget->reparent(this, 0, TQPoint(0, 0)); - m_leftWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred)); - setMargins(m_leftWidget->sizeHint().width(), 0, 0, bwh); + m_leftWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Preferred)); + setMargins(m_leftWidget->tqsizeHint().width(), 0, 0, bwh); } } @@ -467,7 +467,7 @@ void RosegardenCanvasView::updateLeftWidgetGeometry() m_leftWidget->setFixedWidth(leftWidgetWidth); int bottomWidgetHeight = m_bottomWidget ? - m_bottomWidget->sizeHint().height() : 0; + m_bottomWidget->tqsizeHint().height() : 0; setMargins(leftWidgetWidth, 0, 0, bottomWidgetHeight); diff --git a/src/gui/general/RosegardenCanvasView.h b/src/gui/general/RosegardenCanvasView.h index 3096334..02faef2 100644 --- a/src/gui/general/RosegardenCanvasView.h +++ b/src/gui/general/RosegardenCanvasView.h @@ -43,18 +43,19 @@ namespace Rosegarden /** * A TQCanvasView with an auxiliary horiz. scrollbar - * That scrollbar should be provided by the parent widget + * That scrollbar should be provided by the tqparent widget * (typically an EditView). The RosegardenCanvasView keeps * the auxilliary horiz. scrollbar range in sync with the * one of its own scrollbar with slotUpdate(). */ -class RosegardenCanvasView : public QCanvasView +class RosegardenCanvasView : public TQCanvasView { Q_OBJECT + TQ_OBJECT public: RosegardenCanvasView(TQCanvas*, - TQWidget* parent=0, const char* name=0, WFlags f=0); + TQWidget* tqparent=0, const char* name=0, WFlags f=0); /** * EditTool::handleMouseMove() returns a OR-ed combination of these diff --git a/src/gui/general/RosegardenScrollView.cpp b/src/gui/general/RosegardenScrollView.cpp index c3184da..cc73afb 100644 --- a/src/gui/general/RosegardenScrollView.cpp +++ b/src/gui/general/RosegardenScrollView.cpp @@ -49,9 +49,9 @@ const int RosegardenScrollView::InitialScrollAccel = 5; const int RosegardenScrollView::MaxScrollDelta = 100; // max a.scroll speed const double RosegardenScrollView::ScrollAccelValue = 1.04;// acceleration rate -RosegardenScrollView::RosegardenScrollView(TQWidget* parent, +RosegardenScrollView::RosegardenScrollView(TQWidget* tqparent, const char* name, WFlags f) - : TQScrollView(parent, name, f), + : TQScrollView(tqparent, name, f), m_bottomWidget(0), m_currentBottomWidgetHeight( -1), m_smoothScroll(true), @@ -75,8 +75,8 @@ void RosegardenScrollView::setBottomFixedWidget(TQWidget* w) m_bottomWidget = w; if (m_bottomWidget) { m_bottomWidget->reparent(this, 0, TQPoint(0, 0)); - m_bottomWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); - setMargins(0, 0, 0, m_bottomWidget->sizeHint().height()); + m_bottomWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); + setMargins(0, 0, 0, m_bottomWidget->tqsizeHint().height()); } } @@ -376,7 +376,7 @@ void RosegardenScrollView::updateBottomWidgetGeometry() if (!m_bottomWidget) return ; - int bottomWidgetHeight = m_bottomWidget->sizeHint().height(); + int bottomWidgetHeight = m_bottomWidget->tqsizeHint().height(); setMargins(0, 0, 0, bottomWidgetHeight); TQRect r = frameRect(); diff --git a/src/gui/general/RosegardenScrollView.h b/src/gui/general/RosegardenScrollView.h index a0aafbb..14744ee 100644 --- a/src/gui/general/RosegardenScrollView.h +++ b/src/gui/general/RosegardenScrollView.h @@ -48,11 +48,12 @@ namespace Rosegarden * and the ability to have a "fixed" (non-scrolling) widget at its bottom, * just above the bottom scrollbar. */ -class RosegardenScrollView : public QScrollView +class RosegardenScrollView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - RosegardenScrollView(TQWidget* parent=0, const char* name=0, WFlags f=0); + RosegardenScrollView(TQWidget* tqparent=0, const char* name=0, WFlags f=0); /** * EditTool::handleMouseMove() returns a OR-ed combination of these diff --git a/src/gui/general/StaffLine.cpp b/src/gui/general/StaffLine.cpp index 90208fe..6838b22 100644 --- a/src/gui/general/StaffLine.cpp +++ b/src/gui/general/StaffLine.cpp @@ -33,8 +33,8 @@ namespace Rosegarden { -StaffLine::StaffLine(TQCanvas *c, QCanvasItemGroup *g, int height) : - QCanvasLineGroupable(c, g), +StaffLine::StaffLine(TQCanvas *c, TQCanvasItemGroup *g, int height) : + TQCanvasLineGroupable(c, g), m_height(height), m_significant(true) { diff --git a/src/gui/general/StaffLine.h b/src/gui/general/StaffLine.h index 00a02c4..1fa00c2 100644 --- a/src/gui/general/StaffLine.h +++ b/src/gui/general/StaffLine.h @@ -30,7 +30,7 @@ #include <tqpen.h> -class QCanvasItemGroup; +class TQCanvasItemGroup; class TQCanvas; @@ -45,10 +45,10 @@ namespace Rosegarden * A groupable line which can be "highlighted" * (drawn with a different color) */ -class StaffLine : public QCanvasLineGroupable +class StaffLine : public TQCanvasLineGroupable { public: - StaffLine(TQCanvas *c, QCanvasItemGroup *g, int height); + StaffLine(TQCanvas *c, TQCanvasItemGroup *g, int height); enum { NoHeight = -150 }; |