Diffstat (limited to 'microkde/kdecore/klibloader.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | microkde/kdecore/klibloader.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/microkde/kdecore/klibloader.cpp b/microkde/kdecore/klibloader.cpp index 6d0475a..0b54eb6 100644 --- a/microkde/kdecore/klibloader.cpp +++ b/microkde/kdecore/klibloader.cpp @@ -22,5 +22,8 @@ #include <qtimer.h> -#include <qobjectdict.h> -#include <qwidgetlist.h> +#include <q3objectdict.h> #include <qwidget.h> +#include <qwidget.h> +//Added by qt3to4: +#include <Q3CString> +#include <Q3PtrList> @@ -47,3 +50,3 @@ -template class QAsciiDict<KLibrary>; +template class Q3AsciiDict<KLibrary>; @@ -122,3 +125,3 @@ KLibrary::~KLibrary() { - QPtrListIterator<QObject> it( m_objs ); + Q3PtrListIterator<QObject> it( m_objs ); for ( ; it.current() ; ++it ) @@ -154,3 +157,3 @@ KLibFactory* KLibrary::factory() - QCString symname; + Q3CString symname; symname.sprintf("init_%s", name().latin1() ); @@ -307,4 +310,4 @@ class KLibLoaderPrivate public: - QPtrList<KLibWrapPrivate> loaded_stack; - QPtrList<KLibWrapPrivate> pending_close; + Q3PtrList<KLibWrapPrivate> loaded_stack; + Q3PtrList<KLibWrapPrivate> pending_close; enum {UNKNOWN, UNLOAD, DONT_UNLOAD} unload_mode; @@ -350,3 +353,3 @@ KLibLoader::~KLibLoader() - QAsciiDictIterator<KLibWrapPrivate> it( m_libs ); + Q3AsciiDictIterator<KLibWrapPrivate> it( m_libs ); for (; it.current(); ++it ) @@ -366,3 +369,3 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta { - QCString libname( name ); + Q3CString libname( name ); @@ -423,3 +426,3 @@ QString KLibLoader::findLibrary( const char * name/*US , const KInstance * insta kdDebug(150) << "library=" << libname << ": No file names " << libname.data() << " found in paths." << endl; - self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(libname); + self()->d->errorMessage = i18n("Library files for \"%1\" not found in paths").arg(QString(libname)); @@ -471,3 +474,3 @@ KLibrary* KLibLoader::library( const char *name ) unloaded meanwhile, whithout being dlclose()'ed. */ - QPtrListIterator<KLibWrapPrivate> it(d->loaded_stack); + Q3PtrListIterator<KLibWrapPrivate> it(d->loaded_stack); for (; it.current(); ++it) { @@ -552,3 +555,3 @@ void KLibLoader::slotLibraryDestroyed() - QAsciiDictIterator<KLibWrapPrivate> it( m_libs ); + Q3AsciiDictIterator<KLibWrapPrivate> it( m_libs ); for (; it.current(); ++it ) @@ -571,3 +574,3 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap) the DSO behind it. */ - QPtrListIterator<KLibWrapPrivate> it(d->pending_close); + Q3PtrListIterator<KLibWrapPrivate> it(d->pending_close); for (; it.current(); ++it) { |