diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-10-04 14:25:59 +0200 |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-10-04 14:25:59 +0200 |
| commit | 51099c67bcb8d3979cf9985f1d850bf9720ebe5b (patch) | |
| tree | b56668e7f76dc25a5444869c96da26ecaea6b1c6 /common/domain | |
| parent | 80c2ac8b750d0b6460cdeb0d114f5cd77fbca725 (diff) | |
| download | sink-51099c67bcb8d3979cf9985f1d850bf9720ebe5b.tar.gz sink-51099c67bcb8d3979cf9985f1d850bf9720ebe5b.zip | |
Store the resource/account type as just "type"
We use the resource/account prefix only because just "Type" would
conflict with the typedef.
Diffstat (limited to 'common/domain')
| -rw-r--r-- | common/domain/applicationdomaintype.h | 4 |
1 files changed, 2 insertions, 2 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 { | |||
| 275 | 275 | ||
| 276 | SINK_PROPERTY(QString, Name, name); | 276 | SINK_PROPERTY(QString, Name, name); |
| 277 | SINK_PROPERTY(QString, Icon, icon); | 277 | SINK_PROPERTY(QString, Icon, icon); |
| 278 | SINK_PROPERTY(QString, AccountType, accountType); | 278 | SINK_PROPERTY(QString, AccountType, type); |
| 279 | SINK_STATUS_PROPERTY(int, Status, status); | 279 | SINK_STATUS_PROPERTY(int, Status, status); |
| 280 | SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error); | 280 | SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error); |
| 281 | SINK_STATUS_PROPERTY(ApplicationDomain::Progress, Progress, progress); | 281 | SINK_STATUS_PROPERTY(ApplicationDomain::Progress, Progress, progress); |
| @@ -296,7 +296,7 @@ struct SINK_EXPORT SinkResource : public ApplicationDomainType { | |||
| 296 | virtual ~SinkResource(); | 296 | virtual ~SinkResource(); |
| 297 | 297 | ||
| 298 | SINK_REFERENCE_PROPERTY(SinkAccount, Account, account); | 298 | SINK_REFERENCE_PROPERTY(SinkAccount, Account, account); |
| 299 | SINK_PROPERTY(QByteArray, ResourceType, resourceType); | 299 | SINK_PROPERTY(QByteArray, ResourceType, type); |
| 300 | SINK_PROPERTY(QByteArrayList, Capabilities, capabilities); | 300 | SINK_PROPERTY(QByteArrayList, Capabilities, capabilities); |
| 301 | SINK_STATUS_PROPERTY(int, Status, status); | 301 | SINK_STATUS_PROPERTY(int, Status, status); |
| 302 | SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error); | 302 | SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error); |