[Krusader-commits] SF.net SVN: krusader: [2690] trunk/krusader_kde4

[<ck...@us...>]

Revision: 2690
          http://krusader.svn.sourceforge.net/krusader/?rev=2690&view=rev
Author:   ckarai
Date:     2008-01-30 16:46:40 -0800 (Wed, 30 Jan 2008)

Log Message:
-----------
Q3Dict -> QHash, part II., krpermhandler

Modified Paths:
--------------
    trunk/krusader_kde4/iso/kiso.h
    trunk/krusader_kde4/krusader/Panel/krcolorcache.h
    trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp
    trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp
    trunk/krusader_kde4/krusader/VFS/krpermhandler.h

Modified: trunk/krusader_kde4/iso/kiso.h
===================================================================
--- trunk/krusader_kde4/iso/kiso.h	2008-01-30 22:41:16 UTC (rev 2689)
+++ trunk/krusader_kde4/iso/kiso.h	2008-01-31 00:46:40 UTC (rev 2690)
@@ -28,7 +28,6 @@
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qstringlist.h>
-#include <q3dict.h>
 
 #include "kisofile.h"
 #include "kisodirectory.h"

Modified: trunk/krusader_kde4/krusader/Panel/krcolorcache.h
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krcolorcache.h	2008-01-30 22:41:16 UTC (rev 2689)
+++ trunk/krusader_kde4/krusader/Panel/krcolorcache.h	2008-01-31 00:46:40 UTC (rev 2690)
@@ -2,7 +2,6 @@
 #define KRCOLORCACHE_H
 
 #include <qobject.h>
-#include <q3dict.h>
 #include <QList>
 #include <qcolor.h>
 #include <qpalette.h>

Modified: trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp
===================================================================
--- trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp	2008-01-30 22:41:16 UTC (rev 2689)
+++ trunk/krusader_kde4/krusader/Panel/krdetailedview.cpp	2008-01-31 00:46:40 UTC (rev 2690)
@@ -57,7 +57,6 @@
 #include <klocale.h>
 #include <kmenu.h>
 #include <kcolorscheme.h>
-#include <q3dict.h>
 #include <qstyle.h>
 
 //////////////////////////////////////////////////////////////////////////

Modified: trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp
===================================================================
--- trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp	2008-01-30 22:41:16 UTC (rev 2689)
+++ trunk/krusader_kde4/krusader/VFS/krpermhandler.cpp	2008-01-31 00:46:40 UTC (rev 2690)
@@ -48,8 +48,8 @@
 #include "krpermhandler.h"
 #include "../resources.h"
 
-Q3Dict<uid_t> *KRpermHandler::passwdCache = 0L;
-Q3Dict<gid_t> *KRpermHandler::groupCache = 0L;
+QHash<QString, uid_t> *KRpermHandler::passwdCache = 0L;
+QHash<QString, gid_t> *KRpermHandler::groupCache = 0L;
 QHash<int, char>    *KRpermHandler::currentGroups = 0L;
 QHash<int, QString> *KRpermHandler::uidCache = 0L;
 QHash<int, QString> *KRpermHandler::gidCache = 0L;
@@ -166,22 +166,16 @@
 	int groupNo = getgroups( 50, groupList );
 
 	// init the groups and user caches
-	passwdCache	= new Q3Dict<uid_t>( 317 );
-	groupCache	= new Q3Dict<gid_t>( 317 );
+	passwdCache	= new QHash<QString, uid_t>();
+	groupCache	= new QHash<QString, gid_t>();
 	currentGroups = new QHash<int, char>();
 	uidCache = new QHash<int, QString>();
 	gidCache = new QHash<int, QString>();
 
-
-	passwdCache->setAutoDelete( true );
-	groupCache->setAutoDelete( true );
-
 	// fill the UID cache
 	struct passwd *pass;
-	uid_t* uid_temp;
 	while ( ( pass = getpwent() ) != 0L ) {
-		uid_temp = new uid_t( pass->pw_uid );
-		passwdCache->insert( pass->pw_name, uid_temp );
+		passwdCache->insert( pass->pw_name, pass->pw_uid );
 		(*uidCache)[ pass->pw_uid ] = QString( pass->pw_name );
 	}
 	delete pass;
@@ -189,10 +183,8 @@
 
 	// fill the GID cache
 	struct group *gr;
-	gid_t* gid_temp;
 	while ( ( gr = getgrent() ) != 0L ) {
-		gid_temp = new gid_t( gr->gr_gid );
-		groupCache->insert( gr->gr_name, gid_temp );
+		groupCache->insert( gr->gr_name, gr->gr_gid );
 		(*gidCache)[ gr->gr_gid ] = QString( gr->gr_name );
 	}
 	delete gr;
@@ -321,14 +313,14 @@
 }
 
 gid_t KRpermHandler::group2gid( QString group ) {
-	gid_t * gid = groupCache->find( group );
-	if ( gid ) return * gid;
-	return getgid();
+	if( groupCache->find( group ) == groupCache->end() )
+		return getgid();
+	return (*groupCache)[ group ];
 }
 uid_t KRpermHandler::user2uid ( QString user ) {
-	uid_t * uid = passwdCache->find( user );
-	if ( uid ) return * uid;
-	return getuid();
+	if( passwdCache->find( user ) == passwdCache->end() )
+		return getuid();
+	return (*passwdCache)[ user ];
 }
 
 QString KRpermHandler::gid2group( gid_t groupId ) {

Modified: trunk/krusader_kde4/krusader/VFS/krpermhandler.h
===================================================================
--- trunk/krusader_kde4/krusader/VFS/krpermhandler.h	2008-01-30 22:41:16 UTC (rev 2689)
+++ trunk/krusader_kde4/krusader/VFS/krpermhandler.h	2008-01-31 00:46:40 UTC (rev 2690)
@@ -35,7 +35,6 @@
 #include <qstring.h>
 #include <qfileinfo.h>
 #include <sys/types.h>
-#include <q3dict.h>
 #include <qhash.h>
 #include <kio/global.h>
 
@@ -79,11 +78,11 @@
 
 private:
 	// cache for passwd and group entries
-	static Q3Dict<uid_t> 	    *passwdCache;
-  static Q3Dict<gid_t> 	    *groupCache;
-  static QHash<int, char>    *currentGroups;
-  static QHash<int, QString> *uidCache;
-  static QHash<int, QString> *gidCache;
+  static QHash<QString, uid_t> *passwdCache;
+  static QHash<QString, gid_t> *groupCache;
+  static QHash<int, char>      *currentGroups;
+  static QHash<int, QString>   *uidCache;
+  static QHash<int, QString>   *gidCache;
 };
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.