← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libusermetrics/trusty-proposed

~ubuntu-branches/ubuntu/trusty/libusermetrics/trusty-proposed

« back to all changes in this revision

Viewing changes to src/libusermetricsoutput/UserData.cpp

Committer: Package Import Robot
Author(s): Ubuntu daily release, Pete Woods, Ubuntu daily release
Date: 2013-07-02 02:02:52 UTC
mfrom: (1.1.2)
Revision ID: package-import@ubuntu.com-20130702020252-53yuhnlabsq1cq8x

Tags: 1.0.1+13.10.20130702-0ubuntu1

[ Pete Woods ]
* Implement most of storage service and wire up input API.
* Wire up the output API to the storage service.

[ Ubuntu daily release ]
* Automatic snapshot from revision 80

files added:
data

data/CMakeLists.txt

data/com.canonical.UserMetrics.conf

data/com.canonical.UserMetrics.service.in

data/com.canonical.UserMetrics.xml

data/com.canonical.usermetrics.DataSet.xml

data/com.canonical.usermetrics.DataSource.xml

data/com.canonical.usermetrics.UserData.xml

debian/libusermetrics-tools.install

debian/usermetricsservice.install

debian/usermetricsservice.postinst

debian/usermetricsservice.postrm

debian/usermetricsservice.prerm

src/libusermetricscommon

src/libusermetricscommon/CMakeLists.txt

src/libusermetricscommon/DBusPaths.cpp

src/libusermetricscommon/DBusPaths.h

src/libusermetricscommon/DateFactory.cpp

src/libusermetricscommon/DateFactory.h

src/libusermetricscommon/DateFactoryImpl.cpp

src/libusermetricscommon/DateFactoryImpl.h

src/libusermetricsinput/main.cpp

src/libusermetricsoutput/DataSource.cpp

src/libusermetricsoutput/DataSource.h

src/libusermetricsoutput/SyncedDataSet.cpp

src/libusermetricsoutput/SyncedDataSet.h

src/libusermetricsoutput/SyncedDataSource.cpp

src/libusermetricsoutput/SyncedDataSource.h

src/libusermetricsoutput/SyncedUserData.cpp

src/libusermetricsoutput/SyncedUserData.h

src/libusermetricsoutput/SyncedUserMetricsStore.cpp

src/libusermetricsoutput/SyncedUserMetricsStore.h

src/libusermetricsoutput/UserMetricsStore.cpp

src/libusermetricsoutput/UserMetricsStore.h

src/usermetricsservice

src/usermetricsservice/CMakeLists.txt

src/usermetricsservice/DBusDataSet.cpp

src/usermetricsservice/DBusDataSet.h

src/usermetricsservice/DBusDataSource.cpp

src/usermetricsservice/DBusDataSource.h

src/usermetricsservice/DBusUserData.cpp

src/usermetricsservice/DBusUserData.h

src/usermetricsservice/DBusUserMetrics.cpp

src/usermetricsservice/DBusUserMetrics.h

src/usermetricsservice/database

src/usermetricsservice/database/DataSet.cpp

src/usermetricsservice/database/DataSet.h

src/usermetricsservice/database/DataSource.cpp

src/usermetricsservice/database/DataSource.h

src/usermetricsservice/database/UserData.cpp

src/usermetricsservice/database/UserData.h

src/usermetricsservice/main.cpp

tests/data

tests/data/session.conf

tests/data/system.conf

tests/data/valgrind.suppression

tests/testutils/DBusTest.cpp

tests/testutils/DBusTest.h

tests/testutils/QVariantListPrinter.cpp

tests/testutils/QVariantListPrinter.h

tests/unit/libusermetricsoutput/TestSyncedUserMetricsStore.cpp

tests/unit/usermetricsservice

tests/unit/usermetricsservice/CMakeLists.txt

tests/unit/usermetricsservice/TestUserMetricsService.cpp

files removed:
src/libusermetricsoutput/DateFactory.cpp

src/libusermetricsoutput/DateFactory.h

src/libusermetricsoutput/DateFactoryImpl.cpp

src/libusermetricsoutput/DateFactoryImpl.h

src/libusermetricsoutput/UserDataStore.cpp

src/libusermetricsoutput/UserDataStore.h

tests/unit/libusermetricsinput/TestMetricImpl.cpp

tests/unit/libusermetricsinput/TestMetricUpdateImpl.cpp

files modified:
CMakeLists.txt

build.sh

cmake/FindValgrind.cmake

debian/changelog

debian/control

src/CMakeLists.txt

src/libusermetricsinput/CMakeLists.txt

src/libusermetricsinput/MetricImpl.cpp

src/libusermetricsinput/MetricImpl.h

src/libusermetricsinput/MetricManager.cpp

src/libusermetricsinput/MetricManagerImpl.cpp

src/libusermetricsinput/MetricManagerImpl.h

src/libusermetricsinput/MetricUpdate.h

src/libusermetricsinput/MetricUpdateImpl.cpp

src/libusermetricsinput/MetricUpdateImpl.h

src/libusermetricsoutput/CMakeLists.txt

src/libusermetricsoutput/DataSet.cpp

src/libusermetricsoutput/DataSet.h

src/libusermetricsoutput/UserData.cpp

src/libusermetricsoutput/UserData.h

src/libusermetricsoutput/UserMetrics.cpp

src/libusermetricsoutput/UserMetricsImpl.cpp

src/libusermetricsoutput/UserMetricsImpl.h

tests/CMakeLists.txt

tests/integration/libusermetricsinput/CMakeLists.txt

tests/integration/libusermetricsinput/TestMetricManager.cpp

tests/integration/libusermetricsoutput/CMakeLists.txt

tests/integration/libusermetricsoutput/TestUserMetrics.cpp

tests/testutils/CMakeLists.txt

tests/unit/CMakeLists.txt

tests/unit/libusermetricsinput/CMakeLists.txt

tests/unit/libusermetricsinput/TestMetricManagerImpl.cpp

tests/unit/libusermetricsinput/TestUserMetricInputCAPI.cpp

tests/unit/libusermetricsoutput/CMakeLists.txt

tests/unit/libusermetricsoutput/TestUserMetricsImpl.cpp

Show diffs side-by-side

added added

removed removed

src/libusermetricsoutput/UserData.cpp

35

35

return m_dataSets.constEnd();

36

36

}

37

37

38

UserData::iterator UserData::find(const QString & dataSetId) {

39

iterator data(m_dataSets.find(dataSetId));

40

41

if (data == m_dataSets.end()) {

42

UserData::DataSetPtr dataSet(new DataSet(this));

43

data = m_dataSets.insert(dataSetId, dataSet);

44

}

45

46

return m_dataSets.find(dataSetId);

38

UserData::iterator UserData::insert(const QString &dataSetId,

39

DataSetPtr dataSet) {

40

return m_dataSets.insert(dataSetId, dataSet);

47

41

}

48

42

Older »