[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kresources
From:       Caleb Tennis <caleb () gentoo ! org>
Date:       2005-12-07 18:20:42
Message-ID: 1133979642.336368.25391.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 486397 by ctennis:

QDict -> QMap<QString..>

 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> *Factory::mSelves = 0;
-static KStaticDeleter< Q3Dict<Factory> > staticDeleter;
+QMap<QString, Factory*> *Factory::mSelves = 0;
+static KStaticDeleter< QMap<QString, Factory*> > staticDeleter;
 
 Factory *Factory::self( const QString& resourceFamily )
 {
@@ -43,9 +43,9 @@
 
   Factory *factory = 0;
   if ( !mSelves )
-    staticDeleter.setObject( mSelves, new Q3Dict<Factory> );
+    staticDeleter.setObject( mSelves, new QMap<QString, Factory*> );
 
-  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 <q3dict.h>
+#include <QMap>
 #include <qstring.h>
 
 #include <kconfig.h>
@@ -108,7 +108,7 @@
     Factory( const QString& resourceFamily );
 
   private:
-    static Q3Dict<Factory> *mSelves;
+    static QMap<QString, Factory*> *mSelves;
 
     QString mResourceFamily;
     QMap<QString, KService::Ptr> mTypeMap;
[prev in list] [next in list] [prev in thread] [next in thread]