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

List:       kde-commits
Subject:    KDE/kdelibs/kutils
From:       David Faure <faure () kde ! org>
Date:       2006-01-09 15:32:25
Message-ID: 1136820745.764503.28365.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 496052 by dfaure:

q3ptrdict -> qhash


 M  +6 -9      kcmultidialog.cpp  
 M  +2 -3      kcmultidialog.h  


--- trunk/KDE/kdelibs/kutils/kcmultidialog.cpp #496051:496052
@@ -97,8 +97,6 @@
     enableButton(Apply, false);
     connect(this, SIGNAL(currentPageChanged(QWidget *)), this, SLOT(slotCurrentPageChanged(QWidget *)));
     setInitialSize(QSize(640,480));
-    moduleParentComponents.setAutoDelete( true );
-
 }
 
 KCMultiDialog::~KCMultiDialog()
@@ -146,9 +144,9 @@
         if( m->changed() )
         {
             m->save();
-            QStringList * names = moduleParentComponents[ m ];
-            kdDebug(710) << k_funcinfo << *names << " saved and added to the list" << endl;
-            for( QStringList::ConstIterator it = names->begin(); it != names->end(); ++it )
+            const QStringList names = moduleParentComponents.value( m );
+            kdDebug(710) << k_funcinfo << names << " saved and added to the list" << endl;
+            for( QStringList::ConstIterator it = names.begin(); it != names.end(); ++it )
                 if( updatedModules.find( *it ) == updatedModules.end() )
                     updatedModules.append( *it );
         }
@@ -296,10 +294,9 @@
     else
     {
         module = new KCModuleProxy( moduleinfo, withfallback, page );
-        QStringList parentComponents = moduleinfo.service()->property(
-                "X-KDE-ParentComponents" ).toStringList();
-        moduleParentComponents.insert( module,
-                new QStringList( parentComponents ) );
+        const QStringList parentComponents = moduleinfo.service()->property(
+            "X-KDE-ParentComponents" ).toStringList();
+        moduleParentComponents.insert( module, parentComponents );
 
         connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool)));
 
--- trunk/KDE/kdelibs/kutils/kcmultidialog.h #496051:496052
@@ -23,12 +23,11 @@
 #ifndef KCMULTIDIALOG_H
 #define KCMULTIDIALOG_H
 
-#include <q3ptrdict.h>
-
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kservice.h>
 #include <QList>
+#include <qhash.h>
 
 class KCModuleProxy;
 class KCModuleInfo;
@@ -271,7 +270,7 @@
     typedef QMap<KService::Ptr, KCModuleProxy*> OrphanMap;
     OrphanMap m_orphanModules;
 
-    Q3PtrDict<QStringList> moduleParentComponents;
+    QHash<KCModuleProxy *, QStringList> moduleParentComponents;
     QString _docPath;
     int dialogface;
 
[prev in list] [next in list] [prev in thread] [next in thread]