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

List:       kde-commits
Subject:    KDE/kdetoys/amor
From:       Pino Toscano <toscano.pino () tiscali ! it>
Date:       2006-10-29 21:53:45
Message-ID: 1162158825.618560.21347.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 600216 by pino:

Q3Dict -> QHash


 M  +6 -7      amoranim.cpp  
 M  +6 -4      amoranim.h  
 M  +4 -3      amorpm.cpp  
 M  +3 -5      amorpm.h  


--- trunk/KDE/kdetoys/amor/amoranim.cpp #600215:600216
@@ -136,13 +136,13 @@
     : mMaximumSize(0, 0)
 {
     mConfig = 0;
-    mAnimations.setAutoDelete(true);
 }
 
 //---------------------------------------------------------------------------
 //
 AmorThemeManager::~AmorThemeManager()
 {
+    qDeleteAll(mAnimations);
     delete mConfig;
 }
 
@@ -180,6 +180,7 @@
     mMaximumSize.setWidth(0);
     mMaximumSize.setHeight(0);
 
+    qDeleteAll(mAnimations);
     mAnimations.clear();
 
     return true;
@@ -191,13 +192,11 @@
 //
 AmorAnim *AmorThemeManager::random(const QString & group)
 {
-    QString grp( group );
+    QString grp = mStatic ? QLatin1String("Base") : group;
 
-    if (mStatic)
-	grp = "Base";
+    QHash<QString, AmorAnimationGroup*>::const_iterator it = mAnimations.find(grp);
+    AmorAnimationGroup *animGroup = it != mAnimations.end() ? *it : 0;
 
-    AmorAnimationGroup *animGroup = mAnimations.find(grp);
-
     if (animGroup) {
 	int idx = KRandom::random()%animGroup->count();
         return animGroup->at( idx );
@@ -251,7 +250,7 @@
     if ( entries == 0)
         return false;
 
-    mAnimations.insert(seq, animList);
+    mAnimations[seq] = animList;
 
     return true;
 }
--- trunk/KDE/kdetoys/amor/amoranim.h #600215:600216
@@ -32,14 +32,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <q3dict.h>
+#include <qhash.h>
+#include <qpoint.h>
+#include <qsize.h>
 #include <qstringlist.h>
-//Added by qt3to4:
-#include <QPixmap>
 #include <QVector>
 #include <kconfigbase.h>
 #include <ksimpleconfig.h>
 
+class QPixmap;
+
 //---------------------------------------------------------------------------
 //
 // AmorAnim contains the properties of a single animation
@@ -110,7 +112,7 @@
     QString           mPath;
     KSimpleConfig     *mConfig;
     QSize             mMaximumSize; // The largest pixmap used
-    Q3Dict<AmorAnimationGroup> mAnimations; // list of animation groups
+    QHash<QString, AmorAnimationGroup*> mAnimations; // list of animation groups
     bool              mStatic;	    // static image
 };
 
--- trunk/KDE/kdetoys/amor/amorpm.cpp #600215:600216
@@ -38,7 +38,6 @@
 AmorPixmapManager::AmorPixmapManager()
     : mPixmapDir(".")
 {
-    mPixmaps.setAutoDelete(true);
 }
 
 //---------------------------------------------------------------------------
@@ -47,6 +46,7 @@
 //
 AmorPixmapManager::~AmorPixmapManager()
 {
+    qDeleteAll(mPixmaps);
 }
 
 //---------------------------------------------------------------------------
@@ -58,7 +58,8 @@
 //
 const QPixmap *AmorPixmapManager::load(const QString & img)
 {
-    QPixmap *pixmap = mPixmaps.find(img);
+    QHash<QString, QPixmap*>::const_iterator it = mPixmaps.find(img);
+    QPixmap *pixmap = it != mPixmaps.end() ? *it : 0;
 
     if (!pixmap)
     {
@@ -68,7 +69,7 @@
 
         if (!pixmap->isNull())
         {
-            mPixmaps.insert(img,pixmap);
+            mPixmaps[img] = pixmap;
         }
         else
         {
--- trunk/KDE/kdetoys/amor/amorpm.h #600215:600216
@@ -27,9 +27,7 @@
 #ifndef AMORPM_H 
 #define AMORPM_H 
 
-#include <config.h>
-
-#include <q3dict.h>
+#include <qhash.h>
 #include <qpixmap.h>
 
 //---------------------------------------------------------------------------
@@ -48,13 +46,13 @@
         { mPixmapDir = "."; mPixmaps.clear(); }
     const QPixmap *load(const QString & img);
     const QPixmap *pixmap(const QString & img) const
-        { return mPixmaps.find(img); }
+        { return mPixmaps.contains(img) ? mPixmaps[img] : 0; }
 
     static AmorPixmapManager *manager();
 
 public:
     QString        mPixmapDir;           // get pixmaps from here
-    Q3Dict<QPixmap> mPixmaps;             // list of pixmaps
+    QHash<QString, QPixmap*> mPixmaps;   // list of pixmaps
     static AmorPixmapManager *mManager; // static pointer to instance
 };
 
[prev in list] [next in list] [prev in thread] [next in thread]