summaryrefslogtreecommitdiffstats
path: root/kdecore/klibloader.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-07 03:45:53 +0000
commit10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch)
tree4bc444c00a79e88105f2cfce5b6209994c413ca0 /kdecore/klibloader.cpp
parent307136d8eef0ba133b78ceee8e901138d4c996a1 (diff)
downloadtdelibs-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 'kdecore/klibloader.cpp')
-rw-r--r--kdecore/klibloader.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/kdecore/klibloader.cpp b/kdecore/klibloader.cpp
index 84482ba79..e2f55fe67 100644
--- a/kdecore/klibloader.cpp
+++ b/kdecore/klibloader.cpp
@@ -209,7 +209,7 @@ void KLibrary::slotObjectCreated( TQObject *obj )
if ( m_timer && m_timer->isActive() )
m_timer->stop();
- if ( m_objs.tqcontainsRef( obj ) )
+ if ( m_objs.containsRef( obj ) )
return; // we know this object already
connect( obj, TQT_SIGNAL( destroyed() ),
@@ -320,7 +320,7 @@ KLibLoader::~KLibLoader()
TQAsciiDictIterator<KLibWrapPrivate> it( m_libs );
for (; it.current(); ++it )
{
- kdDebug(150) << "The KLibLoader tqcontains the library " << it.current()->name
+ kdDebug(150) << "The KLibLoader contains the library " << it.current()->name
<< " (" << it.current()->lib << ")" << endl;
d->pending_close.append(it.current());
}
@@ -337,10 +337,10 @@ static inline TQCString makeLibName( const char* name )
// only append ".la" if there is no extension
// this allows to load non-libtool libraries as well
// (mhk, 20000228)
- int pos = libname.tqfindRev('/');
+ int pos = libname.findRev('/');
if (pos < 0)
pos = 0;
- if (libname.tqfind('.', pos) < 0)
+ if (libname.find('.', pos) < 0)
libname += ".la";
return libname;
}
@@ -500,7 +500,7 @@ void KLibLoader::slotLibraryDestroyed()
void KLibLoader::close_pending(KLibWrapPrivate *wrap)
{
- if (wrap && !d->pending_close.tqcontainsRef( wrap ))
+ if (wrap && !d->pending_close.containsRef( wrap ))
d->pending_close.append( wrap );
/* First delete all KLibrary objects in pending_close, but _don't_ unload
@@ -534,7 +534,7 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
/* Now ensure, that the libs are only unloaded in the reverse direction
they were loaded. */
- if (!d->pending_close.tqcontainsRef( wrap )) {
+ if (!d->pending_close.containsRef( wrap )) {
if (!deleted_one)
/* Only diagnose, if we really haven't deleted anything. */
// kdDebug(150) << "try to dlclose " << wrap->name << ": not yet" << endl;