From 51099c67bcb8d3979cf9985f1d850bf9720ebe5b Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 4 Oct 2016 14:25:59 +0200 Subject: Store the resource/account type as just "type" We use the resource/account prefix only because just "Type" would conflict with the typedef. --- common/domain/applicationdomaintype.h | 4 ++-- common/resourcefacade.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h index 2c93639..af2920c 100644 --- a/common/domain/applicationdomaintype.h +++ b/common/domain/applicationdomaintype.h @@ -275,7 +275,7 @@ struct SINK_EXPORT SinkAccount : public ApplicationDomainType { SINK_PROPERTY(QString, Name, name); SINK_PROPERTY(QString, Icon, icon); - SINK_PROPERTY(QString, AccountType, accountType); + SINK_PROPERTY(QString, AccountType, type); SINK_STATUS_PROPERTY(int, Status, status); SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error); SINK_STATUS_PROPERTY(ApplicationDomain::Progress, Progress, progress); @@ -296,7 +296,7 @@ struct SINK_EXPORT SinkResource : public ApplicationDomainType { virtual ~SinkResource(); SINK_REFERENCE_PROPERTY(SinkAccount, Account, account); - SINK_PROPERTY(QByteArray, ResourceType, resourceType); + SINK_PROPERTY(QByteArray, ResourceType, type); SINK_PROPERTY(QByteArrayList, Capabilities, capabilities); SINK_STATUS_PROPERTY(int, Status, status); SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error); diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp index aee5706..6747938 100644 --- a/common/resourcefacade.cpp +++ b/common/resourcefacade.cpp @@ -279,7 +279,7 @@ QPair, typename Sink::ResultEmitter("accounts", "type") +AccountFacade::AccountFacade() : LocalStorageFacade("accounts", ApplicationDomain::SinkAccount::AccountType::name) { } -- cgit v1.2.3