From 9e5c87c89567a98c3344c90e392a27715437334c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:14:58 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- kdelirc/kcmlirc/addaction.cpp | 8 ++++---- kdelirc/kcmlirc/addactionbase.ui | 14 +++++++------- kdelirc/kcmlirc/kcmlirc.cpp | 14 +++++++------- kdelirc/kcmlirc/kcmlirc.h | 4 ++-- kdelirc/kcmlirc/kcmlircbase.ui | 8 ++++---- kdelirc/kcmlirc/modeslist.cpp | 2 +- kdelirc/kcmlirc/modeslist.h | 2 +- kdelirc/kcmlirc/newmode.ui | 2 +- kdelirc/kcmlirc/selectprofile.ui | 2 +- 9 files changed, 28 insertions(+), 28 deletions(-) (limited to 'kdelirc/kcmlirc') diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp index 7281251..9e4f21d 100644 --- a/kdelirc/kcmlirc/addaction.cpp +++ b/kdelirc/kcmlirc/addaction.cpp @@ -228,7 +228,7 @@ void AddAction::updateParameters() { Prototype p(theFunctions->currentItem()->text(2)); for(unsigned k = 0; k < p.count(); k++) - { new KListViewItem(theParameters, p.name(k).isEmpty() ? i18n( "" ) : p.name(k), "", p.type(k), TQString().setNum(k + 1)); + { new TDEListViewItem(theParameters, p.name(k).isEmpty() ? i18n( "" ) : p.name(k), "", p.type(k), TQString().setNum(k + 1)); theArguments.append(TQVariant("")); theArguments.back().cast(TQVariant::nameToType(p.type(k).utf8())); } @@ -346,14 +346,14 @@ void AddAction::updateObjects() if(names.contains(name)) continue; names += name; - KListViewItem *a = new KListViewItem(theObjects, name); + TDEListViewItem *a = new TDEListViewItem(theObjects, name); uniqueProgramMap[a] = name == TQString(*i); nameProgramMap[a] = *i; QCStringList theObjects = theClient->remoteObjects(*i); for(QCStringList::iterator j = theObjects.begin(); j != theObjects.end(); ++j) if(*j != "tdesycoca" && *j != "qt")// && getFunctions(*i, *j).count()) - new KListViewItem(a, *j); + new TDEListViewItem(a, *j); } updateFunctions(); } @@ -365,7 +365,7 @@ void AddAction::updateFunctions() { TQStringList functions = getFunctions(nameProgramMap[theObjects->currentItem()->parent()], theObjects->currentItem()->text(0)); for(TQStringList::iterator i = functions.begin(); i != functions.end(); ++i) { Prototype p((TQString)(*i)); - new KListViewItem(theFunctions, p.name(), p.argumentList(), *i); + new TDEListViewItem(theFunctions, p.name(), p.argumentList(), *i); } } updateOptions(); diff --git a/kdelirc/kcmlirc/addactionbase.ui b/kdelirc/kcmlirc/addactionbase.ui index ee500a6..57f3c38 100644 --- a/kdelirc/kcmlirc/addactionbase.ui +++ b/kdelirc/kcmlirc/addactionbase.ui @@ -88,7 +88,7 @@ - + Applications @@ -252,7 +252,7 @@ - + Button @@ -318,7 +318,7 @@ Horizontal - + Program @@ -423,7 +423,7 @@ 0 - + Function @@ -535,7 +535,7 @@ - + Function @@ -626,7 +626,7 @@ unnamed - + Option Description @@ -1241,7 +1241,7 @@ - + Mode diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index 74856d0..49bc252 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -78,7 +78,7 @@ KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DC 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*))); + connect(theKCMLircBase->theModes, TQT_SIGNAL(dropped(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*)), this, TQT_SLOT(slotDrop(TDEListView*, TQDropEvent*, TQListViewItem*, TQListViewItem*))); connect((TQObject *)(theKCMLircBase->theAddActions), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddActions() )); connect((TQObject *)(theKCMLircBase->theAddAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAction() )); connect((TQObject *)(theKCMLircBase->theEditAction), TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditAction() )); @@ -170,7 +170,7 @@ void KCMLirc::slotAddAction() theDialog.theModes->setEnabled(item->firstChild()); theDialog.theSwitchMode->setEnabled(item->firstChild()); for(item = item->firstChild(); item; item = item->nextSibling()) - { KListViewItem *a = new KListViewItem(theDialog.theModes, item->text(0)); + { TDEListViewItem *a = new TDEListViewItem(theDialog.theModes, item->text(0)); if(item->isSelected()) { a->setSelected(true); theDialog.theModes->setCurrentItem(a); } } @@ -286,7 +286,7 @@ void KCMLirc::slotAddMode() TQListViewItem *tr = theKCMLircBase->theModes->selectedItem(); if(tr) if(tr->parent()) tr = tr->parent(); for(TQListViewItem *i = theKCMLircBase->theModes->firstChild(); i; i = i->nextSibling()) - { KListViewItem *a = new KListViewItem(theDialog.theRemotes, i->text(0)); + { TDEListViewItem *a = new TDEListViewItem(theDialog.theRemotes, i->text(0)); remoteMap[a] = modeMap[i].remote(); if(i == tr) { a->setSelected(true); theDialog.theRemotes->setCurrentItem(a); } } @@ -349,7 +349,7 @@ void KCMLirc::slotSetDefaultMode() emit changed(true); } -void KCMLirc::slotDrop(KListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *after) +void KCMLirc::slotDrop(TDEListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *after) { Mode m = modeMap[after]; @@ -380,7 +380,7 @@ void KCMLirc::updateActions() 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()); + { TQListViewItem *b = new TDEListViewItem(theKCMLircBase->theActions, (**i).buttonName(), (**i).application(), (**i).function(), (**i).arguments().toString(), (**i).notes()); actionMap[b] = *i; if(*i == oldCurrent) { b->setSelected(true); theKCMLircBase->theActions->setCurrentItem(b); } } @@ -411,7 +411,7 @@ void KCMLirc::updateModes() theKCMLircBase->theMainLabel->setMaximumSize(0, 0); for(TQStringList::iterator i = remotes.begin(); i != remotes.end(); ++i) { Mode mode = allModes.getMode(*i, ""); - TQListViewItem *a = new KListViewItem(theKCMLircBase->theModes, RemoteServer::remoteServer()->getRemoteName(*i), allModes.isDefault(mode) ? "Default" : "", mode.iconFile().isNull() ? "" : ""); + TQListViewItem *a = new TDEListViewItem(theKCMLircBase->theModes, RemoteServer::remoteServer()->getRemoteName(*i), allModes.isDefault(mode) ? "Default" : "", mode.iconFile().isNull() ? "" : ""); if(!mode.iconFile().isNull()) a->setPixmap(2, KIconLoader().loadIcon(mode.iconFile(), KIcon::Panel)); modeMap[a] = mode; // the null mode @@ -420,7 +420,7 @@ void KCMLirc::updateModes() ModeList l = allModes.getModes(*i); for(ModeList::iterator j = l.begin(); j != l.end(); ++j) if(!(*j).name().isEmpty()) - { TQListViewItem *b = new KListViewItem(a, (*j).name(), allModes.isDefault(*j) ? i18n("Default") : "", (*j).iconFile().isNull() ? "" : ""); + { TQListViewItem *b = new TDEListViewItem(a, (*j).name(), allModes.isDefault(*j) ? i18n("Default") : "", (*j).iconFile().isNull() ? "" : ""); if(!(*j).iconFile().isNull()) b->setPixmap(2, KIconLoader().loadIcon((*j).iconFile(), KIcon::Panel)); modeMap[b] = *j; diff --git a/kdelirc/kcmlirc/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h index 71209d6..207c995 100644 --- a/kdelirc/kcmlirc/kcmlirc.h +++ b/kdelirc/kcmlirc/kcmlirc.h @@ -23,7 +23,7 @@ #include "modes.h" class TQListViewItem; -class KListView; +class TDEListView; class TQDropEvent; class Profile; class Remote; @@ -58,7 +58,7 @@ public slots: void slotAddActions(); void slotEditAction(); void slotRemoveAction(); - void slotDrop(KListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *after); + void slotDrop(TDEListView *, TQDropEvent *, TQListViewItem *, TQListViewItem *after); void slotRenamed(TQListViewItem *item); void slotEditMode(); diff --git a/kdelirc/kcmlirc/kcmlircbase.ui b/kdelirc/kcmlirc/kcmlircbase.ui index b8c8128..760f4e0 100644 --- a/kdelirc/kcmlirc/kcmlircbase.ui +++ b/kdelirc/kcmlirc/kcmlircbase.ui @@ -104,7 +104,7 @@ Remote controls and modes: - + New Column @@ -221,7 +221,7 @@ - + Button @@ -405,7 +405,7 @@ Horizontal - + Name @@ -446,7 +446,7 @@ - + Name diff --git a/kdelirc/kcmlirc/modeslist.cpp b/kdelirc/kcmlirc/modeslist.cpp index 83678d1..1665e64 100644 --- a/kdelirc/kcmlirc/modeslist.cpp +++ b/kdelirc/kcmlirc/modeslist.cpp @@ -16,7 +16,7 @@ #include "modeslist.h" -ModesList::ModesList(TQWidget *parent, const char *name) : KListView(parent, name) +ModesList::ModesList(TQWidget *parent, const char *name) : TDEListView(parent, name) { setAcceptDrops(true); setDropVisualizer(false); diff --git a/kdelirc/kcmlirc/modeslist.h b/kdelirc/kcmlirc/modeslist.h index 742b0c5..d81b928 100644 --- a/kdelirc/kcmlirc/modeslist.h +++ b/kdelirc/kcmlirc/modeslist.h @@ -22,7 +22,7 @@ @author Gav Wood */ -class ModesList : public KListView +class ModesList : public TDEListView { Q_OBJECT diff --git a/kdelirc/kcmlirc/newmode.ui b/kdelirc/kcmlirc/newmode.ui index 913b912..649cb88 100644 --- a/kdelirc/kcmlirc/newmode.ui +++ b/kdelirc/kcmlirc/newmode.ui @@ -19,7 +19,7 @@ unnamed - + Remote Controls diff --git a/kdelirc/kcmlirc/selectprofile.ui b/kdelirc/kcmlirc/selectprofile.ui index 8731a66..a045921 100644 --- a/kdelirc/kcmlirc/selectprofile.ui +++ b/kdelirc/kcmlirc/selectprofile.ui @@ -19,7 +19,7 @@ unnamed - + Profile Name -- cgit v1.2.3