DevHeads.net

Review Request: nepomuk/services/storage/datamanagementmodel.h fix to allow compiling on apple's gcc 4.2.1

Review request for KDE Runtime.

Description
With this patch, nepomuk won't build on MacOSX Lion w/ i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)

IIRC PovAddict helped figure it out on IRC.

In file included from /Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.cpp:23:
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:159: error: expected ‘,’ or ‘...’ before ‘>’ token
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:191: error: expected ‘,’ or ‘...’ before ‘>’ token
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:207: error: expected ‘,’ or ‘...’ before ‘>’ token
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:159: error: wrong number of template arguments (1, should be 2)
/opt/local/include/QtCore/qdatastream.h:66: error: provided for ‘template<class Key, class T> class QHash’
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:159: error: default argument missing for parameter 6 of ‘void Nepomuk::DataManagementModel::storeResources(const Nepomuk::SimpleResourceGraph&, const QString&, Nepomuk::StoreIdentificationMode, Nepomuk::StoreResourcesFlags, const QHash<QUrl, QVariant>&, QVariant)’
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:191: error: wrong number of template arguments (1, should be 2)

Diffs
nepomuk/services/storage/datamanagementmodel.h 2c26161

Diff: <a href="http://git.reviewboard.kde.org/r/102753/diff/diff" title="http://git.reviewboard.kde.org/r/102753/diff/diff">http://git.reviewboard.kde.org/r/102753/diff/diff</a>

Testing

Thanks,

Kurt Hindenburg

Comments

Re: Review Request: nepomuk/services/storage/datamanagementmodel

By Kurt Hindenburg at 10/02/2011 - 10:13

(Updated Oct. 2, 2011, 2:13 p.m.)

Review request for KDE Runtime and Nepomuk.

Description (updated)
Without this patch, nepomuk won't build on MacOSX Lion w/ i686-apple-darwin11-llvm-g++-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)

IIRC PovAddict helped figure it out on IRC.

In file included from /Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.cpp:23:
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:159: error: expected ‘,’ or ‘...’ before ‘>’ token
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:191: error: expected ‘,’ or ‘...’ before ‘>’ token
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:207: error: expected ‘,’ or ‘...’ before ‘>’ token
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:159: error: wrong number of template arguments (1, should be 2)
/opt/local/include/QtCore/qdatastream.h:66: error: provided for ‘template<class Key, class T> class QHash’
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:159: error: default argument missing for parameter 6 of ‘void Nepomuk::DataManagementModel::storeResources(const Nepomuk::SimpleResourceGraph&, const QString&, Nepomuk::StoreIdentificationMode, Nepomuk::StoreResourcesFlags, const QHash<QUrl, QVariant>&, QVariant)’
/Volumes/ExtraHD/Projects/KDE/kde4/trunk/src/kde/kde-runtime/nepomuk/services/storage/datamanagementmodel.h:191: error: wrong number of template arguments (1, should be 2)

Diffs
nepomuk/services/storage/datamanagementmodel.h 2c26161

Diff: <a href="http://git.reviewboard.kde.org/r/102753/diff/diff" title="http://git.reviewboard.kde.org/r/102753/diff/diff">http://git.reviewboard.kde.org/r/102753/diff/diff</a>

Testing

Thanks,

Kurt Hindenburg

Re: Review Request: nepomuk/services/storage/datamanagementmodel

By Commit Hook at 10/05/2011 - 21:07

This review has been submitted with commit b8f67d82f4924eb6b2d2564c79f0379c524bc593 by Kurt Hindenburg to branch KDE/4.7.

- Commit Hook

On Oct. 2, 2011, 2:13 p.m., Kurt Hindenburg wrote:

Re: Review Request: nepomuk/services/storage/datamanagementmodel

By Commit Hook at 10/05/2011 - 18:11

This review has been submitted with commit 7ff19a5e36189f8af6404f69f5b25aa951e9914d by Kurt Hindenburg to branch master.

- Commit Hook

On Oct. 2, 2011, 2:13 p.m., Kurt Hindenburg wrote:

Re: Review Request: nepomuk/services/storage/datamanagementmodel

By Sebastian Trueg at 10/05/2011 - 10:16

Ship it!

I am fine with this. But maybe it would be cleaner to define a typedef instead. In any case make sure you backport to the KDE/4.7 branch and also fix it in nepomuk-core.

- Sebastian Trueg

On Oct. 2, 2011, 2:13 p.m., Kurt Hindenburg wrote:

Re: Review Request: nepomuk/services/storage/datamanagementmodel

By Sebastian Trueg at 10/02/2011 - 06:44

Please add "nepomuk" as group.

- Sebastian Trueg

On Oct. 1, 2011, 4:16 p.m., Kurt Hindenburg wrote: