SVN commit 486397 by ctennis: QDict -> QMap M +4 -4 factory.cpp M +2 -2 factory.h --- trunk/KDE/kdelibs/kresources/factory.cpp #486396:486397 @@ -34,8 +34,8 @@ using namespace KRES; -Q3Dict *Factory::mSelves = 0; -static KStaticDeleter< Q3Dict > staticDeleter; +QMap *Factory::mSelves = 0; +static KStaticDeleter< QMap > staticDeleter; Factory *Factory::self( const QString& resourceFamily ) { @@ -43,9 +43,9 @@ Factory *factory = 0; if ( !mSelves ) - staticDeleter.setObject( mSelves, new Q3Dict ); + staticDeleter.setObject( mSelves, new QMap ); - factory = mSelves->find( resourceFamily ); + factory = mSelves->value( resourceFamily, 0 ); if ( !factory ) { factory = new Factory( resourceFamily ); --- trunk/KDE/kdelibs/kresources/factory.h #486396:486397 @@ -24,7 +24,7 @@ #ifndef KRESOURCES_FACTORY_H #define KRESOURCES_FACTORY_H -#include +#include #include #include @@ -108,7 +108,7 @@ Factory( const QString& resourceFamily ); private: - static Q3Dict *mSelves; + static QMap *mSelves; QString mResourceFamily; QMap mTypeMap;