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

List:       kde-commits
Subject:    KDE/kdesdk/cervisia/cvsservice
From:       Christian Loose <christian.loose () hamburg ! de>
Date:       2007-04-20 18:09:46
Message-ID: 1177092586.449490.32409.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 656231 by cloose:

less qt3support. Port Q3IntDict to QHash

 M  +10 -8     cvsservice.cpp  


--- trunk/KDE/kdesdk/cervisia/cvsservice/cvsservice.cpp #656230:656231
@@ -23,6 +23,7 @@
 #include <q3intdict.h>
 #include <qstring.h>
 #include <QApplication>
+#include <QHash>
 
 #include <kconfig.h>
 #include <klocale.h>
@@ -52,13 +53,13 @@
         delete singleCvsJob;
     }
 
-    CvsJob*               singleCvsJob;   // non-concurrent cvs job, like update or commit
-    Q3IntDict<CvsJob>      cvsJobs;        // concurrent cvs jobs, like diff or annotate
-    Q3IntDict<CvsLoginJob> loginJobs;
-    unsigned              lastJobId;
+    CvsJob*                  singleCvsJob;   // non-concurrent cvs job, like update or commit
+    QHash<int, CvsJob*>      cvsJobs;       // concurrent cvs jobs, like diff or annotate
+    QHash<int, CvsLoginJob*> loginJobs;
+    unsigned                 lastJobId;
 
 
-    Repository*           repository;
+    Repository*              repository;
 
     CvsJob* createCvsJob();
     QDBusObjectPath setupNonConcurrentJob(Repository* repo = 0);
@@ -81,9 +82,6 @@
     // create repository manager
     d->repository = new Repository();
 
-    d->cvsJobs.setAutoDelete(true);
-    d->loginJobs.setAutoDelete(true);
-
     KSharedConfig::Ptr config = KGlobal::config();
     KConfigGroup cs(config, "General");
     if( cs.readEntry("UseSshAgent", false) )
@@ -103,8 +101,12 @@
     SshAgent ssh;
     ssh.killSshAgent();
 
+    qDeleteAll(d->cvsJobs);
     d->cvsJobs.clear();
+
+    qDeleteAll(d->loginJobs);
     d->loginJobs.clear();
+
     delete d;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]