Store the resource/account type as just "type"

We use the resource/account prefix only because just "Type" would
conflict with the typedef.

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<KAsync::Job<void>, typename Sink::ResultEmitter<typename ApplicationDomain
 }
 
 
-AccountFacade::AccountFacade() : LocalStorageFacade<Sink::ApplicationDomain::SinkAccount>("accounts", "type")
+AccountFacade::AccountFacade() : LocalStorageFacade<Sink::ApplicationDomain::SinkAccount>("accounts", ApplicationDomain::SinkAccount::AccountType::name)
 {
 }