From bf280726d5d22f33d33e4f9e771220c725249407 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:50:52 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kdelirc/kcmlirc/addaction.cpp | 2 +- kdelirc/kcmlirc/addactionbase.ui | 62 +++++++++++++++++++-------------------- kdelirc/kcmlirc/editactionbase.ui | 34 ++++++++++----------- kdelirc/kcmlirc/editmodebase.ui | 14 ++++----- kdelirc/kcmlirc/kcmlirc.cpp | 26 ++++++++-------- kdelirc/kcmlirc/kcmlirc.h | 4 +-- kdelirc/kcmlirc/kcmlircbase.ui | 14 ++++----- kdelirc/kcmlirc/kcmlircbase.ui.h | 2 +- kdelirc/kcmlirc/newmode.ui | 6 ++-- kdelirc/kcmlirc/selectprofile.ui | 4 +-- 10 files changed, 84 insertions(+), 84 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 c9a4559..f052889 100644 --- a/kdelirc/kcmlirc/addactionbase.ui +++ b/kdelirc/kcmlirc/addactionbase.ui @@ -65,7 +65,7 @@ - tqlayout14 + layout14 @@ -81,7 +81,7 @@ Expanding - + 81 31 @@ -125,7 +125,7 @@ Expanding - + 101 31 @@ -144,7 +144,7 @@ Expanding - + 311 20 @@ -169,7 +169,7 @@ Expanding - + 321 21 @@ -194,7 +194,7 @@ Expanding - + 21 20 @@ -223,13 +223,13 @@ 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 - tqlayout6 + layout6 @@ -245,7 +245,7 @@ Expanding - + 110 41 @@ -289,7 +289,7 @@ Expanding - + 110 31 @@ -414,7 +414,7 @@ - tqlayout13 + layout13 @@ -512,7 +512,7 @@ - tqlayout37 + layout37 @@ -528,7 +528,7 @@ Expanding - + 61 21 @@ -604,7 +604,7 @@ Expanding - + 21 81 @@ -677,7 +677,7 @@ - tqlayout35 + layout35 @@ -685,7 +685,7 @@ - tqlayout34 + layout34 @@ -701,7 +701,7 @@ Expanding - + 21 111 @@ -739,7 +739,7 @@ Expanding - + 146 21 @@ -785,7 +785,7 @@ Expanding - + 21 61 @@ -826,7 +826,7 @@ Expanding - + 21 61 @@ -870,7 +870,7 @@ Expanding - + 20 61 @@ -908,7 +908,7 @@ Expanding - + 21 51 @@ -957,7 +957,7 @@ Expanding - + 147 21 @@ -1035,7 +1035,7 @@ Expanding - + 670 20 @@ -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 @@ -1171,7 +1171,7 @@ Expanding - + 20 170 @@ -1218,7 +1218,7 @@ - tqlayout13 + layout13 @@ -1234,7 +1234,7 @@ Expanding - + 131 31 @@ -1278,7 +1278,7 @@ Expanding - + 131 31 @@ -1308,7 +1308,7 @@ Expanding - + 551 20 @@ -1366,7 +1366,7 @@ Expanding - + 21 30 diff --git a/kdelirc/kcmlirc/editactionbase.ui b/kdelirc/kcmlirc/editactionbase.ui index d94cfc2..300c6de 100644 --- a/kdelirc/kcmlirc/editactionbase.ui +++ b/kdelirc/kcmlirc/editactionbase.ui @@ -56,7 +56,7 @@ - tqlayout40 + layout40 @@ -242,7 +242,7 @@ - tqlayout36 + layout36 @@ -295,7 +295,7 @@ Expanding - + 20 91 @@ -339,7 +339,7 @@ Expanding - + 20 101 @@ -377,7 +377,7 @@ Expanding - + 21 101 @@ -415,7 +415,7 @@ Expanding - + 20 101 @@ -467,7 +467,7 @@ Expanding - + 21 111 @@ -486,7 +486,7 @@ 0 - + 106 0 @@ -503,7 +503,7 @@ Expanding - + 20 101 @@ -533,7 +533,7 @@ Expanding - + 481 20 @@ -542,7 +542,7 @@ - tqlayout17 + layout17 @@ -584,7 +584,7 @@ Expanding - + 21 30 @@ -654,7 +654,7 @@ Expanding - + 491 20 @@ -718,7 +718,7 @@ Expanding - + 670 20 @@ -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 @@ -854,7 +854,7 @@ Expanding - + 20 150 @@ -902,7 +902,7 @@ Expanding - + 20 20 diff --git a/kdelirc/kcmlirc/editmodebase.ui b/kdelirc/kcmlirc/editmodebase.ui index 829a35d..785287b 100644 --- a/kdelirc/kcmlirc/editmodebase.ui +++ b/kdelirc/kcmlirc/editmodebase.ui @@ -43,7 +43,7 @@ - tqlayout25 + layout25 @@ -62,7 +62,7 @@ - tqlayout24 + layout24 @@ -78,7 +78,7 @@ Expanding - + 110 21 @@ -145,7 +145,7 @@ Expanding - + 410 20 @@ -192,7 +192,7 @@ Expanding - + 20 90 @@ -215,7 +215,7 @@ - tqlayout15 + layout15 @@ -231,7 +231,7 @@ Expanding - + 231 20 diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index 8ec4fff..f94bb1b 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include @@ -74,8 +74,8 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC (new TQHBoxLayout(this))->setAutoAdd(true); theKCMLircBase = new KCMLircBase(this); connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateActions() )); - connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModestqStatus(TQListViewItem *) )); - connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionstqStatus(TQListViewItem *) )); + connect(theKCMLircBase->theModes, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateModesStatus(TQListViewItem *) )); + connect(theKCMLircBase->theActions, TQT_SIGNAL( currentChanged(TQListViewItem *) ), this, TQT_SLOT( updateActionsStatus(TQListViewItem *) )); connect(theKCMLircBase->theExtensions, TQT_SIGNAL( selectionChanged(TQListViewItem *) ), this, TQT_SLOT( updateInformation() )); connect(theKCMLircBase->theModes, TQT_SIGNAL( itemRenamed(TQListViewItem *) ), this, TQT_SLOT( slotRenamed(TQListViewItem *) )); connect(theKCMLircBase->theModes, TQT_SIGNAL(dropped(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDrop(KListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*))); @@ -94,7 +94,7 @@ KCMLirc::~KCMLirc() { } -void KCMLirc::updateModestqStatus(TQListViewItem *item) +void KCMLirc::updateModesStatus(TQListViewItem *item) { theKCMLircBase->theModes->setItemsRenameable(item && item->parent()); theKCMLircBase->theAddActions->setEnabled(ProfileServer::profileServer()->profiles().count() && theKCMLircBase->theModes->selectedItem() && RemoteServer::remoteServer()->remotes()[modeMap[theKCMLircBase->theModes->selectedItem()].remote()]); @@ -104,7 +104,7 @@ void KCMLirc::updateModestqStatus(TQListViewItem *item) theKCMLircBase->theEditMode->setEnabled(item); } -void KCMLirc::updateActionstqStatus(TQListViewItem *item) +void KCMLirc::updateActionsStatus(TQListViewItem *item) { theKCMLircBase->theRemoveAction->setEnabled(item); theKCMLircBase->theEditAction->setEnabled(item); @@ -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(); @@ -374,10 +374,10 @@ void KCMLirc::updateActions() theKCMLircBase->theActions->clear(); actionMap.clear(); - if(!theKCMLircBase->theModes->selectedItem()) { updateActionstqStatus(0); return; } + 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()); @@ -387,7 +387,7 @@ void KCMLirc::updateActions() if(theKCMLircBase->theActions->currentItem()) theKCMLircBase->theActions->currentItem()->setSelected(true); - updateActionstqStatus(theKCMLircBase->theActions->currentItem()); + updateActionsStatus(theKCMLircBase->theActions->currentItem()); } void KCMLirc::gotButton(TQString remote, TQString button) @@ -429,7 +429,7 @@ void KCMLirc::updateModes() } if(theKCMLircBase->theModes->currentItem()) theKCMLircBase->theModes->currentItem()->setSelected(true); - updateModestqStatus(theKCMLircBase->theModes->currentItem()); + updateModesStatus(theKCMLircBase->theModes->currentItem()); updateActions(); } @@ -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/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h index b4ea329..6d65fe8 100644 --- a/kdelirc/kcmlirc/kcmlirc.h +++ b/kdelirc/kcmlirc/kcmlirc.h @@ -46,8 +46,8 @@ private: public slots: void updateActions(); - void updateModestqStatus(TQListViewItem *); - void updateActionstqStatus(TQListViewItem *); + void updateModesStatus(TQListViewItem *); + void updateActionsStatus(TQListViewItem *); void updateModes(); void updateExtensions(); void updateInformation(); diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui index 625b3a0..b8c8128 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 @@ -158,7 +158,7 @@ Expanding - + 17 20 @@ -204,7 +204,7 @@ - tqlayout9 + layout9 @@ -300,7 +300,7 @@ - tqlayout7 + layout7 @@ -316,7 +316,7 @@ Expanding - + 240 21 @@ -325,7 +325,7 @@ - tqlayout6 + layout6 @@ -429,7 +429,7 @@ - tqlayout9 + layout9 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(); } diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui index 5726eba..913b912 100644 --- a/kdelirc/kcmlirc/newmode.ui +++ b/kdelirc/kcmlirc/newmode.ui @@ -40,7 +40,7 @@ - tqlayout11 + layout11 @@ -77,7 +77,7 @@ - tqlayout12 + layout12 @@ -93,7 +93,7 @@ Expanding - + 61 21 diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui index 5e15af9..8731a66 100644 --- a/kdelirc/kcmlirc/selectprofile.ui +++ b/kdelirc/kcmlirc/selectprofile.ui @@ -54,7 +54,7 @@ - tqlayout47 + layout47 @@ -70,7 +70,7 @@ Expanding - + 40 20 -- cgit v1.2.1