From 458efa7b0c935cbaafa2791021a5f8f7241aa876 Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 2 May 2011 22:38:52 +0000 Subject: Initial TQt4 port of Rosegarden This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1230242 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/gui/editors/notation/RestInserter.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gui/editors/notation/RestInserter.cpp') diff --git a/src/gui/editors/notation/RestInserter.cpp b/src/gui/editors/notation/RestInserter.cpp index e9b6bdb..faef304 100644 --- a/src/gui/editors/notation/RestInserter.cpp +++ b/src/gui/editors/notation/RestInserter.cpp @@ -56,14 +56,14 @@ RestInserter::RestInserter(NotationView* view) { TQIconSet icon; - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory:: + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("dotted-rest-crotchet"))); new KToggleAction(i18n("Dotted rest"), icon, 0, this, TQT_SLOT(slotToggleDot()), actionCollection(), "toggle_dot"); - icon = TQIconSet(NotePixmapFactory::toQPixmap(NotePixmapFactory:: + icon = TQIconSet(NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("select"))); new KAction(i18n("Switch to Select Tool"), icon, 0, this, TQT_SLOT(slotSelectSelected()), actionCollection(), @@ -73,8 +73,8 @@ RestInserter::RestInserter(NotationView* view) TQT_SLOT(slotEraseSelected()), actionCollection(), "erase"); - icon = QIconSet - (NotePixmapFactory::toQPixmap(NotePixmapFactory:: + icon = TQIconSet + (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: makeToolbarPixmap("crotchet"))); new KAction(i18n("Switch to Inserting Notes"), icon, 0, this, TQT_SLOT(slotNotesSelected()), actionCollection(), @@ -127,8 +127,8 @@ void RestInserter::slotToggleDot() m_noteDots = (m_noteDots) ? 0 : 1; Note note(m_noteType, m_noteDots); TQString actionName(NotationStrings::getReferenceName(note, true)); - actionName.replace(TQRegExp("-"), "_"); - KAction *action = m_parentView->actionCollection()->action(actionName); + actionName.tqreplace(TQRegExp("-"), "_"); + KAction *action = m_tqparentView->actionCollection()->action(actionName); if (!action) { std::cerr << "WARNING: No such action as " << actionName << std::endl; } else { @@ -140,8 +140,8 @@ void RestInserter::slotNotesSelected() { Note note(m_noteType, m_noteDots); TQString actionName(NotationStrings::getReferenceName(note)); - actionName.replace(TQRegExp(" "), "_"); - m_parentView->actionCollection()->action(actionName)->activate(); + actionName.tqreplace(TQRegExp(" "), "_"); + m_tqparentView->actionCollection()->action(actionName)->activate(); } const TQString RestInserter::ToolName = "restinserter"; -- cgit v1.2.3