From 632b7d40cf87562965abb5c7dffc1bae509bad2c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:59:52 -0600 Subject: Remove additional unneeded tq method conversions (cherry picked from commit 7ea89afa119615e547323a7a482ea7fef8e67029) --- kdelirc/kcmlirc/addaction.cpp | 2 +- kdelirc/kcmlirc/addactionbase.ui | 4 ++-- kdelirc/kcmlirc/editactionbase.ui | 2 +- kdelirc/kcmlirc/kcmlirc.cpp | 10 +++++----- kdelirc/kcmlirc/kcmlircbase.ui | 2 +- kdelirc/kcmlirc/kcmlircbase.ui.h | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kdelirc/kcmlirc') diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp index 632ac02..c12b9f0 100644 --- a/kdelirc/kcmlirc/addaction.cpp +++ b/kdelirc/kcmlirc/addaction.cpp @@ -97,7 +97,7 @@ void AddAction::updateButton(const TQString &remote, const TQString &button) } else KMessageBox::error(this, i18n( "You did not select a mode of that remote control. Please use %1, " - "or revert back to select a different mode." ).tqarg( theMode.remoteName() ), + "or revert back to select a different mode." ).arg( theMode.remoteName() ), i18n( "Incorrect Remote Control Detected" )); if(indexOf(currentPage()) == 1) diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui index e4ed1f0..8c6a15a 100644 --- a/kdelirc/kcmlirc/addactionbase.ui +++ b/kdelirc/kcmlirc/addactionbase.ui @@ -223,7 +223,7 @@ You are attempting to configure an action for a button on [remote] (in mode [mode]). Press a button on this remote control or select from the list. - + WordBreak|AlignVCenter @@ -1085,7 +1085,7 @@ This application may have multiple instances. In the case of having multiple instances at once when this action should be executed, choose a course of action: - + WordBreak|AlignVCenter diff --git a/kdelirc/kcmlirc/editactionbase.ui b/kdelirc/kcmlirc/editactionbase.ui index acd9f94..e95a07c 100644 --- a/kdelirc/kcmlirc/editactionbase.ui +++ b/kdelirc/kcmlirc/editactionbase.ui @@ -768,7 +768,7 @@ This application may have multiple instances. In the case of having multiple instances at once when this action should be executed, choose a course of action: - + WordBreak|AlignVCenter diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index 8d4de53..dfaf75f 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -333,7 +333,7 @@ void KCMLirc::slotRemoveMode() if(!theKCMLircBase->theModes->selectedItem()) return; if(!theKCMLircBase->theModes->selectedItem()->parent()) return; - if(KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove %1 and all its actions?").tqarg(theKCMLircBase->theModes->selectedItem()->text(0)), i18n("Erase Actions?")) == KMessageBox::Continue) + if(KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to remove %1 and all its actions?").arg(theKCMLircBase->theModes->selectedItem()->text(0)), i18n("Erase Actions?")) == KMessageBox::Continue) { allModes.erase(modeMap[theKCMLircBase->theModes->selectedItem()]); updateModes(); @@ -377,7 +377,7 @@ void KCMLirc::updateActions() if(!theKCMLircBase->theModes->selectedItem()) { updateActionsStatus(0); return; } Mode m = modeMap[theKCMLircBase->theModes->selectedItem()]; - theKCMLircBase->theModeLabel->setText(m.remoteName() + ": " + (m.name().isEmpty() ? i18n("Actions always available") : i18n("Actions available only in mode %1").tqarg(m.name()))); + theKCMLircBase->theModeLabel->setText(m.remoteName() + ": " + (m.name().isEmpty() ? i18n("Actions always available") : i18n("Actions available only in mode %1").arg(m.name()))); IRAItList l = allActions.findByMode(m); for(IRAItList::iterator i = l.begin(); i != l.end(); ++i) { TQListViewItem *b = new KListViewItem(theKCMLircBase->theActions, (**i).buttonName(), (**i).application(), (**i).function(), (**i).arguments().toString(), (**i).notes()); @@ -467,7 +467,7 @@ void KCMLirc::updateInformation() if(!theKCMLircBase->theExtensions->selectedItem()->parent()) { - theKCMLircBase->theInformationLabel->setText(i18n("Information on %1:").tqarg(theKCMLircBase->theExtensions->selectedItem()->text(0))); + theKCMLircBase->theInformationLabel->setText(i18n("Information on %1:").arg(theKCMLircBase->theExtensions->selectedItem()->text(0))); if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Applications")) new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Applications"), TQString().setNum(theKCMLircBase->theExtensions->selectedItem()->childCount())); else if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Remote Controls")) @@ -481,7 +481,7 @@ void KCMLirc::updateInformation() new TQListViewItem(theKCMLircBase->theInformation, i18n("Extension Author"), p->author()); new TQListViewItem(theKCMLircBase->theInformation, i18n("Application Identifier"), p->id()); new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Actions"), TQString().setNum(p->actions().count())); - theKCMLircBase->theInformationLabel->setText(i18n("Information on %1:").tqarg(p->name())); + theKCMLircBase->theInformationLabel->setText(i18n("Information on %1:").arg(p->name())); } else if(theKCMLircBase->theExtensions->selectedItem()->parent()->text(0) == i18n("Remote Controls")) { @@ -491,7 +491,7 @@ void KCMLirc::updateInformation() new TQListViewItem(theKCMLircBase->theInformation, i18n("Extension Author"), p->author()); new TQListViewItem(theKCMLircBase->theInformation, i18n("Remote Control Identifier"), p->id()); new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Buttons"), TQString().setNum(p->buttons().count())); - theKCMLircBase->theInformationLabel->setText(i18n("Information on %1:").tqarg(p->name())); + theKCMLircBase->theInformationLabel->setText(i18n("Information on %1:").arg(p->name())); } } diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui index dfd2897..929641c 100644 --- a/kdelirc/kcmlirc/kcmlircbase.ui +++ b/kdelirc/kcmlirc/kcmlircbase.ui @@ -74,7 +74,7 @@ There are currently no remote controls available. You must first set up LIRC correctly; see www.lirc.org for more information. - + WordBreak|AlignTop diff --git a/kdelirc/kcmlirc/kcmlircbase.ui.h b/kdelirc/kcmlirc/kcmlircbase.ui.h index 42faaab..dcf2ec3 100644 --- a/kdelirc/kcmlirc/kcmlircbase.ui.h +++ b/kdelirc/kcmlirc/kcmlircbase.ui.h @@ -32,6 +32,6 @@ void KCMLircBase::init() theModes->setItemsRenameable(true); modeLayout->addWidget(theModes); modeLayout->addLayout(modeButtonLayout); - modeLayout->tqinvalidate(); + modeLayout->invalidate(); modeLayout->activate(); } -- cgit v1.2.1