From 11f31c37e5fa4889d9989f10272f44845449cb7b Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 6 Sep 2010 20:59:29 +0000 Subject: Initial TQt conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1172292 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/document/MultiViewCommandHistory.cpp | 54 ++++++++++++++++---------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src/document/MultiViewCommandHistory.cpp') diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp index f8cddeb..58f0b55 100644 --- a/src/document/MultiViewCommandHistory.cpp +++ b/src/document/MultiViewCommandHistory.cpp @@ -31,10 +31,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -75,40 +75,40 @@ MultiViewCommandHistory::attachView(KActionCollection *collection) KToolBarPopupAction *undo = dynamic_cast(collection->action(KStdAction::stdName(KStdAction::Undo))); if (undo) { - connect(undo, SIGNAL(activated()), - this, SLOT(slotUndo())); + connect(undo, TQT_SIGNAL(activated()), + this, TQT_SLOT(slotUndo())); connect (undo->popupMenu(), - SIGNAL(aboutToShow()), + TQT_SIGNAL(aboutToShow()), this, - SLOT(slotUndoAboutToShow())); + TQT_SLOT(slotUndoAboutToShow())); connect (undo->popupMenu(), - SIGNAL(activated(int)), + TQT_SIGNAL(activated(int)), this, - SLOT(slotUndoActivated(int))); + TQT_SLOT(slotUndoActivated(int))); } KToolBarPopupAction *redo = dynamic_cast(collection->action(KStdAction::stdName(KStdAction::Redo))); if (redo) { - connect(redo, SIGNAL(activated()), - this, SLOT(slotRedo())); + connect(redo, TQT_SIGNAL(activated()), + this, TQT_SLOT(slotRedo())); connect (redo->popupMenu(), - SIGNAL(aboutToShow()), + TQT_SIGNAL(aboutToShow()), this, - SLOT(slotRedoAboutToShow())); + TQT_SLOT(slotRedoAboutToShow())); connect (redo->popupMenu(), - SIGNAL(activated(int)), + TQT_SIGNAL(activated(int)), this, - SLOT(slotRedoActivated(int))); + TQT_SLOT(slotRedoActivated(int))); } m_views.insert(collection); @@ -302,7 +302,7 @@ MultiViewCommandHistory::updateButtons() void MultiViewCommandHistory::updateButton(bool undo, - const QString &name, + const TQString &name, CommandStack &stack) { for (ViewSet::iterator i = m_views.begin(); i != m_views.end(); ++i) { @@ -310,7 +310,7 @@ MultiViewCommandHistory::updateButton(bool undo, KAction *action = (*i)->action(name); if (!action) continue; - QString text; + TQString text; if (stack.empty()) { action->setEnabled(false); @@ -321,9 +321,9 @@ MultiViewCommandHistory::updateButton(bool undo, action->setText(text); } else { action->setEnabled(true); - QString commandName = stack.top()->name(); - commandName.replace(QRegExp("&"), ""); - commandName.replace(QRegExp("\\.\\.\\.$"), ""); + TQString commandName = stack.top()->name(); + commandName.replace(TQRegExp("&"), ""); + commandName.replace(TQRegExp("\\.\\.\\.$"), ""); if (undo) text = i18n("Und&o %1").arg(commandName); else @@ -335,7 +335,7 @@ MultiViewCommandHistory::updateButton(bool undo, void MultiViewCommandHistory::updateMenu(bool undo, - const QString &name, + const TQString &name, CommandStack &stack) { for (ViewSet::iterator i = m_views.begin(); i != m_views.end(); ++i) { @@ -349,7 +349,7 @@ MultiViewCommandHistory::updateMenu(bool undo, if (!popupAction) continue; - QPopupMenu *menu = popupAction->popupMenu(); + TQPopupMenu *menu = popupAction->popupMenu(); if (!menu) continue; menu->clear(); @@ -363,11 +363,11 @@ MultiViewCommandHistory::updateMenu(bool undo, tempStack.push(command); stack.pop(); - QString commandName = command->name(); - commandName.replace(QRegExp("&"), ""); - commandName.replace(QRegExp("\\.\\.\\.$"), ""); + TQString commandName = command->name(); + commandName.replace(TQRegExp("&"), ""); + commandName.replace(TQRegExp("\\.\\.\\.$"), ""); - QString text; + TQString text; if (undo) text = i18n("Und&o %1").arg(commandName); else -- cgit v1.2.1