← Back to branch summary

~ubuntu-branches/ubuntu/saucy/libusermetrics/saucy

~ubuntu-branches/ubuntu/saucy/libusermetrics/saucy

« back to all changes in this revision

Viewing changes to src/usermetricsservice/database/DataSource.cpp

Committer: Package Import Robot
Author(s): Ubuntu daily release, Pete Woods, Ubuntu daily release
Date: 2013-07-03 14:16:44 UTC
mfrom: (1.1.3)
Revision ID: package-import@ubuntu.com-20130703141644-3apl14qyyga4ytxv

Tags: 1.0.2+13.10.20130703.1-0ubuntu1

[ Pete Woods ]
* Add support for providing and storing text domain for format strings
* Support string for empty data
* Update doxyfile format
* Make prerm script more heavy handed
* Only try and register the service inside main
* Log daemon output to syslog

[ Ubuntu daily release ]
* Automatic snapshot from revision 88

files added:
examples/MetricManagerAdvanced.cpp

examples/MetricManagerCAPI.c

examples/MetricManagerSingleDay.cpp

include/libusermetricsinput/usermetricsinput.h

tests/unit/libusermetricsoutput/TestDataSet.cpp

files modified:
cmake/Doxyfile.in

data/com.canonical.UserMetrics.service.in

data/com.canonical.UserMetrics.xml

data/com.canonical.usermetrics.DataSource.xml

debian/changelog

debian/libusermetricsinput1.symbols

debian/usermetricsservice.prerm

src/libusermetricsinput/CMakeLists.txt

src/libusermetricsinput/Metric.cpp

src/libusermetricsinput/Metric.h

src/libusermetricsinput/MetricImpl.cpp

src/libusermetricsinput/MetricImpl.h

src/libusermetricsinput/MetricManager.cpp

src/libusermetricsinput/MetricManager.h

src/libusermetricsinput/MetricManagerImpl.cpp

src/libusermetricsinput/MetricManagerImpl.h

src/libusermetricsinput/MetricUpdate.cpp

src/libusermetricsinput/MetricUpdate.h

src/libusermetricsinput/MetricUpdateImpl.cpp

src/libusermetricsinput/MetricUpdateImpl.h

src/libusermetricsinput/main.cpp

src/libusermetricsinput/usermetricsinput.cpp

src/libusermetricsinput/usermetricsinput.h

src/libusermetricsoutput/ColorThemeProvider.h

src/libusermetricsoutput/DataSet.cpp

src/libusermetricsoutput/DataSet.h

src/libusermetricsoutput/DataSource.cpp

src/libusermetricsoutput/DataSource.h

src/libusermetricsoutput/HardCodedColorThemeProvider.cpp

src/libusermetricsoutput/HardCodedColorThemeProvider.h

src/libusermetricsoutput/SyncedDataSet.cpp

src/libusermetricsoutput/SyncedDataSource.cpp

src/libusermetricsoutput/SyncedUserData.cpp

src/libusermetricsoutput/SyncedUserMetricsStore.cpp

src/libusermetricsoutput/UserMetrics.cpp

src/libusermetricsoutput/UserMetricsImpl.cpp

src/usermetricsservice/DBusDataSource.cpp

src/usermetricsservice/DBusDataSource.h

src/usermetricsservice/DBusUserMetrics.cpp

src/usermetricsservice/DBusUserMetrics.h

src/usermetricsservice/database/DataSource.cpp

src/usermetricsservice/database/DataSource.h

src/usermetricsservice/main.cpp

tests/integration/libusermetricsinput/TestMetricManager.cpp

tests/testutils/QVariantListPrinter.cpp

tests/unit/libusermetricsinput/TestUserMetricInputCAPI.cpp

tests/unit/libusermetricsoutput/CMakeLists.txt

tests/unit/libusermetricsoutput/TestQVariantListModel.cpp

tests/unit/libusermetricsoutput/TestSyncedUserMetricsStore.cpp

tests/unit/libusermetricsoutput/TestUserMetricsImpl.cpp

tests/unit/usermetricsservice/TestUserMetricsService.cpp

Show diffs side-by-side

added added

removed removed

src/usermetricsservice/database/DataSource.cpp

53

53

m_formatString = formatString;

54

54

}

55

55

56

const QString & DataSource::emptyDataString() const {

57

return m_emptyDataString;

58

}

59

60

void DataSource::setEmptyDataString(const QString &emptyDataString) {

61

m_emptyDataString = emptyDataString;

62

}

63

64

const QString & DataSource::textDomain() const {

65

return m_textDomain;

66

}

67

68

void DataSource::setTextDomain(const QString &textDomain) {

69

m_textDomain = textDomain;

70

}

71

56

72

void DataSource::findById(int id, DataSource *dataSource) {

57

73

QDjangoQuerySet<DataSource>().get(

58

74

QDjangoWhere("id", QDjangoWhere::Equals, id), dataSource);

Older »