[meego-commits] 10872: Changes to devel:contentfw/libqttracker
Mishra Maitrey
no_reply at build.meego.com
Mon Dec 13 10:41:41 UTC 2010
Hi,
I have made the following changes to libqttracker in project devel:contentfw. Please review and accept ASAP.
Thank You,
Mishra Maitrey
[This message was auto-generated]
---
Request #10872:
submit: home:maimishr/libqttracker(r5) -> devel:contentfw/libqttracker
Message:
Update to upstream, fixes BMC - 11087
* Mon Dec 13 2010 Maitrey Mishra <ext-maitrey.mishra at nokia.com> - 6.12.4
- Update to upstream, fixes BMC - 11087
- libqttracker doesn't support INSERT/DELETE SILENT
- Not possible to create a "FILTER( false )" in output
- <MemLeak> small memory leaks after open / close image
- nfo::fileSize returns 0 for large files
- call-ui locks up when tracker-store crashes
- libqttracker is built without optimizations
- Massive leak in SopranoLive::BackEnds::Tracker::TrackerService::getRDFGraphCache()
- Not possible to create a "FILTER( false )" in output
- libqttracker doesn't support INSERT/DELETE SILENT
State: new 2010-12-13T02:41:28 maimishr
Comment: None
changes files:
--------------
--- libqttracker.changes
+++ libqttracker.changes
@@ -0,0 +1,12 @@
+* Mon Dec 13 2010 Maitrey Mishra <ext-maitrey.mishra at nokia.com> - 6.12.4
+- Update to upstream, fixes BMC - 11087
+- libqttracker doesn't support INSERT/DELETE SILENT
+- Not possible to create a "FILTER( false )" in output
+- <MemLeak> small memory leaks after open / close image
+- nfo::fileSize returns 0 for large files
+- call-ui locks up when tracker-store crashes
+- libqttracker is built without optimizations
+- Massive leak in SopranoLive::BackEnds::Tracker::TrackerService::getRDFGraphCache()
+- Not possible to create a "FILTER( false )" in output
+- libqttracker doesn't support INSERT/DELETE SILENT
+
old:
----
libqttracker-6.12.1.tar.bz2
new:
----
libqttracker-6.12.4.tar.bz2
spec files:
-----------
--- libqttracker.spec
+++ libqttracker.spec
@@ -7,7 +7,7 @@
Name: libqttracker
Summary: Qt bindings for the Tracker media indexing infrastructure
-Version: 6.12.1
+Version: 6.12.4
Release: 1
Group: System/Libraries
License: LGPLv2
@@ -89,7 +89,8 @@
sed -i 's,-L/home/abuild/[^ ]*,,' %{buildroot}/%{_libdir}/pkgconfig/*.pc
# << install post
%fdupes %{buildroot}/%{_includedir}
-
+chmod 0755 %{buildroot}/%{_datadir}/libqttracker-tests/benchmarking/runall.py
+mv %{buildroot}/%{_datadir}/libqttracker-tests %{buildroot}/%{_libdir}/libqttracker-tests
%post -p /sbin/ldconfig
@@ -126,6 +127,6 @@
%{_bindir}/mafwsuite
%{_bindir}/qttracker-perf-tests
%{_bindir}/qttracker-unit-tests
-%{_datadir}/libqttracker-tests/*
+%{_libdir}/libqttracker-tests/*
# << files tests
other changes:
--------------
++++++ libqttracker-6.12.1.tar.bz2 -> libqttracker-6.12.4.tar.bz2
--- .git/HEAD
+++ .git/HEAD
@@ -1 +1 @@
-ref: refs/heads/test-branch
+ref: refs/heads/m-branch
!!! .git/index and .git/index differ
--- .git/logs/HEAD
+++ .git/logs/HEAD
@@ -1,2 +1,2 @@
-0000000000000000000000000000000000000000 696434281a915d296cb9190fc25a63ba90361a22 maimishr <ext-maitrey.mishra at nokia.com> 1289833397 +0200 clone: from git at gitorious.org:maemo-af/libqttracker.git
-696434281a915d296cb9190fc25a63ba90361a22 e099ecc787c927ad1fce236d13fdce7a2c6f7fc2 maimishr <ext-maitrey.mishra at nokia.com> 1289833485 +0200 checkout: moving from master to test-branch
+0000000000000000000000000000000000000000 0e83e0bef98083001744d90635e5a9e03fff2065 maimishr <ext-maitrey.mishra at nokia.com> 1291708543 +0200 clone: from git at gitorious.org:maemo-af/libqttracker.git
+0e83e0bef98083001744d90635e5a9e03fff2065 bcde14887cde13935749fac395cb6483e0d1e6e5 maimishr <ext-maitrey.mishra at nokia.com> 1291709188 +0200 checkout: moving from master to m-branch
--- .git/logs/refs/heads/m-branch
+++ .git/logs/refs/heads/m-branch
+0000000000000000000000000000000000000000 bcde14887cde13935749fac395cb6483e0d1e6e5 maimishr <ext-maitrey.mishra at nokia.com> 1291709188 +0200 branch: Created from 1pre6.12.4
--- .git/logs/refs/heads/master
+++ .git/logs/refs/heads/master
@@ -1 +1 @@
-0000000000000000000000000000000000000000 696434281a915d296cb9190fc25a63ba90361a22 maimishr <ext-maitrey.mishra at nokia.com> 1289833397 +0200 clone: from git at gitorious.org:maemo-af/libqttracker.git
+0000000000000000000000000000000000000000 0e83e0bef98083001744d90635e5a9e03fff2065 maimishr <ext-maitrey.mishra at nokia.com> 1291708543 +0200 clone: from git at gitorious.org:maemo-af/libqttracker.git
--- .git/logs/refs/heads/test-branch
+++ .git/logs/refs/heads/test-branch
-0000000000000000000000000000000000000000 e099ecc787c927ad1fce236d13fdce7a2c6f7fc2 maimishr <ext-maitrey.mishra at nokia.com> 1289833485 +0200 branch: Created from 1pre6.12.1
--- .git/packed-refs
+++ .git/packed-refs
@@ -1,10 +1,8 @@
# pack-refs with: peeled
86959e03b42c8824bea4a063b573301623b3c909 refs/tags/test_1pre6.5.3.1tracker0.7.28
^573dfd6fd6ec02243c9407636d47a9ba61e1a84e
-bcbf4868a99305f10ced027982cb22d200e2aa3b refs/tags/test1pre6.12.1
-^e099ecc787c927ad1fce236d13fdce7a2c6f7fc2
-157e9afcfcc145945117888f801e2b43dca8f1cd refs/tags/test1pre6.12.0
-^95e0593bcb779f536ccc7874ceea0905d235e8eb
+da409350996d059df24a033b0e3c3608ce510f20 refs/tags/test1pre6.12.6
+^8675b4844acc7f590afdec9829a0151a99d1051f
e81109e84b560e6065a397e12cbe0c40bc71f2ad refs/tags/fake_1pre6.5.3_fixes_160210_2nd_attempt
c7fbb55152d4056496caed5cf4d5e52c99675ccc refs/tags/fake_1pre6.5.3_fixes_160210
7e6318c39acf8a484c24021212d25dcb61236d4a refs/tags/1pre6.9.8+1
@@ -50,6 +48,14 @@
5fd1ff97b0200896a47cafb121465ad63a408b9d refs/tags/1pre6.2.2
6da665a4409d63643774f84030a924bfdf00a1b7 refs/tags/1pre6.2.1
1eb189be60880e9fcc02f9ecd856f9252b081a3b refs/tags/1pre6.2.0
+92f651b3fdbd143fcc7e14fa010c44c402e27a90 refs/tags/1pre6.12.5
+^de3d68730ddf98702743b26c3137f2d0f2525240
+5cf3ea6f475238ccbf923146ebebb5ab1cecf556 refs/tags/1pre6.12.4
+^bcde14887cde13935749fac395cb6483e0d1e6e5
+a356fe477033bbef8ad7e48103514a2d1fe89d94 refs/tags/1pre6.12.3
+^9a0a3f82c09bce71afed15f9eb7272c2d293b157
+272645a09292fe3d4e4cbc379fd884c3af4a0162 refs/tags/1pre6.12.1.1
+^656a351a8b9cb898b01ee3b6f36f1e856366a5d7
4156616f3be24615dc1e82cdd69bd43b7b47adaa refs/tags/1pre6.12.1
^e099ecc787c927ad1fce236d13fdce7a2c6f7fc2
5c6e803be1583de7afd36a8b95dfb0ee1dbf495a refs/tags/1pre6.11.2
@@ -75,12 +81,12 @@
3a2ea407107cddb085a5bd315c079d3de39ca763 refs/tags/0.1.2
9ccbabf61f3e5ea3bfc5f4bb5a4d2b784fddc174 refs/remotes/origin/work_performance
46b4d5d9af7ac7e7b19fc26e051efe9e0b2a414b refs/remotes/origin/work_1pre6.7.1_m01_fixes_163512
-9ff5e6d8402f437932a6d25e8ac325d5df16ebf7 refs/remotes/origin/wip_tracker_access_qsparql
+dfa2e72ffa178c531b0424e8945569f80ac954d5 refs/remotes/origin/wip_tracker_access_qsparql
0f1e9648aa10c5afd7606246703376963b714232 refs/remotes/origin/wip_test_patch_for_scratchbox
ee7192ba773198e8324c5225052782c5f90522ac refs/remotes/origin/wip_modeltest
a220b7c2769cc740187417c9cbd0f3e8a00e4213 refs/remotes/origin/wip_graph_update_signals
d78a209160e9c9fb08d4f8ac14fd4b6a80cf3282 refs/remotes/origin/wip_fleximap
-0a9a1d9208fc8918f12501807c275cd898db7af7 refs/remotes/origin/wip_direct_access
+7541a71264bc1d184fa08901bad4096a17aa9ca1 refs/remotes/origin/wip_fixes_206261
d13f6f2e82311af8a08688c0479c91bcd894576a refs/remotes/origin/wip_1pre7
1b6ab1f0556a364cc5b08279738a6fdbddaf4314 refs/remotes/origin/v1pre6.5.0
2387de00766b451b4b768471b602fd92fee4b6aa refs/remotes/origin/v1pre6.4.2
@@ -89,7 +95,6 @@
6c4f58c72cb6b74847fcf66f7ab172c7d2d82af1 refs/remotes/origin/v1pre6.3.5
fbe3c834b982bb3fe75370b026e9f1170d199e7c refs/remotes/origin/testadditions
1c2519b14a5207d41604c69eeeaf8c33a742db83 refs/remotes/origin/sparsevector
-2a17c0f73805c00813057b16211922a88183e151 refs/remotes/origin/review_1pre6.7.1_i08_fixes_164935_live_mode_doesnt_work_for_union
6df02d4ccb2b9fb53f48bb860631f8add2840647 refs/remotes/origin/review_1pre6.7.0_m01_fixes_163512_update_results
4d1e68c7bb2531332ea5547d3bfeded7e973e2ff refs/remotes/origin/review_1pre6.7.0_i04_fixes_163508_blank_node_support
ffba2187b938e33d6d2ebfdb0f36c07c81bcf1cb refs/remotes/origin/review_1pre6.7.0_i03_adds_non_column_group_by_support
@@ -109,25 +114,22 @@
1db064e5bfaab47c3e50739877a830bb13fa1953 refs/remotes/origin/rebase_1pre6.9.8_i03_fixes_176754_datachanged_after_refreshmodel_indicates_whole_row
80ceefd4d09768e8056c73af7a3f88e7d5798030 refs/remotes/origin/rebase_1pre6.9.8_i02_fixes_176926_strange_output_for_literal_columns
6ad66f98932cc710403d0cc8905539dff26775e4 refs/remotes/origin/rebase_1pre6.9.8_i01_fixes_176925_requires_rtti_by_default
-cec3f905e7cd1356345be58a5d2c88b43ef6642a refs/remotes/origin/rebase_1pre6.9.3_i04_fixes_160660_tracker_sync_needed_in_libqttracker
-c97aad65aee9d89e7ac04fe515b11ffabb2f2ea8 refs/remotes/origin/rebase_1pre6.9.3_i03_fixes_172263_syntax_error_with_streaming_query
-3b690688ed28a5ee8f8b9d9f70f99736d5c9ff6d refs/remotes/origin/rebase_1pre6.9.3_i02_fixes_160660_tracker_sync_needed
f812e34c6428122f21d2eba00210bf0b0cdacc94 refs/remotes/origin/rebase_1pre6.9.1_mjd05_performance_test_result_page_update_001
-4c8d328fc839063aa3b272a3365746398a252e26 refs/remotes/origin/rebase_1pre6.9.1_mjd01_sparse-vector-unit-tests_001
597d8bb31905be77f8261caa6a52100843c29f0b refs/remotes/origin/rebase_1pre6.9.1_full_tracker_id_streaming_support
a711a560c3165226838e1e433294e416f4f01efe refs/remotes/origin/rebase_1pre6.8.5_i02_i01_164935_livenodemodel_update_infinite_loop
908664b747e1b805e70292cc8085f9d2350a8005 refs/remotes/origin/rebase_1pre6.8.4_replace_vecvecmapstrstr_with_typedef
107ec9e406391a4e92b0283251b57ab323826ff4 refs/remotes/origin/rebase_1pre6.8.1_mjd01_unit_tests_for_rdf_graph_001
-a484d879a6429d0b41aa908d6c9db85623ef2b2f refs/remotes/origin/rebase_1pre6.8.1_mjd01_unit_tests_for_bug_reports_002
-ad75365ec3a19e61507d7214577346757dbb2747 refs/remotes/origin/rebase_1pre6.8.1_mjd01_unit_tests_for_bug_reports_001
60e56959880b713f9e77d5474b9080ecc61a2402 refs/remotes/origin/rebase_1pre6.7.1_i13_fixes_165859_tags_get_added_automatically
+25863522a7d4c0d947fe66935c1492b4747051a2 refs/remotes/origin/rebase_1pre6.12.5_i01_fixes_191946_memory_leaks_when_adding_sms_messages
+9b31810150ac688feda89a0dd06530772e8be33b refs/remotes/origin/rebase_1pre6.12.3_mjd07_benchmarks_use_qwarn_001
b2d76ea98d5f673d3c69ce7b1d9ca80a6db5ab7a refs/remotes/origin/rebase_1pre6.12.2_i02_visualizer_and_fixes_159383
d7e4e85fd13ba6cd8069f9e5ce3a0a6534d8a90d refs/remotes/origin/rebase_1pre6.12.2_i02_fixes_159383_small_memory_leaks_after_open_close_image
edfd01b2cff0bb046f488da0409ef8ec532c2dd5 refs/remotes/origin/rebase_1pre6.12.2_i01_fixes_193173_197096
92465037065e7ace31a5291c4fff795a8d7a4554 refs/remotes/origin/rebase_1pre6.11.2_t01_increasing_coverage
c4270eebe2d65f5fba73156cfb2dc7b756d8637a refs/remotes/origin/rebase_1pre6.10.2_mjd04_benchmark_updates_002
+e849aaea0db3c3890145c2ea4ca41d64776df028 refs/remotes/origin/qttracker-aegis
b0bf811622726310bafe54c65d857fdc5e67dd51 refs/remotes/origin/merge_1pre6.12.1_isolating_dbus_dependencies_from_content_module
-696434281a915d296cb9190fc25a63ba90361a22 refs/remotes/origin/master
+0e83e0bef98083001744d90635e5a9e03fff2065 refs/remotes/origin/master
509260cc99361429932bac2c8a4518a131705dad refs/remotes/origin/mafw
7615c757c5ba3ce2bb79eadc1c45da130e0403a7 refs/remotes/origin/logging
60d5fa1ee0bae28f63a4c31e10255850c28d6d68 refs/remotes/origin/lifetime_domain
--- .git/refs/heads/m-branch
+++ .git/refs/heads/m-branch
+bcde14887cde13935749fac395cb6483e0d1e6e5
--- .git/refs/heads/master
+++ .git/refs/heads/master
@@ -1 +1 @@
-696434281a915d296cb9190fc25a63ba90361a22
+0e83e0bef98083001744d90635e5a9e03fff2065
--- .git/refs/heads/test-branch
+++ .git/refs/heads/test-branch
-e099ecc787c927ad1fce236d13fdce7a2c6f7fc2
--- INSTALL
+++ INSTALL
@@ -4,7 +4,7 @@
qmake CONFIG+=coverage # to allow code coverage measurement
qmake CONFIG+=timestamps # to print timestamps at certain key places
qmake CONFIG+=profile # to build with profiling enabled
- qmake CONFIG+=noopt # to build without optimizations
+ qmake CONFIG+=noopt # to build without optimizations, debug mode
Then the following make targets are available in the top level directory:
--- debian/changelog
+++ debian/changelog
@@ -1,6 +1,38 @@
+libqttracker (1~6.12.4) unstable; urgency=low
+
+ * debian: Aegis security framework integration for test cases
+
+ -- Jean-Luc Lamadon <jean-luc.lamadon at nokia.com> Wed, 24 Nov 2010 13:09:38 +0200
+
+libqttracker (1~6.12.3) unstable; urgency=low
+
+ * Fixes: NB#197096 - libqttracker doesn't support INSERT/DELETE SILENT
+ * Fixes: NB#193973 - Not possible to create a "FILTER( false )" in output
+ * Fixes: NB#159383 - <MemLeak> small memory leaks after open / close image
+
+ -- Jean-Luc Lamadon <jean-luc.lamadon at nokia.com> Tue, 23 Nov 2010 14:36:42 +0200
+
+libqttracker (1~6.12.2) unstable; urgency=low
+
+ * Fixes: NB#193607 - nfo::fileSize returns 0 for large files
+ * Fixes: NB#197867 - call-ui locks up when tracker-store crashes
+ * Fixes: NB#203307 - libqttracker is built without optimizations
+ * Fixes: NB#175281 - Massive leak in SopranoLive::BackEnds::Tracker::TrackerService::getRDFGraphCache()
+ * Fixes: NB#193973 - Not possible to create a "FILTER( false )" in output
+ * Fixes: NB#197096 - libqttracker doesn't support INSERT/DELETE SILENT
+
+ -- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Wed, 03 Nov 2010 15:14:10 +0200
+
+libqttracker (1~6.12.1.1) unstable; urgency=low
+
+ * Fixes: NB#192152 - libqttracker: add pkg-config to build-deps
+
+ -- Jean-Luc Lamadon <jean-luc.lamadon at nokia.com> Tue, 16 Nov 2010 23:38:34 +0200
+
libqttracker (1~6.12.1) unstable; urgency=low
* Returns localDebug, localWarning and localCritical temporarily
+ * Fixes: NB#168049 - Require an environment variable for setting tracker/qttracker log level
-- Jean-Luc Lamadon <jean-luc.lamadon at nokia.com> Tue, 19 Oct 2010 17:38:41 +0300
@@ -186,7 +218,7 @@
libqttracker (1~6.5.2) unstable; urgency=low
* Fixes streaming mode with descending optionals
- * Implements model canFetchMore and fetchMore
+ * Implements model canFetchMore and fetchMore
* Fixes: NB#160671 - Crash while trying to save contact to tracker
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Tue, 16 Mar 2010 15:05:08 +0200
@@ -218,7 +250,7 @@
libqttracker (1~6.4.2) unstable; urgency=low
* Updates tracker ontologies
- * Fixes ontology generation issues with newest additions
+ * Fixes ontology generation issues with newest additions
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Wed, 24 Feb 2010 13:23:24 +0200
@@ -281,7 +313,7 @@
* Adds tracker property expression support by RDFVariable::function
* Updates tracker ontologies
* Fixes: NB#152709 - SopranoLive::LiveNodes.model() does not emit modelUpdated() signal
- * Adds tracker backend RDFStrategy::Running behaviour
+ * Adds tracker backend RDFStrategy::Running behaviour
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Wed, 13 Jan 2010 18:47:06 +0200
@@ -297,14 +329,14 @@
libqttracker (1~6.3.0) unstable; urgency=low
- * Remove me when releasing, add new items below
+ * Remove me when releasing, add new items below
* Fixes: NB#146962 - LiveNodeModel::setData(...) causes a segmentation fault
* Adds stress test suite and test cases
* Fixes: NB#147673 - Union queries fail randomly
* Adds local writable model support
* Fixes: NB#144665 - When trying to get Medialist's fileLastAccessed as optional tracker doesn't return anything
* Adds RDFVariable::mergeUnion
- * Documentation improvements
+ * Documentation improvements
* Adds RDFVariable::DeepCopier
* Updated tracker ontologies
* Implemented: SWP#MCoFr-376 . QAbstractItemModel tree recursion for cached properties
@@ -313,7 +345,7 @@
libqttracker (1~6.2.2) unstable; urgency=low
- * Updated tracker ontologies
+ * Updated tracker ontologies
-- Iridian Kiiskinen <iridian at iribuntu> Mon, 23 Nov 2009 14:35:58 +0200
@@ -351,7 +383,7 @@
* Fixes: NB#135633 - filter("str").contains() fails for strings with escape characters
* Fixes: NB#132687 - Removing rows from a LiveNodeModel causes a segmentation fault
* Fixes: NB#136713 - metaAddCachedObject() breaks query
- * Bugs below this line have been fixed in earlier release, but weren't checked and closed.
+ * Bugs below this line have been fixed in earlier release, but weren't checked and closed.
* Fixes: NB#119505 - Resource nmm::MusicAlbum::iri() not found from an album
* Fixes: NB#124245 - tracker()->modelQuery() causes an assertion in Qt when there is no D-Bus session bus running
* Fixes: NB#135504 - Subdirectory 'domains' missing fron libqttracker-dev
@@ -380,7 +412,7 @@
* Fixed layer structure transparency issues, where accesses bypassed cache where they should not have
* Small documentation improvements
* Mafw backend: fixed handling of missing property in browse
- * Updated tracker ontologies
+ * Updated tracker ontologies
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Wed, 09 Sep 2009 19:47:18 +0300
@@ -391,7 +423,7 @@
* Added eighth main test
* Added LiveNodeModel::(strict)live+Node/Resource-family
* Added tag domain functions hasAllTags and hasAnyTag
- * Reduced spurious inserts by adding strictLive functionality
+ * Reduced spurious inserts by adding strictLive functionality
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Mon, 07 Sep 2009 15:28:36 +0300
@@ -442,7 +474,7 @@
libqttracker (1~5.1.0) unstable; urgency=low
* Second stage of cached properties: roughyl final API, but implementation disabled
- * Added: transactions
+ * Added: transactions
* Updated email example to reflect the transactions and cached properties
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Mon, 17 Aug 2009 04:50:52 +0300
@@ -456,13 +488,13 @@
libqttracker (1~5.0.2) unstable; urgency=low
* Ontology update
- * Bugfix with RDFVariable::subject
+ * Bugfix with RDFVariable::subject
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Fri, 07 Aug 2009 19:05:33 +0300
libqttracker (1~5.0.1) intrepid; urgency=low
- * Added tracker dbus versioning support causing fromType to fail
+ * Added tracker dbus versioning support causing fromType to fail
* Fixed a regression bug with RDFVariable
* Fixed couple minor syntactic issues preventing compilation in scratchbox
@@ -473,7 +505,7 @@
* ABI break
* Preparing for property cache migration
* Added StrictLive functionality
- * Automated reading custom ontologies from the rdf-xml in rdf_namespaces.py
+ * Automated reading custom ontologies from the rdf-xml in rdf_namespaces.py
* Updated ontologies
* A lot of minor additions
* Fixed: Harmattan#129008
@@ -484,7 +516,7 @@
libqttracker (1~4.0.6) unstable; urgency=low
* Fixed: bug with RDFVariable::child and unconstrained variables
- * Added: better debug output when not connected to dbus
+ * Added: better debug output when not connected to dbus
* Added: RDFVariable::isBound
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Tue, 23 Jun 2009 17:55:30 +0300
@@ -502,14 +534,14 @@
libqttracker (1~4.0.3) unstable; urgency=low
* Fixed: issues with raw string query
- * Internal refactoring with live properties.
+ * Internal refactoring with live properties.
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Fri, 12 Jun 2009 17:12:55 +0300
libqttracker (1~4.0.2) unstable; urgency=low
* Bugfix: Tracker::ClassUpdateSignaler now correctly bound to backend
- * Added: first* family of functions
+ * Added: first* family of functions
* Small documentation updates and additions
* Greatly improved LiveNodes documentation (as in, it exists now)
@@ -518,13 +550,13 @@
libqttracker (1~4.0.1) unstable; urgency=low
* Bugfix: mafw getObjectId
- * Bugfix: live.h plain inclusion causing breakage with QStringList not included
+ * Bugfix: live.h plain inclusion causing breakage with QStringList not included
-- Iridian <ext-iridian.kiiskinen at nokia.com> Wed, 10 Jun 2009 12:14:02 +0300
libqttracker (1~4.0.0) unstable; urgency=low
- * Major unstable version update to 0+4
+ * Major unstable version update to 0+4
* Updated ontologies
* Implemented: SWP#MCoFr-253 . Async call
* Implemented: SWP#MCoFr-255 . Live properties
@@ -534,7 +566,7 @@
* Implemented: SWP#MCoFr-259 . Model transition (livenode model -> transition to another model)
* Implemented: SWP#MCoFr-261 . RDFVariable filter function support
* Too many smaller changes to list
-
+
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Mon, 08 Jun 2009 12:11:23 +0300
libqttracker (0.3.3) unstable; urgency=low
@@ -571,7 +603,7 @@
* Implemented: SWP#MCoFR-67
* Implemented: SWP#MCoFR-66
* Implemented: SWP#MCoFR-171
- * Implemented: SWP#MCoFR-196
+ * Implemented: SWP#MCoFR-196
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Thu, 09 Apr 2009 11:30:50 +0300
@@ -580,7 +612,7 @@
* Implemented: SWP#MCoFr-196
* Fixed a bug in tracker-browser with custom queries.
* Updated tracker ontologies.
- * Updated documentation to include range information.
+ * Updated documentation to include range information.
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Mon, 23 Mar 2009 14:20:01 +0200
@@ -591,7 +623,7 @@
* Fixed a bug with rdfpattern unions
* Updated ontologies to reflect tracker, with nco:has* cardinalities fixed
* Added couple examples into examples/queries.cpp
-
+
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Thu, 12 Mar 2009 14:43:52 +0200
libqttracker (0.2.4) unstable; urgency=low
@@ -631,7 +663,7 @@
libqttracker (0.2) unstable; urgency=low
- * Complete rewrite for the tracker decomposed version with expanded scope
+ * Complete rewrite for the tracker decomposed version with expanded scope
-- Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com> Fri, 23 Jan 2009 16:08:28 +0200
@@ -640,4 +672,4 @@
* Initial packaging
-- Otto Kopra <otto.kopra at nokia.com> Wed, 29 Oct 2008 13:44:49 +0200
-
+
--- debian/control
+++ debian/control
@@ -2,7 +2,13 @@
Section: libs
Priority: extra
Maintainer: Iridian Kiiskinen <ext-iridian.kiiskinen at nokia.com>
-Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.6), doxygen, testhelper, uuid-dev
+Build-Depends: debhelper (>= 5),
+ libqt4-dev (>= 4.6),
+ doxygen,
+ testhelper,
+ uuid-dev,
+ pkg-config,
+ aegis-builder (>= 1.4)
Standards-Version: 3.7.3
Package: libqttracker-dev
--- debian/libqttracker-tests.aegis
+++ debian/libqttracker-tests.aegis
+<aegis>
+ <request>
+ <credential name="TrackerReadAccess" />
+ <credential name="TrackerWriteAccess" />
+ <credential name="tracker::tracker-miner-fs-access" />
+ <credential name="tracker::tracker-extract-access" />
+ <credential name="GRP::metadata-users" />
+ <for path="/usr/bin/qttracker-unit-tests" />
+ </request>
+ <request>
+ <credential name="TrackerReadAccess" />
+ <credential name="TrackerWriteAccess" />
+ <credential name="tracker::tracker-miner-fs-access" />
+ <credential name="tracker::tracker-extract-access" />
+ <credential name="GRP::metadata-users" />
+ <for path="/usr/bin/qttracker-perf-tests" />
+ </request>
+ <request>
+ <credential name="TrackerReadAccess" />
+ <credential name="TrackerWriteAccess" />
+ <credential name="tracker::tracker-miner-fs-access" />
+ <credential name="tracker::tracker-extract-access" />
+ <credential name="GRP::metadata-users" />
+ <for path="/usr/share/libqttracker-tests/benchmarking/runall.py" />
+ </request>
+</aegis>--- debian/libqttracker-tests.install
+++ debian/libqttracker-tests.install
@@ -1,3 +1,4 @@
usr/bin/*
usr/share/libqttracker-tests/tests.xml
usr/share/libqttracker-tests/data/*
+usr/share/libqttracker-tests/benchmarking/*
--- debian/rules
+++ debian/rules
@@ -45,6 +45,7 @@
dh_gencontrol
dh_md5sums
dh_builddeb
+ aegis-deb-add -control debian/libqttracker-tests/DEBIAN/control .. debian/libqttracker-tests.aegis=_aegis
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
--- shared.pri
+++ shared.pri
@@ -2,7 +2,7 @@
LIBRARYNAME_LC = qttracker
PACKAGENAME = libqttracker
-VERSION = 1~6.12.1
+VERSION = 1~6.12.4
# use format VVBBMM where VV = major version, BB = abi/prerelease version, MM = feature version.
# Minor/bugfix versions are ignored.
@@ -21,11 +21,12 @@
isEmpty(PREFIX): PREFIX = /usr/local
top_srcdir = $$PWD
INCLUDEPATH = $$top_srcdir/src/include $$top_srcdir/src/include/qt4
-CONFIG += debug qt depend_includepath warn_on nostrip
+CONFIG += release qt depend_includepath warn_on nostrip
unix:CONFIG += hide_symbols
QT = core
QMAKE_LIBDIR = $$top_srcdir/lib
noopt {
- QMAKE_CXXFLAGS += -O0
+ CONFIG -= release
+ CONFIG += debug
}
--- src/backends/tracker/dbus/asyncdbusinterface.cpp
+++ src/backends/tracker/dbus/asyncdbusinterface.cpp
+/*
+ * Copyright (C) 2008, 2009 Nokia Corporation.
+ *
+ * Contact: Marius Vollmer <marius.vollmer at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include "asyncdbusinterface.h"
+#include <QObject>
+#include <QDBusConnection>
+#include <QString>
+
+/*!
+ \class AsyncDBusInterface
+
+ \brief This is a workaround for QtDBus to be asynchronous.
+
+ In QtDBus, the QDBusInterface class which the developer is supposed
+ to use makes introspection calls synchronously. It is not clear
+ (and not documented), what is the benefit of these introspection
+ calls, probably invalid use and some errors are catched earlier if
+ introspection data is available.
+
+ However this introspection data is requested synchronously, so
+ constructing a new QDBusInterface can block your thread if the
+ endpoint serving that introspection data on D-Bus is stuck.
+
+ ContextKit tries to be asynchronous, so this behavior of
+ QDBusInterface is unacceptable and this is why
+ QDBusAbstractInterface has to be used instead (it is simpler, it
+ doesn't use introspection at all).
+
+ Unfortunately QDBusAbstractInterface only has a protected
+ constructor, so we need this wrapper class, which makes that
+ constructor available to us.
+
+ So this class is internal to ContextKit, it is distributed only,
+ because we use it in several subprojects, do not use it through
+ ContextKit. If you find this useful, copy the source instead.
+*/
+AsyncDBusInterface::AsyncDBusInterface(const QString &service, const QString &path,
+ const QString &interface,
+ const QDBusConnection &connection,
+ QObject *parent)
+ : QDBusAbstractInterface(service, path, interface.toLatin1().data(), connection, parent)
+{
+}
--- src/backends/tracker/dbus/asyncdbusinterface.h
+++ src/backends/tracker/dbus/asyncdbusinterface.h
+/*
+ * Copyright (C) 2008, 2009 Nokia Corporation.
+ *
+ * Contact: Marius Vollmer <marius.vollmer at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef ASYNCDBUSINTERFACE_H
+#define ASYNCDBUSINTERFACE_H
+
+class QString;
+class QObject;
+class QDBusConnection;
+
+#include <QDBusAbstractInterface>
+
+class AsyncDBusInterface : public QDBusAbstractInterface
+{
+public:
+ AsyncDBusInterface(const QString &service, const QString &path,
+ const QString &interface,
+ const QDBusConnection &connection,
+ QObject *parent = 0);
+};
+#endif
--- src/backends/tracker/dbus/tracker_resources.h
+++ src/backends/tracker/dbus/tracker_resources.h
@@ -22,20 +22,26 @@
#include "dbus_types.h"
#include <QtTracker/Tracker>
-
+#include "../../../utils/visualizer.h"
/*
* Proxy class for interface org.freedesktop.Tracker1.Resources
*/
class TrackerNodesProxy: public QDBusAbstractInterface
{
Q_OBJECT
+
+ /* VZR_CLASS(TrackerNodesProxy, (QDBusAbstractInterface));*/
+
public:
static inline const char *staticInterfaceName()
{ return "org.freedesktop.Tracker1.Resources"; }
public:
- QString service_, path_;
- QDBusConnection connection_;
+ QString service_; // VZR_MEMBER
+
+ QString path_; // VZR_MEMBER
+ QDBusConnection connection_; // VZR_MEMBER
+
TrackerNodesProxy(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
~TrackerNodesProxy();
--- src/backends/tracker/dbus/trackeraccessdbus.cpp
+++ src/backends/tracker/dbus/trackeraccessdbus.cpp
+/*
+ * This file is part of libqttracker project
+ *
+ * Copyright (C) 2009-2010, Nokia
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "trackeraccessdbus.h"
+#include "dbus_types.h"
+#include "../tracker_p.h"
+#include <QDBusPendingCallWatcher>
+#include <QString>
+
+Q_DECLARE_METATYPE(QEventLoop::ProcessEventsFlags)
+
+namespace SopranoLive
+{
+ namespace BackEnds
+ {
+ namespace Tracker
+ {
+ TrackerAccessDbus::TrackerAccessDbus(QSharedPointer<TrackerService> service, QueryType queryType) :
+ pending_completion_watcher_(false), queryType_(queryType), service_(service)
+ {
+ }
+
+ void TrackerAccessDbus::startQuery(const QString& query)
+ {
+ content_reply_ = QSharedPointer<QDBusPendingReply<> >(new QDBusPendingReply<>
+ (service_->resources.SparqlQuery(query)));
+ completion_watcher_ = QSharedPointer<QDBusPendingCallWatcher>
+ (new QDBusPendingCallWatcher(*content_reply_), &QObject::deleteLater);
+
+ connect(completion_watcher_.data()
+ , SIGNAL(finished(QDBusPendingCallWatcher*)), SIGNAL(queryCompleted()));
+ }
+
+ void TrackerAccessDbus::abort()
+ {
+ if(content_reply_ && !content_reply_->isFinished()) content_reply_.clear();
+ completion_watcher_.clear();
+ pending_completion_watcher_ = false;
+ }
+
+ void TrackerAccessDbus::reset()
+ {
+ if(content_reply_ && content_reply_->isFinished()) content_reply_.clear();
+ }
+
+ void TrackerAccessDbus::waitForQueryComplete()
+ {
+ // The while is here because TrackerUpdateModule might have multi-step
+ // completion cycle. Specifically when Sync is requested, the first step is to wait
+ // for the update query to finish, which calls TrackerUpdateModule::rynSync.
+ // This sets up a new completion_watcher_ which waits for tracker.Sync to finish.
+
+ while(completion_watcher_ && !pending_completion_watcher_
+ && !completion_watcher_->isFinished())
+ {
+ pending_completion_watcher_ = true;
+
+ PERF_EVENT("before_completion_wait %d", query_id_);
+
+ QSharedPointer<QDBusPendingCallWatcher> watcher = completion_watcher_;
+ service_->waitForFinished(*watcher);
+
+ PERF_EVENT("after_completion_wait %d", query_id_);
+
+ pending_completion_watcher_ = false;
+ }
+ }
+
+ bool TrackerAccessDbus::isWaitingForQueryComplete() const
+ {
+ return pending_completion_watcher_;
+ }
+
+ TrackerQueryResult TrackerAccessDbus::takeQueryResult()
+ {
+ const bool finished = completion_watcher_ ? completion_watcher_->isFinished() : false;
+ const bool error = isError();
+ TrackerQueryResult result(finished, error, errorMessage());
+ if(finished && !error)
+ {
+ switch(queryType_)
+ {
+ case SELECT:
+ {
+ result.setSelectResult(QDBusPendingReply<QVector<QStringList> > (*content_reply_).value());
+ break;
+ }
+ case UPDATE:
+ {
+ result.setUpdateResult(QDBusPendingReply<UpdateResultOperations>(*content_reply_).value());
+ break;
+ }
+ case MUTE:
+ // Do not access query result
+ break;
+ }
+ }
+
+ if(finished)
+ {
+ completion_watcher_.clear();
+ content_reply_.clear();
+ }
+
+ return result;
+ }
+
+ bool TrackerAccessDbus::isError() const
+ {
+ const bool content_error = content_reply_ ? content_reply_->isError() : true;
+ const bool watcher_error = completion_watcher_ ? completion_watcher_->isError() : true;
+ return(content_error || watcher_error);
+ }
+
+ QString TrackerAccessDbus::errorMessage() const
+ {
+ if(content_reply_ && content_reply_->isError())
+ return content_reply_->error().message();
+ else if(completion_watcher_ && completion_watcher_->isError())
+ return completion_watcher_->error().message();
+ else
+ return QString();
+ }
+
+ }
+ }
+}
+
--- src/backends/tracker/dbus/trackeraccessdbus.h
+++ src/backends/tracker/dbus/trackeraccessdbus.h
+/*
+ * This file is part of libqttracker project
+ *
+ * Copyright (C) 2009-2010, Nokia
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef TRACKERACCESSDBUS_H
+#define TRACKERACCESSDBUS_H
+
+#include <QSharedPointer>
+#include <QDBusPendingReply>
+#include "../trackeraccess.h"
+
+namespace SopranoLive
+{
+ namespace BackEnds
+ {
+ namespace Tracker
+ {
+ class TrackerService;
+
+
+ /*!
+ * Implementation of interface TrackerAccess for Dbus.
+ */
+ class TrackerAccessDbus : public TrackerAccess
+ {
+ /* VZR_CLASS(TrackerAccessDbus, (TrackerAccess));*/
+
+ bool pending_completion_watcher_; // VZR_MEMBER
+ QueryType queryType_; // VZR_MEMBER
+
+
+ public:
+ QSharedPointer<TrackerService> service_; // VZR_MEMBER
+
+ QSharedPointer<QDBusPendingReply<> > content_reply_; // VZR_MEMBER
+ // completion_watcher_ signals when the whole process is done
+ // content_reply_ will contain the reply of the data. Distinction made
+ // to facilitate Sync as completion marker for update calls
+ QSharedPointer<QDBusPendingCallWatcher> completion_watcher_; // VZR_MEMBER
+
+
+ TrackerAccessDbus(QSharedPointer<TrackerService> service, QueryType queryType);
+
+ void startQuery(const QString& query);
+ void abort();
+ void reset();
+ void waitForQueryComplete();
+ bool isWaitingForQueryComplete() const;
+ TrackerQueryResult takeQueryResult();
+
+ private:
+ bool isError() const;
+ QString errorMessage() const;
+ };
+ }
+ }
+}
+
+
+#endif // TRACKERACCESSDBUS_H
--- src/backends/tracker/graph_signals_p.cpp
+++ src/backends/tracker/graph_signals_p.cpp
@@ -38,6 +38,11 @@
const QString changedSignal = QString::fromLatin1("GraphUpdated");
const QString changedSignature = QString::fromLatin1("sa(iiii)a(iiii)");
+ QDebug operator<<(QDebug d, Quad const &t)
+ {
+ return d.nospace() << t.graph << t.subject << t.predicate << t.object;
+ }
+
// D-Bus marshalling
QDBusArgument &operator<<(QDBusArgument &argument, const Quad &t)
{
--- src/backends/tracker/graph_signals_p.h
+++ src/backends/tracker/graph_signals_p.h
@@ -46,7 +46,7 @@
int predicate;
int object;
};
-
+ QDebug operator<<(QDebug d, Quad const &t);
QDBusArgument& operator<<(QDBusArgument& argument, const Quad &t);
const QDBusArgument& operator>>(const QDBusArgument& argument, Quad &t);
@@ -57,6 +57,8 @@
{
Q_OBJECT
+ /* VZR_CLASS(GraphClassUpdateDispatcher, (ClassUpdateDispatcher));*/
+
private:
friend class TrackerService;
GraphClassUpdateDispatcher
@@ -69,10 +71,13 @@
private:
void ensureDisconnect();
bool ensureConnect();
- TrackerService *tracker_;
- bool connected_;
- QScopedPointer<QSet<QSharedPointer<ClassUpdateCompatibilitySegment> > >
- compatibility_;
+ TrackerService *tracker_; // VZR_MEMBER
+
+ bool connected_;// VZR_MEMBER
+ typedef QScopedPointer<QSet<QSharedPointer<ClassUpdateCompatibilitySegment> > >
+ CompatibilitySegments;
+ CompatibilitySegments compatibility_; // VZR_MEMBER
+
friend class ClassUpdateCompatibilitySegment;
Q_SIGNALS:
@@ -89,9 +94,13 @@
{
Q_OBJECT
- GraphClassUpdateDispatcher *dispatcher_;
- QVector<Quad> deletes_, inserts_;
- LiveNodes ids_to_uris_;
+ /* VZR_CLASS(ClassUpdateCompatibilitySegment, (QObject));*/
+ GraphClassUpdateDispatcher *dispatcher_; // VZR_MEMBER
+
+ QVector<Quad> deletes_; // VZR_MEMBER
+ QVector<Quad> inserts_; // VZR_MEMBER
+
+ LiveNodes ids_to_uris_; // VZR_MEMBER
public:
ClassUpdateCompatibilitySegment
( GraphClassUpdateDispatcher *dispatcher
--- src/backends/tracker/rdftrackerselect_p.cpp
+++ src/backends/tracker/rdftrackerselect_p.cpp
@@ -47,9 +47,11 @@
if(!col.variable().metaIsResource())
return column;
+ RDFVariable var = col.variable().function(tracker::iri("id"));
+ var.isOfType<int>();
+
RDFDerivedColumn prop = RDFDerivedColumn::Private::create
- ( RDFProperty::fromVariable
- (col.variable().function(tracker::iri("id"))));
+ (RDFProperty::fromVariable(var));
return resource_to_tracker_id[column]
= addColumn(prop, RDFDerivedColumn::HiddenColumn, column).index();
--- src/backends/tracker/signals_p.cpp
+++ src/backends/tracker/signals_p.cpp
@@ -34,6 +34,8 @@
#undef SOPRANOLIVE_ONTOLOGIES_FORWARD_DECLARATIONS_AND_PROPERTY_DEFINITIONS_ONLY
#undef SOPRANOLIVE_ONTOLOGIES_TOP_LEVEL_INCLUDING
+#include "dbus/asyncdbusinterface.h"
+
namespace SopranoLive
{
namespace BackEnds
@@ -63,7 +65,7 @@
if(class_signals && class_signals->isValid())
return true;
- class_signals.reset(new QDBusInterface( Tracker::service_g
+ class_signals.reset(new AsyncDBusInterface( Tracker::service_g
, class_path
, Tracker::resources_class_interface_g
, trackerBus()));
@@ -133,35 +135,45 @@
bool ClassUpdateDispatcher::registerForEvents
- (SharedTripleUpdateContext const &handler, Events events
+ (TripleUpdateContextPtr const &handler, Events events
, QString const &resource, QString const &property)
{
if(!ensureConnect())
return false;
- debug(3) << "Event handler for" << short_name << "registered"
- << (handler->isValid() ? ", valid" : ", invalid");
+ debug(3) << "Event handler for" << short_name << "registered";
if(events & AddsAndRemoves)
- typehandlers.insert(handler);
+ typehandlers.push_back(handler);
if(events & Updates)
- resource2handler.insertMulti(resource, qMakePair(property, handler));
+ resource2handler.insertMulti
+ ( resource
+ , QPair<Property, TripleUpdateContextWeakPtr>
+ (property, handler));
handler->mode_ = TripleUpdateContext::FullUpdates;
return true;
}
+ //! \return false if the context was invalidated and should be deleted
bool notifyEntry
- ( QPair<QString, SharedTripleUpdateContext> const &entry
+ ( QPair<QString, TripleUpdateContextWeakPtr> const &entry_pair
, RawTriplesData const &data)
{
- if(entry.first.size()
+ TripleUpdateContextPtr strong_entry = entry_pair.second;
+ if(!strong_entry)
+ return false;
+
+ if(entry_pair.first.size()
&& data.predicates().size()
- && !data.predicates().contains(entry.first))
+ && !data.predicates().contains(entry_pair.first))
return true;
- return entry.second.data()->tripleUpdates(data);
+ return strong_entry->tripleUpdates(data);
}
- bool notifyEntry(SharedTripleUpdateContext const &entry, RawTriplesData const &data)
+ //! \return false if the context was invalidated and should be deleted
+ bool notifyEntry(TripleUpdateContextWeakPtr const &entry, RawTriplesData const &data)
{
- return entry.data()->tripleUpdates(data);
+ if(TripleUpdateContextPtr strong_entry = entry)
+ return strong_entry->tripleUpdates(data);
+ return false;
}
template<typename Cont>
--- src/backends/tracker/signals_p.h
+++ src/backends/tracker/signals_p.h
@@ -47,11 +47,14 @@
{
Q_OBJECT
+ /* VZR_CLASS(ClassUpdateDispatcher
+ , (QSharedFromThis<ClassUpdateDispatcher, ClassUpdateSignaler>));*/
+
public:
typedef QString Property;
- typedef QMap<QString, QPair<Property, SharedTripleUpdateContext> >
+ typedef QMap<QString, QPair<Property, TripleUpdateContextWeakPtr> >
RegisteredResources;
- typedef QSet<SharedTripleUpdateContext> TypeHandlers;
+ typedef QList<TripleUpdateContextWeakPtr> TypeHandlers;
QUrl classUri();
@@ -64,7 +67,7 @@
, AllEvents = Adds | Removes | Updates
};
typedef unsigned Events;
- bool registerForEvents(SharedTripleUpdateContext const &handler
+ bool registerForEvents(TripleUpdateContextPtr const &handler
, Events events = AllEvents
, QString const &resource = QString()
, QString const &property = QString());
@@ -95,18 +98,18 @@
void connectNotify(char const *signal);
void disconnectNotify(char const *signal);
- RDFServicePtr service_;
+ RDFServicePtr service_; // VZR_MEMBER
- QScopedPointer<QDBusInterface> class_signals;
- QString class_path;
- QString class_uri;
- QStringList class_uri_in_strlist;
- QString short_name;
+ QScopedPointer<QDBusAbstractInterface> class_signals; // VZR_MEMBER
+ QString class_path; // VZR_MEMBER
+ QString class_uri; // VZR_MEMBER
+ QStringList class_uri_in_strlist; // VZR_MEMBER
+ QString short_name; // VZR_MEMBER
- RegisteredResources resource2handler;
- TypeHandlers typehandlers;
+ RegisteredResources resource2handler; // VZR_MEMBER
+ TypeHandlers typehandlers; // VZR_MEMBER
- int connected_count_;
+ int connected_count_; // VZR_MEMBER
friend class ClassUpdateHandler;
};
--- src/backends/tracker/tracker_p.cpp
+++ src/backends/tracker/tracker_p.cpp
@@ -31,6 +31,7 @@
#include "../local/local_p.h"
#include "../../include/QtTracker/Tracker"
#include "../../util_p.h"
+#include "dbus/trackeraccessdbus.h"
#include <uuid.h>
@@ -350,10 +351,13 @@
if(implementing_live)
{
TripleModelPtr trip_ret = ret.staticCast<TripleModel>();
- SharedTripleUpdateContext ctxt(new TripleUpdateContext
+ TripleUpdateContextPtr ctxt(new TripleUpdateContext
(trip_ret, property_data.asStatementWith(sourceVariable())));
if(tracker()->registerForTripleUpdates(ctxt))
+ {
trip_ret->doEnableStrategyFlags(RDFStrategy::Live);
+ live_update_context_ = ctxt;
+ }
else
warning(graph_.data()) << "live property models with non-explicit predicates"
" not supported, non-live model returned. Specify an explicit "
@@ -372,7 +376,9 @@
// if query_id is supplied, the query is flushed and executed
// when attached. Otherwise, query has to be explicitly flushed.
TrackerContentModule::TrackerContentModule
- ( QSharedPointer<TrackerService> service, RDFDerivedSelect const &columns
+ ( QSharedPointer<TrackerService> service
+ , QSharedPointer<TrackerAccess> tracker_access
+ , RDFDerivedSelect const &columns
, bool flush_on_attach, ContentModule::ChangePolicy change_policy
, QSet<QString> const &sequencing_qualities
, DependencyChain const &sequencing_dependencies)
@@ -384,7 +390,7 @@
, sequencing_qualities_(sequencing_qualities)
, sequencing_dependencies_(sequencing_dependencies)
, sequenced_(), pending_sequenced_(false)
- , content_reply_(), completion_watcher_(), pending_completion_watcher_(false)
+ , tracker_access_(tracker_access)
{
debug(4, service_.data()) << "TrackerContentModule TCM(" << this << ") created";
}
@@ -397,7 +403,7 @@
, sequencing_qualities_(cp.sequencing_qualities_)
, sequencing_dependencies_(cp.sequencing_dependencies_)
, sequenced_(), pending_sequenced_(false)
- , content_reply_(), completion_watcher_(), pending_completion_watcher_(false)
+ , tracker_access_(cp.tracker_access_)
{
debug(4, service_.data()) << "TrackerContentModule TCM(" << this << ") copied"
" from TCM(" << &cp << ")";
@@ -436,10 +442,7 @@
sequenced_.clear();
pending_sequenced_ = false;
}
- content_reply_.clear();
-
- completion_watcher_.clear();
- pending_completion_watcher_ = false;
+ tracker_access_->abort();
}
QSet<QString> TrackerContentModule::read_qualities_s = QSet<QString>() << "read";
@@ -516,38 +519,21 @@
pending_sequenced_ = false;
}
- // the while is here because TrackerUpdateModule might have multi-step
- // completion cycle. Specifically when Sync is requested, the first step is to wait
- // for the update query to finish, which calls TrackerUpdateModule::rynSync.
- // This sets up a new completion_watcher_ which waits for tracker.Sync to finish.
- while(completion_watcher_ && !pending_completion_watcher_
- && !completion_watcher_->isFinished())
- {
- pending_completion_watcher_ = true;
-
- PERF_EVENT("before_completion_wait %d", query_id_);
-
- QSharedPointer<QDBusPendingCallWatcher> watcher = completion_watcher_;
- service_->waitForFinished(*watcher);
-
- PERF_EVENT("after_completion_wait %d", query_id_);
-
- pending_completion_watcher_ = false;
- }
+ // The wait is here because TrackerUpdateModule might have multi-step
+ // completion cycle.
+ tracker_access_->waitForQueryComplete();
}
// third step of refresh: if a query has completed, process the results
- if(completion_watcher_ && completion_watcher_->isFinished())
+ TrackerQueryResult queryResult(tracker_access_->takeQueryResult());
+ if(queryResult.isFinished())
{
setRunning(false);
sequenced_.clear();
- if(content_reply_->isError() || completion_watcher_->isError())
+ if(queryResult.isError())
{
- QString error_message = (content_reply_->isError()
- ? content_reply_->error() : completion_watcher_->error()).message();
-
- completion_watcher_.clear();
+ QString error_message = queryResult.errorMessage();
if(RowStoreModel *m = model())
m->emitErrorImpl(error_message, 0, QModelIndex(), !(mode & LiveNodeModel::Block));
@@ -559,12 +545,9 @@
emit sequencedFailure();
ret = NothingReady;
-
- content_reply_.clear();
} else
{
- completion_watcher_.clear();
- ret = processResults();
+ ret = processResults(queryResult);
}
}
@@ -577,14 +560,10 @@
PERF_EVENT("before_query %d", service_->query_id_counter);
- content_reply_ = QSharedPointer<QDBusPendingReply<> >(new QDBusPendingReply<>
- (service_->resources.SparqlQuery(query)));
- completion_watcher_ = QSharedPointer<QDBusPendingCallWatcher>
- (new QDBusPendingCallWatcher(*content_reply_), &QObject::deleteLater);
+ tracker_access_->startQuery(query);
- connect(completion_watcher_.data()
- , SIGNAL(finished(QDBusPendingCallWatcher*)), SLOT(queryCompleted()));
+ connect(tracker_access_.data(), SIGNAL(queryCompleted()), SLOT(queryCompleted()));
query_id_ = service_->query_id_counter++;
debug(2, service_.data()) << "modeling query (id =" << query_id_ << "):\n"
@@ -593,7 +572,7 @@
void TrackerContentModule::queryCompleted()
{
- if(pending_completion_watcher_)
+ if(tracker_access_->isWaitingForQueryComplete())
return;
if(RowStoreModel *m = model())
m->refreshModelSignal();
@@ -603,13 +582,9 @@
refreshModel_chain(LiveNodeModel::Poll, InterfaceChain<ModelCommons>());
}
- ModelCommons::ReadyFlags TrackerContentModule::processResults()
+ ModelCommons::ReadyFlags TrackerContentModule::processResults(TrackerQueryResult const &queryResult)
{
- // clean data_watcher, keep as local for postprocessing
- QVector<QStringList> reply_data = QDBusPendingReply<QVector<QStringList> >
- (*content_reply_).value();
-
- content_reply_.clear();
+ QVector<QStringList> reply_data(queryResult.selectResult());
if(RowStoreModel *m = model())
{
@@ -688,12 +663,13 @@
, bool flush_on_attach, bool batch_mode, bool sync_on_commit
, ContentModule::ChangePolicy change_policy)
: TrackerContentModule
- ( service, columns, flush_on_attach, change_policy
+ ( service, QSharedPointer<TrackerAccess>(new TrackerAccessDbus(service, batch_mode ? MUTE : UPDATE)), columns, flush_on_attach, change_policy
, write_qualities_s, write_dependencies_s)
, update_(update)
, batch_mode_(batch_mode)
, sync_on_commit_(sync_on_commit)
, my_index_(0)
+ , tracker_access_dbus_(static_cast<TrackerAccessDbus*>(tracker_access_.data()))
{
debug(4, service_.data()) << "TrackerUpdateModule TUM(" << this << ") created";
}
@@ -742,7 +718,7 @@
// now. If somebody has, just start watching it.
void TrackerUpdateModule::sequencedStart()
{
- if(!content_reply_)
+ if(!tracker_access_dbus_->content_reply_)
{
// This is the first sister module to initiate the creation of the
// pending call.
@@ -752,7 +728,7 @@
{
// First call the SparqlBatchUpdate, then BatchCommit. The update is
// finished when BatchCommit returns.
- content_reply_ = QSharedPointer<QDBusPendingReply<> >(new QDBusPendingReply<>
+ tracker_access_dbus_->content_reply_ = QSharedPointer<QDBusPendingReply<> >(new QDBusPendingReply<>
(service_->resources.BatchSparqlUpdate(query)));
// TODO: verify following:
@@ -760,8 +736,8 @@
// Calling BatchCommit as it was the previous behaviour before recent changes
// in tracker behavior.
service_->resources.BatchCommit();
- completion_watcher_ = QSharedPointer<QDBusPendingCallWatcher>
- (new QDBusPendingCallWatcher(*content_reply_));
+ tracker_access_dbus_->completion_watcher_ = QSharedPointer<QDBusPendingCallWatcher>
+ (new QDBusPendingCallWatcher(*tracker_access_dbus_->content_reply_));
// TODO: why does BatchCommit give timeout?
// completion_watcher_ = QSharedPointer<QDBusPendingCallWatcher>
@@ -771,13 +747,13 @@
{
// Normal mode; just call SparqlUpdate. The update is finished when it
// returns.
- content_reply_ = QSharedPointer<QDBusPendingReply<> >(new QDBusPendingReply<>
+ tracker_access_dbus_->content_reply_ = QSharedPointer<QDBusPendingReply<> >(new QDBusPendingReply<>
(service_->resources.SparqlUpdateBlank(query)));
- completion_watcher_ = QSharedPointer<QDBusPendingCallWatcher>
- (new QDBusPendingCallWatcher(*content_reply_));
+ tracker_access_dbus_->completion_watcher_ = QSharedPointer<QDBusPendingCallWatcher>
+ (new QDBusPendingCallWatcher(*tracker_access_dbus_->content_reply_));
}
- connect(completion_watcher_.data()
+ connect(tracker_access_dbus_->completion_watcher_.data()
, SIGNAL(finished(QDBusPendingCallWatcher*))
, sync_on_commit_
? SLOT(runSync())
@@ -789,10 +765,10 @@
{
if(*csmi != 0 && (*csmi != this))
{
- (*csmi)->content_reply_ = content_reply_;
- (*csmi)->completion_watcher_ = completion_watcher_;
+ (*csmi)->tracker_access_dbus_->content_reply_ = tracker_access_dbus_->content_reply_;
+ (*csmi)->tracker_access_dbus_->completion_watcher_ = tracker_access_dbus_->completion_watcher_;
if(!sync_on_commit_)
- (*csmi)->connect(completion_watcher_.data()
+ (*csmi)->connect(tracker_access_dbus_->completion_watcher_.data()
, SIGNAL(finished(QDBusPendingCallWatcher*))
, SLOT(queryCompleted()));
}
@@ -809,22 +785,22 @@
void TrackerUpdateModule::runSync()
{
service_->sync_id_counter++;
- completion_watcher_ = QSharedPointer<QDBusPendingCallWatcher>
+ tracker_access_dbus_->completion_watcher_ = QSharedPointer<QDBusPendingCallWatcher>
(new QDBusPendingCallWatcher(service_->resources.Sync()));
foreach(TrackerUpdateModule *sister, sister_modules_)
{
if(sister != 0)
{
- sister->completion_watcher_ = completion_watcher_;
+ sister->tracker_access_dbus_->completion_watcher_ = tracker_access_dbus_->completion_watcher_;
sister->connect
- ( completion_watcher_.data()
+ ( tracker_access_dbus_->completion_watcher_.data()
, SIGNAL(finished(QDBusPendingCallWatcher*))
, SLOT(queryCompleted()));
}
}
}
- ModelCommons::ReadyFlags TrackerUpdateModule::processResults()
+ ModelCommons::ReadyFlags TrackerUpdateModule::processResults(TrackerQueryResult const &queryResult)
{
RowStoreModel *m = model();
if(m && !batch_mode_)
@@ -838,10 +814,7 @@
// highest-level "a" is because the query may have multiple insert
// statements
- UpdateResultOperations const result
- = QDBusPendingReply<UpdateResultOperations>(*content_reply_).value();
-
- content_reply_.clear();
+ UpdateResultOperations const result = queryResult.updateResult();
if(result.size() > my_index_)
{
@@ -873,7 +846,7 @@
}
}
} else
- content_reply_.clear();
+ tracker_access_->reset();
debug(2, service_.data()) << "done modeling query (id =" << query_id_ << "):";
debug(4, service_.data()) << " query was:\n" << getQueryText() << "\n";
@@ -886,21 +859,23 @@
}
TCM_TextQuery::TCM_TextQuery
- ( QSharedPointer<TrackerService> service, QString const &query_text
+ ( QSharedPointer<TrackerService> service, QSharedPointer<TrackerAccess> tracker_access
+ , QString const &query_text
, RDFDerivedSelect const &columns, bool flush_on_attach)
- : TrackerContentModule(service, columns, flush_on_attach)
+ : TrackerContentModule(service, tracker_access, columns, flush_on_attach)
, query_text_(query_text)
{}
QSharedPointer<TCM_TextQuery> TCM_TextQuery::create
- ( QSharedPointer<TrackerService> service, QString const &query_text
+ ( QSharedPointer<TrackerService> service, QSharedPointer<TrackerAccess> tracker_access
+ , QString const &query_text
, QStringList const &columns, bool flush_on_attach)
{
RDFDerivedSelect sel;
for(QStringList::const_iterator fi = columns.begin(); fi != columns.end(); ++fi)
sel.addColumn(RDFVariable(*fi));
return QSharedCreator<TCM_TextQuery>::create
- (service, query_text, sel, flush_on_attach);
+ (service, tracker_access, query_text, sel, flush_on_attach);
}
QSharedPointer<ContentModule> TCM_TextQuery::copy() const
@@ -1074,7 +1049,7 @@
}
TripleUpdateContext::Mode TrackerService::registerForTripleUpdates
- (SharedTripleUpdateContext const &context)
+ (TripleUpdateContextPtr const &context)
{
// variables describing the desired triples. We're mostly
// interested in the types of subj, which are stored in
@@ -1330,6 +1305,7 @@
( 0
, TCM_TextQuery::create
( sharedFromThis<TrackerService>()
+ , QSharedPointer<TrackerAccess>(new TrackerAccessDbus(sharedFromThis<TrackerService>(), SELECT))
, select, columns
, false)
, triple_module
@@ -1352,6 +1328,7 @@
( 0
, QSharedCreator<TrackerContentModule>::create
( sharedFromThis<TrackerService>()
+ , QSharedPointer<TrackerAccess>(new TrackerAccessDbus(sharedFromThis<TrackerService>(), SELECT))
, RDFDerivedSelect().swap(*select)
, false
)
--- src/backends/tracker/tracker_p.h
+++ src/backends/tracker/tracker_p.h
@@ -37,23 +37,31 @@
#include "graph_signals_p.h"
#include "id2iricache_p.h"
+
namespace SopranoLive
{
namespace BackEnds
{
namespace Tracker
{
+ class TrackerAccess;
+ class TrackerQueryResult;
+ class TrackerAccessDbus;
+
enum { BatchSPARQLUpdate = RDFQuery::SPARQLUpdate + 1 };
class TrackerResource
: public ResourceOfService
{
+ /* VZR_CLASS(TrackerResource, (ResourceOfService));*/
+
public:
TrackerResource
(QSharedPointer<RDFServiceImplBase> const &service, Node const &node);
~TrackerResource();
- mutable QString has_signaling_type;
+ mutable QString has_signaling_type; // VZR_MEMBER
+ mutable TripleUpdateContextPtr live_update_context_; // VZR_MEMBER
TrackerService *tracker() const;
@@ -79,6 +87,8 @@
{
Q_OBJECT
+ /* VZR_CLASS(TrackerService, (RDFServiceBasic));*/
+
public:
TrackerService();
~TrackerService();
@@ -88,16 +98,20 @@
static QSharedPointer<RDFGraphCache> getRDFGraphCache(bool persistent = true);
static QSharedPointer<TrackerService> get();
- mutable org::freedesktop::Tracker1::Resources resources;
- QString stem;
- int id_counter, query_id_counter, update_id_counter, sync_id_counter;
- RDFServicePtr local_service_;
+ mutable org::freedesktop::Tracker1::Resources resources; // VZR_MEMBER
+ QString stem; // VZR_MEMBER
- IDIriCache id2iri_;
+ int id_counter; // VZR_MEMBER
+ int query_id_counter; // VZR_MEMBER
- Sequencer query_sequencer_;
+ int update_id_counter; // VZR_MEMBER
+ int sync_id_counter; // VZR_MEMBER
- typedef QMap<QString, ClassUpdateDispatcher *> QString2Dispatcher;
+ RDFServicePtr local_service_; // VZR_MEMBER
+
+ IDIriCache id2iri_; // VZR_MEMBER
+
+ Sequencer query_sequencer_; // VZR_MEMBER
bool waitForFinishedPendingCall
( QDBusPendingCall &pending_call
@@ -118,9 +132,13 @@
return reply.isFinished();
}
- QScopedPointer<QMap<QString, GraphClassUpdateDispatcherPtr> > graph_dispatchers_;
- QString2Dispatcher class2dispatcher;
- QString2Dispatcher property2dispatcher;
+ typedef QMap<QString, ClassUpdateDispatcher *> QString2Dispatcher;
+ typedef QScopedPointer<QMap<QString, GraphClassUpdateDispatcherPtr> > Dispatchers;
+
+ Dispatchers graph_dispatchers_; // VZR_MEMBER
+ QString2Dispatcher class2dispatcher; // VZR_MEMBER
+
+ QString2Dispatcher property2dispatcher; // VZR_MEMBER
ClassUpdateDispatcher *dispatcherFromClass(QString const &class_name);
ClassUpdateDispatcher *dispatcherFromProperty(QString const &property_name);
@@ -173,7 +191,7 @@
QStringList inferNotifyTypes(RDFVariable const &resource) const;
TripleUpdateContext::Mode registerForTripleUpdates
- (SharedTripleUpdateContext const &context);
+ (TripleUpdateContextPtr const &context);
public Q_SLOTS:
void sequencedStarted(SequencedOperation *operation);
@@ -193,31 +211,32 @@
{
Q_OBJECT
+ /* VZR_CLASS(TrackerContentModule, (QObject), (ContentModule_Simple));*/
+
public:
static QSet<QString> read_qualities_s, write_qualities_s;
static DependencyChain read_dependencies_s, write_dependencies_s;
- QSharedPointer<TrackerService> service_;
- RDFDerivedSelect columns_;
- int query_id_;
- bool flush_on_attach_;
+ QSharedPointer<TrackerService> service_; // VZR_MEMBER
+ RDFDerivedSelect columns_; // VZR_MEMBER
+ int query_id_; // VZR_MEMBER
+
+ bool flush_on_attach_; // VZR_MEMBER
- QSet<QString> sequencing_qualities_;
- DependencyChain sequencing_dependencies_;
+ QSet<QString> sequencing_qualities_; // VZR_MEMBER
+ DependencyChain sequencing_dependencies_; // VZR_MEMBER
// a handle to the active sequenced operation for this query
- QSharedPointer<SequencedOperation> sequenced_;
- bool pending_sequenced_;
+ QSharedPointer<SequencedOperation> sequenced_; // VZR_MEMBER
+
+ bool pending_sequenced_; // VZR_MEMBER
- QSharedPointer<QDBusPendingReply<> > content_reply_;
- // completion_watcher_ signals when the whole process is done
- // data_watcher_ will contain the reply of the data. Distinction made
- // to facilitate Sync as completion marker for update calls
- QSharedPointer<QDBusPendingCallWatcher> completion_watcher_;
- bool pending_completion_watcher_;
+ QSharedPointer<TrackerAccess> tracker_access_; // VZR_MEMBER
TrackerContentModule
- ( QSharedPointer<TrackerService> service, RDFDerivedSelect const &columns
+ ( QSharedPointer<TrackerService> service
+ , QSharedPointer<TrackerAccess> tracker_access
+ , RDFDerivedSelect const &columns
, bool flush_on_attach = true
, ContentModule::ChangePolicy change_policy = ContentModule::ReportChanges
, QSet<QString> const &sequencing_qualities = read_qualities_s
@@ -239,7 +258,7 @@
void queryCompleted();
public:
- virtual ModelCommons::ReadyFlags processResults();
+ virtual ModelCommons::ReadyFlags processResults(TrackerQueryResult const &queryResult);
bool alterStrategy_chain
( RDFStrategyFlags flags, RDFStrategyFlags mask, QModelIndex const &index
@@ -261,17 +280,25 @@
{
Q_OBJECT
+ /* VZR_CLASS(TrackerUpdateModule, (TrackerContentModule));*/
+
public:
- RDFUpdate update_;
- bool batch_mode_, sync_on_commit_;
+ RDFUpdate update_; // VZR_MEMBER
+
+ bool batch_mode_; // VZR_MEMBER
+ bool sync_on_commit_; // VZR_MEMBER
+
// Many TrackerUpdateModules may share the same D-Bus call. This happens when the
// tracker update query will contain multiple insert statements. Each insert
// statement gets its own model (and thus, a TrackerUpdateModule.) The
// TrackerUpdateModule knows which is the index of the related insert statement in
// the update, and also the other TrackerUpdateModules sharing the same D-Bus call.
- QList<TrackerUpdateModule*> sister_modules_;
- int my_index_;
+ QList<TrackerUpdateModule *> sister_modules_; // VZR_MEMBER
+
+ int my_index_; // VZR_MEMBER
+
+ TrackerAccessDbus *tracker_access_dbus_; // VZR_MEMBER
TrackerUpdateModule(QSharedPointer<TrackerService> service,
RDFDerivedSelect const& columns,
@@ -295,22 +322,28 @@
void runSync();
public:
- ModelCommons::ReadyFlags processResults();
+ ModelCommons::ReadyFlags processResults(TrackerQueryResult const &queryResult);
};
struct TCM_TextQuery
: TrackerContentModule
{
- QString query_text_;
+ /* VZR_CLASS(TCM_TextQuery, (TrackerContentModule));*/
+
+ QString query_text_; // VZR_MEMBER
static QSharedPointer<TCM_TextQuery> create
- ( QSharedPointer<TrackerService> service, QString const &query_text
+ ( QSharedPointer<TrackerService> service
+ , QSharedPointer<TrackerAccess> tracker_access
+ , QString const &query_text
, QStringList const &columns, bool flush_on_attach = true);
private:
friend class QSharedCreator<TCM_TextQuery>;
TCM_TextQuery
- ( QSharedPointer<TrackerService> service, QString const &query_text
+ ( QSharedPointer<TrackerService> service
+ , QSharedPointer<TrackerAccess> tracker_access
+ , QString const &query_text
, RDFDerivedSelect const &columns, bool flush_on_attach);
QString getQueryText() const;
ContentModulePtr copy() const;
--- src/backends/tracker/trackeraccess.cpp
+++ src/backends/tracker/trackeraccess.cpp
+#include "trackeraccess.h"
+
+namespace SopranoLive
+{
+ namespace BackEnds
+ {
+ namespace Tracker
+ {
+
+ TrackerQueryResult::TrackerQueryResult(bool isFinished
+ , bool isError
+ , QString const &errorMessage) :
+ isFinished_(isFinished), isError_(isError), errorMessage_(errorMessage)
+ {
+ }
+
+ bool TrackerQueryResult::isFinished() const
+ {
+ return isFinished_;
+ }
+
+ bool TrackerQueryResult::isError() const
+ {
+ return isError_;
+ }
+
+ QString TrackerQueryResult::errorMessage() const
+ {
+ return errorMessage_;
+ }
+
+ void TrackerQueryResult::setSelectResult(QVector<QStringList> const &select_result)
+ {
+ select_result_ = select_result;
+ }
+
+ void TrackerQueryResult::setUpdateResult(UpdateResultOperations const &update_result)
+ {
+ update_result_ = update_result;
+ }
+
+ QVector<QStringList> TrackerQueryResult::selectResult() const
+ {
+ return select_result_;
+ }
+
+ UpdateResultOperations TrackerQueryResult::updateResult() const
+ {
+ return update_result_;
+ }
+ }
+ }
+}
--- src/backends/tracker/trackeraccess.h
+++ src/backends/tracker/trackeraccess.h
+/*
+ * This file is part of libqttracker project
+ *
+ * Copyright (C) 2009-2010, Nokia
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef TRACKERACCESS_H
+#define TRACKERACCESS_H
+
+#include <QObject>
+#include <QStringList>
+#include <QVector>
+
+#include "common_p.h"
+#include "../../include/QtTracker/Tracker"
+
+namespace SopranoLive
+{
+ namespace BackEnds
+ {
+ namespace Tracker
+ {
+ /*!
+ *
+ */
+ enum QueryType
+ {
+ SELECT,
+ UPDATE,
+ //! Do not store query result. Used by batch mode update.
+ MUTE
+ };
+
+ /*!
+ * State of query execution.
+ *
+ * \sa TrackerAccess::takeQueryState
+ */
+ class TrackerQueryResult
+ {
+ /* VZR_CLASS(TrackerQueryResult);*/
+
+ bool isFinished_; // VZR_MEMBER
+ bool isError_; // VZR_MEMBER
+
+ QString errorMessage_; // VZR_MEMBER
+ QVector<QStringList> select_result_; // VZR_MEMBER
+
+ UpdateResultOperations update_result_; // VZR_MEMBER
+
+ public:
+ TrackerQueryResult(bool isFinished, bool isError, QString const &errorMessage);
+ bool isFinished() const;
+ bool isError() const;
+ QString errorMessage() const;
+ void setSelectResult(QVector<QStringList> const &select_result);
+ void setUpdateResult(UpdateResultOperations const &update_result);
+ QVector<QStringList> selectResult() const;
+ UpdateResultOperations updateResult() const;
+ };
+
+ /*!
+ * Abstract interface for accessing data from Tracker.
+ */
+ class TrackerAccess : public QObject
+ {
+ Q_OBJECT
+
+ /* VZR_CLASS(TrackerAccess, (QObject));*/
+
+ public:
+ /*!
+ * Starts query execution in tracker.
+ * Emits queryComplete() signal when query is executed.
+ *
+ * \param query the query string
+ * \sa queryCompleted
+ */
+ virtual void startQuery(const QString& query) =0;
+
+ /*!
+ * Aborts query execution. No signals will be emitted.
+ */
+ virtual void abort() =0;
+
+ /*!
+ * Resets query result.
+ */
+ virtual void reset() =0;
+
+ /*!
+ * Waits synchronously for pending query to complete.
+ *
+ * \sa isWaitingForQueryComplete
+ */
+ virtual void waitForQueryComplete() =0;
+
+ /*!
+ * Returns true if waitForQueryComplete() is in progress.
+ *
+ * \sa waitForQueryComplete
+ */
+ virtual bool isWaitingForQueryComplete() const =0;
+
+ /*!
+ * Returns the result of the query. If the query is finished the internal state of
+ * this object is reset.
+ */
+ virtual TrackerQueryResult takeQueryResult() =0;
+
+ Q_SIGNALS:
+ /*!
+ * Emitted when query has been executed.
+ *
+ * \sa startQuery
+ */
+ void queryCompleted();
+ };
+ }
+ }
+}
+
+
+#endif // TRACKERACCESS_H
--- src/compositemodule_p.h
+++ src/compositemodule_p.h
@@ -30,6 +30,7 @@
#include <QtCore/QLinkedList>
#include <typeinfo>
+#include "utils/visualizer.h"
namespace SopranoLive
{
@@ -90,15 +91,19 @@
struct Interfaces
: ModuleDetail::Typedefs<Compositor_>
{
+ /* VZR_CLASS(Interfaces);*/
+
Interfaces() : module_interfaces_head_(0) {}
Interfaces(Interfaces const &) : module_interfaces_head_(0) {}
+ CommonModuleInterface<Compositor_> * module_interfaces_head_; // VZR_MEMBER
- CommonModuleInterface<Compositor_> *module_interfaces_head_;
};
template<typename Compositor_>
struct CommonModuleInterface
{
+ /* VZR_CLASS(CommonModuleInterface);*/
+
typedef ModuleDetail::Typedefs<Compositor_> Defs;
friend struct Compositor<Compositor_>;
@@ -109,7 +114,8 @@
? ifs
: dynamic_cast<Interfaces<Compositor_> *>(this)
)->module_interfaces_head_
- , module_interfaces_next_); }
+ , module_interfaces_next_);
+ }
CommonModuleInterface(Interfaces<Compositor_> *ifs = 0)
: module_interfaces_next_(this)
@@ -123,17 +129,20 @@
virtual void interfaceDetach(typename Defs::ModuleHandle ths, typename Defs::ModuleList &modules) = 0;
private:
- CommonModuleInterface *module_interfaces_next_;
+ CommonModuleInterface * module_interfaces_next_; // VZR_MEMBER
+
};
template<typename Interface_>
struct Interface
: Interface_
{
+ /* VZR_CLASS(Interface, (Interface_));*/
+
Interface() : next_chain_interface_(this) {}
Interface(Interface const &) : next_chain_interface_(this) {}
- Interface *next_chain_interface_;
+ Interface * next_chain_interface_; // VZR_MEMBER
};
struct NullDeleter
@@ -149,6 +158,10 @@
: QSharedFromThis<Module<Compositor_>, ModuleDetail::Interfaces<Compositor_> >
{
typedef typename ModuleDetail::Typedefs<Compositor_> Defs;
+
+ /* VZR_CLASS(Module
+ , (QSharedFromThis<Module<Compositor_>, ModuleDetail::Interfaces<Compositor_> >));*/
+
protected:
// public interface
@@ -182,6 +195,8 @@
struct Compositor
: ModuleDetail::Typedefs<Compositor_>
{
+ /* VZR_CLASS(Compositor);*/
+
typedef Compositor_ BaseCompositor;
typedef ModuleDetail::Typedefs<Compositor_> Defs;
typedef typename Defs::ModulePtr ModulePtr;
@@ -301,7 +316,8 @@
private:
- QLinkedList<ModulePtr> modules_;
+ QLinkedList<ModulePtr> modules_; // VZR_MEMBER
+
};
// inherited by module classes which implement the given \a Interface_
@@ -312,6 +328,10 @@
: ModuleDetail::Interface<Interface_>
, ModuleDetail::CommonModuleInterface<BaseCompositor_>
{
+ /* VZR_CLASS(ModuleInterface
+ , (ModuleDetail::Interface<Interface_>)
+ , (ModuleDetail::CommonModuleInterface<BaseCompositor_>));*/
+
typedef typename ModuleDetail::Typedefs<BaseCompositor_> Defs;
typedef typename ModuleDetail::Interface<Interface_> ModuleDetailInterface;
@@ -367,13 +387,20 @@
, typename BaseCompositor_ = typename Compositor_::BaseCompositor>
struct CompositorInterface
: ModuleInterface<Interface_, Compositor_, Compositor_, BaseCompositor_>
- {};
+ {
+ /* VZR_CLASS(CompositorInterface
+ , (ModuleInterface<Interface_, Compositor_, Compositor_, BaseCompositor_>));*/
+ };
template<typename Compositor_>
struct CompositorAndBaseModule
: Compositor<Compositor_>
, Module<Compositor_>
{
+ /* VZR_CLASS(CompositorAndBaseModule
+ , (Compositor<Compositor_>)
+ , (Module<Compositor_>));*/
+
typedef typename Compositor<Compositor_>::ModulePtr ModulePtr;
typedef typename Compositor<Compositor_>::ModuleHandle ModuleHandle;
@@ -392,19 +419,23 @@
~CompositorAndBaseModule()
{}
bool aboutToDetach(Compositor_ &) { return true; }
- typename Module<Compositor_>::ModulePtr attach(Compositor_ &) { return this->sharedFromThis(); }
+ typename Module<Compositor_>::ModulePtr attach(Compositor_ &)
+ { return this->sharedFromThis(); }
void attached(Compositor_ &) {}
void detached(Compositor_ &) {}
ModuleHandle attachFrontModule(ModulePtr const &module = ModulePtr())
{ return attachModule(compositor_base_module_ + 1, module); }
private:
- ModuleHandle compositor_base_module_;
+ ModuleHandle compositor_base_module_; // VZR_MEMBER
+
};
template<typename Interface_, typename ModuleInterface_>
struct InterfaceChainBase
{
+ /* VZR_CLASS(InterfaceChainBase);*/
+
InterfaceChainBase()
: current_() {}
@@ -450,7 +481,7 @@
return typename Compositor_::CallChainCache();
}
- ModuleInterface_ *current_;
+ ModuleInterface_ * current_; // VZR_MEMBER
};
template<typename Interface_>
@@ -458,6 +489,9 @@
: public InterfaceChainBase<Interface_, ModuleDetail::Interface<Interface_> >
{
typedef InterfaceChainBase<Interface_, ModuleDetail::Interface<Interface_> > Base;
+
+ /* VZR_CLASS(InterfaceChain, (Base));*/
+
InterfaceChain() : Base() {}
InterfaceChain(InterfaceChain const &cp) : Base(cp) {}
InterfaceChain(Interface_ ¤t)
@@ -475,6 +509,8 @@
typedef InterfaceChainBase<Interface_ const, ModuleDetail::Interface<Interface_> const>
Base;
+ /* VZR_CLASS(InterfaceChain, (Base));*/
+
InterfaceChain() : Base() {}
InterfaceChain(InterfaceChain const &cp) : Base(cp) {}
InterfaceChain(Interface_ const ¤t)
@@ -488,8 +524,11 @@
struct SingleModule
: Module<Compositor_>
{
+ /* VZR_CLASS(SingleModule, (Module<Compositor_>));*/
+
protected:
- Compositor_ *compositor_;
+ Compositor_ * compositor_; // VZR_MEMBER
+
bool aboutToDetach(Compositor_ &compositor) { return compositor_ == &compositor; }
typename Module<Compositor_>::ModulePtr attach(Compositor_ &compositor)
@@ -514,6 +553,8 @@
struct SingleModuleOfDerivedCompositor
: Base_
{
+ /* VZR_CLASS(SingleModuleOfDerivedCompositor, (Base_));*/
+
SingleModuleOfDerivedCompositor(DerivedCompositor_ *compositor = 0) : Base_(compositor) {}
typename Base_::ModulePtr attach(typename Base_::ModuleCompositor &compositor)
@@ -532,7 +573,10 @@
virtual void attached(DerivedCompositor_ &compositor) { Base_::attached(compositor); }
virtual void detached(DerivedCompositor_ &compositor) { Base_::detached(compositor); }
- DerivedCompositor_ *compositor() const { return static_cast<DerivedCompositor_ *>(Base_::compositor_); }
+ DerivedCompositor_ *compositor() const
+ {
+ return static_cast<DerivedCompositor_ *>(Base_::compositor());
+ }
};
}
--- src/derived_columns_p.h
+++ src/derived_columns_p.h
@@ -37,15 +37,19 @@
: public QObject
, public TripleModule
{
+ /* VZR_CLASS(DerivedColumnModule, (QObject), (TripleModule));*/
+
protected:
struct DerivedRealColumnInfo;
typedef QMap<int, LiveNodeModelBasePtr> Models;
- Models column_models;
+ Models column_models; // VZR_MEMBER
+
+
+ RDFDerivedSelect * columns_; // VZR_MEMBER
+ RDFGraphImplBasePtr graph_; // VZR_MEMBER
- RDFDerivedSelect *columns_;
- RDFGraphImplBasePtr graph_;
QModelIndex index(RawPropertyData const &property, QModelIndex const ¤t) const;
@@ -62,6 +66,8 @@
struct DerivedUpdate : UpdateContext
{
+ /* VZR_CLASS(DerivedUpdate, (UpdateContext));*/
+
DerivedUpdate(ConstLiveNodeModelBasePtr const &model) : UpdateContext(model) {}
bool updateModel(LiveNodeModelBase *target) const;
};
@@ -89,6 +95,8 @@
class ItemsAsColumnModule
{
+ /* VZR_CLASS(ItemsAsColumnModule);*/
+
public:
void addSetItems(QStringList adds, RowStoreModel *model) const;
void removeSetItems(QStringList removes, RowStoreModel *model) const;
--- src/include/QtTracker/ontologies/dc.h
+++ src/include/QtTracker/ontologies/dc.h
@@ -1,7 +1,7 @@
/*
* dc.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:14:58.326519
+ * Automatically created on: 2010-11-01 14:52:10.407942
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/dc.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
--- src/include/QtTracker/ontologies/fts.h
+++ src/include/QtTracker/ontologies/fts.h
@@ -1,7 +1,7 @@
/*
* fts.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:14:59.634393
+ * Automatically created on: 2010-11-01 14:52:10.464100
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/fts.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
--- src/include/QtTracker/ontologies/maemo.h
+++ src/include/QtTracker/ontologies/maemo.h
@@ -1,7 +1,7 @@
/*
* maemo.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:01.148530
+ * Automatically created on: 2010-11-01 14:52:10.527756
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/maemo.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
--- src/include/QtTracker/ontologies/mfo.h
+++ src/include/QtTracker/ontologies/mfo.h
@@ -1,7 +1,7 @@
/*
* mfo.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:03.013417
+ * Automatically created on: 2010-11-01 14:52:10.605335
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/mfo.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -329,7 +329,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef FeedChannel RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -363,7 +363,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef FeedChannel RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -566,7 +566,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef FeedSettings RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -600,7 +600,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef FeedSettings RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -702,7 +702,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef FeedSettings RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1589,45 +1589,45 @@
*/
void removeTotalCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(mfo::totalCount::iri(), object_info); }
/*!
- \fn int getTotalCount()
+ \fn qint64 getTotalCount()
- Returns the property \ref mfo_totalCount "mfo:totalCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref mfo_totalCount "mfo:totalCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getTotalCount() { return baseGetObject< mfo::totalCount >(); }
+ qint64 getTotalCount() { return baseGetObject< mfo::totalCount >(); }
/*!
- \fn void setTotalCount(int const &totalCount_)
+ \fn void setTotalCount(qint64 const &totalCount_)
Sets the property \ref mfo_totalCount "mfo:totalCount" to the given \a totalCount.
\sa LiveResource::setObject
*/
- void setTotalCount(int const &totalCount_) { baseSetObject< mfo::totalCount >( totalCount_ ); }
+ void setTotalCount(qint64 const &totalCount_) { baseSetObject< mfo::totalCount >( totalCount_ ); }
/*!
- \fn int firstTotalCount()
+ \fn qint64 firstTotalCount()
Returns the first property \ref mfo_totalCount "mfo:totalCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstTotalCount() { return baseFirstObject< mfo::totalCount >(); }
+ qint64 firstTotalCount() { return baseFirstObject< mfo::totalCount >(); }
/*!
- \fn void addTotalCount(int const &totalCount_)
+ \fn void addTotalCount(qint64 const &totalCount_)
Adds the given \a totalCount_ to the property \ref mfo_totalCount "mfo:totalCount" set.
\sa LiveResource::addObject
*/
- void addTotalCount(int const &totalCount_) { baseAddObject< mfo::totalCount >( totalCount_ ); }
+ void addTotalCount(qint64 const &totalCount_) { baseAddObject< mfo::totalCount >( totalCount_ ); }
/*!
- \fn void removeTotalCount(int const &totalCount_)
+ \fn void removeTotalCount(qint64 const &totalCount_)
Removes the given \a totalCount_ from the property \ref mfo_totalCount "mfo:totalCount" set.
\sa LiveResource::removeObject
*/
- void removeTotalCount(int const &totalCount_) { baseRemoveObject< mfo::totalCount >(totalCount_); }
+ void removeTotalCount(qint64 const &totalCount_) { baseRemoveObject< mfo::totalCount >(totalCount_); }
/* Property generated from mfo:action
* \n Captures the current action for the channel: Refresh Now
@@ -1851,45 +1851,45 @@
*/
void removeUnreadCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(mfo::unreadCount::iri(), object_info); }
/*!
- \fn int getUnreadCount()
+ \fn qint64 getUnreadCount()
- Returns the property \ref mfo_unreadCount "mfo:unreadCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref mfo_unreadCount "mfo:unreadCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getUnreadCount() { return baseGetObject< mfo::unreadCount >(); }
+ qint64 getUnreadCount() { return baseGetObject< mfo::unreadCount >(); }
/*!
- \fn void setUnreadCount(int const &unreadCount_)
+ \fn void setUnreadCount(qint64 const &unreadCount_)
Sets the property \ref mfo_unreadCount "mfo:unreadCount" to the given \a unreadCount.
\sa LiveResource::setObject
*/
- void setUnreadCount(int const &unreadCount_) { baseSetObject< mfo::unreadCount >( unreadCount_ ); }
+ void setUnreadCount(qint64 const &unreadCount_) { baseSetObject< mfo::unreadCount >( unreadCount_ ); }
/*!
- \fn int firstUnreadCount()
+ \fn qint64 firstUnreadCount()
Returns the first property \ref mfo_unreadCount "mfo:unreadCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstUnreadCount() { return baseFirstObject< mfo::unreadCount >(); }
+ qint64 firstUnreadCount() { return baseFirstObject< mfo::unreadCount >(); }
/*!
- \fn void addUnreadCount(int const &unreadCount_)
+ \fn void addUnreadCount(qint64 const &unreadCount_)
Adds the given \a unreadCount_ to the property \ref mfo_unreadCount "mfo:unreadCount" set.
\sa LiveResource::addObject
*/
- void addUnreadCount(int const &unreadCount_) { baseAddObject< mfo::unreadCount >( unreadCount_ ); }
+ void addUnreadCount(qint64 const &unreadCount_) { baseAddObject< mfo::unreadCount >( unreadCount_ ); }
/*!
- \fn void removeUnreadCount(int const &unreadCount_)
+ \fn void removeUnreadCount(qint64 const &unreadCount_)
Removes the given \a unreadCount_ from the property \ref mfo_unreadCount "mfo:unreadCount" set.
\sa LiveResource::removeObject
*/
- void removeUnreadCount(int const &unreadCount_) { baseRemoveObject< mfo::unreadCount >(unreadCount_); }
+ void removeUnreadCount(qint64 const &unreadCount_) { baseRemoveObject< mfo::unreadCount >(unreadCount_); }
/* Property generated from mfo:image
* \n rdfs:range=xsd:string
@@ -2275,45 +2275,45 @@
*/
void removeExpiryIntervals(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(mfo::expiryInterval::iri(), object_info); }
/*!
- \fn int getExpiryInterval()
+ \fn qint64 getExpiryInterval()
- Returns the property \ref mfo_expiryInterval "mfo:expiryInterval". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref mfo_expiryInterval "mfo:expiryInterval". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getExpiryInterval() { return baseGetObject< mfo::expiryInterval >(); }
+ qint64 getExpiryInterval() { return baseGetObject< mfo::expiryInterval >(); }
/*!
- \fn void setExpiryInterval(int const &expiryInterval_)
+ \fn void setExpiryInterval(qint64 const &expiryInterval_)
Sets the property \ref mfo_expiryInterval "mfo:expiryInterval" to the given \a expiryInterval.
\sa LiveResource::setObject
*/
- void setExpiryInterval(int const &expiryInterval_) { baseSetObject< mfo::expiryInterval >( expiryInterval_ ); }
+ void setExpiryInterval(qint64 const &expiryInterval_) { baseSetObject< mfo::expiryInterval >( expiryInterval_ ); }
/*!
- \fn int firstExpiryInterval()
+ \fn qint64 firstExpiryInterval()
Returns the first property \ref mfo_expiryInterval "mfo:expiryInterval". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstExpiryInterval() { return baseFirstObject< mfo::expiryInterval >(); }
+ qint64 firstExpiryInterval() { return baseFirstObject< mfo::expiryInterval >(); }
/*!
- \fn void addExpiryInterval(int const &expiryInterval_)
+ \fn void addExpiryInterval(qint64 const &expiryInterval_)
Adds the given \a expiryInterval_ to the property \ref mfo_expiryInterval "mfo:expiryInterval" set.
\sa LiveResource::addObject
*/
- void addExpiryInterval(int const &expiryInterval_) { baseAddObject< mfo::expiryInterval >( expiryInterval_ ); }
+ void addExpiryInterval(qint64 const &expiryInterval_) { baseAddObject< mfo::expiryInterval >( expiryInterval_ ); }
/*!
- \fn void removeExpiryInterval(int const &expiryInterval_)
+ \fn void removeExpiryInterval(qint64 const &expiryInterval_)
Removes the given \a expiryInterval_ from the property \ref mfo_expiryInterval "mfo:expiryInterval" set.
\sa LiveResource::removeObject
*/
- void removeExpiryInterval(int const &expiryInterval_) { baseRemoveObject< mfo::expiryInterval >(expiryInterval_); }
+ void removeExpiryInterval(qint64 const &expiryInterval_) { baseRemoveObject< mfo::expiryInterval >(expiryInterval_); }
/* Property generated from mfo:downloadPath
* \n Download path for enclosures in a message
@@ -2439,45 +2439,45 @@
*/
void removeUpdateIntervals(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(mfo::updateInterval::iri(), object_info); }
/*!
- \fn int getUpdateInterval()
+ \fn qint64 getUpdateInterval()
- Returns the property \ref mfo_updateInterval "mfo:updateInterval". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref mfo_updateInterval "mfo:updateInterval". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getUpdateInterval() { return baseGetObject< mfo::updateInterval >(); }
+ qint64 getUpdateInterval() { return baseGetObject< mfo::updateInterval >(); }
/*!
- \fn void setUpdateInterval(int const &updateInterval_)
+ \fn void setUpdateInterval(qint64 const &updateInterval_)
Sets the property \ref mfo_updateInterval "mfo:updateInterval" to the given \a updateInterval.
\sa LiveResource::setObject
*/
- void setUpdateInterval(int const &updateInterval_) { baseSetObject< mfo::updateInterval >( updateInterval_ ); }
+ void setUpdateInterval(qint64 const &updateInterval_) { baseSetObject< mfo::updateInterval >( updateInterval_ ); }
/*!
- \fn int firstUpdateInterval()
+ \fn qint64 firstUpdateInterval()
Returns the first property \ref mfo_updateInterval "mfo:updateInterval". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstUpdateInterval() { return baseFirstObject< mfo::updateInterval >(); }
+ qint64 firstUpdateInterval() { return baseFirstObject< mfo::updateInterval >(); }
/*!
- \fn void addUpdateInterval(int const &updateInterval_)
+ \fn void addUpdateInterval(qint64 const &updateInterval_)
Adds the given \a updateInterval_ to the property \ref mfo_updateInterval "mfo:updateInterval" set.
\sa LiveResource::addObject
*/
- void addUpdateInterval(int const &updateInterval_) { baseAddObject< mfo::updateInterval >( updateInterval_ ); }
+ void addUpdateInterval(qint64 const &updateInterval_) { baseAddObject< mfo::updateInterval >( updateInterval_ ); }
/*!
- \fn void removeUpdateInterval(int const &updateInterval_)
+ \fn void removeUpdateInterval(qint64 const &updateInterval_)
Removes the given \a updateInterval_ from the property \ref mfo_updateInterval "mfo:updateInterval" set.
\sa LiveResource::removeObject
*/
- void removeUpdateInterval(int const &updateInterval_) { baseRemoveObject< mfo::updateInterval >(updateInterval_); }
+ void removeUpdateInterval(qint64 const &updateInterval_) { baseRemoveObject< mfo::updateInterval >(updateInterval_); }
/* Property generated from mfo:downloadFlag
* \n To indicate whether enclosures will be downloaded or not
@@ -2603,45 +2603,45 @@
*/
void removeMaxSizes(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(mfo::maxSize::iri(), object_info); }
/*!
- \fn int getMaxSize()
+ \fn qint64 getMaxSize()
- Returns the property \ref mfo_maxSize "mfo:maxSize". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref mfo_maxSize "mfo:maxSize". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getMaxSize() { return baseGetObject< mfo::maxSize >(); }
+ qint64 getMaxSize() { return baseGetObject< mfo::maxSize >(); }
/*!
- \fn void setMaxSize(int const &maxSize_)
+ \fn void setMaxSize(qint64 const &maxSize_)
Sets the property \ref mfo_maxSize "mfo:maxSize" to the given \a maxSize.
\sa LiveResource::setObject
*/
- void setMaxSize(int const &maxSize_) { baseSetObject< mfo::maxSize >( maxSize_ ); }
+ void setMaxSize(qint64 const &maxSize_) { baseSetObject< mfo::maxSize >( maxSize_ ); }
/*!
- \fn int firstMaxSize()
+ \fn qint64 firstMaxSize()
Returns the first property \ref mfo_maxSize "mfo:maxSize". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstMaxSize() { return baseFirstObject< mfo::maxSize >(); }
+ qint64 firstMaxSize() { return baseFirstObject< mfo::maxSize >(); }
/*!
- \fn void addMaxSize(int const &maxSize_)
+ \fn void addMaxSize(qint64 const &maxSize_)
Adds the given \a maxSize_ to the property \ref mfo_maxSize "mfo:maxSize" set.
\sa LiveResource::addObject
*/
- void addMaxSize(int const &maxSize_) { baseAddObject< mfo::maxSize >( maxSize_ ); }
+ void addMaxSize(qint64 const &maxSize_) { baseAddObject< mfo::maxSize >( maxSize_ ); }
/*!
- \fn void removeMaxSize(int const &maxSize_)
+ \fn void removeMaxSize(qint64 const &maxSize_)
Removes the given \a maxSize_ from the property \ref mfo_maxSize "mfo:maxSize" set.
\sa LiveResource::removeObject
*/
- void removeMaxSize(int const &maxSize_) { baseRemoveObject< mfo::maxSize >(maxSize_); }
+ void removeMaxSize(qint64 const &maxSize_) { baseRemoveObject< mfo::maxSize >(maxSize_); }
//@}
};
--- src/include/QtTracker/ontologies/mlo.h
+++ src/include/QtTracker/ontologies/mlo.h
@@ -1,7 +1,7 @@
/*
* mlo.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:05.793824
+ * Automatically created on: 2010-11-01 14:52:10.708354
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/mlo.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
--- src/include/QtTracker/ontologies/mto.h
+++ src/include/QtTracker/ontologies/mto.h
@@ -1,7 +1,7 @@
/*
* mto.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:08.657809
+ * Automatically created on: 2010-11-01 14:52:10.807756
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/mto.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
--- src/include/QtTracker/ontologies/mtp.h
+++ src/include/QtTracker/ontologies/mtp.h
@@ -1,7 +1,7 @@
/*
* mtp.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:10.782171
+ * Automatically created on: 2010-11-01 14:52:10.889468
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/mtp.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
--- src/include/QtTracker/ontologies/nao.h
+++ src/include/QtTracker/ontologies/nao.h
@@ -1,7 +1,7 @@
/*
* nao.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:12.586450
+ * Automatically created on: 2010-11-01 14:52:10.958014
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/nao.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
--- src/include/QtTracker/ontologies/ncal.h
+++ src/include/QtTracker/ontologies/ncal.h
@@ -1,7 +1,7 @@
/*
* ncal.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:17.163424
+ * Automatically created on: 2010-11-01 14:52:11.135874
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/ncal.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -195,7 +195,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Alarm RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -704,7 +704,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef BydayRulePart RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1247,7 +1247,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef NcalPeriod RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1416,7 +1416,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef RecurrenceRule RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1484,7 +1484,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef RecurrenceRule RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1550,7 +1550,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef RecurrenceRule RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1583,7 +1583,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef RecurrenceRule RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1616,7 +1616,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef RecurrenceRule RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1649,7 +1649,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef RecurrenceRule RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1682,7 +1682,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef RecurrenceRule RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1715,7 +1715,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef RecurrenceRule RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1749,7 +1749,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef RecurrenceRule RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1782,7 +1782,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef RecurrenceRule RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2190,7 +2190,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Todo RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2394,7 +2394,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Trigger RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2669,7 +2669,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef UnionParentClass RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -3247,7 +3247,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef UnionParentClass RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -3659,7 +3659,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef UnionParentClass RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -4794,45 +4794,45 @@
*/
void removeSequences(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::sequence::iri(), object_info); }
/*!
- \fn int getSequence()
+ \fn qint64 getSequence()
- Returns the property \ref ncal_sequence "ncal:sequence". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref ncal_sequence "ncal:sequence". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getSequence() { return baseGetObject< ncal::sequence >(); }
+ qint64 getSequence() { return baseGetObject< ncal::sequence >(); }
/*!
- \fn void setSequence(int const &sequence_)
+ \fn void setSequence(qint64 const &sequence_)
Sets the property \ref ncal_sequence "ncal:sequence" to the given \a sequence.
\sa LiveResource::setObject
*/
- void setSequence(int const &sequence_) { baseSetObject< ncal::sequence >( sequence_ ); }
+ void setSequence(qint64 const &sequence_) { baseSetObject< ncal::sequence >( sequence_ ); }
/*!
- \fn int firstSequence()
+ \fn qint64 firstSequence()
Returns the first property \ref ncal_sequence "ncal:sequence". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstSequence() { return baseFirstObject< ncal::sequence >(); }
+ qint64 firstSequence() { return baseFirstObject< ncal::sequence >(); }
/*!
- \fn void addSequence(int const &sequence_)
+ \fn void addSequence(qint64 const &sequence_)
Adds the given \a sequence_ to the property \ref ncal_sequence "ncal:sequence" set.
\sa LiveResource::addObject
*/
- void addSequence(int const &sequence_) { baseAddObject< ncal::sequence >( sequence_ ); }
+ void addSequence(qint64 const &sequence_) { baseAddObject< ncal::sequence >( sequence_ ); }
/*!
- \fn void removeSequence(int const &sequence_)
+ \fn void removeSequence(qint64 const &sequence_)
Removes the given \a sequence_ from the property \ref ncal_sequence "ncal:sequence" set.
\sa LiveResource::removeObject
*/
- void removeSequence(int const &sequence_) { baseRemoveObject< ncal::sequence >(sequence_); }
+ void removeSequence(qint64 const &sequence_) { baseRemoveObject< ncal::sequence >(sequence_); }
/* Property generated from ncal:contactAltRep
* \n Alternate representation of the contact property. Introduced to cover the ALTREP parameter of the CONTACT property. See documentation of ncal:contact for details.
@@ -6168,45 +6168,45 @@
*/
void removeDurations(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::duration::iri(), object_info); }
/*!
- \fn int getDuration()
+ \fn qint64 getDuration()
- Returns the property \ref ncal_duration "ncal:duration". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref ncal_duration "ncal:duration". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getDuration() { return baseGetObject< ncal::duration >(); }
+ qint64 getDuration() { return baseGetObject< ncal::duration >(); }
/*!
- \fn void setDuration(int const &duration_)
+ \fn void setDuration(qint64 const &duration_)
Sets the property \ref ncal_duration "ncal:duration" to the given \a duration.
\sa LiveResource::setObject
*/
- void setDuration(int const &duration_) { baseSetObject< ncal::duration >( duration_ ); }
+ void setDuration(qint64 const &duration_) { baseSetObject< ncal::duration >( duration_ ); }
/*!
- \fn int firstDuration()
+ \fn qint64 firstDuration()
Returns the first property \ref ncal_duration "ncal:duration". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstDuration() { return baseFirstObject< ncal::duration >(); }
+ qint64 firstDuration() { return baseFirstObject< ncal::duration >(); }
/*!
- \fn void addDuration(int const &duration_)
+ \fn void addDuration(qint64 const &duration_)
Adds the given \a duration_ to the property \ref ncal_duration "ncal:duration" set.
\sa LiveResource::addObject
*/
- void addDuration(int const &duration_) { baseAddObject< ncal::duration >( duration_ ); }
+ void addDuration(qint64 const &duration_) { baseAddObject< ncal::duration >( duration_ ); }
/*!
- \fn void removeDuration(int const &duration_)
+ \fn void removeDuration(qint64 const &duration_)
Removes the given \a duration_ from the property \ref ncal_duration "ncal:duration" set.
\sa LiveResource::removeObject
*/
- void removeDuration(int const &duration_) { baseRemoveObject< ncal::duration >(duration_); }
+ void removeDuration(qint64 const &duration_) { baseRemoveObject< ncal::duration >(duration_); }
/* Property generated from ncal:requestStatus
* \n This property defines the status code returned for a scheduling request. Inspired by RFC 2445 sec. 4.8.8.2. Original value of this property was a four-element structure. The RequestStatus class has been introduced to express it. In RFC 2445 this property could have the LANGUAGE parameter. This has been discarded in this ontology. Use xml:lang literals to express it if necessary.
@@ -6844,45 +6844,45 @@
*/
void removePrioritys(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::priority::iri(), object_info); }
/*!
- \fn int getPriority()
+ \fn qint64 getPriority()
- Returns the property \ref ncal_priority "ncal:priority". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref ncal_priority "ncal:priority". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getPriority() { return baseGetObject< ncal::priority >(); }
+ qint64 getPriority() { return baseGetObject< ncal::priority >(); }
/*!
- \fn void setPriority(int const &priority_)
+ \fn void setPriority(qint64 const &priority_)
Sets the property \ref ncal_priority "ncal:priority" to the given \a priority.
\sa LiveResource::setObject
*/
- void setPriority(int const &priority_) { baseSetObject< ncal::priority >( priority_ ); }
+ void setPriority(qint64 const &priority_) { baseSetObject< ncal::priority >( priority_ ); }
/*!
- \fn int firstPriority()
+ \fn qint64 firstPriority()
Returns the first property \ref ncal_priority "ncal:priority". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstPriority() { return baseFirstObject< ncal::priority >(); }
+ qint64 firstPriority() { return baseFirstObject< ncal::priority >(); }
/*!
- \fn void addPriority(int const &priority_)
+ \fn void addPriority(qint64 const &priority_)
Adds the given \a priority_ to the property \ref ncal_priority "ncal:priority" set.
\sa LiveResource::addObject
*/
- void addPriority(int const &priority_) { baseAddObject< ncal::priority >( priority_ ); }
+ void addPriority(qint64 const &priority_) { baseAddObject< ncal::priority >( priority_ ); }
/*!
- \fn void removePriority(int const &priority_)
+ \fn void removePriority(qint64 const &priority_)
Removes the given \a priority_ from the property \ref ncal_priority "ncal:priority" set.
\sa LiveResource::removeObject
*/
- void removePriority(int const &priority_) { baseRemoveObject< ncal::priority >(priority_); }
+ void removePriority(qint64 const &priority_) { baseRemoveObject< ncal::priority >(priority_); }
/* Property generated from ncal:recurrenceId
* \n rdfs:label=recurrenceId
@@ -7287,45 +7287,45 @@
*/
void removeRepeats(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::repeat::iri(), object_info); }
/*!
- \fn int getRepeat()
+ \fn qint64 getRepeat()
- Returns the property \ref ncal_repeat "ncal:repeat". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref ncal_repeat "ncal:repeat". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getRepeat() { return baseGetObject< ncal::repeat >(); }
+ qint64 getRepeat() { return baseGetObject< ncal::repeat >(); }
/*!
- \fn void setRepeat(int const &repeat_)
+ \fn void setRepeat(qint64 const &repeat_)
Sets the property \ref ncal_repeat "ncal:repeat" to the given \a repeat.
\sa LiveResource::setObject
*/
- void setRepeat(int const &repeat_) { baseSetObject< ncal::repeat >( repeat_ ); }
+ void setRepeat(qint64 const &repeat_) { baseSetObject< ncal::repeat >( repeat_ ); }
/*!
- \fn int firstRepeat()
+ \fn qint64 firstRepeat()
Returns the first property \ref ncal_repeat "ncal:repeat". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstRepeat() { return baseFirstObject< ncal::repeat >(); }
+ qint64 firstRepeat() { return baseFirstObject< ncal::repeat >(); }
/*!
- \fn void addRepeat(int const &repeat_)
+ \fn void addRepeat(qint64 const &repeat_)
Adds the given \a repeat_ to the property \ref ncal_repeat "ncal:repeat" set.
\sa LiveResource::addObject
*/
- void addRepeat(int const &repeat_) { baseAddObject< ncal::repeat >( repeat_ ); }
+ void addRepeat(qint64 const &repeat_) { baseAddObject< ncal::repeat >( repeat_ ); }
/*!
- \fn void removeRepeat(int const &repeat_)
+ \fn void removeRepeat(qint64 const &repeat_)
Removes the given \a repeat_ from the property \ref ncal_repeat "ncal:repeat" set.
\sa LiveResource::removeObject
*/
- void removeRepeat(int const &repeat_) { baseRemoveObject< ncal::repeat >(repeat_); }
+ void removeRepeat(qint64 const &repeat_) { baseRemoveObject< ncal::repeat >(repeat_); }
/* Property generated from ncal:action
* \n This property defines the action to be invoked when an alarm is triggered. Inspired by RFC 2445 sec 4.8.6.1. Originally this property had a limited set of values. They are expressed as instances of the AlarmAction class.
@@ -9129,29 +9129,29 @@
*/
void removeBydayModifiers(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::bydayModifier::iri(), object_info); }
/*!
- \fn int firstBydayModifier()
+ \fn qint64 firstBydayModifier()
Returns the first property \ref ncal_bydayModifier "ncal:bydayModifier". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstBydayModifier() { return baseFirstObject< ncal::bydayModifier >(); }
+ qint64 firstBydayModifier() { return baseFirstObject< ncal::bydayModifier >(); }
/*!
- \fn void addBydayModifier(int const &bydayModifier_)
+ \fn void addBydayModifier(qint64 const &bydayModifier_)
Adds the given \a bydayModifier_ to the property \ref ncal_bydayModifier "ncal:bydayModifier" set.
\sa LiveResource::addObject
*/
- void addBydayModifier(int const &bydayModifier_) { baseAddObject< ncal::bydayModifier >( bydayModifier_ ); }
+ void addBydayModifier(qint64 const &bydayModifier_) { baseAddObject< ncal::bydayModifier >( bydayModifier_ ); }
/*!
- \fn void removeBydayModifier(int const &bydayModifier_)
+ \fn void removeBydayModifier(qint64 const &bydayModifier_)
Removes the given \a bydayModifier_ from the property \ref ncal_bydayModifier "ncal:bydayModifier" set.
\sa LiveResource::removeObject
*/
- void removeBydayModifier(int const &bydayModifier_) { baseRemoveObject< ncal::bydayModifier >(bydayModifier_); }
+ void removeBydayModifier(qint64 const &bydayModifier_) { baseRemoveObject< ncal::bydayModifier >(bydayModifier_); }
//@}
};
@@ -10500,45 +10500,45 @@
*/
void removePeriodDurations(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::periodDuration::iri(), object_info); }
/*!
- \fn int getPeriodDuration()
+ \fn qint64 getPeriodDuration()
- Returns the property \ref ncal_periodDuration "ncal:periodDuration". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref ncal_periodDuration "ncal:periodDuration". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getPeriodDuration() { return baseGetObject< ncal::periodDuration >(); }
+ qint64 getPeriodDuration() { return baseGetObject< ncal::periodDuration >(); }
/*!
- \fn void setPeriodDuration(int const &periodDuration_)
+ \fn void setPeriodDuration(qint64 const &periodDuration_)
Sets the property \ref ncal_periodDuration "ncal:periodDuration" to the given \a periodDuration.
\sa LiveResource::setObject
*/
- void setPeriodDuration(int const &periodDuration_) { baseSetObject< ncal::periodDuration >( periodDuration_ ); }
+ void setPeriodDuration(qint64 const &periodDuration_) { baseSetObject< ncal::periodDuration >( periodDuration_ ); }
/*!
- \fn int firstPeriodDuration()
+ \fn qint64 firstPeriodDuration()
Returns the first property \ref ncal_periodDuration "ncal:periodDuration". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstPeriodDuration() { return baseFirstObject< ncal::periodDuration >(); }
+ qint64 firstPeriodDuration() { return baseFirstObject< ncal::periodDuration >(); }
/*!
- \fn void addPeriodDuration(int const &periodDuration_)
+ \fn void addPeriodDuration(qint64 const &periodDuration_)
Adds the given \a periodDuration_ to the property \ref ncal_periodDuration "ncal:periodDuration" set.
\sa LiveResource::addObject
*/
- void addPeriodDuration(int const &periodDuration_) { baseAddObject< ncal::periodDuration >( periodDuration_ ); }
+ void addPeriodDuration(qint64 const &periodDuration_) { baseAddObject< ncal::periodDuration >( periodDuration_ ); }
/*!
- \fn void removePeriodDuration(int const &periodDuration_)
+ \fn void removePeriodDuration(qint64 const &periodDuration_)
Removes the given \a periodDuration_ from the property \ref ncal_periodDuration "ncal:periodDuration" set.
\sa LiveResource::removeObject
*/
- void removePeriodDuration(int const &periodDuration_) { baseRemoveObject< ncal::periodDuration >(periodDuration_); }
+ void removePeriodDuration(qint64 const &periodDuration_) { baseRemoveObject< ncal::periodDuration >(periodDuration_); }
//@}
};
@@ -11791,29 +11791,29 @@
*/
void removeByseconds(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::bysecond::iri(), object_info); }
/*!
- \fn int firstBysecond()
+ \fn qint64 firstBysecond()
Returns the first property \ref ncal_bysecond "ncal:bysecond". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstBysecond() { return baseFirstObject< ncal::bysecond >(); }
+ qint64 firstBysecond() { return baseFirstObject< ncal::bysecond >(); }
/*!
- \fn void addBysecond(int const &bysecond_)
+ \fn void addBysecond(qint64 const &bysecond_)
Adds the given \a bysecond_ to the property \ref ncal_bysecond "ncal:bysecond" set.
\sa LiveResource::addObject
*/
- void addBysecond(int const &bysecond_) { baseAddObject< ncal::bysecond >( bysecond_ ); }
+ void addBysecond(qint64 const &bysecond_) { baseAddObject< ncal::bysecond >( bysecond_ ); }
/*!
- \fn void removeBysecond(int const &bysecond_)
+ \fn void removeBysecond(qint64 const &bysecond_)
Removes the given \a bysecond_ from the property \ref ncal_bysecond "ncal:bysecond" set.
\sa LiveResource::removeObject
*/
- void removeBysecond(int const &bysecond_) { baseRemoveObject< ncal::bysecond >(bysecond_); }
+ void removeBysecond(qint64 const &bysecond_) { baseRemoveObject< ncal::bysecond >(bysecond_); }
/* Property generated from ncal:wkst
* \n The day that's counted as the start of the week. It is used to disambiguate the byweekno rule. Defined in RFC 2445 sec. 4.3.10
@@ -11946,29 +11946,29 @@
*/
void removeBymonths(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::bymonth::iri(), object_info); }
/*!
- \fn int firstBymonth()
+ \fn qint64 firstBymonth()
Returns the first property \ref ncal_bymonth "ncal:bymonth". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstBymonth() { return baseFirstObject< ncal::bymonth >(); }
+ qint64 firstBymonth() { return baseFirstObject< ncal::bymonth >(); }
/*!
- \fn void addBymonth(int const &bymonth_)
+ \fn void addBymonth(qint64 const &bymonth_)
Adds the given \a bymonth_ to the property \ref ncal_bymonth "ncal:bymonth" set.
\sa LiveResource::addObject
*/
- void addBymonth(int const &bymonth_) { baseAddObject< ncal::bymonth >( bymonth_ ); }
+ void addBymonth(qint64 const &bymonth_) { baseAddObject< ncal::bymonth >( bymonth_ ); }
/*!
- \fn void removeBymonth(int const &bymonth_)
+ \fn void removeBymonth(qint64 const &bymonth_)
Removes the given \a bymonth_ from the property \ref ncal_bymonth "ncal:bymonth" set.
\sa LiveResource::removeObject
*/
- void removeBymonth(int const &bymonth_) { baseRemoveObject< ncal::bymonth >(bymonth_); }
+ void removeBymonth(qint64 const &bymonth_) { baseRemoveObject< ncal::bymonth >(bymonth_); }
/* Property generated from ncal:interval
* \n The INTERVAL rule part contains a positive integer representing how often the recurrence rule repeats. The default value is '1', meaning every second for a SECONDLY rule, or every minute for a MINUTELY rule, every hour for an HOURLY rule, every day for a DAILY rule, every week for a WEEKLY rule, every month for a MONTHLY rule andevery year for a YEARLY rule. Defined in RFC 2445 sec. 4.3.10
@@ -12012,45 +12012,45 @@
*/
void removeIntervals(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::interval::iri(), object_info); }
/*!
- \fn int getInterval()
+ \fn qint64 getInterval()
- Returns the property \ref ncal_interval "ncal:interval". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref ncal_interval "ncal:interval". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getInterval() { return baseGetObject< ncal::interval >(); }
+ qint64 getInterval() { return baseGetObject< ncal::interval >(); }
/*!
- \fn void setInterval(int const &interval_)
+ \fn void setInterval(qint64 const &interval_)
Sets the property \ref ncal_interval "ncal:interval" to the given \a interval.
\sa LiveResource::setObject
*/
- void setInterval(int const &interval_) { baseSetObject< ncal::interval >( interval_ ); }
+ void setInterval(qint64 const &interval_) { baseSetObject< ncal::interval >( interval_ ); }
/*!
- \fn int firstInterval()
+ \fn qint64 firstInterval()
Returns the first property \ref ncal_interval "ncal:interval". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstInterval() { return baseFirstObject< ncal::interval >(); }
+ qint64 firstInterval() { return baseFirstObject< ncal::interval >(); }
/*!
- \fn void addInterval(int const &interval_)
+ \fn void addInterval(qint64 const &interval_)
Adds the given \a interval_ to the property \ref ncal_interval "ncal:interval" set.
\sa LiveResource::addObject
*/
- void addInterval(int const &interval_) { baseAddObject< ncal::interval >( interval_ ); }
+ void addInterval(qint64 const &interval_) { baseAddObject< ncal::interval >( interval_ ); }
/*!
- \fn void removeInterval(int const &interval_)
+ \fn void removeInterval(qint64 const &interval_)
Removes the given \a interval_ from the property \ref ncal_interval "ncal:interval" set.
\sa LiveResource::removeObject
*/
- void removeInterval(int const &interval_) { baseRemoveObject< ncal::interval >(interval_); }
+ void removeInterval(qint64 const &interval_) { baseRemoveObject< ncal::interval >(interval_); }
/* Property generated from ncal:until
* \n The UNTIL rule part defines a date-time value which bounds the recurrence rule in an inclusive manner. If the value specified by UNTIL is synchronized with the specified recurrence, this date or date-time becomes the last instance of the recurrence. If specified as a date-time value, then it MUST be specified in an UTC time format. If not present, and the COUNT rule part is also not present, the RRULE is considered to repeat forever.
@@ -12175,29 +12175,29 @@
*/
void removeByyeardays(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::byyearday::iri(), object_info); }
/*!
- \fn int firstByyearday()
+ \fn qint64 firstByyearday()
Returns the first property \ref ncal_byyearday "ncal:byyearday". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstByyearday() { return baseFirstObject< ncal::byyearday >(); }
+ qint64 firstByyearday() { return baseFirstObject< ncal::byyearday >(); }
/*!
- \fn void addByyearday(int const &byyearday_)
+ \fn void addByyearday(qint64 const &byyearday_)
Adds the given \a byyearday_ to the property \ref ncal_byyearday "ncal:byyearday" set.
\sa LiveResource::addObject
*/
- void addByyearday(int const &byyearday_) { baseAddObject< ncal::byyearday >( byyearday_ ); }
+ void addByyearday(qint64 const &byyearday_) { baseAddObject< ncal::byyearday >( byyearday_ ); }
/*!
- \fn void removeByyearday(int const &byyearday_)
+ \fn void removeByyearday(qint64 const &byyearday_)
Removes the given \a byyearday_ from the property \ref ncal_byyearday "ncal:byyearday" set.
\sa LiveResource::removeObject
*/
- void removeByyearday(int const &byyearday_) { baseRemoveObject< ncal::byyearday >(byyearday_); }
+ void removeByyearday(qint64 const &byyearday_) { baseRemoveObject< ncal::byyearday >(byyearday_); }
/* Property generated from ncal:byhour
* \n Hour of recurrence. Defined in RFC 2445 sec. 4.3.10
@@ -12240,29 +12240,29 @@
*/
void removeByhours(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::byhour::iri(), object_info); }
/*!
- \fn int firstByhour()
+ \fn qint64 firstByhour()
Returns the first property \ref ncal_byhour "ncal:byhour". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstByhour() { return baseFirstObject< ncal::byhour >(); }
+ qint64 firstByhour() { return baseFirstObject< ncal::byhour >(); }
/*!
- \fn void addByhour(int const &byhour_)
+ \fn void addByhour(qint64 const &byhour_)
Adds the given \a byhour_ to the property \ref ncal_byhour "ncal:byhour" set.
\sa LiveResource::addObject
*/
- void addByhour(int const &byhour_) { baseAddObject< ncal::byhour >( byhour_ ); }
+ void addByhour(qint64 const &byhour_) { baseAddObject< ncal::byhour >( byhour_ ); }
/*!
- \fn void removeByhour(int const &byhour_)
+ \fn void removeByhour(qint64 const &byhour_)
Removes the given \a byhour_ from the property \ref ncal_byhour "ncal:byhour" set.
\sa LiveResource::removeObject
*/
- void removeByhour(int const &byhour_) { baseRemoveObject< ncal::byhour >(byhour_); }
+ void removeByhour(qint64 const &byhour_) { baseRemoveObject< ncal::byhour >(byhour_); }
/* Property generated from ncal:bysetpos
* \n The BYSETPOS rule part specify values which correspond to the nth occurrence within the set of events specified by the rule. Valid values are 1 to 366 or -366 to -1. It MUST only be used in conjunction with another BYxxx rule part. For example 'the last work day of the month' could be represented as: RRULE: FREQ=MONTHLY; BYDAY=MO', 'TU', 'WE', 'TH', 'FR; BYSETPOS=-1. Each BYSETPOS value can include a positive (+n) or negative (-n) integer. If present, this indicates the nth occurrence of the specific occurrence within the set of events specified by the rule. Defined in RFC 2445 sec. 4.3.10
@@ -12305,29 +12305,29 @@
*/
void removeBysetposs(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::bysetpos::iri(), object_info); }
/*!
- \fn int firstBysetpos()
+ \fn qint64 firstBysetpos()
Returns the first property \ref ncal_bysetpos "ncal:bysetpos". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstBysetpos() { return baseFirstObject< ncal::bysetpos >(); }
+ qint64 firstBysetpos() { return baseFirstObject< ncal::bysetpos >(); }
/*!
- \fn void addBysetpos(int const &bysetpos_)
+ \fn void addBysetpos(qint64 const &bysetpos_)
Adds the given \a bysetpos_ to the property \ref ncal_bysetpos "ncal:bysetpos" set.
\sa LiveResource::addObject
*/
- void addBysetpos(int const &bysetpos_) { baseAddObject< ncal::bysetpos >( bysetpos_ ); }
+ void addBysetpos(qint64 const &bysetpos_) { baseAddObject< ncal::bysetpos >( bysetpos_ ); }
/*!
- \fn void removeBysetpos(int const &bysetpos_)
+ \fn void removeBysetpos(qint64 const &bysetpos_)
Removes the given \a bysetpos_ from the property \ref ncal_bysetpos "ncal:bysetpos" set.
\sa LiveResource::removeObject
*/
- void removeBysetpos(int const &bysetpos_) { baseRemoveObject< ncal::bysetpos >(bysetpos_); }
+ void removeBysetpos(qint64 const &bysetpos_) { baseRemoveObject< ncal::bysetpos >(bysetpos_); }
/* Property generated from ncal:byweekno
* \n The number of the week an event should recur. Defined in RFC 2445 sec. 4.3.10
@@ -12370,29 +12370,29 @@
*/
void removeByweeknos(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::byweekno::iri(), object_info); }
/*!
- \fn int firstByweekno()
+ \fn qint64 firstByweekno()
Returns the first property \ref ncal_byweekno "ncal:byweekno". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstByweekno() { return baseFirstObject< ncal::byweekno >(); }
+ qint64 firstByweekno() { return baseFirstObject< ncal::byweekno >(); }
/*!
- \fn void addByweekno(int const &byweekno_)
+ \fn void addByweekno(qint64 const &byweekno_)
Adds the given \a byweekno_ to the property \ref ncal_byweekno "ncal:byweekno" set.
\sa LiveResource::addObject
*/
- void addByweekno(int const &byweekno_) { baseAddObject< ncal::byweekno >( byweekno_ ); }
+ void addByweekno(qint64 const &byweekno_) { baseAddObject< ncal::byweekno >( byweekno_ ); }
/*!
- \fn void removeByweekno(int const &byweekno_)
+ \fn void removeByweekno(qint64 const &byweekno_)
Removes the given \a byweekno_ from the property \ref ncal_byweekno "ncal:byweekno" set.
\sa LiveResource::removeObject
*/
- void removeByweekno(int const &byweekno_) { baseRemoveObject< ncal::byweekno >(byweekno_); }
+ void removeByweekno(qint64 const &byweekno_) { baseRemoveObject< ncal::byweekno >(byweekno_); }
/* Property generated from ncal:bymonthday
* \n Day of the month when the event should recur. Defined in RFC 2445 sec. 4.3.10
@@ -12435,29 +12435,29 @@
*/
void removeBymonthdays(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::bymonthday::iri(), object_info); }
/*!
- \fn int firstBymonthday()
+ \fn qint64 firstBymonthday()
Returns the first property \ref ncal_bymonthday "ncal:bymonthday". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstBymonthday() { return baseFirstObject< ncal::bymonthday >(); }
+ qint64 firstBymonthday() { return baseFirstObject< ncal::bymonthday >(); }
/*!
- \fn void addBymonthday(int const &bymonthday_)
+ \fn void addBymonthday(qint64 const &bymonthday_)
Adds the given \a bymonthday_ to the property \ref ncal_bymonthday "ncal:bymonthday" set.
\sa LiveResource::addObject
*/
- void addBymonthday(int const &bymonthday_) { baseAddObject< ncal::bymonthday >( bymonthday_ ); }
+ void addBymonthday(qint64 const &bymonthday_) { baseAddObject< ncal::bymonthday >( bymonthday_ ); }
/*!
- \fn void removeBymonthday(int const &bymonthday_)
+ \fn void removeBymonthday(qint64 const &bymonthday_)
Removes the given \a bymonthday_ from the property \ref ncal_bymonthday "ncal:bymonthday" set.
\sa LiveResource::removeObject
*/
- void removeBymonthday(int const &bymonthday_) { baseRemoveObject< ncal::bymonthday >(bymonthday_); }
+ void removeBymonthday(qint64 const &bymonthday_) { baseRemoveObject< ncal::bymonthday >(bymonthday_); }
/* Property generated from ncal:byday
* \n Weekdays the recurrence should occur. Defined in RFC 2445 sec. 4.3.10
@@ -12573,29 +12573,29 @@
*/
void removeByminutes(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::byminute::iri(), object_info); }
/*!
- \fn int firstByminute()
+ \fn qint64 firstByminute()
Returns the first property \ref ncal_byminute "ncal:byminute". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstByminute() { return baseFirstObject< ncal::byminute >(); }
+ qint64 firstByminute() { return baseFirstObject< ncal::byminute >(); }
/*!
- \fn void addByminute(int const &byminute_)
+ \fn void addByminute(qint64 const &byminute_)
Adds the given \a byminute_ to the property \ref ncal_byminute "ncal:byminute" set.
\sa LiveResource::addObject
*/
- void addByminute(int const &byminute_) { baseAddObject< ncal::byminute >( byminute_ ); }
+ void addByminute(qint64 const &byminute_) { baseAddObject< ncal::byminute >( byminute_ ); }
/*!
- \fn void removeByminute(int const &byminute_)
+ \fn void removeByminute(qint64 const &byminute_)
Removes the given \a byminute_ from the property \ref ncal_byminute "ncal:byminute" set.
\sa LiveResource::removeObject
*/
- void removeByminute(int const &byminute_) { baseRemoveObject< ncal::byminute >(byminute_); }
+ void removeByminute(qint64 const &byminute_) { baseRemoveObject< ncal::byminute >(byminute_); }
/* Property generated from ncal:count
* \n How many times should an event be repeated. Defined in RFC 2445 sec. 4.3.10
@@ -12639,45 +12639,45 @@
*/
void removeCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::count::iri(), object_info); }
/*!
- \fn int getCount()
+ \fn qint64 getCount()
- Returns the property \ref ncal_count "ncal:count". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref ncal_count "ncal:count". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getCount() { return baseGetObject< ncal::count >(); }
+ qint64 getCount() { return baseGetObject< ncal::count >(); }
/*!
- \fn void setCount(int const &count_)
+ \fn void setCount(qint64 const &count_)
Sets the property \ref ncal_count "ncal:count" to the given \a count.
\sa LiveResource::setObject
*/
- void setCount(int const &count_) { baseSetObject< ncal::count >( count_ ); }
+ void setCount(qint64 const &count_) { baseSetObject< ncal::count >( count_ ); }
/*!
- \fn int firstCount()
+ \fn qint64 firstCount()
Returns the first property \ref ncal_count "ncal:count". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstCount() { return baseFirstObject< ncal::count >(); }
+ qint64 firstCount() { return baseFirstObject< ncal::count >(); }
/*!
- \fn void addCount(int const &count_)
+ \fn void addCount(qint64 const &count_)
Adds the given \a count_ to the property \ref ncal_count "ncal:count" set.
\sa LiveResource::addObject
*/
- void addCount(int const &count_) { baseAddObject< ncal::count >( count_ ); }
+ void addCount(qint64 const &count_) { baseAddObject< ncal::count >( count_ ); }
/*!
- \fn void removeCount(int const &count_)
+ \fn void removeCount(qint64 const &count_)
Removes the given \a count_ from the property \ref ncal_count "ncal:count" set.
\sa LiveResource::removeObject
*/
- void removeCount(int const &count_) { baseRemoveObject< ncal::count >(count_); }
+ void removeCount(qint64 const &count_) { baseRemoveObject< ncal::count >(count_); }
/* Property generated from ncal:freq
* \n Frequency of a recurrence rule. Defined in RFC 2445 sec. 4.3.10
@@ -13925,45 +13925,45 @@
*/
void removePercentCompletes(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::percentComplete::iri(), object_info); }
/*!
- \fn int getPercentComplete()
+ \fn qint64 getPercentComplete()
- Returns the property \ref ncal_percentComplete "ncal:percentComplete". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref ncal_percentComplete "ncal:percentComplete". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getPercentComplete() { return baseGetObject< ncal::percentComplete >(); }
+ qint64 getPercentComplete() { return baseGetObject< ncal::percentComplete >(); }
/*!
- \fn void setPercentComplete(int const &percentComplete_)
+ \fn void setPercentComplete(qint64 const &percentComplete_)
Sets the property \ref ncal_percentComplete "ncal:percentComplete" to the given \a percentComplete.
\sa LiveResource::setObject
*/
- void setPercentComplete(int const &percentComplete_) { baseSetObject< ncal::percentComplete >( percentComplete_ ); }
+ void setPercentComplete(qint64 const &percentComplete_) { baseSetObject< ncal::percentComplete >( percentComplete_ ); }
/*!
- \fn int firstPercentComplete()
+ \fn qint64 firstPercentComplete()
Returns the first property \ref ncal_percentComplete "ncal:percentComplete". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstPercentComplete() { return baseFirstObject< ncal::percentComplete >(); }
+ qint64 firstPercentComplete() { return baseFirstObject< ncal::percentComplete >(); }
/*!
- \fn void addPercentComplete(int const &percentComplete_)
+ \fn void addPercentComplete(qint64 const &percentComplete_)
Adds the given \a percentComplete_ to the property \ref ncal_percentComplete "ncal:percentComplete" set.
\sa LiveResource::addObject
*/
- void addPercentComplete(int const &percentComplete_) { baseAddObject< ncal::percentComplete >( percentComplete_ ); }
+ void addPercentComplete(qint64 const &percentComplete_) { baseAddObject< ncal::percentComplete >( percentComplete_ ); }
/*!
- \fn void removePercentComplete(int const &percentComplete_)
+ \fn void removePercentComplete(qint64 const &percentComplete_)
Removes the given \a percentComplete_ from the property \ref ncal_percentComplete "ncal:percentComplete" set.
\sa LiveResource::removeObject
*/
- void removePercentComplete(int const &percentComplete_) { baseRemoveObject< ncal::percentComplete >(percentComplete_); }
+ void removePercentComplete(qint64 const &percentComplete_) { baseRemoveObject< ncal::percentComplete >(percentComplete_); }
/* Property generated from ncal:completed
* \n This property defines the date and time that a to-do was actually completed. Inspired by RFC 2445 sec. 4.8.2.1. Note that the RFC allows ONLY UTC time values for this property.
@@ -14377,45 +14377,45 @@
*/
void removeTriggerDurations(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(ncal::triggerDuration::iri(), object_info); }
/*!
- \fn int getTriggerDuration()
+ \fn qint64 getTriggerDuration()
- Returns the property \ref ncal_triggerDuration "ncal:triggerDuration". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref ncal_triggerDuration "ncal:triggerDuration". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getTriggerDuration() { return baseGetObject< ncal::triggerDuration >(); }
+ qint64 getTriggerDuration() { return baseGetObject< ncal::triggerDuration >(); }
/*!
- \fn void setTriggerDuration(int const &triggerDuration_)
+ \fn void setTriggerDuration(qint64 const &triggerDuration_)
Sets the property \ref ncal_triggerDuration "ncal:triggerDuration" to the given \a triggerDuration.
\sa LiveResource::setObject
*/
- void setTriggerDuration(int const &triggerDuration_) { baseSetObject< ncal::triggerDuration >( triggerDuration_ ); }
+ void setTriggerDuration(qint64 const &triggerDuration_) { baseSetObject< ncal::triggerDuration >( triggerDuration_ ); }
/*!
- \fn int firstTriggerDuration()
+ \fn qint64 firstTriggerDuration()
Returns the first property \ref ncal_triggerDuration "ncal:triggerDuration". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstTriggerDuration() { return baseFirstObject< ncal::triggerDuration >(); }
+ qint64 firstTriggerDuration() { return baseFirstObject< ncal::triggerDuration >(); }
/*!
- \fn void addTriggerDuration(int const &triggerDuration_)
+ \fn void addTriggerDuration(qint64 const &triggerDuration_)
Adds the given \a triggerDuration_ to the property \ref ncal_triggerDuration "ncal:triggerDuration" set.
\sa LiveResource::addObject
*/
- void addTriggerDuration(int const &triggerDuration_) { baseAddObject< ncal::triggerDuration >( triggerDuration_ ); }
+ void addTriggerDuration(qint64 const &triggerDuration_) { baseAddObject< ncal::triggerDuration >( triggerDuration_ ); }
/*!
- \fn void removeTriggerDuration(int const &triggerDuration_)
+ \fn void removeTriggerDuration(qint64 const &triggerDuration_)
Removes the given \a triggerDuration_ from the property \ref ncal_triggerDuration "ncal:triggerDuration" set.
\sa LiveResource::removeObject
*/
- void removeTriggerDuration(int const &triggerDuration_) { baseRemoveObject< ncal::triggerDuration >(triggerDuration_); }
+ void removeTriggerDuration(qint64 const &triggerDuration_) { baseRemoveObject< ncal::triggerDuration >(triggerDuration_); }
/* Property generated from ncal:triggerDateTime
* \n The exact date and time of the trigger. This property has been created to express the VALUE=DATE, and VALUE=DATE-TIME parameters of the TRIGGER property. See the documentation for ncal:trigger for more details
--- src/include/QtTracker/ontologies/nco.h
+++ src/include/QtTracker/ontologies/nco.h
@@ -1,7 +1,7 @@
/*
* nco.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:26.253172
+ * Automatically created on: 2010-11-01 14:52:11.440391
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/nco.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
--- src/include/QtTracker/ontologies/nfo.h
+++ src/include/QtTracker/ontologies/nfo.h
@@ -1,7 +1,7 @@
/*
* nfo.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:34.747325
+ * Automatically created on: 2010-11-01 14:52:11.735437
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/nfo.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -191,7 +191,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Archive RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -259,7 +259,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Audio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -294,7 +294,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Audio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -329,7 +329,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Audio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -364,7 +364,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Audio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -399,7 +399,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Audio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -434,7 +434,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Audio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -537,7 +537,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Audio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -571,7 +571,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Audio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -605,7 +605,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Audio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -673,7 +673,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Bookmark RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -706,7 +706,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Bookmark RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -739,7 +739,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Bookmark RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -772,7 +772,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Bookmark RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1185,7 +1185,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef FileDataObject RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1567,7 +1567,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Image RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1601,7 +1601,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Image RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1699,7 +1699,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Media RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1733,7 +1733,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Media RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2252,7 +2252,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MediaList RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2287,7 +2287,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MediaList RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2354,7 +2354,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef PaginatedTextDocument RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2559,7 +2559,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef SourceCode RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2728,7 +2728,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef TextDocument RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2762,7 +2762,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef TextDocument RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2796,7 +2796,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef TextDocument RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2865,7 +2865,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Video RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -3069,7 +3069,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Visual RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -3103,7 +3103,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Visual RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -3138,7 +3138,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Visual RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -4100,45 +4100,45 @@
*/
void removeUncompressedSizes(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::uncompressedSize::iri(), object_info); }
/*!
- \fn int getUncompressedSize()
+ \fn qint64 getUncompressedSize()
- Returns the property \ref nfo_uncompressedSize "nfo:uncompressedSize". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_uncompressedSize "nfo:uncompressedSize". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getUncompressedSize() { return baseGetObject< nfo::uncompressedSize >(); }
+ qint64 getUncompressedSize() { return baseGetObject< nfo::uncompressedSize >(); }
/*!
- \fn void setUncompressedSize(int const &uncompressedSize_)
+ \fn void setUncompressedSize(qint64 const &uncompressedSize_)
Sets the property \ref nfo_uncompressedSize "nfo:uncompressedSize" to the given \a uncompressedSize.
\sa LiveResource::setObject
*/
- void setUncompressedSize(int const &uncompressedSize_) { baseSetObject< nfo::uncompressedSize >( uncompressedSize_ ); }
+ void setUncompressedSize(qint64 const &uncompressedSize_) { baseSetObject< nfo::uncompressedSize >( uncompressedSize_ ); }
/*!
- \fn int firstUncompressedSize()
+ \fn qint64 firstUncompressedSize()
Returns the first property \ref nfo_uncompressedSize "nfo:uncompressedSize". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstUncompressedSize() { return baseFirstObject< nfo::uncompressedSize >(); }
+ qint64 firstUncompressedSize() { return baseFirstObject< nfo::uncompressedSize >(); }
/*!
- \fn void addUncompressedSize(int const &uncompressedSize_)
+ \fn void addUncompressedSize(qint64 const &uncompressedSize_)
Adds the given \a uncompressedSize_ to the property \ref nfo_uncompressedSize "nfo:uncompressedSize" set.
\sa LiveResource::addObject
*/
- void addUncompressedSize(int const &uncompressedSize_) { baseAddObject< nfo::uncompressedSize >( uncompressedSize_ ); }
+ void addUncompressedSize(qint64 const &uncompressedSize_) { baseAddObject< nfo::uncompressedSize >( uncompressedSize_ ); }
/*!
- \fn void removeUncompressedSize(int const &uncompressedSize_)
+ \fn void removeUncompressedSize(qint64 const &uncompressedSize_)
Removes the given \a uncompressedSize_ from the property \ref nfo_uncompressedSize "nfo:uncompressedSize" set.
\sa LiveResource::removeObject
*/
- void removeUncompressedSize(int const &uncompressedSize_) { baseRemoveObject< nfo::uncompressedSize >(uncompressedSize_); }
+ void removeUncompressedSize(qint64 const &uncompressedSize_) { baseRemoveObject< nfo::uncompressedSize >(uncompressedSize_); }
//@}
};
@@ -4756,45 +4756,45 @@
*/
void removeFileSizes(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::fileSize::iri(), object_info); }
/*!
- \fn int getFileSize()
+ \fn qint64 getFileSize()
- Returns the property \ref nfo_fileSize "nfo:fileSize". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_fileSize "nfo:fileSize". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getFileSize() { return baseGetObject< nfo::fileSize >(); }
+ qint64 getFileSize() { return baseGetObject< nfo::fileSize >(); }
/*!
- \fn void setFileSize(int const &fileSize_)
+ \fn void setFileSize(qint64 const &fileSize_)
Sets the property \ref nfo_fileSize "nfo:fileSize" to the given \a fileSize.
\sa LiveResource::setObject
*/
- void setFileSize(int const &fileSize_) { baseSetObject< nfo::fileSize >( fileSize_ ); }
+ void setFileSize(qint64 const &fileSize_) { baseSetObject< nfo::fileSize >( fileSize_ ); }
/*!
- \fn int firstFileSize()
+ \fn qint64 firstFileSize()
Returns the first property \ref nfo_fileSize "nfo:fileSize". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstFileSize() { return baseFirstObject< nfo::fileSize >(); }
+ qint64 firstFileSize() { return baseFirstObject< nfo::fileSize >(); }
/*!
- \fn void addFileSize(int const &fileSize_)
+ \fn void addFileSize(qint64 const &fileSize_)
Adds the given \a fileSize_ to the property \ref nfo_fileSize "nfo:fileSize" set.
\sa LiveResource::addObject
*/
- void addFileSize(int const &fileSize_) { baseAddObject< nfo::fileSize >( fileSize_ ); }
+ void addFileSize(qint64 const &fileSize_) { baseAddObject< nfo::fileSize >( fileSize_ ); }
/*!
- \fn void removeFileSize(int const &fileSize_)
+ \fn void removeFileSize(qint64 const &fileSize_)
Removes the given \a fileSize_ from the property \ref nfo_fileSize "nfo:fileSize" set.
\sa LiveResource::removeObject
*/
- void removeFileSize(int const &fileSize_) { baseRemoveObject< nfo::fileSize >(fileSize_); }
+ void removeFileSize(qint64 const &fileSize_) { baseRemoveObject< nfo::fileSize >(fileSize_); }
/* Property generated from nfo:fileName
* \n Name of the file, together with the extension
@@ -6310,45 +6310,45 @@
*/
void removeCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::count::iri(), object_info); }
/*!
- \fn int getCount()
+ \fn qint64 getCount()
- Returns the property \ref nfo_count "nfo:count". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_count "nfo:count". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getCount() { return baseGetObject< nfo::count >(); }
+ qint64 getCount() { return baseGetObject< nfo::count >(); }
/*!
- \fn void setCount(int const &count_)
+ \fn void setCount(qint64 const &count_)
Sets the property \ref nfo_count "nfo:count" to the given \a count.
\sa LiveResource::setObject
*/
- void setCount(int const &count_) { baseSetObject< nfo::count >( count_ ); }
+ void setCount(qint64 const &count_) { baseSetObject< nfo::count >( count_ ); }
/*!
- \fn int firstCount()
+ \fn qint64 firstCount()
Returns the first property \ref nfo_count "nfo:count". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstCount() { return baseFirstObject< nfo::count >(); }
+ qint64 firstCount() { return baseFirstObject< nfo::count >(); }
/*!
- \fn void addCount(int const &count_)
+ \fn void addCount(qint64 const &count_)
Adds the given \a count_ to the property \ref nfo_count "nfo:count" set.
\sa LiveResource::addObject
*/
- void addCount(int const &count_) { baseAddObject< nfo::count >( count_ ); }
+ void addCount(qint64 const &count_) { baseAddObject< nfo::count >( count_ ); }
/*!
- \fn void removeCount(int const &count_)
+ \fn void removeCount(qint64 const &count_)
Removes the given \a count_ from the property \ref nfo_count "nfo:count" set.
\sa LiveResource::removeObject
*/
- void removeCount(int const &count_) { baseRemoveObject< nfo::count >(count_); }
+ void removeCount(qint64 const &count_) { baseRemoveObject< nfo::count >(count_); }
/* Property generated from nfo:averageBitrate
* \n The average overall bitrate of a media container. (i.e. the size of the piece of media in bits, divided by it's duration expressed in seconds).
@@ -6473,45 +6473,45 @@
*/
void removeNmmSkipCounters(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::skipCounter::iri(), object_info); }
/*!
- \fn int getNmmSkipCounter()
+ \fn qint64 getNmmSkipCounter()
- Returns the property \ref nmm_skipCounter "nmm:skipCounter". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_skipCounter "nmm:skipCounter". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getNmmSkipCounter() { return baseGetObject< nmm::skipCounter >(); }
+ qint64 getNmmSkipCounter() { return baseGetObject< nmm::skipCounter >(); }
/*!
- \fn void setNmmSkipCounter(int const &nmmSkipCounter_)
+ \fn void setNmmSkipCounter(qint64 const &nmmSkipCounter_)
Sets the property \ref nmm_skipCounter "nmm:skipCounter" to the given \a nmmSkipCounter.
\sa LiveResource::setObject
*/
- void setNmmSkipCounter(int const &nmmSkipCounter_) { baseSetObject< nmm::skipCounter >( nmmSkipCounter_ ); }
+ void setNmmSkipCounter(qint64 const &nmmSkipCounter_) { baseSetObject< nmm::skipCounter >( nmmSkipCounter_ ); }
/*!
- \fn int firstNmmSkipCounter()
+ \fn qint64 firstNmmSkipCounter()
Returns the first property \ref nmm_skipCounter "nmm:skipCounter". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstNmmSkipCounter() { return baseFirstObject< nmm::skipCounter >(); }
+ qint64 firstNmmSkipCounter() { return baseFirstObject< nmm::skipCounter >(); }
/*!
- \fn void addNmmSkipCounter(int const &nmmSkipCounter_)
+ \fn void addNmmSkipCounter(qint64 const &nmmSkipCounter_)
Adds the given \a nmmSkipCounter_ to the property \ref nmm_skipCounter "nmm:skipCounter" set.
\sa LiveResource::addObject
*/
- void addNmmSkipCounter(int const &nmmSkipCounter_) { baseAddObject< nmm::skipCounter >( nmmSkipCounter_ ); }
+ void addNmmSkipCounter(qint64 const &nmmSkipCounter_) { baseAddObject< nmm::skipCounter >( nmmSkipCounter_ ); }
/*!
- \fn void removeNmmSkipCounter(int const &nmmSkipCounter_)
+ \fn void removeNmmSkipCounter(qint64 const &nmmSkipCounter_)
Removes the given \a nmmSkipCounter_ from the property \ref nmm_skipCounter "nmm:skipCounter" set.
\sa LiveResource::removeObject
*/
- void removeNmmSkipCounter(int const &nmmSkipCounter_) { baseRemoveObject< nmm::skipCounter >(nmmSkipCounter_); }
+ void removeNmmSkipCounter(qint64 const &nmmSkipCounter_) { baseRemoveObject< nmm::skipCounter >(nmmSkipCounter_); }
/* Property generated from nfo:duration
* \n Duration of a media piece.
@@ -6555,45 +6555,45 @@
*/
void removeDurations(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::duration::iri(), object_info); }
/*!
- \fn int getDuration()
+ \fn qint64 getDuration()
- Returns the property \ref nfo_duration "nfo:duration". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_duration "nfo:duration". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getDuration() { return baseGetObject< nfo::duration >(); }
+ qint64 getDuration() { return baseGetObject< nfo::duration >(); }
/*!
- \fn void setDuration(int const &duration_)
+ \fn void setDuration(qint64 const &duration_)
Sets the property \ref nfo_duration "nfo:duration" to the given \a duration.
\sa LiveResource::setObject
*/
- void setDuration(int const &duration_) { baseSetObject< nfo::duration >( duration_ ); }
+ void setDuration(qint64 const &duration_) { baseSetObject< nfo::duration >( duration_ ); }
/*!
- \fn int firstDuration()
+ \fn qint64 firstDuration()
Returns the first property \ref nfo_duration "nfo:duration". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstDuration() { return baseFirstObject< nfo::duration >(); }
+ qint64 firstDuration() { return baseFirstObject< nfo::duration >(); }
/*!
- \fn void addDuration(int const &duration_)
+ \fn void addDuration(qint64 const &duration_)
Adds the given \a duration_ to the property \ref nfo_duration "nfo:duration" set.
\sa LiveResource::addObject
*/
- void addDuration(int const &duration_) { baseAddObject< nfo::duration >( duration_ ); }
+ void addDuration(qint64 const &duration_) { baseAddObject< nfo::duration >( duration_ ); }
/*!
- \fn void removeDuration(int const &duration_)
+ \fn void removeDuration(qint64 const &duration_)
Removes the given \a duration_ from the property \ref nfo_duration "nfo:duration" set.
\sa LiveResource::removeObject
*/
- void removeDuration(int const &duration_) { baseRemoveObject< nfo::duration >(duration_); }
+ void removeDuration(qint64 const &duration_) { baseRemoveObject< nfo::duration >(duration_); }
/* Property generated from nfo:compressionType
* \n The type of the compression. Values include, lossy and lossless.
@@ -7122,45 +7122,45 @@
*/
void removeRearChannelss(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::rearChannels::iri(), object_info); }
/*!
- \fn int getRearChannels()
+ \fn qint64 getRearChannels()
- Returns the property \ref nfo_rearChannels "nfo:rearChannels". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_rearChannels "nfo:rearChannels". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getRearChannels() { return baseGetObject< nfo::rearChannels >(); }
+ qint64 getRearChannels() { return baseGetObject< nfo::rearChannels >(); }
/*!
- \fn void setRearChannels(int const &rearChannels_)
+ \fn void setRearChannels(qint64 const &rearChannels_)
Sets the property \ref nfo_rearChannels "nfo:rearChannels" to the given \a rearChannels.
\sa LiveResource::setObject
*/
- void setRearChannels(int const &rearChannels_) { baseSetObject< nfo::rearChannels >( rearChannels_ ); }
+ void setRearChannels(qint64 const &rearChannels_) { baseSetObject< nfo::rearChannels >( rearChannels_ ); }
/*!
- \fn int firstRearChannels()
+ \fn qint64 firstRearChannels()
Returns the first property \ref nfo_rearChannels "nfo:rearChannels". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstRearChannels() { return baseFirstObject< nfo::rearChannels >(); }
+ qint64 firstRearChannels() { return baseFirstObject< nfo::rearChannels >(); }
/*!
- \fn void addRearChannels(int const &rearChannels_)
+ \fn void addRearChannels(qint64 const &rearChannels_)
Adds the given \a rearChannels_ to the property \ref nfo_rearChannels "nfo:rearChannels" set.
\sa LiveResource::addObject
*/
- void addRearChannels(int const &rearChannels_) { baseAddObject< nfo::rearChannels >( rearChannels_ ); }
+ void addRearChannels(qint64 const &rearChannels_) { baseAddObject< nfo::rearChannels >( rearChannels_ ); }
/*!
- \fn void removeRearChannels(int const &rearChannels_)
+ \fn void removeRearChannels(qint64 const &rearChannels_)
Removes the given \a rearChannels_ from the property \ref nfo_rearChannels "nfo:rearChannels" set.
\sa LiveResource::removeObject
*/
- void removeRearChannels(int const &rearChannels_) { baseRemoveObject< nfo::rearChannels >(rearChannels_); }
+ void removeRearChannels(qint64 const &rearChannels_) { baseRemoveObject< nfo::rearChannels >(rearChannels_); }
/* Property generated from nfo:bitsPerSample
* \n Amount of bits in each audio sample.
@@ -7205,45 +7205,45 @@
*/
void removeBitsPerSamples(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::bitsPerSample::iri(), object_info); }
/*!
- \fn int getBitsPerSample()
+ \fn qint64 getBitsPerSample()
- Returns the property \ref nfo_bitsPerSample "nfo:bitsPerSample". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_bitsPerSample "nfo:bitsPerSample". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getBitsPerSample() { return baseGetObject< nfo::bitsPerSample >(); }
+ qint64 getBitsPerSample() { return baseGetObject< nfo::bitsPerSample >(); }
/*!
- \fn void setBitsPerSample(int const &bitsPerSample_)
+ \fn void setBitsPerSample(qint64 const &bitsPerSample_)
Sets the property \ref nfo_bitsPerSample "nfo:bitsPerSample" to the given \a bitsPerSample.
\sa LiveResource::setObject
*/
- void setBitsPerSample(int const &bitsPerSample_) { baseSetObject< nfo::bitsPerSample >( bitsPerSample_ ); }
+ void setBitsPerSample(qint64 const &bitsPerSample_) { baseSetObject< nfo::bitsPerSample >( bitsPerSample_ ); }
/*!
- \fn int firstBitsPerSample()
+ \fn qint64 firstBitsPerSample()
Returns the first property \ref nfo_bitsPerSample "nfo:bitsPerSample". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstBitsPerSample() { return baseFirstObject< nfo::bitsPerSample >(); }
+ qint64 firstBitsPerSample() { return baseFirstObject< nfo::bitsPerSample >(); }
/*!
- \fn void addBitsPerSample(int const &bitsPerSample_)
+ \fn void addBitsPerSample(qint64 const &bitsPerSample_)
Adds the given \a bitsPerSample_ to the property \ref nfo_bitsPerSample "nfo:bitsPerSample" set.
\sa LiveResource::addObject
*/
- void addBitsPerSample(int const &bitsPerSample_) { baseAddObject< nfo::bitsPerSample >( bitsPerSample_ ); }
+ void addBitsPerSample(qint64 const &bitsPerSample_) { baseAddObject< nfo::bitsPerSample >( bitsPerSample_ ); }
/*!
- \fn void removeBitsPerSample(int const &bitsPerSample_)
+ \fn void removeBitsPerSample(qint64 const &bitsPerSample_)
Removes the given \a bitsPerSample_ from the property \ref nfo_bitsPerSample "nfo:bitsPerSample" set.
\sa LiveResource::removeObject
*/
- void removeBitsPerSample(int const &bitsPerSample_) { baseRemoveObject< nfo::bitsPerSample >(bitsPerSample_); }
+ void removeBitsPerSample(qint64 const &bitsPerSample_) { baseRemoveObject< nfo::bitsPerSample >(bitsPerSample_); }
/* Property generated from nfo:sampleRate
* \n The amount of audio samples per second.
@@ -7369,45 +7369,45 @@
*/
void removePeakGains(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::peakGain::iri(), object_info); }
/*!
- \fn int getPeakGain()
+ \fn qint64 getPeakGain()
- Returns the property \ref nfo_peakGain "nfo:peakGain". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_peakGain "nfo:peakGain". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getPeakGain() { return baseGetObject< nfo::peakGain >(); }
+ qint64 getPeakGain() { return baseGetObject< nfo::peakGain >(); }
/*!
- \fn void setPeakGain(int const &peakGain_)
+ \fn void setPeakGain(qint64 const &peakGain_)
Sets the property \ref nfo_peakGain "nfo:peakGain" to the given \a peakGain.
\sa LiveResource::setObject
*/
- void setPeakGain(int const &peakGain_) { baseSetObject< nfo::peakGain >( peakGain_ ); }
+ void setPeakGain(qint64 const &peakGain_) { baseSetObject< nfo::peakGain >( peakGain_ ); }
/*!
- \fn int firstPeakGain()
+ \fn qint64 firstPeakGain()
Returns the first property \ref nfo_peakGain "nfo:peakGain". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstPeakGain() { return baseFirstObject< nfo::peakGain >(); }
+ qint64 firstPeakGain() { return baseFirstObject< nfo::peakGain >(); }
/*!
- \fn void addPeakGain(int const &peakGain_)
+ \fn void addPeakGain(qint64 const &peakGain_)
Adds the given \a peakGain_ to the property \ref nfo_peakGain "nfo:peakGain" set.
\sa LiveResource::addObject
*/
- void addPeakGain(int const &peakGain_) { baseAddObject< nfo::peakGain >( peakGain_ ); }
+ void addPeakGain(qint64 const &peakGain_) { baseAddObject< nfo::peakGain >( peakGain_ ); }
/*!
- \fn void removePeakGain(int const &peakGain_)
+ \fn void removePeakGain(qint64 const &peakGain_)
Removes the given \a peakGain_ from the property \ref nfo_peakGain "nfo:peakGain" set.
\sa LiveResource::removeObject
*/
- void removePeakGain(int const &peakGain_) { baseRemoveObject< nfo::peakGain >(peakGain_); }
+ void removePeakGain(qint64 const &peakGain_) { baseRemoveObject< nfo::peakGain >(peakGain_); }
/* Property generated from nfo:averageAudioBitrate
* \n The average overall bitrate of a media container. (i.e. the size of the piece of media in bits, divided by it's duration expressed in seconds).
@@ -7534,45 +7534,45 @@
*/
void removeLfeChannelss(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::lfeChannels::iri(), object_info); }
/*!
- \fn int getLfeChannels()
+ \fn qint64 getLfeChannels()
- Returns the property \ref nfo_lfeChannels "nfo:lfeChannels". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_lfeChannels "nfo:lfeChannels". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getLfeChannels() { return baseGetObject< nfo::lfeChannels >(); }
+ qint64 getLfeChannels() { return baseGetObject< nfo::lfeChannels >(); }
/*!
- \fn void setLfeChannels(int const &lfeChannels_)
+ \fn void setLfeChannels(qint64 const &lfeChannels_)
Sets the property \ref nfo_lfeChannels "nfo:lfeChannels" to the given \a lfeChannels.
\sa LiveResource::setObject
*/
- void setLfeChannels(int const &lfeChannels_) { baseSetObject< nfo::lfeChannels >( lfeChannels_ ); }
+ void setLfeChannels(qint64 const &lfeChannels_) { baseSetObject< nfo::lfeChannels >( lfeChannels_ ); }
/*!
- \fn int firstLfeChannels()
+ \fn qint64 firstLfeChannels()
Returns the first property \ref nfo_lfeChannels "nfo:lfeChannels". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstLfeChannels() { return baseFirstObject< nfo::lfeChannels >(); }
+ qint64 firstLfeChannels() { return baseFirstObject< nfo::lfeChannels >(); }
/*!
- \fn void addLfeChannels(int const &lfeChannels_)
+ \fn void addLfeChannels(qint64 const &lfeChannels_)
Adds the given \a lfeChannels_ to the property \ref nfo_lfeChannels "nfo:lfeChannels" set.
\sa LiveResource::addObject
*/
- void addLfeChannels(int const &lfeChannels_) { baseAddObject< nfo::lfeChannels >( lfeChannels_ ); }
+ void addLfeChannels(qint64 const &lfeChannels_) { baseAddObject< nfo::lfeChannels >( lfeChannels_ ); }
/*!
- \fn void removeLfeChannels(int const &lfeChannels_)
+ \fn void removeLfeChannels(qint64 const &lfeChannels_)
Removes the given \a lfeChannels_ from the property \ref nfo_lfeChannels "nfo:lfeChannels" set.
\sa LiveResource::removeObject
*/
- void removeLfeChannels(int const &lfeChannels_) { baseRemoveObject< nfo::lfeChannels >(lfeChannels_); }
+ void removeLfeChannels(qint64 const &lfeChannels_) { baseRemoveObject< nfo::lfeChannels >(lfeChannels_); }
/* Property generated from nfo:gain
* \n Gain of media
@@ -7616,45 +7616,45 @@
*/
void removeGains(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::gain::iri(), object_info); }
/*!
- \fn int getGain()
+ \fn qint64 getGain()
- Returns the property \ref nfo_gain "nfo:gain". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_gain "nfo:gain". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getGain() { return baseGetObject< nfo::gain >(); }
+ qint64 getGain() { return baseGetObject< nfo::gain >(); }
/*!
- \fn void setGain(int const &gain_)
+ \fn void setGain(qint64 const &gain_)
Sets the property \ref nfo_gain "nfo:gain" to the given \a gain.
\sa LiveResource::setObject
*/
- void setGain(int const &gain_) { baseSetObject< nfo::gain >( gain_ ); }
+ void setGain(qint64 const &gain_) { baseSetObject< nfo::gain >( gain_ ); }
/*!
- \fn int firstGain()
+ \fn qint64 firstGain()
Returns the first property \ref nfo_gain "nfo:gain". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstGain() { return baseFirstObject< nfo::gain >(); }
+ qint64 firstGain() { return baseFirstObject< nfo::gain >(); }
/*!
- \fn void addGain(int const &gain_)
+ \fn void addGain(qint64 const &gain_)
Adds the given \a gain_ to the property \ref nfo_gain "nfo:gain" set.
\sa LiveResource::addObject
*/
- void addGain(int const &gain_) { baseAddObject< nfo::gain >( gain_ ); }
+ void addGain(qint64 const &gain_) { baseAddObject< nfo::gain >( gain_ ); }
/*!
- \fn void removeGain(int const &gain_)
+ \fn void removeGain(qint64 const &gain_)
Removes the given \a gain_ from the property \ref nfo_gain "nfo:gain" set.
\sa LiveResource::removeObject
*/
- void removeGain(int const &gain_) { baseRemoveObject< nfo::gain >(gain_); }
+ void removeGain(qint64 const &gain_) { baseRemoveObject< nfo::gain >(gain_); }
/* Property generated from nfo:channels
* \n Number of channels. This property is to be used directly if no detailed information is necessary. Otherwise use more detailed subproperties.
@@ -7698,45 +7698,45 @@
*/
void removeChannelss(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::channels::iri(), object_info); }
/*!
- \fn int getChannels()
+ \fn qint64 getChannels()
- Returns the property \ref nfo_channels "nfo:channels". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_channels "nfo:channels". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getChannels() { return baseGetObject< nfo::channels >(); }
+ qint64 getChannels() { return baseGetObject< nfo::channels >(); }
/*!
- \fn void setChannels(int const &channels_)
+ \fn void setChannels(qint64 const &channels_)
Sets the property \ref nfo_channels "nfo:channels" to the given \a channels.
\sa LiveResource::setObject
*/
- void setChannels(int const &channels_) { baseSetObject< nfo::channels >( channels_ ); }
+ void setChannels(qint64 const &channels_) { baseSetObject< nfo::channels >( channels_ ); }
/*!
- \fn int firstChannels()
+ \fn qint64 firstChannels()
Returns the first property \ref nfo_channels "nfo:channels". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstChannels() { return baseFirstObject< nfo::channels >(); }
+ qint64 firstChannels() { return baseFirstObject< nfo::channels >(); }
/*!
- \fn void addChannels(int const &channels_)
+ \fn void addChannels(qint64 const &channels_)
Adds the given \a channels_ to the property \ref nfo_channels "nfo:channels" set.
\sa LiveResource::addObject
*/
- void addChannels(int const &channels_) { baseAddObject< nfo::channels >( channels_ ); }
+ void addChannels(qint64 const &channels_) { baseAddObject< nfo::channels >( channels_ ); }
/*!
- \fn void removeChannels(int const &channels_)
+ \fn void removeChannels(qint64 const &channels_)
Removes the given \a channels_ from the property \ref nfo_channels "nfo:channels" set.
\sa LiveResource::removeObject
*/
- void removeChannels(int const &channels_) { baseRemoveObject< nfo::channels >(channels_); }
+ void removeChannels(qint64 const &channels_) { baseRemoveObject< nfo::channels >(channels_); }
/* Property generated from nfo:frontChannels
* \n Number of front channels.
@@ -7781,45 +7781,45 @@
*/
void removeFrontChannelss(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::frontChannels::iri(), object_info); }
/*!
- \fn int getFrontChannels()
+ \fn qint64 getFrontChannels()
- Returns the property \ref nfo_frontChannels "nfo:frontChannels". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_frontChannels "nfo:frontChannels". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getFrontChannels() { return baseGetObject< nfo::frontChannels >(); }
+ qint64 getFrontChannels() { return baseGetObject< nfo::frontChannels >(); }
/*!
- \fn void setFrontChannels(int const &frontChannels_)
+ \fn void setFrontChannels(qint64 const &frontChannels_)
Sets the property \ref nfo_frontChannels "nfo:frontChannels" to the given \a frontChannels.
\sa LiveResource::setObject
*/
- void setFrontChannels(int const &frontChannels_) { baseSetObject< nfo::frontChannels >( frontChannels_ ); }
+ void setFrontChannels(qint64 const &frontChannels_) { baseSetObject< nfo::frontChannels >( frontChannels_ ); }
/*!
- \fn int firstFrontChannels()
+ \fn qint64 firstFrontChannels()
Returns the first property \ref nfo_frontChannels "nfo:frontChannels". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstFrontChannels() { return baseFirstObject< nfo::frontChannels >(); }
+ qint64 firstFrontChannels() { return baseFirstObject< nfo::frontChannels >(); }
/*!
- \fn void addFrontChannels(int const &frontChannels_)
+ \fn void addFrontChannels(qint64 const &frontChannels_)
Adds the given \a frontChannels_ to the property \ref nfo_frontChannels "nfo:frontChannels" set.
\sa LiveResource::addObject
*/
- void addFrontChannels(int const &frontChannels_) { baseAddObject< nfo::frontChannels >( frontChannels_ ); }
+ void addFrontChannels(qint64 const &frontChannels_) { baseAddObject< nfo::frontChannels >( frontChannels_ ); }
/*!
- \fn void removeFrontChannels(int const &frontChannels_)
+ \fn void removeFrontChannels(qint64 const &frontChannels_)
Removes the given \a frontChannels_ from the property \ref nfo_frontChannels "nfo:frontChannels" set.
\sa LiveResource::removeObject
*/
- void removeFrontChannels(int const &frontChannels_) { baseRemoveObject< nfo::frontChannels >(frontChannels_); }
+ void removeFrontChannels(qint64 const &frontChannels_) { baseRemoveObject< nfo::frontChannels >(frontChannels_); }
/* Property generated from nfo:sideChannels
* \n Number of side channels
@@ -7864,45 +7864,45 @@
*/
void removeSideChannelss(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::sideChannels::iri(), object_info); }
/*!
- \fn int getSideChannels()
+ \fn qint64 getSideChannels()
- Returns the property \ref nfo_sideChannels "nfo:sideChannels". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_sideChannels "nfo:sideChannels". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getSideChannels() { return baseGetObject< nfo::sideChannels >(); }
+ qint64 getSideChannels() { return baseGetObject< nfo::sideChannels >(); }
/*!
- \fn void setSideChannels(int const &sideChannels_)
+ \fn void setSideChannels(qint64 const &sideChannels_)
Sets the property \ref nfo_sideChannels "nfo:sideChannels" to the given \a sideChannels.
\sa LiveResource::setObject
*/
- void setSideChannels(int const &sideChannels_) { baseSetObject< nfo::sideChannels >( sideChannels_ ); }
+ void setSideChannels(qint64 const &sideChannels_) { baseSetObject< nfo::sideChannels >( sideChannels_ ); }
/*!
- \fn int firstSideChannels()
+ \fn qint64 firstSideChannels()
Returns the first property \ref nfo_sideChannels "nfo:sideChannels". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstSideChannels() { return baseFirstObject< nfo::sideChannels >(); }
+ qint64 firstSideChannels() { return baseFirstObject< nfo::sideChannels >(); }
/*!
- \fn void addSideChannels(int const &sideChannels_)
+ \fn void addSideChannels(qint64 const &sideChannels_)
Adds the given \a sideChannels_ to the property \ref nfo_sideChannels "nfo:sideChannels" set.
\sa LiveResource::addObject
*/
- void addSideChannels(int const &sideChannels_) { baseAddObject< nfo::sideChannels >( sideChannels_ ); }
+ void addSideChannels(qint64 const &sideChannels_) { baseAddObject< nfo::sideChannels >( sideChannels_ ); }
/*!
- \fn void removeSideChannels(int const &sideChannels_)
+ \fn void removeSideChannels(qint64 const &sideChannels_)
Removes the given \a sideChannels_ from the property \ref nfo_sideChannels "nfo:sideChannels" set.
\sa LiveResource::removeObject
*/
- void removeSideChannels(int const &sideChannels_) { baseRemoveObject< nfo::sideChannels >(sideChannels_); }
+ void removeSideChannels(qint64 const &sideChannels_) { baseRemoveObject< nfo::sideChannels >(sideChannels_); }
/* Property generated from nfo:sampleCount
* \n The amount of samples in an audio clip.
@@ -7947,45 +7947,45 @@
*/
void removeSampleCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::sampleCount::iri(), object_info); }
/*!
- \fn int getSampleCount()
+ \fn qint64 getSampleCount()
- Returns the property \ref nfo_sampleCount "nfo:sampleCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_sampleCount "nfo:sampleCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getSampleCount() { return baseGetObject< nfo::sampleCount >(); }
+ qint64 getSampleCount() { return baseGetObject< nfo::sampleCount >(); }
/*!
- \fn void setSampleCount(int const &sampleCount_)
+ \fn void setSampleCount(qint64 const &sampleCount_)
Sets the property \ref nfo_sampleCount "nfo:sampleCount" to the given \a sampleCount.
\sa LiveResource::setObject
*/
- void setSampleCount(int const &sampleCount_) { baseSetObject< nfo::sampleCount >( sampleCount_ ); }
+ void setSampleCount(qint64 const &sampleCount_) { baseSetObject< nfo::sampleCount >( sampleCount_ ); }
/*!
- \fn int firstSampleCount()
+ \fn qint64 firstSampleCount()
Returns the first property \ref nfo_sampleCount "nfo:sampleCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstSampleCount() { return baseFirstObject< nfo::sampleCount >(); }
+ qint64 firstSampleCount() { return baseFirstObject< nfo::sampleCount >(); }
/*!
- \fn void addSampleCount(int const &sampleCount_)
+ \fn void addSampleCount(qint64 const &sampleCount_)
Adds the given \a sampleCount_ to the property \ref nfo_sampleCount "nfo:sampleCount" set.
\sa LiveResource::addObject
*/
- void addSampleCount(int const &sampleCount_) { baseAddObject< nfo::sampleCount >( sampleCount_ ); }
+ void addSampleCount(qint64 const &sampleCount_) { baseAddObject< nfo::sampleCount >( sampleCount_ ); }
/*!
- \fn void removeSampleCount(int const &sampleCount_)
+ \fn void removeSampleCount(qint64 const &sampleCount_)
Removes the given \a sampleCount_ from the property \ref nfo_sampleCount "nfo:sampleCount" set.
\sa LiveResource::removeObject
*/
- void removeSampleCount(int const &sampleCount_) { baseRemoveObject< nfo::sampleCount >(sampleCount_); }
+ void removeSampleCount(qint64 const &sampleCount_) { baseRemoveObject< nfo::sampleCount >(sampleCount_); }
//@}
};
@@ -8147,45 +8147,45 @@
*/
void removePageNumbers(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::pageNumber::iri(), object_info); }
/*!
- \fn int getPageNumber()
+ \fn qint64 getPageNumber()
- Returns the property \ref nfo_pageNumber "nfo:pageNumber". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_pageNumber "nfo:pageNumber". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getPageNumber() { return baseGetObject< nfo::pageNumber >(); }
+ qint64 getPageNumber() { return baseGetObject< nfo::pageNumber >(); }
/*!
- \fn void setPageNumber(int const &pageNumber_)
+ \fn void setPageNumber(qint64 const &pageNumber_)
Sets the property \ref nfo_pageNumber "nfo:pageNumber" to the given \a pageNumber.
\sa LiveResource::setObject
*/
- void setPageNumber(int const &pageNumber_) { baseSetObject< nfo::pageNumber >( pageNumber_ ); }
+ void setPageNumber(qint64 const &pageNumber_) { baseSetObject< nfo::pageNumber >( pageNumber_ ); }
/*!
- \fn int firstPageNumber()
+ \fn qint64 firstPageNumber()
Returns the first property \ref nfo_pageNumber "nfo:pageNumber". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstPageNumber() { return baseFirstObject< nfo::pageNumber >(); }
+ qint64 firstPageNumber() { return baseFirstObject< nfo::pageNumber >(); }
/*!
- \fn void addPageNumber(int const &pageNumber_)
+ \fn void addPageNumber(qint64 const &pageNumber_)
Adds the given \a pageNumber_ to the property \ref nfo_pageNumber "nfo:pageNumber" set.
\sa LiveResource::addObject
*/
- void addPageNumber(int const &pageNumber_) { baseAddObject< nfo::pageNumber >( pageNumber_ ); }
+ void addPageNumber(qint64 const &pageNumber_) { baseAddObject< nfo::pageNumber >( pageNumber_ ); }
/*!
- \fn void removePageNumber(int const &pageNumber_)
+ \fn void removePageNumber(qint64 const &pageNumber_)
Removes the given \a pageNumber_ from the property \ref nfo_pageNumber "nfo:pageNumber" set.
\sa LiveResource::removeObject
*/
- void removePageNumber(int const &pageNumber_) { baseRemoveObject< nfo::pageNumber >(pageNumber_); }
+ void removePageNumber(qint64 const &pageNumber_) { baseRemoveObject< nfo::pageNumber >(pageNumber_); }
/* Property generated from nfo:characterPosition
* \n rdfs:label=Character position
@@ -8228,45 +8228,45 @@
*/
void removeCharacterPositions(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::characterPosition::iri(), object_info); }
/*!
- \fn int getCharacterPosition()
+ \fn qint64 getCharacterPosition()
- Returns the property \ref nfo_characterPosition "nfo:characterPosition". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_characterPosition "nfo:characterPosition". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getCharacterPosition() { return baseGetObject< nfo::characterPosition >(); }
+ qint64 getCharacterPosition() { return baseGetObject< nfo::characterPosition >(); }
/*!
- \fn void setCharacterPosition(int const &characterPosition_)
+ \fn void setCharacterPosition(qint64 const &characterPosition_)
Sets the property \ref nfo_characterPosition "nfo:characterPosition" to the given \a characterPosition.
\sa LiveResource::setObject
*/
- void setCharacterPosition(int const &characterPosition_) { baseSetObject< nfo::characterPosition >( characterPosition_ ); }
+ void setCharacterPosition(qint64 const &characterPosition_) { baseSetObject< nfo::characterPosition >( characterPosition_ ); }
/*!
- \fn int firstCharacterPosition()
+ \fn qint64 firstCharacterPosition()
Returns the first property \ref nfo_characterPosition "nfo:characterPosition". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstCharacterPosition() { return baseFirstObject< nfo::characterPosition >(); }
+ qint64 firstCharacterPosition() { return baseFirstObject< nfo::characterPosition >(); }
/*!
- \fn void addCharacterPosition(int const &characterPosition_)
+ \fn void addCharacterPosition(qint64 const &characterPosition_)
Adds the given \a characterPosition_ to the property \ref nfo_characterPosition "nfo:characterPosition" set.
\sa LiveResource::addObject
*/
- void addCharacterPosition(int const &characterPosition_) { baseAddObject< nfo::characterPosition >( characterPosition_ ); }
+ void addCharacterPosition(qint64 const &characterPosition_) { baseAddObject< nfo::characterPosition >( characterPosition_ ); }
/*!
- \fn void removeCharacterPosition(int const &characterPosition_)
+ \fn void removeCharacterPosition(qint64 const &characterPosition_)
Removes the given \a characterPosition_ from the property \ref nfo_characterPosition "nfo:characterPosition" set.
\sa LiveResource::removeObject
*/
- void removeCharacterPosition(int const &characterPosition_) { baseRemoveObject< nfo::characterPosition >(characterPosition_); }
+ void removeCharacterPosition(qint64 const &characterPosition_) { baseRemoveObject< nfo::characterPosition >(characterPosition_); }
/* Property generated from nfo:bookmarks
* \n The address of the linked object. Usually a web URI.
@@ -8401,45 +8401,45 @@
*/
void removeStreamDurations(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::streamDuration::iri(), object_info); }
/*!
- \fn int getStreamDuration()
+ \fn qint64 getStreamDuration()
- Returns the property \ref nfo_streamDuration "nfo:streamDuration". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_streamDuration "nfo:streamDuration". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getStreamDuration() { return baseGetObject< nfo::streamDuration >(); }
+ qint64 getStreamDuration() { return baseGetObject< nfo::streamDuration >(); }
/*!
- \fn void setStreamDuration(int const &streamDuration_)
+ \fn void setStreamDuration(qint64 const &streamDuration_)
Sets the property \ref nfo_streamDuration "nfo:streamDuration" to the given \a streamDuration.
\sa LiveResource::setObject
*/
- void setStreamDuration(int const &streamDuration_) { baseSetObject< nfo::streamDuration >( streamDuration_ ); }
+ void setStreamDuration(qint64 const &streamDuration_) { baseSetObject< nfo::streamDuration >( streamDuration_ ); }
/*!
- \fn int firstStreamDuration()
+ \fn qint64 firstStreamDuration()
Returns the first property \ref nfo_streamDuration "nfo:streamDuration". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstStreamDuration() { return baseFirstObject< nfo::streamDuration >(); }
+ qint64 firstStreamDuration() { return baseFirstObject< nfo::streamDuration >(); }
/*!
- \fn void addStreamDuration(int const &streamDuration_)
+ \fn void addStreamDuration(qint64 const &streamDuration_)
Adds the given \a streamDuration_ to the property \ref nfo_streamDuration "nfo:streamDuration" set.
\sa LiveResource::addObject
*/
- void addStreamDuration(int const &streamDuration_) { baseAddObject< nfo::streamDuration >( streamDuration_ ); }
+ void addStreamDuration(qint64 const &streamDuration_) { baseAddObject< nfo::streamDuration >( streamDuration_ ); }
/*!
- \fn void removeStreamDuration(int const &streamDuration_)
+ \fn void removeStreamDuration(qint64 const &streamDuration_)
Removes the given \a streamDuration_ from the property \ref nfo_streamDuration "nfo:streamDuration" set.
\sa LiveResource::removeObject
*/
- void removeStreamDuration(int const &streamDuration_) { baseRemoveObject< nfo::streamDuration >(streamDuration_); }
+ void removeStreamDuration(qint64 const &streamDuration_) { baseRemoveObject< nfo::streamDuration >(streamDuration_); }
/* Property generated from nfo:streamPosition
* \n rdfs:label=Stream position
@@ -8482,45 +8482,45 @@
*/
void removeStreamPositions(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::streamPosition::iri(), object_info); }
/*!
- \fn int getStreamPosition()
+ \fn qint64 getStreamPosition()
- Returns the property \ref nfo_streamPosition "nfo:streamPosition". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_streamPosition "nfo:streamPosition". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getStreamPosition() { return baseGetObject< nfo::streamPosition >(); }
+ qint64 getStreamPosition() { return baseGetObject< nfo::streamPosition >(); }
/*!
- \fn void setStreamPosition(int const &streamPosition_)
+ \fn void setStreamPosition(qint64 const &streamPosition_)
Sets the property \ref nfo_streamPosition "nfo:streamPosition" to the given \a streamPosition.
\sa LiveResource::setObject
*/
- void setStreamPosition(int const &streamPosition_) { baseSetObject< nfo::streamPosition >( streamPosition_ ); }
+ void setStreamPosition(qint64 const &streamPosition_) { baseSetObject< nfo::streamPosition >( streamPosition_ ); }
/*!
- \fn int firstStreamPosition()
+ \fn qint64 firstStreamPosition()
Returns the first property \ref nfo_streamPosition "nfo:streamPosition". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstStreamPosition() { return baseFirstObject< nfo::streamPosition >(); }
+ qint64 firstStreamPosition() { return baseFirstObject< nfo::streamPosition >(); }
/*!
- \fn void addStreamPosition(int const &streamPosition_)
+ \fn void addStreamPosition(qint64 const &streamPosition_)
Adds the given \a streamPosition_ to the property \ref nfo_streamPosition "nfo:streamPosition" set.
\sa LiveResource::addObject
*/
- void addStreamPosition(int const &streamPosition_) { baseAddObject< nfo::streamPosition >( streamPosition_ ); }
+ void addStreamPosition(qint64 const &streamPosition_) { baseAddObject< nfo::streamPosition >( streamPosition_ ); }
/*!
- \fn void removeStreamPosition(int const &streamPosition_)
+ \fn void removeStreamPosition(qint64 const &streamPosition_)
Removes the given \a streamPosition_ from the property \ref nfo_streamPosition "nfo:streamPosition" set.
\sa LiveResource::removeObject
*/
- void removeStreamPosition(int const &streamPosition_) { baseRemoveObject< nfo::streamPosition >(streamPosition_); }
+ void removeStreamPosition(qint64 const &streamPosition_) { baseRemoveObject< nfo::streamPosition >(streamPosition_); }
//@}
};
@@ -8874,45 +8874,45 @@
*/
void removeColorDepths(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::colorDepth::iri(), object_info); }
/*!
- \fn int getColorDepth()
+ \fn qint64 getColorDepth()
- Returns the property \ref nfo_colorDepth "nfo:colorDepth". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_colorDepth "nfo:colorDepth". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getColorDepth() { return baseGetObject< nfo::colorDepth >(); }
+ qint64 getColorDepth() { return baseGetObject< nfo::colorDepth >(); }
/*!
- \fn void setColorDepth(int const &colorDepth_)
+ \fn void setColorDepth(qint64 const &colorDepth_)
Sets the property \ref nfo_colorDepth "nfo:colorDepth" to the given \a colorDepth.
\sa LiveResource::setObject
*/
- void setColorDepth(int const &colorDepth_) { baseSetObject< nfo::colorDepth >( colorDepth_ ); }
+ void setColorDepth(qint64 const &colorDepth_) { baseSetObject< nfo::colorDepth >( colorDepth_ ); }
/*!
- \fn int firstColorDepth()
+ \fn qint64 firstColorDepth()
Returns the first property \ref nfo_colorDepth "nfo:colorDepth". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstColorDepth() { return baseFirstObject< nfo::colorDepth >(); }
+ qint64 firstColorDepth() { return baseFirstObject< nfo::colorDepth >(); }
/*!
- \fn void addColorDepth(int const &colorDepth_)
+ \fn void addColorDepth(qint64 const &colorDepth_)
Adds the given \a colorDepth_ to the property \ref nfo_colorDepth "nfo:colorDepth" set.
\sa LiveResource::addObject
*/
- void addColorDepth(int const &colorDepth_) { baseAddObject< nfo::colorDepth >( colorDepth_ ); }
+ void addColorDepth(qint64 const &colorDepth_) { baseAddObject< nfo::colorDepth >( colorDepth_ ); }
/*!
- \fn void removeColorDepth(int const &colorDepth_)
+ \fn void removeColorDepth(qint64 const &colorDepth_)
Removes the given \a colorDepth_ from the property \ref nfo_colorDepth "nfo:colorDepth" set.
\sa LiveResource::removeObject
*/
- void removeColorDepth(int const &colorDepth_) { baseRemoveObject< nfo::colorDepth >(colorDepth_); }
+ void removeColorDepth(qint64 const &colorDepth_) { baseRemoveObject< nfo::colorDepth >(colorDepth_); }
/* Property generated from nfo:tilt
* \n Vertical inclination of the camera while capturing the image, in angles starting on 0 as horizontal, positive numbers pointing up, negative angles pointing down
@@ -9120,45 +9120,45 @@
*/
void removeHeights(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::height::iri(), object_info); }
/*!
- \fn int getHeight()
+ \fn qint64 getHeight()
- Returns the property \ref nfo_height "nfo:height". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_height "nfo:height". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getHeight() { return baseGetObject< nfo::height >(); }
+ qint64 getHeight() { return baseGetObject< nfo::height >(); }
/*!
- \fn void setHeight(int const &height_)
+ \fn void setHeight(qint64 const &height_)
Sets the property \ref nfo_height "nfo:height" to the given \a height.
\sa LiveResource::setObject
*/
- void setHeight(int const &height_) { baseSetObject< nfo::height >( height_ ); }
+ void setHeight(qint64 const &height_) { baseSetObject< nfo::height >( height_ ); }
/*!
- \fn int firstHeight()
+ \fn qint64 firstHeight()
Returns the first property \ref nfo_height "nfo:height". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstHeight() { return baseFirstObject< nfo::height >(); }
+ qint64 firstHeight() { return baseFirstObject< nfo::height >(); }
/*!
- \fn void addHeight(int const &height_)
+ \fn void addHeight(qint64 const &height_)
Adds the given \a height_ to the property \ref nfo_height "nfo:height" set.
\sa LiveResource::addObject
*/
- void addHeight(int const &height_) { baseAddObject< nfo::height >( height_ ); }
+ void addHeight(qint64 const &height_) { baseAddObject< nfo::height >( height_ ); }
/*!
- \fn void removeHeight(int const &height_)
+ \fn void removeHeight(qint64 const &height_)
Removes the given \a height_ from the property \ref nfo_height "nfo:height" set.
\sa LiveResource::removeObject
*/
- void removeHeight(int const &height_) { baseRemoveObject< nfo::height >(height_); }
+ void removeHeight(qint64 const &height_) { baseRemoveObject< nfo::height >(height_); }
/* Property generated from nfo:aspectRatio
* \n Visual content aspect ratio. (Width divided by Height)
@@ -9366,45 +9366,45 @@
*/
void removeWidths(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::width::iri(), object_info); }
/*!
- \fn int getWidth()
+ \fn qint64 getWidth()
- Returns the property \ref nfo_width "nfo:width". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_width "nfo:width". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getWidth() { return baseGetObject< nfo::width >(); }
+ qint64 getWidth() { return baseGetObject< nfo::width >(); }
/*!
- \fn void setWidth(int const &width_)
+ \fn void setWidth(qint64 const &width_)
Sets the property \ref nfo_width "nfo:width" to the given \a width.
\sa LiveResource::setObject
*/
- void setWidth(int const &width_) { baseSetObject< nfo::width >( width_ ); }
+ void setWidth(qint64 const &width_) { baseSetObject< nfo::width >( width_ ); }
/*!
- \fn int firstWidth()
+ \fn qint64 firstWidth()
Returns the first property \ref nfo_width "nfo:width". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstWidth() { return baseFirstObject< nfo::width >(); }
+ qint64 firstWidth() { return baseFirstObject< nfo::width >(); }
/*!
- \fn void addWidth(int const &width_)
+ \fn void addWidth(qint64 const &width_)
Adds the given \a width_ to the property \ref nfo_width "nfo:width" set.
\sa LiveResource::addObject
*/
- void addWidth(int const &width_) { baseAddObject< nfo::width >( width_ ); }
+ void addWidth(qint64 const &width_) { baseAddObject< nfo::width >( width_ ); }
/*!
- \fn void removeWidth(int const &width_)
+ \fn void removeWidth(qint64 const &width_)
Removes the given \a width_ from the property \ref nfo_width "nfo:width" set.
\sa LiveResource::removeObject
*/
- void removeWidth(int const &width_) { baseRemoveObject< nfo::width >(width_); }
+ void removeWidth(qint64 const &width_) { baseRemoveObject< nfo::width >(width_); }
//@}
};
@@ -9506,45 +9506,45 @@
*/
void removeHorizontalResolutions(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::horizontalResolution::iri(), object_info); }
/*!
- \fn int getHorizontalResolution()
+ \fn qint64 getHorizontalResolution()
- Returns the property \ref nfo_horizontalResolution "nfo:horizontalResolution". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_horizontalResolution "nfo:horizontalResolution". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getHorizontalResolution() { return baseGetObject< nfo::horizontalResolution >(); }
+ qint64 getHorizontalResolution() { return baseGetObject< nfo::horizontalResolution >(); }
/*!
- \fn void setHorizontalResolution(int const &horizontalResolution_)
+ \fn void setHorizontalResolution(qint64 const &horizontalResolution_)
Sets the property \ref nfo_horizontalResolution "nfo:horizontalResolution" to the given \a horizontalResolution.
\sa LiveResource::setObject
*/
- void setHorizontalResolution(int const &horizontalResolution_) { baseSetObject< nfo::horizontalResolution >( horizontalResolution_ ); }
+ void setHorizontalResolution(qint64 const &horizontalResolution_) { baseSetObject< nfo::horizontalResolution >( horizontalResolution_ ); }
/*!
- \fn int firstHorizontalResolution()
+ \fn qint64 firstHorizontalResolution()
Returns the first property \ref nfo_horizontalResolution "nfo:horizontalResolution". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstHorizontalResolution() { return baseFirstObject< nfo::horizontalResolution >(); }
+ qint64 firstHorizontalResolution() { return baseFirstObject< nfo::horizontalResolution >(); }
/*!
- \fn void addHorizontalResolution(int const &horizontalResolution_)
+ \fn void addHorizontalResolution(qint64 const &horizontalResolution_)
Adds the given \a horizontalResolution_ to the property \ref nfo_horizontalResolution "nfo:horizontalResolution" set.
\sa LiveResource::addObject
*/
- void addHorizontalResolution(int const &horizontalResolution_) { baseAddObject< nfo::horizontalResolution >( horizontalResolution_ ); }
+ void addHorizontalResolution(qint64 const &horizontalResolution_) { baseAddObject< nfo::horizontalResolution >( horizontalResolution_ ); }
/*!
- \fn void removeHorizontalResolution(int const &horizontalResolution_)
+ \fn void removeHorizontalResolution(qint64 const &horizontalResolution_)
Removes the given \a horizontalResolution_ from the property \ref nfo_horizontalResolution "nfo:horizontalResolution" set.
\sa LiveResource::removeObject
*/
- void removeHorizontalResolution(int const &horizontalResolution_) { baseRemoveObject< nfo::horizontalResolution >(horizontalResolution_); }
+ void removeHorizontalResolution(qint64 const &horizontalResolution_) { baseRemoveObject< nfo::horizontalResolution >(horizontalResolution_); }
/* Property generated from nfo:orientation
* \n nrl:maxCardinality=1
@@ -9677,45 +9677,45 @@
*/
void removeVerticalResolutions(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::verticalResolution::iri(), object_info); }
/*!
- \fn int getVerticalResolution()
+ \fn qint64 getVerticalResolution()
- Returns the property \ref nfo_verticalResolution "nfo:verticalResolution". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_verticalResolution "nfo:verticalResolution". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getVerticalResolution() { return baseGetObject< nfo::verticalResolution >(); }
+ qint64 getVerticalResolution() { return baseGetObject< nfo::verticalResolution >(); }
/*!
- \fn void setVerticalResolution(int const &verticalResolution_)
+ \fn void setVerticalResolution(qint64 const &verticalResolution_)
Sets the property \ref nfo_verticalResolution "nfo:verticalResolution" to the given \a verticalResolution.
\sa LiveResource::setObject
*/
- void setVerticalResolution(int const &verticalResolution_) { baseSetObject< nfo::verticalResolution >( verticalResolution_ ); }
+ void setVerticalResolution(qint64 const &verticalResolution_) { baseSetObject< nfo::verticalResolution >( verticalResolution_ ); }
/*!
- \fn int firstVerticalResolution()
+ \fn qint64 firstVerticalResolution()
Returns the first property \ref nfo_verticalResolution "nfo:verticalResolution". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstVerticalResolution() { return baseFirstObject< nfo::verticalResolution >(); }
+ qint64 firstVerticalResolution() { return baseFirstObject< nfo::verticalResolution >(); }
/*!
- \fn void addVerticalResolution(int const &verticalResolution_)
+ \fn void addVerticalResolution(qint64 const &verticalResolution_)
Adds the given \a verticalResolution_ to the property \ref nfo_verticalResolution "nfo:verticalResolution" set.
\sa LiveResource::addObject
*/
- void addVerticalResolution(int const &verticalResolution_) { baseAddObject< nfo::verticalResolution >( verticalResolution_ ); }
+ void addVerticalResolution(qint64 const &verticalResolution_) { baseAddObject< nfo::verticalResolution >( verticalResolution_ ); }
/*!
- \fn void removeVerticalResolution(int const &verticalResolution_)
+ \fn void removeVerticalResolution(qint64 const &verticalResolution_)
Removes the given \a verticalResolution_ from the property \ref nfo_verticalResolution "nfo:verticalResolution" set.
\sa LiveResource::removeObject
*/
- void removeVerticalResolution(int const &verticalResolution_) { baseRemoveObject< nfo::verticalResolution >(verticalResolution_); }
+ void removeVerticalResolution(qint64 const &verticalResolution_) { baseRemoveObject< nfo::verticalResolution >(verticalResolution_); }
/* Property generated from nfo:depicts
* \n rdfs:range=poi:ObjectOfInterest
@@ -11387,45 +11387,45 @@
*/
void removeWordCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::wordCount::iri(), object_info); }
/*!
- \fn int getWordCount()
+ \fn qint64 getWordCount()
- Returns the property \ref nfo_wordCount "nfo:wordCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_wordCount "nfo:wordCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getWordCount() { return baseGetObject< nfo::wordCount >(); }
+ qint64 getWordCount() { return baseGetObject< nfo::wordCount >(); }
/*!
- \fn void setWordCount(int const &wordCount_)
+ \fn void setWordCount(qint64 const &wordCount_)
Sets the property \ref nfo_wordCount "nfo:wordCount" to the given \a wordCount.
\sa LiveResource::setObject
*/
- void setWordCount(int const &wordCount_) { baseSetObject< nfo::wordCount >( wordCount_ ); }
+ void setWordCount(qint64 const &wordCount_) { baseSetObject< nfo::wordCount >( wordCount_ ); }
/*!
- \fn int firstWordCount()
+ \fn qint64 firstWordCount()
Returns the first property \ref nfo_wordCount "nfo:wordCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstWordCount() { return baseFirstObject< nfo::wordCount >(); }
+ qint64 firstWordCount() { return baseFirstObject< nfo::wordCount >(); }
/*!
- \fn void addWordCount(int const &wordCount_)
+ \fn void addWordCount(qint64 const &wordCount_)
Adds the given \a wordCount_ to the property \ref nfo_wordCount "nfo:wordCount" set.
\sa LiveResource::addObject
*/
- void addWordCount(int const &wordCount_) { baseAddObject< nfo::wordCount >( wordCount_ ); }
+ void addWordCount(qint64 const &wordCount_) { baseAddObject< nfo::wordCount >( wordCount_ ); }
/*!
- \fn void removeWordCount(int const &wordCount_)
+ \fn void removeWordCount(qint64 const &wordCount_)
Removes the given \a wordCount_ from the property \ref nfo_wordCount "nfo:wordCount" set.
\sa LiveResource::removeObject
*/
- void removeWordCount(int const &wordCount_) { baseRemoveObject< nfo::wordCount >(wordCount_); }
+ void removeWordCount(qint64 const &wordCount_) { baseRemoveObject< nfo::wordCount >(wordCount_); }
/* Property generated from nfo:lineCount
* \n The amount of lines in a text document
@@ -11469,45 +11469,45 @@
*/
void removeLineCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::lineCount::iri(), object_info); }
/*!
- \fn int getLineCount()
+ \fn qint64 getLineCount()
- Returns the property \ref nfo_lineCount "nfo:lineCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_lineCount "nfo:lineCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getLineCount() { return baseGetObject< nfo::lineCount >(); }
+ qint64 getLineCount() { return baseGetObject< nfo::lineCount >(); }
/*!
- \fn void setLineCount(int const &lineCount_)
+ \fn void setLineCount(qint64 const &lineCount_)
Sets the property \ref nfo_lineCount "nfo:lineCount" to the given \a lineCount.
\sa LiveResource::setObject
*/
- void setLineCount(int const &lineCount_) { baseSetObject< nfo::lineCount >( lineCount_ ); }
+ void setLineCount(qint64 const &lineCount_) { baseSetObject< nfo::lineCount >( lineCount_ ); }
/*!
- \fn int firstLineCount()
+ \fn qint64 firstLineCount()
Returns the first property \ref nfo_lineCount "nfo:lineCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstLineCount() { return baseFirstObject< nfo::lineCount >(); }
+ qint64 firstLineCount() { return baseFirstObject< nfo::lineCount >(); }
/*!
- \fn void addLineCount(int const &lineCount_)
+ \fn void addLineCount(qint64 const &lineCount_)
Adds the given \a lineCount_ to the property \ref nfo_lineCount "nfo:lineCount" set.
\sa LiveResource::addObject
*/
- void addLineCount(int const &lineCount_) { baseAddObject< nfo::lineCount >( lineCount_ ); }
+ void addLineCount(qint64 const &lineCount_) { baseAddObject< nfo::lineCount >( lineCount_ ); }
/*!
- \fn void removeLineCount(int const &lineCount_)
+ \fn void removeLineCount(qint64 const &lineCount_)
Removes the given \a lineCount_ from the property \ref nfo_lineCount "nfo:lineCount" set.
\sa LiveResource::removeObject
*/
- void removeLineCount(int const &lineCount_) { baseRemoveObject< nfo::lineCount >(lineCount_); }
+ void removeLineCount(qint64 const &lineCount_) { baseRemoveObject< nfo::lineCount >(lineCount_); }
/* Property generated from nfo:characterCount
* \n The amount of characters in the document.
@@ -11551,45 +11551,45 @@
*/
void removeCharacterCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::characterCount::iri(), object_info); }
/*!
- \fn int getCharacterCount()
+ \fn qint64 getCharacterCount()
- Returns the property \ref nfo_characterCount "nfo:characterCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_characterCount "nfo:characterCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getCharacterCount() { return baseGetObject< nfo::characterCount >(); }
+ qint64 getCharacterCount() { return baseGetObject< nfo::characterCount >(); }
/*!
- \fn void setCharacterCount(int const &characterCount_)
+ \fn void setCharacterCount(qint64 const &characterCount_)
Sets the property \ref nfo_characterCount "nfo:characterCount" to the given \a characterCount.
\sa LiveResource::setObject
*/
- void setCharacterCount(int const &characterCount_) { baseSetObject< nfo::characterCount >( characterCount_ ); }
+ void setCharacterCount(qint64 const &characterCount_) { baseSetObject< nfo::characterCount >( characterCount_ ); }
/*!
- \fn int firstCharacterCount()
+ \fn qint64 firstCharacterCount()
Returns the first property \ref nfo_characterCount "nfo:characterCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstCharacterCount() { return baseFirstObject< nfo::characterCount >(); }
+ qint64 firstCharacterCount() { return baseFirstObject< nfo::characterCount >(); }
/*!
- \fn void addCharacterCount(int const &characterCount_)
+ \fn void addCharacterCount(qint64 const &characterCount_)
Adds the given \a characterCount_ to the property \ref nfo_characterCount "nfo:characterCount" set.
\sa LiveResource::addObject
*/
- void addCharacterCount(int const &characterCount_) { baseAddObject< nfo::characterCount >( characterCount_ ); }
+ void addCharacterCount(qint64 const &characterCount_) { baseAddObject< nfo::characterCount >( characterCount_ ); }
/*!
- \fn void removeCharacterCount(int const &characterCount_)
+ \fn void removeCharacterCount(qint64 const &characterCount_)
Removes the given \a characterCount_ from the property \ref nfo_characterCount "nfo:characterCount" set.
\sa LiveResource::removeObject
*/
- void removeCharacterCount(int const &characterCount_) { baseRemoveObject< nfo::characterCount >(characterCount_); }
+ void removeCharacterCount(qint64 const &characterCount_) { baseRemoveObject< nfo::characterCount >(characterCount_); }
//@}
};
@@ -12151,45 +12151,45 @@
*/
void removeListDurations(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::listDuration::iri(), object_info); }
/*!
- \fn int getListDuration()
+ \fn qint64 getListDuration()
- Returns the property \ref nfo_listDuration "nfo:listDuration". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_listDuration "nfo:listDuration". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getListDuration() { return baseGetObject< nfo::listDuration >(); }
+ qint64 getListDuration() { return baseGetObject< nfo::listDuration >(); }
/*!
- \fn void setListDuration(int const &listDuration_)
+ \fn void setListDuration(qint64 const &listDuration_)
Sets the property \ref nfo_listDuration "nfo:listDuration" to the given \a listDuration.
\sa LiveResource::setObject
*/
- void setListDuration(int const &listDuration_) { baseSetObject< nfo::listDuration >( listDuration_ ); }
+ void setListDuration(qint64 const &listDuration_) { baseSetObject< nfo::listDuration >( listDuration_ ); }
/*!
- \fn int firstListDuration()
+ \fn qint64 firstListDuration()
Returns the first property \ref nfo_listDuration "nfo:listDuration". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstListDuration() { return baseFirstObject< nfo::listDuration >(); }
+ qint64 firstListDuration() { return baseFirstObject< nfo::listDuration >(); }
/*!
- \fn void addListDuration(int const &listDuration_)
+ \fn void addListDuration(qint64 const &listDuration_)
Adds the given \a listDuration_ to the property \ref nfo_listDuration "nfo:listDuration" set.
\sa LiveResource::addObject
*/
- void addListDuration(int const &listDuration_) { baseAddObject< nfo::listDuration >( listDuration_ ); }
+ void addListDuration(qint64 const &listDuration_) { baseAddObject< nfo::listDuration >( listDuration_ ); }
/*!
- \fn void removeListDuration(int const &listDuration_)
+ \fn void removeListDuration(qint64 const &listDuration_)
Removes the given \a listDuration_ from the property \ref nfo_listDuration "nfo:listDuration" set.
\sa LiveResource::removeObject
*/
- void removeListDuration(int const &listDuration_) { baseRemoveObject< nfo::listDuration >(listDuration_); }
+ void removeListDuration(qint64 const &listDuration_) { baseRemoveObject< nfo::listDuration >(listDuration_); }
/* Property generated from nfo:mediaListEntry
* \n A certain item belongs to a media list. This can reflect that a song is in a playlist, an image or video in an Album
@@ -12382,45 +12382,45 @@
*/
void removeEntryCounters(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::entryCounter::iri(), object_info); }
/*!
- \fn int getEntryCounter()
+ \fn qint64 getEntryCounter()
- Returns the property \ref nfo_entryCounter "nfo:entryCounter". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_entryCounter "nfo:entryCounter". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getEntryCounter() { return baseGetObject< nfo::entryCounter >(); }
+ qint64 getEntryCounter() { return baseGetObject< nfo::entryCounter >(); }
/*!
- \fn void setEntryCounter(int const &entryCounter_)
+ \fn void setEntryCounter(qint64 const &entryCounter_)
Sets the property \ref nfo_entryCounter "nfo:entryCounter" to the given \a entryCounter.
\sa LiveResource::setObject
*/
- void setEntryCounter(int const &entryCounter_) { baseSetObject< nfo::entryCounter >( entryCounter_ ); }
+ void setEntryCounter(qint64 const &entryCounter_) { baseSetObject< nfo::entryCounter >( entryCounter_ ); }
/*!
- \fn int firstEntryCounter()
+ \fn qint64 firstEntryCounter()
Returns the first property \ref nfo_entryCounter "nfo:entryCounter". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstEntryCounter() { return baseFirstObject< nfo::entryCounter >(); }
+ qint64 firstEntryCounter() { return baseFirstObject< nfo::entryCounter >(); }
/*!
- \fn void addEntryCounter(int const &entryCounter_)
+ \fn void addEntryCounter(qint64 const &entryCounter_)
Adds the given \a entryCounter_ to the property \ref nfo_entryCounter "nfo:entryCounter" set.
\sa LiveResource::addObject
*/
- void addEntryCounter(int const &entryCounter_) { baseAddObject< nfo::entryCounter >( entryCounter_ ); }
+ void addEntryCounter(qint64 const &entryCounter_) { baseAddObject< nfo::entryCounter >( entryCounter_ ); }
/*!
- \fn void removeEntryCounter(int const &entryCounter_)
+ \fn void removeEntryCounter(qint64 const &entryCounter_)
Removes the given \a entryCounter_ from the property \ref nfo_entryCounter "nfo:entryCounter" set.
\sa LiveResource::removeObject
*/
- void removeEntryCounter(int const &entryCounter_) { baseRemoveObject< nfo::entryCounter >(entryCounter_); }
+ void removeEntryCounter(qint64 const &entryCounter_) { baseRemoveObject< nfo::entryCounter >(entryCounter_); }
//@}
};
@@ -12732,45 +12732,45 @@
*/
void removePageCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::pageCount::iri(), object_info); }
/*!
- \fn int getPageCount()
+ \fn qint64 getPageCount()
- Returns the property \ref nfo_pageCount "nfo:pageCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_pageCount "nfo:pageCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getPageCount() { return baseGetObject< nfo::pageCount >(); }
+ qint64 getPageCount() { return baseGetObject< nfo::pageCount >(); }
/*!
- \fn void setPageCount(int const &pageCount_)
+ \fn void setPageCount(qint64 const &pageCount_)
Sets the property \ref nfo_pageCount "nfo:pageCount" to the given \a pageCount.
\sa LiveResource::setObject
*/
- void setPageCount(int const &pageCount_) { baseSetObject< nfo::pageCount >( pageCount_ ); }
+ void setPageCount(qint64 const &pageCount_) { baseSetObject< nfo::pageCount >( pageCount_ ); }
/*!
- \fn int firstPageCount()
+ \fn qint64 firstPageCount()
Returns the first property \ref nfo_pageCount "nfo:pageCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstPageCount() { return baseFirstObject< nfo::pageCount >(); }
+ qint64 firstPageCount() { return baseFirstObject< nfo::pageCount >(); }
/*!
- \fn void addPageCount(int const &pageCount_)
+ \fn void addPageCount(qint64 const &pageCount_)
Adds the given \a pageCount_ to the property \ref nfo_pageCount "nfo:pageCount" set.
\sa LiveResource::addObject
*/
- void addPageCount(int const &pageCount_) { baseAddObject< nfo::pageCount >( pageCount_ ); }
+ void addPageCount(qint64 const &pageCount_) { baseAddObject< nfo::pageCount >( pageCount_ ); }
/*!
- \fn void removePageCount(int const &pageCount_)
+ \fn void removePageCount(qint64 const &pageCount_)
Removes the given \a pageCount_ from the property \ref nfo_pageCount "nfo:pageCount" set.
\sa LiveResource::removeObject
*/
- void removePageCount(int const &pageCount_) { baseRemoveObject< nfo::pageCount >(pageCount_); }
+ void removePageCount(qint64 const &pageCount_) { baseRemoveObject< nfo::pageCount >(pageCount_); }
//@}
};
@@ -13396,45 +13396,45 @@
*/
void removeCommentCharacterCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::commentCharacterCount::iri(), object_info); }
/*!
- \fn int getCommentCharacterCount()
+ \fn qint64 getCommentCharacterCount()
- Returns the property \ref nfo_commentCharacterCount "nfo:commentCharacterCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_commentCharacterCount "nfo:commentCharacterCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getCommentCharacterCount() { return baseGetObject< nfo::commentCharacterCount >(); }
+ qint64 getCommentCharacterCount() { return baseGetObject< nfo::commentCharacterCount >(); }
/*!
- \fn void setCommentCharacterCount(int const &commentCharacterCount_)
+ \fn void setCommentCharacterCount(qint64 const &commentCharacterCount_)
Sets the property \ref nfo_commentCharacterCount "nfo:commentCharacterCount" to the given \a commentCharacterCount.
\sa LiveResource::setObject
*/
- void setCommentCharacterCount(int const &commentCharacterCount_) { baseSetObject< nfo::commentCharacterCount >( commentCharacterCount_ ); }
+ void setCommentCharacterCount(qint64 const &commentCharacterCount_) { baseSetObject< nfo::commentCharacterCount >( commentCharacterCount_ ); }
/*!
- \fn int firstCommentCharacterCount()
+ \fn qint64 firstCommentCharacterCount()
Returns the first property \ref nfo_commentCharacterCount "nfo:commentCharacterCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstCommentCharacterCount() { return baseFirstObject< nfo::commentCharacterCount >(); }
+ qint64 firstCommentCharacterCount() { return baseFirstObject< nfo::commentCharacterCount >(); }
/*!
- \fn void addCommentCharacterCount(int const &commentCharacterCount_)
+ \fn void addCommentCharacterCount(qint64 const &commentCharacterCount_)
Adds the given \a commentCharacterCount_ to the property \ref nfo_commentCharacterCount "nfo:commentCharacterCount" set.
\sa LiveResource::addObject
*/
- void addCommentCharacterCount(int const &commentCharacterCount_) { baseAddObject< nfo::commentCharacterCount >( commentCharacterCount_ ); }
+ void addCommentCharacterCount(qint64 const &commentCharacterCount_) { baseAddObject< nfo::commentCharacterCount >( commentCharacterCount_ ); }
/*!
- \fn void removeCommentCharacterCount(int const &commentCharacterCount_)
+ \fn void removeCommentCharacterCount(qint64 const &commentCharacterCount_)
Removes the given \a commentCharacterCount_ from the property \ref nfo_commentCharacterCount "nfo:commentCharacterCount" set.
\sa LiveResource::removeObject
*/
- void removeCommentCharacterCount(int const &commentCharacterCount_) { baseRemoveObject< nfo::commentCharacterCount >(commentCharacterCount_); }
+ void removeCommentCharacterCount(qint64 const &commentCharacterCount_) { baseRemoveObject< nfo::commentCharacterCount >(commentCharacterCount_); }
/* Property generated from nfo:programmingLanguage
* \n rdfs:label=programmingLanguage
@@ -13927,45 +13927,45 @@
*/
void removeFrameCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nfo::frameCount::iri(), object_info); }
/*!
- \fn int getFrameCount()
+ \fn qint64 getFrameCount()
- Returns the property \ref nfo_frameCount "nfo:frameCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nfo_frameCount "nfo:frameCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getFrameCount() { return baseGetObject< nfo::frameCount >(); }
+ qint64 getFrameCount() { return baseGetObject< nfo::frameCount >(); }
/*!
- \fn void setFrameCount(int const &frameCount_)
+ \fn void setFrameCount(qint64 const &frameCount_)
Sets the property \ref nfo_frameCount "nfo:frameCount" to the given \a frameCount.
\sa LiveResource::setObject
*/
- void setFrameCount(int const &frameCount_) { baseSetObject< nfo::frameCount >( frameCount_ ); }
+ void setFrameCount(qint64 const &frameCount_) { baseSetObject< nfo::frameCount >( frameCount_ ); }
/*!
- \fn int firstFrameCount()
+ \fn qint64 firstFrameCount()
Returns the first property \ref nfo_frameCount "nfo:frameCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstFrameCount() { return baseFirstObject< nfo::frameCount >(); }
+ qint64 firstFrameCount() { return baseFirstObject< nfo::frameCount >(); }
/*!
- \fn void addFrameCount(int const &frameCount_)
+ \fn void addFrameCount(qint64 const &frameCount_)
Adds the given \a frameCount_ to the property \ref nfo_frameCount "nfo:frameCount" set.
\sa LiveResource::addObject
*/
- void addFrameCount(int const &frameCount_) { baseAddObject< nfo::frameCount >( frameCount_ ); }
+ void addFrameCount(qint64 const &frameCount_) { baseAddObject< nfo::frameCount >( frameCount_ ); }
/*!
- \fn void removeFrameCount(int const &frameCount_)
+ \fn void removeFrameCount(qint64 const &frameCount_)
Removes the given \a frameCount_ from the property \ref nfo_frameCount "nfo:frameCount" set.
\sa LiveResource::removeObject
*/
- void removeFrameCount(int const &frameCount_) { baseRemoveObject< nfo::frameCount >(frameCount_); }
+ void removeFrameCount(qint64 const &frameCount_) { baseRemoveObject< nfo::frameCount >(frameCount_); }
/* Property generated from nfo:frameRate
* \n Amount of video frames per second.
--- src/include/QtTracker/ontologies/nid3.h
+++ src/include/QtTracker/ontologies/nid3.h
@@ -1,7 +1,7 @@
/*
* nid3.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:40.437389
+ * Automatically created on: 2010-11-01 14:52:11.940005
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/nid3.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -265,7 +265,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef ID3Audio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -299,7 +299,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef ID3Audio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1118,45 +1118,45 @@
*/
void removeRecordingYears(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nid3::recordingYear::iri(), object_info); }
/*!
- \fn int getRecordingYear()
+ \fn qint64 getRecordingYear()
- Returns the property \ref nid3_recordingYear "nid3:recordingYear". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nid3_recordingYear "nid3:recordingYear". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getRecordingYear() { return baseGetObject< nid3::recordingYear >(); }
+ qint64 getRecordingYear() { return baseGetObject< nid3::recordingYear >(); }
/*!
- \fn void setRecordingYear(int const &recordingYear_)
+ \fn void setRecordingYear(qint64 const &recordingYear_)
Sets the property \ref nid3_recordingYear "nid3:recordingYear" to the given \a recordingYear.
\sa LiveResource::setObject
*/
- void setRecordingYear(int const &recordingYear_) { baseSetObject< nid3::recordingYear >( recordingYear_ ); }
+ void setRecordingYear(qint64 const &recordingYear_) { baseSetObject< nid3::recordingYear >( recordingYear_ ); }
/*!
- \fn int firstRecordingYear()
+ \fn qint64 firstRecordingYear()
Returns the first property \ref nid3_recordingYear "nid3:recordingYear". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstRecordingYear() { return baseFirstObject< nid3::recordingYear >(); }
+ qint64 firstRecordingYear() { return baseFirstObject< nid3::recordingYear >(); }
/*!
- \fn void addRecordingYear(int const &recordingYear_)
+ \fn void addRecordingYear(qint64 const &recordingYear_)
Adds the given \a recordingYear_ to the property \ref nid3_recordingYear "nid3:recordingYear" set.
\sa LiveResource::addObject
*/
- void addRecordingYear(int const &recordingYear_) { baseAddObject< nid3::recordingYear >( recordingYear_ ); }
+ void addRecordingYear(qint64 const &recordingYear_) { baseAddObject< nid3::recordingYear >( recordingYear_ ); }
/*!
- \fn void removeRecordingYear(int const &recordingYear_)
+ \fn void removeRecordingYear(qint64 const &recordingYear_)
Removes the given \a recordingYear_ from the property \ref nid3_recordingYear "nid3:recordingYear" set.
\sa LiveResource::removeObject
*/
- void removeRecordingYear(int const &recordingYear_) { baseRemoveObject< nid3::recordingYear >(recordingYear_); }
+ void removeRecordingYear(qint64 const &recordingYear_) { baseRemoveObject< nid3::recordingYear >(recordingYear_); }
/* Property generated from nid3:length
* \n The length in seconds of the music track
@@ -1201,45 +1201,45 @@
*/
void removeLengths(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nid3::length::iri(), object_info); }
/*!
- \fn int getLength()
+ \fn qint64 getLength()
- Returns the property \ref nid3_length "nid3:length". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nid3_length "nid3:length". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getLength() { return baseGetObject< nid3::length >(); }
+ qint64 getLength() { return baseGetObject< nid3::length >(); }
/*!
- \fn void setLength(int const &length_)
+ \fn void setLength(qint64 const &length_)
Sets the property \ref nid3_length "nid3:length" to the given \a length.
\sa LiveResource::setObject
*/
- void setLength(int const &length_) { baseSetObject< nid3::length >( length_ ); }
+ void setLength(qint64 const &length_) { baseSetObject< nid3::length >( length_ ); }
/*!
- \fn int firstLength()
+ \fn qint64 firstLength()
Returns the first property \ref nid3_length "nid3:length". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstLength() { return baseFirstObject< nid3::length >(); }
+ qint64 firstLength() { return baseFirstObject< nid3::length >(); }
/*!
- \fn void addLength(int const &length_)
+ \fn void addLength(qint64 const &length_)
Adds the given \a length_ to the property \ref nid3_length "nid3:length" set.
\sa LiveResource::addObject
*/
- void addLength(int const &length_) { baseAddObject< nid3::length >( length_ ); }
+ void addLength(qint64 const &length_) { baseAddObject< nid3::length >( length_ ); }
/*!
- \fn void removeLength(int const &length_)
+ \fn void removeLength(qint64 const &length_)
Removes the given \a length_ from the property \ref nid3_length "nid3:length" set.
\sa LiveResource::removeObject
*/
- void removeLength(int const &length_) { baseRemoveObject< nid3::length >(length_); }
+ void removeLength(qint64 const &length_) { baseRemoveObject< nid3::length >(length_); }
//@}
};
--- src/include/QtTracker/ontologies/nie.h
+++ src/include/QtTracker/ontologies/nie.h
@@ -1,7 +1,7 @@
/*
* nie.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:43.132847
+ * Automatically created on: 2010-11-01 14:52:12.046320
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/nie.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -141,7 +141,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef DataObject RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1313,7 +1313,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef InformationElement RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1380,7 +1380,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef InformationElement RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1796,45 +1796,45 @@
*/
void removeByteSizes(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nie::byteSize::iri(), object_info); }
/*!
- \fn int getByteSize()
+ \fn qint64 getByteSize()
- Returns the property \ref nie_byteSize "nie:byteSize". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nie_byteSize "nie:byteSize". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getByteSize() { return baseGetObject< nie::byteSize >(); }
+ qint64 getByteSize() { return baseGetObject< nie::byteSize >(); }
/*!
- \fn void setByteSize(int const &byteSize_)
+ \fn void setByteSize(qint64 const &byteSize_)
Sets the property \ref nie_byteSize "nie:byteSize" to the given \a byteSize.
\sa LiveResource::setObject
*/
- void setByteSize(int const &byteSize_) { baseSetObject< nie::byteSize >( byteSize_ ); }
+ void setByteSize(qint64 const &byteSize_) { baseSetObject< nie::byteSize >( byteSize_ ); }
/*!
- \fn int firstByteSize()
+ \fn qint64 firstByteSize()
Returns the first property \ref nie_byteSize "nie:byteSize". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstByteSize() { return baseFirstObject< nie::byteSize >(); }
+ qint64 firstByteSize() { return baseFirstObject< nie::byteSize >(); }
/*!
- \fn void addByteSize(int const &byteSize_)
+ \fn void addByteSize(qint64 const &byteSize_)
Adds the given \a byteSize_ to the property \ref nie_byteSize "nie:byteSize" set.
\sa LiveResource::addObject
*/
- void addByteSize(int const &byteSize_) { baseAddObject< nie::byteSize >( byteSize_ ); }
+ void addByteSize(qint64 const &byteSize_) { baseAddObject< nie::byteSize >( byteSize_ ); }
/*!
- \fn void removeByteSize(int const &byteSize_)
+ \fn void removeByteSize(qint64 const &byteSize_)
Removes the given \a byteSize_ from the property \ref nie_byteSize "nie:byteSize" set.
\sa LiveResource::removeObject
*/
- void removeByteSize(int const &byteSize_) { baseRemoveObject< nie::byteSize >(byteSize_); }
+ void removeByteSize(qint64 const &byteSize_) { baseRemoveObject< nie::byteSize >(byteSize_); }
/* Property generated from nie:url
* \n URL pointing at the location of the resource. In cases where creating a simple file:// or http:// URL for a file is difficult (e.g. for files inside compressed archives) the applications are encouraged to use conventions defined by Apache Commons VFS Project at http://jakarta.apache.org/ commons/ vfs/ filesystems.html.
@@ -2387,45 +2387,45 @@
*/
void removeContentSizes(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nie::contentSize::iri(), object_info); }
/*!
- \fn int getContentSize()
+ \fn qint64 getContentSize()
- Returns the property \ref nie_contentSize "nie:contentSize". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nie_contentSize "nie:contentSize". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getContentSize() { return baseGetObject< nie::contentSize >(); }
+ qint64 getContentSize() { return baseGetObject< nie::contentSize >(); }
/*!
- \fn void setContentSize(int const &contentSize_)
+ \fn void setContentSize(qint64 const &contentSize_)
Sets the property \ref nie_contentSize "nie:contentSize" to the given \a contentSize.
\sa LiveResource::setObject
*/
- void setContentSize(int const &contentSize_) { baseSetObject< nie::contentSize >( contentSize_ ); }
+ void setContentSize(qint64 const &contentSize_) { baseSetObject< nie::contentSize >( contentSize_ ); }
/*!
- \fn int firstContentSize()
+ \fn qint64 firstContentSize()
Returns the first property \ref nie_contentSize "nie:contentSize". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstContentSize() { return baseFirstObject< nie::contentSize >(); }
+ qint64 firstContentSize() { return baseFirstObject< nie::contentSize >(); }
/*!
- \fn void addContentSize(int const &contentSize_)
+ \fn void addContentSize(qint64 const &contentSize_)
Adds the given \a contentSize_ to the property \ref nie_contentSize "nie:contentSize" set.
\sa LiveResource::addObject
*/
- void addContentSize(int const &contentSize_) { baseAddObject< nie::contentSize >( contentSize_ ); }
+ void addContentSize(qint64 const &contentSize_) { baseAddObject< nie::contentSize >( contentSize_ ); }
/*!
- \fn void removeContentSize(int const &contentSize_)
+ \fn void removeContentSize(qint64 const &contentSize_)
Removes the given \a contentSize_ from the property \ref nie_contentSize "nie:contentSize" set.
\sa LiveResource::removeObject
*/
- void removeContentSize(int const &contentSize_) { baseRemoveObject< nie::contentSize >(contentSize_); }
+ void removeContentSize(qint64 const &contentSize_) { baseRemoveObject< nie::contentSize >(contentSize_); }
/* Property generated from nie:usageCounter
* \n nrl:maxCardinality=1
@@ -2469,45 +2469,45 @@
*/
void removeUsageCounters(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nie::usageCounter::iri(), object_info); }
/*!
- \fn int getUsageCounter()
+ \fn qint64 getUsageCounter()
- Returns the property \ref nie_usageCounter "nie:usageCounter". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nie_usageCounter "nie:usageCounter". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getUsageCounter() { return baseGetObject< nie::usageCounter >(); }
+ qint64 getUsageCounter() { return baseGetObject< nie::usageCounter >(); }
/*!
- \fn void setUsageCounter(int const &usageCounter_)
+ \fn void setUsageCounter(qint64 const &usageCounter_)
Sets the property \ref nie_usageCounter "nie:usageCounter" to the given \a usageCounter.
\sa LiveResource::setObject
*/
- void setUsageCounter(int const &usageCounter_) { baseSetObject< nie::usageCounter >( usageCounter_ ); }
+ void setUsageCounter(qint64 const &usageCounter_) { baseSetObject< nie::usageCounter >( usageCounter_ ); }
/*!
- \fn int firstUsageCounter()
+ \fn qint64 firstUsageCounter()
Returns the first property \ref nie_usageCounter "nie:usageCounter". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstUsageCounter() { return baseFirstObject< nie::usageCounter >(); }
+ qint64 firstUsageCounter() { return baseFirstObject< nie::usageCounter >(); }
/*!
- \fn void addUsageCounter(int const &usageCounter_)
+ \fn void addUsageCounter(qint64 const &usageCounter_)
Adds the given \a usageCounter_ to the property \ref nie_usageCounter "nie:usageCounter" set.
\sa LiveResource::addObject
*/
- void addUsageCounter(int const &usageCounter_) { baseAddObject< nie::usageCounter >( usageCounter_ ); }
+ void addUsageCounter(qint64 const &usageCounter_) { baseAddObject< nie::usageCounter >( usageCounter_ ); }
/*!
- \fn void removeUsageCounter(int const &usageCounter_)
+ \fn void removeUsageCounter(qint64 const &usageCounter_)
Removes the given \a usageCounter_ from the property \ref nie_usageCounter "nie:usageCounter" set.
\sa LiveResource::removeObject
*/
- void removeUsageCounter(int const &usageCounter_) { baseRemoveObject< nie::usageCounter >(usageCounter_); }
+ void removeUsageCounter(qint64 const &usageCounter_) { baseRemoveObject< nie::usageCounter >(usageCounter_); }
/* Property generated from nfo:isContentEncrypted
* \n Might change (IE of DataObject property?)
--- src/include/QtTracker/ontologies/nmm.h
+++ src/include/QtTracker/ontologies/nmm.h
@@ -1,7 +1,7 @@
/*
* nmm.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:47.891965
+ * Automatically created on: 2010-11-01 14:52:12.224295
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/nmm.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -172,7 +172,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef AnalogRadio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -244,7 +244,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef DigitalRadio RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -451,7 +451,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MusicAlbum RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -523,7 +523,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MusicAlbum RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -557,7 +557,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MusicAlbum RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -591,7 +591,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MusicAlbum RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -625,7 +625,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MusicAlbum RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -697,7 +697,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MusicPiece RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -770,7 +770,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MusicPiece RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -908,7 +908,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MusicPiece RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1319,7 +1319,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef RadioStation RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1485,7 +1485,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Video RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1518,7 +1518,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Video RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1551,7 +1551,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Video RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1985,7 +1985,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef nfo::Media RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2507,45 +2507,45 @@
*/
void removeFrequencys(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::frequency::iri(), object_info); }
/*!
- \fn int getFrequency()
+ \fn qint64 getFrequency()
- Returns the property \ref nmm_frequency "nmm:frequency". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_frequency "nmm:frequency". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getFrequency() { return baseGetObject< nmm::frequency >(); }
+ qint64 getFrequency() { return baseGetObject< nmm::frequency >(); }
/*!
- \fn void setFrequency(int const &frequency_)
+ \fn void setFrequency(qint64 const &frequency_)
Sets the property \ref nmm_frequency "nmm:frequency" to the given \a frequency.
\sa LiveResource::setObject
*/
- void setFrequency(int const &frequency_) { baseSetObject< nmm::frequency >( frequency_ ); }
+ void setFrequency(qint64 const &frequency_) { baseSetObject< nmm::frequency >( frequency_ ); }
/*!
- \fn int firstFrequency()
+ \fn qint64 firstFrequency()
Returns the first property \ref nmm_frequency "nmm:frequency". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstFrequency() { return baseFirstObject< nmm::frequency >(); }
+ qint64 firstFrequency() { return baseFirstObject< nmm::frequency >(); }
/*!
- \fn void addFrequency(int const &frequency_)
+ \fn void addFrequency(qint64 const &frequency_)
Adds the given \a frequency_ to the property \ref nmm_frequency "nmm:frequency" set.
\sa LiveResource::addObject
*/
- void addFrequency(int const &frequency_) { baseAddObject< nmm::frequency >( frequency_ ); }
+ void addFrequency(qint64 const &frequency_) { baseAddObject< nmm::frequency >( frequency_ ); }
/*!
- \fn void removeFrequency(int const &frequency_)
+ \fn void removeFrequency(qint64 const &frequency_)
Removes the given \a frequency_ from the property \ref nmm_frequency "nmm:frequency" set.
\sa LiveResource::removeObject
*/
- void removeFrequency(int const &frequency_) { baseRemoveObject< nmm::frequency >(frequency_); }
+ void removeFrequency(qint64 const &frequency_) { baseRemoveObject< nmm::frequency >(frequency_); }
//@}
};
@@ -2952,45 +2952,45 @@
*/
void removeStreamingBitrates(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::streamingBitrate::iri(), object_info); }
/*!
- \fn int getStreamingBitrate()
+ \fn qint64 getStreamingBitrate()
- Returns the property \ref nmm_streamingBitrate "nmm:streamingBitrate". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_streamingBitrate "nmm:streamingBitrate". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getStreamingBitrate() { return baseGetObject< nmm::streamingBitrate >(); }
+ qint64 getStreamingBitrate() { return baseGetObject< nmm::streamingBitrate >(); }
/*!
- \fn void setStreamingBitrate(int const &streamingBitrate_)
+ \fn void setStreamingBitrate(qint64 const &streamingBitrate_)
Sets the property \ref nmm_streamingBitrate "nmm:streamingBitrate" to the given \a streamingBitrate.
\sa LiveResource::setObject
*/
- void setStreamingBitrate(int const &streamingBitrate_) { baseSetObject< nmm::streamingBitrate >( streamingBitrate_ ); }
+ void setStreamingBitrate(qint64 const &streamingBitrate_) { baseSetObject< nmm::streamingBitrate >( streamingBitrate_ ); }
/*!
- \fn int firstStreamingBitrate()
+ \fn qint64 firstStreamingBitrate()
Returns the first property \ref nmm_streamingBitrate "nmm:streamingBitrate". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstStreamingBitrate() { return baseFirstObject< nmm::streamingBitrate >(); }
+ qint64 firstStreamingBitrate() { return baseFirstObject< nmm::streamingBitrate >(); }
/*!
- \fn void addStreamingBitrate(int const &streamingBitrate_)
+ \fn void addStreamingBitrate(qint64 const &streamingBitrate_)
Adds the given \a streamingBitrate_ to the property \ref nmm_streamingBitrate "nmm:streamingBitrate" set.
\sa LiveResource::addObject
*/
- void addStreamingBitrate(int const &streamingBitrate_) { baseAddObject< nmm::streamingBitrate >( streamingBitrate_ ); }
+ void addStreamingBitrate(qint64 const &streamingBitrate_) { baseAddObject< nmm::streamingBitrate >( streamingBitrate_ ); }
/*!
- \fn void removeStreamingBitrate(int const &streamingBitrate_)
+ \fn void removeStreamingBitrate(qint64 const &streamingBitrate_)
Removes the given \a streamingBitrate_ from the property \ref nmm_streamingBitrate "nmm:streamingBitrate" set.
\sa LiveResource::removeObject
*/
- void removeStreamingBitrate(int const &streamingBitrate_) { baseRemoveObject< nmm::streamingBitrate >(streamingBitrate_); }
+ void removeStreamingBitrate(qint64 const &streamingBitrate_) { baseRemoveObject< nmm::streamingBitrate >(streamingBitrate_); }
//@}
};
@@ -3346,45 +3346,45 @@
*/
void removeAlbumDurations(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::albumDuration::iri(), object_info); }
/*!
- \fn int getAlbumDuration()
+ \fn qint64 getAlbumDuration()
- Returns the property \ref nmm_albumDuration "nmm:albumDuration". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_albumDuration "nmm:albumDuration". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getAlbumDuration() { return baseGetObject< nmm::albumDuration >(); }
+ qint64 getAlbumDuration() { return baseGetObject< nmm::albumDuration >(); }
/*!
- \fn void setAlbumDuration(int const &albumDuration_)
+ \fn void setAlbumDuration(qint64 const &albumDuration_)
Sets the property \ref nmm_albumDuration "nmm:albumDuration" to the given \a albumDuration.
\sa LiveResource::setObject
*/
- void setAlbumDuration(int const &albumDuration_) { baseSetObject< nmm::albumDuration >( albumDuration_ ); }
+ void setAlbumDuration(qint64 const &albumDuration_) { baseSetObject< nmm::albumDuration >( albumDuration_ ); }
/*!
- \fn int firstAlbumDuration()
+ \fn qint64 firstAlbumDuration()
Returns the first property \ref nmm_albumDuration "nmm:albumDuration". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstAlbumDuration() { return baseFirstObject< nmm::albumDuration >(); }
+ qint64 firstAlbumDuration() { return baseFirstObject< nmm::albumDuration >(); }
/*!
- \fn void addAlbumDuration(int const &albumDuration_)
+ \fn void addAlbumDuration(qint64 const &albumDuration_)
Adds the given \a albumDuration_ to the property \ref nmm_albumDuration "nmm:albumDuration" set.
\sa LiveResource::addObject
*/
- void addAlbumDuration(int const &albumDuration_) { baseAddObject< nmm::albumDuration >( albumDuration_ ); }
+ void addAlbumDuration(qint64 const &albumDuration_) { baseAddObject< nmm::albumDuration >( albumDuration_ ); }
/*!
- \fn void removeAlbumDuration(int const &albumDuration_)
+ \fn void removeAlbumDuration(qint64 const &albumDuration_)
Removes the given \a albumDuration_ from the property \ref nmm_albumDuration "nmm:albumDuration" set.
\sa LiveResource::removeObject
*/
- void removeAlbumDuration(int const &albumDuration_) { baseRemoveObject< nmm::albumDuration >(albumDuration_); }
+ void removeAlbumDuration(qint64 const &albumDuration_) { baseRemoveObject< nmm::albumDuration >(albumDuration_); }
/* Property generated from nmm:internationalStandardRecordingCode
* \n ISRC ID. Format: 'CC-XXX-YY-NNNNN'
@@ -3597,45 +3597,45 @@
*/
void removeAlbumTrackCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::albumTrackCount::iri(), object_info); }
/*!
- \fn int getAlbumTrackCount()
+ \fn qint64 getAlbumTrackCount()
- Returns the property \ref nmm_albumTrackCount "nmm:albumTrackCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_albumTrackCount "nmm:albumTrackCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getAlbumTrackCount() { return baseGetObject< nmm::albumTrackCount >(); }
+ qint64 getAlbumTrackCount() { return baseGetObject< nmm::albumTrackCount >(); }
/*!
- \fn void setAlbumTrackCount(int const &albumTrackCount_)
+ \fn void setAlbumTrackCount(qint64 const &albumTrackCount_)
Sets the property \ref nmm_albumTrackCount "nmm:albumTrackCount" to the given \a albumTrackCount.
\sa LiveResource::setObject
*/
- void setAlbumTrackCount(int const &albumTrackCount_) { baseSetObject< nmm::albumTrackCount >( albumTrackCount_ ); }
+ void setAlbumTrackCount(qint64 const &albumTrackCount_) { baseSetObject< nmm::albumTrackCount >( albumTrackCount_ ); }
/*!
- \fn int firstAlbumTrackCount()
+ \fn qint64 firstAlbumTrackCount()
Returns the first property \ref nmm_albumTrackCount "nmm:albumTrackCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstAlbumTrackCount() { return baseFirstObject< nmm::albumTrackCount >(); }
+ qint64 firstAlbumTrackCount() { return baseFirstObject< nmm::albumTrackCount >(); }
/*!
- \fn void addAlbumTrackCount(int const &albumTrackCount_)
+ \fn void addAlbumTrackCount(qint64 const &albumTrackCount_)
Adds the given \a albumTrackCount_ to the property \ref nmm_albumTrackCount "nmm:albumTrackCount" set.
\sa LiveResource::addObject
*/
- void addAlbumTrackCount(int const &albumTrackCount_) { baseAddObject< nmm::albumTrackCount >( albumTrackCount_ ); }
+ void addAlbumTrackCount(qint64 const &albumTrackCount_) { baseAddObject< nmm::albumTrackCount >( albumTrackCount_ ); }
/*!
- \fn void removeAlbumTrackCount(int const &albumTrackCount_)
+ \fn void removeAlbumTrackCount(qint64 const &albumTrackCount_)
Removes the given \a albumTrackCount_ from the property \ref nmm_albumTrackCount "nmm:albumTrackCount" set.
\sa LiveResource::removeObject
*/
- void removeAlbumTrackCount(int const &albumTrackCount_) { baseRemoveObject< nmm::albumTrackCount >(albumTrackCount_); }
+ void removeAlbumTrackCount(qint64 const &albumTrackCount_) { baseRemoveObject< nmm::albumTrackCount >(albumTrackCount_); }
/* Property generated from nmm:albumGain
* \n Gain of album
@@ -3679,45 +3679,45 @@
*/
void removeAlbumGains(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::albumGain::iri(), object_info); }
/*!
- \fn int getAlbumGain()
+ \fn qint64 getAlbumGain()
- Returns the property \ref nmm_albumGain "nmm:albumGain". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_albumGain "nmm:albumGain". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getAlbumGain() { return baseGetObject< nmm::albumGain >(); }
+ qint64 getAlbumGain() { return baseGetObject< nmm::albumGain >(); }
/*!
- \fn void setAlbumGain(int const &albumGain_)
+ \fn void setAlbumGain(qint64 const &albumGain_)
Sets the property \ref nmm_albumGain "nmm:albumGain" to the given \a albumGain.
\sa LiveResource::setObject
*/
- void setAlbumGain(int const &albumGain_) { baseSetObject< nmm::albumGain >( albumGain_ ); }
+ void setAlbumGain(qint64 const &albumGain_) { baseSetObject< nmm::albumGain >( albumGain_ ); }
/*!
- \fn int firstAlbumGain()
+ \fn qint64 firstAlbumGain()
Returns the first property \ref nmm_albumGain "nmm:albumGain". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstAlbumGain() { return baseFirstObject< nmm::albumGain >(); }
+ qint64 firstAlbumGain() { return baseFirstObject< nmm::albumGain >(); }
/*!
- \fn void addAlbumGain(int const &albumGain_)
+ \fn void addAlbumGain(qint64 const &albumGain_)
Adds the given \a albumGain_ to the property \ref nmm_albumGain "nmm:albumGain" set.
\sa LiveResource::addObject
*/
- void addAlbumGain(int const &albumGain_) { baseAddObject< nmm::albumGain >( albumGain_ ); }
+ void addAlbumGain(qint64 const &albumGain_) { baseAddObject< nmm::albumGain >( albumGain_ ); }
/*!
- \fn void removeAlbumGain(int const &albumGain_)
+ \fn void removeAlbumGain(qint64 const &albumGain_)
Removes the given \a albumGain_ from the property \ref nmm_albumGain "nmm:albumGain" set.
\sa LiveResource::removeObject
*/
- void removeAlbumGain(int const &albumGain_) { baseRemoveObject< nmm::albumGain >(albumGain_); }
+ void removeAlbumGain(qint64 const &albumGain_) { baseRemoveObject< nmm::albumGain >(albumGain_); }
/* Property generated from nmm:albumArtist
* \n main artists of the album
@@ -3852,45 +3852,45 @@
*/
void removeSetNumbers(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::setNumber::iri(), object_info); }
/*!
- \fn int getSetNumber()
+ \fn qint64 getSetNumber()
- Returns the property \ref nmm_setNumber "nmm:setNumber". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_setNumber "nmm:setNumber". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getSetNumber() { return baseGetObject< nmm::setNumber >(); }
+ qint64 getSetNumber() { return baseGetObject< nmm::setNumber >(); }
/*!
- \fn void setSetNumber(int const &setNumber_)
+ \fn void setSetNumber(qint64 const &setNumber_)
Sets the property \ref nmm_setNumber "nmm:setNumber" to the given \a setNumber.
\sa LiveResource::setObject
*/
- void setSetNumber(int const &setNumber_) { baseSetObject< nmm::setNumber >( setNumber_ ); }
+ void setSetNumber(qint64 const &setNumber_) { baseSetObject< nmm::setNumber >( setNumber_ ); }
/*!
- \fn int firstSetNumber()
+ \fn qint64 firstSetNumber()
Returns the first property \ref nmm_setNumber "nmm:setNumber". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstSetNumber() { return baseFirstObject< nmm::setNumber >(); }
+ qint64 firstSetNumber() { return baseFirstObject< nmm::setNumber >(); }
/*!
- \fn void addSetNumber(int const &setNumber_)
+ \fn void addSetNumber(qint64 const &setNumber_)
Adds the given \a setNumber_ to the property \ref nmm_setNumber "nmm:setNumber" set.
\sa LiveResource::addObject
*/
- void addSetNumber(int const &setNumber_) { baseAddObject< nmm::setNumber >( setNumber_ ); }
+ void addSetNumber(qint64 const &setNumber_) { baseAddObject< nmm::setNumber >( setNumber_ ); }
/*!
- \fn void removeSetNumber(int const &setNumber_)
+ \fn void removeSetNumber(qint64 const &setNumber_)
Removes the given \a setNumber_ from the property \ref nmm_setNumber "nmm:setNumber" set.
\sa LiveResource::removeObject
*/
- void removeSetNumber(int const &setNumber_) { baseRemoveObject< nmm::setNumber >(setNumber_); }
+ void removeSetNumber(qint64 const &setNumber_) { baseRemoveObject< nmm::setNumber >(setNumber_); }
/* Property generated from nmm:albumPeakGain
* \n Peak Gain of album
@@ -3934,45 +3934,45 @@
*/
void removeAlbumPeakGains(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::albumPeakGain::iri(), object_info); }
/*!
- \fn int getAlbumPeakGain()
+ \fn qint64 getAlbumPeakGain()
- Returns the property \ref nmm_albumPeakGain "nmm:albumPeakGain". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_albumPeakGain "nmm:albumPeakGain". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getAlbumPeakGain() { return baseGetObject< nmm::albumPeakGain >(); }
+ qint64 getAlbumPeakGain() { return baseGetObject< nmm::albumPeakGain >(); }
/*!
- \fn void setAlbumPeakGain(int const &albumPeakGain_)
+ \fn void setAlbumPeakGain(qint64 const &albumPeakGain_)
Sets the property \ref nmm_albumPeakGain "nmm:albumPeakGain" to the given \a albumPeakGain.
\sa LiveResource::setObject
*/
- void setAlbumPeakGain(int const &albumPeakGain_) { baseSetObject< nmm::albumPeakGain >( albumPeakGain_ ); }
+ void setAlbumPeakGain(qint64 const &albumPeakGain_) { baseSetObject< nmm::albumPeakGain >( albumPeakGain_ ); }
/*!
- \fn int firstAlbumPeakGain()
+ \fn qint64 firstAlbumPeakGain()
Returns the first property \ref nmm_albumPeakGain "nmm:albumPeakGain". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstAlbumPeakGain() { return baseFirstObject< nmm::albumPeakGain >(); }
+ qint64 firstAlbumPeakGain() { return baseFirstObject< nmm::albumPeakGain >(); }
/*!
- \fn void addAlbumPeakGain(int const &albumPeakGain_)
+ \fn void addAlbumPeakGain(qint64 const &albumPeakGain_)
Adds the given \a albumPeakGain_ to the property \ref nmm_albumPeakGain "nmm:albumPeakGain" set.
\sa LiveResource::addObject
*/
- void addAlbumPeakGain(int const &albumPeakGain_) { baseAddObject< nmm::albumPeakGain >( albumPeakGain_ ); }
+ void addAlbumPeakGain(qint64 const &albumPeakGain_) { baseAddObject< nmm::albumPeakGain >( albumPeakGain_ ); }
/*!
- \fn void removeAlbumPeakGain(int const &albumPeakGain_)
+ \fn void removeAlbumPeakGain(qint64 const &albumPeakGain_)
Removes the given \a albumPeakGain_ from the property \ref nmm_albumPeakGain "nmm:albumPeakGain" set.
\sa LiveResource::removeObject
*/
- void removeAlbumPeakGain(int const &albumPeakGain_) { baseRemoveObject< nmm::albumPeakGain >(albumPeakGain_); }
+ void removeAlbumPeakGain(qint64 const &albumPeakGain_) { baseRemoveObject< nmm::albumPeakGain >(albumPeakGain_); }
//@}
};
@@ -4329,45 +4329,45 @@
*/
SOPRANO_DEPRECATED void removeLengths(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::length::iri(), object_info); }
/*!
- \fn int getLength()
+ \fn qint64 getLength()
\deprecated See \ref nmm::length for replacement
- Returns the property \ref nmm_length "nmm:length". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_length "nmm:length". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- SOPRANO_DEPRECATED int getLength() { return baseGetObject< nmm::length >(); }
+ SOPRANO_DEPRECATED qint64 getLength() { return baseGetObject< nmm::length >(); }
/*!
- \fn void setLength(int const &length_)
+ \fn void setLength(qint64 const &length_)
\deprecated See \ref nmm::length for replacement
Sets the property \ref nmm_length "nmm:length" to the given \a length.
\sa LiveResource::setObject
*/
- SOPRANO_DEPRECATED void setLength(int const &length_) { baseSetObject< nmm::length >( length_ ); }
+ SOPRANO_DEPRECATED void setLength(qint64 const &length_) { baseSetObject< nmm::length >( length_ ); }
/*!
- \fn int firstLength()
+ \fn qint64 firstLength()
\deprecated See \ref nmm::length for replacement
Returns the first property \ref nmm_length "nmm:length". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- SOPRANO_DEPRECATED int firstLength() { return baseFirstObject< nmm::length >(); }
+ SOPRANO_DEPRECATED qint64 firstLength() { return baseFirstObject< nmm::length >(); }
/*!
- \fn void addLength(int const &length_)
+ \fn void addLength(qint64 const &length_)
\deprecated See \ref nmm::length for replacement
Adds the given \a length_ to the property \ref nmm_length "nmm:length" set.
\sa LiveResource::addObject
*/
- SOPRANO_DEPRECATED void addLength(int const &length_) { baseAddObject< nmm::length >( length_ ); }
+ SOPRANO_DEPRECATED void addLength(qint64 const &length_) { baseAddObject< nmm::length >( length_ ); }
/*!
- \fn void removeLength(int const &length_)
+ \fn void removeLength(qint64 const &length_)
\deprecated See \ref nmm::length for replacement
Removes the given \a length_ from the property \ref nmm_length "nmm:length" set.
\sa LiveResource::removeObject
*/
- SOPRANO_DEPRECATED void removeLength(int const &length_) { baseRemoveObject< nmm::length >(length_); }
+ SOPRANO_DEPRECATED void removeLength(qint64 const &length_) { baseRemoveObject< nmm::length >(length_); }
/* Property generated from nmm:composer
* \n Composer
@@ -4503,45 +4503,45 @@
*/
void removeTrackNumbers(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::trackNumber::iri(), object_info); }
/*!
- \fn int getTrackNumber()
+ \fn qint64 getTrackNumber()
- Returns the property \ref nmm_trackNumber "nmm:trackNumber". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_trackNumber "nmm:trackNumber". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getTrackNumber() { return baseGetObject< nmm::trackNumber >(); }
+ qint64 getTrackNumber() { return baseGetObject< nmm::trackNumber >(); }
/*!
- \fn void setTrackNumber(int const &trackNumber_)
+ \fn void setTrackNumber(qint64 const &trackNumber_)
Sets the property \ref nmm_trackNumber "nmm:trackNumber" to the given \a trackNumber.
\sa LiveResource::setObject
*/
- void setTrackNumber(int const &trackNumber_) { baseSetObject< nmm::trackNumber >( trackNumber_ ); }
+ void setTrackNumber(qint64 const &trackNumber_) { baseSetObject< nmm::trackNumber >( trackNumber_ ); }
/*!
- \fn int firstTrackNumber()
+ \fn qint64 firstTrackNumber()
Returns the first property \ref nmm_trackNumber "nmm:trackNumber". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstTrackNumber() { return baseFirstObject< nmm::trackNumber >(); }
+ qint64 firstTrackNumber() { return baseFirstObject< nmm::trackNumber >(); }
/*!
- \fn void addTrackNumber(int const &trackNumber_)
+ \fn void addTrackNumber(qint64 const &trackNumber_)
Adds the given \a trackNumber_ to the property \ref nmm_trackNumber "nmm:trackNumber" set.
\sa LiveResource::addObject
*/
- void addTrackNumber(int const &trackNumber_) { baseAddObject< nmm::trackNumber >( trackNumber_ ); }
+ void addTrackNumber(qint64 const &trackNumber_) { baseAddObject< nmm::trackNumber >( trackNumber_ ); }
/*!
- \fn void removeTrackNumber(int const &trackNumber_)
+ \fn void removeTrackNumber(qint64 const &trackNumber_)
Removes the given \a trackNumber_ from the property \ref nmm_trackNumber "nmm:trackNumber" set.
\sa LiveResource::removeObject
*/
- void removeTrackNumber(int const &trackNumber_) { baseRemoveObject< nmm::trackNumber >(trackNumber_); }
+ void removeTrackNumber(qint64 const &trackNumber_) { baseRemoveObject< nmm::trackNumber >(trackNumber_); }
/* Property generated from nmm:beatsPerMinute
* \n beats per minute
@@ -4585,45 +4585,45 @@
*/
void removeBeatsPerMinutes(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::beatsPerMinute::iri(), object_info); }
/*!
- \fn int getBeatsPerMinute()
+ \fn qint64 getBeatsPerMinute()
- Returns the property \ref nmm_beatsPerMinute "nmm:beatsPerMinute". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_beatsPerMinute "nmm:beatsPerMinute". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getBeatsPerMinute() { return baseGetObject< nmm::beatsPerMinute >(); }
+ qint64 getBeatsPerMinute() { return baseGetObject< nmm::beatsPerMinute >(); }
/*!
- \fn void setBeatsPerMinute(int const &beatsPerMinute_)
+ \fn void setBeatsPerMinute(qint64 const &beatsPerMinute_)
Sets the property \ref nmm_beatsPerMinute "nmm:beatsPerMinute" to the given \a beatsPerMinute.
\sa LiveResource::setObject
*/
- void setBeatsPerMinute(int const &beatsPerMinute_) { baseSetObject< nmm::beatsPerMinute >( beatsPerMinute_ ); }
+ void setBeatsPerMinute(qint64 const &beatsPerMinute_) { baseSetObject< nmm::beatsPerMinute >( beatsPerMinute_ ); }
/*!
- \fn int firstBeatsPerMinute()
+ \fn qint64 firstBeatsPerMinute()
Returns the first property \ref nmm_beatsPerMinute "nmm:beatsPerMinute". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstBeatsPerMinute() { return baseFirstObject< nmm::beatsPerMinute >(); }
+ qint64 firstBeatsPerMinute() { return baseFirstObject< nmm::beatsPerMinute >(); }
/*!
- \fn void addBeatsPerMinute(int const &beatsPerMinute_)
+ \fn void addBeatsPerMinute(qint64 const &beatsPerMinute_)
Adds the given \a beatsPerMinute_ to the property \ref nmm_beatsPerMinute "nmm:beatsPerMinute" set.
\sa LiveResource::addObject
*/
- void addBeatsPerMinute(int const &beatsPerMinute_) { baseAddObject< nmm::beatsPerMinute >( beatsPerMinute_ ); }
+ void addBeatsPerMinute(qint64 const &beatsPerMinute_) { baseAddObject< nmm::beatsPerMinute >( beatsPerMinute_ ); }
/*!
- \fn void removeBeatsPerMinute(int const &beatsPerMinute_)
+ \fn void removeBeatsPerMinute(qint64 const &beatsPerMinute_)
Removes the given \a beatsPerMinute_ from the property \ref nmm_beatsPerMinute "nmm:beatsPerMinute" set.
\sa LiveResource::removeObject
*/
- void removeBeatsPerMinute(int const &beatsPerMinute_) { baseRemoveObject< nmm::beatsPerMinute >(beatsPerMinute_); }
+ void removeBeatsPerMinute(qint64 const &beatsPerMinute_) { baseRemoveObject< nmm::beatsPerMinute >(beatsPerMinute_); }
/* Property generated from nmm:performer
* \n Performer
@@ -5825,45 +5825,45 @@
*/
void removeRadioPTYs(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::radioPTY::iri(), object_info); }
/*!
- \fn int getRadioPTY()
+ \fn qint64 getRadioPTY()
- Returns the property \ref nmm_radioPTY "nmm:radioPTY". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_radioPTY "nmm:radioPTY". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getRadioPTY() { return baseGetObject< nmm::radioPTY >(); }
+ qint64 getRadioPTY() { return baseGetObject< nmm::radioPTY >(); }
/*!
- \fn void setRadioPTY(int const &radioPTY_)
+ \fn void setRadioPTY(qint64 const &radioPTY_)
Sets the property \ref nmm_radioPTY "nmm:radioPTY" to the given \a radioPTY.
\sa LiveResource::setObject
*/
- void setRadioPTY(int const &radioPTY_) { baseSetObject< nmm::radioPTY >( radioPTY_ ); }
+ void setRadioPTY(qint64 const &radioPTY_) { baseSetObject< nmm::radioPTY >( radioPTY_ ); }
/*!
- \fn int firstRadioPTY()
+ \fn qint64 firstRadioPTY()
Returns the first property \ref nmm_radioPTY "nmm:radioPTY". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstRadioPTY() { return baseFirstObject< nmm::radioPTY >(); }
+ qint64 firstRadioPTY() { return baseFirstObject< nmm::radioPTY >(); }
/*!
- \fn void addRadioPTY(int const &radioPTY_)
+ \fn void addRadioPTY(qint64 const &radioPTY_)
Adds the given \a radioPTY_ to the property \ref nmm_radioPTY "nmm:radioPTY" set.
\sa LiveResource::addObject
*/
- void addRadioPTY(int const &radioPTY_) { baseAddObject< nmm::radioPTY >( radioPTY_ ); }
+ void addRadioPTY(qint64 const &radioPTY_) { baseAddObject< nmm::radioPTY >( radioPTY_ ); }
/*!
- \fn void removeRadioPTY(int const &radioPTY_)
+ \fn void removeRadioPTY(qint64 const &radioPTY_)
Removes the given \a radioPTY_ from the property \ref nmm_radioPTY "nmm:radioPTY" set.
\sa LiveResource::removeObject
*/
- void removeRadioPTY(int const &radioPTY_) { baseRemoveObject< nmm::radioPTY >(radioPTY_); }
+ void removeRadioPTY(qint64 const &radioPTY_) { baseRemoveObject< nmm::radioPTY >(radioPTY_); }
/* Property generated from nmm:radioIcon
* \n Image used as logo for a radio station
@@ -6422,45 +6422,45 @@
*/
void removeSeasons(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::season::iri(), object_info); }
/*!
- \fn int getSeason()
+ \fn qint64 getSeason()
- Returns the property \ref nmm_season "nmm:season". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_season "nmm:season". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getSeason() { return baseGetObject< nmm::season >(); }
+ qint64 getSeason() { return baseGetObject< nmm::season >(); }
/*!
- \fn void setSeason(int const &season_)
+ \fn void setSeason(qint64 const &season_)
Sets the property \ref nmm_season "nmm:season" to the given \a season.
\sa LiveResource::setObject
*/
- void setSeason(int const &season_) { baseSetObject< nmm::season >( season_ ); }
+ void setSeason(qint64 const &season_) { baseSetObject< nmm::season >( season_ ); }
/*!
- \fn int firstSeason()
+ \fn qint64 firstSeason()
Returns the first property \ref nmm_season "nmm:season". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstSeason() { return baseFirstObject< nmm::season >(); }
+ qint64 firstSeason() { return baseFirstObject< nmm::season >(); }
/*!
- \fn void addSeason(int const &season_)
+ \fn void addSeason(qint64 const &season_)
Adds the given \a season_ to the property \ref nmm_season "nmm:season" set.
\sa LiveResource::addObject
*/
- void addSeason(int const &season_) { baseAddObject< nmm::season >( season_ ); }
+ void addSeason(qint64 const &season_) { baseAddObject< nmm::season >( season_ ); }
/*!
- \fn void removeSeason(int const &season_)
+ \fn void removeSeason(qint64 const &season_)
Removes the given \a season_ from the property \ref nmm_season "nmm:season" set.
\sa LiveResource::removeObject
*/
- void removeSeason(int const &season_) { baseRemoveObject< nmm::season >(season_); }
+ void removeSeason(qint64 const &season_) { baseRemoveObject< nmm::season >(season_); }
/* Property generated from nmm:videoAlbum
* \n rdfs:label=Album
@@ -6747,45 +6747,45 @@
*/
void removeRunTimes(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::runTime::iri(), object_info); }
/*!
- \fn int getRunTime()
+ \fn qint64 getRunTime()
- Returns the property \ref nmm_runTime "nmm:runTime". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_runTime "nmm:runTime". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getRunTime() { return baseGetObject< nmm::runTime >(); }
+ qint64 getRunTime() { return baseGetObject< nmm::runTime >(); }
/*!
- \fn void setRunTime(int const &runTime_)
+ \fn void setRunTime(qint64 const &runTime_)
Sets the property \ref nmm_runTime "nmm:runTime" to the given \a runTime.
\sa LiveResource::setObject
*/
- void setRunTime(int const &runTime_) { baseSetObject< nmm::runTime >( runTime_ ); }
+ void setRunTime(qint64 const &runTime_) { baseSetObject< nmm::runTime >( runTime_ ); }
/*!
- \fn int firstRunTime()
+ \fn qint64 firstRunTime()
Returns the first property \ref nmm_runTime "nmm:runTime". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstRunTime() { return baseFirstObject< nmm::runTime >(); }
+ qint64 firstRunTime() { return baseFirstObject< nmm::runTime >(); }
/*!
- \fn void addRunTime(int const &runTime_)
+ \fn void addRunTime(qint64 const &runTime_)
Adds the given \a runTime_ to the property \ref nmm_runTime "nmm:runTime" set.
\sa LiveResource::addObject
*/
- void addRunTime(int const &runTime_) { baseAddObject< nmm::runTime >( runTime_ ); }
+ void addRunTime(qint64 const &runTime_) { baseAddObject< nmm::runTime >( runTime_ ); }
/*!
- \fn void removeRunTime(int const &runTime_)
+ \fn void removeRunTime(qint64 const &runTime_)
Removes the given \a runTime_ from the property \ref nmm_runTime "nmm:runTime" set.
\sa LiveResource::removeObject
*/
- void removeRunTime(int const &runTime_) { baseRemoveObject< nmm::runTime >(runTime_); }
+ void removeRunTime(qint64 const &runTime_) { baseRemoveObject< nmm::runTime >(runTime_); }
/* Property generated from nmm:producedBy
* \n rdfs:label=Produced by
@@ -7384,45 +7384,45 @@
*/
void removeEpisodeNumbers(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmm::episodeNumber::iri(), object_info); }
/*!
- \fn int getEpisodeNumber()
+ \fn qint64 getEpisodeNumber()
- Returns the property \ref nmm_episodeNumber "nmm:episodeNumber". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmm_episodeNumber "nmm:episodeNumber". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getEpisodeNumber() { return baseGetObject< nmm::episodeNumber >(); }
+ qint64 getEpisodeNumber() { return baseGetObject< nmm::episodeNumber >(); }
/*!
- \fn void setEpisodeNumber(int const &episodeNumber_)
+ \fn void setEpisodeNumber(qint64 const &episodeNumber_)
Sets the property \ref nmm_episodeNumber "nmm:episodeNumber" to the given \a episodeNumber.
\sa LiveResource::setObject
*/
- void setEpisodeNumber(int const &episodeNumber_) { baseSetObject< nmm::episodeNumber >( episodeNumber_ ); }
+ void setEpisodeNumber(qint64 const &episodeNumber_) { baseSetObject< nmm::episodeNumber >( episodeNumber_ ); }
/*!
- \fn int firstEpisodeNumber()
+ \fn qint64 firstEpisodeNumber()
Returns the first property \ref nmm_episodeNumber "nmm:episodeNumber". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstEpisodeNumber() { return baseFirstObject< nmm::episodeNumber >(); }
+ qint64 firstEpisodeNumber() { return baseFirstObject< nmm::episodeNumber >(); }
/*!
- \fn void addEpisodeNumber(int const &episodeNumber_)
+ \fn void addEpisodeNumber(qint64 const &episodeNumber_)
Adds the given \a episodeNumber_ to the property \ref nmm_episodeNumber "nmm:episodeNumber" set.
\sa LiveResource::addObject
*/
- void addEpisodeNumber(int const &episodeNumber_) { baseAddObject< nmm::episodeNumber >( episodeNumber_ ); }
+ void addEpisodeNumber(qint64 const &episodeNumber_) { baseAddObject< nmm::episodeNumber >( episodeNumber_ ); }
/*!
- \fn void removeEpisodeNumber(int const &episodeNumber_)
+ \fn void removeEpisodeNumber(qint64 const &episodeNumber_)
Removes the given \a episodeNumber_ from the property \ref nmm_episodeNumber "nmm:episodeNumber" set.
\sa LiveResource::removeObject
*/
- void removeEpisodeNumber(int const &episodeNumber_) { baseRemoveObject< nmm::episodeNumber >(episodeNumber_); }
+ void removeEpisodeNumber(qint64 const &episodeNumber_) { baseRemoveObject< nmm::episodeNumber >(episodeNumber_); }
/* Property generated from nmm:synopsis
* \n rdfs:label=Synopsis
--- src/include/QtTracker/ontologies/nmo.h
+++ src/include/QtTracker/ontologies/nmo.h
@@ -1,7 +1,7 @@
/*
* nmo.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:53.154266
+ * Automatically created on: 2010-11-01 14:52:12.427225
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/nmo.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -149,7 +149,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Call RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -640,7 +640,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MailFolder RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -672,7 +672,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef MailFolder RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2114,7 +2114,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef PhoneMessage RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2150,7 +2150,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef PhoneMessage RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -2184,7 +2184,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef PhoneMessage RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -5993,45 +5993,45 @@
*/
void removeDurations(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmo::duration::iri(), object_info); }
/*!
- \fn int getDuration()
+ \fn qint64 getDuration()
- Returns the property \ref nmo_duration "nmo:duration". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmo_duration "nmo:duration". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getDuration() { return baseGetObject< nmo::duration >(); }
+ qint64 getDuration() { return baseGetObject< nmo::duration >(); }
/*!
- \fn void setDuration(int const &duration_)
+ \fn void setDuration(qint64 const &duration_)
Sets the property \ref nmo_duration "nmo:duration" to the given \a duration.
\sa LiveResource::setObject
*/
- void setDuration(int const &duration_) { baseSetObject< nmo::duration >( duration_ ); }
+ void setDuration(qint64 const &duration_) { baseSetObject< nmo::duration >( duration_ ); }
/*!
- \fn int firstDuration()
+ \fn qint64 firstDuration()
Returns the first property \ref nmo_duration "nmo:duration". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstDuration() { return baseFirstObject< nmo::duration >(); }
+ qint64 firstDuration() { return baseFirstObject< nmo::duration >(); }
/*!
- \fn void addDuration(int const &duration_)
+ \fn void addDuration(qint64 const &duration_)
Adds the given \a duration_ to the property \ref nmo_duration "nmo:duration" set.
\sa LiveResource::addObject
*/
- void addDuration(int const &duration_) { baseAddObject< nmo::duration >( duration_ ); }
+ void addDuration(qint64 const &duration_) { baseAddObject< nmo::duration >( duration_ ); }
/*!
- \fn void removeDuration(int const &duration_)
+ \fn void removeDuration(qint64 const &duration_)
Removes the given \a duration_ from the property \ref nmo_duration "nmo:duration" set.
\sa LiveResource::removeObject
*/
- void removeDuration(int const &duration_) { baseRemoveObject< nmo::duration >(duration_); }
+ void removeDuration(qint64 const &duration_) { baseRemoveObject< nmo::duration >(duration_); }
//@}
};
@@ -7024,45 +7024,45 @@
*/
SOPRANO_DEPRECATED void removeSmsIds(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmo::smsId::iri(), object_info); }
/*!
- \fn int getSmsId()
+ \fn qint64 getSmsId()
\deprecated See \ref nmo::smsId for replacement
- Returns the property \ref nmo_smsId "nmo:smsId". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmo_smsId "nmo:smsId". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- SOPRANO_DEPRECATED int getSmsId() { return baseGetObject< nmo::smsId >(); }
+ SOPRANO_DEPRECATED qint64 getSmsId() { return baseGetObject< nmo::smsId >(); }
/*!
- \fn void setSmsId(int const &smsId_)
+ \fn void setSmsId(qint64 const &smsId_)
\deprecated See \ref nmo::smsId for replacement
Sets the property \ref nmo_smsId "nmo:smsId" to the given \a smsId.
\sa LiveResource::setObject
*/
- SOPRANO_DEPRECATED void setSmsId(int const &smsId_) { baseSetObject< nmo::smsId >( smsId_ ); }
+ SOPRANO_DEPRECATED void setSmsId(qint64 const &smsId_) { baseSetObject< nmo::smsId >( smsId_ ); }
/*!
- \fn int firstSmsId()
+ \fn qint64 firstSmsId()
\deprecated See \ref nmo::smsId for replacement
Returns the first property \ref nmo_smsId "nmo:smsId". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- SOPRANO_DEPRECATED int firstSmsId() { return baseFirstObject< nmo::smsId >(); }
+ SOPRANO_DEPRECATED qint64 firstSmsId() { return baseFirstObject< nmo::smsId >(); }
/*!
- \fn void addSmsId(int const &smsId_)
+ \fn void addSmsId(qint64 const &smsId_)
\deprecated See \ref nmo::smsId for replacement
Adds the given \a smsId_ to the property \ref nmo_smsId "nmo:smsId" set.
\sa LiveResource::addObject
*/
- SOPRANO_DEPRECATED void addSmsId(int const &smsId_) { baseAddObject< nmo::smsId >( smsId_ ); }
+ SOPRANO_DEPRECATED void addSmsId(qint64 const &smsId_) { baseAddObject< nmo::smsId >( smsId_ ); }
/*!
- \fn void removeSmsId(int const &smsId_)
+ \fn void removeSmsId(qint64 const &smsId_)
\deprecated See \ref nmo::smsId for replacement
Removes the given \a smsId_ from the property \ref nmo_smsId "nmo:smsId" set.
\sa LiveResource::removeObject
*/
- SOPRANO_DEPRECATED void removeSmsId(int const &smsId_) { baseRemoveObject< nmo::smsId >(smsId_); }
+ SOPRANO_DEPRECATED void removeSmsId(qint64 const &smsId_) { baseRemoveObject< nmo::smsId >(smsId_); }
/* Property generated from nmo:fromVCard
* \n Reference to a VCard in the filesystem, containing the Contact information of the 'from' recipient
@@ -7197,45 +7197,45 @@
*/
void removePhoneMessageIds(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmo::phoneMessageId::iri(), object_info); }
/*!
- \fn int getPhoneMessageId()
+ \fn qint64 getPhoneMessageId()
- Returns the property \ref nmo_phoneMessageId "nmo:phoneMessageId". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmo_phoneMessageId "nmo:phoneMessageId". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getPhoneMessageId() { return baseGetObject< nmo::phoneMessageId >(); }
+ qint64 getPhoneMessageId() { return baseGetObject< nmo::phoneMessageId >(); }
/*!
- \fn void setPhoneMessageId(int const &phoneMessageId_)
+ \fn void setPhoneMessageId(qint64 const &phoneMessageId_)
Sets the property \ref nmo_phoneMessageId "nmo:phoneMessageId" to the given \a phoneMessageId.
\sa LiveResource::setObject
*/
- void setPhoneMessageId(int const &phoneMessageId_) { baseSetObject< nmo::phoneMessageId >( phoneMessageId_ ); }
+ void setPhoneMessageId(qint64 const &phoneMessageId_) { baseSetObject< nmo::phoneMessageId >( phoneMessageId_ ); }
/*!
- \fn int firstPhoneMessageId()
+ \fn qint64 firstPhoneMessageId()
Returns the first property \ref nmo_phoneMessageId "nmo:phoneMessageId". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstPhoneMessageId() { return baseFirstObject< nmo::phoneMessageId >(); }
+ qint64 firstPhoneMessageId() { return baseFirstObject< nmo::phoneMessageId >(); }
/*!
- \fn void addPhoneMessageId(int const &phoneMessageId_)
+ \fn void addPhoneMessageId(qint64 const &phoneMessageId_)
Adds the given \a phoneMessageId_ to the property \ref nmo_phoneMessageId "nmo:phoneMessageId" set.
\sa LiveResource::addObject
*/
- void addPhoneMessageId(int const &phoneMessageId_) { baseAddObject< nmo::phoneMessageId >( phoneMessageId_ ); }
+ void addPhoneMessageId(qint64 const &phoneMessageId_) { baseAddObject< nmo::phoneMessageId >( phoneMessageId_ ); }
/*!
- \fn void removePhoneMessageId(int const &phoneMessageId_)
+ \fn void removePhoneMessageId(qint64 const &phoneMessageId_)
Removes the given \a phoneMessageId_ from the property \ref nmo_phoneMessageId "nmo:phoneMessageId" set.
\sa LiveResource::removeObject
*/
- void removePhoneMessageId(int const &phoneMessageId_) { baseRemoveObject< nmo::phoneMessageId >(phoneMessageId_); }
+ void removePhoneMessageId(qint64 const &phoneMessageId_) { baseRemoveObject< nmo::phoneMessageId >(phoneMessageId_); }
/* Property generated from nmo:encoding
* \n Encoding of the message
@@ -7434,45 +7434,45 @@
*/
void removeValidityPeriods(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmo::validityPeriod::iri(), object_info); }
/*!
- \fn int getValidityPeriod()
+ \fn qint64 getValidityPeriod()
- Returns the property \ref nmo_validityPeriod "nmo:validityPeriod". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmo_validityPeriod "nmo:validityPeriod". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getValidityPeriod() { return baseGetObject< nmo::validityPeriod >(); }
+ qint64 getValidityPeriod() { return baseGetObject< nmo::validityPeriod >(); }
/*!
- \fn void setValidityPeriod(int const &validityPeriod_)
+ \fn void setValidityPeriod(qint64 const &validityPeriod_)
Sets the property \ref nmo_validityPeriod "nmo:validityPeriod" to the given \a validityPeriod.
\sa LiveResource::setObject
*/
- void setValidityPeriod(int const &validityPeriod_) { baseSetObject< nmo::validityPeriod >( validityPeriod_ ); }
+ void setValidityPeriod(qint64 const &validityPeriod_) { baseSetObject< nmo::validityPeriod >( validityPeriod_ ); }
/*!
- \fn int firstValidityPeriod()
+ \fn qint64 firstValidityPeriod()
Returns the first property \ref nmo_validityPeriod "nmo:validityPeriod". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstValidityPeriod() { return baseFirstObject< nmo::validityPeriod >(); }
+ qint64 firstValidityPeriod() { return baseFirstObject< nmo::validityPeriod >(); }
/*!
- \fn void addValidityPeriod(int const &validityPeriod_)
+ \fn void addValidityPeriod(qint64 const &validityPeriod_)
Adds the given \a validityPeriod_ to the property \ref nmo_validityPeriod "nmo:validityPeriod" set.
\sa LiveResource::addObject
*/
- void addValidityPeriod(int const &validityPeriod_) { baseAddObject< nmo::validityPeriod >( validityPeriod_ ); }
+ void addValidityPeriod(qint64 const &validityPeriod_) { baseAddObject< nmo::validityPeriod >( validityPeriod_ ); }
/*!
- \fn void removeValidityPeriod(int const &validityPeriod_)
+ \fn void removeValidityPeriod(qint64 const &validityPeriod_)
Removes the given \a validityPeriod_ from the property \ref nmo_validityPeriod "nmo:validityPeriod" set.
\sa LiveResource::removeObject
*/
- void removeValidityPeriod(int const &validityPeriod_) { baseRemoveObject< nmo::validityPeriod >(validityPeriod_); }
+ void removeValidityPeriod(qint64 const &validityPeriod_) { baseRemoveObject< nmo::validityPeriod >(validityPeriod_); }
//@}
};
@@ -8165,45 +8165,45 @@
*/
void removeServerUnreadCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmo::serverUnreadCount::iri(), object_info); }
/*!
- \fn int getServerUnreadCount()
+ \fn qint64 getServerUnreadCount()
- Returns the property \ref nmo_serverUnreadCount "nmo:serverUnreadCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmo_serverUnreadCount "nmo:serverUnreadCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getServerUnreadCount() { return baseGetObject< nmo::serverUnreadCount >(); }
+ qint64 getServerUnreadCount() { return baseGetObject< nmo::serverUnreadCount >(); }
/*!
- \fn void setServerUnreadCount(int const &serverUnreadCount_)
+ \fn void setServerUnreadCount(qint64 const &serverUnreadCount_)
Sets the property \ref nmo_serverUnreadCount "nmo:serverUnreadCount" to the given \a serverUnreadCount.
\sa LiveResource::setObject
*/
- void setServerUnreadCount(int const &serverUnreadCount_) { baseSetObject< nmo::serverUnreadCount >( serverUnreadCount_ ); }
+ void setServerUnreadCount(qint64 const &serverUnreadCount_) { baseSetObject< nmo::serverUnreadCount >( serverUnreadCount_ ); }
/*!
- \fn int firstServerUnreadCount()
+ \fn qint64 firstServerUnreadCount()
Returns the first property \ref nmo_serverUnreadCount "nmo:serverUnreadCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstServerUnreadCount() { return baseFirstObject< nmo::serverUnreadCount >(); }
+ qint64 firstServerUnreadCount() { return baseFirstObject< nmo::serverUnreadCount >(); }
/*!
- \fn void addServerUnreadCount(int const &serverUnreadCount_)
+ \fn void addServerUnreadCount(qint64 const &serverUnreadCount_)
Adds the given \a serverUnreadCount_ to the property \ref nmo_serverUnreadCount "nmo:serverUnreadCount" set.
\sa LiveResource::addObject
*/
- void addServerUnreadCount(int const &serverUnreadCount_) { baseAddObject< nmo::serverUnreadCount >( serverUnreadCount_ ); }
+ void addServerUnreadCount(qint64 const &serverUnreadCount_) { baseAddObject< nmo::serverUnreadCount >( serverUnreadCount_ ); }
/*!
- \fn void removeServerUnreadCount(int const &serverUnreadCount_)
+ \fn void removeServerUnreadCount(qint64 const &serverUnreadCount_)
Removes the given \a serverUnreadCount_ from the property \ref nmo_serverUnreadCount "nmo:serverUnreadCount" set.
\sa LiveResource::removeObject
*/
- void removeServerUnreadCount(int const &serverUnreadCount_) { baseRemoveObject< nmo::serverUnreadCount >(serverUnreadCount_); }
+ void removeServerUnreadCount(qint64 const &serverUnreadCount_) { baseRemoveObject< nmo::serverUnreadCount >(serverUnreadCount_); }
/* Property generated from nmo:serverCount
* \n rdfs:range=xsd:integer
@@ -8245,45 +8245,45 @@
*/
void removeServerCounts(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nmo::serverCount::iri(), object_info); }
/*!
- \fn int getServerCount()
+ \fn qint64 getServerCount()
- Returns the property \ref nmo_serverCount "nmo:serverCount". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nmo_serverCount "nmo:serverCount". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getServerCount() { return baseGetObject< nmo::serverCount >(); }
+ qint64 getServerCount() { return baseGetObject< nmo::serverCount >(); }
/*!
- \fn void setServerCount(int const &serverCount_)
+ \fn void setServerCount(qint64 const &serverCount_)
Sets the property \ref nmo_serverCount "nmo:serverCount" to the given \a serverCount.
\sa LiveResource::setObject
*/
- void setServerCount(int const &serverCount_) { baseSetObject< nmo::serverCount >( serverCount_ ); }
+ void setServerCount(qint64 const &serverCount_) { baseSetObject< nmo::serverCount >( serverCount_ ); }
/*!
- \fn int firstServerCount()
+ \fn qint64 firstServerCount()
Returns the first property \ref nmo_serverCount "nmo:serverCount". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstServerCount() { return baseFirstObject< nmo::serverCount >(); }
+ qint64 firstServerCount() { return baseFirstObject< nmo::serverCount >(); }
/*!
- \fn void addServerCount(int const &serverCount_)
+ \fn void addServerCount(qint64 const &serverCount_)
Adds the given \a serverCount_ to the property \ref nmo_serverCount "nmo:serverCount" set.
\sa LiveResource::addObject
*/
- void addServerCount(int const &serverCount_) { baseAddObject< nmo::serverCount >( serverCount_ ); }
+ void addServerCount(qint64 const &serverCount_) { baseAddObject< nmo::serverCount >( serverCount_ ); }
/*!
- \fn void removeServerCount(int const &serverCount_)
+ \fn void removeServerCount(qint64 const &serverCount_)
Removes the given \a serverCount_ from the property \ref nmo_serverCount "nmo:serverCount" set.
\sa LiveResource::removeObject
*/
- void removeServerCount(int const &serverCount_) { baseRemoveObject< nmo::serverCount >(serverCount_); }
+ void removeServerCount(qint64 const &serverCount_) { baseRemoveObject< nmo::serverCount >(serverCount_); }
//@}
};
--- src/include/QtTracker/ontologies/nrl.h
+++ src/include/QtTracker/ontologies/nrl.h
@@ -1,7 +1,7 @@
/*
* nrl.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:57.244482
+ * Automatically created on: 2010-11-01 14:52:12.583770
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/nrl.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -116,7 +116,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef rdf::Property RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
--- src/include/QtTracker/ontologies/poi.h
+++ src/include/QtTracker/ontologies/poi.h
@@ -1,7 +1,7 @@
/*
* poi.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:15:58.460977
+ * Automatically created on: 2010-11-01 14:52:12.633475
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/poi.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
--- src/include/QtTracker/ontologies/rdf.h
+++ src/include/QtTracker/ontologies/rdf.h
@@ -1,7 +1,7 @@
/*
* rdf.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:16:00.033521
+ * Automatically created on: 2010-11-01 14:52:12.695672
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/rdf.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -585,45 +585,45 @@
*/
void removeNrlMaxCardinalitys(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(nrl::maxCardinality::iri(), object_info); }
/*!
- \fn int getNrlMaxCardinality()
+ \fn qint64 getNrlMaxCardinality()
- Returns the property \ref nrl_maxCardinality "nrl:maxCardinality". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref nrl_maxCardinality "nrl:maxCardinality". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getNrlMaxCardinality() { return baseGetObject< nrl::maxCardinality >(); }
+ qint64 getNrlMaxCardinality() { return baseGetObject< nrl::maxCardinality >(); }
/*!
- \fn void setNrlMaxCardinality(int const &nrlMaxCardinality_)
+ \fn void setNrlMaxCardinality(qint64 const &nrlMaxCardinality_)
Sets the property \ref nrl_maxCardinality "nrl:maxCardinality" to the given \a nrlMaxCardinality.
\sa LiveResource::setObject
*/
- void setNrlMaxCardinality(int const &nrlMaxCardinality_) { baseSetObject< nrl::maxCardinality >( nrlMaxCardinality_ ); }
+ void setNrlMaxCardinality(qint64 const &nrlMaxCardinality_) { baseSetObject< nrl::maxCardinality >( nrlMaxCardinality_ ); }
/*!
- \fn int firstNrlMaxCardinality()
+ \fn qint64 firstNrlMaxCardinality()
Returns the first property \ref nrl_maxCardinality "nrl:maxCardinality". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstNrlMaxCardinality() { return baseFirstObject< nrl::maxCardinality >(); }
+ qint64 firstNrlMaxCardinality() { return baseFirstObject< nrl::maxCardinality >(); }
/*!
- \fn void addNrlMaxCardinality(int const &nrlMaxCardinality_)
+ \fn void addNrlMaxCardinality(qint64 const &nrlMaxCardinality_)
Adds the given \a nrlMaxCardinality_ to the property \ref nrl_maxCardinality "nrl:maxCardinality" set.
\sa LiveResource::addObject
*/
- void addNrlMaxCardinality(int const &nrlMaxCardinality_) { baseAddObject< nrl::maxCardinality >( nrlMaxCardinality_ ); }
+ void addNrlMaxCardinality(qint64 const &nrlMaxCardinality_) { baseAddObject< nrl::maxCardinality >( nrlMaxCardinality_ ); }
/*!
- \fn void removeNrlMaxCardinality(int const &nrlMaxCardinality_)
+ \fn void removeNrlMaxCardinality(qint64 const &nrlMaxCardinality_)
Removes the given \a nrlMaxCardinality_ from the property \ref nrl_maxCardinality "nrl:maxCardinality" set.
\sa LiveResource::removeObject
*/
- void removeNrlMaxCardinality(int const &nrlMaxCardinality_) { baseRemoveObject< nrl::maxCardinality >(nrlMaxCardinality_); }
+ void removeNrlMaxCardinality(qint64 const &nrlMaxCardinality_) { baseRemoveObject< nrl::maxCardinality >(nrlMaxCardinality_); }
/* Property generated from tracker:weight
* \n rdfs:range=xsd:integer
@@ -665,45 +665,45 @@
*/
void removeTrackerWeights(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(tracker::weight::iri(), object_info); }
/*!
- \fn int getTrackerWeight()
+ \fn qint64 getTrackerWeight()
- Returns the property \ref tracker_weight "tracker:weight". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref tracker_weight "tracker:weight". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getTrackerWeight() { return baseGetObject< tracker::weight >(); }
+ qint64 getTrackerWeight() { return baseGetObject< tracker::weight >(); }
/*!
- \fn void setTrackerWeight(int const &trackerWeight_)
+ \fn void setTrackerWeight(qint64 const &trackerWeight_)
Sets the property \ref tracker_weight "tracker:weight" to the given \a trackerWeight.
\sa LiveResource::setObject
*/
- void setTrackerWeight(int const &trackerWeight_) { baseSetObject< tracker::weight >( trackerWeight_ ); }
+ void setTrackerWeight(qint64 const &trackerWeight_) { baseSetObject< tracker::weight >( trackerWeight_ ); }
/*!
- \fn int firstTrackerWeight()
+ \fn qint64 firstTrackerWeight()
Returns the first property \ref tracker_weight "tracker:weight". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstTrackerWeight() { return baseFirstObject< tracker::weight >(); }
+ qint64 firstTrackerWeight() { return baseFirstObject< tracker::weight >(); }
/*!
- \fn void addTrackerWeight(int const &trackerWeight_)
+ \fn void addTrackerWeight(qint64 const &trackerWeight_)
Adds the given \a trackerWeight_ to the property \ref tracker_weight "tracker:weight" set.
\sa LiveResource::addObject
*/
- void addTrackerWeight(int const &trackerWeight_) { baseAddObject< tracker::weight >( trackerWeight_ ); }
+ void addTrackerWeight(qint64 const &trackerWeight_) { baseAddObject< tracker::weight >( trackerWeight_ ); }
/*!
- \fn void removeTrackerWeight(int const &trackerWeight_)
+ \fn void removeTrackerWeight(qint64 const &trackerWeight_)
Removes the given \a trackerWeight_ from the property \ref tracker_weight "tracker:weight" set.
\sa LiveResource::removeObject
*/
- void removeTrackerWeight(int const &trackerWeight_) { baseRemoveObject< tracker::weight >(trackerWeight_); }
+ void removeTrackerWeight(qint64 const &trackerWeight_) { baseRemoveObject< tracker::weight >(trackerWeight_); }
/* Property generated from tracker:transient
* \n rdfs:range=xsd:boolean
--- src/include/QtTracker/ontologies/rdfs.h
+++ src/include/QtTracker/ontologies/rdfs.h
@@ -1,7 +1,7 @@
/*
* rdfs.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:16:02.338131
+ * Automatically created on: 2010-11-01 14:52:12.791561
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/rdfs.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -2207,45 +2207,45 @@
*/
void removeTrackerModifieds(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(tracker::modified::iri(), object_info); }
/*!
- \fn int getTrackerModified()
+ \fn qint64 getTrackerModified()
- Returns the property \ref tracker_modified "tracker:modified". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref tracker_modified "tracker:modified". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getTrackerModified() { return baseGetObject< tracker::modified >(); }
+ qint64 getTrackerModified() { return baseGetObject< tracker::modified >(); }
/*!
- \fn void setTrackerModified(int const &trackerModified_)
+ \fn void setTrackerModified(qint64 const &trackerModified_)
Sets the property \ref tracker_modified "tracker:modified" to the given \a trackerModified.
\sa LiveResource::setObject
*/
- void setTrackerModified(int const &trackerModified_) { baseSetObject< tracker::modified >( trackerModified_ ); }
+ void setTrackerModified(qint64 const &trackerModified_) { baseSetObject< tracker::modified >( trackerModified_ ); }
/*!
- \fn int firstTrackerModified()
+ \fn qint64 firstTrackerModified()
Returns the first property \ref tracker_modified "tracker:modified". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstTrackerModified() { return baseFirstObject< tracker::modified >(); }
+ qint64 firstTrackerModified() { return baseFirstObject< tracker::modified >(); }
/*!
- \fn void addTrackerModified(int const &trackerModified_)
+ \fn void addTrackerModified(qint64 const &trackerModified_)
Adds the given \a trackerModified_ to the property \ref tracker_modified "tracker:modified" set.
\sa LiveResource::addObject
*/
- void addTrackerModified(int const &trackerModified_) { baseAddObject< tracker::modified >( trackerModified_ ); }
+ void addTrackerModified(qint64 const &trackerModified_) { baseAddObject< tracker::modified >( trackerModified_ ); }
/*!
- \fn void removeTrackerModified(int const &trackerModified_)
+ \fn void removeTrackerModified(qint64 const &trackerModified_)
Removes the given \a trackerModified_ from the property \ref tracker_modified "tracker:modified" set.
\sa LiveResource::removeObject
*/
- void removeTrackerModified(int const &trackerModified_) { baseRemoveObject< tracker::modified >(trackerModified_); }
+ void removeTrackerModified(qint64 const &trackerModified_) { baseRemoveObject< tracker::modified >(trackerModified_); }
/* Property generated from dc:coverage
* \n The spatial or temporal topic of the resource, the spatial applicability of the resource, or the jurisdiction under which the resource is relevant.
--- src/include/QtTracker/ontologies/scal.h
+++ src/include/QtTracker/ontologies/scal.h
@@ -1,7 +1,7 @@
/*
* scal.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:16:05.612136
+ * Automatically created on: 2010-11-01 14:52:12.919819
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/scal.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -443,7 +443,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef CalendarAlarm RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -544,7 +544,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef CalendarItem RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -881,7 +881,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef CalendarItem RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -981,7 +981,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef CalendarItem RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1015,7 +1015,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef CalendarItem RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -1389,7 +1389,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef Todo RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -3295,45 +3295,45 @@
*/
void removeAlarmOffsets(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(scal::alarmOffset::iri(), object_info); }
/*!
- \fn int getAlarmOffset()
+ \fn qint64 getAlarmOffset()
- Returns the property \ref scal_alarmOffset "scal:alarmOffset". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref scal_alarmOffset "scal:alarmOffset". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getAlarmOffset() { return baseGetObject< scal::alarmOffset >(); }
+ qint64 getAlarmOffset() { return baseGetObject< scal::alarmOffset >(); }
/*!
- \fn void setAlarmOffset(int const &alarmOffset_)
+ \fn void setAlarmOffset(qint64 const &alarmOffset_)
Sets the property \ref scal_alarmOffset "scal:alarmOffset" to the given \a alarmOffset.
\sa LiveResource::setObject
*/
- void setAlarmOffset(int const &alarmOffset_) { baseSetObject< scal::alarmOffset >( alarmOffset_ ); }
+ void setAlarmOffset(qint64 const &alarmOffset_) { baseSetObject< scal::alarmOffset >( alarmOffset_ ); }
/*!
- \fn int firstAlarmOffset()
+ \fn qint64 firstAlarmOffset()
Returns the first property \ref scal_alarmOffset "scal:alarmOffset". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstAlarmOffset() { return baseFirstObject< scal::alarmOffset >(); }
+ qint64 firstAlarmOffset() { return baseFirstObject< scal::alarmOffset >(); }
/*!
- \fn void addAlarmOffset(int const &alarmOffset_)
+ \fn void addAlarmOffset(qint64 const &alarmOffset_)
Adds the given \a alarmOffset_ to the property \ref scal_alarmOffset "scal:alarmOffset" set.
\sa LiveResource::addObject
*/
- void addAlarmOffset(int const &alarmOffset_) { baseAddObject< scal::alarmOffset >( alarmOffset_ ); }
+ void addAlarmOffset(qint64 const &alarmOffset_) { baseAddObject< scal::alarmOffset >( alarmOffset_ ); }
/*!
- \fn void removeAlarmOffset(int const &alarmOffset_)
+ \fn void removeAlarmOffset(qint64 const &alarmOffset_)
Removes the given \a alarmOffset_ from the property \ref scal_alarmOffset "scal:alarmOffset" set.
\sa LiveResource::removeObject
*/
- void removeAlarmOffset(int const &alarmOffset_) { baseRemoveObject< scal::alarmOffset >(alarmOffset_); }
+ void removeAlarmOffset(qint64 const &alarmOffset_) { baseRemoveObject< scal::alarmOffset >(alarmOffset_); }
//@}
};
@@ -3501,45 +3501,45 @@
*/
void removeRdates(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(scal::rdate::iri(), object_info); }
/*!
- \fn int getRdate()
+ \fn qint64 getRdate()
- Returns the property \ref scal_rdate "scal:rdate". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref scal_rdate "scal:rdate". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getRdate() { return baseGetObject< scal::rdate >(); }
+ qint64 getRdate() { return baseGetObject< scal::rdate >(); }
/*!
- \fn void setRdate(int const &rdate_)
+ \fn void setRdate(qint64 const &rdate_)
Sets the property \ref scal_rdate "scal:rdate" to the given \a rdate.
\sa LiveResource::setObject
*/
- void setRdate(int const &rdate_) { baseSetObject< scal::rdate >( rdate_ ); }
+ void setRdate(qint64 const &rdate_) { baseSetObject< scal::rdate >( rdate_ ); }
/*!
- \fn int firstRdate()
+ \fn qint64 firstRdate()
Returns the first property \ref scal_rdate "scal:rdate". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstRdate() { return baseFirstObject< scal::rdate >(); }
+ qint64 firstRdate() { return baseFirstObject< scal::rdate >(); }
/*!
- \fn void addRdate(int const &rdate_)
+ \fn void addRdate(qint64 const &rdate_)
Adds the given \a rdate_ to the property \ref scal_rdate "scal:rdate" set.
\sa LiveResource::addObject
*/
- void addRdate(int const &rdate_) { baseAddObject< scal::rdate >( rdate_ ); }
+ void addRdate(qint64 const &rdate_) { baseAddObject< scal::rdate >( rdate_ ); }
/*!
- \fn void removeRdate(int const &rdate_)
+ \fn void removeRdate(qint64 const &rdate_)
Removes the given \a rdate_ from the property \ref scal_rdate "scal:rdate" set.
\sa LiveResource::removeObject
*/
- void removeRdate(int const &rdate_) { baseRemoveObject< scal::rdate >(rdate_); }
+ void removeRdate(qint64 const &rdate_) { baseRemoveObject< scal::rdate >(rdate_); }
/* Property generated from scal:textLocation
* \n Textual description of location for an item. Sec. 4.8.1.7. Use better mlo:location
@@ -3583,45 +3583,45 @@
*/
void removeTextLocations(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(scal::textLocation::iri(), object_info); }
/*!
- \fn int getTextLocation()
+ \fn qint64 getTextLocation()
- Returns the property \ref scal_textLocation "scal:textLocation". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref scal_textLocation "scal:textLocation". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getTextLocation() { return baseGetObject< scal::textLocation >(); }
+ qint64 getTextLocation() { return baseGetObject< scal::textLocation >(); }
/*!
- \fn void setTextLocation(int const &textLocation_)
+ \fn void setTextLocation(qint64 const &textLocation_)
Sets the property \ref scal_textLocation "scal:textLocation" to the given \a textLocation.
\sa LiveResource::setObject
*/
- void setTextLocation(int const &textLocation_) { baseSetObject< scal::textLocation >( textLocation_ ); }
+ void setTextLocation(qint64 const &textLocation_) { baseSetObject< scal::textLocation >( textLocation_ ); }
/*!
- \fn int firstTextLocation()
+ \fn qint64 firstTextLocation()
Returns the first property \ref scal_textLocation "scal:textLocation". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstTextLocation() { return baseFirstObject< scal::textLocation >(); }
+ qint64 firstTextLocation() { return baseFirstObject< scal::textLocation >(); }
/*!
- \fn void addTextLocation(int const &textLocation_)
+ \fn void addTextLocation(qint64 const &textLocation_)
Adds the given \a textLocation_ to the property \ref scal_textLocation "scal:textLocation" set.
\sa LiveResource::addObject
*/
- void addTextLocation(int const &textLocation_) { baseAddObject< scal::textLocation >( textLocation_ ); }
+ void addTextLocation(qint64 const &textLocation_) { baseAddObject< scal::textLocation >( textLocation_ ); }
/*!
- \fn void removeTextLocation(int const &textLocation_)
+ \fn void removeTextLocation(qint64 const &textLocation_)
Removes the given \a textLocation_ from the property \ref scal_textLocation "scal:textLocation" set.
\sa LiveResource::removeObject
*/
- void removeTextLocation(int const &textLocation_) { baseRemoveObject< scal::textLocation >(textLocation_); }
+ void removeTextLocation(qint64 const &textLocation_) { baseRemoveObject< scal::textLocation >(textLocation_); }
/* Property generated from scal:start
* \n Start time of a calendar item
@@ -4049,45 +4049,45 @@
*/
void removeExceptionRDates(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(scal::exceptionRDate::iri(), object_info); }
/*!
- \fn int getExceptionRDate()
+ \fn qint64 getExceptionRDate()
- Returns the property \ref scal_exceptionRDate "scal:exceptionRDate". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref scal_exceptionRDate "scal:exceptionRDate". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getExceptionRDate() { return baseGetObject< scal::exceptionRDate >(); }
+ qint64 getExceptionRDate() { return baseGetObject< scal::exceptionRDate >(); }
/*!
- \fn void setExceptionRDate(int const &exceptionRDate_)
+ \fn void setExceptionRDate(qint64 const &exceptionRDate_)
Sets the property \ref scal_exceptionRDate "scal:exceptionRDate" to the given \a exceptionRDate.
\sa LiveResource::setObject
*/
- void setExceptionRDate(int const &exceptionRDate_) { baseSetObject< scal::exceptionRDate >( exceptionRDate_ ); }
+ void setExceptionRDate(qint64 const &exceptionRDate_) { baseSetObject< scal::exceptionRDate >( exceptionRDate_ ); }
/*!
- \fn int firstExceptionRDate()
+ \fn qint64 firstExceptionRDate()
Returns the first property \ref scal_exceptionRDate "scal:exceptionRDate". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstExceptionRDate() { return baseFirstObject< scal::exceptionRDate >(); }
+ qint64 firstExceptionRDate() { return baseFirstObject< scal::exceptionRDate >(); }
/*!
- \fn void addExceptionRDate(int const &exceptionRDate_)
+ \fn void addExceptionRDate(qint64 const &exceptionRDate_)
Adds the given \a exceptionRDate_ to the property \ref scal_exceptionRDate "scal:exceptionRDate" set.
\sa LiveResource::addObject
*/
- void addExceptionRDate(int const &exceptionRDate_) { baseAddObject< scal::exceptionRDate >( exceptionRDate_ ); }
+ void addExceptionRDate(qint64 const &exceptionRDate_) { baseAddObject< scal::exceptionRDate >( exceptionRDate_ ); }
/*!
- \fn void removeExceptionRDate(int const &exceptionRDate_)
+ \fn void removeExceptionRDate(qint64 const &exceptionRDate_)
Removes the given \a exceptionRDate_ from the property \ref scal_exceptionRDate "scal:exceptionRDate" set.
\sa LiveResource::removeObject
*/
- void removeExceptionRDate(int const &exceptionRDate_) { baseRemoveObject< scal::exceptionRDate >(exceptionRDate_); }
+ void removeExceptionRDate(qint64 const &exceptionRDate_) { baseRemoveObject< scal::exceptionRDate >(exceptionRDate_); }
/* Property generated from scal:isAllDay
* \n True if the event applies to the whole day
@@ -4376,45 +4376,45 @@
*/
void removePrioritys(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(scal::priority::iri(), object_info); }
/*!
- \fn int getPriority()
+ \fn qint64 getPriority()
- Returns the property \ref scal_priority "scal:priority". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref scal_priority "scal:priority". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getPriority() { return baseGetObject< scal::priority >(); }
+ qint64 getPriority() { return baseGetObject< scal::priority >(); }
/*!
- \fn void setPriority(int const &priority_)
+ \fn void setPriority(qint64 const &priority_)
Sets the property \ref scal_priority "scal:priority" to the given \a priority.
\sa LiveResource::setObject
*/
- void setPriority(int const &priority_) { baseSetObject< scal::priority >( priority_ ); }
+ void setPriority(qint64 const &priority_) { baseSetObject< scal::priority >( priority_ ); }
/*!
- \fn int firstPriority()
+ \fn qint64 firstPriority()
Returns the first property \ref scal_priority "scal:priority". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstPriority() { return baseFirstObject< scal::priority >(); }
+ qint64 firstPriority() { return baseFirstObject< scal::priority >(); }
/*!
- \fn void addPriority(int const &priority_)
+ \fn void addPriority(qint64 const &priority_)
Adds the given \a priority_ to the property \ref scal_priority "scal:priority" set.
\sa LiveResource::addObject
*/
- void addPriority(int const &priority_) { baseAddObject< scal::priority >( priority_ ); }
+ void addPriority(qint64 const &priority_) { baseAddObject< scal::priority >( priority_ ); }
/*!
- \fn void removePriority(int const &priority_)
+ \fn void removePriority(qint64 const &priority_)
Removes the given \a priority_ from the property \ref scal_priority "scal:priority" set.
\sa LiveResource::removeObject
*/
- void removePriority(int const &priority_) { baseRemoveObject< scal::priority >(priority_); }
+ void removePriority(qint64 const &priority_) { baseRemoveObject< scal::priority >(priority_); }
/* Property generated from scal:transparency
* \n Time transparency for the item (busy time or transparent)
@@ -6001,45 +6001,45 @@
*/
void removePercentCompletes(RDFVariable const &object_info = RDFVariable()) { baseRemoveObjects(scal::percentComplete::iri(), object_info); }
/*!
- \fn int getPercentComplete()
+ \fn qint64 getPercentComplete()
- Returns the property \ref scal_percentComplete "scal:percentComplete". If the property didn't exist, it is set to a default initialized value of type int and returned.
+ Returns the property \ref scal_percentComplete "scal:percentComplete". If the property didn't exist, it is set to a default initialized value of type qint64 and returned.
\sa LiveResource::getObject
*/
- int getPercentComplete() { return baseGetObject< scal::percentComplete >(); }
+ qint64 getPercentComplete() { return baseGetObject< scal::percentComplete >(); }
/*!
- \fn void setPercentComplete(int const &percentComplete_)
+ \fn void setPercentComplete(qint64 const &percentComplete_)
Sets the property \ref scal_percentComplete "scal:percentComplete" to the given \a percentComplete.
\sa LiveResource::setObject
*/
- void setPercentComplete(int const &percentComplete_) { baseSetObject< scal::percentComplete >( percentComplete_ ); }
+ void setPercentComplete(qint64 const &percentComplete_) { baseSetObject< scal::percentComplete >( percentComplete_ ); }
/*!
- \fn int firstPercentComplete()
+ \fn qint64 firstPercentComplete()
Returns the first property \ref scal_percentComplete "scal:percentComplete". If the property didn't exist, a default value is returned.
\sa LiveResource::firstObject
*/
- int firstPercentComplete() { return baseFirstObject< scal::percentComplete >(); }
+ qint64 firstPercentComplete() { return baseFirstObject< scal::percentComplete >(); }
/*!
- \fn void addPercentComplete(int const &percentComplete_)
+ \fn void addPercentComplete(qint64 const &percentComplete_)
Adds the given \a percentComplete_ to the property \ref scal_percentComplete "scal:percentComplete" set.
\sa LiveResource::addObject
*/
- void addPercentComplete(int const &percentComplete_) { baseAddObject< scal::percentComplete >( percentComplete_ ); }
+ void addPercentComplete(qint64 const &percentComplete_) { baseAddObject< scal::percentComplete >( percentComplete_ ); }
/*!
- \fn void removePercentComplete(int const &percentComplete_)
+ \fn void removePercentComplete(qint64 const &percentComplete_)
Removes the given \a percentComplete_ from the property \ref scal_percentComplete "scal:percentComplete" set.
\sa LiveResource::removeObject
*/
- void removePercentComplete(int const &percentComplete_) { baseRemoveObject< scal::percentComplete >(percentComplete_); }
+ void removePercentComplete(qint64 const &percentComplete_) { baseRemoveObject< scal::percentComplete >(percentComplete_); }
/* Property generated from scal:completed
* \n Time when the task was completed
--- src/include/QtTracker/ontologies/slo.h
+++ src/include/QtTracker/ontologies/slo.h
@@ -1,7 +1,7 @@
/*
* slo.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:16:09.189484
+ * Automatically created on: 2010-11-01 14:52:13.052959
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/slo.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
--- src/include/QtTracker/ontologies/tracker.h
+++ src/include/QtTracker/ontologies/tracker.h
@@ -1,7 +1,7 @@
/*
* tracker.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:16:11.667072
+ * Automatically created on: 2010-11-01 14:52:13.146793
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/tracker.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
@@ -608,7 +608,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef rdfs::Resource RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
@@ -767,7 +767,7 @@
/// The domain/owning class of this property (for symmetry with RDFRange)
typedef rdf::Property RDFDomain;
/// The localized c++ range type of this property
- typedef int Range;
+ typedef qint64 Range;
/// The full, non-localized rdf range type of this property
typedef ::SopranoLive::Ontologies::xsd::integer RDFRange;
};
--- src/include/QtTracker/ontologies/xsd.h
+++ src/include/QtTracker/ontologies/xsd.h
@@ -1,7 +1,7 @@
/*
* xsd.h, autogenerated
*
- * Automatically created on: 2010-10-12 16:16:13.275796
+ * Automatically created on: 2010-11-01 14:52:13.209726
* Automatically created by: tools/build/detail/rdfxml2convenience.py -i data/rdf-xml/QtTracker/ontologies/xsd.xml -c QtTracker
* DO NOT MAKE CHANGES TO THIS FILE AS THEY MIGHT BE LOST
*/
--- src/include/sopranolive/document_global.h
+++ src/include/sopranolive/document_global.h
@@ -1650,12 +1650,16 @@
QCOMPARE(associations->liveResource<nco::PersonContact>(0), someone);
* \endcode
*
- * \section user_manual_efficiency_tips 9. Tips for Efficient Usage
+ * \section user_manual_efficiency_tips 9. Misc and Tips for Efficient Usage
*
* Try to use as few queries as possible. If you need to do a query, and then
* do additional queries based on the results you got, you might be able to
* use \ref user_manual_unbound_rdfsubselect instead.
*
+ * While developing and debugging, it is useful to set the environment variable
+ * QTTRACKER_LOGLEVEL to an integer value (between 0-5) to alter the runtime
+ * warning/debug message verbosity level.
+ *
* Avoid RDFVariable::optional(). Try to use \ref user_manual_unbound_rdfselect_function instead.
*
* \section user_manual_future 10. Shortcomings and the Future
--- src/include/sopranolive/livebag.h
+++ src/include/sopranolive/livebag.h
@@ -183,6 +183,8 @@
friend QDebug operator<<(QDebug s, LiveBag const &bag)
{
+ if(Entity const *model = bag.model())
+ return s << *model;
return s << bag.nodes();
}
};
--- src/include/sopranolive/rdfunbound.h
+++ src/include/sopranolive/rdfunbound.h
@@ -2410,33 +2410,74 @@
struct Operation
{
public:
- enum ClauseType { Insert, Delete, Modify, Definite = 4, DefiniteInsert = Insert | Definite, DefiniteDeletion = Delete | Definite };
+ //! Enum for the Operation type.
+ enum ClauseType
+ { Insert, Delete, Modify
+ , Definite = 4
+ , DefiniteInsert = Insert | Definite
+ , DefiniteDelete = Delete | Definite
+ , DefiniteDeletion = DefiniteDelete // inconsistent, dont use, retained to not cause breaks
+ , Silent = 8
+ , SilentInsert = Insert | Silent
+ , SilentDelete = Delete | Silent
+ , SilentModify = Modify | Silent
+ , SilentDefiniteInsert = Silent | DefiniteInsert
+ , SilentDefiniteDelete = Silent | DefiniteDelete
+ , SilentDefiniteModify = Silent | SilentModify
+ };
private:
mutable ClauseType type_;
RDFStatementList deletes_, inserts_;
Node graph_;
friend class Data;
+
public:
+ //! \return true if the operation does not contain variables, ie if it has an empty
+ //! WHERE clause
bool isDefinite() const;
- ClauseType type() const { return ClauseType(type_ & ~Definite); }
- RDFStatementList deletes() const { return deletes_; }
- RDFStatementList inserts() const { return inserts_; }
- Node graph() const { return graph_; }
+ //! \return true if the operation is a silent operation. See \ref setSilent for details.
+ bool isSilent() const;
- Operation(RDFStatementList const &deletes, RDFStatementList const &inserts, ClauseType type, Node const &graph);
+ //! Set the operation to \a silent and return this. If a silent operation fails, it wont
+ //! generate errors and the full update will proceed executing subsequent operations.
+ Operation &setSilent(bool silent = true);
- Operation deepCopy(RDFVariable::DeepCopier const &copier = RDFVariable::DeepCopier()) const;
+ //! \return the type of the operation.
+ ClauseType type() const;
+
+ //! \return delete statements
+ RDFStatementList deletes() const;
- static Operation insertion(RDFStatementList const &inserts, Node const &graph = Node())
- { return Operation(RDFStatementList(), inserts, Insert, graph); }
+ //! \return insert statements
+ RDFStatementList inserts() const;
- static Operation deletion(RDFStatementList const &deletes, Node const &graph = Node())
- { return Operation(deletes, RDFStatementList(), Delete, graph); }
+ //! \return graph node
+ Node graph() const;
- static Operation modification(RDFStatementList const &deletes, RDFStatementList const &inserts, Node const &graph = Node())
- { return Operation(deletes, inserts, Modify, graph); }
+ Operation(RDFStatementList const &deletes, RDFStatementList const &inserts, ClauseType type, Node const &graph);
+
+ //! \return a deep copy of the operation
+ Operation deepCopy(RDFVariable::DeepCopier const &copier = RDFVariable::DeepCopier()) const;
+ /*!
+ * \return a INSERT operation which inserts all given \a inserts statements
+ * into given \a graph, or default graph if \a graph is omitted.
+ */
+ static Operation insertion(RDFStatementList const &inserts, Node const &graph = Node());
+
+ /*!
+ * \return a DELETE operation which deletes all given \a deletes statements
+ * from given \a graph, or default graph if \a graph is omitted.
+ */
+ static Operation deletion(RDFStatementList const &deletes, Node const &graph = Node());
+
+ /*!
+ * \return a modify operation which first deletes all given \a deletes and
+ * then inserts all given \a inserts statements on given \a graph, or default
+ * graph if \a graph is omitted.
+ */
+ static Operation modification(RDFStatementList const &deletes, RDFStatementList const &inserts, Node const &graph = Node());
};
typedef QList<Operation> OperationList;
@@ -2449,7 +2490,7 @@
//! \return the list of operations contained in this update
OperationList const &operations() const;
- //! Sets the contained operations to given list of \a operations
+ //! Sets the contained operations to given list of \a operations and returns this
RDFUpdate &setOperations(OperationList const &operations);
QString getQuery(int format = SPARQLUpdate) const;
--- src/live_p.h
+++ src/live_p.h
@@ -28,6 +28,7 @@
#ifndef SOPRANOLIVE_LIVE_P_H_
#define SOPRANOLIVE_LIVE_P_H_
+#include "utils/visualizer.h"
#include "include/sopranolive/liveautogenerationbase.h"
namespace SopranoLive
@@ -49,6 +50,8 @@
struct SharedNull
: Resource_
{
+ /* VZR_CLASS(SharedNull, (Resource_));*/
+
SharedNull(int = (SopranoLive::static_phase_g = StaticConstruct))
: Resource_()
{
--- src/livenodemodelbase_p.cpp
+++ src/livenodemodelbase_p.cpp
@@ -206,7 +206,12 @@
list.push_back(value.headerData(h, Qt::Horizontal).toString());
s << "\t" << list.join("\t|") << "\n";
}
- for(int r = 0, rend = value.rowCount(); r != rend; ++r)
+ int rend = 0;
+ if(RowStoreModel const *rsm = dynamic_cast<RowStoreModel const *>(&value))
+ rend = rsm->row_store.size();
+ else
+ rend = value.rowCount();
+ for(int r = 0; r != rend; ++r)
{
QStringList list;
for(int c = 0, cend = value.columnCount(); c != cend; ++c)
@@ -444,7 +449,7 @@
return ModelCommons::strategy_chain(index, chain);
return isWholeIndex(index)
- ? strategy_
+ ? unsigned(strategy_)
: unsigned(RDFStrategy::Disabled);
}
RDFStrategyFlags LiveNodeModelBase::strategy(QModelIndex const &index) const
--- src/livenodemodelbase_p.h
+++ src/livenodemodelbase_p.h
@@ -22,7 +22,10 @@
struct UpdateContext
: QSharedFromThis<UpdateContext>
{
- ConstLiveNodeModelBasePtr model_;
+ /* VZR_CLASS(UpdateContext, (QSharedFromThis<UpdateContext>));*/
+
+ ConstLiveNodeModelBasePtr model_; // VZR_MEMBER
+
UpdateContext(ConstLiveNodeModelBasePtr const &model) : model_(model) {}
virtual bool updateModel(LiveNodeModelBase *target) const = 0;
};
@@ -32,6 +35,8 @@
struct ModelModule
: SingleModule<LiveNodeModelBase>
{
+ /* VZR_CLASS(ModelModule, (SingleModule<LiveNodeModelBase>));*/
+
ModelModule(LiveNodeModelBase *model = 0) : SingleModule<LiveNodeModelBase>(model) {}
LiveNodeModelBase *model() const { return this->compositor(); }
@@ -40,6 +45,8 @@
struct ModelCommons
{
+ /* VZR_CLASS(ModelCommons);*/
+
virtual bool isAdoptable_chain
( QSharedPointer<RDFGraphImplBase> const &new_model_parent
, InterfaceChain<ModelCommons const> chain) const;
@@ -87,6 +94,13 @@
, public LogContext
{
Q_OBJECT
+
+ /* VZR_CLASS(LiveNodeModelBase
+ , (LiveNodeModel)
+ , (CompositorAndBaseModule<LiveNodeModelBase>)
+ , (CompositorInterface<ModelCommons, LiveNodeModelBase, LiveNodeModelBase>)
+ , (LogContext));*/
+
public:
using LiveNodeModel::sharedFromThis;
using LiveNodeModel::initialSharedFromThis;
@@ -103,11 +117,13 @@
| RDFStrategy::Running | ExposeDerivedProperties | RDFStrategy::CacheDataRoles
};
- QSharedPointer<RDFGraphImplBase> graph_;
- RDFDerivedSelect columns_;
- RDFStrategyFlags strategy_;
- QVariantMap model_attributes_;
- QVector<SharedTypeSet> column_types_;
+ QSharedPointer<RDFGraphImplBase> graph_; // VZR_MEMBER
+ RDFDerivedSelect columns_; // VZR_MEMBER
+
+ RDFStrategyFlags strategy_; // VZR_MEMBER
+ QVariantMap model_attributes_; // VZR_MEMBER
+
+ QVector<SharedTypeSet> column_types_; // VZR_MEMBER
LiveNodeModelBase
( QSharedPointer<RDFGraphImplBase> const &graph
@@ -250,6 +266,9 @@
struct ModuleOfDerivedModel
: SingleModuleOfDerivedCompositor<DerivedModel_, ModelModule>
{
+ /* VZR_CLASS(ModuleOfDerivedModel
+ , (SingleModuleOfDerivedCompositor<DerivedModel_, ModelModule>));*/
+
ModuleOfDerivedModel(DerivedModel_ *model = 0)
: SingleModuleOfDerivedCompositor<DerivedModel_, ModelModule>(model) {}
--- src/livenodemodelbridge_p.h
+++ src/livenodemodelbridge_p.h
@@ -99,10 +99,15 @@
: public Base
, public LiveNodeModelBridgeDetail
{
+ /* VZR_CLASS(LiveNodeModelBridge
+ , (Base)
+ , (LiveNodeModelBridgeDetail));*/
+
protected:
- QSharedPointer<Base> backend_;
- public:
+ QSharedPointer<Base> backend_; // VZR_MEMBER
+
+ public:
LiveNodeModelBridge() {}
LiveNodeModelBridge(QSharedPointer<Base> const &backend, unsigned connect_signals = all_signals)
@@ -197,6 +202,8 @@
class LiveNodeModelOfGraphBridge
: public EntityOfGraph<LiveNodeModelBridge<> >
{
+ /* VZR_CLASS(LiveNodeModelOfGraphBridge, (EntityOfGraph<LiveNodeModelBridge<> >));*/
+
public:
typedef EntityOfGraph<LiveNodeModelBridge<> > Base;
LiveNodeModelOfGraphBridge(QSharedPointer<RDFGraphImplBase> const &graph, LiveNodeModelPtr const &backend)
@@ -219,6 +226,8 @@
class LiveNodeModelBaseBridge
: public LiveNodeModelBridge<LiveNodeModelBase>
{
+ /* VZR_CLASS(LiveNodeModelBaseBridge, (LiveNodeModelBridge<LiveNodeModelBase>));*/
+
public:
LiveNodeModelBaseBridge(QSharedPointer<RDFGraphImplBase> const &graph, LiveNodeModelBasePtr const &backend)
: LiveNodeModelBridge<LiveNodeModelBase>(graph, backend)
--- src/liveresource_p.h
+++ src/liveresource_p.h
@@ -41,6 +41,8 @@
class LiveResourceImplBase
: public LiveResource
{
+ /* VZR_CLASS(LiveResourceImplBase, (LiveResource));*/
+
public:
typedef RDFGraphImplBase GraphType;
virtual GraphType *graph() const = 0;
@@ -55,6 +57,9 @@
class ResourceOfGraphBridge
: public EntityOfGraph<LiveResourceBridgeMixin<LiveResourceImplBase> >
{
+ /* VZR_CLASS(ResourceOfGraphBridge
+ , (EntityOfGraph<LiveResourceBridgeMixin<LiveResourceImplBase> >));*/
+
public:
typedef EntityOfGraph<LiveResourceBridgeMixin<LiveResourceImplBase> > Base;
ResourceOfGraphBridge
@@ -100,6 +105,9 @@
class ResourceByGraphQueries
: public EntityOfGraph<LiveResourceImplBase>
{
+ /* VZR_CLASS(ResourceByGraphQueries
+ , (EntityOfGraph<LiveResourceImplBase>));*/
+
protected:
ResourceByGraphQueries(QSharedPointer<RDFGraphImplBase> const &graph);
public:
@@ -155,6 +163,8 @@
class ResourceFromVariableSource
: public ResourceByGraphQueries
{
+ /* VZR_CLASS(ResourceFromVariableSource, (ResourceByGraphQueries));*/
+
public:
ResourceFromVariableSource
( QSharedPointer<RDFGraphImplBase> const &graph
@@ -168,13 +178,16 @@
protected:
virtual Node evaluateSource() const = 0;
- RDFVariableLink source_;
- QSharedPointer<ResourceOfGraphBridge> parent_;
+ RDFVariableLink source_; // VZR_MEMBER
+ QSharedPointer<ResourceOfGraphBridge> parent_; // VZR_MEMBER
+
};
class ResourceOfService
: public ResourceByGraphQueries
{
+ /* VZR_CLASS(ResourceOfService, (ResourceByGraphQueries));*/
+
public:
ResourceOfService(QSharedPointer<RDFServiceImplBase> const &graph, Node const &node);
@@ -183,7 +196,8 @@
RDFVariable sourceVariable() const;
protected:
- Node node_;
+ Node node_; // VZR_MEMBER
+
};
}
--- src/lnm_transitionstrategy_p.h
+++ src/lnm_transitionstrategy_p.h
@@ -57,39 +57,70 @@
class SmoothTransitionModule
: public ContentModule
{
+ /* VZR_CLASS(SmoothTransitionModule, (ContentModule));*/
+
public:
- RowStore old_row_store_, new_row_store_;
- ContentModulePtr old_module_, new_module_;
+ RowStore old_row_store_; // VZR_MEMBER
+
+ RowStore new_row_store_; // VZR_MEMBER
+
+ ContentModulePtr old_module_; // VZR_MEMBER
+ ContentModulePtr new_module_; // VZR_MEMBER
+
- RowStoreRange old_rows_;
- int start_row_;
+ RowStoreRange old_rows_; // VZR_MEMBER
+ int start_row_; // VZR_MEMBER
- RDFSelect::OrderByInfo identity_columns_;
- bool finalization_ready_, commit_, no_delegation_;
+ RDFSelect::OrderByInfo identity_columns_; // VZR_MEMBER
+
+ bool finalization_ready_; // VZR_MEMBER
+ bool commit_; // VZR_MEMBER
+
+ bool no_delegation_; // VZR_MEMBER
// migration time variables
- RowStoreRange new_rows_;
- int to_new_mid_offset_, to_old_upper_offset_;
- int count_;
+ RowStoreRange new_rows_; // VZR_MEMBER
+
+ int to_new_mid_offset_; // VZR_MEMBER
+ int to_old_upper_offset_; // VZR_MEMBER
+
+ int count_; // VZR_MEMBER
struct SimpleRange
{
RowStore::const_iterator row_;
int count_;
SimpleRange() : row_(), count_(0) {}
+
+ friend QDebug operator<<(QDebug s, SimpleRange const &range)
+ {
+ return s.nospace() << "Range(" << range.row_.key() << ", " << range.count_ << ")";
+ }
};
typedef QHash<QVector<QString>, SimpleRange> Lookup;
- Lookup lookup;
+ Lookup lookup; // VZR_MEMBER
+
+
+ unsigned current_target_row_; // VZR_MEMBER
+ unsigned current_source_row_; // VZR_MEMBER
+
+ unsigned equal_source_row_; // VZR_MEMBER
+ unsigned equal_target_row_; // VZR_MEMBER
+
+ unsigned changed_target_row_; // VZR_MEMBER
+ unsigned changed_source_row_; // VZR_MEMBER
+
+
+ RowStore::iterator ti_; // VZR_MEMBER
+ RowStore::iterator tiend_; // VZR_MEMBER
+
- unsigned current_target_row_, current_source_row_;
- unsigned equal_source_row_, equal_target_row_;
- unsigned changed_target_row_, changed_source_row_;
+ RowStore::const_iterator si_; // VZR_MEMBER
+ RowStore::const_iterator siend_; // VZR_MEMBER
- RowStore::iterator ti_, tiend_;
- RowStore::const_iterator si_, siend_;
RowStore::iterator createRow(int row);
--- src/pending_abi_break.cpp
+++ src/pending_abi_break.cpp
@@ -79,5 +79,15 @@
bool RDFServiceBasic::InPlaceSubTransaction::isInPlacePending() const
{ return isOtherActive(); }
+ QDebugHelper localDebug(unsigned)
+ { return qDebug() << "SopranoLive::localDebug deprecated. "
+ "libqttracker no longer exposes the logging API externally, remove the debug code"; }
+ QDebugHelper localWarning(unsigned)
+ { return qDebug() << "SopranoLive::localWarning deprecated. "
+ "libqttracker no longer exposes the logging API externally, remove the debug code"; }
+
+ QDebugHelper localCritical(unsigned)
+ { return qDebug() << "SopranoLive::localCritical deprecated. "
+ "libqttracker no longer exposes the logging API externally, remove the debug code."; }
}
--- src/qsharedobject_p.cpp
+++ src/qsharedobject_p.cpp
@@ -51,8 +51,15 @@
#define SOPRANOLIVE_IMMEDIATE_DELETION 0
+ // once a QObject is no longer associated with thread
+ // (if it was released as part of a transferred shared pointer)
+ // or if the thread does't have an event dispatcher (which is
+ // the original reason for using deleteLater in the first place)
+ // delete object directly.
+ QThread *t = 0;;
if(SOPRANOLIVE_IMMEDIATE_DELETION
- || !QAbstractEventDispatcher::instance())
+ || !(t = object->thread())
+ || !QAbstractEventDispatcher::instance(t))
delete object;
else
object->deleteLater();
--- src/qsharedset_p.h
+++ src/qsharedset_p.h
@@ -153,7 +153,7 @@
typedef typename QSet<T_>::const_iterator const_iterator;
typedef typename QSet<T_>::const_iterator iterator;
- operator QSet<T_> const &() { return *set_iter_; }
+ operator QSet<T_> const &() const { return *set_iter_; }
iterator begin () const { return set_iter_->begin(); }
int capacity () const { return set_iter_->capacity(); }
void clear () { set_iter_ = storage_->construct(); }
@@ -238,5 +238,10 @@
}
};
+ template<class T>
+ QDebug operator<<(QDebug s, QSharedSet<T> const &set)
+ {
+ return s << set.operator QSet<T> const &();
+ }
}
#endif /* SOPRANOLIVE_QSHAREDSET_P_H_ */
--- src/rdfcache_p.cpp
+++ src/rdfcache_p.cpp
@@ -955,7 +955,7 @@
}
bool PropertyOfSingleResourceModule::tripleUpdates_chain
- ( RawTriplesData const &triples, TripleUpdateContext const *context
+ ( RawTriplesData const &triples, TripleUpdateContextConstPtr const &context
, InterfaceChain<TripleUpdateReceiver> chain)
{
do
--- src/rdfcache_p.h
+++ src/rdfcache_p.h
@@ -47,6 +47,8 @@
class ResourceOfGraphCache
: public ResourceOfGraphBridge
{
+ /* VZR_CLASS(ResourceOfGraphCache, (ResourceOfGraphBridge));*/
+
public:
~ResourceOfGraphCache();
typedef QHash< RawPropertyDataWithEqualityMask<RawEqualityMask>, PersistentTripleIndex> CachedSubModels;
@@ -101,9 +103,11 @@
mutable CachedSubModels cached_properties_;
- mutable QMap<QString, ResourceOfGraphCache *>::iterator self_reference_;
- QSharedPointer<LiveResource> invalidated_backend_;
- SharedTypeSet type_set_;
+ typedef QMap<QString, ResourceOfGraphCache *> Nodes;
+ mutable Nodes::iterator self_reference_; // VZR_MEMBER
+ QSharedPointer<LiveResource> invalidated_backend_; // VZR_MEMBER
+
+ SharedTypeSet type_set_; // VZR_MEMBER
private:
void operator=(ResourceOfGraphCache const &/*disabled*/);
};
@@ -112,6 +116,8 @@
class RDFGraphCache
: public RDFGraphBridge
{
+ /* VZR_CLASS(RDFGraphCache, (RDFGraphBridge));*/
+
public:
enum { StrategiesImplementedByGraphCache = ( RDFStrategy::Streaming | RDFStrategy::Windowed
@@ -161,15 +167,19 @@
SharedTypeSetStorage &typeSetStorage() const { return *type_set_storage_; }
protected:
friend class ResourceOfGraphCache;
- mutable Nodes cached_nodes_;
- LiveNode dummy;
- mutable QSharedPointer<SharedTypeSetStorage> type_set_storage_;
+ mutable Nodes cached_nodes_; // VZR_MEMBER
+ LiveNode dummy; // VZR_MEMBER
+
+ mutable QSharedPointer<SharedTypeSetStorage> type_set_storage_; // VZR_MEMBER
};
class CacheModule
: public DerivedColumnModule
{
Q_OBJECT
+
+ /* VZR_CLASS(CacheModule, (DerivedColumnModule));*/
+
protected:
CacheModule(RDFGraphImplBasePtr const &graph);
@@ -179,9 +189,12 @@
RDFGraphCache *graphCache() const { return static_cast<RDFGraphCache *>(model()->graph()); }
// TODO: replace with a structure that supports removal too.
- QHash<QString, ResourceOfGraphCachePtr> cached_resources_;
- typedef QVector<int> SingleItemColumns;
- SingleItemColumns single_item_columns_;
+
+ typedef QHash<QString, ResourceOfGraphCachePtr> QString2Resource;
+ QString2Resource cached_resources_; // VZR_MEMBER
+ typedef QVector<int> SingleItemColumns;
+ SingleItemColumns single_item_columns_; // VZR_MEMBER
+
ResourceOfGraphCachePtr cachedResource(QString const &str, LiveNode const &node);
ResourceOfGraphCachePtr cachedResource(LiveNode const &node);
ResourceOfGraphCachePtr cachedResource(QString const &res_str, int column);
@@ -207,6 +220,8 @@
: public CacheModule
, public ItemsAsColumnModule
{
+ /* VZR_CLASS(OneMainColumnManyProperties, (CacheModule), (ItemsAsColumnModule));*/
+
public:
OneMainColumnManyProperties(RDFGraphImplBasePtr const &graph);
void registerInto(RDFGraphCache &cache);
@@ -215,6 +230,8 @@
class ManyMainColumnManyProperties
: public CacheModule
{
+ /* VZR_CLASS(ManyMainColumnManyProperties, (CacheModule));*/
+
public:
ManyMainColumnManyProperties(RDFGraphImplBasePtr const &graph);
void registerInto(RDFGraphCache &cache);
@@ -225,8 +242,14 @@
, public ModuleInterface
<TripleUpdateReceiver, TripleModel, PropertyOfSingleResourceModule>
{
- RawPropertyData property_data_;
- LiveResourceConstPtr property_;
+ /* VZR_CLASS(PropertyOfSingleResourceModule
+ , (OneMainColumnManyProperties)
+ , (ModuleInterface
+ <TripleUpdateReceiver, TripleModel, PropertyOfSingleResourceModule>));*/
+
+ RawPropertyData property_data_; // VZR_MEMBER
+ LiveResourceConstPtr property_; // VZR_MEMBER
+
public:
PropertyOfSingleResourceModule
( RDFGraphImplBasePtr const &graph, RawPropertyData const &property_data
@@ -238,15 +261,18 @@
void registerInto(RDFGraphCache &cache);
bool tripleUpdates_chain
- ( RawTriplesData const &triples, TripleUpdateContext const *context
+ ( RawTriplesData const &triples, TripleUpdateContextConstPtr const &context
, InterfaceChain<TripleUpdateReceiver> chain);
};
class PropertyOfManyResourcesModule
: public ManyMainColumnManyProperties
{
- RawPropertyData property_data_;
- bool ascending_primary_;
+ /* VZR_CLASS(PropertyOfManyResourcesModule, (ManyMainColumnManyProperties));*/
+
+ RawPropertyData property_data_; // VZR_MEMBER
+ bool ascending_primary_; // VZR_MEMBER
+
int searchResource(QString const &res) const;
public:
--- src/rdfservice_p.cpp
+++ src/rdfservice_p.cpp
@@ -301,7 +301,7 @@
}
TripleUpdateContext::Mode RDFGraphBasic::registerForTripleUpdates
- (SharedTripleUpdateContext const &context)
+ (TripleUpdateContextPtr const &context)
{
// TODO: context unused
Q_UNUSED(context);
--- src/rdfservice_p.h
+++ src/rdfservice_p.h
@@ -38,11 +38,13 @@
class RDFGraphBridge
: public RDFServiceImplBase
{
+ /* VZR_CLASS(RDFGraphBridge, (RDFServiceImplBase));*/
+
protected:
RDFGraphBridge(QSharedPointer<RDFGraphImplBase> const &backend)
: RDFServiceImplBase(backend->service_context_data_), backend_(backend) {}
- QSharedPointer<RDFGraphImplBase> backend_;
+ QSharedPointer<RDFGraphImplBase> backend_; // VZR_MEMBER
public:
RDFGraphImplBase &backend() { return *backend_.data(); }
RDFGraphImplBase const &backend() const { return *backend_.data(); }
@@ -116,7 +118,7 @@
void removeResources(RDFVariable const &variable)
{ return backend().removeResources(variable); }
- TripleUpdateContext::Mode registerForTripleUpdates(SharedTripleUpdateContext const &ctxt)
+ TripleUpdateContext::Mode registerForTripleUpdates(TripleUpdateContextPtr const &ctxt)
{ return backend().registerForTripleUpdates(ctxt); }
// cludge. They should be in RDFServiceBridge but meh.
@@ -183,6 +185,8 @@
class RDFServiceBridge
: public RDFGraphBridge
{
+ /* VZR_CLASS(RDFServiceBridge, (RDFGraphBridge));*/
+
protected:
RDFServiceBridge(QSharedPointer<RDFServiceImplBase> const &backend)
: RDFGraphBridge(backend) {}
@@ -196,17 +200,22 @@
// this, we inherit RDFService and give its methods dummy stub implementations
: RDFServiceImplBase
{
+ /* VZR_CLASS(RDFGraphBasic, (RDFServiceImplBase));*/
+
typedef QMap<QString, QString> Prefixes;
- Prefixes prefixes;
- Prefixes reverse_prefixes;
+ Prefixes prefixes; // VZR_MEMBER
+
+ Prefixes reverse_prefixes; // VZR_MEMBER
typedef QMap<QString, int> ImplementedContexts;
- ImplementedContexts implemented_contexts_;
+ ImplementedContexts implemented_contexts_; // VZR_MEMBER
+
+
+ QSharedPointer<RDFServiceBasic> external_parent_ref_; // VZR_MEMBER
+ QWeakPointer<RDFServiceBasic> parent_; // VZR_MEMBER
- QSharedPointer<RDFServiceBasic> external_parent_ref_;
- QWeakPointer<RDFServiceBasic> parent_;
- QUrl graph_iri;
+ QUrl graph_iri; // VZR_MEMBER
RDFGraphBasic
( QSharedPointer<RDFServiceBasic> parent, ServiceContextDataPtr const &ctxt)
@@ -284,7 +293,7 @@
RDFTransactionPtr pendingTransaction() const { return RDFTransactionPtr(); }
RDFServicePtr createChildService() { return RDFServicePtr(); }
- TripleUpdateContext::Mode registerForTripleUpdates(SharedTripleUpdateContext const &ctxt);
+ TripleUpdateContext::Mode registerForTripleUpdates(TripleUpdateContextPtr const &ctxt);
// own functions
@@ -298,7 +307,9 @@
struct RDFServiceBasic
: RDFGraphBasic
{
- QString name_;
+ /* VZR_CLASS(RDFServiceBasic, (RDFGraphBasic));*/
+
+ QString name_; // VZR_MEMBER
typedef QVariantMap AttributeMap;
mutable AttributeMap attributes_;
@@ -307,7 +318,9 @@
struct TransactionBase
: RDFTransaction
{
- RDFTransaction::Mode mode_;
+ /* VZR_CLASS(TransactionBase, (RDFTransaction));*/
+
+ RDFTransaction::Mode mode_; // VZR_MEMBER
TransactionBase(RDFTransaction::Mode mode = RDFTransaction::Default) : mode_(mode) {}
@@ -325,13 +338,17 @@
struct Transaction
: TransactionBase
{
+ /* VZR_CLASS(Transaction, (TransactionBase));*/
+
Transaction(QSharedPointer<RDFServiceBasic> const &svc, RDFTransaction::Mode mode);
~Transaction();
- QSharedPointer<RDFServiceBasic> service_;
- RDFUpdate update_;
- int active_subs_;
- LiveNodes pending_commit_;
+ QSharedPointer<RDFServiceBasic> service_; // VZR_MEMBER
+ RDFUpdate update_; // VZR_MEMBER
+
+ int active_subs_; // VZR_MEMBER
+ LiveNodes pending_commit_; // VZR_MEMBER
+
RDFServicePtr service() const;
@@ -347,12 +364,14 @@
struct InPlaceSubTransaction
: TransactionBase
{
+ /* VZR_CLASS(InPlaceSubTransaction, (TransactionBase));*/
+
InPlaceSubTransaction
(QSharedPointer<Transaction> const &parent
, RDFTransaction::Mode mode = RDFTransaction::Mode());
~InPlaceSubTransaction();
- QSharedPointer<Transaction> parent_;
+ QSharedPointer<Transaction> parent_; // VZR_MEMBER
RDFServicePtr service() const;
Mode mode() const;
@@ -369,7 +388,7 @@
bool rollbackAndReinitiate(bool is_blocking = false);
};
- Transaction *transaction_;
+ Transaction * transaction_; // VZR_MEMBER
RDFServiceBasic
( QString name, QList<QUrl> const &implemented_contexts = QList<QUrl>()
--- src/rdfservicebase_p.cpp
+++ src/rdfservicebase_p.cpp
@@ -130,9 +130,9 @@
: receiver_(receiver), mode_(Inactive), triple_mask_(triple_mask), index_(index)
{}
- void TripleUpdateContext::receiverDetach()
+ TripleUpdateContext::~TripleUpdateContext()
{
- receiver_.clear();
+ index_ = QModelIndex();
}
ServiceContextData::ServiceContextData()
@@ -281,18 +281,6 @@
QDebugHelper::QDebugHelper(QDebug const &cp) : QDebug(cp) {}
QDebugHelper::~QDebugHelper() {}
- QDebugHelper localDebug(unsigned verbosity)
- { return qDebug() << "SopranoLive::localDebug deprecated. "
- "libqttracker no longer exposes the logging API externally, remove the debug code"; }
-
- QDebugHelper localWarning(unsigned verbosity)
- { return qDebug() << "SopranoLive::localWarning deprecated. "
- "libqttracker no longer exposes the logging API externally, remove the debug code"; }
-
- QDebugHelper localCritical(unsigned verbosity)
- { return qDebug() << "SopranoLive::localCritical deprecated. "
- "libqttracker no longer exposes the logging API externally, remove the debug code."; }
-
void RDFServiceImplBase::setVerbosity(int level)
{
SopranoLive::setVerbosity(level);
--- src/rdfservicebase_p.h
+++ src/rdfservicebase_p.h
@@ -50,12 +50,17 @@
//! Stores shared service context data.
struct ServiceContextData
{
+ /* VZR_CLASS(ServiceContextData);*/
+
ServiceContextData();
//! The shared type storage of the context
- SharedTypeSetStorage shared_type_storage_;
- RDFDerivedSelect select_prototype_;
- RDFUpdate update_prototype_;
+
+ SharedTypeSetStorage shared_type_storage_; // VZR_MEMBER
+ RDFDerivedSelect select_prototype_; // VZR_MEMBER
+
+ RDFUpdate update_prototype_; // VZR_MEMBER
+
virtual RDFDerivedSelect select();
virtual RDFDerivedSelect select(RDFSelect const ©);
virtual RDFUpdate update();
@@ -66,13 +71,17 @@
class RDFGraphImplBase
: public RDFService, public TripleUpdateNotifier, public LogContext
{
+ /* VZR_CLASS(RDFGraphImplBase, (RDFService), (TripleUpdateNotifier), (LogContext));*/
+
public:
RDFGraphImplBase(ServiceContextDataPtr const &service_context_data);
// a bit hacky. See the implementation of ResourceByGraphQueries::attachInterface
- bool discard_interface_modifications;
- RDFStatementList interface_adds;
- ServiceContextDataPtr service_context_data_;
+ bool discard_interface_modifications; // VZR_MEMBER
+
+ RDFStatementList interface_adds; // VZR_MEMBER
+ ServiceContextDataPtr service_context_data_; // VZR_MEMBER
+
virtual LiveResource *newLiveResource(Node const &node) = 0;
@@ -123,7 +132,10 @@
class EntityOfGraph
: public Base_
{
+ /* VZR_CLASS(EntityOfGraph, (Base_));*/
+
protected:
+
EntityOfGraph(QSharedPointer<RDFGraphImplBase> const &graph
= QSharedPointer<RDFGraphImplBase>())
: Base_(), graph_(graph) {}
@@ -133,12 +145,14 @@
RDFGraphImplBase *graph() const { return graph_.data(); }
- QSharedPointer<RDFGraphImplBase> graph_;
+ QSharedPointer<RDFGraphImplBase> graph_; // VZR_MEMBER
};
class RDFServiceImplBase
: public RDFGraphImplBase
{
+ /* VZR_CLASS(RDFServiceImplBase, (RDFGraphImplBase));*/
+
public:
RDFServiceImplBase(ServiceContextDataPtr const &service_context_data);
--- src/rdfunbound_p.cpp
+++ src/rdfunbound_p.cpp
@@ -713,6 +713,7 @@
void RDFPattern::useFilter(RDFFilter const &filter) const
{
+ d->pattern()->connectTo(*filter.d->assertPattern());
filter.useFilterIn(this);
}
@@ -1219,6 +1220,8 @@
{
QString ret;
typedef Unboundtor::Filter Filter;
+ if(filter.filtertype_ == filter.identity)
+ return nodeString(filter.node);
if(filter.filtertype_ >= filter.beginUnaryOps && filter.filtertype_ < filter.endUnaryOps)
{
Unboundtor::UnaryFilter const &ufilter
@@ -2848,6 +2851,49 @@
return false;
}
+ bool RDFUpdate::Operation::isSilent() const
+ {
+ return type_ & Silent;
+ }
+
+ RDFUpdate::Operation &RDFUpdate::Operation::setSilent(bool silent)
+ {
+ if(!silent)
+ type_ = ClauseType(type_ & ~Silent);
+ else
+ type_ = ClauseType(type_ | Silent);
+ return *this;
+ }
+
+ RDFUpdate::Operation::ClauseType RDFUpdate::Operation::type() const
+ {
+ return ClauseType(type_ & ~(Definite | Silent));
+ }
+ RDFStatementList RDFUpdate::Operation::deletes() const
+ {
+ return deletes_;
+ }
+ RDFStatementList RDFUpdate::Operation::inserts() const
+ {
+ return inserts_;
+ }
+ Node RDFUpdate::Operation::graph() const
+ {
+ return graph_;
+ }
+
+ RDFUpdate::Operation RDFUpdate::Operation::insertion
+ ( RDFStatementList const &inserts, Node const &graph)
+ { return Operation(RDFStatementList(), inserts, Insert, graph); }
+
+ RDFUpdate::Operation RDFUpdate::Operation::deletion
+ ( RDFStatementList const &deletes, Node const &graph)
+ { return Operation(deletes, RDFStatementList(), Delete, graph); }
+
+ RDFUpdate::Operation RDFUpdate::Operation::modification
+ ( RDFStatementList const &deletes, RDFStatementList const &inserts, Node const &graph)
+ { return Operation(deletes, inserts, Modify, graph); }
+
RDFUpdate::Data::Builder::Builder(RDFUpdate::Data const &query)
: RDFQuery::Data::Builder(query)
{
@@ -2885,7 +2931,7 @@
QString RDFUpdate::Data::Builder::generateOperation(Operation const &operation, QStringList const &reserved_words)
{
QString ret;
- unsigned type = operation.type_ & ~Operation::Definite;
+ unsigned type = operation.type_ & ~(Operation::Definite | Operation::Silent);
prepareQuery(reserved_words);
@@ -2896,22 +2942,26 @@
RDFQuery::Data::Builder::processUnboundtors();
+ QString silent;
+ if(operation.type_ & RDFUpdate::Operation::Silent)
+ silent = "SILENT ";
+
if(type == Operation::Modify)
{
if(!operation.graph_.isEmpty())
((ret += "WITH ") += nodeString(operation.graph_)) += "\n";
- ((ret += "DELETE ") += generateTemplate(operation.deletes_, true)) += "\n";
- ((ret += "INSERT ") += generateTemplate(operation.inserts_, false));
+ (((ret += "DELETE ") += silent) += generateTemplate(operation.deletes_, true)) += "\n";
+ (((ret += "INSERT ") += silent) += generateTemplate(operation.inserts_, false));
} else if(type == Operation::Delete)
{
- (ret += "DELETE ")
+ ((ret += "DELETE ") += silent)
+= /*(concrete ? "DATA " : "")) += */ (operation.graph_.isEmpty()
? ""
: "FROM " + nodeString(operation.graph_));
((ret += " ") += generateTemplate(operation.deletes_, true));
} else
{
- (ret += "INSERT ")
+ ((ret += "INSERT ") += silent)
+= /*(concrete ? "DATA " : "")) += */ (operation.graph_.isEmpty()
? ""
: "INTO " + nodeString(operation.graph_));
@@ -3025,6 +3075,7 @@
{
if(((left.type() != Operation::Delete) && (right.type() != Operation::Insert))
|| !left.isDefinite() || !right.isDefinite()
+ || left.isSilent() || right.isSilent()
|| left.graph_ != right.graph_)
return false;
left.deletes_ += right.deletes_;
--- src/rdfunbound_p.h
+++ src/rdfunbound_p.h
@@ -280,8 +280,9 @@
{
enum Type
{ none
- , beginUnaryOps
- , identity = beginUnaryOps, not_, inv
+ , identity
+ , beginUnaryOps
+ , not_ = beginUnaryOps, inv
, suffixStringUnaryOpsBegin
, hasPrefix = suffixStringUnaryOpsBegin, hasSuffix, contains, matchesRegexp
, suffixStringUnaryOpsEnd
--- src/rdfvariable_p.cpp
+++ src/rdfvariable_p.cpp
@@ -354,7 +354,7 @@
return;
}
#else
- if(type.metaTypeId() == new_type.metaTypeId() && strict > new_strict)
+ if (isStrict() && !new_strict)
return;
#endif
type = new_type;
--- src/rowstoremodel_p.h
+++ src/rowstoremodel_p.h
@@ -47,6 +47,8 @@
{
Q_OBJECT
+ /* VZR_CLASS(RowStoreModel, (LiveNodeModelBase));*/
+
public:
QModelIndex wholeIndex() const { return createIndex(0, 0, quint32(strategy_ | WholeIndex)); }
@@ -165,7 +167,7 @@
// TODO: create the meta information lookup structure
// for user defined per-row custom properties, efficient update signaling, etc.
- ModuleHandle content_module_handle_;
+ ModuleHandle content_module_handle_; // VZR_MEMBER
inline ContentModulePtr contentModule() const;
friend class SmoothTransitionModule;
@@ -177,6 +179,10 @@
: ModuleOfDerivedModel<RowStoreModel>
, ModuleInterface<ModelCommons, RowStoreModel, ContentModule>
{
+ /* VZR_CLASS(ContentModule
+ , (ModuleOfDerivedModel<RowStoreModel>)
+ , (ModuleInterface<ModelCommons, RowStoreModel, ContentModule>));*/
+
typedef ModuleOfDerivedModel<RowStoreModel> Base;
enum ChangePolicy { DenyChanges, AllowChanges, ReportChanges };
@@ -197,13 +203,14 @@
friend class RowStoreModel;
friend class SmoothTransitionModule;
- RowStore *rows_;
+ RowStore * rows_; // VZR_MEMBER
+
public:
virtual ~ContentModule();
virtual RowStore::iterator createRow(int row);
- ChangePolicy change_policy;
+ ChangePolicy change_policy; // VZR_MEMBER
RDFStrategyFlags strategy_chain(QModelIndex const &index
, InterfaceChain<ModelCommons const> chain) const;
@@ -258,7 +265,9 @@
struct ContentModule_Simple
: ContentModule
{
- bool update_pending_;
+ /* VZR_CLASS(ContentModule_Simple, (ContentModule));*/
+
+ bool update_pending_; // VZR_MEMBER
ContentModule_Simple(ChangePolicy change_policy);
ContentModule_Simple(ContentModule_Simple const &cp);
--- src/sequencer.h
+++ src/sequencer.h
@@ -51,6 +51,7 @@
QString quality_;
ChainBranches branches_;
};
+ QDebug operator<<(QDebug d, DependencyChainNode const &node);
class Q_DECL_EXPORT SequencerArgument
: public QGenericArgument
--- src/sequencer_p.cpp
+++ src/sequencer_p.cpp
@@ -48,6 +48,16 @@
, branches_(ChainBranches(new QList<DependencyChain>(chain_branches)))
{}
+ QDebug Detail::operator<<(QDebug d, DependencyChainNode const &node)
+ {
+ d.nospace() << "DCN(" << node.flags_ << ", " << node.quality_;
+ if(QList<DependencyChain> const *branches = node.branches_.data())
+ for(QList<DependencyChain>::const_iterator dci = branches->begin()
+ , dciend = branches->end(); dci != dciend; ++dci)
+ d.nospace() << ", Branch{" << *dci << "}";
+ return d << ")";
+ }
+
/*!
* A data structure describing a chain of dependency steps.
* \n It is used with \ref Sequencer::addOperation to determine the starting conditions of
--- src/src.pro
+++ src/src.pro
@@ -26,10 +26,14 @@
backends/tracker/rdftrackerupdate_p.h \
backends/tracker/signals_p.h \
backends/tracker/tracker_p.h \
+ backends/tracker/trackeraccess.h \
+ backends/tracker/dbus/asyncdbusinterface.h \
backends/tracker/dbus/tracker_resources.h \
backends/tracker/dbus/dbus_types.h \
+ backends/tracker/dbus/trackeraccessdbus.h \
soprano/vocabulary/rdf.h \
soprano/vocabulary/xsd.h \
+ utils/visualizer.h \
compositemodule_p.h \
derived_columns_p.h \
live_p.h \
@@ -110,6 +114,7 @@
include/sopranolive/rdfunbound.h \
include/sopranolive/transitionmodel.h \
include/sopranolive/unbound/rdfderivedselect.h \
+ include/sopranolive/unbound/rdfderivedselect.h \
SOURCES = \
backends/local/local_p.cpp \
@@ -121,8 +126,11 @@
backends/tracker/rdftrackerupdate_p.cpp \
backends/tracker/signals_p.cpp \
backends/tracker/tracker_p.cpp \
+ backends/tracker/trackeraccess.cpp \
+ backends/tracker/dbus/asyncdbusinterface.cpp \
backends/tracker/dbus/tracker_resources.cpp \
backends/tracker/dbus/dbus_types.cpp \
+ backends/tracker/dbus/trackeraccessdbus.cpp \
domains/tags.cpp \
soprano/vocabulary/rdf.cpp \
soprano/vocabulary/xsd.cpp \
@@ -130,6 +138,7 @@
soprano/languagetag.cpp \
soprano/literalvalue.cpp \
soprano/node.cpp \
+ utils/visualizer_p.cpp \
derived_columns_p.cpp \
live_p.cpp \
livenodemodelbase_p.cpp \
@@ -204,5 +213,8 @@
QMAKE_CXXFLAGS += -pg
}
+visualize {
+ QMAKE_CXXFLAGS += -DVISUALIZER_ENABLE
+}
check.CONFIG = recursive
check.commands = cat /dev/null
--- src/subrowstoremodel_p.h
+++ src/subrowstoremodel_p.h
@@ -43,13 +43,19 @@
class SubRowStoreModel
: public LiveNodeModelBase
{
+ /* VZR_CLASS(SubRowStoreModel, (LiveNodeModelBase));*/
+
public:
- RowStoreModelPtr row_model_;
- QPersistentModelIndex root_;
- QPersistentModelIndex topleft_incl_, bottomright_excl_;
+ RowStoreModelPtr row_model_; // VZR_MEMBER
+
+ QPersistentModelIndex root_; // VZR_MEMBER
+ QPersistentModelIndex topleft_incl_; // VZR_MEMBER
+
+ QPersistentModelIndex bottomright_excl_; // VZR_MEMBER
// contains both forward and backward conversion lookups.
// backward conversion resides before zero in inverse order
- int *columns_mapping_;
+ int * columns_mapping_; // VZR_MEMBER
+
SubRowStoreModel(RowStoreModelPtr row_model
, RDFStrategyFlags strategy
--- src/triplemodel_p.cpp
+++ src/triplemodel_p.cpp
@@ -112,7 +112,7 @@
// however, typically only one of these lists will be multiple valued.
bool TripleModel::tripleUpdates_chain
- ( RawTriplesData const &triples, TripleUpdateContext const *context
+ ( RawTriplesData const &triples, TripleUpdateContextConstPtr const &context
, InterfaceChain<TripleUpdateReceiver> chain)
{
if(chain.primeCompositeCall(this))
--- src/triplemodel_p.h
+++ src/triplemodel_p.h
@@ -81,6 +81,10 @@
: public RowStoreModel
, public CompositorInterface<TripleUpdateReceiver, TripleModel, LiveNodeModelBase>
{
+ /* VZR_CLASS(TripleModel
+ , (RowStoreModel)
+ , (CompositorInterface<TripleUpdateReceiver, TripleModel, LiveNodeModelBase>));*/
+
public:
enum StrategyFlags
{ offset_NoFalsePositives = offsetEnd_RowStoreModelFlags, offset_NoFalseNegatives
@@ -104,7 +108,7 @@
// Methods locally added
- ModuleHandle triple_module_handle_;
+ ModuleHandle triple_module_handle_; // VZR_MEMBER
void registerInto(RDFGraphCache &cache);
@@ -123,7 +127,7 @@
// , QModelIndex const &parent = QModelIndex());
bool tripleUpdates_chain
- ( RawTriplesData const &triples, TripleUpdateContext const *context
+ ( RawTriplesData const &triples, TripleUpdateContextConstPtr const &context
, InterfaceChain<TripleUpdateReceiver> chain);
protected:
@@ -139,10 +143,14 @@
: public ModuleOfDerivedModel<TripleModel>
, public ModuleInterface<ModelCommons, TripleModel, TripleModule>
{
+ /* VZR_CLASS(TripleModule
+ , (ModuleOfDerivedModel<TripleModel>)
+ , (ModuleInterface<ModelCommons, TripleModel, TripleModule>));*/
+
public:
typedef ModuleOfDerivedModel<TripleModel> Base;
- RowStore *rows_;
+ RowStore * rows_; // VZR_MEMBER
TripleModule()
: Base(), rows_(0) {}
--- src/tripleupdates_p.cpp
+++ src/tripleupdates_p.cpp
@@ -31,8 +31,8 @@
{
bool TripleUpdateContext::tripleUpdates(RawTriplesData const &triples) const
{
- if(TripleUpdateReceiverPtr rec = TripleUpdateReceiverPtr(receiver_))
- return rec->tripleUpdates(triples, this), true;
+ if(TripleUpdateReceiverPtr rec = receiver_.toStrongRef())
+ return rec->tripleUpdates(triples, sharedFromThis<TripleUpdateContext>()), true;
return false;
}
}
--- src/tripleupdates_p.h
+++ src/tripleupdates_p.h
@@ -41,8 +41,10 @@
// shared context between a single receiver and possibly multiple notifiers.
struct TripleUpdateContext
- : QSharedData
+ : QSharedFromThis<TripleUpdateContext>
{
+ /* VZR_CLASS(TripleUpdateContext, (QSharedFromThis<TripleUpdateContext>));*/
+
enum Offsets
{
offset_Adds = RDFStrategy::offset_ContextSpecificFlags, offset_Removes, offset_Partial
@@ -67,30 +69,31 @@
, RDFStatement const &triple_mask
, QModelIndex const &index = QModelIndex());
- QWeakPointer<TripleUpdateReceiver> receiver_;
- Mode mode_;
+ ~TripleUpdateContext();
+
+ QWeakPointer<TripleUpdateReceiver> receiver_; // VZR_MEMBER
+ Mode mode_; // VZR_MEMBER
+
// possibly should be inside a derived class. Each update receiver could
// want their own context dependent data passed on to them in the update.
- RDFStatement triple_mask_;
+ RDFStatement triple_mask_; // VZR_MEMBER
+
// TODO: solve the issue of meta-indices representing columns (row == -1),
// which dont map to cells
- QModelIndex index_;
-
- // sets receiver_ to null, which notifiers will interpret as
- // termination of the signaling relationship.
- void receiverDetach();
-
- inline bool isValid() const { return QSharedPointer<TripleUpdateReceiver>(receiver_); }
+ QModelIndex index_; // VZR_MEMBER
virtual bool tripleUpdates(RawTriplesData const &triples) const;
};
- typedef QExplicitlySharedDataPointer<TripleUpdateContext> SharedTripleUpdateContext;
- typedef QExplicitlySharedDataPointer<TripleUpdateContext const> SharedConstTripleUpdateContext;
+ typedef QWeakPointer<TripleUpdateContext> TripleUpdateContextWeakPtr;
+ typedef QSharedPointer<TripleUpdateContext> TripleUpdateContextPtr;
+ typedef QSharedPointer<TripleUpdateContext const> TripleUpdateContextConstPtr;
class TripleUpdateReceiver
{
+ /* VZR_CLASS(TripleUpdateReceiver);*/
+
public:
// \param triples contains the update information. Its mask denotes
// whether the modification is \a Adds or \a Removes, or if both are
@@ -102,7 +105,7 @@
// \param handle contains an optional reference to a model location.
// \return true if the update was handled, false otherwise
virtual bool tripleUpdates_chain
- ( RawTriplesData const &triples, TripleUpdateContext const *context
+ ( RawTriplesData const &triples, TripleUpdateContextConstPtr const &context
, InterfaceChain<TripleUpdateReceiver> chain)
{
return chain.advance(*this)
@@ -110,20 +113,22 @@
: false;
}
- bool tripleUpdates(RawTriplesData const &triples, TripleUpdateContext const *context)
+ bool tripleUpdates(RawTriplesData const &triples, TripleUpdateContextConstPtr const &context)
{
return tripleUpdates_chain(triples, context, InterfaceChain<TripleUpdateReceiver>());
}
protected:
- static void registerForTripleUpdates(SharedTripleUpdateContext const ¬ifier);
+ static void registerForTripleUpdates(TripleUpdateContextPtr const ¬ifier);
};
typedef QSharedPointer<TripleUpdateReceiver> TripleUpdateReceiverPtr;
class TripleUpdateNotifier
{
+ /* VZR_CLASS(TripleUpdateNotifier);*/
+
public:
- virtual TripleUpdateContext::Mode registerForTripleUpdates(SharedTripleUpdateContext const &context) = 0;
+ virtual TripleUpdateContext::Mode registerForTripleUpdates(TripleUpdateContextPtr const &context) = 0;
};
}
#endif /* SOPRANOLIVE_TRIPLEUPDATES_P_H_ */
--- src/updatermodule_p.cpp
+++ src/updatermodule_p.cpp
@@ -72,6 +72,12 @@
changeState(our_states_on_model, our_states_on_model);
}
+ void UpdaterModule::detached(TripleModel &triplemodel)
+ {
+ Q_UNUSED(triplemodel);
+ active_update_contexts_.clear();
+ }
+
bool UpdaterModule::alterStrategy_chain
( RDFStrategyFlags flags, RDFStrategyFlags mask, QModelIndex const &index
, InterfaceChain<ModelCommons> chain)
@@ -119,7 +125,7 @@
//! \return RDFStrategy::Object if it was an object property of col that changed,
//! and/or RDFStrategy::Subject if it was a subject property.
RDFStrategyFlags UpdaterModule::constrainUpdateQuery
- ( RawTriplesData const &triples, TripleUpdateContext const *context
+ ( RawTriplesData const &triples, TripleUpdateContextConstPtr const &context
, RDFDerivedColumn *col, RDFDerivedSelect *update_select)
{
Q_UNUSED(context);
@@ -132,7 +138,7 @@
*/
RDFStrategyFlags ret = 0;
- ChainContext const *chain_context = dynamic_cast<ChainContext const *>(context);
+ ChainContext const *chain_context = 0;
RDFVariableLink col_var_link(col->variable());
@@ -158,7 +164,7 @@
{
// "\tNeeded, predicate rdf:type denotes additions or removals";
ret = RDFStrategy::Object;
- } else if(!chain_context)
+ } else if(!(chain_context = dynamic_cast<ChainContext const *>(context.data())))
{
// TODO: remove dependency from RDFDerivedColumnPrivate
RDFDerivedColumnPrivate::Deriveds const &cdeps
@@ -251,7 +257,7 @@
}
bool UpdaterModule::tripleUpdates_chain
- ( RawTriplesData const &triples, TripleUpdateContext const *context
+ ( RawTriplesData const &triples, TripleUpdateContextConstPtr const &context
, InterfaceChain<TripleUpdateReceiver> chain)
{
RDFDerivedSelect update_sel = model()->columns_;
@@ -291,9 +297,7 @@
pending_updates_[update_model.data()] =
QSharedCreator<LiveUpdate>::create
( update_model.staticCast<RowStoreModel>()
- , triples, SharedConstTripleUpdateContext(context)
- , model_ordering_
- , updated_keys);
+ , triples, context, model_ordering_, updated_keys);
QObject::connect
( update_model.data(), SIGNAL(derivedsUpdated())
@@ -304,15 +308,16 @@
return true;
}
- SharedTripleUpdateContext UpdaterModule::createAndRegisterContext
+ TripleUpdateContextPtr UpdaterModule::createAndRegisterContext
( RDFStatement const &statement, int col)
{
- SharedTripleUpdateContext ret(new TripleUpdateContext
+ TripleUpdateContextPtr ret(QSharedCreator<TripleUpdateContext>::create
( model()->sharedFromThis<TripleModel>()
, statement
, model()->areaIndex(-1, col)
));
- model()->graph()->registerForTripleUpdates(ret);
+ if(model()->graph()->registerForTripleUpdates(ret))
+ active_update_contexts_.push_back(ret);
return ret;
}
@@ -336,12 +341,16 @@
// properly, thus if a property is a Subject property, we're creating a regular
// chain property for it
if(reg_outermost || (link.strategy() & RDFStrategy::Subject))
- model()->graph()->registerForTripleUpdates(SharedChainContext(new ChainContext
+ {
+ ChainContextPtr ctxt(QSharedCreator<ChainContext>::create
( model()->sharedFromThis<TripleModel>()
, ret.asStatement()
, model()->areaIndex(-1, col)
, ret
- )));
+ ));
+ if(model()->graph()->registerForTripleUpdates(ctxt))
+ active_update_contexts_.push_back(ctxt);
+ }
}
QVector<RDFProperty> derived_props = link.target().derivedProperties();
@@ -454,12 +463,13 @@
RDFStatement statement = cols[c].propertyData().asStatementWith(cols[cols[c].parent()].variable());
// TODO: these might fail and return false/partial. What then?
- model()->graph()->registerForTripleUpdates
- ( SharedTripleUpdateContext(new TripleUpdateContext
+ TripleUpdateContextPtr ctxt(new TripleUpdateContext
( model()->sharedFromThis<TripleModel>()
, statement
, model()->areaIndex(-1, c)
- )));
+ );
+ if(model()->graph()->registerForTripleUpdates(ctxt))
+ active_update_contexts_.push_back(ctxt);
}
*/
}
@@ -494,7 +504,7 @@
UpdaterModule::LiveUpdate::LiveUpdate
( RowStoreModelPtr const &model, RawTriplesData const &triples
- , SharedConstTripleUpdateContext const &update_context
+ , TripleUpdateContextConstPtr const &update_context
, RDFSelect::OrderByInfo const &model_ordering
, SmoothTransitionModule::UpdateKeys const &update_keys)
: UpdateContext(model), source_model_(model)
--- src/updatermodule_p.h
+++ src/updatermodule_p.h
@@ -40,6 +40,13 @@
, public ModuleInterface<TripleUpdateReceiver, TripleModel, UpdaterModule>
{
Q_OBJECT
+
+ /* VZR_CLASS(UpdaterModule
+ , (QObject)
+ , (ModuleOfDerivedModel<TripleModel>)
+ , (ModuleInterface<ModelCommons, TripleModel, UpdaterModule>)
+ , (ModuleInterface<TripleUpdateReceiver, TripleModel, UpdaterModule>));*/
+
public:
UpdaterModule(RDFStrategyFlags responsibility_modes);
@@ -49,27 +56,32 @@
, EndOfStreamSeen = RDFStrategyFlags(1) << RDFStrategy::offset_ContextSpecificFlags
};
- RDFStrategyFlags responsibility_modes_;
+ RDFStrategyFlags responsibility_modes_; // VZR_MEMBER
bool seenEndOfStream() const { return responsibility_modes_ & EndOfStreamSeen; }
void setSeenEndOfStream(bool seen = true)
{
if(seen)
- responsibility_modes_ |= EndOfStreamSeen;
+ responsibility_modes_ |= RDFStrategyFlags(EndOfStreamSeen);
else
responsibility_modes_ &= ~RDFStrategyFlags(EndOfStreamSeen);
}
- QList<RDFVariableLink> column_filters_;
+ QList<RDFVariableLink> column_filters_; // VZR_MEMBER
+
+ typedef QList<QSharedPointer<TripleUpdateContext> > ActiveUpdateContexts;
+ ActiveUpdateContexts active_update_contexts_; // VZR_MEMBER
// contains a single entry for each pending update model.
typedef QMap<LiveNodeModel const *, UpdateContextPtr> PendingUpdates;
- PendingUpdates pending_updates_;
- RDFSelect::OrderByInfo model_ordering_;
+ PendingUpdates pending_updates_; // VZR_MEMBER
+
+ RDFSelect::OrderByInfo model_ordering_; // VZR_MEMBER
// overrides of Module
void attached(TripleModel &model);
+ void detached(TripleModel &model);
// overrides of ModelCommons
@@ -83,7 +95,7 @@
// overrides of TripleUpdateReceiver
bool tripleUpdates_chain
- ( RawTriplesData const &triples, TripleUpdateContext const *context
+ ( RawTriplesData const &triples, TripleUpdateContextConstPtr const &context
, InterfaceChain<TripleUpdateReceiver> chain);
// local additions
@@ -91,7 +103,7 @@
void changeState(RDFStrategyFlags flags, RDFStrategyFlags mask);
RDFStrategyFlags constrainUpdateQuery
- ( RawTriplesData const &triples, TripleUpdateContext const *context
+ ( RawTriplesData const &triples, TripleUpdateContextConstPtr const &context
, RDFDerivedColumn *col, RDFDerivedSelect *update_select);
public Q_SLOTS:
@@ -101,32 +113,42 @@
struct LiveUpdate
: UpdateContext
{
+ /* VZR_CLASS(LiveUpdate, (UpdateContext));*/
+
LiveUpdate
( RowStoreModelPtr const &model, RawTriplesData const &triples
- , SharedConstTripleUpdateContext const &update_context
+ , TripleUpdateContextConstPtr const &update_context
, RDFSelect::OrderByInfo const &model_ordering
, SmoothTransitionModule::UpdateKeys const &update_keys);
- RowStoreModelPtr source_model_;
- RawTriplesData triples_;
- SharedConstTripleUpdateContext update_context_;
- RDFSelect::OrderByInfo model_ordering_;
- SmoothTransitionModule::UpdateKeys update_keys_;
+
+ RowStoreModelPtr source_model_; // VZR_MEMBER
+ RawTriplesData triples_; // VZR_MEMBER
+
+ TripleUpdateContextConstPtr update_context_; // VZR_MEMBER
+ RDFSelect::OrderByInfo model_ordering_; // VZR_MEMBER
+
+ SmoothTransitionModule::UpdateKeys update_keys_; // VZR_MEMBER
+
bool updateModel(LiveNodeModelBase *target) const;
};
struct ChainContext
: TripleUpdateContext
{
+ /* VZR_CLASS(ChainContext, (TripleUpdateContext));*/
+
ChainContext
( QWeakPointer<TripleUpdateReceiver> const &receiver
, RDFStatement const &triple_mask
, QModelIndex const &index, RDFProperty const &link);
- RDFProperty link_;
+
+ RDFProperty link_; // VZR_MEMBER
+
//! Contains information on aggregate chained property update dependency chains
};
- typedef QExplicitlySharedDataPointer<ChainContext> SharedChainContext;
+ typedef QSharedPointer<ChainContext> ChainContextPtr;
- SharedTripleUpdateContext createAndRegisterContext(RDFStatement const &statement, int col);
+ TripleUpdateContextPtr createAndRegisterContext(RDFStatement const &statement, int col);
RDFProperty recurseAndRegisterChainUpdates
( RDFVariable const &source, RDFProperty const &link, int col
, bool register_outermost = true);
@@ -135,6 +157,10 @@
: ModuleOfDerivedModel<TripleModel>
, ModuleInterface<ModelCommons, TripleModel, UpdaterModule>
{
+ /* VZR_CLASS(UpdateTransitionModule
+ , (ModuleOfDerivedModel<TripleModel>)
+ , (ModuleInterface<ModelCommons, TripleModel, UpdaterModule>));*/
+
bool updateTargetModule_chain
( ModelModule *target_module, UpdateContext const &update_context
, InterfaceChain<ModelCommons const> chain) const;
@@ -153,9 +179,13 @@
struct StreamingUpdate
: UpdateContext
{
- RowStoreModel *source_;
- UpdaterModule *updater_;
- int last_requested_block_size_;
+ /* VZR_CLASS(StreamingUpdate, (UpdateContext));*/
+
+ RowStoreModel * source_; // VZR_MEMBER
+ UpdaterModule * updater_; // VZR_MEMBER
+
+ int last_requested_block_size_; // VZR_MEMBER
+
StreamingUpdate(RowStoreModelPtr &source, UpdaterModule *updater, int requested_size)
: UpdateContext(source), source_(source.data()), updater_(updater)
, last_requested_block_size_(requested_size)
@@ -163,9 +193,12 @@
bool updateModel(LiveNodeModelBase *target) const;
};
- QSharedPointer<StreamingUpdate> streaming_update_;
+ QSharedPointer<StreamingUpdate> streaming_update_; // VZR_MEMBER
+
+ int streaming_block_size_; // VZR_MEMBER
+ int streaming_first_block_size_; // VZR_MEMBER
- int streaming_block_size_, streaming_first_block_size_, streaming_remaining_limit_;
+ int streaming_remaining_limit_; // VZR_MEMBER
};
}
--- src/util_p.h
+++ src/util_p.h
@@ -23,7 +23,7 @@
#include <QtGlobal>
#include <QDebug>
-
+#include "utils/visualizer.h"
class QFile;
@@ -49,12 +49,16 @@
// LogContext and override logMessage(). The implementation should first call
// parentContext()->logMessage(level) to get a QDebug object to use.
struct LogContext {
+ /* VZR_CLASS(LogContext);*/
+
virtual QDebug logMessage(int level, char const *func, char const *loc) const;
protected:
virtual LogContext const *parentContext() const;
};
struct GlobalLogContext: public LogContext {
+ /* VZR_CLASS(GlobalLogContext);*/
+
QDebug logMessage(int level, char const *func, char const *loc) const;
};
extern GlobalLogContext global_log;
--- src/utils
+++ src/utils
+(directory)
--- src/utils/visualizer.h
+++ src/utils/visualizer.h
+/*
+ * This file is part of libqttracker project
+ *
+ * Copyright (C) 2009, Nokia
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+/*
+ * visualizer.h
+ *
+ * Created on: Oct 14, 2010
+ * Author: iridian
+ */
+
+#ifndef SOPRANOLIVE_VISUALIZER_H_
+#define SOPRANOLIVE_VISUALIZER_H_
+
+#include <QDebug>
+#include <QSharedPointer>
+#include <QWeakPointer>
+#include <QProcess>
+#include <QTime>
+
+namespace SopranoLive
+{
+#ifdef VISUALIZER_ENABLE
+ namespace Visualizer
+ {
+ QIODevice *visualizerDevice();
+ void visualizerPostOutput(QIODevice *out_device);
+
+ static struct Dummy { virtual ~Dummy() {}; } dummy;
+
+#define VISUALIZER_KNOWNADDRESS ((char *) &::SopranoLive::Visualizer::dummy)
+
+#define VISUALIZER_OFFSETOF(type, member) \
+ (((char *) &((type *) VISUALIZER_KNOWNADDRESS)->member) - VISUALIZER_KNOWNADDRESS)
+
+#define VISUALIZER_STR_STR(x) #x
+#define VISUALIZER_STR(x) VISUALIZER_STR_STR(x)
+
+ QDebug outputHeader(QIODevice *, const char *op);
+
+ template<class T>
+ struct LifetimeTracker
+ {
+ void out(const char *op)
+ {
+ if(QIODevice *out_device = visualizerDevice())
+ {
+ T::visualizerClassOut(outputHeader(out_device, op), (char*)this)
+ << "\t\nVZREND\n";
+ visualizerPostOutput(out_device);
+ }
+ }
+
+ LifetimeTracker() { out("C"); }
+ LifetimeTracker(LifetimeTracker const &) { out("CP"); }
+ ~LifetimeTracker() { out("D"); }
+ };
+
+ template<class T>
+ struct MemberBuiltin
+ {
+ T val_;
+ MemberBuiltin(T const &val = T()) : val_(val) {}
+
+ operator T() const { return val_; }
+
+ bool operator!() const { return !val_; }
+ T operator~() const { return ~val_; }
+
+ template<class U>
+ T operator+(U const &rhs) const { return val_ + rhs; }
+ template<class U>
+ T operator-(U const &rhs) const { return val_ - rhs; }
+ template<class U>
+ T operator*(U const &rhs) const { return val_ * rhs; }
+ template<class U>
+ T operator/(U const &rhs) const { return val_ / rhs; }
+ template<class U>
+ T operator|(U const &rhs) const { return val_ | rhs; }
+ template<class U>
+ T operator&(U const &rhs) const { return val_ & rhs; }
+ template<class U>
+ T operator||(U const &rhs) const { return val_ || rhs; }
+ template<class U>
+ T operator&&(U const &rhs) const { return val_ && rhs; }
+ template<class U>
+ T operator<<(U const &rhs) const { return val_ & rhs; }
+ template<class U>
+ T operator>>(U const &rhs) const { return val_ & rhs; }
+ };
+
+ template<class T>
+ struct MemberBuiltin<T *>
+ {
+ T *val_;
+ MemberBuiltin(T *val = 0) : val_(val) {}
+ T *operator->() const { return val_; }
+ T &operator*() const { return *val_; }
+
+ operator T *() const { return val_; }
+
+ bool operator!() const { return !val_; }
+ };
+
+ template<class T>
+ char isClassTester(void(T::*)(void));
+
+ template<class T>
+ double isClassTester(...);
+
+ template<class T, bool inheritable = (sizeof(isClassTester<T>(0)) == 1)>
+ struct MemberContainerSelector { typedef T Type; };
+
+ template<class T>
+ struct MemberContainerSelector<T, false> { typedef MemberBuiltin<T> Type; };
+
+ template<class T>
+ T &visualizerValue(T &val) { return val; }
+
+ template<class T>
+ T &visualizerValue(MemberBuiltin<T> &c) { return c.val_; }
+
+ template<class T>
+ T &visualizerValue(MemberBuiltin<T &> &c) { return c.val_; }
+
+ template<class T>
+ typename T::VisualizerThis *outTypeSuffix(QDebug s, T const *)
+ {
+ s << "/" << T::visualizerClassName();
+ return 0;
+ }
+
+ template<class T>
+ void outTypeSuffix(QDebug, ...) {}
+
+ template<class T>
+ QDebug operator<<(QDebug s, T const *p)
+ {
+ outTypeSuffix<T>(s << "* " << (void*)p, p);
+ return s;
+ }
+
+ template<class T>
+ QDebug operator<<(QDebug s, QSharedPointer<T> const &p) { return s << p.data(); }
+
+ template<class T>
+ QDebug operator<<(QDebug s, QWeakPointer<T> const &p) { return s << p.data(); }
+
+ template<class T, int chooser = sizeof(qDebug() << T())>
+ struct QDebuggable
+ {
+ struct Dummy { char val[2]; };
+ typedef Dummy Type;
+ };
+
+ template<class T>
+ typename QDebuggable<T>::Type outputSelector(T const *val, T const *val2);
+
+ template<class T>
+ char outputSelector(T const *val, ...);
+
+ template<class T, int = sizeof(outputSelector((T*)0, (T*)0))>
+ struct OutputValue
+ {
+ static QDebug out(QDebug d, T const *val)
+ {
+ return d << *val;
+ }
+ };
+
+ template<class T>
+ struct OutputValue<T, 1>
+ {
+ static QDebug out(QDebug d, T const *val)
+ {
+ return d << val;
+ }
+ };
+
+ template
+ < class T
+ , class C
+ , QDebug (*baseOut)(QDebug, char *)>
+ struct BaseTracker
+ {
+ void out(const char *op)
+ {
+ if(QIODevice *out_device = visualizerDevice())
+ {
+ (*baseOut)(outputHeader(out_device, op), (char*)this) << "\nVZREND\n";
+ visualizerPostOutput(out_device);
+ }
+ }
+
+ BaseTracker() { out("BC"); }
+ BaseTracker(BaseTracker const &) { out("BCP"); }
+ ~BaseTracker() { out("BD"); }
+ };
+
+ template<class T>
+ const char *baseClassName(const char *, T *, typename T::VisualizerThis * = 0)
+ {
+ return T::visualizerClassName();
+ }
+
+ template<class T>
+ const char *baseClassName(const char *name, ...) { return name; }
+
+ template<class P, class QP = P>
+ struct Ptrify
+ {
+ typedef QP &Type;
+ };
+
+ template<class QP>
+ struct Ptrify<int, QP>
+ {
+ typedef Ptrify<int, QP> Type;
+ int p_;
+ Ptrify(int p) : p_(p) {}
+ operator int() { return p_; }
+ template<class T> operator T *() { return 0; }
+ };
+
+ template
+ < class T
+ , class C
+ , QDebug (*memberOut)(QDebug, char *)
+ , class B = typename MemberContainerSelector<T>::Type>
+ struct MemberTracker
+ : B
+ {
+ T &value() { return visualizerValue(*static_cast<B *>(this)); }
+
+ void out(const char *op, bool mute_value = false)
+ {
+ if(QIODevice *out_device = visualizerDevice())
+ {
+ QDebug out = (*memberOut)(outputHeader(out_device, op), (char*)this)
+ << "\t";
+ if(!mute_value)
+ OutputValue<T>::out(out.nospace(), &value());
+ out.nospace() << "\nVZREND\n";
+ visualizerPostOutput(out_device);
+ }
+ }
+
+ MemberTracker() : B() { out("MCD"); }
+ MemberTracker(T const &val) : B(val) { out("MCP"); }
+ MemberTracker(MemberTracker const &val) : B(val) { out("MCP"); }
+ ~MemberTracker() { out("MD", true); }
+
+ template<class P1>
+ MemberTracker(P1 &p1)
+ : B(typename Ptrify<P1>::Type(p1))
+ { out("MC"); }
+
+ template<class P1>
+ MemberTracker(P1 const &p1)
+ : B(typename Ptrify<P1, P1 const>::Type(p1))
+ { out("MC"); }
+
+ template<class P1, class P2>
+ MemberTracker(P1 const &p1, P2 const &p2)
+ : B(p1, p2)
+ { out("MC"); }
+
+ template<class P1, class P2, class P3>
+ MemberTracker(P1 const &p1, P2 const &p2, P3 const &p3)
+ : B(p1, p2, p3)
+ { out("MC"); }
+
+ template<class P1, class P2, class P3, class P4>
+ MemberTracker(P1 const &p1, P2 const &p2, P3 const &p3, P4 const &p4)
+ : B(p1, p2, p3, p4)
+ { out("MC"); }
+
+ template<class P1, class P2, class P3, class P4, class P5>
+ MemberTracker(P1 const &p1, P2 const &p2, P3 const &p3, P4 const &p4, P5 const &p5)
+ : B(p1, p2, p3, p4, p5)
+ { out("MC"); }
+
+ template<class P1, class P2, class P3, class P4, class P5, class P6>
+ MemberTracker(P1 const &p1, P2 const &p2, P3 const &p3, P4 const &p4, P5 const &p5, P6 const &p6)
+ : B(p1, p2, p3, p4, p5, p6)
+ { out("MC"); }
+
+ template<class U>
+ MemberTracker &operator=(U &other)
+ {
+ value() = typename Ptrify<U, U>::Type(other);
+ out("M=");
+ return *this;
+ }
+
+ template<class U>
+ MemberTracker &operator=(U const &other)
+ {
+ value() = typename Ptrify<U, U const>::Type(other);
+ out("M=");
+ return *this;
+ }
+
+ T *operator&()
+ {
+ out("M&");
+ return &value();
+ }
+
+ MemberTracker &operator++()
+ {
+ value()++;
+ out("M++");
+ return *this;
+ }
+
+ T operator++(int)
+ {
+ T ret(value());
+ value()++;
+ out("M++");
+ return ret;
+ }
+
+ MemberTracker &operator--()
+ {
+ value()--;
+ out("M--");
+ return *this;
+ }
+
+ T operator--(int)
+ {
+ T ret(value());
+ value()--;
+ out("M--");
+ return ret;
+ }
+
+ template<class U>
+ MemberTracker &operator+=(U const &other) { value() += other; out("M+="); return *this; }
+ template<class U>
+ MemberTracker &operator-=(U const &other) { value() -= other; out("M-="); return *this; }
+ template<class U>
+ MemberTracker &operator*=(U const &other) { value() *= other; out("M*="); return *this; }
+ template<class U>
+ MemberTracker &operator/=(U const &other) { value() /= other; out("M/="); return *this; }
+ template<class U>
+ MemberTracker &operator&=(U const &other) { value() &= other; out("M&="); return *this; }
+ template<class U>
+ MemberTracker &operator|=(U const &other) { value() |= other; out("M|="); return *this; }
+ template<class U>
+ MemberTracker &operator<<=(U const &other) { value() <<= other; out("M<<="); return *this; }
+ template<class U>
+ MemberTracker &operator>>=(U const &other) { value() >>= other; out("M>>="); return *this; }
+ };
+
+ template
+ < class T
+ , class LC, class RC
+ , QDebug (*LmemberOut)(QDebug, char *), QDebug (*RmemberOut)(QDebug, char *)
+ , class B>
+ void qSwap
+ ( MemberTracker<T, LC, LmemberOut, B> &lh
+ , MemberTracker<T, RC, RmemberOut, B> &rh)
+ {
+ T val = lh.value();
+ lh = rh.value();
+ rh = val;
+ }
+ }
+
+#define VZR_CLASS_C_0(class_name_, custom_string_) \
+ typedef class_name_ VisualizerThis; \
+ static const char *visualizerClassName() { return #class_name_; } \
+ static QDebug visualizerClassOut(QDebug d, char *lifetime_tracker) \
+ { \
+ return d.nospace() << (void*)(lifetime_tracker \
+ - VISUALIZER_OFFSETOF(VisualizerThis, visualizer_lifetime_tracker_)) \
+ << "/" << visualizerClassName() << "\t" << #class_name_ << "\t\t" \
+ << #custom_string_ "&File=" __FILE__ "&Line=" VISUALIZER_STR(__LINE__); \
+ } \
+ ::SopranoLive::Visualizer::LifetimeTracker<VisualizerThis> visualizer_lifetime_tracker_;
+
+#define VISUALIZER_CAT_DO(a,b) a ## b
+#define VISUALIZER_CAT(a,b) VISUALIZER_CAT_DO(a,b)
+#define VISUALIZER_CALL(f,args) f args
+#define VISUALIZER_EXPAND(...) __VA_ARGS__
+
+#define VISUALIZER_BASE_CLASS(index_, base_) \
+ typedef VISUALIZER_CALL(VISUALIZER_EXPAND, base_) VisualizerBase##index_; \
+ static QDebug visualizerBaseString_##index_(QDebug d, char *base_tracker) \
+ { \
+ VisualizerThis *ths = (VisualizerThis *)(base_tracker \
+ - VISUALIZER_OFFSETOF(VisualizerThis, visualizer_base_tracker_##index_)); \
+ VisualizerBase##index_ *base = ths; \
+ return d.nospace() << (void*)ths << "/" << visualizerClassName() \
+ << "\t" << ::SopranoLive::Visualizer::baseClassName<VisualizerBase##index_>(#base_, base) \
+ << "\t" << "Base" #base_ << "\t&Relation=Owns&File=" __FILE__ "&Line=" VISUALIZER_STR(__LINE__) "\t* " \
+ << (void *)base << "/" << ::SopranoLive::Visualizer::baseClassName<VisualizerBase##index_>(#base_, base); \
+ } \
+ ::SopranoLive::Visualizer::BaseTracker \
+ <VisualizerBase##index_, VisualizerThis, &VisualizerThis::visualizerBaseString_##index_> \
+ visualizer_base_tracker_##index_;
+
+#define VZR_CLASS_C_1(class_name, custom_string_, b0) \
+ VZR_CLASS_C_0(class_name, custom_string_) VISUALIZER_BASE_CLASS(0, b0)
+#define VZR_CLASS_C_2(class_name, custom_string_, b0, b1) \
+ VZR_CLASS_C_1(class_name, custom_string_, b0) VISUALIZER_BASE_CLASS(1, b1)
+#define VZR_CLASS_C_3(class_name, custom_string_, b0, b1, b2) \
+ VZR_CLASS_C_2(class_name, custom_string_, b0, b1) VISUALIZER_BASE_CLASS(2, b2)
+#define VZR_CLASS_C_4(class_name, custom_string_, b0, b1, b2, b3) \
+ VZR_CLASS_C_3(class_name, custom_string_, b0, b1, b2) VISUALIZER_BASE_CLASS(3, b3)
+#define VZR_CLASS_C_5(class_name, custom_string_, b0, b1, b2, b3, b4) \
+ VZR_CLASS_C_4(class_name, custom_string_, b0, b1, b2, b3) VISUALIZER_BASE_CLASS(4, b4)
+#define VZR_CLASS_C_6(class_name, custom_string_, b0, b1, b2, b3, b4, b5) \
+ VZR_CLASS_C_5(class_name, custom_string_, b0, b1, b2, b3, b4) VISUALIZER_BASE_CLASS(5, b5)
+#define VZR_CLASS_C_7(class_name, custom_string_, b0, b1, b2, b3, b4, b5, b6) \
+ VZR_CLASS_C_6(class_name, custom_string_, b0, b1, b2, b3, b4, b5) VISUALIZER_BASE_CLASS(6, b6)
+#define VZR_CLASS_C_8(class_name, custom_string_, b0, b1, b2, b3, b4, b5, b6, b7) \
+ VZR_CLASS_C_7(class_name, custom_string_, b0, b1, b2, b3, b4, b5, b6) VISUALIZER_BASE_CLASS(7, b7)
+#define VZR_CLASS_C_9(class_name, custom_string_, b0, b1, b2, b3, b4, b5, b6, b7, b8) \
+ VZR_CLASS_C_8(class_name, custom_string_, b0, b1, b2, b3, b4, b5, b6, b7) VISUALIZER_BASE_CLASS(8, b8)
+
+ /*
+ * The PP_NARG macro evaluates to the number of arguments that have
+ been
+ * passed to it.
+ *
+ * Laurent Deniau, "__VA_NARG__," 17 January 2006, <comp.std.c> (29
+ November 2007).
+ */
+ #define PP_NARG(...) PP_NARG_(__VA_ARGS__,PP_RSEQ_N())
+ #define PP_NARG_(...) PP_ARG_N(__VA_ARGS__)
+
+ #define PP_ARG_N( \
+ _1, _2, _3, _4, _5, _6, _7, _8, _9,_10, \
+ _11,_12,_13,_14,_15,_16,_17,_18,_19,_20, \
+ _21,_22,_23,_24,_25,_26,_27,_28,_29,_30, \
+ _31,_32,_33,_34,_35,_36,_37,_38,_39,_40, \
+ _41,_42,_43,_44,_45,_46,_47,_48,_49,_50, \
+ _51,_52,_53,_54,_55,_56,_57,_58,_59,_60, \
+ _61,_62,_63,N,...) N
+
+ #define PP_RSEQ_N() \
+ 62,61,60, \
+ 59,58,57,56,55,54,53,52,51,50, \
+ 49,48,47,46,45,44,43,42,41,40, \
+ 39,38,37,36,35,34,33,32,31,30, \
+ 29,28,27,26,25,24,23,22,21,20, \
+ 19,18,17,16,15,14,13,12,11,10, \
+ 9,8,7,6,5,4,3,2,1,0
+
+#define VZR_CLASS_C_N(custom_string_, class_name_, bases_...) \
+public: \
+ VISUALIZER_CAT(VZR_CLASS_C_, PP_NARG( , ## bases_)) (class_name_, custom_string_ , ## bases_)
+
+
+#define VZR_MEMBER_M_T_CV_N_C(mutable_, type_, cv_, name_, custom_string_) \
+public: \
+ static QDebug visualizerMemberString_##name_(QDebug d, char *member) \
+ { \
+ return d.nospace() << (void*)(member - VISUALIZER_OFFSETOF(VisualizerThis, name_.value())) \
+ << "/" << visualizerClassName() \
+ << "\t" #type_ "\t" #name_ "\t" \
+ #custom_string_ "&File=" __FILE__ "&Line=" VISUALIZER_STR(__LINE__); \
+ } \
+ mutable_ ::SopranoLive::Visualizer::MemberTracker \
+ <type_, VisualizerThis, &VisualizerThis::visualizerMemberString_##name_> cv_ name_;
+
+#else
+
+#define VZR_CLASS_C_N(custom_string_, class_name_and_bases_...)
+#define VZR_MEMBER_M_T_CV_N_C(mutable_, type_, cv_, name_, custom_string_) mutable_ type_ cv_ name_;
+
+#endif
+
+#define VZRX_CLASS(class_name_and_bases_...) VZR_CLASS_C_N( , ## class_name_and_bases_)
+#define VZRX_CLASS_C(class_name_, custom_string_, bases_...) \
+ VZR_CLASS_C_N(custom_string_, class_name, ## bases_)
+}
+#endif /* SOPRANOLIVE_VISUALIZER_H_ */
--- src/utils/visualizer_p.cpp
+++ src/utils/visualizer_p.cpp
+/*
+ * This file is part of libqttracker project
+ *
+ * Copyright (C) 2009, Nokia
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+/*
+ * visualizer_p.cpp
+ *
+ * Created on: Oct 27, 2010
+ * Author: iridian
+ */
+
+#include <QFile>
+#include "visualizer.h"
+
+namespace SopranoLive
+{
+ namespace Visualizer
+ {
+ struct VisualizerProcess
+ : QProcess
+ {
+ VisualizerProcess(char *logd)
+ : QProcess()
+ {
+ setReadChannelMode(QProcess::ForwardedChannels);
+ //setStandardOutputFile("vis.out");
+ start(logd);
+ waitForStarted();
+
+ QTime timer;
+ timer.start();
+ while(timer.elapsed() < 1000);
+ }
+
+ ~VisualizerProcess()
+ {
+ if(state() == QProcess::Running)
+ {
+ closeWriteChannel();
+ // 1 day. If you're debugging for longer, you have some real issues
+ waitForFinished(86400000);
+ }
+ }
+ };
+
+ QIODevice *tryInitVisualizerSingleton()
+ {
+ if(char *logd = getenv("VISUALIZER"))
+ {
+ if(QFile(logd).exists())
+ {
+ static VisualizerProcess visualizer_g(logd);
+ return &visualizer_g;
+ }
+ qWarning() << "Visualizer: specified visualizer does not exist:" << logd;
+ } else if(char *logf = getenv("VISUALIZER_FILE"))
+ {
+ static QFile file_g(logf);
+ if(file_g.open(QIODevice::WriteOnly | QIODevice::Text))
+ return &file_g;
+ qWarning() << "Visualizer: could not open file" << logf << "for writing";
+ }
+ return 0;
+ }
+
+ QIODevice *visualizerDevice()
+ {
+ static QIODevice *visualizer = tryInitVisualizerSingleton();
+ return visualizer;
+ }
+
+ void visualizerPostOutput(QIODevice *out_device)
+ {
+ out_device->waitForBytesWritten(1);
+ }
+
+ QDebug outputHeader(QIODevice *out_device, const char *op)
+ {
+ //while(out_device->bytesToWrite())
+ // out_device->waitForBytesWritten(1);
+ return QDebug(out_device).nospace() << "VZR\t" << op << "\t";
+ }
+
+ }
+}
--- tests/benchmarking/benchmarking.pro
+++ tests/benchmarking/benchmarking.pro
@@ -1,3 +1,9 @@
+include(../../shared.pri)
+
TEMPLATE = subdirs
SUBDIRS = gallery rtcom music contacts email calls im content location
+
+runall.files = runall.py
+runall.path = $$PREFIX/share/libqttracker-tests/benchmarking/
+INSTALLS += runall
--- tests/benchmarking/calls/calls.pro
+++ tests/benchmarking/calls/calls.pro
@@ -15,6 +15,6 @@
SOURCES += calls-benchmark.cpp
-target.path = $$PREFIX/bin
+target.path = $$PREFIX/share/libqttracker-tests/benchmarking/calls/
INSTALLS += target
--- tests/benchmarking/contacts/contacts.pro
+++ tests/benchmarking/contacts/contacts.pro
@@ -15,6 +15,6 @@
SOURCES += contacts-benchmark.cpp
-target.path = $$PREFIX/bin
+target.path = $$PREFIX/share/libqttracker-tests/benchmarking/contacts/
INSTALLS += target
--- tests/benchmarking/content/content.pro
+++ tests/benchmarking/content/content.pro
@@ -15,6 +15,6 @@
SOURCES += content-benchmark.cpp
-target.path = $$PREFIX/bin
+target.path = $$PREFIX/share/libqttracker-tests/benchmarking/content/
INSTALLS += target
--- tests/benchmarking/email/email.pro
+++ tests/benchmarking/email/email.pro
@@ -15,6 +15,6 @@
SOURCES += email-benchmark.cpp
-target.path = $$PREFIX/bin
+target.path = $$PREFIX/share/libqttracker-tests/benchmarking/email/
INSTALLS += target
--- tests/benchmarking/extracttracker.py
+++ tests/benchmarking/extracttracker.py
-from xml.dom.minidom import parse
-from string import strip
-
-class TestResult(object):
- __slots__ = [
- 'test',
- 'description',
- 'expectedvalue',
- 'actualvalue',
- 'numitems',
- ]
-
- def __init__(self, data):
- self.test, self.description, self.expectedvalue, self.actualvalue, self.numitems = data
-
-
- def __str__(self):
- return (str(self.test) + '\n' +
- str(self.description) + '\n' +
- str(self.expectedvalue) + '\n' +
- str(self.actualvalue) + '\n' +
- str(self.numitems))
-
-def getText (node):
- textnode = node.childNodes[0]
- return strip(textnode.data)
-
-def parseRow (tr):
- tds = tr.getElementsByTagName ('td')
-
- if len (tds) != 7:
- return (None, None)
-
- testnode = tds[0]
- test = getText (testnode)
-
- descriptionnode = tds[1]
- description = getText (descriptionnode)
-
- expectedvaluenode = tds[2]
- expectedvalue = getText (expectedvaluenode)
-
- actualvaluenode = tds[3]
- actualvalue = eval(getText (actualvaluenode))
- avf = [float (v) for v in actualvalue]
- actualmean = sum (avf) / len (avf)
- actualmeanms = actualmean * 1000
-
- numitemsnode = tds[5]
- numitems = getText (numitemsnode)
-
- return (test, TestResult ((test, description, expectedvalue, actualmeanms, numitems)))
-
-def parseTrackerResults (fname):
-
- doc = parse (fname)
- trs = doc.getElementsByTagName ('tr')
-
- parsed = {}
- for tr in trs:
- test, testresult = parseRow (tr)
- if test:
- parsed [test] = testresult
-
- return parsed
-
--- tests/benchmarking/gallery/gallery.pro
+++ tests/benchmarking/gallery/gallery.pro
@@ -15,6 +15,6 @@
SOURCES += gallery-benchmark.cpp
-target.path = $$PREFIX/bin
+target.path = $$PREFIX/share/libqttracker-tests/benchmarking/gallery/
INSTALLS += target
--- tests/benchmarking/htmlreport.py
+++ tests/benchmarking/htmlreport.py
-import sys
-import string
-from StringIO import StringIO
-from xml.dom.minidom import parse, parseString
-from extracttracker import TestResult
-
-null_tracker_result = TestResult (("", "", "0", 0, "0"))
-
-def percentDifference (old, new):
- if old == 0:
- return 0
- diff = ((new - old) / old) * 100
- return int (diff)
-
-def parseTestSuite (nodes, output, extra={}):
- htmlhead = \
-"""
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
- <title>LibQtTracker performance benchmarks</title>
- </head>
- <style type="text/css">
- body {
- font-family: "Helvetica Neue", "Lucida Grande", Helvetica, Arial, Verdana, sans-serif;
- margin-top: .5em; color: #444;
- }
- </style>
- <body>
-"""
-
- htmlfoot = \
-"""
- </body>
-</html>
-"""
-
- output.write (htmlhead)
- parseTestCase (nodes, output, extra)
- output.write (htmlfoot)
-
-def parseTestCase (nodes, output, extra={}):
- tchead = string.Template ( \
-"""
- <div class="qttrackertestcase">
- <h1> $testname </h1>
- <table cellpadding="4" width="100%" style="border: 1px solid #000000; border-collapse: collapse;" border="1">
- <tr>
- <th>Function</th>
- <th>Description</th>
- <th>LibQtTracker</th>
- <th>Tracker</th>
- <th>% Difference</th>
- <th>Expected</th>
- <th>Iterations</th>
- </tr>
-"""
- )
-
- tcfoot = \
-"""
- </table>
- </div>
-"""
-
-
- tcs = nodes.getElementsByTagName ("TestCase")
- for tc in tcs:
- output.write (tchead.substitute ({'testname': tc.attributes['name'].value}))
- parseTestFunction (tc, output, extra)
- output.write (tcfoot)
-
-def parseTestFunction (nodes, output, extra={}):
- tfs = nodes.getElementsByTagName ("TestFunction")
- for tf in tfs:
- parseBenchmarkResult (tf, output, extra)
-
-def parseBenchmarkResult (tf, output, extra={}):
- tfbody = string.Template ( \
-"""
- <tr class="$result" style="background: $background">
- <td> $function </td>
- <td> $description</td>
- <td> $qttime </td>
- <td> $rawtime </td>
- <td> $pdiff </td>
- <td> $etime </td>
- <td> $iterations </td>
- </tr>
-"""
- )
- bmr = tf.getElementsByTagName ('BenchmarkResult')
- if bmr:
- bmr = bmr[0]
- function = tf.attributes['name'].value
- exv = extra.get(function, null_tracker_result)
-
- description = exv.description
- time = bmr.attributes['value'].value
- etime = exv.expectedvalue
- iterations = bmr.attributes['iterations'].value
-
- result = "qttrackerfail"
- background = "#FF9999"
- if (etime == 0 or (etime >= int (time))):
- result = "qttrackerpass"
- background = "#FFFFFF"
-
- pdiff = percentDifference (exv.actualvalue, int(time))
- pdiffstr = "%d %%" % (pdiff)
- rawtime = exv.actualvalue
-
- bodyattr = {'function': function,
- 'description': description,
- 'qttime': time,
- 'rawtime': rawtime,
- 'etime': etime,
- 'pdiff': pdiffstr,
- 'iterations': iterations,
- 'result': result,
- 'background': background}
-
- output.write (tfbody.substitute (bodyattr))
-
-def main (argv):
- html = StringIO ()
- nodes = parseString (sys.stdin.read())
-
- parseTestSuite (nodes, html)
-
- print html.getvalue()
-
-if __name__ == "__main__":
- sys.exit (main (sys.argv))
--- tests/benchmarking/im/im-benchmark.cpp
+++ tests/benchmarking/im/im-benchmark.cpp
@@ -85,7 +85,7 @@
query.limit (10000);
LiveNodes query_model = ::tracker()->modelQuery (query, SopranoLive::RDFStrategy::LiveStrategy);
- QCOMPARE (query_model->rowCount(), 0);
+ QCOMPARE (query_model->rowCount(), 1000);
}
}
--- tests/benchmarking/im/im.pro
+++ tests/benchmarking/im/im.pro
@@ -15,6 +15,6 @@
SOURCES += im-benchmark.cpp
-target.path = $$PREFIX/bin
+target.path = $$PREFIX/share/libqttracker-tests/benchmarking/im/
INSTALLS += target
--- tests/benchmarking/location/location.pro
+++ tests/benchmarking/location/location.pro
@@ -15,6 +15,6 @@
SOURCES += location-benchmark.cpp
-target.path = $$PREFIX/bin
+target.path = $$PREFIX/share/libqttracker-tests/benchmarking/location/
INSTALLS += target
--- tests/benchmarking/mergeresults.py
+++ tests/benchmarking/mergeresults.py
+#!/usr/bin/python
+
+import sys
+import subprocess
+import string
+
+from StringIO import StringIO
+from xml.dom.minidom import parseString, parse
+from string import strip
+
+#----- Extraction of the tracker results
+
+class TestResult(object):
+ __slots__ = [
+ 'test',
+ 'description',
+ 'expectedvalue',
+ 'actualvalue',
+ 'numitems',
+ ]
+
+ def __init__(self, data):
+ self.test, self.description, self.expectedvalue, self.actualvalue, self.numitems = data
+
+
+ def __str__(self):
+ return (str(self.test) + '\n' +
+ str(self.description) + '\n' +
+ str(self.expectedvalue) + '\n' +
+ str(self.actualvalue) + '\n' +
+ str(self.numitems))
+
+def getText (node):
+ textnode = node.childNodes[0]
+ return strip(textnode.data)
+
+def parseRow (tr):
+ tds = tr.getElementsByTagName ('td')
+
+ if len (tds) != 7:
+ return (None, None)
+
+ testnode = tds[0]
+ test = getText (testnode)
+
+ descriptionnode = tds[1]
+ description = getText (descriptionnode)
+
+ expectedvaluenode = tds[2]
+ expectedvalue = getText (expectedvaluenode)
+
+ actualvaluenode = tds[3]
+ actualvalue = eval(getText (actualvaluenode))
+ avf = [float (v) for v in actualvalue]
+ actualmean = sum (avf) / len (avf)
+ actualmeanms = actualmean * 1000
+
+ numitemsnode = tds[5]
+ numitems = getText (numitemsnode)
+
+ return (test, TestResult ((test, description, expectedvalue, actualmeanms, numitems)))
+
+def parseTrackerResults (fname):
+
+ doc = parse (fname)
+ trs = doc.getElementsByTagName ('tr')
+
+ parsed = {}
+ for tr in trs:
+ test, testresult = parseRow (tr)
+ if test:
+ parsed [test] = testresult
+
+ return parsed
+
+# ------------------- Creation of the html report
+
+
+null_tracker_result = TestResult (("", "", "0", 0, "0"))
+
+def percentDifference (old, new):
+ if old == 0:
+ return 0
+ diff = ((new - old) / old) * 100
+ return int (diff)
+
+def parseTestSuite (nodes, extra={}):
+ htmlhead = \
+"""
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>
+ <title>LibQtTracker performance benchmarks</title>
+ </head>
+ <style type="text/css">
+ body {
+ font-family: "Helvetica Neue", "Lucida Grande", Helvetica, Arial, Verdana, sans-serif;
+ margin-top: .5em; color: #444;
+ }
+ </style>
+ <body>
+"""
+
+ htmlfoot = \
+"""
+ </body>
+</html>
+"""
+ output = StringIO ()
+
+ output.write (htmlhead)
+ parseTestCase (nodes, output, extra)
+ output.write (htmlfoot)
+
+ return output.getvalue ()
+
+def parseTestCase (nodes, output, extra={}):
+ tchead = string.Template ( \
+"""
+ <div class="qttrackertestcase">
+ <h1> $testname </h1>
+ <table cellpadding="4" width="100%" style="border: 1px solid #000000; border-collapse: collapse;" border="1">
+ <tr>
+ <th>Function</th>
+ <th>Description</th>
+ <th>LibQtTracker</th>
+ <th>Tracker</th>
+ <th>% Difference</th>
+ <th>Expected</th>
+ <th>Iterations</th>
+ </tr>
+"""
+ )
+
+ tcfoot = \
+"""
+ </table>
+ </div>
+"""
+ tcs = nodes.getElementsByTagName ("TestCase")
+ for tc in tcs:
+ output.write (tchead.substitute ({'testname': tc.attributes['name'].value}))
+ parseTestFunction (tc, output, extra)
+ output.write (tcfoot)
+
+def parseTestFunction (nodes, output, extra={}):
+ tfs = nodes.getElementsByTagName ("TestFunction")
+ for tf in tfs:
+ parseBenchmarkResult (tf, output, extra)
+
+def parseBenchmarkResult (tf, output, extra={}):
+ tfbody = string.Template ( \
+"""
+ <tr class="$result" style="background: $background">
+ <td> $function </td>
+ <td> $description </td>
+ <td> $qttime </td>
+ <td> $rawtime </td>
+ <td> $pdiff </td>
+ <td> $etime </td>
+ <td> $iterations </td>
+ </tr>
+"""
+ )
+ bmr = tf.getElementsByTagName ('BenchmarkResult')
+ if bmr:
+ bmr = bmr[0]
+ function = tf.attributes['name'].value
+ exv = extra.get(function, null_tracker_result)
+
+ description = exv.description
+ time = bmr.attributes['value'].value
+ etime = exv.expectedvalue
+ iterations = bmr.attributes['iterations'].value
+
+ result = "qttrackerfail"
+ background = "#FF9999"
+ if (etime == 0 or (etime >= int (time))):
+ result = "qttrackerpass"
+ background = "#FFFFFF"
+
+ pdiff = percentDifference (exv.actualvalue, int(time))
+ pdiffstr = "%d %%" % (pdiff)
+ rawtime = exv.actualvalue
+
+ bodyattr = {'function': function,
+ 'description': description,
+ 'qttime': time,
+ 'rawtime': rawtime,
+ 'etime': etime,
+ 'pdiff': pdiffstr,
+ 'iterations': iterations,
+ 'result': result,
+ 'background': background}
+
+ output.write (tfbody.substitute (bodyattr))
+
+#-----------------------------
+
+def getResults (testExec):
+ #r = subprocess.Popen ([testExec + ' -xml' + ' -iterations 5'], shell=True, stdout=subprocess.PIPE)
+ r = subprocess.Popen ([testExec + ' -xml' + ' -iterations 2'], shell=True, stdout=subprocess.PIPE)
+ return r.stdout.read()
+
+benchmarks = ["rtcom",
+ "gallery",
+ "music",
+ "email",
+ "calls",
+ "im",
+ "location",
+ "contacts",]
+ #"content",
+
+def main (argv):
+ libqttrackerres = parse (argv[1])
+ trackerres = parseTrackerResults (argv[2])
+
+ print parseTestSuite (libqttrackerres, extra=trackerres)
+
+if __name__ == "__main__":
+ sys.exit (main (sys.argv))
--- tests/benchmarking/music/music-benchmark.cpp
+++ tests/benchmarking/music/music-benchmark.cpp
@@ -37,6 +37,17 @@
}
ORDER BY ?title
*/
+ /*
+ SELECT ?title ?artist nmm:albumTitle (nmm:musicAlbum (?song))\
+ WHERE { { \
+ ?song a nmm:MusicPiece . \
+ ?song nie:title ?title .\
+ ?song nmm:performer ?perf . \
+ ?perf nmm:artistName ?artist .
+ }} \
+ ORDER BY ?title "
+
+ */
//::tracker()->setVerbosity (2);
QBENCHMARK {
RDFSelect query;
--- tests/benchmarking/music/music.pro
+++ tests/benchmarking/music/music.pro
@@ -15,6 +15,6 @@
SOURCES += music-benchmark.cpp
-target.path = $$PREFIX/bin
+target.path = $$PREFIX/share/libqttracker-tests/benchmarking/music/
INSTALLS += target
--- tests/benchmarking/rtcom/rtcom-benchmark.cpp
+++ tests/benchmarking/rtcom/rtcom-benchmark.cpp
@@ -240,6 +240,18 @@
} ORDER BY DESC(?date) LIMIT 50"
*/
+ /*
+ SELECT ?msg ?date ?text ?contact \
+ WHERE { \
+ ?msg nmo:communicationChannel <urn:channel:1> ; \
+ nmo:sentDate ?date ; \
+ nie:plainTextContent ?text ; \
+ nmo:from [ nco:hasIMAddress ?fromAddress ] . \
+ <urn:channel:1> nmo:hasParticipant ?contact . \
+ ?contact nco:hasIMAddress ?fromAddress . \
+ } ORDER BY DESC(?date) LIMIT 50"
+ */
+
//::tracker()->setVerbosity(2);
RDFSelect conversation_view;
@@ -267,7 +279,7 @@
LiveNodes query_model = ::tracker()->modelQuery (conversation_view,
SopranoLive::RDFStrategy::LiveStrategy);
- QCOMPARE(query_model->rowCount(), 1);
+ QCOMPARE(query_model->rowCount(), 2);
}
}
--- tests/benchmarking/rtcom/rtcom.pro
+++ tests/benchmarking/rtcom/rtcom.pro
@@ -15,6 +15,6 @@
SOURCES += rtcom-benchmark.cpp
-target.path = $$PREFIX/bin
+target.path = $$PREFIX/share/libqttracker-tests/benchmarking/rtcom/
INSTALLS += target
--- tests/benchmarking/runall.py
+++ tests/benchmarking/runall.py
@@ -2,12 +2,10 @@
import sys
import subprocess
+
from StringIO import StringIO
from xml.dom.minidom import parseString
-from htmlreport import parseTestSuite
-from extracttracker import parseTrackerResults
-
def getResults (testExec):
#r = subprocess.Popen ([testExec + ' -xml' + ' -iterations 5'], shell=True, stdout=subprocess.PIPE)
r = subprocess.Popen ([testExec + ' -xml' + ' -iterations 2'], shell=True, stdout=subprocess.PIPE)
@@ -38,11 +36,7 @@
merged.write (ostr)
merged.write ("</TestSuite>")
- html = StringIO ()
- trackerres = parseTrackerResults (argv[1])
- parseTestSuite (parseString (merged.getvalue()), html, trackerres)
-
- print html.getvalue()
+ print merged.getvalue()
if __name__ == "__main__":
sys.exit (main (sys.argv))
--- tests/test/test.cpp
+++ tests/test/test.cpp
@@ -3,19 +3,24 @@
#include <QDBusConnection>
#include <QDBusConnectionInterface>
#include <QtTracker/Tracker>
+/*
#include <QtTracker/ontologies/nmm.h>
#include <QtTracker/ontologies/nmo.h>
#include <QtTracker/ontologies/nfo.h>
#include <QtTracker/ontologies/nco.h>
#include <QtTracker/ontologies/mto.h>
+*/
#include <QtTracker/ontologies/mfo.h>
#include <QtTracker/ontologies/tracker.h>
+#define VISUALIZER_ENABLE
+#include "../../src/utils/visualizer.h"
+#include "../../src/utils/visualizer_p.cpp"
+#include "../../src/lnm_transitionstrategy_p.h"
using namespace SopranoLive;
using namespace SopranoLive::Ontologies;
-
struct LiveNodeModelDebugger
: public QObject
{
@@ -121,7 +126,7 @@
void test()
{
qDebug() << "entering test";
-
+/*
LiveNodes res = ::tracker()->modelVariable(RDFVariable::fromType<nmo::Email>());
QObject::connect(res.model(), SIGNAL(modelUpdated()), this, SLOT(ready()));
@@ -135,19 +140,97 @@
if(!simple_signal_flag)
qDebug() << "timeouted";
+*/
qDebug() << "exiting test";
}
};
- struct A { int a; };
- struct B { int b; };
- struct C : A, B {};
+struct O {};
+struct A : O
+{
+ VZRX_CLASS(A, (O));
+VZR_MEMBER_M_T_CV_N_C(, int,, a, O); // VZRX_MEMBER
+
+};
+struct B
+{
+ VZRX_CLASS(B);
+VZR_MEMBER_M_T_CV_N_C(, int,, b, O); // VZRX_MEMBER
+
+};
+
+template<typename T>
+struct D
+{
+ VZRX_CLASS(D);
+};
+
+template<typename Compositor_>
+struct Interfaces
+{
+ VZRX_CLASS(Interfaces);
+
+Interfaces() {}
+Interfaces(Interfaces const &) {}
+
+};
+
+struct C : A, B, D<int>
+{
+ VZRX_CLASS(C, (A), (B), (D<int>));
+VZR_MEMBER_M_T_CV_N_C(, B,, owned_b, &Relation=Owns); // VZRX_MEMBER
+
+VZR_MEMBER_M_T_CV_N_C(, B * ,,pointed_b, &Relation=Refers); // VZRX_MEMBER
+VZR_MEMBER_M_T_CV_N_C(, QSharedPointer<B> ,,shared_b, &Relation=Shares); // VZRX_MEMBER
+
+};
+
+namespace SopranoLive
+{
+ int oro();
+}
+
+struct Bar;
+
+void bar(Bar);
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
+
+ B b[2];
+ QSharedPointer<B> sb = QSharedPointer<B>(new B);
+ C c;
+ c.pointed_b = &b[0];
+ ++c.pointed_b;
+ c.shared_b = sb;
+ return 0;
+
+
+#if 0
+ RDFSelect sel;
+ RDFVariable feed_channel = sel.newColumn<mfo::FeedChannel>();
+ RDFPattern exists_pattern;
+ exists_pattern
+ .variable(feed_channel)
+ .subject<nie::hasLogicalPart>().isOfType<mfo::FeedMessage>()
+ .subject<nie::hasLogicalPart>().isOfType<mfo::Enclosure>()
+ .property<mfo::optional>(LiteralValue(true));
+ sel.addColumn(exists_pattern.exists());
+
+ qDebug() << sel.getQuery();
+
+ return 0;
setVerbosity(5);
+ RDFVariable var;
+ var.pattern().useFilter(LiteralValue(false));
+ qDebug() << RDFSelect().addColumn(var).getQuery();
+
+ return 0;
+
+#if 0
+
RDFVariable emails = RDFVariable::fromType<nmo::Email>("emails");
RDFVariable recipients = emails.property<nmo::to>(RDFVariable("recipients"));
@@ -164,9 +247,8 @@
qDebug() << by_me.getQuery();
qDebug() << by_mailing_list.getQuery();
- return 0;
-#if 0
+ return 0;
RDFSelect sel;
RDFVariable var = sel.newColumn("col");
@@ -438,4 +520,4 @@
#endif
}
-#include "test.moc"
+//#include "test.moc"
--- tests/tests.pro
+++ tests/tests.pro
@@ -1,6 +1,6 @@
TEMPLATE = subdirs
-SUBDIRS = unit-tests mafw perf-tests
+SUBDIRS = unit-tests mafw perf-tests benchmarking
check.CONFIG = recursive
check.recurse = unit-tests mafw
--- tests/unit-tests/base-suite.cpp
+++ tests/unit-tests/base-suite.cpp
@@ -28,6 +28,8 @@
#include "unit-tests.h"
#include <sopranolive/live.h>
+Q_DECLARE_METATYPE(UnitTests::QueryType)
+
void UnitTests::base_ResourceLifetime()
{
QUrl node_url = ::tracker()->createUniqueIri();
@@ -603,9 +605,19 @@
checkQueryCount("base_childModels");
}
+void UnitTests::base_setDataTest_data()
+{
+ QTest::addColumn<QueryType>("queryType");
+
+ QTest::newRow("ObjectBasedQuery") << ObjectBasedQuery;
+ QTest::newRow("TextualQuery") << TextualQuery;
+}
+
// from https://projects.maemo.org/bugzilla/show_bug.cgi?id=146962
void UnitTests::base_setDataTest()
{
+ QFETCH(QueryType, queryType);
+
QList<Live<nmm::MusicPiece> > pieces;
{
RDFTransactionPtr transaction = ::tracker()->createTransaction();
@@ -628,7 +640,27 @@
select.orderBy(title);
select.distinct(true);
- LiveNodes query = ::tracker()->modelQuery(select);
+ LiveNodes query;
+ switch(queryType) {
+ case ObjectBasedQuery:
+ {
+ query = ::tracker()->modelQuery(select);
+ break;
+ }
+ case TextualQuery:
+ {
+ QStringList columns;
+ columns << select.columns().at(0).name() << select.columns().at(1).name();
+ query = ::tracker()->modelQuery(select.getQuery(), columns );
+ break;
+ }
+ default:
+ {
+ QFAIL("Unknown query type");
+ break;
+ }
+ }
+
LiveNodeModelTester tester(query);
tester.runTests();
@@ -2174,9 +2206,15 @@
{
QFileInfo local (QString ("./data/nmm.ttl"));
if (local.exists())
- ::tracker()->rawLoad(QUrl::fromLocalFile(QFileInfo(QString("./data/nmm.ttl")).absoluteFilePath()));
+ ::tracker()->rawLoad(QUrl::fromLocalFile(local.absoluteFilePath()));
else
- ::tracker()->rawLoad(QUrl::fromLocalFile(QFileInfo(QString("/usr/share/libqttracker-tests/data/nmm.ttl")).absoluteFilePath()));
+ {
+ local.setFile(QString("/usr/share/libqttracker-tests/data/nmm.ttl"));
+ if (local.exists())
+ ::tracker()->rawLoad(QUrl::fromLocalFile(local.absoluteFilePath()));
+ else
+ QFAIL("Turtle file for testcase missing");
+ }
QTest::qWait(1000);
QUrl tgraphUrl("http://www.codethink.co.uk/tracker/test/uri#nmm-test-graph-001");
@@ -2289,9 +2327,15 @@
{
QFileInfo local (QString ("./data/nmm.ttl"));
if (local.exists())
- ::tracker()->rawLoad(QUrl::fromLocalFile(QFileInfo(QString("./data/nmm.ttl")).absoluteFilePath()));
+ ::tracker()->rawLoad(QUrl::fromLocalFile(local.absoluteFilePath()));
else
- ::tracker()->rawLoad(QUrl::fromLocalFile(QFileInfo(QString("/usr/share/libqttracker-tests/data/nmm.ttl")).absoluteFilePath()));
+ {
+ local.setFile(QString("/usr/share/libqttracker-tests/data/nmm.ttl"));
+ if (local.exists())
+ ::tracker()->rawLoad(QUrl::fromLocalFile(local.absoluteFilePath()));
+ else
+ QFAIL("Turtle file for testcase missing");
+ }
QTest::qWait(1000);
RDFVariable const tgraph (QUrl ("http://www.codethink.co.uk/tracker/test/uri#nmm-test-graph-001"));
@@ -2350,9 +2394,15 @@
{
QFileInfo local (QString ("./data/nmm.ttl"));
if (local.exists())
- ::tracker()->rawLoad(QUrl::fromLocalFile(QFileInfo(QString("./data/nmm.ttl")).absoluteFilePath()));
+ ::tracker()->rawLoad(QUrl::fromLocalFile(local.absoluteFilePath()));
else
- ::tracker()->rawLoad(QUrl::fromLocalFile(QFileInfo(QString("/usr/share/libqttracker-tests/data/nmm.ttl")).absoluteFilePath()));
+ {
+ local.setFile(QString("/usr/share/libqttracker-tests/data/nmm.ttl"));
+ if (local.exists())
+ ::tracker()->rawLoad(QUrl::fromLocalFile(local.absoluteFilePath()));
+ else
+ QFAIL("Turtle file for testcase missing");
+ }
QTest::qWait(1000);
RDFVariable music_albums = isTestGraphResource
@@ -2441,6 +2491,7 @@
void UnitTests::base_liveFeeds()
{
+ QSKIP("Skipping due to freezing", SkipSingle);
QTest::qWait(1000);
QVector<Live<mfo::FeedChannel> > channels;
--- tests/unit-tests/conv-suite.cpp
+++ tests/unit-tests/conv-suite.cpp
@@ -236,6 +236,35 @@
checkQueryCount("conv_setAffilTitle");
}
+//https://projects.maemo.org/bugzilla/show_bug.cgi?id=193607
+void UnitTests::conv_getBigInt()
+{
+ Live<nfo::FileDataObject> fileObject = regLocalResource(::tracker()->createLiveNode());
+
+ const int sampleInt = 789;
+ int retrievedInt;
+ fileObject->setFileSize(sampleInt);
+ retrievedInt=fileObject->getFileSize();
+ QCOMPARE(retrievedInt, sampleInt);
+
+ const long sampleLong=2147483647;
+ long retrievedLong;
+ fileObject->setFileSize(sampleLong);
+ retrievedLong=fileObject->getFileSize();
+ QCOMPARE(retrievedLong, sampleLong);
+
+
+ const qint64 sampleInt64=9223372036854775807LL;
+ qint64 retrievedInt64;
+ fileObject->setFileSize(sampleInt64);
+ retrievedInt64=fileObject->getFileSize();
+ if(sampleInt64!=retrievedInt64)
+ QFAIL("Comparison of int64 failed");
+
+ fileObject->remove();
+
+}
+
void UnitTests::conv_contentLastModified()
{
--- tests/unit-tests/livenodemodeltester.cpp
+++ tests/unit-tests/livenodemodeltester.cpp
@@ -70,6 +70,7 @@
void LiveNodeModelTester::prepareWaitForModelSignal(const char *signal)
{
spy_ = QSharedPointer<QSignalSpy>(new QSignalSpy(model(), signal));
+ timer_.setSingleShot(true);
timer_.start(timeout_);
}
bool LiveNodeModelTester::waitForModelSignal()
--- tests/unit-tests/unbound-suite.cpp
+++ tests/unit-tests/unbound-suite.cpp
@@ -644,3 +644,46 @@
QCOMPARE(model->rowCount(), 1);
QCOMPARE(model->data(model->index(0, 0)).toString(), QString::fromLatin1("Home"));
}
+
+void UnitTests::unbound_filterFalse()
+{
+ RDFSelect sel;
+ sel.limit(1);
+ sel.pattern().useFilter(LiteralValue(false));
+ sel.addColumn(RDFVariable::fromType<rdfs::Resource>());
+
+ QCOMPARE(::tracker()->modelQuery(sel)->rowCount(), 0);
+}
+
+void UnitTests::unbound_silentOperations()
+{
+ RDFServicePtr svc = ::tracker();
+
+ Live<nmo::Email> res_node = regLocalResource(svc->createLiveResource<nmo::Email>());
+ QUrl res = res_node.uri();
+ res_node = Live<nmo::Email>();
+
+ RDFUpdate up;
+ up.addInsertion(RDFStatementList()
+ << RDFStatement(res, nie::title::iri(), LiteralValue("title")));
+ up.addOperation(RDFUpdate::Operation::insertion
+ (RDFStatementList() << RDFStatement(res, nie::title::iri(), LiteralValue("silent failure")))
+ .setSilent());
+ up.addInsertion(res, nmo::messageId::iri(), LiteralValue("id"));
+
+ svc->executeQuery(up);
+ QCOMPARE(svc->modelVariable(RDFVariable(res).property<nmo::messageId>())
+ ->liveNode(0, 0).toString(), QString("id"));
+
+ RDFUpdate up2;
+ // this should get rolled back
+ up2.addOperation(RDFUpdate::Operation::deletion
+ (RDFStatementList() << RDFStatement(res, rdfs::type::iri(), rdfs::Resource::iri())));
+
+ // because this insertion should fail after above removal
+ up2.addOperation(RDFUpdate::Operation::insertion
+ (RDFStatementList() << RDFStatement(res, nie::title::iri(), LiteralValue("title2"))));
+
+ svc->executeQuery(up2);
+ QCOMPARE(svc->strictLiveResource<nmo::Email>(res).isValid(), true);
+}
--- tests/unit-tests/unit-tests.cpp
+++ tests/unit-tests/unit-tests.cpp
@@ -23,7 +23,7 @@
// to update watermarks, #define OUTPUT_QUERY_COUNTS, run the test and overwrite this function by copypaste from the console output
-#define OUTPUT_QUERY_COUNTS
+#undef OUTPUT_QUERY_COUNTS
const QString UnitTests::global_test_context_str = "http://sopranolive.org/coresuite/global_test_context";
@@ -172,9 +172,15 @@
if(cqci != query_count_watermarks_.end())
if (current_count != *cqci)
{
- QString msg = " query count: " + testname + "_selects"
- ", actual: " + QString::number(current_count) + ", expected: " + QString::number(*cqci);
- QFAIL(msg.toLatin1());
+ QMap<TestName, int>::const_iterator qc_min = query_count_watermarks_.find(testname + "_selects_min");
+ QMap<TestName, int>::const_iterator qc_max = query_count_watermarks_.find(testname + "_selects_max");
+ if((qc_min == query_count_watermarks_.end() || qc_max == query_count_watermarks_.end()) ||
+ (current_count < *qc_min) || (current_count > *qc_max))
+ {
+ QString msg = " query count: " + testname + "_selects"
+ ", actual: " + QString::number(current_count) + ", expected: " + QString::number(*cqci);
+ QFAIL(msg.toLatin1());
+ }
}
current_mark = ::tracker()->serviceAttribute("update_count").toInt();
@@ -185,9 +191,15 @@
if(cqci != query_count_watermarks_.end())
if (current_count != *cqci)
{
- QString msg = " query count: " + testname + "_updates"
- ", actual: " + QString::number(current_count) + ", expected: " + QString::number(*cqci);
- QFAIL(msg.toLatin1());
+ QMap<TestName, int>::const_iterator qc_min = query_count_watermarks_.find(testname + "_updates_min");
+ QMap<TestName, int>::const_iterator qc_max = query_count_watermarks_.find(testname + "_updates_max");
+ if((qc_min == query_count_watermarks_.end() || qc_max == query_count_watermarks_.end()) ||
+ (current_count < *qc_min) || (current_count > *qc_max))
+ {
+ QString msg = " query count: " + testname + "_updates"
+ ", actual: " + QString::number(current_count) + ", expected: " + QString::number(*cqci);
+ QFAIL(msg.toLatin1());
+ }
}
}
@@ -226,6 +238,8 @@
query_count_watermarks_["base_aggregateModelVariables_selects"] = 1;
query_count_watermarks_["base_aggregateModelVariables_updates"] = 0;
query_count_watermarks_["base_blankUpdateResults_selects"] = 0;
+ query_count_watermarks_["base_blankUpdateResults_selects_min"] = 0;
+ query_count_watermarks_["base_blankUpdateResults_selects_max"] = 1;
query_count_watermarks_["base_blankUpdateResults_updates"] = 7;
query_count_watermarks_["base_chainedDerivedProperties_selects"] = 2;
query_count_watermarks_["base_chainedDerivedProperties_updates"] = 3;
@@ -236,8 +250,14 @@
query_count_watermarks_["base_hasTypeMusicAlbum_selects"] = 7;
query_count_watermarks_["base_hasTypeMusicAlbum_updates"] = 6;
query_count_watermarks_["base_liveFeeds_selects"] = 66;
+ query_count_watermarks_["base_liveFeeds_selects_min"] = 41;
+ query_count_watermarks_["base_liveFeeds_selects_max"] = 66;
query_count_watermarks_["base_livePhotos_selects"] = 10;
+ query_count_watermarks_["base_livePhotos_selects_min"] = 7;
+ query_count_watermarks_["base_livePhotos_selects_max"] = 14;
query_count_watermarks_["base_livePhotos_updates"] = 4;
+ query_count_watermarks_["base_livePhotos_updates_min"] = 4;
+ query_count_watermarks_["base_livePhotos_updates_max"] = 5;
query_count_watermarks_["base_modelUpdatedSignal_selects"] = 3;
query_count_watermarks_["base_modelUpdatedSignal_updates"] = 0;
query_count_watermarks_["base_multiurlModel_selects"] = 0;
@@ -253,10 +273,14 @@
query_count_watermarks_["base_rdfGraph_removeResources_selects"] = 1;
query_count_watermarks_["base_rdfGraph_removeResources_updates"] = 13;
query_count_watermarks_["base_removeLiveNodeAlsoInAModel_selects"] = 1;
+ query_count_watermarks_["base_removeLiveNodeAlsoInAModel_selects_min"] = 1;
+ query_count_watermarks_["base_removeLiveNodeAlsoInAModel_selects_max"] = 3;
query_count_watermarks_["base_removeLiveNodeAlsoInAModel_updates"] = 4;
query_count_watermarks_["base_selectUrnFilteredPhotos_selects"] = 2;
query_count_watermarks_["base_selectUrnFilteredPhotos_updates"] = 5;
query_count_watermarks_["base_setDataOnInsertedRow_selects"] = 1;
+ query_count_watermarks_["base_setDataOnInsertedRow_selects_min"] = 1;
+ query_count_watermarks_["base_setDataOnInsertedRow_selects_max"] = 3;
query_count_watermarks_["base_setDataOnInsertedRow_updates"] = 8;
query_count_watermarks_["base_setDataTest_selects"] = 1;
query_count_watermarks_["base_setDataTest_updates"] = 2;
@@ -267,17 +291,29 @@
query_count_watermarks_["base_storingQDateTimeWithLocal_selects"] = 1;
query_count_watermarks_["base_storingQDateTimeWithLocal_updates"] = 5;
query_count_watermarks_["base_storingQDateTimeWithUTCOffset_selects"] = 1;
+ query_count_watermarks_["base_storingQDateTimeWithUTCOffset_selects_min"] = 1;
+ query_count_watermarks_["base_storingQDateTimeWithUTCOffset_selects_max"] = 2;
query_count_watermarks_["base_storingQDateTimeWithUTCOffset_updates"] = 5;
query_count_watermarks_["base_storingQDateTimeWithUTC_selects"] = 1;
+ query_count_watermarks_["base_storingQDateTimeWithUTC_selects_min"] = 1;
+ query_count_watermarks_["base_storingQDateTimeWithUTC_selects_max"] = 2;
query_count_watermarks_["base_storingQDateTimeWithUTC_updates"] = 5;
query_count_watermarks_["base_streamingResultsOrdered_selects"] = 5;
query_count_watermarks_["base_streamingResultsOrdered_updates"] = 0;
query_count_watermarks_["base_streamingResults_selects"] = 19;
+ query_count_watermarks_["base_streamingResults_selects_min"] = 16;
+ query_count_watermarks_["base_streamingResults_selects_max"] = 19;
query_count_watermarks_["base_streamingResults_updates"] = 0;
query_count_watermarks_["base_strictMultiurlModelWithWrongTypes_selects"] = 1;
+ query_count_watermarks_["base_strictMultiurlModelWithWrongTypes_selects_min"] = 1;
+ query_count_watermarks_["base_strictMultiurlModelWithWrongTypes_selects_max"] = 3;
query_count_watermarks_["base_strictMultiurlModelWithWrongTypes_updates"] = 16;
+ query_count_watermarks_["base_strictMultiurlModelWithWrongTypes_updates_min"] = 16;
+ query_count_watermarks_["base_strictMultiurlModelWithWrongTypes_updates_max"] = 33;
query_count_watermarks_["base_strictMultiurlModel_selects"] = 0;
query_count_watermarks_["base_strictMultiurlModel_updates"] = 16;
+ query_count_watermarks_["base_strictMultiurlModel_updates_min"] = 0;
+ query_count_watermarks_["base_strictMultiurlModel_updates_max"] = 16;
query_count_watermarks_["base_testDummyModel_selects"] = 0;
query_count_watermarks_["base_testDummyModel_updates"] = 0;
query_count_watermarks_["conv_ContactManipulationQuerying_selects"] = 7;
@@ -299,16 +335,28 @@
query_count_watermarks_["conv_setAffilTitle_selects"] = 1;
query_count_watermarks_["conv_setAffilTitle_updates"] = 10;
query_count_watermarks_["conv_setObjectWithEmpty_selects"] = 2;
+ query_count_watermarks_["conv_setObjectWithEmpty_selects_min"] = 2;
+ query_count_watermarks_["conv_setObjectWithEmpty_selects_max"] = 3;
query_count_watermarks_["conv_setObjectWithEmpty_updates"] = 10;
query_count_watermarks_["conv_setObjectsWithEmpty_selects"] = 1;
+ query_count_watermarks_["conv_setObjectsWithEmpty_selects_min"] = 1;
+ query_count_watermarks_["conv_setObjectsWithEmpty_selects_max"] = 2;
query_count_watermarks_["conv_setObjectsWithEmpty_updates"] = 8;
query_count_watermarks_["conv_staticResourcesSupport_selects"] = 3;
+ query_count_watermarks_["conv_staticResourcesSupport_selects_min"] = 3;
+ query_count_watermarks_["conv_staticResourcesSupport_selects_max"] = 4;
query_count_watermarks_["conv_staticResourcesSupport_updates"] = 11;
query_count_watermarks_["conv_storingQDateTimeWithLocal_selects"] = 2;
+ query_count_watermarks_["conv_storingQDateTimeWithLocal_selects_min"] = 2;
+ query_count_watermarks_["conv_storingQDateTimeWithLocal_selects_max"] = 3;
query_count_watermarks_["conv_storingQDateTimeWithLocal_updates"] = 5;
query_count_watermarks_["conv_storingQDateTimeWithUTCOffset_selects"] = 2;
+ query_count_watermarks_["conv_storingQDateTimeWithUTCOffset_selects_min"] = 2;
+ query_count_watermarks_["conv_storingQDateTimeWithUTCOffset_selects_max"] = 3;
query_count_watermarks_["conv_storingQDateTimeWithUTCOffset_updates"] = 5;
query_count_watermarks_["conv_storingQDateTimeWithUTC_selects"] = 2;
+ query_count_watermarks_["conv_storingQDateTimeWithUTC_selects_min"] = 2;
+ query_count_watermarks_["conv_storingQDateTimeWithUTC_selects_max"] = 3;
query_count_watermarks_["conv_storingQDateTimeWithUTC_updates"] = 5;
query_count_watermarks_["conv_testFileLastAccessed_selects"] = 1;
query_count_watermarks_["conv_testFileLastAccessed_updates"] = 4;
@@ -321,7 +369,11 @@
query_count_watermarks_["stress_testTrackerHeavyLoad_selects"] = 1;
query_count_watermarks_["stress_testTrackerHeavyLoad_updates"] = 7;
query_count_watermarks_["tracker_signalsTests_selects"] = 7;
+ query_count_watermarks_["tracker_signalsTests_selects_min"] = 3;
+ query_count_watermarks_["tracker_signalsTests_selects_max"] = 7;
query_count_watermarks_["tracker_subjectsAdded_selects"] = 1;
+ query_count_watermarks_["tracker_subjectsAdded_selects_min"] = 0;
+ query_count_watermarks_["tracker_subjectsAdded_selects_max"] = 1;
query_count_watermarks_["tracker_subjectsAdded_updates"] = 4;
query_count_watermarks_["tracker_sync_selects"] = 0;
query_count_watermarks_["tracker_sync_updates"] = 2;
@@ -348,14 +400,22 @@
query_count_watermarks_["unbound_messagingSubQuery_selects"] = 1;
query_count_watermarks_["unbound_messagingSubQuery_updates"] = 0;
query_count_watermarks_["unbound_nonColumnOrderBy_selects"] = 1;
+ query_count_watermarks_["unbound_nonColumnOrderBy_selects_min"] = 1;
+ query_count_watermarks_["unbound_nonColumnOrderBy_selects_max"] = 2;
query_count_watermarks_["unbound_nonColumnOrderBy_updates"] = 15;
+ query_count_watermarks_["unbound_nonColumnOrderBy_updates_min"] = 15;
+ query_count_watermarks_["unbound_nonColumnOrderBy_updates_max"] = 16;
query_count_watermarks_["unbound_optionalChildOfLink_selects"] = 0;
query_count_watermarks_["unbound_optionalChildOfLink_updates"] = 0;
query_count_watermarks_["unbound_orderByOuterVariable_selects"] = 1;
+ query_count_watermarks_["unbound_orderByOuterVariable_selects_min"] = 1;
+ query_count_watermarks_["unbound_orderByOuterVariable_selects_max"] = 2;
query_count_watermarks_["unbound_orderByOuterVariable_updates"] = 21;
query_count_watermarks_["unbound_queryContactAndMinProperties_selects"] = 1;
query_count_watermarks_["unbound_queryContactAndMinProperties_updates"] = 0;
query_count_watermarks_["unbound_unionChildren_selects"] = 1;
+ query_count_watermarks_["unbound_unionChildren_selects_min"] = 1;
+ query_count_watermarks_["unbound_unionChildren_selects_max"] = 2;
query_count_watermarks_["unbound_unionChildren_updates"] = 21;
}
--- tests/unit-tests/unit-tests.h
+++ tests/unit-tests/unit-tests.h
@@ -45,9 +45,13 @@
class UnitTests : public QObject
{
-Q_OBJECT
+ Q_OBJECT
+
public:
UnitTests();
+
+ enum QueryType { ObjectBasedQuery, TextualQuery };
+
private:
static const QString global_test_context_str, local_test_context_str;
Live<nie::InformationElement> global_test_context, local_test_context;
@@ -220,8 +224,10 @@
void base_addRowsToModel();
void unbound_queryContactAndMinProperties();
void conv_setAffilTitle();
+ void conv_getBigInt();
void base_aggregateModelVariables();
void base_childModels();
+ void base_setDataTest_data();
void base_setDataTest();
void base_testDummyModel();
void conv_contentLastModified();
@@ -314,5 +320,7 @@
void unbound_literalColumns();
void base_removeResources();
void base_modelExercise();
+ void unbound_filterFalse();
+ void unbound_silentOperations();
};
#endif
--- tools/build/detail/rdfxml2convenience.py
+++ tools/build/detail/rdfxml2convenience.py
@@ -137,19 +137,19 @@
, "xsd:ID": ["QString", "QString"]
, "xsd:IDREF": ["QString", "QString"]
, "xsd:ENTITY": ["QString", "QString"]
- , "xsd:integer": ["int", "int"]
- , "xsd:nonPositiveInteger": ["int", "int"]
- , "xsd:negativeInteger": ["int", "int"]
- , "xsd:long": ["long", "long"]
- , "xsd:int": ["int", "int"]
- , "xsd:short": ["short", "short"]
- , "xsd:byte": ["char", "char"]
- , "xsd:nonNegativeInteger": ["unsigned", "unsigned"]
- , "xsd:unsignedLong": ["unsigned long", "unsigned long"]
- , "xsd:unsignedInt": ["unsigned", "unsigned"]
- , "xsd:unsignedShort": ["unsigned short", "unsigned short"]
- , "xsd:unsignedByte": ["unsigned char", "unsigned char"]
- , "xsd:positiveInteger": ["unsigned", "unsigned"]
+ , "xsd:integer": ["qint64", "qint64"]
+ , "xsd:nonPositiveInteger": ["qint64", "qint64"]
+ , "xsd:negativeInteger": ["qint64", "qint64"]
+ , "xsd:long": ["qint64", "qint64"]
+ , "xsd:int": ["qint32", "qint32"]
+ , "xsd:short": ["qint16", "qint16"]
+ , "xsd:byte": ["qint8", "qint8"]
+ , "xsd:nonNegativeInteger": ["quint64", "quint64"]
+ , "xsd:unsignedLong": ["quint64", "quint64"]
+ , "xsd:unsignedInt": ["quint32", "quint32"]
+ , "xsd:unsignedShort": ["quint16", "quint16"]
+ , "xsd:unsignedByte": ["quint8", "quint8"]
+ , "xsd:positiveInteger": ["quint64", "quint64"]
}
# returns is_resource_type, cpptype, full_cpptype
--- tools/visualizer
+++ tools/visualizer
+(directory)
--- tools/visualizer/visualizer-backward.sh
+++ tools/visualizer/visualizer-backward.sh
+#!/bin/sh
+find -regex ".*\(cpp\|h\)" | xargs perl -0 -pi -n -e 's$\n([\t ]*)VZR_MEMBER_M_T_CV_N_C\(([^,;\n]*?)\,([^;\n]+?)\,([^,;\n]*?)\,(\s*\w+)\,([^,;\n]*)\)(\s*);(\s*)//(\s*)VZRX_MEMBER[^,;\n]*$\n\1\2\3\4\5\7;\8//\9VZR_MEMBER\6$mg'
+find -regex ".*\(cpp\|h\)" | xargs perl -0 -pi -n -e 's$VZRX_CLASS([^;]*;)$/* VZR_CLASS\1*/$mg'
+
--- tools/visualizer/visualizer-forward.sh
+++ tools/visualizer/visualizer-forward.sh
+#!/bin/sh
+find -regex '.*\(cpp\|h\)' | xargs perl -0 -pi -n -e 's$([\t ]*mutable)?([\t ]*\w[^\n;]*?)(([\t ]*?const|[\t ]*?volatile)*)\b([\t ]*\w+)([\t ]*);([\t ]*)//([\t ]*)VZR_MEMBER([^,;\n\r]*)\n$VZR_MEMBER_M_T_CV_N_C(\1,\2,\3,\5,\9)\6;\7//\8VZRX_MEMBER\7\n$mg'
+find -regex '.*\(cpp\|h\)' | xargs perl -0 -pi -n -e 's$\/\*(\s*)VZR_CLASS((.|\n)*?)(\s*)\*\/$\1VZRX_CLASS\2\4$mg'
+
--- tools/visualizer/visualizer.cpp
+++ tools/visualizer/visualizer.cpp
+/*
+ * This file is part of libqttracker project
+ *
+ * Copyright (C) 2009, Nokia
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+/*
+ * visualizer.cpp
+ *
+ * Created on: Oct 18, 2010
+ * Author: iridian
+ */
+
+#include <stdio.h>
+#include <QHeaderView>
+#include "visualizer.h"
+
+using namespace Qt;
+
+namespace SopranoLive
+{
+
+ QString categoryName[] = { "Bases", "Members", "Referers" };
+
+ bool LazyStandardItemModel::hasChildren(const QModelIndex &parent) const
+ {
+ QStandardItem *item = visualizer_->model_.itemFromIndex(parent);
+ return (item && item->type() == S_Leaf)
+ ? true
+ : QStandardItemModel::hasChildren(parent);
+ }
+
+
+ bool LazyStandardItemModel::canFetchMore(QModelIndex const &parent) const
+ {
+ QStandardItem *item = visualizer_->model_.itemFromIndex(parent);
+
+ /*qDebug() << __func__ << parent
+ << item
+ << (item ? item->type() : 0)
+ << (item && item->type() == S_Leaf ? static_cast<LeafTreeItem *>(item)->is_expanded_ : false);
+ */
+
+ return item
+ && item->type() == S_Leaf
+ && !static_cast<LeafTreeItem *>(item)->is_expanded_;
+ }
+ void LazyStandardItemModel::fetchMore(QModelIndex const &parent)
+ {
+ QStandardItemModel *m = &visualizer_->model_;
+ QStandardItem *item = m->itemFromIndex(parent);
+ if(item && item->type() == S_Leaf)
+ {
+ LeafTreeItem *tnd = static_cast<LeafTreeItem *>(item);
+ if(tnd->object_)
+ tnd->cloneChildrenFrom(tnd->object_->node_list_.front());
+ tnd->setExpanded(true);
+ }
+ }
+
+ Rule::Rule(QString key, int condition, QVariant value)
+ : key_(key), condition_(condition), value_(value)
+ {
+
+ }
+
+ int Rule::check(Qualities const &qualities) const
+ {
+ Qualities::const_iterator cq = qualities.find(key_);
+ bool satisfies_operation = false;
+ if(cq != qualities.end())
+ {
+ bool numbers = (cq->type() == QVariant::Double && value_.type() == QVariant::Double);
+
+ if(condition_ & Exists)
+ satisfies_operation = true;
+ else if(condition_ & Equal)
+ satisfies_operation = (cq.value() == value_);
+ else if(condition_ & Less)
+ satisfies_operation = (numbers
+ ? cq->toDouble() < value_.toDouble()
+ : cq->toString() < value_.toString());
+ else if(condition_ & Greater)
+ satisfies_operation = (numbers
+ ? cq->toDouble() > value_.toDouble()
+ : cq->toString() > value_.toString());
+ }
+ if(condition_ & Not)
+ satisfies_operation = !satisfies_operation;
+ if(condition_ & Accept)
+ return satisfies_operation ? Accept : Next;
+ // else condition_ & Require
+ return satisfies_operation ? Next : Reject;
+ }
+ QDebug operator<<(QDebug d, Rule const &r)
+ {
+ d.nospace() << "Rule(" << r.key_;
+ if(r.condition_ & Rule::Require)
+ d.nospace() << "Require ";
+ if(r.condition_ & Rule::Accept)
+ d.nospace() << "Accept ";
+ if(r.condition_ & Rule::Not)
+ d.nospace() << "Not ";
+ if(r.condition_ & Rule::Exists)
+ d.nospace() << "Exists ";
+ if(r.condition_ & Rule::Equal)
+ d.nospace() << "Equal ";
+ if(r.condition_ & Rule::Less)
+ d.nospace() << "Less ";
+ if(r.condition_ & Rule::Greater)
+ d.nospace() << "Greater ";
+ d.nospace() << r.value_ << ")";
+ return d;
+ }
+
+
+ FilterRulesModel::FilterRulesModel()
+ {
+ QString headers[] = { "Key", "Condition", "Value" };
+
+ for(unsigned i = 0; i < sizeof(headers) / sizeof(QString); ++i)
+ setHorizontalHeaderItem(i, new QStandardItem(headers[i]));
+
+ connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int))
+ , SLOT(filterRulesRowsAffected(const QModelIndex &, int, int)));
+ connect(this, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int))
+ , SLOT(filterRulesRowsAffected(const QModelIndex &, int, int)));
+ connect(this, SIGNAL(rowsAboutToBeMoved(const QModelIndex &, int, int, const QModelIndex &, int))
+ , SLOT(filterRulesRowsAffected(const QModelIndex &, int, int)));
+ connect(this, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &))
+ , SLOT(filterRulesDataChanged(const QModelIndex &, const QModelIndex &)));
+
+ connect(this, SIGNAL(modelReset()), SIGNAL(filterRulesInvalidated()));
+ }
+
+ QMap<QString, Rule> primeRulePrototypes()
+ {
+ QMap<QString, Rule> ret;
+ ret["exists"] = Rule("", Rule::Exists);
+ ret["!exists"] = Rule("", Rule::Not | Rule::Exists);
+ ret["=="] = Rule("", Rule::Equal);
+ ret["!="] = Rule("", Rule::Not | Rule::Equal);
+ ret["<"] = Rule("", Rule::Less);
+ ret[">="] = Rule("", Rule::Not | Rule::Less);
+ ret[">"] = Rule("", Rule::Greater);
+ ret["<="] = Rule("", Rule::Not | Rule::Greater);
+ return ret;
+ }
+
+ QMap<QString, Rule> rule_prototypes = primeRulePrototypes();
+
+ QVector<Rule> FilterRulesModel::rules() const
+ {
+ if(rule_cache_.size())
+ return rule_cache_;
+ for(int i = 0, iend = rowCount(); i < iend; ++i)
+ {
+ QStandardItem *rule_name = item(i, 0);
+ if(Qt::CheckState st = rule_name->checkState())
+ {
+ Rule proto = rule_prototypes[item(i, 1)->text()];
+ proto.key_ = rule_name->text();
+ proto.condition_ |= (st == Qt::Checked ? Rule::Require : Rule::Accept);
+ QString v = item(i, 2)->text();
+ bool is_double;
+ double d = v.toDouble(&is_double);
+ proto.value_ = is_double ? QVariant(d) : QVariant(v);
+ rule_cache_.push_back(proto);
+ }
+ }
+ return rule_cache_;
+ }
+
+ void FilterRulesModel::addFilterRow(QString const &key)
+ {
+ QList<QStandardItem *> row_items;
+ row_items << new QStandardItem(key) << new QStandardItem("exists") << new QStandardItem();
+ row_items[0]->setCheckable(true);
+ row_items[0]->setTristate(true);
+ row_items[0]->setCheckState(Qt::Unchecked);
+ appendRow(row_items);
+ }
+
+ void FilterRulesModel::checkKey(QString const &key)
+ {
+ bool &initialized = existing_keys_[key];
+ if(!initialized)
+ {
+ initialized = true;
+ addFilterRow(key);
+ }
+ }
+
+ void FilterRulesModel::filterRulesRowsAffected(const QModelIndex &, int top, int bottom)
+ {
+ while(top <= bottom)
+ if(item(top++, 0)->checkState() != Qt::Unchecked)
+ {
+ QMetaObject::invokeMethod(this, "filterRulesInvalidated", Qt::QueuedConnection);
+ return;
+ }
+ }
+ void FilterRulesModel::filterRulesDataChanged(const QModelIndex &tl, const QModelIndex &br)
+ {
+ if(!tl.column()) // the checked state might have changed
+ QMetaObject::invokeMethod(this, "filterRulesInvalidated", Qt::QueuedConnection);
+ else
+ filterRulesRowsAffected(QModelIndex(), tl.row(), br.row());
+ }
+
+ SortFilterProxyModel::SortFilterProxyModel(Visualizer *visualizer, FilterRulesModel *filter_model)
+ : visualizer_(visualizer), filter_model_(filter_model)
+ {
+ connect(filter_model_, SIGNAL(filterRulesInvalidated()), SLOT(filterInvalidated()));
+ }
+
+ bool SortFilterProxyModel::filterAcceptsRow
+ (int source_row, const QModelIndex &source_parent) const
+ {
+ // always accept non-toplevel items
+ if(source_parent.isValid())
+ return true;
+ Element *object = static_cast<TreeItem *>
+ (visualizer_->model_.item(source_row, 0))->object_;
+
+ //qDebug() << __func__ << source_row << source_parent;
+ QVector<Rule> const rules = filter_model_->rules();
+ //qDebug() << "Checking" << object->qualities_ << "against" << rules;
+ for(int i = 0, iend = rules.size(); i != iend; ++i)
+ if(int ret = rules[i].check(object->qualities_))
+ {
+ //qDebug() << (ret == Rule::Accept ? "\tAccepted" : "\tRejected") << "at rule" << i;
+ return (ret == Rule::Accept);
+ }
+ //qDebug() << "Accepted by default";
+ return true;
+ }
+
+ void SortFilterProxyModel::filterInvalidated()
+ {
+ filter_model_->rule_cache_.clear();
+ invalidateFilter();
+ }
+
+ Visualizer::Visualizer()
+ : model_(this)
+ , filter_model_(), sort_proxy_model_(this, &filter_model_)
+ , stdin_(), stdin_read_()
+ , event_id_(0)
+ , root_element_(this)
+ {
+ stdin_= new QFile();
+ stdin_->open(0,QIODevice::ReadOnly); // 0 = stdin
+
+ stdin_read_ = new QSocketNotifier(0,QSocketNotifier::Read);
+
+ connect(stdin_read_, SIGNAL(activated(int)), SLOT(processInput(int)));
+
+ QString headers[] =
+ { "Name", "Value", "Last Op", "Modified", "Type", "Qualities", "ID", "Created" };
+
+ for(unsigned i = 0; i < sizeof(headers) / sizeof(QString); ++i)
+ model_.setHorizontalHeaderItem(i, new QStandardItem(headers[i]));
+
+ setLayout(root_vertical_ = new QVBoxLayout());
+
+ root_vertical_->addWidget(splitter_ = new QSplitter(this));
+
+ tree_ = new QTreeView();
+ tree_->setSortingEnabled(true);
+ sort_proxy_model_.setSourceModel(&model_);
+ sort_proxy_model_.setDynamicSortFilter(true);
+ tree_->setModel(&sort_proxy_model_);
+ splitter_->addWidget(tree_);
+
+ filters_ = new QTreeView();
+ filters_->setModel(&filter_model_);
+ splitter_->addWidget(filters_);
+
+ setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+ }
+
+ Visualizer::~Visualizer()
+ {
+
+ }
+
+ TreeItem::TreeItem(QString const &item_text, Element *object)
+ : QStandardItem(item_text), object_(object)
+ , self_ref_(object_
+ ? object_->node_list_.insert(object_->node_list_.end(), this)
+ : TreeNodeList::iterator())
+ {
+ // qDebug() << "Created TreeItem(" << this << "):" << item_text;
+ }
+ TreeItem::~TreeItem()
+ {
+ // qDebug() << "Destroyed TreeItem(" << this << "):" << text();
+ if(object_)
+ object_->node_list_.erase(self_ref_);
+ }
+ QStandardItem *TreeItem::clone() const
+ {
+ return new TreeItem(text(), object_);
+ }
+ void TreeItem::destroy()
+ {
+ tndParent()->removeRow(row());
+ }
+ void TreeItem::updateDatas(ItemDataLine const &values)
+ {
+ QStandardItem *p = tndParent();
+ for(int i = 0, iend = values.size(); i < iend; ++i)
+ if(values[i].size())
+ {
+ if(QStandardItem *child = p->child(row(), i))
+ for(QMap<int, QVariant>::const_iterator cvi = values[i].constBegin()
+ , cviend = values[i].constEnd(); cvi != cviend; ++cvi)
+ child->setData(cvi.value(), cvi.key());
+ else
+ qWarning() << __func__ << ": invalid child for" << p->index() << "at (" << row() << ", " << i << ")";
+ }
+ }
+ void TreeItem::cloneChildrenFrom(QStandardItem *source)
+ {
+ // qDebug() << __func__ << source->index() << "to" << index();
+ for(int row = 0, rowend = source->rowCount(); row < rowend; ++row)
+ {
+ QList<QStandardItem *> row_items;
+ for(int col = 0, colend = source->columnCount(); col < colend; ++col)
+ row_items << source->child(row, col)->clone();
+ appendRow(row_items);
+ object_->visualizer_->model_.setItemData
+ ( child(row, 0)->index()
+ , object_->visualizer_->model_.itemData(source->child(row, 0)->index()));
+ if(row_items[0]->type() > S_Leaf) // do not clone the tree past leaf nodes
+ static_cast<TreeItem *>(row_items[0])->cloneChildrenFrom(source->child(row, 0));
+ }
+ }
+ QStandardItem *TreeItem::tndParent() const
+ {
+ QStandardItem *ret = parent();
+ if(!ret)
+ ret = object_->visualizer_->model_.invisibleRootItem();
+ return ret;
+ }
+
+ int TreeItem::type() const { return object_->state_ & ObjectTypeMask; }
+
+
+ LeafTreeItem::LeafTreeItem(QString const &item_text, Element *object)
+ : TreeItem(item_text, object), is_expanded_(false)
+ {}
+
+ QStandardItem *LeafTreeItem::clone() const
+ {
+ return new LeafTreeItem(text(), object_);
+ }
+
+ void LeafTreeItem::retarget(Element *object)
+ {
+ if(object_ == object)
+ return;
+ bool was_expanded = is_expanded_;
+ //qDebug() << __func__ << tndParent()->text() << (object ? object->name_ : "0x0");
+ QStandardItemModel *m = 0;
+ if(object_)
+ {
+ m = &object_->visualizer_->model_;
+ removeRows(0, rowCount());
+ setExpanded(false);
+
+ object_->node_list_.erase(self_ref_);
+ }
+ object_ = object;
+ if(object_)
+ {
+ m = &object_->visualizer_->model_;
+ self_ref_ = object_->node_list_.insert(object_->node_list_.end(), this);
+
+ QModelIndex clone_index = object_->node_list_.first()->index();
+
+ for(int i = 0; i < HeaderCount; ++i)
+ m->setItemData
+ ( index().sibling(row(), i)
+ , m->itemData(clone_index.sibling(clone_index.row(), i)));
+
+ if(was_expanded)
+ {
+ m->fetchMore(index());
+ setExpanded(true);
+ }
+ } else
+ {
+ QMap<int, QVariant> red_zero;
+ red_zero[Qt::DisplayRole] = QVariant("invalid");
+ red_zero[Qt::ForegroundRole] = Qt::red;
+
+ m->setItemData(index().sibling(row(), 0), red_zero);
+ for(int i = 1; i < HeaderCount; ++i)
+ m->setItemData(index().sibling(row(), i), QMap<int, QVariant>());
+
+ setExpanded(false);
+ }
+ }
+
+ void LeafTreeItem::setExpanded(bool expanded)
+ {
+ if(is_expanded_ && !expanded)
+ is_expanded_ = false;
+ else if(!is_expanded_ && expanded)
+ is_expanded_ = true;
+ }
+
+ Element::Element(Visualizer *visualizer, int state)
+ : parent_(0), visualizer_(visualizer), state_(state)
+ , children_()
+ , is_reference_(false)
+ {
+ node_list_.push_back(static_cast<TreeItem *>
+ (visualizer_->model_.invisibleRootItem()));
+ }
+
+ Element::Element(Element *parent, int state)
+ : parent_(parent), visualizer_(parent->visualizer_), state_(state)
+ , children_()
+ , is_reference_(false)
+ {}
+
+ Element::~Element() { while(node_list_.size()) node_list_.back()->destroy(); }
+
+ void Element::addNodeDatas(ItemDataLine const &values)
+ {
+ //qDebug() << __func__ << values;
+ for(TreeNodeList::iterator tni = parent_->node_list_.begin()
+ , tniend = parent_->node_list_.end(); tni != tniend; ++tni)
+ if((*tni)->type() != S_Leaf || static_cast<LeafTreeItem *>(*tni)->is_expanded_)
+ {
+ //qDebug() << __func__ << *tni;
+ QList<QStandardItem *> row_items;
+ // TreeItem constructor adds itself to this->node_list_ and
+ // stores a backreference iterator to it as well
+
+ for(int i = 0; i < HeaderCount; ++i) // skips H_Name
+ {
+ row_items << (!i
+ ? new TreeItem(values[H_Name][Qt::DisplayRole].toString(), this)
+ : new QStandardItem());
+
+ for(QMap<int, QVariant>::const_iterator cvi = values[i].constBegin()
+ , cviend = values[i].constEnd(); cvi != cviend; ++cvi)
+ row_items.back()->setData(cvi.value(), cvi.key());
+ }
+ (*tni)->appendRow(row_items);
+ }
+ }
+
+ void Element::updateNodeDatas(ItemDataLine const &values)
+ {
+ for(TreeNodeList::iterator tni = node_list_.begin()
+ , tniend = node_list_.end(); tni != tniend; ++tni)
+ (*tni)->updateDatas(values);
+ }
+ void Element::removeNodeDatas()
+ {
+ for(TreeNodeList::iterator tni = node_list_.begin()
+ , tniend = node_list_.end(); tni != tniend; )
+ (*tni++)->destroy(); // the iterator gets invalidated here
+ }
+
+ void Element::createLeafChild(int child, Element *new_element)
+ {
+ //qDebug() << __func__ << child << (new_element ? new_element->value_ : "") << (new_element ? new_element->name_ : "");
+ for(TreeNodeList::iterator tni = node_list_.begin()
+ , tniend = node_list_.end(); tni != tniend; ++tni)
+ {
+ QList<QStandardItem *> row_items;
+ LeafTreeItem *lti = new LeafTreeItem("", 0);
+ row_items << lti;
+ for(int i = HeaderCount; --i; ) // skips H_Name
+ row_items << new QStandardItem();
+ //qDebug() << "Inserting row" << child << "under" << (*tni)->index() ;
+ (*tni)->insertRow(child, row_items);
+ lti->retarget(new_element);
+ }
+ }
+ void Element::retargetLeafChild(int child, Element *new_element)
+ {
+ for(TreeNodeList::iterator tni = node_list_.begin()
+ , tniend = node_list_.end(); tni != tniend; ++tni)
+ if(QStandardItem *item = (*tni)->child(child, 0))
+ if(item->type() == S_Leaf)
+ static_cast<LeafTreeItem *>(item)->retarget(new_element);
+ }
+ void Element::removeLeafChild(int child)
+ {
+ for(TreeNodeList::iterator tni = node_list_.begin()
+ , tniend = node_list_.end(); tni != tniend; ++tni)
+ (*tni)->removeRow(child);
+ }
+
+ Qualities Element::updateQualities
+ (Qualities const &q, ItemDataLine *update_data_line)
+ {
+ Qualities changed;
+ for(Qualities::const_iterator cqi = q.begin(), cqiend = q.end()
+ ; cqi != cqiend; ++cqi)
+ {
+ Qualities::iterator tqi = qualities_.find(cqi.key());
+ if(tqi == qualities_.end())
+ qualities_.insert(cqi.key(), cqi.value());
+ else if(*tqi != *cqi)
+ *tqi = *cqi;
+ else
+ continue;
+ changed.insert(cqi.key(), cqi.value());
+ }
+ if(changed.size())
+ {
+ qualities_text_.clear();
+ for(Qualities::const_iterator cqi = qualities_.begin()
+ , cqiend = qualities_.end(); cqi != cqiend; ++cqi)
+ ((((qualities_text_ += '&') += cqi.key()) += '=') += cqi->toString());
+ (*update_data_line)[H_Qualities][Qt::DisplayRole] = QVariant(qualities_text_);
+ }
+ return changed;
+ }
+
+ bool Element::updateName(QString raw_name, ItemDataLine *update_data_line)
+ {
+ name_ = raw_name;
+ (*update_data_line)[H_Name][Qt::DisplayRole] = name_;
+ return true;
+ }
+
+ bool Element::updateValue(QString raw_value, ItemDataLine *update_data_line)
+ {
+ bool changed = false;
+
+ QString new_value;
+ if(raw_value.mid(0, 2) == "* ")
+ {
+ if(!is_reference_)
+ changed = true;
+ is_reference_ = true;
+ new_value = raw_value.mid(2);
+ } else
+ {
+ if(is_reference_)
+ changed = true;
+ is_reference_ = false;
+ new_value = raw_value;
+ }
+ if(value_ != new_value)
+ {
+ changed = true;
+ value_ = new_value;
+
+ (*update_data_line)[H_Value][Qt::DisplayRole] = QVariant(value_);
+ }
+ return changed;
+ }
+
+ void Element::updateModified(int id, ItemDataLine *update_data_line)
+ {
+ QVariant modified_id(id);
+ for(TreeNodeList::iterator tni = node_list_.begin()
+ , tniend = node_list_.end(); tni != tniend; ++tni)
+ {
+ for(QStandardItem *p = visualizer_->tndParent(*tni)
+ , *pend = visualizer_->model_.invisibleRootItem(); p != pend; )
+ {
+ int row = p->row();
+ p = visualizer_->tndParent(p);
+ p->child(row, H_Modified)->setData(modified_id, Qt::DisplayRole);
+ }
+ }
+ (*update_data_line)[H_Modified][Qt::DisplayRole] = modified_id;
+ }
+
+ ReverseRefIndices::iterator Element::addReferer(Element *object)
+ {
+ int referer_location = reverse_refs_.size();
+ //qDebug() << __func__ << object->value_ << referer_location;
+ createLeafChild(referer_location, object);
+ return reverse_refs_.insert(reverse_refs_.end(), referer_location);
+ }
+
+ void Element::removeReferer(ReverseRefIndices::iterator ref)
+ {
+ removeLeafChild(*ref);
+ //qDebug() << __func__ << *ref << reverse_refs_.size();
+ //for(ReverseRefIndices::iterator i = reverse_refs_.begin(); i != reverse_refs_.end(); ++i)
+ // qDebug() << *i;
+ ref = reverse_refs_.erase(ref);
+ for( ; ref != reverse_refs_.end(); ++ref)
+ --*ref;
+ }
+
+
+ bool Association::updateValue(QString raw_value, ItemDataLine *update_data_line)
+ {
+ if(!Element::updateValue(raw_value, update_data_line))
+ return false;
+
+ ElementChildren::iterator obji = visualizer_->root_element_.children_.find(value_);
+ bool referee_exists = (obji != visualizer_->root_element_.children_.end());
+
+ // qDebug() << __func__ << raw_value << referee_exists;
+
+ Qualities::const_iterator relationi = qualities_.find("Relation");
+ if(relationi != qualities_.end())
+ {
+ Qualities carry_over;
+ if(relationi.value() == "Owns")
+ carry_over["Lifetime"] = "Owned";
+ else if(relationi.value() == "Shares")
+ carry_over["Lifetime"] = "Shared";
+ if(referee_exists)
+ {
+ ItemDataLine carryover_update_data_line_(HeaderCount);
+ (*obji)->updateQualities(carry_over, &carryover_update_data_line_);
+ (*obji)->updateNodeDatas(carryover_update_data_line_);
+ }
+ }
+
+ if(has_reference_leaf_ && !is_reference_)
+ {
+ removeLeafChild(0);
+ has_reference_leaf_ = false;
+ }
+ else if(has_reference_leaf_ && is_reference_)
+ retargetLeafChild(0, referee_exists ? obji->data() : 0);
+ else if(!has_reference_leaf_ && is_reference_)
+ {
+ createLeafChild(0, referee_exists ? obji->data() : 0);
+ has_reference_leaf_ = true;
+ }
+
+ // remove old referer entry
+ if(referee_)
+ {
+ referee_->removeReferer(referee_self_iter_);
+ referee_ = 0;
+ }
+
+ if(referee_exists)
+ {
+ referee_ = (*obji)->child<Referer>("<-" + name_.mid(2, name_.size() - 2))->data();
+ referee_self_iter_ = referee_->addReferer(parent_);
+ }
+ return true;
+ }
+
+ Qualities Association::updateQualities
+ ( Qualities const &q, ItemDataLine *update_data_line)
+ {
+ Qualities changed = Element::updateQualities(q, update_data_line);
+ Qualities carry_over;
+ Qualities::const_iterator relationi = changed.find("Relation");
+ if(relationi != changed.end())
+ {
+ if(relationi.value() == "Owns")
+ carry_over["Lifetime"] = "Owned";
+ else if(relationi.value() == "Shares")
+ carry_over["Lifetime"] = "Shared";
+ }
+
+ if(carry_over.size())
+ {
+ // we should diagnose ownership type changes here.
+ ElementChildren::iterator obji = visualizer_->root_element_.children_.find(value_);
+ if(obji != visualizer_->root_element_.children_.end())
+ {
+ ItemDataLine carry_over_node_vec(HeaderCount);
+ (*obji)->updateQualities(carry_over, &carry_over_node_vec);
+ (*obji)->updateNodeDatas(carry_over_node_vec);
+ }
+ }
+ return changed;
+ }
+
+ Qualities Visualizer::parseQualities(QString raw_qualities)
+ {
+ Qualities ret;
+ QStringList qualities = raw_qualities.split('&');
+ for(QStringList::const_iterator cqi = qualities.constBegin()
+ , cqiend = qualities.constEnd(); cqi != cqiend; ++cqi)
+ if(cqi->size())
+ {
+ QStringList key_and_value = cqi->split("=");
+ QString key = key_and_value.takeFirst();
+ filter_model_.checkKey(key);
+ QVariant &value = ret[key];
+ QString str = key_and_value.join("=");
+ bool is_double = false;
+ double d = str.toDouble(&is_double);
+ value = is_double ? QVariant(d) : QVariant(str);
+ }
+ return ret;
+ }
+
+
+ void Visualizer::processLifetimeLine(QStringList const &array)
+ {
+ ElementChildren::iterator obji = root_element_.children_.find(array[Raw_ID]);
+ if(array[Raw_Last_Op][0] == 'C')
+ {
+ ItemDataLine node_datas(HeaderCount);
+
+ if(obji == root_element_.children_.end())
+ obji = root_element_.child<Object>(array[Raw_ID]);
+ else
+ {
+ if(!((*obji)->state_ & S_Deleted))
+ qWarning() << "Visualizer: Object ID conflict, reconstructing" << array[Raw_ID];
+ (*obji)->children_.clear();
+ obji = root_element_.child<Object>(array[Raw_ID]);
+ for(int i = HeaderCount; i--; )
+ node_datas[i][Qt::ForegroundRole] = Qt::black;
+ }
+
+ node_datas[H_Last_Op][Qt::DisplayRole] = QVariant(array[Raw_Last_Op]);
+ node_datas[H_ID][Qt::DisplayRole] = QVariant(array[Raw_ID]);
+ node_datas[H_Type][Qt::DisplayRole] = QVariant(array[Raw_Type]);
+ node_datas[H_Created][Qt::DisplayRole] = QVariant(event_id_);
+ node_datas[H_Modified][Qt::DisplayRole] = QVariant(event_id_);
+
+ (*obji)->updateName(array[Raw_Name].size() ? array[Raw_Name] : array[Raw_ID], &node_datas);
+ (*obji)->updateValue(array[Raw_Value], &node_datas);
+ (*obji)->updateQualities(parseQualities(array[Raw_Qualities]), &node_datas);
+ (*obji)->updateNodeDatas(node_datas);
+
+ } else if(array[Raw_Last_Op] == "D")
+ {
+ if(obji == root_element_.children_.end())
+ qWarning() << "Visualizer: double deletion of" << array[Raw_ID];
+ else
+ {
+ (*obji)->state_ |= S_Deleted;
+ for(TreeNodeList::iterator tni = (*obji)->node_list_.begin()
+ , tniend = (*obji)->node_list_.end(); tni != tniend; ++tni)
+ {
+ QStandardItem *p = (*tni)->tndParent();
+ p->child((*tni)->row(), H_Last_Op)->setText(array[Raw_Last_Op]);
+ for(int i = HeaderCount; i--; )
+ p->child((*tni)->row(), i)
+ ->setData(Qt::red, Qt::ForegroundRole);
+ }
+ }
+ }
+ }
+
+ void Visualizer::processAssociationLine(QStringList const &array)
+ {
+ ElementChildren::iterator obji = root_element_.children_.find(array[Raw_ID]);
+
+ if(obji == root_element_.children_.end())
+ {
+ qWarning() << "Visualizer: While accessing member" << array[Raw_Name] << " "
+ "undefined object" << array[Raw_ID];
+ return;
+ }
+
+ QString association_id = "->" + array[Raw_Name];
+
+ ItemDataLine node_datas(HeaderCount);
+
+ ElementChildren::iterator assi = (*obji)->children_.find(association_id);
+ if(array[Raw_Last_Op][1] == 'C')
+ {
+ if(assi == (*obji)->children_.end())
+ assi = (*obji)->child<Association>(association_id);
+ else qWarning() << "Visualizer: While creating association" << association_id << " "
+ "on " << array[Raw_ID] << ": association already exists, duplicating";
+
+ node_datas[H_Last_Op][Qt::DisplayRole] = QVariant(array[Raw_Last_Op]);
+ node_datas[H_ID][Qt::DisplayRole] = QVariant(array[Raw_ID]);
+ node_datas[H_Type][Qt::DisplayRole] = QVariant(array[Raw_Type]);
+ node_datas[H_Created][Qt::DisplayRole] = QVariant(event_id_);
+
+ (*assi)->updateName(association_id, &node_datas);
+ (*assi)->updateValue(array[Raw_Value], &node_datas);
+ (*assi)->updateQualities(parseQualities(array[Raw_Qualities]), &node_datas);
+ } else
+ {
+ if(assi == (*obji)->children_.end())
+ {
+ qWarning() << "Visualizer: While deleting or updating association"
+ << association_id << " on " << array[Raw_ID] << ": association doesn't exist";
+ }
+ else if(array[Raw_Last_Op][1] == 'D') // delete member association
+ {
+ for(TreeNodeList::iterator tni = (*assi)->node_list_.begin()
+ , tniend = (*assi)->node_list_.end(); tni != tniend; ++tni)
+ {
+ QStandardItem *p = (*tni)->parent();
+ p->child((*tni)->row(), H_Last_Op)->setText(array[Raw_Last_Op]);
+ for(int i = HeaderCount; i--; )
+ p->child((*tni)->row(), i)->setData(Qt::red, Qt::ForegroundRole);
+ }
+ } else // update member association data
+ {
+ node_datas[H_Last_Op][Qt::DisplayRole] = QVariant(array[Raw_Last_Op]);
+ node_datas[H_Type][Qt::DisplayRole] = QVariant(array[Raw_Type]);
+
+ (*assi)->updateValue(array[Raw_Value], &node_datas);
+ (*assi)->updateQualities(parseQualities(array[Raw_Qualities]), &node_datas);
+ }
+ }
+ if(assi != (*obji)->children_.end())
+ {
+ (*assi)->updateModified(event_id_, &node_datas);
+ (*assi)->updateNodeDatas(node_datas);
+ }
+ }
+
+ void Visualizer::processInput(int)
+ {
+ stdin_read_->setEnabled(false);
+ do
+ {
+ QStringList lines;
+
+ QString line = stdin_->readLine();
+ if(line.size() < 3 || line.mid(0,3) != "VZR")
+ continue;
+ lines << line;
+ while((line = stdin_->readLine()) != "VZREND\n")
+ lines << line;
+
+ QStringList chunks = lines.takeFirst().split('\n')[0].split('\t');
+
+ int s = chunks.size();
+
+ if(s != 7)
+ {
+ qWarning() << "Invalid sized(" << s << ") != 7 row: " << chunks;
+ while(s++ < 7)
+ chunks << QString();
+ }
+
+ while(lines.size())
+ (chunks[6] += "\n") += lines.takeFirst().split('\n')[0];
+
+ // qDebug() << "Processing input:" << chunks;
+
+ if(chunks[1][0] == 'M' || chunks[1][0] == 'B')
+ processAssociationLine(chunks);
+ else
+ processLifetimeLine(chunks);
+
+ event_id_++;
+ } while(stdin_->bytesAvailable());
+ stdin_read_->setEnabled(true);
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ QApplication app(argc, argv);
+ return SopranoLive::Visualizer().show()
+ , app.exec();
+}
--- tools/visualizer/visualizer.h
+++ tools/visualizer/visualizer.h
+/*
+ * This file is part of libqttracker project
+ *
+ * Copyright (C) 2009, Nokia
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+/*
+ * visualizer.h
+ *
+ * Created on: Oct 18, 2010
+ * Author: iridian
+ */
+
+#ifndef SOPRANOLIVE_VISUALIZER_H_
+#define SOPRANOLIVE_VISUALIZER_H_
+
+#include <QDebug>
+#include <QLinkedList>
+#include <QApplication>
+#include <QSocketNotifier>
+#include <QFile>
+#include <QTextStream>
+#include <QTableView>
+#include <QTreeView>
+#include <QStandardItemModel>
+#include <QSortFilterProxyModel>
+#include <QSplitter>
+#include <QVBoxLayout>
+#include <QtGui>
+
+namespace SopranoLive
+{
+ typedef QMap<QString, QVariant> Qualities;
+
+ enum Categories { Referers, MostDerived, CategoryCount };
+ extern QString categoryName[];
+
+ enum { Raw_Prefix, Raw_Last_Op, Raw_ID, Raw_Type, Raw_Name, Raw_Qualities, Raw_Value };
+ enum { H_Name, H_Value, H_Last_Op, H_Modified, H_Type, H_Qualities, H_ID, H_Created, HeaderCount };
+
+ enum { TreeItemRole = Qt::UserRole + 2 };
+
+ enum ObjectState
+ { S_Leaf = 1024
+ , S_Root
+ , S_TypedObject
+ , S_UntypedObject
+ , S_Association
+ , S_TopmostOwner, S_Owner, S_Sharer, S_Referer
+ , S_Deleted = 1 << 8
+ , ObjectTypeMask = 1024 | 0xf
+ };
+
+ class Visualizer;
+
+ class LazyStandardItemModel
+ : public QStandardItemModel
+ {
+ public:
+ Visualizer *visualizer_;
+ LazyStandardItemModel(Visualizer *visualizer)
+ : visualizer_(visualizer) {}
+
+ //! overridden to implement lazy expansion of cyclic branches
+ bool hasChildren(const QModelIndex &parent) const;
+ bool canFetchMore(QModelIndex const &parent) const;
+ void fetchMore(QModelIndex const &parent);
+ };
+
+ struct Rule
+ {
+ enum
+ { Reject = -1, Next = 0, Accept = 1, Require = 2
+ , Not = 4
+ , Exists = 8, Equal = 16, Less = 32, Greater = 64
+ };
+
+ QString key_;
+ int condition_;
+ QVariant value_;
+ Rule(QString key = QString(), int condition = Next, QVariant value = QVariant());
+
+ int check(Qualities const &qualities) const;
+ };
+ QDebug operator<<(QDebug d, Rule const &t);
+
+ class FilterRulesModel
+ : public QStandardItemModel
+ {
+ Q_OBJECT
+
+ public:
+ FilterRulesModel();
+
+ mutable QMap<QString, bool> existing_keys_;
+ mutable QVector<Rule> rule_cache_;
+ void checkKey(QString const &key);
+ QVector<Rule> rules() const;
+
+ void addFilterRow(QString const &key);
+
+ public Q_SLOTS:
+ void filterRulesRowsAffected(const QModelIndex &, int, int);
+ void filterRulesDataChanged(const QModelIndex &, const QModelIndex &);
+
+ Q_SIGNALS:
+ void filterRulesInvalidated();
+ };
+
+ class SortFilterProxyModel
+ : public QSortFilterProxyModel
+ {
+ Q_OBJECT
+
+ public:
+ Visualizer *visualizer_;
+ SortFilterProxyModel(Visualizer *visualizer, FilterRulesModel *filter_model);
+
+ FilterRulesModel *filter_model_;
+
+ bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
+
+ public Q_SLOTS:
+ void filterInvalidated();
+ };
+
+ struct Element;
+ struct TreeItem;
+
+ typedef QLinkedList<TreeItem *> TreeNodeList;
+
+ typedef QSharedPointer<Element> ElementPtr;
+ typedef QMap<QString, ElementPtr> ElementChildren;
+ typedef QLinkedList<int> ReverseRefIndices;
+
+ typedef QVector<QMap<int, QVariant> > ItemDataLine;
+
+ struct TreeItem
+ : QStandardItem
+ {
+ TreeItem(QString const &item_text, Element *object);
+ ~TreeItem();
+ void destroy();
+
+ void updateDatas(ItemDataLine const &values);
+ void cloneChildrenFrom(QStandardItem *source);
+
+ QStandardItem *clone() const;
+
+ QStandardItem *tndParent() const;
+
+ int type() const;
+
+ Element *object_;
+ TreeNodeList::iterator self_ref_;
+ };
+
+ struct LeafTreeItem
+ : TreeItem
+ {
+ LeafTreeItem(QString const &item_text, Element *object);
+
+ QStandardItem *clone() const;
+
+ int type() const { return S_Leaf; }
+
+ void retarget(Element *object);
+ void setExpanded(bool expanded);
+
+ bool is_expanded_;
+ };
+
+ struct Element
+ {
+ protected:
+ // root constructor
+ Element(Visualizer *visualizer, int state);
+ Element(Element *parent, int state);
+ public:
+ ~Element();
+
+ Element *parent_;
+ Visualizer *visualizer_;
+ int state_;
+ TreeNodeList node_list_;
+ ElementChildren children_;
+
+ void addNodeDatas(ItemDataLine const &values);
+ void updateNodeDatas(ItemDataLine const &values);
+ void removeNodeDatas();
+
+ void createLeafChild(int child, Element *new_element);
+ void retargetLeafChild(int child, Element *new_element);
+ void removeLeafChild(int child);
+
+ virtual bool updateName(QString raw_name, ItemDataLine *update_data_line);
+ virtual bool updateValue(QString raw_value, ItemDataLine *update_data_line);
+ virtual Qualities updateQualities
+ (Qualities const &q, ItemDataLine *update_data_line);
+ virtual void updateModified(int event, ItemDataLine *update_data_line);
+
+ template<class T>
+ ElementChildren::iterator child(QString name = QString())
+ {
+ if(!name.size())
+ name = T::name();
+ ElementChildren::iterator childi = children_.find(name);
+ if(childi == children_.end())
+ {
+ childi = children_.insert(name, ElementPtr());
+
+ T::template addAsChild<T>(childi, name, this);
+ ItemDataLine item_datas(HeaderCount);
+ item_datas[H_Name][Qt::DisplayRole] = name;
+ (*childi)->addNodeDatas(item_datas);
+ }
+ return childi;
+ }
+
+ template<class T_>
+ static void addAsChild(ElementChildren::iterator childi, QString name, Element *obj)
+ {
+ Q_UNUSED(name);
+ QSharedPointer<T_> t = QSharedPointer<T_>(new T_(obj));
+ *childi = t;
+ }
+
+ QString name_, value_;
+ QString qualities_text_;
+ bool is_reference_;
+ Qualities qualities_;
+
+ ReverseRefIndices reverse_refs_;
+
+ ReverseRefIndices::iterator addReferer(Element *object);
+ void removeReferer(ReverseRefIndices::iterator ref);
+
+ };
+
+ struct RootElement : Element
+ {
+ RootElement(Visualizer *visualizer)
+ : Element(visualizer, S_Root)
+ {
+ visualizer_ = visualizer;
+ }
+ };
+
+ template<class MostDerived_>
+ struct Child : Element
+ {
+ Child(Element *parent, int state = S_UntypedObject)
+ : Element(parent, state)
+ {}
+ };
+
+ struct Object
+ : Child<Object>
+ {
+ Object(Element *parent)
+ : Child<Object>(parent, S_TypedObject) {}
+ static QString name() { return ""; }
+ };
+
+ struct Association
+ : Child<Association>
+ {
+ Association(Element *parent)
+ : Child<Association>(parent, S_Association)
+ , has_reference_leaf_(false), referee_(0), referee_self_iter_() {}
+ static QString name() { return ""; }
+ bool updateValue(QString raw_value, ItemDataLine *update_data_line);
+ Qualities updateQualities(Qualities const &q, ItemDataLine *update_data_line);
+ bool has_reference_leaf_;
+ Element *referee_;
+ ReverseRefIndices::iterator referee_self_iter_;
+ };
+
+ struct TopmostOwner
+ : Child<TopmostOwner>
+ {
+ TopmostOwner(Element *parent)
+ : Child<TopmostOwner>(parent, S_TopmostOwner) {}
+ static QString name() { return "TopmostOwner"; };
+ };
+
+ struct Owner
+ : Child<Owner>
+ {
+ Owner(Element *parent)
+ : Child<Owner>(parent, S_Owner) {}
+ static QString name() { return "Owner"; };
+ };
+
+ struct Sharer
+ : Child<Sharer>
+ {
+ Sharer(Element *parent)
+ : Child<Sharer>(parent, S_Sharer) {}
+ static QString name() { return "Sharers"; };
+ };
+
+ struct Referer
+ : Child<Referer>
+ {
+ Referer(Element *parent)
+ : Child<Referer>(parent, S_Referer) {}
+ static QString name() { return "Referers"; };
+ };
+
+ class Visualizer
+ : public QWidget
+ {
+ Q_OBJECT
+
+ public:
+ Visualizer();
+ ~Visualizer();
+
+ public Q_SLOTS:
+ void processInput(int socket);
+
+ public:
+
+ QVBoxLayout *root_vertical_;
+ QSplitter *splitter_;
+ QTreeView *tree_;
+ QTreeView *filters_;
+
+ LazyStandardItemModel model_;
+
+ FilterRulesModel filter_model_;
+ SortFilterProxyModel sort_proxy_model_;
+
+ QStandardItem *tndParent(QStandardItem *item) const
+ {
+ QStandardItem *ret = item->parent();
+ if(!ret)
+ ret = model_.invisibleRootItem();
+ return ret;
+ }
+
+ public:
+
+ QFile *stdin_;
+ QSocketNotifier *stdin_read_;
+
+ int event_id_;
+
+ RootElement root_element_;
+
+ Qualities parseQualities(QString raw_qualities);
+ void processLifetimeLine(QStringList const &array);
+ void processAssociationLine(QStringList const &array);
+ };
+}
+Q_DECLARE_METATYPE(QSharedPointer<SopranoLive::TreeItem>);
+
+#endif /* SOPRANOLIVE_VISUALIZER_H_ */
--- tools/visualizer/visualizer.pro
+++ tools/visualizer/visualizer.pro
+include(../../shared.pri)
+
+TEMPLATE = app
+TARGET = visualizer
+QT += gui
+CONFIG += debug
+
+HEADERS = visualizer.h
+SOURCES = visualizer.cpp
+
+target.path = $$PREFIX/bin
+INSTALLS = target
--- tools/visualizer/writer.sh
+++ tools/visualizer/writer.sh
+#!/bin/sh
+tee visualizer.out > /dev/null
++++++ libqttracker.yaml
--- libqttracker.yaml
+++ libqttracker.yaml
@@ -1,6 +1,6 @@
Name: libqttracker
Summary: Qt bindings for the Tracker media indexing infrastructure
-Version: 6.12.1
+Version: 6.12.4
Release: 1
Group: System/Libraries
License: LGPLv2
More information about the MeeGo-commits
mailing list