summaryrefslogtreecommitdiffstats
path: root/kdelirc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit625904bd3097f9749450428904ca14ff2531824d (patch)
treea45c43d5de71cb720078fa1272a4339815a919be /kdelirc
parent6335dc55802871b5a43492f217b6edbb420204c4 (diff)
downloadtdeutils-625904bd3097f9749450428904ca14ff2531824d.tar.gz
tdeutils-625904bd3097f9749450428904ca14ff2531824d.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdelirc')
-rw-r--r--kdelirc/irkick/irkick.h2
-rw-r--r--kdelirc/irkick/klircclient.cpp2
-rw-r--r--kdelirc/irkick/klircclient.h2
-rw-r--r--kdelirc/kcmlirc/addaction.cpp8
-rw-r--r--kdelirc/kcmlirc/addaction.h2
-rw-r--r--kdelirc/kcmlirc/editaction.cpp2
-rw-r--r--kdelirc/kcmlirc/editaction.h2
-rw-r--r--kdelirc/kcmlirc/editmode.cpp2
-rw-r--r--kdelirc/kcmlirc/editmode.h2
-rw-r--r--kdelirc/kcmlirc/kcmlirc.cpp30
-rw-r--r--kdelirc/kcmlirc/kcmlirc.h2
-rw-r--r--kdelirc/kcmlirc/modeslist.cpp2
-rw-r--r--kdelirc/kcmlirc/modeslist.h2
-rw-r--r--kdelirc/kdelirc/profileserver.h12
14 files changed, 36 insertions, 36 deletions
diff --git a/kdelirc/irkick/irkick.h b/kdelirc/irkick/irkick.h
index d55dcee..f3b7687 100644
--- a/kdelirc/irkick/irkick.h
+++ b/kdelirc/irkick/irkick.h
@@ -36,7 +36,7 @@ public:
KPopupMenu* contextMenu() const { return KSystemTray::contextMenu(); }
KActionCollection* actionCollection() { return KSystemTray::actionCollection(); }
- IRKTrayIcon(TQWidget *tqparent = 0, const char *name = 0): KSystemTray(tqparent, name) {}
+ IRKTrayIcon(TQWidget *parent = 0, const char *name = 0): KSystemTray(parent, name) {}
};
class IRKick: public TQObject, public DCOPObject
diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp
index d78b1e0..4d2089f 100644
--- a/kdelirc/irkick/klircclient.cpp
+++ b/kdelirc/irkick/klircclient.cpp
@@ -43,7 +43,7 @@
#include "klircclient.h"
-KLircClient::KLircClient(TQWidget *tqparent, const char *name) : TQObject(tqparent, name), theSocket(0), listIsUpToDate(false)
+KLircClient::KLircClient(TQWidget *parent, const char *name) : TQObject(parent, name), theSocket(0), listIsUpToDate(false)
{
connectToLirc();
}
diff --git a/kdelirc/irkick/klircclient.h b/kdelirc/irkick/klircclient.h
index 24089c8..bae36ec 100644
--- a/kdelirc/irkick/klircclient.h
+++ b/kdelirc/irkick/klircclient.h
@@ -108,7 +108,7 @@ public:
*/
bool connectToLirc();
- KLircClient(TQWidget *tqparent = 0, const char *name = 0);
+ KLircClient(TQWidget *parent = 0, const char *name = 0);
~KLircClient();
};
diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp
index 0209f5f..632ac02 100644
--- a/kdelirc/kcmlirc/addaction.cpp
+++ b/kdelirc/kcmlirc/addaction.cpp
@@ -32,7 +32,7 @@
#include "profileserver.h"
#include "remoteserver.h"
-AddAction::AddAction(TQWidget *tqparent, const char *name, const Mode &mode): AddActionBase(tqparent, name), theMode(mode)
+AddAction::AddAction(TQWidget *parent, const char *name, const Mode &mode): AddActionBase(parent, name), theMode(mode)
{
connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( updateForPageChange() ));
connect(this, TQT_SIGNAL( selected(const TQString &) ), TQT_SLOT( slotCorrectPage() ));
@@ -180,7 +180,7 @@ void AddAction::updateOptions()
else if(theUseDCOP->isChecked())
{
if(!theObjects->selectedItem()) return;
- TQListViewItem* i = theObjects->selectedItem()->tqparent();
+ TQListViewItem* i = theObjects->selectedItem()->parent();
if(!i) return;
isUnique = uniqueProgramMap[i];
TQRegExp r("(.*)-[0-9]+");
@@ -361,8 +361,8 @@ void AddAction::updateObjects()
void AddAction::updateFunctions()
{
theFunctions->clear();
- if(theObjects->currentItem() && theObjects->currentItem()->tqparent())
- { TQStringList functions = getFunctions(nameProgramMap[theObjects->currentItem()->tqparent()], theObjects->currentItem()->text(0));
+ if(theObjects->currentItem() && theObjects->currentItem()->parent())
+ { 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);
diff --git a/kdelirc/kcmlirc/addaction.h b/kdelirc/kcmlirc/addaction.h
index b95fd17..e1c812b 100644
--- a/kdelirc/kcmlirc/addaction.h
+++ b/kdelirc/kcmlirc/addaction.h
@@ -67,7 +67,7 @@ public:
TQMap<TQListViewItem *, bool> uniqueProgramMap;
TQMap<TQListViewItem *, TQString> nameProgramMap;
- AddAction(TQWidget *tqparent, const char *name, const Mode &mode);
+ AddAction(TQWidget *parent, const char *name, const Mode &mode);
~AddAction();
};
diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp
index d54f23c..8b1b03b 100644
--- a/kdelirc/kcmlirc/editaction.cpp
+++ b/kdelirc/kcmlirc/editaction.cpp
@@ -35,7 +35,7 @@
#include "editaction.h"
#include "addaction.h"
-EditAction::EditAction(IRAIt action, TQWidget *tqparent, const char *name) : EditActionBase(tqparent, name)
+EditAction::EditAction(IRAIt action, TQWidget *parent, const char *name) : EditActionBase(parent, name)
{
theAction = action;
diff --git a/kdelirc/kcmlirc/editaction.h b/kdelirc/kcmlirc/editaction.h
index b3d3939..bc01d24 100644
--- a/kdelirc/kcmlirc/editaction.h
+++ b/kdelirc/kcmlirc/editaction.h
@@ -49,7 +49,7 @@ public:
virtual void updateDCOPObjects();
virtual void updateDCOPFunctions();
- EditAction(IRAIt action, TQWidget *tqparent = 0, const char *name = 0);
+ EditAction(IRAIt action, TQWidget *parent = 0, const char *name = 0);
~EditAction();
};
diff --git a/kdelirc/kcmlirc/editmode.cpp b/kdelirc/kcmlirc/editmode.cpp
index 6092e96..aad27da 100644
--- a/kdelirc/kcmlirc/editmode.cpp
+++ b/kdelirc/kcmlirc/editmode.cpp
@@ -16,7 +16,7 @@
#include "editmode.h"
-EditMode::EditMode(TQWidget *tqparent, const char *name, bool modal, WFlags fl) : EditModeBase(tqparent, name, modal, fl)
+EditMode::EditMode(TQWidget *parent, const char *name, bool modal, WFlags fl) : EditModeBase(parent, name, modal, fl)
{
theIcon->setIconType(KIcon::Panel, KIcon::Any);
}
diff --git a/kdelirc/kcmlirc/editmode.h b/kdelirc/kcmlirc/editmode.h
index 8ea0c45..8ceff01 100644
--- a/kdelirc/kcmlirc/editmode.h
+++ b/kdelirc/kcmlirc/editmode.h
@@ -27,7 +27,7 @@ public:
void slotCheckText(const TQString &newText);
void slotClearIcon();
- EditMode(TQWidget *tqparent = 0, const char *name = 0, bool modal = false, WFlags fl = 0);
+ EditMode(TQWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0);
~EditMode();
};
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index 2fc7313..8ec4fff 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -49,7 +49,7 @@
typedef KGenericFactory<KCMLirc, TQWidget> theFactory;
K_EXPORT_COMPONENT_FACTORY(kcmlirc, theFactory("kcmlirc"))
-KCMLirc::KCMLirc(TQWidget *tqparent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(tqparent, name)
+KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, name)
{
KGlobal::locale()->insertCatalogue( "kcmlirc" );
setAboutData(new KAboutData("kcmlirc", I18N_NOOP("KDE Lirc"), VERSION, I18N_NOOP("The KDE IR Remote Control System"), KAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure KDE's infrared remote control system in order to control any KDE application with your infrared remote control."), "http://www.kde.org"));
@@ -96,11 +96,11 @@ KCMLirc::~KCMLirc()
void KCMLirc::updateModestqStatus(TQListViewItem *item)
{
- theKCMLircBase->theModes->setItemsRenameable(item && item->tqparent());
+ theKCMLircBase->theModes->setItemsRenameable(item && item->parent());
theKCMLircBase->theAddActions->setEnabled(ProfileServer::profileServer()->profiles().count() && theKCMLircBase->theModes->selectedItem() && RemoteServer::remoteServer()->remotes()[modeMap[theKCMLircBase->theModes->selectedItem()].remote()]);
theKCMLircBase->theAddAction->setEnabled(item);
theKCMLircBase->theAddMode->setEnabled(item);
- theKCMLircBase->theRemoveMode->setEnabled(item && item->tqparent());
+ theKCMLircBase->theRemoveMode->setEnabled(item && item->parent());
theKCMLircBase->theEditMode->setEnabled(item);
}
@@ -114,7 +114,7 @@ void KCMLirc::slotRenamed(TQListViewItem *item)
{
if(!item) return;
- if(item->tqparent() && item->text(0) != modeMap[item].name())
+ if(item->parent() && item->text(0) != modeMap[item].name())
{ allActions.renameMode(modeMap[item], item->text(0));
allModes.rename(modeMap[item], item->text(0));
emit changed(true);
@@ -128,7 +128,7 @@ void KCMLirc::slotEditAction()
EditAction theDialog(actionMap[theKCMLircBase->theActions->currentItem()], this);
TQListViewItem *item = theKCMLircBase->theModes->currentItem();
- if(item->tqparent()) item = item->tqparent();
+ if(item->parent()) item = item->parent();
theDialog.theModes->insertItem(i18n("[Exit current mode]"));
for(item = item->firstChild(); item; item = item->nextSibling())
theDialog.theModes->insertItem(item->text(0));
@@ -166,7 +166,7 @@ void KCMLirc::slotAddAction()
// populate the modes list box
TQListViewItem *item = theKCMLircBase->theModes->selectedItem();
- if(item->tqparent()) item = item->tqparent();
+ if(item->parent()) item = item->parent();
theDialog.theModes->setEnabled(item->firstChild());
theDialog.theSwitchMode->setEnabled(item->firstChild());
for(item = item->firstChild(); item; item = item->nextSibling())
@@ -202,7 +202,7 @@ void KCMLirc::slotAddAction()
a.setRepeat(false);
}
// DCOP?
- else if(theDialog.theUseDCOP->isChecked() && theDialog.theObjects->selectedItem() && theDialog.theObjects->selectedItem()->tqparent() && theDialog.theFunctions->selectedItem())
+ else if(theDialog.theUseDCOP->isChecked() && theDialog.theObjects->selectedItem() && theDialog.theObjects->selectedItem()->parent() && theDialog.theFunctions->selectedItem())
{
a.setProgram(theDialog.program);
a.setObject(theDialog.theObjects->selectedItem()->text(0));
@@ -284,7 +284,7 @@ void KCMLirc::slotAddMode()
NewMode theDialog(this, 0);
TQMap<TQListViewItem *, TQString> remoteMap;
TQListViewItem *tr = theKCMLircBase->theModes->selectedItem();
- if(tr) if(tr->tqparent()) tr = tr->tqparent();
+ 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));
remoteMap[a] = modeMap[i].remote();
@@ -305,7 +305,7 @@ void KCMLirc::slotEditMode()
EditMode theDialog(this, 0);
Mode &mode = modeMap[theKCMLircBase->theModes->selectedItem()];
- theDialog.theName->setEnabled(theKCMLircBase->theModes->selectedItem()->tqparent());
+ theDialog.theName->setEnabled(theKCMLircBase->theModes->selectedItem()->parent());
theDialog.theName->setText(mode.name().isEmpty() ? mode.remoteName() : mode.name());
if(!mode.iconFile().isNull())
theDialog.theIcon->setIcon(mode.iconFile());
@@ -331,7 +331,7 @@ void KCMLirc::slotEditMode()
void KCMLirc::slotRemoveMode()
{
if(!theKCMLircBase->theModes->selectedItem()) return;
- if(!theKCMLircBase->theModes->selectedItem()->tqparent()) 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)
{
@@ -465,7 +465,7 @@ void KCMLirc::updateInformation()
if(!theKCMLircBase->theExtensions->selectedItem()) return;
- if(!theKCMLircBase->theExtensions->selectedItem()->tqparent())
+ if(!theKCMLircBase->theExtensions->selectedItem()->parent())
{
theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(theKCMLircBase->theExtensions->selectedItem()->text(0)));
if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Applications"))
@@ -473,7 +473,7 @@ void KCMLirc::updateInformation()
else if(theKCMLircBase->theExtensions->selectedItem()->text(0) == i18n("Remote Controls"))
new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Remote Controls"), TQString().setNum(theKCMLircBase->theExtensions->selectedItem()->childCount()));
}
- else if(theKCMLircBase->theExtensions->selectedItem()->tqparent()->text(0) == i18n("Applications"))
+ else if(theKCMLircBase->theExtensions->selectedItem()->parent()->text(0) == i18n("Applications"))
{
ProfileServer *theServer = ProfileServer::profileServer();
const Profile *p = theServer->profiles()[profileMap[theKCMLircBase->theExtensions->selectedItem()]];
@@ -483,7 +483,7 @@ void KCMLirc::updateInformation()
new TQListViewItem(theKCMLircBase->theInformation, i18n("Number of Actions"), TQString().setNum(p->actions().count()));
theKCMLircBase->theInformationLabel->setText(i18n("Information on <b>%1</b>:").tqarg(p->name()));
}
- else if(theKCMLircBase->theExtensions->selectedItem()->tqparent()->text(0) == i18n("Remote Controls"))
+ else if(theKCMLircBase->theExtensions->selectedItem()->parent()->text(0) == i18n("Remote Controls"))
{
RemoteServer *theServer = RemoteServer::remoteServer();
const Remote *p = theServer->remotes()[remoteMap[theKCMLircBase->theExtensions->selectedItem()]];
@@ -534,9 +534,9 @@ void KCMLirc::configChanged()
// TODO: Take this out when I know how
extern "C"
{
- KDE_EXPORT KCModule *create_kcmlirc(TQWidget *tqparent, const char *)
+ KDE_EXPORT KCModule *create_kcmlirc(TQWidget *parent, const char *)
{ KGlobal::locale()->insertCatalogue("kcmlirc");
- return new KCMLirc(tqparent, "KCMLirc");
+ return new KCMLirc(parent, "KCMLirc");
}
}
diff --git a/kdelirc/kcmlirc/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h
index 4af2347..b4ea329 100644
--- a/kdelirc/kcmlirc/kcmlirc.h
+++ b/kdelirc/kcmlirc/kcmlirc.h
@@ -78,7 +78,7 @@ public:
virtual void defaults();
virtual void configChanged();
- KCMLirc(TQWidget *tqparent = 0, const char *name = 0, TQStringList args = TQStringList());
+ KCMLirc(TQWidget *parent = 0, const char *name = 0, TQStringList args = TQStringList());
~KCMLirc();
};
diff --git a/kdelirc/kcmlirc/modeslist.cpp b/kdelirc/kcmlirc/modeslist.cpp
index a182129..83678d1 100644
--- a/kdelirc/kcmlirc/modeslist.cpp
+++ b/kdelirc/kcmlirc/modeslist.cpp
@@ -16,7 +16,7 @@
#include "modeslist.h"
-ModesList::ModesList(TQWidget *tqparent, const char *name) : KListView(tqparent, name)
+ModesList::ModesList(TQWidget *parent, const char *name) : KListView(parent, name)
{
setAcceptDrops(true);
setDropVisualizer(false);
diff --git a/kdelirc/kcmlirc/modeslist.h b/kdelirc/kcmlirc/modeslist.h
index 5cc77a8..c0e9aa8 100644
--- a/kdelirc/kcmlirc/modeslist.h
+++ b/kdelirc/kcmlirc/modeslist.h
@@ -28,7 +28,7 @@ class ModesList : public KListView
TQ_OBJECT
public:
virtual bool acceptDrag(TQDropEvent *) const;
- ModesList(TQWidget *tqparent = 0, const char *name = 0);
+ ModesList(TQWidget *parent = 0, const char *name = 0);
};
#endif
diff --git a/kdelirc/kdelirc/profileserver.h b/kdelirc/kdelirc/profileserver.h
index f049ad4..0d9bc59 100644
--- a/kdelirc/kdelirc/profileserver.h
+++ b/kdelirc/kdelirc/profileserver.h
@@ -36,7 +36,7 @@ class ProfileActionArgument
TQString theComment, theType;
Range theRange;
TQString theDefault; // should be TQVariant?
- const ProfileAction *tqparent;
+ const ProfileAction *parent;
friend class Profile;
public:
@@ -49,15 +49,15 @@ public:
const Range &range() const { return theRange; }
void setRange(const Range &a) { theRange = a; }
- const ProfileAction *action() const { return tqparent; }
- void setAction(const ProfileAction *a) { tqparent = a; }
+ const ProfileAction *action() const { return parent; }
+ void setAction(const ProfileAction *a) { parent = a; }
};
class ProfileAction
{
TQString theObjId, thePrototype, theName, theComment, theClass;
float theMultiplier;
- const Profile *tqparent;
+ const Profile *parent;
bool theRepeat, theAutoStart;
TQValueList<ProfileActionArgument> theArguments;
@@ -81,8 +81,8 @@ public:
void setAutoStart(bool a) { theAutoStart = a; }
const TQValueList<ProfileActionArgument> &arguments() const { return theArguments; }
- const Profile *profile() const { return tqparent; }
- void setProfile(const Profile *a) { tqparent = a; }
+ const Profile *profile() const { return parent; }
+ void setProfile(const Profile *a) { parent = a; }
};
class Profile : public TQXmlDefaultHandler