diff options
Diffstat (limited to 'src/gui/editors/notation/NotationView.cpp')
| -rw-r--r-- | src/gui/editors/notation/NotationView.cpp | 1120 |
1 files changed, 560 insertions, 560 deletions
diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp index 66cb4b3..b3db080 100644 --- a/src/gui/editors/notation/NotationView.cpp +++ b/src/gui/editors/notation/NotationView.cpp @@ -25,7 +25,7 @@ #include "NotationView.h" #include <list> -#include <qlayout.h> +#include <tqlayout.h> #include "misc/Debug.h" #include <kapplication.h> @@ -194,32 +194,32 @@ #include <ktempfile.h> #include <ktoolbar.h> #include <kxmlguiclient.h> -#include <qbrush.h> -#include <qcanvas.h> -#include <qcursor.h> -#include <qdialog.h> -#include <qevent.h> -#include <qfont.h> -#include <qfontmetrics.h> -#include <qhbox.h> -#include <qiconset.h> -#include <qlabel.h> -#include <qobject.h> -#include <qpaintdevicemetrics.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qpoint.h> -#include <qprinter.h> -#include <qrect.h> -#include <qregexp.h> -#include <qsize.h> -#include <qstring.h> -#include <qtimer.h> -#include <qwidget.h> -#include <qvalidator.h> +#include <tqbrush.h> +#include <tqcanvas.h> +#include <tqcursor.h> +#include <tqdialog.h> +#include <tqevent.h> +#include <tqfont.h> +#include <tqfontmetrics.h> +#include <tqhbox.h> +#include <tqiconset.h> +#include <tqlabel.h> +#include <tqobject.h> +#include <tqpaintdevicemetrics.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqpoint.h> +#include <tqprinter.h> +#include <tqrect.h> +#include <tqregexp.h> +#include <tqsize.h> +#include <tqstring.h> +#include <tqtimer.h> +#include <tqwidget.h> +#include <tqvalidator.h> #include <algorithm> -#include <qpushbutton.h> -#include <qtooltip.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> namespace Rosegarden @@ -229,17 +229,17 @@ class NoteActionData { public: NoteActionData(); - NoteActionData(const QString& _title, - QString _actionName, - QString _pixmapName, + NoteActionData(const TQString& _title, + TQString _actionName, + TQString _pixmapName, int _keycode, bool _rest, Note::Type _noteType, int _dots); - QString title; - QString actionName; - QString pixmapName; + TQString title; + TQString actionName; + TQString pixmapName; int keycode; bool rest; Note::Type noteType; @@ -257,9 +257,9 @@ NoteActionData::NoteActionData() { } -NoteActionData::NoteActionData(const QString& _title, - QString _actionName, - QString _pixmapName, +NoteActionData::NoteActionData(const TQString& _title, + TQString _actionName, + TQString _pixmapName, int _keycode, bool _rest, Note::Type _noteType, @@ -279,16 +279,16 @@ class NoteChangeActionData { public: NoteChangeActionData(); - NoteChangeActionData(const QString &_title, - QString _actionName, - QString _pixmapName, + NoteChangeActionData(const TQString &_title, + TQString _actionName, + TQString _pixmapName, int _keycode, bool _notationOnly, Note::Type _noteType); - QString title; - QString actionName; - QString pixmapName; + TQString title; + TQString actionName; + TQString pixmapName; int keycode; bool notationOnly; Note::Type noteType; @@ -304,9 +304,9 @@ NoteChangeActionData::NoteChangeActionData() { } -NoteChangeActionData::NoteChangeActionData(const QString& _title, - QString _actionName, - QString _pixmapName, +NoteChangeActionData::NoteChangeActionData(const TQString& _title, + TQString _actionName, + TQString _pixmapName, int _keycode, bool _notationOnly, Note::Type _noteType) @@ -328,8 +328,8 @@ public: actionName(0), keycode(0) { } - MarkActionData(const QString &_title, - QString _actionName, + MarkActionData(const TQString &_title, + TQString _actionName, int _keycode, Mark _mark) : title(_title), @@ -337,8 +337,8 @@ public: keycode(_keycode), mark(_mark) { } - QString title; - QString actionName; + TQString title; + TQString actionName; int keycode; Mark mark; }; @@ -346,7 +346,7 @@ public: NotationView::NotationView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - QWidget *parent, + TQWidget *parent, bool showProgressive) : EditView(doc, segments, 2, parent, "notationview"), m_properties(getViewLocalPropertyPrefix()), @@ -452,7 +452,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, setBackgroundMode(PaletteBase); - QCanvas *tCanvas = new QCanvas(this); + TQCanvas *tCanvas = new TQCanvas(this); tCanvas->resize(width() * 2, height() * 2); setCanvasView(new NotationCanvasView(*this, tCanvas, getCentralWidget())); @@ -498,28 +498,28 @@ NotationView::NotationView(RosegardenGUIDoc *doc, // HeadersGroup ctor must not be called before m_staffs initialization m_headersGroupView = new QDeferScrollView(getCentralWidget()); - QWidget * vport = m_headersGroupView->viewport(); + TQWidget * vport = m_headersGroupView->viewport(); m_headersGroup = new HeadersGroup(vport, this, &doc->getComposition()); - m_headersGroupView->setVScrollBarMode(QScrollView::AlwaysOff); - m_headersGroupView->setHScrollBarMode(QScrollView::AlwaysOff); + m_headersGroupView->setVScrollBarMode(TQScrollView::AlwaysOff); + m_headersGroupView->setHScrollBarMode(TQScrollView::AlwaysOff); m_headersGroupView->setFixedWidth(m_headersGroupView->contentsWidth()); m_canvasView->setLeftFixedWidget(m_headersGroupView); // Add a close button just above the track headers. // The grid layout is only here to maintain the button in a // right place - m_headersTopFrame = new QFrame(getCentralWidget()); - QGridLayout * headersTopGrid - = new QGridLayout(m_headersTopFrame, 2, 2); - QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); - QCanvasPixmap pixmap(pixmapDir + "/misc/close.xpm"); - QPushButton * hideHeadersButton - = new QPushButton(m_headersTopFrame); + m_headersTopFrame = new TQFrame(getCentralWidget()); + TQGridLayout * headersTopGrid + = new TQGridLayout(m_headersTopFrame, 2, 2); + TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQCanvasPixmap pixmap(pixmapDir + "/misc/close.xpm"); + TQPushButton * hideHeadersButton + = new TQPushButton(m_headersTopFrame); headersTopGrid->addWidget(hideHeadersButton, 1, 1, Qt::AlignRight | Qt::AlignBottom); - hideHeadersButton->setIconSet(QIconSet(pixmap)); + hideHeadersButton->setIconSet(TQIconSet(pixmap)); hideHeadersButton->setFlat(true); - QToolTip::add(hideHeadersButton, i18n("Close track headers")); + TQToolTip::add(hideHeadersButton, i18n("Close track headers")); headersTopGrid->setMargin(4); setTopStandardRuler(new StandardRuler(getDocument(), m_hlayout, m_leftGutter, 25, @@ -528,19 +528,19 @@ NotationView::NotationView(RosegardenGUIDoc *doc, m_topStandardRuler->getLoopRuler()->setBackgroundColor (GUIPalette::getColour(GUIPalette::InsertCursorRuler)); - connect(m_topStandardRuler->getLoopRuler(), SIGNAL(startMouseMove(int)), - m_canvasView, SLOT(startAutoScroll(int))); - connect(m_topStandardRuler->getLoopRuler(), SIGNAL(stopMouseMove()), - m_canvasView, SLOT(stopAutoScroll())); + connect(m_topStandardRuler->getLoopRuler(), TQT_SIGNAL(startMouseMove(int)), + m_canvasView, TQT_SLOT(startAutoScroll(int))); + connect(m_topStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()), + m_canvasView, TQT_SLOT(stopAutoScroll())); - connect(m_bottomStandardRuler->getLoopRuler(), SIGNAL(startMouseMove(int)), - m_canvasView, SLOT(startAutoScroll(int))); - connect(m_bottomStandardRuler->getLoopRuler(), SIGNAL(stopMouseMove()), - m_canvasView, SLOT(stopAutoScroll())); + connect(m_bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(startMouseMove(int)), + m_canvasView, TQT_SLOT(startAutoScroll(int))); + connect(m_bottomStandardRuler->getLoopRuler(), TQT_SIGNAL(stopMouseMove()), + m_canvasView, TQT_SLOT(stopAutoScroll())); // Following connection have to be done before calling setPageMode()) - connect(m_headersGroup, SIGNAL(headersResized(int)), - this, SLOT(slotHeadersWidthChanged(int))); + connect(m_headersGroup, TQT_SIGNAL(headersResized(int)), + this, TQT_SLOT(slotHeadersWidthChanged(int))); // @@ -616,9 +616,9 @@ NotationView::NotationView(RosegardenGUIDoc *doc, // Connect signals // - QObject::connect - (getCanvasView(), SIGNAL(renderRequired(double, double)), - this, SLOT(slotCheckRendered(double, double))); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(renderRequired(double, double)), + this, TQT_SLOT(slotCheckRendered(double, double))); m_topStandardRuler->connectRulerToDocPointer(doc); m_bottomStandardRuler->connectRulerToDocPointer(doc); @@ -626,104 +626,104 @@ NotationView::NotationView(RosegardenGUIDoc *doc, // Disconnect the default connection for this signal from the // top ruler, and connect our own instead - QObject::disconnect + TQObject::disconnect (m_topStandardRuler->getLoopRuler(), - SIGNAL(setPointerPosition(timeT)), 0, 0); + TQT_SIGNAL(setPointerPosition(timeT)), 0, 0); - QObject::connect + TQObject::connect (m_topStandardRuler->getLoopRuler(), - SIGNAL(setPointerPosition(timeT)), - this, SLOT(slotSetInsertCursorPosition(timeT))); + TQT_SIGNAL(setPointerPosition(timeT)), + this, TQT_SLOT(slotSetInsertCursorPosition(timeT))); - QObject::connect + TQObject::connect (m_topStandardRuler, - SIGNAL(dragPointerToPosition(timeT)), - this, SLOT(slotSetInsertCursorPosition(timeT))); + TQT_SIGNAL(dragPointerToPosition(timeT)), + this, TQT_SLOT(slotSetInsertCursorPosition(timeT))); - connect(m_bottomStandardRuler, SIGNAL(dragPointerToPosition(timeT)), - this, SLOT(slotSetPointerPosition(timeT))); + connect(m_bottomStandardRuler, TQT_SIGNAL(dragPointerToPosition(timeT)), + this, TQT_SLOT(slotSetPointerPosition(timeT))); - QObject::connect - (getCanvasView(), SIGNAL(itemPressed(int, int, QMouseEvent*, NotationElement*)), - this, SLOT (slotItemPressed(int, int, QMouseEvent*, NotationElement*))); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(itemPressed(int, int, TQMouseEvent*, NotationElement*)), + this, TQT_SLOT (slotItemPressed(int, int, TQMouseEvent*, NotationElement*))); - QObject::connect - (getCanvasView(), SIGNAL(activeItemPressed(QMouseEvent*, QCanvasItem*)), - this, SLOT (slotActiveItemPressed(QMouseEvent*, QCanvasItem*))); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(activeItemPressed(TQMouseEvent*, TQCanvasItem*)), + this, TQT_SLOT (slotActiveItemPressed(TQMouseEvent*, TQCanvasItem*))); - QObject::connect - (getCanvasView(), SIGNAL(nonNotationItemPressed(QMouseEvent*, QCanvasItem*)), - this, SLOT (slotNonNotationItemPressed(QMouseEvent*, QCanvasItem*))); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(nonNotationItemPressed(TQMouseEvent*, TQCanvasItem*)), + this, TQT_SLOT (slotNonNotationItemPressed(TQMouseEvent*, TQCanvasItem*))); - QObject::connect - (getCanvasView(), SIGNAL(textItemPressed(QMouseEvent*, QCanvasItem*)), - this, SLOT (slotTextItemPressed(QMouseEvent*, QCanvasItem*))); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(textItemPressed(TQMouseEvent*, TQCanvasItem*)), + this, TQT_SLOT (slotTextItemPressed(TQMouseEvent*, TQCanvasItem*))); - QObject::connect - (getCanvasView(), SIGNAL(mouseMoved(QMouseEvent*)), - this, SLOT (slotMouseMoved(QMouseEvent*))); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(mouseMoved(TQMouseEvent*)), + this, TQT_SLOT (slotMouseMoved(TQMouseEvent*))); - QObject::connect - (getCanvasView(), SIGNAL(mouseReleased(QMouseEvent*)), - this, SLOT (slotMouseReleased(QMouseEvent*))); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(mouseReleased(TQMouseEvent*)), + this, TQT_SLOT (slotMouseReleased(TQMouseEvent*))); - QObject::connect - (getCanvasView(), SIGNAL(hoveredOverNoteChanged(const QString&)), - this, SLOT (slotHoveredOverNoteChanged(const QString&))); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(hoveredOverNoteChanged(const TQString&)), + this, TQT_SLOT (slotHoveredOverNoteChanged(const TQString&))); - QObject::connect - (getCanvasView(), SIGNAL(hoveredOverAbsoluteTimeChanged(unsigned int)), - this, SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int))); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(hoveredOverAbsoluteTimeChanged(unsigned int)), + this, TQT_SLOT (slotHoveredOverAbsoluteTimeChanged(unsigned int))); - QObject::connect - (getCanvasView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn())); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(zoomIn()), this, TQT_SLOT(slotZoomIn())); - QObject::connect - (getCanvasView(), SIGNAL(zoomOut()), this, SLOT(slotZoomOut())); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(zoomOut()), this, TQT_SLOT(slotZoomOut())); - QObject::connect - (m_pannerDialog->scrollbox(), SIGNAL(valueChanged(const QPoint &)), - getCanvasView(), SLOT(slotSetScrollPos(const QPoint &))); + TQObject::connect + (m_pannerDialog->scrollbox(), TQT_SIGNAL(valueChanged(const TQPoint &)), + getCanvasView(), TQT_SLOT(slotSetScrollPos(const TQPoint &))); - QObject::connect - (getCanvasView()->horizontalScrollBar(), SIGNAL(valueChanged(int)), - m_pannerDialog->scrollbox(), SLOT(setViewX(int))); + TQObject::connect + (getCanvasView()->horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), + m_pannerDialog->scrollbox(), TQT_SLOT(setViewX(int))); - QObject::connect - (getCanvasView()->verticalScrollBar(), SIGNAL(valueChanged(int)), - m_pannerDialog->scrollbox(), SLOT(setViewY(int))); + TQObject::connect + (getCanvasView()->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), + m_pannerDialog->scrollbox(), TQT_SLOT(setViewY(int))); - QObject::connect - (doc, SIGNAL(pointerPositionChanged(timeT)), - this, SLOT(slotSetPointerPosition(timeT))); + TQObject::connect + (doc, TQT_SIGNAL(pointerPositionChanged(timeT)), + this, TQT_SLOT(slotSetPointerPosition(timeT))); // // Connect vertical scrollbars between canvas and notation header - QObject::connect - (getCanvasView()->verticalScrollBar(), SIGNAL(valueChanged(int)), - this, SLOT(slotVerticalScrollHeadersGroup(int))); + TQObject::connect + (getCanvasView()->verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), + this, TQT_SLOT(slotVerticalScrollHeadersGroup(int))); - QObject::connect - (getCanvasView()->verticalScrollBar(), SIGNAL(sliderMoved(int)), - this, SLOT(slotVerticalScrollHeadersGroup(int))); + TQObject::connect + (getCanvasView()->verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)), + this, TQT_SLOT(slotVerticalScrollHeadersGroup(int))); - QObject::connect - (m_headersGroupView, SIGNAL(gotWheelEvent(QWheelEvent*)), - getCanvasView(), SLOT(slotExternalWheelEvent(QWheelEvent*))); + TQObject::connect + (m_headersGroupView, TQT_SIGNAL(gotWheelEvent(TQWheelEvent*)), + getCanvasView(), TQT_SLOT(slotExternalWheelEvent(TQWheelEvent*))); // Ensure notation header keeps the right bottom margin when user // toggles the canvas view bottom rulers - connect(getCanvasView(), SIGNAL(bottomWidgetHeightChanged(int)), - this, SLOT(slotCanvasBottomWidgetHeightChanged(int))); + connect(getCanvasView(), TQT_SIGNAL(bottomWidgetHeightChanged(int)), + this, TQT_SLOT(slotCanvasBottomWidgetHeightChanged(int))); // Signal canvas horizontal scroll to notation header - QObject::connect - (getCanvasView(), SIGNAL(contentsMoving(int, int)), - this, SLOT(slotUpdateHeaders(int, int))); + TQObject::connect + (getCanvasView(), TQT_SIGNAL(contentsMoving(int, int)), + this, TQT_SLOT(slotUpdateHeaders(int, int))); // Connect the close notation headers button - QObject::connect(hideHeadersButton, SIGNAL(clicked()), - this, SLOT(slotHideHeadersGroup())); + TQObject::connect(hideHeadersButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotHideHeadersGroup())); stateChanged("have_selection", KXMLGUIClient::StateReverse); stateChanged("have_notes_in_selection", KXMLGUIClient::StateReverse); @@ -764,17 +764,17 @@ NotationView::NotationView(RosegardenGUIDoc *doc, // getCanvasView()->repaintContents(); updateView(); - QObject::connect - (this, SIGNAL(renderComplete()), - getCanvasView(), SLOT(slotRenderComplete())); + TQObject::connect + (this, TQT_SIGNAL(renderComplete()), + getCanvasView(), TQT_SLOT(slotRenderComplete())); if (parent) { const TrackButtons * trackLabels = ((RosegardenGUIView*)parent)->getTrackEditor()->getTrackButtons(); - QObject::connect - (trackLabels, SIGNAL(nameChanged()), - this, SLOT(slotUpdateStaffName())); + TQObject::connect + (trackLabels, TQT_SIGNAL(nameChanged()), + this, TQT_SLOT(slotUpdateStaffName())); } setConfigDialogPageIndex(3); @@ -796,7 +796,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, NotationView::NotationView(RosegardenGUIDoc *doc, std::vector<Segment *> segments, - QWidget *parent, + TQWidget *parent, NotationView *referenceView) : EditView(doc, segments, 1, 0, "printview"), m_properties(getViewLocalPropertyPrefix()), @@ -889,7 +889,7 @@ NotationView::NotationView(RosegardenGUIDoc *doc, setBackgroundMode(PaletteBase); m_config->setGroup(NotationViewConfigGroup); - QCanvas *tCanvas = new QCanvas(this); + TQCanvas *tCanvas = new TQCanvas(this); tCanvas->resize(width() * 2, height() * 2); //!!! setCanvasView(new NotationCanvasView(*this, tCanvas, getCentralWidget())); @@ -1046,16 +1046,16 @@ void NotationView::positionStaffs() const Configuration &metadata = getDocument()->getComposition().getMetadata(); - QFont defaultFont(NotePixmapFactory::defaultSerifFontFamily); + TQFont defaultFont(NotePixmapFactory::defaultSerifFontFamily); m_config->setGroup(NotationViewConfigGroup); - QFont font = m_config->readFontEntry("textfont", &defaultFont); + TQFont font = m_config->readFontEntry("textfont", &defaultFont); font.setPixelSize(m_fontSize * 5); - QFontMetrics metrics(font); + TQFontMetrics metrics(font); if (metadata.has(CompositionMetadataKeys::Title)) { - QString title(strtoqstr(metadata.get<String> + TQString title(strtoqstr(metadata.get<String> (CompositionMetadataKeys::Title))); - m_title = new QCanvasText(title, font, canvas()); + m_title = new TQCanvasText(title, font, canvas()); m_title->setX(m_leftGutter + pageWidth / 2 - metrics.width(title) / 2); m_title->setY(20 + topMargin / 4 + metrics.ascent()); m_title->show(); @@ -1063,12 +1063,12 @@ void NotationView::positionStaffs() } font.setPixelSize(m_fontSize * 3); - metrics = QFontMetrics(font); + metrics = TQFontMetrics(font); if (metadata.has(CompositionMetadataKeys::Subtitle)) { - QString subtitle(strtoqstr(metadata.get<String> + TQString subtitle(strtoqstr(metadata.get<String> (CompositionMetadataKeys::Subtitle))); - m_subtitle = new QCanvasText(subtitle, font, canvas()); + m_subtitle = new TQCanvasText(subtitle, font, canvas()); m_subtitle->setX(m_leftGutter + pageWidth / 2 - metrics.width(subtitle) / 2); m_subtitle->setY(20 + titleHeight + metrics.ascent()); m_subtitle->show(); @@ -1076,9 +1076,9 @@ void NotationView::positionStaffs() } if (metadata.has(CompositionMetadataKeys::Composer)) { - QString composer(strtoqstr(metadata.get<String> + TQString composer(strtoqstr(metadata.get<String> (CompositionMetadataKeys::Composer))); - m_composer = new QCanvasText(composer, font, canvas()); + m_composer = new TQCanvasText(composer, font, canvas()); m_composer->setX(m_leftGutter + pageWidth - metrics.width(composer) - leftMargin); m_composer->setY(20 + titleHeight + metrics.ascent()); m_composer->show(); @@ -1086,12 +1086,12 @@ void NotationView::positionStaffs() } font.setPixelSize(m_fontSize * 2); - metrics = QFontMetrics(font); + metrics = TQFontMetrics(font); if (metadata.has(CompositionMetadataKeys::Copyright)) { - QString copyright(strtoqstr(metadata.get<String> + TQString copyright(strtoqstr(metadata.get<String> (CompositionMetadataKeys::Copyright))); - m_copyright = new QCanvasText(copyright, font, canvas()); + m_copyright = new TQCanvasText(copyright, font, canvas()); m_copyright->setX(m_leftGutter + leftMargin); m_copyright->setY(20 + pageHeight - topMargin - metrics.descent()); m_copyright->show(); @@ -1328,20 +1328,20 @@ void NotationView::positionPages() if (m_printMode) return ; - QPixmap background; - QPixmap deskBackground; + TQPixmap background; + TQPixmap deskBackground; bool haveBackground = false; m_config->setGroup(NotationViewConfigGroup); if (m_config->readBoolEntry("backgroundtextures", true)) { - QString pixmapDir = + TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); - if (background.load(QString("%1/misc/bg-paper-cream.xpm"). + if (background.load(TQString("%1/misc/bg-paper-cream.xpm"). arg(pixmapDir))) { haveBackground = true; } // we're happy to ignore errors from this one: - deskBackground.load(QString("%1/misc/bg-desktop.xpm").arg(pixmapDir)); + deskBackground.load(TQString("%1/misc/bg-desktop.xpm").arg(pixmapDir)); } int pageWidth = getPageWidth(); @@ -1378,9 +1378,9 @@ void NotationView::positionPages() getCanvasView()->setErasePixmap(background); } - QFont pageNumberFont; + TQFont pageNumberFont; pageNumberFont.setPixelSize(m_fontSize * 2); - QFontMetrics pageNumberMetrics(pageNumberFont); + TQFontMetrics pageNumberMetrics(pageNumberFont); for (int page = 0; page < maxPageCount; ++page) { @@ -1389,17 +1389,17 @@ void NotationView::positionPages() int w = pageWidth - leftMargin / 2; int h = pageHeight; - QString str = QString("%1").arg(page + 1); - QCanvasText *text = new QCanvasText(str, pageNumberFont, canvas()); + TQString str = TQString("%1").arg(page + 1); + TQCanvasText *text = new TQCanvasText(str, pageNumberFont, canvas()); text->setX(m_leftGutter + pageWidth * page + pageWidth - pageNumberMetrics.width(str) - leftMargin); text->setY(y + h - pageNumberMetrics.descent() - topMargin); text->setZ( -999); text->show(); m_pageNumbers.push_back(text); - QCanvasRectangle *rect = new QCanvasRectangle(x, y, w, h, canvas()); + TQCanvasRectangle *rect = new TQCanvasRectangle(x, y, w, h, canvas()); if (haveBackground) - rect->setBrush(QBrush(Qt::white, background)); + rect->setBrush(TQBrush(Qt::white, background)); rect->setPen(Qt::black); rect->setZ( -1000); rect->show(); @@ -1440,7 +1440,7 @@ void NotationView::setOneToolbar(const char *actionName, std::cerr << "WARNING: No such action as " << actionName << std::endl; return ; } - QWidget *toolbar = toolBar(toolbarName); + TQWidget *toolbar = toolBar(toolbarName); if (!toolbar) { std::cerr << "WARNING: No such toolbar as " << toolbarName << std::endl; return ; @@ -1493,16 +1493,16 @@ void NotationView::readOptions() void NotationView::setupActions() { - KStdAction::print(this, SLOT(slotFilePrint()), actionCollection()); - KStdAction::printPreview(this, SLOT(slotFilePrintPreview()), + KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection()); + KStdAction::printPreview(this, TQT_SLOT(slotFilePrintPreview()), actionCollection()); new KAction(i18n("Print &with LilyPond..."), 0, 0, this, - SLOT(slotPrintLilyPond()), actionCollection(), + TQT_SLOT(slotPrintLilyPond()), actionCollection(), "file_print_lilypond"); new KAction(i18n("Preview with Lil&yPond..."), 0, 0, this, - SLOT(slotPreviewLilyPond()), actionCollection(), + TQT_SLOT(slotPreviewLilyPond()), actionCollection(), "file_preview_lilypond"); EditViewBase::setupActions("notation.rc"); @@ -1522,11 +1522,11 @@ void NotationView::setupActions() for (std::vector<std::string>::iterator i = f.begin(); i != f.end(); ++i) { - QString fontQName(strtoqstr(*i)); + TQString fontQName(strtoqstr(*i)); KToggleAction *fontAction = new KToggleAction - (fontQName, 0, this, SLOT(slotChangeFontFromAction()), + (fontQName, 0, this, TQT_SLOT(slotChangeFontFromAction()), actionCollection(), "note_font_" + fontQName); fontAction->setChecked(*i == m_fontName); @@ -1543,7 +1543,7 @@ void NotationView::setupActions() m_showHeadersMenuEntry = new KAction(i18n("Show Track Headers"), 0, this, - SLOT(slotShowHeadersGroup()), + TQT_SLOT(slotShowHeadersGroup()), actionCollection(), "show_track_headers"); KActionMenu *spacingActionMenu = @@ -1557,9 +1557,9 @@ void NotationView::setupActions() KToggleAction *spacingAction = new KToggleAction - (QString("%1%").arg(*i), 0, this, - SLOT(slotChangeSpacingFromAction()), - actionCollection(), QString("spacing_%1").arg(*i)); + (TQString("%1%").arg(*i), 0, this, + TQT_SLOT(slotChangeSpacingFromAction()), + actionCollection(), TQString("spacing_%1").arg(*i)); spacingAction->setExclusiveGroup("spacing"); spacingAction->setChecked(*i == defaultSpacing); @@ -1577,15 +1577,15 @@ void NotationView::setupActions() for (std::vector<int>::iterator i = proportions.begin(); i != proportions.end(); ++i) { - QString name = QString("%1%").arg(*i); + TQString name = TQString("%1%").arg(*i); if (*i == 0) name = i18n("None"); KToggleAction *proportionAction = new KToggleAction (name, 0, this, - SLOT(slotChangeProportionFromAction()), - actionCollection(), QString("proportion_%1").arg(*i)); + TQT_SLOT(slotChangeProportionFromAction()), + actionCollection(), TQString("proportion_%1").arg(*i)); proportionAction->setExclusiveGroup("proportion"); proportionAction->setChecked(*i == defaultProportion); @@ -1603,11 +1603,11 @@ void NotationView::setupActions() for (std::vector<NoteStyleName>::iterator i = styles.begin(); i != styles.end(); ++i) { - QString styleQName(strtoqstr(*i)); + TQString styleQName(strtoqstr(*i)); KAction *styleAction = new KAction - (styleQName, 0, this, SLOT(slotSetStyleFromAction()), + (styleQName, 0, this, TQT_SLOT(slotSetStyleFromAction()), actionCollection(), "style_" + styleQName); styleActionMenu->insert(styleAction); @@ -1621,22 +1621,22 @@ void NotationView::setupActions() new KAction - (i18n("Insert Rest"), Key_P, this, SLOT(slotInsertRest()), - actionCollection(), QString("insert_rest")); + (i18n("Insert Rest"), Key_P, this, TQT_SLOT(slotInsertRest()), + actionCollection(), TQString("insert_rest")); new KAction (i18n("Switch from Note to Rest"), Key_T, this, - SLOT(slotSwitchFromNoteToRest()), - actionCollection(), QString("switch_from_note_to_rest")); + TQT_SLOT(slotSwitchFromNoteToRest()), + actionCollection(), TQString("switch_from_note_to_rest")); new KAction (i18n("Switch from Rest to Note"), Key_Y, this, - SLOT(slotSwitchFromRestToNote()), - actionCollection(), QString("switch_from_rest_to_note")); + TQT_SLOT(slotSwitchFromRestToNote()), + actionCollection(), TQString("switch_from_rest_to_note")); // setup Notes menu & toolbar - QIconSet icon; + TQIconSet icon; for (NoteActionDataMap::Iterator actionDataIter = m_noteActionDataMap->begin(); actionDataIter != m_noteActionDataMap->end(); @@ -1651,7 +1651,7 @@ void NotationView::setupActions() icon, noteActionData.keycode, this, - SLOT(slotNoteAction()), + TQT_SLOT(slotNoteAction()), actionCollection(), noteActionData.actionName); noteAction->setExclusiveGroup("notes"); @@ -1677,7 +1677,7 @@ void NotationView::setupActions() icon, data.keycode, this, - SLOT(slotNoteChangeAction()), + TQT_SLOT(slotNoteChangeAction()), actionCollection(), data.actionName); } @@ -1685,7 +1685,7 @@ void NotationView::setupActions() // // Accidentals // - static QString actionsAccidental[][4] = + static TQString actionsAccidental[][4] = { { i18n("No accidental"), "1slotNoAccidental()", "no_accidental", "accidental-none" }, { i18n("Follow previous accidental"), "1slotFollowAccidental()", "follow_accidental", "accidental-follow" }, @@ -1699,7 +1699,7 @@ void NotationView::setupActions() for (unsigned int i = 0; i < sizeof(actionsAccidental) / sizeof(actionsAccidental[0]); ++i) { - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap (actionsAccidental[i][3]))); noteAction = new KRadioAction(actionsAccidental[i][0], icon, 0, this, actionsAccidental[i][1], @@ -1713,49 +1713,49 @@ void NotationView::setupActions() // // Treble - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble"))); + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-treble"))); noteAction = new KRadioAction(i18n("&Treble Clef"), icon, 0, this, - SLOT(slotTrebleClef()), + TQT_SLOT(slotTrebleClef()), actionCollection(), "treble_clef"); noteAction->setExclusiveGroup("notes"); // Alto - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto"))); + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-alto"))); noteAction = new KRadioAction(i18n("&Alto Clef"), icon, 0, this, - SLOT(slotAltoClef()), + TQT_SLOT(slotAltoClef()), actionCollection(), "alto_clef"); noteAction->setExclusiveGroup("notes"); // Tenor - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor"))); + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-tenor"))); noteAction = new KRadioAction(i18n("Te&nor Clef"), icon, 0, this, - SLOT(slotTenorClef()), + TQT_SLOT(slotTenorClef()), actionCollection(), "tenor_clef"); noteAction->setExclusiveGroup("notes"); // Bass - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass"))); + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("clef-bass"))); noteAction = new KRadioAction(i18n("&Bass Clef"), icon, 0, this, - SLOT(slotBassClef()), + TQT_SLOT(slotBassClef()), actionCollection(), "bass_clef"); noteAction->setExclusiveGroup("notes"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("text"))); + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("text"))); noteAction = new KRadioAction(i18n("&Text"), icon, Key_F8, this, - SLOT(slotText()), + TQT_SLOT(slotText()), actionCollection(), "text"); noteAction->setExclusiveGroup("notes"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord"))); + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("guitarchord"))); noteAction = new KRadioAction(i18n("&Guitar Chord"), icon, Key_F9, this, - SLOT(slotGuitarChord()), + TQT_SLOT(slotGuitarChord()), actionCollection(), "guitarchord"); noteAction->setExclusiveGroup("notes"); - /* icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("lilypond"))); + /* icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("lilypond"))); noteAction = new KRadioAction(i18n("Lil&ypond Directive"), icon, Key_F9, this, - SLOT(slotLilyPondDirective()), + TQT_SLOT(slotLilyPondDirective()), actionCollection(), "lilypond_directive"); noteAction->setExclusiveGroup("notes"); */ @@ -1764,53 +1764,53 @@ void NotationView::setupActions() // Edition tools (eraser, selector...) // noteAction = new KRadioAction(i18n("&Erase"), "eraser", Key_F4, - this, SLOT(slotEraseSelected()), + this, TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); noteAction->setExclusiveGroup("notes"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("select"))); + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("select"))); noteAction = new KRadioAction(i18n("&Select and Edit"), icon, Key_F2, - this, SLOT(slotSelectSelected()), + this, TQT_SLOT(slotSelectSelected()), actionCollection(), "select"); noteAction->setExclusiveGroup("notes"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("step_by_step"))); + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap("step_by_step"))); new KToggleAction(i18n("Ste&p Recording"), icon, 0, this, - SLOT(slotToggleStepByStep()), actionCollection(), + TQT_SLOT(slotToggleStepByStep()), actionCollection(), "toggle_step_by_step"); // Edit menu new KAction(i18n("Select from Sta&rt"), 0, this, - SLOT(slotEditSelectFromStart()), actionCollection(), + TQT_SLOT(slotEditSelectFromStart()), actionCollection(), "select_from_start"); new KAction(i18n("Select to &End"), 0, this, - SLOT(slotEditSelectToEnd()), actionCollection(), + TQT_SLOT(slotEditSelectToEnd()), actionCollection(), "select_to_end"); new KAction(i18n("Select Whole St&aff"), Key_A + CTRL, this, - SLOT(slotEditSelectWholeStaff()), actionCollection(), + TQT_SLOT(slotEditSelectWholeStaff()), actionCollection(), "select_whole_staff"); new KAction(i18n("C&ut and Close"), CTRL + SHIFT + Key_X, this, - SLOT(slotEditCutAndClose()), actionCollection(), + TQT_SLOT(slotEditCutAndClose()), actionCollection(), "cut_and_close"); new KAction(i18n("Pa&ste..."), CTRL + SHIFT + Key_V, this, - SLOT(slotEditGeneralPaste()), actionCollection(), + TQT_SLOT(slotEditGeneralPaste()), actionCollection(), "general_paste"); new KAction(i18n("De&lete"), Key_Delete, this, - SLOT(slotEditDelete()), actionCollection(), + TQT_SLOT(slotEditDelete()), actionCollection(), "delete"); new KAction(i18n("Move to Staff Above"), 0, this, - SLOT(slotMoveEventsUpStaff()), actionCollection(), + TQT_SLOT(slotMoveEventsUpStaff()), actionCollection(), "move_events_up_staff"); new KAction(i18n("Move to Staff Below"), 0, this, - SLOT(slotMoveEventsDownStaff()), actionCollection(), + TQT_SLOT(slotMoveEventsDownStaff()), actionCollection(), "move_events_down_staff"); // @@ -1818,56 +1818,56 @@ void NotationView::setupActions() // int layoutMode = m_config->readNumEntry("layoutmode", 0); - QString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); + TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/"); - QCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm"); - icon = QIconSet(pixmap); + TQCanvasPixmap pixmap(pixmapDir + "/toolbar/linear-layout.xpm"); + icon = TQIconSet(pixmap); KRadioAction *linearModeAction = new KRadioAction - (i18n("&Linear Layout"), icon, 0, this, SLOT(slotLinearMode()), + (i18n("&Linear Layout"), icon, 0, this, TQT_SLOT(slotLinearMode()), actionCollection(), "linear_mode"); linearModeAction->setExclusiveGroup("layoutMode"); if (layoutMode == 0) linearModeAction->setChecked(true); pixmap.load(pixmapDir + "/toolbar/continuous-page-mode.xpm"); - icon = QIconSet(pixmap); + icon = TQIconSet(pixmap); KRadioAction *continuousPageModeAction = new KRadioAction - (i18n("&Continuous Page Layout"), icon, 0, this, SLOT(slotContinuousPageMode()), + (i18n("&Continuous Page Layout"), icon, 0, this, TQT_SLOT(slotContinuousPageMode()), actionCollection(), "continuous_page_mode"); continuousPageModeAction->setExclusiveGroup("layoutMode"); if (layoutMode == 1) continuousPageModeAction->setChecked(true); pixmap.load(pixmapDir + "/toolbar/multi-page-mode.xpm"); - icon = QIconSet(pixmap); + icon = TQIconSet(pixmap); KRadioAction *multiPageModeAction = new KRadioAction - (i18n("&Multiple Page Layout"), icon, 0, this, SLOT(slotMultiPageMode()), + (i18n("&Multiple Page Layout"), icon, 0, this, TQT_SLOT(slotMultiPageMode()), actionCollection(), "multi_page_mode"); multiPageModeAction->setExclusiveGroup("layoutMode"); if (layoutMode == 2) multiPageModeAction->setChecked(true); new KToggleAction(i18n("Show Ch&ord Name Ruler"), 0, this, - SLOT(slotToggleChordsRuler()), + TQT_SLOT(slotToggleChordsRuler()), actionCollection(), "show_chords_ruler"); new KToggleAction(i18n("Show Ra&w Note Ruler"), 0, this, - SLOT(slotToggleRawNoteRuler()), + TQT_SLOT(slotToggleRawNoteRuler()), actionCollection(), "show_raw_note_ruler"); new KToggleAction(i18n("Show &Tempo Ruler"), 0, this, - SLOT(slotToggleTempoRuler()), + TQT_SLOT(slotToggleTempoRuler()), actionCollection(), "show_tempo_ruler"); new KToggleAction(i18n("Show &Annotations"), 0, this, - SLOT(slotToggleAnnotations()), + TQT_SLOT(slotToggleAnnotations()), actionCollection(), "show_annotations"); new KToggleAction(i18n("Show Lily&Pond Directives"), 0, this, - SLOT(slotToggleLilyPondDirectives()), + TQT_SLOT(slotToggleLilyPondDirectives()), actionCollection(), "show_lilypond_directives"); - new KAction(i18n("Open L&yric Editor"), 0, this, SLOT(slotEditLyrics()), + new KAction(i18n("Open L&yric Editor"), 0, this, TQT_SLOT(slotEditLyrics()), actionCollection(), "lyric_editor"); // @@ -1878,53 +1878,53 @@ void NotationView::setupActions() ("group-beam"))); new KAction(BeamCommand::getGlobalName(), icon, Key_B + CTRL, this, - SLOT(slotGroupBeam()), actionCollection(), "beam"); + TQT_SLOT(slotGroupBeam()), actionCollection(), "beam"); new KAction(AutoBeamCommand::getGlobalName(), 0, this, - SLOT(slotGroupAutoBeam()), actionCollection(), "auto_beam"); + TQT_SLOT(slotGroupAutoBeam()), actionCollection(), "auto_beam"); icon = QIconSet (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-unbeam"))); new KAction(BreakCommand::getGlobalName(), icon, Key_U + CTRL, this, - SLOT(slotGroupBreak()), actionCollection(), "break_group"); + TQT_SLOT(slotGroupBreak()), actionCollection(), "break_group"); icon = QIconSet (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-simple-tuplet"))); new KAction(TupletCommand::getGlobalName(true), icon, Key_R + CTRL, this, - SLOT(slotGroupSimpleTuplet()), actionCollection(), "simple_tuplet"); + TQT_SLOT(slotGroupSimpleTuplet()), actionCollection(), "simple_tuplet"); icon = QIconSet (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-tuplet"))); new KAction(TupletCommand::getGlobalName(false), icon, Key_T + CTRL, this, - SLOT(slotGroupGeneralTuplet()), actionCollection(), "tuplet"); + TQT_SLOT(slotGroupGeneralTuplet()), actionCollection(), "tuplet"); new KAction(UnTupletCommand::getGlobalName(), 0, this, - SLOT(slotGroupUnTuplet()), actionCollection(), "break_tuplets"); + TQT_SLOT(slotGroupUnTuplet()), actionCollection(), "break_tuplets"); - icon = QIconSet(NotePixmapFactory::toQPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap (NotePixmapFactory::makeToolbarPixmap("triplet"))); (new KToggleAction(i18n("Trip&let Insert Mode"), icon, Key_G, - this, SLOT(slotUpdateInsertModeStatus()), + this, TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "triplet_mode"))-> setChecked(false); - icon = QIconSet(NotePixmapFactory::toQPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap (NotePixmapFactory::makeToolbarPixmap("chord"))); (new KToggleAction(i18n("C&hord Insert Mode"), icon, Key_H, - this, SLOT(slotUpdateInsertModeStatus()), + this, TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "chord_mode"))-> setChecked(false); - icon = QIconSet(NotePixmapFactory::toQPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap (NotePixmapFactory::makeToolbarPixmap("group-grace"))); (new KToggleAction(i18n("Grace Insert Mode"), icon, 0, - this, SLOT(slotUpdateInsertModeStatus()), + this, TQT_SLOT(slotUpdateInsertModeStatus()), actionCollection(), "grace_mode"))-> setChecked(false); /*!!! @@ -1933,10 +1933,10 @@ void NotationView::setupActions() ("group-grace"))); new KAction(GraceCommand::getGlobalName(), icon, 0, this, - SLOT(slotGroupGrace()), actionCollection(), "grace"); + TQT_SLOT(slotGroupGrace()), actionCollection(), "grace"); new KAction(UnGraceCommand::getGlobalName(), 0, this, - SLOT(slotGroupUnGrace()), actionCollection(), "ungrace"); + TQT_SLOT(slotGroupUnGrace()), actionCollection(), "ungrace"); */ icon = QIconSet (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap @@ -1944,11 +1944,11 @@ void NotationView::setupActions() new KAction(AddIndicationCommand::getGlobalName (Indication::Slur), icon, Key_ParenRight, this, - SLOT(slotGroupSlur()), actionCollection(), "slur"); + TQT_SLOT(slotGroupSlur()), actionCollection(), "slur"); new KAction(AddIndicationCommand::getGlobalName (Indication::PhrasingSlur), 0, Key_ParenRight + CTRL, this, - SLOT(slotGroupPhrasingSlur()), actionCollection(), "phrasing_slur"); + TQT_SLOT(slotGroupPhrasingSlur()), actionCollection(), "phrasing_slur"); icon = QIconSet (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap @@ -1956,7 +1956,7 @@ void NotationView::setupActions() new KAction(AddIndicationCommand::getGlobalName (Indication::Glissando), icon, 0, this, - SLOT(slotGroupGlissando()), actionCollection(), "glissando"); + TQT_SLOT(slotGroupGlissando()), actionCollection(), "glissando"); icon = QIconSet (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap @@ -1964,7 +1964,7 @@ void NotationView::setupActions() new KAction(AddIndicationCommand::getGlobalName (Indication::Crescendo), icon, Key_Less, this, - SLOT(slotGroupCrescendo()), actionCollection(), "crescendo"); + TQT_SLOT(slotGroupCrescendo()), actionCollection(), "crescendo"); icon = QIconSet (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap @@ -1972,11 +1972,11 @@ void NotationView::setupActions() new KAction(AddIndicationCommand::getGlobalName (Indication::Decrescendo), icon, Key_Greater, this, - SLOT(slotGroupDecrescendo()), actionCollection(), "decrescendo"); + TQT_SLOT(slotGroupDecrescendo()), actionCollection(), "decrescendo"); new KAction(AddIndicationCommand::getGlobalName (Indication::QuindicesimaUp), 0, 0, this, - SLOT(slotGroupOctave2Up()), actionCollection(), "octave_2up"); + TQT_SLOT(slotGroupOctave2Up()), actionCollection(), "octave_2up"); icon = QIconSet (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap @@ -1984,33 +1984,33 @@ void NotationView::setupActions() new KAction(AddIndicationCommand::getGlobalName (Indication::OttavaUp), icon, 0, this, - SLOT(slotGroupOctaveUp()), actionCollection(), "octave_up"); + TQT_SLOT(slotGroupOctaveUp()), actionCollection(), "octave_up"); new KAction(AddIndicationCommand::getGlobalName (Indication::OttavaDown), 0, 0, this, - SLOT(slotGroupOctaveDown()), actionCollection(), "octave_down"); + TQT_SLOT(slotGroupOctaveDown()), actionCollection(), "octave_down"); new KAction(AddIndicationCommand::getGlobalName (Indication::QuindicesimaDown), 0, 0, this, - SLOT(slotGroupOctave2Down()), actionCollection(), "octave_2down"); + TQT_SLOT(slotGroupOctave2Down()), actionCollection(), "octave_2down"); icon = QIconSet (NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("group-chord"))); new KAction(MakeChordCommand::getGlobalName(), icon, 0, this, - SLOT(slotGroupMakeChord()), actionCollection(), "make_chord"); + TQT_SLOT(slotGroupMakeChord()), actionCollection(), "make_chord"); // setup Transforms menu new KAction(NormalizeRestsCommand::getGlobalName(), Key_N + CTRL, this, - SLOT(slotTransformsNormalizeRests()), actionCollection(), + TQT_SLOT(slotTransformsNormalizeRests()), actionCollection(), "normalize_rests"); new KAction(CollapseRestsCommand::getGlobalName(), 0, this, - SLOT(slotTransformsCollapseRests()), actionCollection(), + TQT_SLOT(slotTransformsCollapseRests()), actionCollection(), "collapse_rests_aggressively"); new KAction(CollapseNotesCommand::getGlobalName(), Key_Equal + CTRL, this, - SLOT(slotTransformsCollapseNotes()), actionCollection(), + TQT_SLOT(slotTransformsCollapseNotes()), actionCollection(), "collapse_notes"); icon = QIconSet @@ -2018,15 +2018,15 @@ void NotationView::setupActions() ("transforms-tie"))); new KAction(TieNotesCommand::getGlobalName(), icon, Key_AsciiTilde, this, - SLOT(slotTransformsTieNotes()), actionCollection(), + TQT_SLOT(slotTransformsTieNotes()), actionCollection(), "tie_notes"); new KAction(UntieNotesCommand::getGlobalName(), 0, this, - SLOT(slotTransformsUntieNotes()), actionCollection(), + TQT_SLOT(slotTransformsUntieNotes()), actionCollection(), "untie_notes"); new KAction(MakeNotesViableCommand::getGlobalName(), 0, this, - SLOT(slotTransformsMakeNotesViable()), actionCollection(), + TQT_SLOT(slotTransformsMakeNotesViable()), actionCollection(), "make_notes_viable"); icon = QIconSet @@ -2034,49 +2034,49 @@ void NotationView::setupActions() ("transforms-decounterpoint"))); new KAction(DeCounterpointCommand::getGlobalName(), icon, 0, this, - SLOT(slotTransformsDeCounterpoint()), actionCollection(), + TQT_SLOT(slotTransformsDeCounterpoint()), actionCollection(), "de_counterpoint"); new KAction(ChangeStemsCommand::getGlobalName(true), 0, Key_PageUp + CTRL, this, - SLOT(slotTransformsStemsUp()), actionCollection(), + TQT_SLOT(slotTransformsStemsUp()), actionCollection(), "stems_up"); new KAction(ChangeStemsCommand::getGlobalName(false), 0, Key_PageDown + CTRL, this, - SLOT(slotTransformsStemsDown()), actionCollection(), + TQT_SLOT(slotTransformsStemsDown()), actionCollection(), "stems_down"); new KAction(RestoreStemsCommand::getGlobalName(), 0, this, - SLOT(slotTransformsRestoreStems()), actionCollection(), + TQT_SLOT(slotTransformsRestoreStems()), actionCollection(), "restore_stems"); new KAction(ChangeSlurPositionCommand::getGlobalName(true), 0, this, - SLOT(slotTransformsSlursAbove()), actionCollection(), + TQT_SLOT(slotTransformsSlursAbove()), actionCollection(), "slurs_above"); new KAction(ChangeSlurPositionCommand::getGlobalName(false), 0, this, - SLOT(slotTransformsSlursBelow()), actionCollection(), + TQT_SLOT(slotTransformsSlursBelow()), actionCollection(), "slurs_below"); new KAction(RestoreSlursCommand::getGlobalName(), 0, this, - SLOT(slotTransformsRestoreSlurs()), actionCollection(), + TQT_SLOT(slotTransformsRestoreSlurs()), actionCollection(), "restore_slurs"); new KAction(ChangeTiePositionCommand::getGlobalName(true), 0, this, - SLOT(slotTransformsTiesAbove()), actionCollection(), + TQT_SLOT(slotTransformsTiesAbove()), actionCollection(), "ties_above"); new KAction(ChangeTiePositionCommand::getGlobalName(false), 0, this, - SLOT(slotTransformsTiesBelow()), actionCollection(), + TQT_SLOT(slotTransformsTiesBelow()), actionCollection(), "ties_below"); new KAction(RestoreTiesCommand::getGlobalName(), 0, this, - SLOT(slotTransformsRestoreTies()), actionCollection(), + TQT_SLOT(slotTransformsRestoreTies()), actionCollection(), "restore_ties"); icon = QIconSet @@ -2086,7 +2086,7 @@ void NotationView::setupActions() new KAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::DoubleFlat), icon, 0, this, - SLOT(slotRespellDoubleFlat()), actionCollection(), + TQT_SLOT(slotRespellDoubleFlat()), actionCollection(), "respell_doubleflat"); icon = QIconSet @@ -2096,7 +2096,7 @@ void NotationView::setupActions() new KAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::Flat), icon, 0, this, - SLOT(slotRespellFlat()), actionCollection(), + TQT_SLOT(slotRespellFlat()), actionCollection(), "respell_flat"); icon = QIconSet @@ -2106,7 +2106,7 @@ void NotationView::setupActions() new KAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::Natural), icon, 0, this, - SLOT(slotRespellNatural()), actionCollection(), + TQT_SLOT(slotRespellNatural()), actionCollection(), "respell_natural"); icon = QIconSet @@ -2116,7 +2116,7 @@ void NotationView::setupActions() new KAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::Sharp), icon, 0, this, - SLOT(slotRespellSharp()), actionCollection(), + TQT_SLOT(slotRespellSharp()), actionCollection(), "respell_sharp"); icon = QIconSet @@ -2126,35 +2126,35 @@ void NotationView::setupActions() new KAction(RespellCommand::getGlobalName (RespellCommand::Set, Accidentals::DoubleSharp), icon, 0, this, - SLOT(slotRespellDoubleSharp()), actionCollection(), + TQT_SLOT(slotRespellDoubleSharp()), actionCollection(), "respell_doublesharp"); new KAction(RespellCommand::getGlobalName (RespellCommand::Up, Accidentals::NoAccidental), Key_Up + CTRL + SHIFT, this, - SLOT(slotRespellUp()), actionCollection(), + TQT_SLOT(slotRespellUp()), actionCollection(), "respell_up"); new KAction(RespellCommand::getGlobalName (RespellCommand::Down, Accidentals::NoAccidental), Key_Down + CTRL + SHIFT, this, - SLOT(slotRespellDown()), actionCollection(), + TQT_SLOT(slotRespellDown()), actionCollection(), "respell_down"); new KAction(RespellCommand::getGlobalName (RespellCommand::Restore, Accidentals::NoAccidental), 0, this, - SLOT(slotRespellRestore()), actionCollection(), + TQT_SLOT(slotRespellRestore()), actionCollection(), "respell_restore"); new KAction(MakeAccidentalsCautionaryCommand::getGlobalName(true), 0, this, - SLOT(slotShowCautionary()), actionCollection(), + TQT_SLOT(slotShowCautionary()), actionCollection(), "show_cautionary"); new KAction(MakeAccidentalsCautionaryCommand::getGlobalName(false), 0, this, - SLOT(slotCancelCautionary()), actionCollection(), + TQT_SLOT(slotCancelCautionary()), actionCollection(), "cancel_cautionary"); icon = QIconSet @@ -2162,37 +2162,37 @@ void NotationView::setupActions() ("quantize"))); new KAction(EventQuantizeCommand::getGlobalName(), icon, Key_Equal, this, - SLOT(slotTransformsQuantize()), actionCollection(), + TQT_SLOT(slotTransformsQuantize()), actionCollection(), "quantize"); new KAction(FixNotationQuantizeCommand::getGlobalName(), 0, - this, SLOT(slotTransformsFixQuantization()), actionCollection(), + this, TQT_SLOT(slotTransformsFixQuantization()), actionCollection(), "fix_quantization"); new KAction(RemoveNotationQuantizeCommand::getGlobalName(), 0, - this, SLOT(slotTransformsRemoveQuantization()), actionCollection(), + this, TQT_SLOT(slotTransformsRemoveQuantization()), actionCollection(), "remove_quantization"); new KAction(InterpretCommand::getGlobalName(), 0, - this, SLOT(slotTransformsInterpret()), actionCollection(), + this, TQT_SLOT(slotTransformsInterpret()), actionCollection(), "interpret"); new KAction(i18n("&Dump selected events to stderr"), 0, this, - SLOT(slotDebugDump()), actionCollection(), "debug_dump"); + TQT_SLOT(slotDebugDump()), actionCollection(), "debug_dump"); for (MarkActionDataMap::Iterator i = m_markActionDataMap->begin(); i != m_markActionDataMap->end(); ++i) { const MarkActionData &markActionData = **i; - icon = QIconSet(NotePixmapFactory::toQPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap (NotePixmapFactory::makeMarkMenuPixmap(markActionData.mark))); new KAction(markActionData.title, icon, markActionData.keycode, this, - SLOT(slotAddMark()), + TQT_SLOT(slotAddMark()), actionCollection(), markActionData.actionName); } @@ -2202,97 +2202,97 @@ void NotationView::setupActions() ("text-mark"))); new KAction(AddTextMarkCommand::getGlobalName(), icon, 0, this, - SLOT(slotMarksAddTextMark()), actionCollection(), + TQT_SLOT(slotMarksAddTextMark()), actionCollection(), "add_text_mark"); new KAction(AddFingeringMarkCommand::getGlobalName("0"), 0, Key_0 + ALT, this, - SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), + TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_0"); new KAction(AddFingeringMarkCommand::getGlobalName("1"), 0, Key_1 + ALT, this, - SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), + TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_1"); new KAction(AddFingeringMarkCommand::getGlobalName("2"), 0, Key_2 + ALT, this, - SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), + TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_2"); new KAction(AddFingeringMarkCommand::getGlobalName("3"), 0, Key_3 + ALT, this, - SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), + TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_3"); new KAction(AddFingeringMarkCommand::getGlobalName("4"), 0, Key_4 + ALT, this, - SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), + TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_4"); new KAction(AddFingeringMarkCommand::getGlobalName("5"), 0, Key_5 + ALT, this, - SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), + TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_5"); new KAction(AddFingeringMarkCommand::getGlobalName("+"), 0, Key_9 + ALT, this, - SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), + TQT_SLOT(slotMarksAddFingeringMarkFromAction()), actionCollection(), "add_fingering_plus"); new KAction(AddFingeringMarkCommand::getGlobalName(), 0, 0, this, - SLOT(slotMarksAddFingeringMark()), actionCollection(), + TQT_SLOT(slotMarksAddFingeringMark()), actionCollection(), "add_fingering_mark"); new KAction(RemoveMarksCommand::getGlobalName(), 0, this, - SLOT(slotMarksRemoveMarks()), actionCollection(), + TQT_SLOT(slotMarksRemoveMarks()), actionCollection(), "remove_marks"); new KAction(RemoveFingeringMarksCommand::getGlobalName(), 0, this, - SLOT(slotMarksRemoveFingeringMarks()), actionCollection(), + TQT_SLOT(slotMarksRemoveFingeringMarks()), actionCollection(), "remove_fingering_marks"); new KAction(i18n("Ma&ke Ornament..."), 0, this, - SLOT(slotMakeOrnament()), actionCollection(), + TQT_SLOT(slotMakeOrnament()), actionCollection(), "make_ornament"); new KAction(i18n("Trigger &Ornament..."), 0, this, - SLOT(slotUseOrnament()), actionCollection(), + TQT_SLOT(slotUseOrnament()), actionCollection(), "use_ornament"); new KAction(i18n("Remove Ornament..."), 0, this, - SLOT(slotRemoveOrnament()), actionCollection(), + TQT_SLOT(slotRemoveOrnament()), actionCollection(), "remove_ornament"); - static QString slashTitles[] = { + static TQString slashTitles[] = { i18n("&None"), "&1", "&2", "&3", "&4", "&5" }; for (int i = 0; i <= 5; ++i) { new KAction(slashTitles[i], 0, this, - SLOT(slotAddSlashes()), actionCollection(), - QString("slashes_%1").arg(i)); + TQT_SLOT(slotAddSlashes()), actionCollection(), + TQString("slashes_%1").arg(i)); } new KAction(ClefInsertionCommand::getGlobalName(), 0, this, - SLOT(slotEditAddClef()), actionCollection(), + TQT_SLOT(slotEditAddClef()), actionCollection(), "add_clef"); new KAction(KeyInsertionCommand::getGlobalName(), 0, this, - SLOT(slotEditAddKeySignature()), actionCollection(), + TQT_SLOT(slotEditAddKeySignature()), actionCollection(), "add_key_signature"); new KAction(SustainInsertionCommand::getGlobalName(true), 0, this, - SLOT(slotEditAddSustainDown()), actionCollection(), + TQT_SLOT(slotEditAddSustainDown()), actionCollection(), "add_sustain_down"); new KAction(SustainInsertionCommand::getGlobalName(false), 0, this, - SLOT(slotEditAddSustainUp()), actionCollection(), + TQT_SLOT(slotEditAddSustainUp()), actionCollection(), "add_sustain_up"); new KAction(TransposeCommand::getDiatonicGlobalName(false), 0, this, - SLOT(slotEditTranspose()), actionCollection(), + TQT_SLOT(slotEditTranspose()), actionCollection(), "transpose_segment"); new KAction(i18n("Convert Notation For..."), 0, this, - SLOT(slotEditSwitchPreset()), actionCollection(), + TQT_SLOT(slotEditSwitchPreset()), actionCollection(), "switch_preset"); // setup Settings menu - static QString actionsToolbars[][4] = + static TQString actionsToolbars[][4] = { { i18n("Show T&ools Toolbar"), "1slotToggleToolsToolBar()", "show_tools_toolbar", "palette-tools" }, { i18n("Show &Notes Toolbar"), "1slotToggleNotesToolBar()", "show_notes_toolbar", "palette-notes" }, @@ -2315,7 +2315,7 @@ void NotationView::setupActions() for (unsigned int i = 0; i < sizeof(actionsToolbars) / sizeof(actionsToolbars[0]); ++i) { - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap(actionsToolbars[i][3]))); + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap(actionsToolbars[i][3]))); new KToggleAction(actionsToolbars[i][0], icon, 0, this, actionsToolbars[i][1], @@ -2323,193 +2323,193 @@ void NotationView::setupActions() } new KAction(i18n("Cursor &Back"), 0, Key_Left, this, - SLOT(slotStepBackward()), actionCollection(), + TQT_SLOT(slotStepBackward()), actionCollection(), "cursor_back"); new KAction(i18n("Cursor &Forward"), 0, Key_Right, this, - SLOT(slotStepForward()), actionCollection(), + TQT_SLOT(slotStepForward()), actionCollection(), "cursor_forward"); new KAction(i18n("Cursor Ba&ck Bar"), 0, Key_Left + CTRL, this, - SLOT(slotJumpBackward()), actionCollection(), + TQT_SLOT(slotJumpBackward()), actionCollection(), "cursor_back_bar"); new KAction(i18n("Cursor For&ward Bar"), 0, Key_Right + CTRL, this, - SLOT(slotJumpForward()), actionCollection(), + TQT_SLOT(slotJumpForward()), actionCollection(), "cursor_forward_bar"); new KAction(i18n("Cursor Back and Se&lect"), SHIFT + Key_Left, this, - SLOT(slotExtendSelectionBackward()), actionCollection(), + TQT_SLOT(slotExtendSelectionBackward()), actionCollection(), "extend_selection_backward"); new KAction(i18n("Cursor Forward and &Select"), SHIFT + Key_Right, this, - SLOT(slotExtendSelectionForward()), actionCollection(), + TQT_SLOT(slotExtendSelectionForward()), actionCollection(), "extend_selection_forward"); new KAction(i18n("Cursor Back Bar and Select"), SHIFT + CTRL + Key_Left, this, - SLOT(slotExtendSelectionBackwardBar()), actionCollection(), + TQT_SLOT(slotExtendSelectionBackwardBar()), actionCollection(), "extend_selection_backward_bar"); new KAction(i18n("Cursor Forward Bar and Select"), SHIFT + CTRL + Key_Right, this, - SLOT(slotExtendSelectionForwardBar()), actionCollection(), + TQT_SLOT(slotExtendSelectionForwardBar()), actionCollection(), "extend_selection_forward_bar"); /*!!! not here yet new KAction(i18n("Move Selection Left"), Key_Minus, this, - SLOT(slotMoveSelectionLeft()), actionCollection(), + TQT_SLOT(slotMoveSelectionLeft()), actionCollection(), "move_selection_left"); */ new KAction(i18n("Cursor to St&art"), 0, /* #1025717: conflicting meanings for ctrl+a - dupe with Select All Key_A + CTRL, */ this, - SLOT(slotJumpToStart()), actionCollection(), + TQT_SLOT(slotJumpToStart()), actionCollection(), "cursor_start"); new KAction(i18n("Cursor to &End"), 0, Key_E + CTRL, this, - SLOT(slotJumpToEnd()), actionCollection(), + TQT_SLOT(slotJumpToEnd()), actionCollection(), "cursor_end"); new KAction(i18n("Cursor &Up Staff"), 0, Key_Up + SHIFT, this, - SLOT(slotCurrentStaffUp()), actionCollection(), + TQT_SLOT(slotCurrentStaffUp()), actionCollection(), "cursor_up_staff"); new KAction(i18n("Cursor &Down Staff"), 0, Key_Down + SHIFT, this, - SLOT(slotCurrentStaffDown()), actionCollection(), + TQT_SLOT(slotCurrentStaffDown()), actionCollection(), "cursor_down_staff"); new KAction(i18n("Cursor Pre&vious Segment"), 0, Key_Prior + ALT, this, - SLOT(slotCurrentSegmentPrior()), actionCollection(), + TQT_SLOT(slotCurrentSegmentPrior()), actionCollection(), "cursor_prior_segment"); new KAction(i18n("Cursor Ne&xt Segment"), 0, Key_Next + ALT, this, - SLOT(slotCurrentSegmentNext()), actionCollection(), + TQT_SLOT(slotCurrentSegmentNext()), actionCollection(), "cursor_next_segment"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-cursor-to-pointer"))); new KAction(i18n("Cursor to &Playback Pointer"), icon, 0, this, - SLOT(slotJumpCursorToPlayback()), actionCollection(), + TQT_SLOT(slotJumpCursorToPlayback()), actionCollection(), "cursor_to_playback_pointer"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-play"))); KAction *play = new KAction(i18n("&Play"), icon, Key_Enter, this, - SIGNAL(play()), actionCollection(), "play"); + TQT_SIGNAL(play()), actionCollection(), "play"); // Alternative shortcut for Play KShortcut playShortcut = play->shortcut(); playShortcut.append( KKey(Key_Return + CTRL) ); play->setShortcut(playShortcut); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-stop"))); new KAction(i18n("&Stop"), icon, Key_Insert, this, - SIGNAL(stop()), actionCollection(), "stop"); + TQT_SIGNAL(stop()), actionCollection(), "stop"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind"))); new KAction(i18n("Re&wind"), icon, Key_End, this, - SIGNAL(rewindPlayback()), actionCollection(), + TQT_SIGNAL(rewindPlayback()), actionCollection(), "playback_pointer_back_bar"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd"))); new KAction(i18n("&Fast Forward"), icon, Key_PageDown, this, - SIGNAL(fastForwardPlayback()), actionCollection(), + TQT_SIGNAL(fastForwardPlayback()), actionCollection(), "playback_pointer_forward_bar"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-rewind-end"))); new KAction(i18n("Rewind to &Beginning"), icon, 0, this, - SIGNAL(rewindPlaybackToBeginning()), actionCollection(), + TQT_SIGNAL(rewindPlaybackToBeginning()), actionCollection(), "playback_pointer_start"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-ffwd-end"))); new KAction(i18n("Fast Forward to &End"), icon, 0, this, - SIGNAL(fastForwardPlaybackToEnd()), actionCollection(), + TQT_SIGNAL(fastForwardPlaybackToEnd()), actionCollection(), "playback_pointer_end"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-pointer-to-cursor"))); new KAction(i18n("Playback Pointer to &Cursor"), icon, 0, this, - SLOT(slotJumpPlaybackToCursor()), actionCollection(), + TQT_SLOT(slotJumpPlaybackToCursor()), actionCollection(), "playback_pointer_to_cursor"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-solo"))); new KToggleAction(i18n("&Solo"), icon, 0, this, - SLOT(slotToggleSolo()), actionCollection(), + TQT_SLOT(slotToggleSolo()), actionCollection(), "toggle_solo"); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-tracking"))); (new KToggleAction(i18n("Scro&ll to Follow Playback"), icon, Key_Pause, this, - SLOT(slotToggleTracking()), actionCollection(), + TQT_SLOT(slotToggleTracking()), actionCollection(), "toggle_tracking"))->setChecked(m_playTracking); - icon = QIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap + icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory::makeToolbarPixmap ("transport-panic"))); new KAction(i18n("Panic"), icon, Key_P + CTRL + ALT, this, - SIGNAL(panic()), actionCollection(), "panic"); + TQT_SIGNAL(panic()), actionCollection(), "panic"); new KAction(i18n("Set Loop to Selection"), Key_Semicolon + CTRL, this, - SLOT(slotPreviewSelection()), actionCollection(), + TQT_SLOT(slotPreviewSelection()), actionCollection(), "preview_selection"); new KAction(i18n("Clear L&oop"), Key_Colon + CTRL, this, - SLOT(slotClearLoop()), actionCollection(), + TQT_SLOT(slotClearLoop()), actionCollection(), "clear_loop"); new KAction(i18n("Clear Selection"), Key_Escape, this, - SLOT(slotClearSelection()), actionCollection(), + TQT_SLOT(slotClearSelection()), actionCollection(), "clear_selection"); - // QString pixmapDir = + // TQString pixmapDir = // KGlobal::dirs()->findResource("appdata", "pixmaps/"); - // icon = QIconSet(QCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); + // icon = TQIconSet(TQCanvasPixmap(pixmapDir + "/toolbar/eventfilter.xpm")); new KAction(i18n("&Filter Selection"), "filter", Key_F + CTRL, this, - SLOT(slotFilterSelection()), actionCollection(), + TQT_SLOT(slotFilterSelection()), actionCollection(), "filter_selection"); new KAction(i18n("Push &Left"), 0, this, - SLOT(slotFinePositionLeft()), actionCollection(), + TQT_SLOT(slotFinePositionLeft()), actionCollection(), "fine_position_left"); new KAction(i18n("Push &Right"), 0, this, - SLOT(slotFinePositionRight()), actionCollection(), + TQT_SLOT(slotFinePositionRight()), actionCollection(), "fine_position_right"); new KAction(i18n("Push &Up"), 0, this, - SLOT(slotFinePositionUp()), actionCollection(), + TQT_SLOT(slotFinePositionUp()), actionCollection(), "fine_position_up"); new KAction(i18n("Push &Down"), 0, this, - SLOT(slotFinePositionDown()), actionCollection(), + TQT_SLOT(slotFinePositionDown()), actionCollection(), "fine_position_down"); new KAction(i18n("&Restore Positions"), 0, this, - SLOT(slotFinePositionRestore()), actionCollection(), + TQT_SLOT(slotFinePositionRestore()), actionCollection(), "fine_position_restore"); new KAction(i18n("Make &Invisible"), 0, this, - SLOT(slotMakeInvisible()), actionCollection(), + TQT_SLOT(slotMakeInvisible()), actionCollection(), "make_invisible"); new KAction(i18n("Make &Visible"), 0, this, - SLOT(slotMakeVisible()), actionCollection(), + TQT_SLOT(slotMakeVisible()), actionCollection(), "make_visible"); new KAction(i18n("Toggle Dot"), Key_Period, this, - SLOT(slotToggleDot()), actionCollection(), + TQT_SLOT(slotToggleDot()), actionCollection(), "toggle_dot"); new KAction(i18n("Add Dot"), Key_Period + CTRL, this, - SLOT(slotAddDot()), actionCollection(), + TQT_SLOT(slotAddDot()), actionCollection(), "add_dot"); new KAction(i18n("Add Dot"), Key_Period + CTRL + ALT, this, - SLOT(slotAddDotNotationOnly()), actionCollection(), + TQT_SLOT(slotAddDotNotationOnly()), actionCollection(), "add_notation_dot"); createGUI(getRCFileName(), false); @@ -2546,7 +2546,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName) for (unsigned int i = 0; i < sizes.size(); ++i) { KAction *action = actionCollection()->action - (QString("note_font_size_%1").arg(sizes[i])); + (TQString("note_font_size_%1").arg(sizes[i])); m_fontSizeActionMenu->remove (action); @@ -2560,7 +2560,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName) for (unsigned int i = 0; i < sizes.size(); ++i) { - QString actionName = QString("note_font_size_%1").arg(sizes[i]); + TQString actionName = TQString("note_font_size_%1").arg(sizes[i]); KToggleAction *sizeAction = dynamic_cast<KToggleAction *> (actionCollection()->action(actionName)); @@ -2569,7 +2569,7 @@ NotationView::setupFontSizeMenu(std::string oldFontName) sizeAction = new KToggleAction(i18n("1 pixel", "%n pixels", sizes[i]), 0, this, - SLOT(slotChangeFontSizeFromAction()), + TQT_SLOT(slotChangeFontSizeFromAction()), actionCollection(), actionName); } @@ -2616,7 +2616,7 @@ void NotationView::initLayoutToolbar() return ; } - new QLabel(i18n(" Font: "), layoutToolbar, "font label"); + new TQLabel(i18n(" Font: "), layoutToolbar, "font label"); // // font combo @@ -2633,7 +2633,7 @@ void NotationView::initLayoutToolbar() for (std::vector<std::string>::iterator i = f.begin(); i != f.end(); ++i) { - QString fontQName(strtoqstr(*i)); + TQString fontQName(strtoqstr(*i)); m_fontCombo->insertItem(fontQName); if (fontQName.lower() == strtoqstr(m_fontName).lower()) { @@ -2649,12 +2649,12 @@ void NotationView::initLayoutToolbar() m_fontName = NoteFontFactory::getDefaultFontName(); } - connect(m_fontCombo, SIGNAL(activated(const QString &)), - this, SLOT(slotChangeFont(const QString &))); + connect(m_fontCombo, TQT_SIGNAL(activated(const TQString &)), + this, TQT_SLOT(slotChangeFont(const TQString &))); - new QLabel(i18n(" Size: "), layoutToolbar, "size label"); + new TQLabel(i18n(" Size: "), layoutToolbar, "size label"); - QString value; + TQString value; // // font size combo @@ -2671,10 +2671,10 @@ void NotationView::initLayoutToolbar() value.setNum(m_fontSize); m_fontSizeCombo->setCurrentText(value); - connect(m_fontSizeCombo, SIGNAL(activated(const QString&)), - this, SLOT(slotChangeFontSizeFromStringValue(const QString&))); + connect(m_fontSizeCombo, TQT_SIGNAL(activated(const TQString&)), + this, TQT_SLOT(slotChangeFontSizeFromStringValue(const TQString&))); - new QLabel(i18n(" Spacing: "), layoutToolbar, "spacing label"); + new TQLabel(i18n(" Spacing: "), layoutToolbar, "spacing label"); // // spacing combo @@ -2694,29 +2694,29 @@ void NotationView::initLayoutToolbar() value += "%"; m_spacingCombo->setCurrentText(value); - connect(m_spacingCombo, SIGNAL(activated(const QString&)), - this, SLOT(slotChangeSpacingFromStringValue(const QString&))); + connect(m_spacingCombo, TQT_SIGNAL(activated(const TQString&)), + this, TQT_SLOT(slotChangeSpacingFromStringValue(const TQString&))); } void NotationView::initStatusBar() { KStatusBar* sb = statusBar(); - m_hoveredOverNoteName = new QLabel(sb); + m_hoveredOverNoteName = new TQLabel(sb); m_hoveredOverNoteName->setMinimumWidth(32); - m_hoveredOverAbsoluteTime = new QLabel(sb); + m_hoveredOverAbsoluteTime = new TQLabel(sb); m_hoveredOverAbsoluteTime->setMinimumWidth(160); sb->addWidget(m_hoveredOverAbsoluteTime); sb->addWidget(m_hoveredOverNoteName); - QHBox *hbox = new QHBox(sb); - m_currentNotePixmap = new QLabel(hbox); + TQHBox *hbox = new TQHBox(sb); + m_currentNotePixmap = new TQLabel(hbox); m_currentNotePixmap->setMinimumWidth(20); - m_insertModeLabel = new QLabel(hbox); - m_annotationsLabel = new QLabel(hbox); - m_lilyPondDirectivesLabel = new QLabel(hbox); + m_insertModeLabel = new TQLabel(hbox); + m_annotationsLabel = new TQLabel(hbox); + m_lilyPondDirectivesLabel = new TQLabel(hbox); sb->addWidget(hbox); sb->insertItem(KTmpStatusMsg::getDefaultMsg(), @@ -2724,7 +2724,7 @@ void NotationView::initStatusBar() sb->setItemAlignment(KTmpStatusMsg::getDefaultId(), AlignLeft | AlignVCenter); - m_selectionCounter = new QLabel(sb); + m_selectionCounter = new TQLabel(sb); sb->addWidget(m_selectionCounter); m_progressBar = new ProgressBar(100, true, sb); @@ -2732,12 +2732,12 @@ void NotationView::initStatusBar() sb->addWidget(m_progressBar); } -QSize NotationView::getViewSize() +TQSize NotationView::getViewSize() { return canvas()->size(); } -void NotationView::setViewSize(QSize s) +void NotationView::setViewSize(TQSize s) { canvas()->resize(s.width(), s.height()); @@ -2916,7 +2916,7 @@ NotationView::getHLayout() } void -NotationView::paintEvent(QPaintEvent *e) +NotationView::paintEvent(TQPaintEvent *e) { m_inPaintEvent = true; @@ -3534,18 +3534,18 @@ void NotationView::print(bool previewOnly) maxPageCount = pageCount; } - KPrinter printer(true, QPrinter::HighResolution); + KPrinter printer(true, TQPrinter::HighResolution); printer.setPageSelection(KPrinter::ApplicationSide); printer.setMinMax(1, maxPageCount + 1); if (previewOnly) printer.setPreviewOnly(true); - else if (!printer.setup((QWidget *)parent())) + else if (!printer.setup((TQWidget *)parent())) return ; - QPaintDeviceMetrics pdm(&printer); - QPainter printpainter(&printer); + TQPaintDeviceMetrics pdm(&printer); + TQPainter printpainter(&printer); // Ideally we should aim to retain the aspect ratio and to move the // staffs so as to be centred after scaling. But because we haven't @@ -3562,9 +3562,9 @@ void NotationView::print(bool previewOnly) // (double)pdm.height() / (double)(pageHeight - topMargin*2)); printpainter.translate( -leftMargin, -topMargin); - QValueList<int> pages = printer.pageList(); + TQValueList<int> pages = printer.pageList(); - for (QValueList<int>::Iterator pli = pages.begin(); + for (TQValueList<int>::Iterator pli = pages.begin(); pli != pages.end(); ) { // incremented just below int page = *pli - 1; @@ -3574,7 +3574,7 @@ void NotationView::print(bool previewOnly) NOTATION_DEBUG << "Printing page " << page << endl; - QRect pageRect(m_leftGutter + leftMargin + pageWidth * page, + TQRect pageRect(m_leftGutter + leftMargin + pageWidth * page, topMargin, pageWidth - leftMargin, pageHeight - topMargin); @@ -3604,10 +3604,10 @@ void NotationView::print(bool previewOnly) m_config->setGroup(NotationViewConfigGroup); - NOTATION_DEBUG << "NotationView::print: calling QCanvas::drawArea" << endl; + NOTATION_DEBUG << "NotationView::print: calling TQCanvas::drawArea" << endl; { - Profiler profiler("NotationView::print(QCanvas::drawArea)"); + Profiler profiler("NotationView::print(TQCanvas::drawArea)"); if (m_config->readBoolEntry("forcedoublebufferprinting", false)) { getCanvasView()->canvas()->drawArea(pageRect, &printpainter, true); @@ -3623,7 +3623,7 @@ void NotationView::print(bool previewOnly) } - NOTATION_DEBUG << "NotationView::print: QCanvas::drawArea done" << endl; + NOTATION_DEBUG << "NotationView::print: TQCanvas::drawArea done" << endl; for (size_t i = 0; i < m_staffs.size(); ++i) { @@ -3685,10 +3685,10 @@ NotationView::updateThumbnails(bool complete) } int thumbScale = 20; - QPixmap thumbnail(canvas()->width() / thumbScale, + TQPixmap thumbnail(canvas()->width() / thumbScale, canvas()->height() / thumbScale); thumbnail.fill(Qt::white); - QPainter thumbPainter(&thumbnail); + TQPainter thumbPainter(&thumbnail); if (complete) { @@ -3697,8 +3697,8 @@ NotationView::updateThumbnails(bool complete) thumbPainter.setBrush(Qt::white); /* - QCanvas *canvas = getCanvasView()->canvas(); - canvas->drawArea(QRect(0, 0, canvas->width(), canvas->height()), + TQCanvas *canvas = getCanvasView()->canvas(); + canvas->drawArea(TQRect(0, 0, canvas->width(), canvas->height()), &thumbPainter, false); */ // hide small texts, as we get a crash in Xft when trying to @@ -3719,12 +3719,12 @@ NotationView::updateThumbnails(bool complete) if (havePageNumber) m_pageNumbers[page]->hide(); - QRect pageRect(m_leftGutter + leftMargin * 2 + pageWidth * page, + TQRect pageRect(m_leftGutter + leftMargin * 2 + pageWidth * page, topMargin * 2, pageWidth - leftMargin*3, pageHeight - topMargin*3); - QCanvas *canvas = getCanvasView()->canvas(); + TQCanvas *canvas = getCanvasView()->canvas(); canvas->drawArea(pageRect, &thumbPainter, false); if (havePageNumber) @@ -3751,7 +3751,7 @@ NotationView::updateThumbnails(bool complete) int w = pageWidth - leftMargin / 2; int h = pageHeight; - QString str = QString("%1").arg(page + 1); + TQString str = TQString("%1").arg(page + 1); thumbPainter.drawRect(x / thumbScale, y / thumbScale, w / thumbScale, h / thumbScale); @@ -3927,7 +3927,7 @@ void NotationView::readjustCanvasSize() } // now get the EditView to do the biz - readjustViewSize(QSize(int(maxWidth), maxHeight), true); + readjustViewSize(TQSize(int(maxWidth), maxHeight), true); UPDATE_PROGRESS(2); @@ -3941,11 +3941,11 @@ void NotationView::readjustCanvasSize() m_pannerDialog->show(); m_pannerDialog->setPageSize - (QSize(canvas()->width(), + (TQSize(canvas()->width(), canvas()->height())); m_pannerDialog->scrollbox()->setViewSize - (QSize(getCanvasView()->width(), + (TQSize(getCanvasView()->width(), getCanvasView()->height())); } } @@ -3958,7 +3958,7 @@ void NotationView::readjustCanvasSize() void NotationView::slotNoteAction() { - const QObject* sigSender = sender(); + const TQObject* sigSender = sender(); NoteActionDataMap::Iterator noteAct = m_noteActionDataMap->find(sigSender->name()); @@ -3989,7 +3989,7 @@ void NotationView::slotLastNoteAction() void NotationView::slotAddMark() { - const QObject *s = sender(); + const TQObject *s = sender(); if (!m_currentEventSelection) return ; @@ -4003,7 +4003,7 @@ void NotationView::slotAddMark() void NotationView::slotNoteChangeAction() { - const QObject* sigSender = sender(); + const TQObject* sigSender = sender(); NoteChangeActionDataMap::Iterator noteAct = m_noteChangeActionDataMap->find(sigSender->name()); @@ -4034,20 +4034,20 @@ void NotationView::initActionDataMaps() if (dots && (type == Note::Longest)) continue; - QString refName + TQString refName (NotationStrings::getReferenceName(Note(type, dots), rest == 1)); - QString shortName(refName); - shortName.replace(QRegExp("-"), "_"); + TQString shortName(refName); + shortName.replace(TQRegExp("-"), "_"); - QString titleName + TQString titleName (NotationStrings::getNoteName(Note(type, dots))); titleName = titleName.left(1).upper() + titleName.right(titleName.length() - 1); if (rest) { - titleName.replace(QRegExp(i18n("note")), i18n("rest")); + titleName.replace(TQRegExp(i18n("note")), i18n("rest")); } int keycode = keys[type - Note::Shortest]; @@ -4069,14 +4069,14 @@ void NotationView::initActionDataMaps() for (int notationOnly = 0; notationOnly <= 1; ++notationOnly) { for (int type = Note::Longest; type >= Note::Shortest; --type) { - QString refName + TQString refName (NotationStrings::getReferenceName(Note(type, 0), false)); - QString shortName(QString("change_%1%2") + TQString shortName(TQString("change_%1%2") .arg(notationOnly ? "notation_" : "").arg(refName)); - shortName.replace(QRegExp("-"), "_"); + shortName.replace(TQRegExp("-"), "_"); - QString titleName + TQString titleName (NotationStrings::getNoteName(Note(type, 0))); titleName = titleName.left(1).upper() + @@ -4100,8 +4100,8 @@ void NotationView::initActionDataMaps() for (unsigned int i = 0; i < marks.size(); ++i) { Mark mark = marks[i]; - QString markName(strtoqstr(mark)); - QString actionName = QString("add_%1").arg(markName); + TQString markName(strtoqstr(mark)); + TQString actionName = TQString("add_%1").arg(markName); m_markActionDataMap->insert (actionName, new MarkActionData @@ -4116,24 +4116,24 @@ void NotationView::setupProgress(KProgress* bar) if (bar) { NOTATION_DEBUG << "NotationView::setupProgress(bar)\n"; - connect(m_hlayout, SIGNAL(setProgress(int)), - bar, SLOT(setValue(int))); + connect(m_hlayout, TQT_SIGNAL(setProgress(int)), + bar, TQT_SLOT(setValue(int))); - connect(m_hlayout, SIGNAL(incrementProgress(int)), - bar, SLOT(advance(int))); + connect(m_hlayout, TQT_SIGNAL(incrementProgress(int)), + bar, TQT_SLOT(advance(int))); - connect(this, SIGNAL(setProgress(int)), - bar, SLOT(setValue(int))); + connect(this, TQT_SIGNAL(setProgress(int)), + bar, TQT_SLOT(setValue(int))); - connect(this, SIGNAL(incrementProgress(int)), - bar, SLOT(advance(int))); + connect(this, TQT_SIGNAL(incrementProgress(int)), + bar, TQT_SLOT(advance(int))); for (unsigned int i = 0; i < m_staffs.size(); ++i) { - connect(m_staffs[i], SIGNAL(setProgress(int)), - bar, SLOT(setValue(int))); + connect(m_staffs[i], TQT_SIGNAL(setProgress(int)), + bar, TQT_SLOT(setValue(int))); - connect(m_staffs[i], SIGNAL(incrementProgress(int)), - bar, SLOT(advance(int))); + connect(m_staffs[i], TQT_SIGNAL(incrementProgress(int)), + bar, TQT_SLOT(advance(int))); } } @@ -4147,28 +4147,28 @@ void NotationView::setupProgress(ProgressDialog* dialog) if (dialog) { setupProgress(dialog->progressBar()); - connect(dialog, SIGNAL(cancelClicked()), - m_hlayout, SLOT(slotCancel())); + connect(dialog, TQT_SIGNAL(cancelClicked()), + m_hlayout, TQT_SLOT(slotCancel())); for (unsigned int i = 0; i < m_staffs.size(); ++i) { - connect(m_staffs[i], SIGNAL(setOperationName(QString)), - this, SLOT(slotSetOperationNameAndStatus(QString))); + connect(m_staffs[i], TQT_SIGNAL(setOperationName(TQString)), + this, TQT_SLOT(slotSetOperationNameAndStatus(TQString))); - connect(dialog, SIGNAL(cancelClicked()), - m_staffs[i], SLOT(slotCancel())); + connect(dialog, TQT_SIGNAL(cancelClicked()), + m_staffs[i], TQT_SLOT(slotCancel())); } - connect(this, SIGNAL(setOperationName(QString)), - dialog, SLOT(slotSetOperationName(QString))); + connect(this, TQT_SIGNAL(setOperationName(TQString)), + dialog, TQT_SLOT(slotSetOperationName(TQString))); m_progressDisplayer = PROGRESS_DIALOG; } } -void NotationView::slotSetOperationNameAndStatus(QString name) +void NotationView::slotSetOperationNameAndStatus(TQString name) { emit setOperationName(name); - statusBar()->changeItem(QString(" %1").arg(name), + statusBar()->changeItem(TQString(" %1").arg(name), KTmpStatusMsg::getDefaultId()); } @@ -4177,9 +4177,9 @@ void NotationView::disconnectProgress() NOTATION_DEBUG << "NotationView::disconnectProgress()" << endl; m_hlayout->disconnect(); - disconnect(SIGNAL(setProgress(int))); - disconnect(SIGNAL(incrementProgress(int))); - disconnect(SIGNAL(setOperationName(QString))); + disconnect(TQT_SIGNAL(setProgress(int))); + disconnect(TQT_SIGNAL(incrementProgress(int))); + disconnect(TQT_SIGNAL(setOperationName(TQString))); for (unsigned int i = 0; i < m_staffs.size(); ++i) { m_staffs[i]->disconnect(); @@ -4238,10 +4238,10 @@ NotationView::MarkActionDataMap* NotationView::m_markActionDataMap = 0; void NotationView::slotUpdateInsertModeStatus() { - QString tripletMessage = i18n("Triplet"); - QString chordMessage = i18n("Chord"); - QString graceMessage = i18n("Grace"); - QString message; + TQString tripletMessage = i18n("Triplet"); + TQString chordMessage = i18n("Chord"); + TQString graceMessage = i18n("Grace"); + TQString message; if (isInTripletMode()) { message = i18n("%1 %2").arg(message).arg(tripletMessage); @@ -4301,7 +4301,7 @@ NotationView::slotUpdateLilyPondDirectivesStatus() } void -NotationView::slotChangeSpacingFromStringValue(const QString& spacingT) +NotationView::slotChangeSpacingFromStringValue(const TQString& spacingT) { // spacingT has a '%' at the end // @@ -4312,8 +4312,8 @@ NotationView::slotChangeSpacingFromStringValue(const QString& spacingT) void NotationView::slotChangeSpacingFromAction() { - const QObject *s = sender(); - QString name = s->name(); + const TQObject *s = sender(); + TQString name = s->name(); if (name.left(8) == "spacing_") { int spacing = name.right(name.length() - 8).toInt(); @@ -4338,7 +4338,7 @@ NotationView::slotChangeSpacing(int spacing) // m_spacingSlider->setSize(spacing); KToggleAction *action = dynamic_cast<KToggleAction *> - (actionCollection()->action(QString("spacing_%1").arg(spacing))); + (actionCollection()->action(TQString("spacing_%1").arg(spacing))); if (action) action->setChecked(true); else { @@ -4372,8 +4372,8 @@ NotationView::slotChangeProportionFromIndex(int n) void NotationView::slotChangeProportionFromAction() { - const QObject *s = sender(); - QString name = s->name(); + const TQObject *s = sender(); + TQString name = s->name(); if (name.left(11) == "proportion_") { int proportion = name.right(name.length() - 11).toInt(); @@ -4396,7 +4396,7 @@ NotationView::slotChangeProportion(int proportion) // m_proportionSlider->setSize(proportion); KToggleAction *action = dynamic_cast<KToggleAction *> - (actionCollection()->action(QString("proportion_%1").arg(proportion))); + (actionCollection()->action(TQString("proportion_%1").arg(proportion))); if (action) action->setChecked(true); else { @@ -4421,8 +4421,8 @@ NotationView::slotChangeProportion(int proportion) void NotationView::slotChangeFontFromAction() { - const QObject *s = sender(); - QString name = s->name(); + const TQObject *s = sender(); + TQString name = s->name(); if (name.left(10) == "note_font_") { name = name.right(name.length() - 10); slotChangeFont(name); @@ -4435,8 +4435,8 @@ NotationView::slotChangeFontFromAction() void NotationView::slotChangeFontSizeFromAction() { - const QObject *s = sender(); - QString name = s->name(); + const TQObject *s = sender(); + TQString name = s->name(); if (name.left(15) == "note_font_size_") { name = name.right(name.length() - 15); @@ -4455,7 +4455,7 @@ NotationView::slotChangeFontSizeFromAction() } void -NotationView::slotChangeFont(const QString &newName) +NotationView::slotChangeFont(const TQString &newName) { NOTATION_DEBUG << "changeFont: " << newName << endl; slotChangeFont(std::string(newName.utf8())); @@ -4488,7 +4488,7 @@ NotationView::slotChangeFontSize(int newSize) } void -NotationView::slotChangeFontSizeFromStringValue(const QString& sizeT) +NotationView::slotChangeFontSizeFromStringValue(const TQString& sizeT) { int size = sizeT.toInt(); slotChangeFont(m_fontName, size); @@ -4566,7 +4566,7 @@ NotationView::slotChangeFont(std::string newName, int newSize) std::vector<int> sizes = NoteFontFactory::getScreenSizes(m_fontName); m_fontSizeCombo->clear(); - QString value; + TQString value; for (std::vector<int>::iterator i = sizes.begin(); i != sizes.end(); ++i) { value.setNum(*i); m_fontSizeCombo->insertItem(value); @@ -4619,7 +4619,7 @@ NotationView::slotFilePrint() SetWaitCursor waitCursor; NotationView printingView(getDocument(), m_segments, - (QWidget *)parent(), this); + (TQWidget *)parent(), this); if (!printingView.isOK()) { NOTATION_DEBUG << "Print : operation cancelled\n"; @@ -4636,7 +4636,7 @@ NotationView::slotFilePrintPreview() SetWaitCursor waitCursor; NotationView printingView(getDocument(), m_segments, - (QWidget *)parent(), this); + (TQWidget *)parent(), this); if (!printingView.isOK()) { NOTATION_DEBUG << "Print preview : operation cancelled\n"; @@ -4651,7 +4651,7 @@ std::map<KProcess *, KTempFile *> NotationView::m_lilyTempFileMap; void NotationView::slotPrintLilyPond() { KTmpStatusMsg msg(i18n("Printing LilyPond file..."), this); - KTempFile *file = new KTempFile(QString::null, ".ly"); + KTempFile *file = new KTempFile(TQString::null, ".ly"); file->setAutoDelete(true); if (!file->name()) { // CurrentProgressDialog::freeze(); @@ -4666,8 +4666,8 @@ void NotationView::slotPrintLilyPond() *proc << "--graphical"; *proc << "--print"; *proc << file->name(); - connect(proc, SIGNAL(processExited(KProcess *)), - this, SLOT(slotLilyPondViewProcessExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); m_lilyTempFileMap[proc] = file; proc->start(KProcess::NotifyOnExit); } @@ -4675,7 +4675,7 @@ void NotationView::slotPrintLilyPond() void NotationView::slotPreviewLilyPond() { KTmpStatusMsg msg(i18n("Previewing LilyPond file..."), this); - KTempFile *file = new KTempFile(QString::null, ".ly"); + KTempFile *file = new KTempFile(TQString::null, ".ly"); file->setAutoDelete(true); if (!file->name()) { // CurrentProgressDialog::freeze(); @@ -4690,8 +4690,8 @@ void NotationView::slotPreviewLilyPond() *proc << "--graphical"; *proc << "--pdf"; *proc << file->name(); - connect(proc, SIGNAL(processExited(KProcess *)), - this, SLOT(slotLilyPondViewProcessExited(KProcess *))); + connect(proc, TQT_SIGNAL(processExited(KProcess *)), + this, TQT_SLOT(slotLilyPondViewProcessExited(KProcess *))); m_lilyTempFileMap[proc] = file; proc->start(KProcess::NotifyOnExit); } @@ -4703,16 +4703,16 @@ void NotationView::slotLilyPondViewProcessExited(KProcess *p) delete p; } -bool NotationView::exportLilyPondFile(QString file, bool forPreview) +bool NotationView::exportLilyPondFile(TQString file, bool forPreview) { - QString caption = "", heading = ""; + TQString caption = "", heading = ""; if (forPreview) { caption = i18n("LilyPond Preview Options"); heading = i18n("LilyPond preview options"); } LilyPondOptionsDialog dialog(this, m_doc, caption, heading); - if (dialog.exec() != QDialog::Accepted) { + if (dialog.exec() != TQDialog::Accepted) { return false; } @@ -4720,13 +4720,13 @@ bool NotationView::exportLilyPondFile(QString file, bool forPreview) 100, this); - LilyPondExporter e(this, m_doc, std::string(QFile::encodeName(file))); + LilyPondExporter e(this, m_doc, std::string(TQFile::encodeName(file))); - connect(&e, SIGNAL(setProgress(int)), - progressDlg.progressBar(), SLOT(setValue(int))); + connect(&e, TQT_SIGNAL(setProgress(int)), + progressDlg.progressBar(), TQT_SLOT(setValue(int))); - connect(&e, SIGNAL(incrementProgress(int)), - progressDlg.progressBar(), SLOT(advance(int))); + connect(&e, TQT_SIGNAL(incrementProgress(int)), + progressDlg.progressBar(), TQT_SLOT(advance(int))); if (!e.write()) { // CurrentProgressDialog::freeze(); @@ -4776,7 +4776,7 @@ void NotationView::slotEditCutAndClose() getDocument()->getClipboard())); } -static const QString RESTRICTED_PASTE_FAILED_DESCRIPTION = i18n( +static const TQString RESTRICTED_PASTE_FAILED_DESCRIPTION = i18n( "The Restricted paste type requires enough empty " \ "space (containing only rests) at the paste position " \ "to hold all of the events to be pasted.\n" \ @@ -4855,7 +4855,7 @@ void NotationView::slotEditGeneralPaste() PasteNotationDialog dialog(this, defaultType); - if (dialog.exec() == QDialog::Accepted) { + if (dialog.exec() == TQDialog::Accepted) { PasteEventsCommand::PasteType type = dialog.getPasteType(); if (dialog.setAsDefault()) { @@ -5006,7 +5006,7 @@ void NotationView::slotFilterSelection() return ; EventFilterDialog dialog(this); - if (dialog.exec() == QDialog::Accepted) { + if (dialog.exec() == TQDialog::Accepted) { NOTATION_DEBUG << "slotFilterSelection- accepted" << endl; bool haveEvent = false; @@ -5150,7 +5150,7 @@ void NotationView::slotToggleTransportToolBar() toggleNamedToolBar("Transport Toolbar"); } -void NotationView::toggleNamedToolBar(const QString& toolBarName, bool* force) +void NotationView::toggleNamedToolBar(const TQString& toolBarName, bool* force) { KToolBar *namedToolBar = toolBar(toolBarName); @@ -5238,7 +5238,7 @@ void NotationView::slotGroupTuplet(bool simple) if (!simple) { TupletDialog dialog(this, unitType, duration); - if (dialog.exec() != QDialog::Accepted) + if (dialog.exec() != TQDialog::Accepted) return ; unit = Note(dialog.getUnitType()).getDuration(); tupled = dialog.getTupledCount(); @@ -5267,7 +5267,7 @@ void NotationView::slotGroupTuplet(bool simple) if (!simple) { TupletDialog dialog(this, unitType); - if (dialog.exec() != QDialog::Accepted) + if (dialog.exec() != TQDialog::Accepted) return ; unit = Note(dialog.getUnitType()).getDuration(); tupled = dialog.getTupledCount(); @@ -5350,7 +5350,7 @@ void NotationView::slotGroupOctave2Down() slotAddIndication(Indication::QuindicesimaDown, i18n("ottava")); } -void NotationView::slotAddIndication(std::string type, QString desc) +void NotationView::slotAddIndication(std::string type, TQString desc) { if (!m_currentEventSelection) return ; @@ -5565,8 +5565,8 @@ void NotationView::slotTransformsRemoveQuantization() void NotationView::slotSetStyleFromAction() { - const QObject *s = sender(); - QString name = s->name(); + const TQObject *s = sender(); + TQString name = s->name(); if (!m_currentEventSelection) return ; @@ -5588,8 +5588,8 @@ void NotationView::slotSetStyleFromAction() void NotationView::slotInsertNoteFromAction() { - const QObject *s = sender(); - QString name = s->name(); + const TQObject *s = sender(); + TQString name = s->name(); Segment &segment = m_staffs[m_currentStaff]->getSegment(); @@ -5663,7 +5663,7 @@ void NotationView::slotSwitchFromRestToNote() Note note(restInserter->getCurrentNote()); - QString actionName = NotationStrings::getReferenceName(note, false); + TQString actionName = NotationStrings::getReferenceName(note, false); actionName = actionName.replace("-", "_"); KRadioAction *action = dynamic_cast<KRadioAction *> @@ -5698,7 +5698,7 @@ void NotationView::slotSwitchFromNoteToRest() Note note(noteInserter->getCurrentNote()); - QString actionName = NotationStrings::getReferenceName(note, true); + TQString actionName = NotationStrings::getReferenceName(note, true); actionName = actionName.replace("-", "_"); KRadioAction *action = dynamic_cast<KRadioAction *> @@ -5865,7 +5865,7 @@ void NotationView::slotTransformsQuantize() QuantizeDialog dialog(this, true); - if (dialog.exec() == QDialog::Accepted) { + if (dialog.exec() == TQDialog::Accepted) { KTmpStatusMsg msg(i18n("Quantizing..."), this); addCommandToHistory(new EventQuantizeCommand (*m_currentEventSelection, @@ -5880,7 +5880,7 @@ void NotationView::slotTransformsInterpret() InterpretDialog dialog(this); - if (dialog.exec() == QDialog::Accepted) { + if (dialog.exec() == TQDialog::Accepted) { KTmpStatusMsg msg(i18n("Interpreting selection..."), this); addCommandToHistory(new InterpretCommand (*m_currentEventSelection, @@ -5915,11 +5915,11 @@ void NotationView::slotAddDotNotationOnly() void NotationView::slotAddSlashes() { - const QObject *s = sender(); + const TQObject *s = sender(); if (!m_currentEventSelection) return ; - QString name = s->name(); + TQString name = s->name(); int slashes = name.right(1).toInt(); addCommandToHistory(new AddSlashesCommand @@ -5931,7 +5931,7 @@ void NotationView::slotMarksAddTextMark() if (m_currentEventSelection) { bool pressedOK = false; - QString txt = KLineEditDlg::getText(i18n("Text: "), "", &pressedOK, this); + TQString txt = KLineEditDlg::getText(i18n("Text: "), "", &pressedOK, this); if (pressedOK) { addCommandToHistory(new AddTextMarkCommand @@ -5945,7 +5945,7 @@ void NotationView::slotMarksAddFingeringMark() if (m_currentEventSelection) { bool pressedOK = false; - QString txt = KLineEditDlg::getText(i18n("Fingering: "), "", &pressedOK, this); + TQString txt = KLineEditDlg::getText(i18n("Fingering: "), "", &pressedOK, this); if (pressedOK) { addCommandToHistory(new AddFingeringMarkCommand @@ -5956,12 +5956,12 @@ void NotationView::slotMarksAddFingeringMark() void NotationView::slotMarksAddFingeringMarkFromAction() { - const QObject *s = sender(); - QString name = s->name(); + const TQObject *s = sender(); + TQString name = s->name(); if (name.left(14) == "add_fingering_") { - QString fingering = name.right(name.length() - 14); + TQString fingering = name.right(name.length() - 14); if (fingering == "plus") fingering = "+"; @@ -6030,16 +6030,16 @@ NotationView::slotMakeOrnament() Track *track = segment.getComposition()->getTrackById(segment.getTrack()); - QString name; + TQString name; int barNo = segment.getComposition()->getBarNumber(absTime); if (track) { - name = QString(i18n("Ornament track %1 bar %2").arg(track->getPosition() + 1).arg(barNo + 1)); + name = TQString(i18n("Ornament track %1 bar %2").arg(track->getPosition() + 1).arg(barNo + 1)); } else { - name = QString(i18n("Ornament bar %1").arg(barNo + 1)); + name = TQString(i18n("Ornament bar %1").arg(barNo + 1)); } MakeOrnamentDialog dialog(this, name, basePitch); - if (dialog.exec() != QDialog::Accepted) + if (dialog.exec() != TQDialog::Accepted) return ; name = dialog.getName(); @@ -6076,7 +6076,7 @@ NotationView::slotUseOrnament() return ; UseOrnamentDialog dialog(this, &getDocument()->getComposition()); - if (dialog.exec() != QDialog::Accepted) + if (dialog.exec() != TQDialog::Accepted) return ; addCommandToHistory(new SetTriggerCommand(*m_currentEventSelection, @@ -6109,7 +6109,7 @@ void NotationView::slotEditAddClef() ClefDialog dialog(this, m_notePixmapFactory, lastClef); - if (dialog.exec() == QDialog::Accepted) { + if (dialog.exec() == TQDialog::Accepted) { ClefDialog::ConversionType conversion = dialog.getConversionType(); @@ -6144,7 +6144,7 @@ void NotationView::slotEditAddKeySignature() (this, m_notePixmapFactory, clef, key, true, true, i18n("Estimated key signature shown")); - if (dialog.exec() == QDialog::Accepted && + if (dialog.exec() == TQDialog::Accepted && dialog.isValid()) { KeySignatureDialog::ConversionType conversion = @@ -6251,7 +6251,7 @@ void NotationView::slotEditSwitchPreset() { PresetHandlerDialog dialog(this, true); - if (dialog.exec() != QDialog::Accepted) return; + if (dialog.exec() != TQDialog::Accepted) return; if (dialog.getConvertAllSegments()) { // get all segments for this track and convert them. @@ -6296,7 +6296,7 @@ void NotationView::slotEditElement(NotationStaff *staff, EventEditDialog dialog(this, *element->event(), true); - if (dialog.exec() == QDialog::Accepted && + if (dialog.exec() == TQDialog::Accepted && dialog.isModified()) { EventEditCommand *command = new EventEditCommand @@ -6313,7 +6313,7 @@ void NotationView::slotEditElement(NotationStaff *staff, ClefDialog dialog(this, m_notePixmapFactory, Clef(*element->event())); - if (dialog.exec() == QDialog::Accepted) { + if (dialog.exec() == TQDialog::Accepted) { ClefDialog::ConversionType conversion = dialog.getConversionType(); bool shouldChangeOctave = (conversion != ClefDialog::NoConversion); @@ -6338,7 +6338,7 @@ void NotationView::slotEditElement(NotationStaff *staff, (this, m_notePixmapFactory, clef, Rosegarden::Key(*element->event()), false, true); - if (dialog.exec() == QDialog::Accepted && + if (dialog.exec() == TQDialog::Accepted && dialog.isValid()) { KeySignatureDialog::ConversionType conversion = @@ -6365,7 +6365,7 @@ void NotationView::slotEditElement(NotationStaff *staff, try { TextEventDialog dialog (this, m_notePixmapFactory, Text(*element->event())); - if (dialog.exec() == QDialog::Accepted) { + if (dialog.exec() == TQDialog::Accepted) { TextInsertionCommand *command = new TextInsertionCommand (staff->getSegment(), element->event()->getAbsoluteTime(), @@ -6395,7 +6395,7 @@ void NotationView::slotEditElement(NotationStaff *staff, SimpleEventEditDialog dialog(this, getDocument(), *element->event(), false); - if (dialog.exec() == QDialog::Accepted && + if (dialog.exec() == TQDialog::Accepted && dialog.isModified()) { EventEditCommand *command = new EventEditCommand @@ -6835,7 +6835,7 @@ NotationView::doDeferredCursorMove() } } - QScrollBar* hbar = getCanvasView()->horizontalScrollBar(); + TQScrollBar* hbar = getCanvasView()->horizontalScrollBar(); hbar->setValue(int(hbar->value() - (m_deferredCursorScrollToX - ccx))); } @@ -7024,7 +7024,7 @@ void NotationView::slotEditLyrics() LyricEditDialog dialog(this, &segment); - if (dialog.exec() == QDialog::Accepted) { + if (dialog.exec() == TQDialog::Accepted) { KMacroCommand *macro = new KMacroCommand (SetLyricsCommand::getGlobalName()); @@ -7040,7 +7040,7 @@ void NotationView::slotEditLyrics() } void NotationView::slotItemPressed(int height, int staffNo, - QMouseEvent* e, + TQMouseEvent* e, NotationElement* el) { NOTATION_DEBUG << "NotationView::slotItemPressed(height = " @@ -7073,7 +7073,7 @@ void NotationView::slotItemPressed(int height, int staffNo, timeT unknownTime = 0; - if (e->type() == QEvent::MouseButtonDblClick) { + if (e->type() == TQEvent::MouseButtonDblClick) { m_tool->handleMouseDoubleClick(unknownTime, height, staffNo, e, el); } else { @@ -7083,9 +7083,9 @@ void NotationView::slotItemPressed(int height, int staffNo, } } -void NotationView::slotNonNotationItemPressed(QMouseEvent *e, QCanvasItem *it) +void NotationView::slotNonNotationItemPressed(TQMouseEvent *e, TQCanvasItem *it) { - if (e->type() != QEvent::MouseButtonDblClick) + if (e->type() != TQEvent::MouseButtonDblClick) return ; Staff *staff = getStaffForCanvasCoords(e->x(), e->y()); @@ -7101,10 +7101,10 @@ void NotationView::slotNonNotationItemPressed(QMouseEvent *e, QCanvasItem *it) getTrackById(staff->getSegment().getTrack())->getLabel(); bool ok = false; - QRegExpValidator validator(QRegExp(".*"), this); // empty is OK + TQRegExpValidator validator(TQRegExp(".*"), this); // empty is OK - QString newText = KLineEditDlg::getText(QString("Change staff name"), - QString("Enter new staff name"), + TQString newText = KLineEditDlg::getText(TQString("Change staff name"), + TQString("Enter new staff name"), strtoqstr(name), &ok, this, @@ -7126,9 +7126,9 @@ void NotationView::slotNonNotationItemPressed(QMouseEvent *e, QCanvasItem *it) } } -void NotationView::slotTextItemPressed(QMouseEvent *e, QCanvasItem *it) +void NotationView::slotTextItemPressed(TQMouseEvent *e, TQCanvasItem *it) { - if (e->type() != QEvent::MouseButtonDblClick) + if (e->type() != TQEvent::MouseButtonDblClick) return ; if (it == m_title) { @@ -7146,7 +7146,7 @@ void NotationView::slotTextItemPressed(QMouseEvent *e, QCanvasItem *it) positionStaffs(); } -void NotationView::slotMouseMoved(QMouseEvent *e) +void NotationView::slotMouseMoved(TQMouseEvent *e) { if (activeItem()) { activeItem()->handleMouseMove(e); @@ -7169,7 +7169,7 @@ void NotationView::slotMouseMoved(QMouseEvent *e) } } -void NotationView::slotMouseReleased(QMouseEvent *e) +void NotationView::slotMouseReleased(TQMouseEvent *e) { if (activeItem()) { activeItem()->handleMouseRelease(e); @@ -7181,9 +7181,9 @@ void NotationView::slotMouseReleased(QMouseEvent *e) } void -NotationView::slotHoveredOverNoteChanged(const QString ¬eName) +NotationView::slotHoveredOverNoteChanged(const TQString ¬eName) { - m_hoveredOverNoteName->setText(QString(" ") + noteName); + m_hoveredOverNoteName->setText(TQString(" ") + noteName); } void @@ -7198,19 +7198,19 @@ NotationView::slotHoveredOverAbsoluteTimeChanged(unsigned int time) getDocument()->getComposition().getMusicalTimeForAbsoluteTime (t, bar, beat, fraction, remainder); - // QString message; - // QString format("%ld (%ld.%03lds)"); + // TQString message; + // TQString format("%ld (%ld.%03lds)"); // format = i18n("Time: %1").arg(format); // message.sprintf(format, t, rt.sec, ms); - QString message = i18n("Time: %1 (%2.%3s)") - .arg(QString("%1-%2-%3-%4") - .arg(QString("%1").arg(bar + 1).rightJustify(3, '0')) - .arg(QString("%1").arg(beat).rightJustify(2, '0')) - .arg(QString("%1").arg(fraction).rightJustify(2, '0')) - .arg(QString("%1").arg(remainder).rightJustify(2, '0'))) + TQString message = i18n("Time: %1 (%2.%3s)") + .arg(TQString("%1-%2-%3-%4") + .arg(TQString("%1").arg(bar + 1).rightJustify(3, '0')) + .arg(TQString("%1").arg(beat).rightJustify(2, '0')) + .arg(TQString("%1").arg(fraction).rightJustify(2, '0')) + .arg(TQString("%1").arg(remainder).rightJustify(2, '0'))) .arg(rt.sec) - .arg(QString("%1").arg(ms).rightJustify(3, '0')); + .arg(TQString("%1").arg(ms).rightJustify(3, '0')); m_hoveredOverAbsoluteTime->setText(message); } @@ -7374,7 +7374,7 @@ NotationView::slotToggleStepByStep() } void -NotationView::slotStepByStepTargetRequested(QObject *obj) +NotationView::slotStepByStepTargetRequested(TQObject *obj) { KToggleAction *action = dynamic_cast<KToggleAction *> (actionCollection()->action("toggle_step_by_step")); @@ -7414,8 +7414,8 @@ NotationView::slotCheckRendered(double cx0, double cx1) emit renderComplete(); if (m_renderTimer) delete m_renderTimer; - m_renderTimer = new QTimer(this); - connect(m_renderTimer, SIGNAL(timeout()), SLOT(slotRenderSomething())); + m_renderTimer = new TQTimer(this); + connect(m_renderTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRenderSomething())); m_renderTimer->start(0, true); } @@ -7433,8 +7433,8 @@ NotationView::slotRenderSomething() clock_t now = clock(); long elapsed = ((now - lastWork) * 1000 / CLOCKS_PER_SEC); if (elapsed < 70) { - m_renderTimer = new QTimer(this); - connect(m_renderTimer, SIGNAL(timeout()), SLOT(slotRenderSomething())); + m_renderTimer = new TQTimer(this); + connect(m_renderTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRenderSomething())); m_renderTimer->start(0, true); return ; } @@ -7444,8 +7444,8 @@ NotationView::slotRenderSomething() if (m_staffs[i]->doRenderWork(m_staffs[i]->getSegment().getStartTime(), m_staffs[i]->getSegment().getEndTime())) { - m_renderTimer = new QTimer(this); - connect(m_renderTimer, SIGNAL(timeout()), SLOT(slotRenderSomething())); + m_renderTimer = new TQTimer(this); + connect(m_renderTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRenderSomething())); m_renderTimer->start(0, true); return ; } |