Changeset 846 for trunk/src/qt3support/tools/q3gcache.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/qt3support/tools/q3gcache.cpp (modified) (6 diffs)

trunk/src/qt3support/tools/q3gcache.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -227 +227 @@
         { return Q3GDict::remove_ascii((const char *)item->key,item); }
     bool  remove_int(Q3CacheItem *item)
-        { return Q3GDict::remove_int((long)item->key,item);}
+        { return Q3GDict::remove_int((quintptr)item->key,item);}
 
     void  statistics()                  { Q3GDict::statistics(); }
@@ -427 +427 @@
         dict->insert_ascii(key, ci);
     else
-        dict->insert_int((long)key, ci);
+        dict->insert_int((quintptr)key, ci);
     tCost += cost;
     return true;
@@ -487 +487 @@
         ci = dict->take_ascii(key);
     else
-        ci = dict->take_int((long)key);
+        ci = dict->take_int((quintptr)key);
     Item d;
     if (ci) {
@@ -564 +564 @@
 {
     Q3CacheItem *ci = keytype == AsciiKey ? dict->find_ascii(key)
-                                         : dict->find_int((long)key);
+                                         : dict->find_int((quintptr)key);
 #if defined(QT_DEBUG)
     lruList->finds++;
@@ -812 +812 @@
 {
     Q3CacheItem *item = it->current();
-    return item ? (long)item->key : 0;
+    return item ? (quintptr)item->key : 0;
 }