From kde-commits  Fri May 04 20:55:11 2012
From: Shaun Reich <shaun.reich () kdemail ! net>
Date: Fri, 04 May 2012 20:55:11 +0000
To: kde-commits
Subject: [kde-runtime] nepomuk/services/storage: fix build errors with CLANG/LLVM
Message-Id: <20120504205511.74EC7A60A9 () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=133616505219370

Git commit ac48ea95c7f726b7208b6b6136d97beefe7b06d9 by Shaun Reich.
Committed on 04/05/2012 at 22:54.
Pushed by sreich into branch 'master'.

fix build errors with CLANG/LLVM

M  +3    -3    nepomuk/services/storage/datamanagementmodel.h
M  +1    -1    nepomuk/services/storage/resourcemerger.cpp

http://commits.kde.org/kde-runtime/ac48ea95c7f726b7208b6b6136d97beefe7b06d9

diff --git a/nepomuk/services/storage/datamanagementmodel.h b/nepomuk/servi=
ces/storage/datamanagementmodel.h
index 781fb2c..5d9cbf1 100644
--- a/nepomuk/services/storage/datamanagementmodel.h
+++ b/nepomuk/services/storage/datamanagementmodel.h
@@ -156,7 +156,7 @@ public Q_SLOTS:
                         const QString& app,
                         Nepomuk::StoreIdentificationMode identificationMod=
e =3D Nepomuk::IdentifyNew,
                         Nepomuk::StoreResourcesFlags flags =3D Nepomuk::No=
StoreResourcesFlags,
-                        const QHash<QUrl, QVariant>& additionalMetadata =
=3D QHash<QUrl, QVariant>() );
+                        const QHash<QUrl, QVariant>& additionalMetadata =
=3D (QHash<QUrl, QVariant>()));
 =

     /**
      * Merges two resources into one. Properties from \p resource1
@@ -188,7 +188,7 @@ public Q_SLOTS:
                          const QString& userSerialization =3D QString(),
                          Nepomuk::StoreIdentificationMode identificationMo=
de =3D Nepomuk::IdentifyNew,
                          Nepomuk::StoreResourcesFlags flags =3D Nepomuk::N=
oStoreResourcesFlags,
-                         const QHash<QUrl, QVariant>& additionalMetadata =
=3D QHash<QUrl, QVariant>());
+                         const QHash<QUrl, QVariant>& additionalMetadata =
=3D (QHash<QUrl, QVariant>()));
 =

     /**
      * Describe a set of resources, i.e. retrieve all their properties.
@@ -204,7 +204,7 @@ public Q_SLOTS:
     //@}
 =

 private:
-    QUrl createGraph(const QString& app =3D QString(), const QHash<QUrl, Q=
Variant>& additionalMetadata =3D QHash<QUrl, QVariant>());
+    QUrl createGraph(const QString& app =3D QString(), const QHash<QUrl, Q=
Variant>& additionalMetadata =3D (QHash<QUrl, QVariant>()));
     QUrl createGraph(const QString& app, const QMultiHash<QUrl, Soprano::N=
ode>& additionalMetadata);
 =

     /**
diff --git a/nepomuk/services/storage/resourcemerger.cpp b/nepomuk/services=
/storage/resourcemerger.cpp
index e6f352c..1d49e65 100644
--- a/nepomuk/services/storage/resourcemerger.cpp
+++ b/nepomuk/services/storage/resourcemerger.cpp
@@ -506,7 +506,7 @@ Soprano::Node Nepomuk::ResourceMerger::resolveUnmappedN=
ode(const Soprano::Node&
     m_mappings.insert( QUrl(node.toN3()), newUri );
 =

     // FIXME: trueg: IMHO these statements should instead be added to the =
list of all statements so there is only one place where anything is actuall=
y added to the model
-    Soprano::Node dateTime( Soprano::LiteralValue( QDateTime::currentDateT=
ime() ) );
+    Soprano::Node dateTime =3D Soprano::LiteralValue(QDateTime::currentDat=
eTime());
     m_model->addStatement( newUri, NAO::created(), dateTime, m_graph );
     m_model->addStatement( newUri, NAO::lastModified(), dateTime, m_graph =
);
=20