Skip to content

Commit 9a8b6b8

Browse files
committed
Merge pull request #74 from owncloud/rename-granted-to
rename grantedTo to grantedToIdentities
1 parent 31391b3 commit 9a8b6b8

File tree

2 files changed

+23
-23
lines changed

2 files changed

+23
-23
lines changed

client/OAIPermission.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ namespace OpenAPI {
2727
class OAIPermissionPrivate {
2828
friend class OAIPermission;
2929

30-
QList<OAIIdentitySet> granted_to;
31-
bool granted_to_isSet;
32-
bool granted_to_isValid;
30+
QList<OAIIdentitySet> granted_to_identities;
31+
bool granted_to_identities_isSet;
32+
bool granted_to_identities_isValid;
3333

3434
QList<QString> roles;
3535
bool roles_isSet;
@@ -61,8 +61,8 @@ void OAIPermission::initializeModel() {
6161
Q_D(OAIPermission);
6262

6363

64-
d->granted_to_isSet = false;
65-
d->granted_to_isValid = false;
64+
d->granted_to_identities_isSet = false;
65+
d->granted_to_identities_isValid = false;
6666

6767
d->roles_isSet = false;
6868
d->roles_isValid = false;
@@ -81,8 +81,8 @@ void OAIPermission::fromJsonObject(QJsonObject json) {
8181

8282
Q_D(OAIPermission);
8383

84-
d->granted_to_isValid = ::OpenAPI::fromJsonValue(d->granted_to, json[QString("grantedTo")]);
85-
d->granted_to_isSet = !json[QString("grantedTo")].isNull() && d->granted_to_isValid;
84+
d->granted_to_identities_isValid = ::OpenAPI::fromJsonValue(d->granted_to_identities, json[QString("grantedToIdentities")]);
85+
d->granted_to_identities_isSet = !json[QString("grantedToIdentities")].isNull() && d->granted_to_identities_isValid;
8686

8787
d->roles_isValid = ::OpenAPI::fromJsonValue(d->roles, json[QString("roles")]);
8888
d->roles_isSet = !json[QString("roles")].isNull() && d->roles_isValid;
@@ -101,45 +101,45 @@ QJsonObject OAIPermission::asJsonObject() const {
101101
return {};
102102
}
103103
QJsonObject obj;
104-
if (d->granted_to.size() > 0) {
105-
obj.insert(QString("grantedTo"), ::OpenAPI::toJsonValue(d->granted_to));
104+
if (d->granted_to_identities.size() > 0) {
105+
obj.insert(QString("grantedToIdentities"), ::OpenAPI::toJsonValue(d->granted_to_identities));
106106
}
107107
if (d->roles.size() > 0) {
108108
obj.insert(QString("roles"), ::OpenAPI::toJsonValue(d->roles));
109109
}
110110
return obj;
111111
}
112112

113-
QList<OAIIdentitySet> OAIPermission::getGrantedTo() const {
113+
QList<OAIIdentitySet> OAIPermission::getGrantedToIdentities() const {
114114
Q_D(const OAIPermission);
115115
if(!d){
116116
return {};
117117
}
118-
return d->granted_to;
118+
return d->granted_to_identities;
119119
}
120-
void OAIPermission::setGrantedTo(const QList<OAIIdentitySet> &granted_to) {
120+
void OAIPermission::setGrantedToIdentities(const QList<OAIIdentitySet> &granted_to_identities) {
121121
Q_D(OAIPermission);
122122
Q_ASSERT(d);
123123

124-
d->granted_to = granted_to;
125-
d->granted_to_isSet = true;
124+
d->granted_to_identities = granted_to_identities;
125+
d->granted_to_identities_isSet = true;
126126
}
127127

128-
bool OAIPermission::is_granted_to_Set() const{
128+
bool OAIPermission::is_granted_to_identities_Set() const{
129129
Q_D(const OAIPermission);
130130
if(!d){
131131
return false;
132132
}
133133

134-
return d->granted_to_isSet;
134+
return d->granted_to_identities_isSet;
135135
}
136136

137-
bool OAIPermission::is_granted_to_Valid() const{
137+
bool OAIPermission::is_granted_to_identities_Valid() const{
138138
Q_D(const OAIPermission);
139139
if(!d){
140140
return false;
141141
}
142-
return d->granted_to_isValid;
142+
return d->granted_to_identities_isValid;
143143
}
144144

145145
QList<QString> OAIPermission::getRoles() const {
@@ -181,7 +181,7 @@ bool OAIPermission::isSet() const {
181181
}
182182
bool isObjectUpdated = false;
183183
do {
184-
if (d->granted_to.size() > 0) {
184+
if (d->granted_to_identities.size() > 0) {
185185
isObjectUpdated = true;
186186
break;
187187
}

client/OAIPermission.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ class OAIPermission : public OAIObject {
4949
void fromJsonObject(QJsonObject json) override;
5050
void fromJson(QString jsonString) override;
5151

52-
QList<OAIIdentitySet> getGrantedTo() const;
53-
void setGrantedTo(const QList<OAIIdentitySet> &granted_to);
54-
bool is_granted_to_Set() const;
55-
bool is_granted_to_Valid() const;
52+
QList<OAIIdentitySet> getGrantedToIdentities() const;
53+
void setGrantedToIdentities(const QList<OAIIdentitySet> &granted_to_identities);
54+
bool is_granted_to_identities_Set() const;
55+
bool is_granted_to_identities_Valid() const;
5656

5757
QList<QString> getRoles() const;
5858
void setRoles(const QList<QString> &roles);

0 commit comments

Comments
 (0)