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

List:       kde-commits
Subject:    [Soprano] f3adf38: Fix compile with Qt 4.5 where, due to internal reo
From:       Daniel Molkentin <molkentin () kde ! org>
Date:       2010-10-26 12:01:01
Message-ID: 20101026120101.2EC73A6304 () git ! kde ! org
[Download RAW message or body]

commit f3adf385c8a3dc7c84551ef1c30368a9a5fcf14b
branch 2.2
Author: Daniel Molkentin <molkentin@kde.org>
Date:   Wed Sep 24 15:13:58 2008 +0000

    Fix compile with Qt 4.5 where, due to internal reoderings and C++'es stupid \
namespace lookup behaviour, compilation breaks.  Solved by moving the qHash function \
into the soprano namespace.  
    svn path=/trunk/kdesupport/soprano/; revision=864360

diff --git a/index/cluceneindex.cpp b/index/cluceneindex.cpp
index d4c0aae..2c60a6a 100644
--- a/index/cluceneindex.cpp
+++ b/index/cluceneindex.cpp
@@ -41,7 +41,7 @@
 // indexwriter needs to be closed for deletion
 // indexreader needs to be closed after usage of writer
 
-uint qHash( const Soprano::Node& node )
+uint Soprano::qHash( const Soprano::Node& node )
 {
     return qHash( node.toString() );
 }
diff --git a/index/cluceneindex.h b/index/cluceneindex.h
index ecd85bf..8d42e4f 100644
--- a/index/cluceneindex.h
+++ b/index/cluceneindex.h
@@ -259,8 +259,9 @@ namespace Soprano {
             Private* const d;
         };
     }
+
+    uint qHash( const Soprano::Node& node );
 }
 
-uint qHash( const Soprano::Node& node );
 
 #endif
diff --git a/soprano/inference/inferencemodel.cpp \
b/soprano/inference/inferencemodel.cpp index b84424e..cb0f172 100644
--- a/soprano/inference/inferencemodel.cpp
+++ b/soprano/inference/inferencemodel.cpp
@@ -65,7 +65,7 @@ static QUrl createRandomUri()
 // -----------------------------------------------------------------------------------------------------------------------
  #include <QSet>
 #include "statementiterator.h"
-uint qHash( const Soprano::Node& node )
+uint Soprano::qHash( const Soprano::Node& node )
 {
     return qHash( node.toString() );
 }
diff --git a/soprano/inference/inferencemodel.h b/soprano/inference/inferencemodel.h
index 1113eb5..0e095ee 100644
--- a/soprano/inference/inferencemodel.h
+++ b/soprano/inference/inferencemodel.h
@@ -196,8 +196,8 @@ namespace Soprano {
             Private* const d;
         };
     }
-}
 
-uint qHash( const Soprano::Node& node );
+    uint qHash( const Soprano::Node& node );
+}
 
 #endif


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