diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
| commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
| tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /dcop/dcopobject.cpp | |
| parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
| download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip | |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'dcop/dcopobject.cpp')
| -rw-r--r-- | dcop/dcopobject.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dcop/dcopobject.cpp b/dcop/dcopobject.cpp index c686b79d7..fd39fb347 100644 --- a/dcop/dcopobject.cpp +++ b/dcop/dcopobject.cpp @@ -58,7 +58,7 @@ DCOPObject::DCOPObject(TQObject *obj) while (currentObj != 0L) { ident.prepend( currentObj->name() ); ident.prepend("/"); - currentObj = currentObj->tqparent(); + currentObj = currentObj->parent(); } if ( ident[0] == '/' ) ident = ident.mid(1); @@ -97,7 +97,7 @@ void DCOPObject::setCallingDcopClient(DCOPClient *client) bool DCOPObject::setObjId(const TQCString &objId) { - if (objMap()->tqfind(objId)!=objMap()->end()) return false; + if (objMap()->find(objId)!=objMap()->end()) return false; DCOPClient *client = DCOPClient::mainClient(); if ( d->m_signalConnections > 0 && client ) @@ -116,16 +116,16 @@ TQCString DCOPObject::objId() const bool DCOPObject::hasObject(const TQCString &_objId) { - if (objMap()->tqcontains(_objId)) + if (objMap()->contains(_objId)) return true; else return false; } -DCOPObject *DCOPObject::tqfind(const TQCString &_objId) +DCOPObject *DCOPObject::find(const TQCString &_objId) { TQMap<TQCString, DCOPObject *>::ConstIterator it; - it = objMap()->tqfind(_objId); + it = objMap()->find(_objId); if (it != objMap()->end()) return *it; else @@ -155,7 +155,7 @@ TQCString DCOPObject::objectName( TQObject* obj ) { identity.prepend( currentObj->name() ); identity.prepend("/"); - currentObj = currentObj->tqparent(); + currentObj = currentObj->parent(); } if ( identity[0] == '/' ) identity = identity.mid(1); |