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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdelibs-4.1-branch/nepomuk/core/ontology
From:       Allen Winter <winter () kde ! org>
Date:       2009-03-09 16:57:26
Message-ID: 1236617846.354104.15253.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 937388 by winterz:

another attempt to fix compilation against qHash() with various Qt's and compilers.



 M  +0 -13     entity.cpp  
 M  +3 -2      entity.h  


--- branches/kdepim/enterprise4/kdelibs-4.1-branch/nepomuk/core/ontology/entity.cpp #937387:937388
@@ -29,19 +29,6 @@
 
 #include <kicon.h>
 
-#if !defined(_MSC_VER) && (QT_VERSION < QT_VERSION_CHECK(4, 5, 0))
-uint qHash( const QUrl& url )
-{
-    return qHash( url.toString() );
-}
-#endif
-
-// uint qHash( const Nepomuk::Types::Entity& c )
-// {
-//     return (uint)(ulong)c.d.data();
-// }
-
-
 Nepomuk::Types::EntityPrivate::EntityPrivate( const QUrl& uri_ )
     : uri( uri_ ),
       available( uri_.isValid() ? -1 : 0 ),
--- branches/kdepim/enterprise4/kdelibs-4.1-branch/nepomuk/core/ontology/entity.h #937387:937388
@@ -127,7 +127,7 @@
             bool isAvailable();
 
             /**
-             * The Types classes are optimized for performance under the 
+             * The Types classes are optimized for performance under the
              * aasumption that ontologies never change during the execution
              * time of an application.
              *
@@ -165,6 +165,7 @@
             QExplicitlySharedDataPointer<EntityPrivate> d;
         };
 
+        uint qHash(int);
         inline uint qHash( const Entity& c )
         {
             return qHash( c.uri().toString() );
@@ -203,7 +204,7 @@
          * The URI of the resource
          */
         QUrl uri() const;
-	    
+
         QString label( const QString& language = QString() ) const;
         QString comment( const QString& language = QString() ) const;
 
[prev in list] [next in list] [prev in thread] [next in thread]