diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-03 04:12:51 +0000 |
commit | 560378aaca1784ba19806a0414a32b20c744de39 (patch) | |
tree | ce0dfd7c3febf2a1adc7603d1019a8be2083c415 /dcop/dcopobject.cpp | |
parent | d4d5af1cdbd3cc65d095e0afc5b1f4260091cf5d (diff) | |
download | tdelibs-560378aaca1784ba19806a0414a32b20c744de39.tar.gz tdelibs-560378aaca1784ba19806a0414a32b20c744de39.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
NOTE: This will not compile with Qt4 (yet), however it does compile with Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1211081 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 fd39fb347..c686b79d7 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->parent(); + currentObj = currentObj->tqparent(); } if ( ident[0] == '/' ) ident = ident.mid(1); @@ -97,7 +97,7 @@ void DCOPObject::setCallingDcopClient(DCOPClient *client) bool DCOPObject::setObjId(const TQCString &objId) { - if (objMap()->find(objId)!=objMap()->end()) return false; + if (objMap()->tqfind(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()->contains(_objId)) + if (objMap()->tqcontains(_objId)) return true; else return false; } -DCOPObject *DCOPObject::find(const TQCString &_objId) +DCOPObject *DCOPObject::tqfind(const TQCString &_objId) { TQMap<TQCString, DCOPObject *>::ConstIterator it; - it = objMap()->find(_objId); + it = objMap()->tqfind(_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->parent(); + currentObj = currentObj->tqparent(); } if ( identity[0] == '/' ) identity = identity.mid(1); |