Skip to content

Commit 6ee6c18

Browse files
committed
Remove unused and unimplemented VaultGetAgePublicAgesFolder
A vault Age node doesn't contain a PublicAgesFolder, so it's not obvious how this API was supposed to behave. The correct current API for getting the list of public ages is NetCommGetPublicAgeList/PtGetPublicAgeList.
1 parent e5d99d1 commit 6ee6c18

File tree

6 files changed

+0
-30
lines changed

6 files changed

+0
-30
lines changed

Scripts/Python/plasma/Plasma.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,10 +1211,6 @@ def getPeopleIKnowAboutFolder(self):
12111211
"""Returns a ptVaultPlayerInfoListNode of the players the Age knows about(?)."""
12121212
...
12131213

1214-
def getPublicAgesFolder(self):
1215-
"""Returns a ptVaultFolderNode that contains all the public Ages"""
1216-
...
1217-
12181214
def getSubAgeLink(self, ageInfo):
12191215
"""Returns a ptVaultAgeLinkNode to 'ageInfo' (a ptAgeInfoStruct) for this Age."""
12201216
...

Sources/Plasma/FeatureLib/pfPython/pyAgeVault.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,6 @@ PyObject* pyAgeVault::GetPeopleIKnowAboutFolder()
128128
PYTHON_RETURN_NONE;
129129
}
130130

131-
132-
PyObject* pyAgeVault::GetPublicAgesFolder()
133-
{
134-
hsRef<RelVaultNode> rvn = VaultGetAgePublicAgesFolder();
135-
if (rvn)
136-
return pyVaultFolderNode::New(rvn);
137-
138-
// just return a None object
139-
PYTHON_RETURN_NONE;
140-
}
141-
142131
PyObject* pyAgeVault::GetSubAgeLink( const pyAgeInfoStruct & info )
143132
{
144133
hsRef<RelVaultNode> rvn = VaultFindAgeSubAgeLink(info.GetAgeInfo());

Sources/Plasma/FeatureLib/pfPython/pyAgeVault.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ class pyAgeVault
9898
PyObject* GetPeopleIKnowAboutFolder(); // returns pyVaultPlayerInfoListNode
9999
// PERSONAL AGE SPECIFIC
100100
PyObject* GetBookshelfFolder (); // returns pyVaultFolderNode
101-
// NEXUS SPECIFIC
102-
PyObject* GetPublicAgesFolder(); // returns pyVaultFolderNode
103101
PyObject* GetSubAgeLink( const pyAgeInfoStruct & info ); // returns pyVaultAgeLinkNode
104102
// AGE DEVICES. AKA IMAGERS, WHATEVER.
105103
// Add a new device.

Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ PYTHON_METHOD_DEFINITION_NOARGS(ptAgeVault, getPeopleIKnowAboutFolder)
9494
return self->fThis->GetPeopleIKnowAboutFolder();
9595
}
9696

97-
PYTHON_METHOD_DEFINITION_NOARGS(ptAgeVault, getPublicAgesFolder)
98-
{
99-
return self->fThis->GetPublicAgesFolder();
100-
}
101-
10297
PYTHON_METHOD_DEFINITION(ptAgeVault, getSubAgeLink, args)
10398
{
10499
PyObject* ageInfoObj = nullptr;
@@ -251,7 +246,6 @@ PYTHON_START_METHODS_TABLE(ptAgeVault)
251246
PYTHON_METHOD_NOARGS(ptAgeVault, getAgesIOwnFolder, "(depreciated, use getBookshelfFolder) Returns a ptVaultFolderNode that contain the Ages I own"),
252247
PYTHON_METHOD_NOARGS(ptAgeVault, getBookshelfFolder, "Personal age only: Returns a ptVaultFolderNode that contains the owning player's AgesIOwn age list"),
253248
PYTHON_METHOD_NOARGS(ptAgeVault, getPeopleIKnowAboutFolder, "Returns a ptVaultPlayerInfoListNode of the players the Age knows about(?)."),
254-
PYTHON_METHOD_NOARGS(ptAgeVault, getPublicAgesFolder, "Returns a ptVaultFolderNode that contains all the public Ages"),
255249
PYTHON_METHOD(ptAgeVault, getSubAgeLink, "Params: ageInfo\nReturns a ptVaultAgeLinkNode to 'ageInfo' (a ptAgeInfoStruct) for this Age."),
256250
PYTHON_METHOD_NOARGS(ptAgeVault, getAgeGuid, "Returns the current Age's guid as a string."),
257251
PYTHON_METHOD(ptAgeVault, addDevice, "Params: deviceName,cb=None,cbContext=0\nAdds a device to the age"),

Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3622,12 +3622,6 @@ hsRef<RelVaultNode> VaultGetAgeSubAgesFolder () {
36223622
return nullptr;
36233623
}
36243624

3625-
//============================================================================
3626-
hsRef<RelVaultNode> VaultGetAgePublicAgesFolder () {
3627-
hsAssert(false, "eric, implement me");
3628-
return nullptr;
3629-
}
3630-
36313625
//============================================================================
36323626
hsRef<RelVaultNode> VaultAgeGetBookshelfFolder () {
36333627
if (hsRef<RelVaultNode> rvn = GetAgeNode())

Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ hsRef<RelVaultNode> VaultGetAgeChildAgesFolder();
393393
hsRef<RelVaultNode> VaultGetAgeAgeOwnersFolder();
394394
hsRef<RelVaultNode> VaultGetAgeCanVisitFolder();
395395
hsRef<RelVaultNode> VaultGetAgePeopleIKnowAboutFolder();
396-
hsRef<RelVaultNode> VaultGetAgePublicAgesFolder();
397396
hsRef<RelVaultNode> VaultAgeGetBookshelfFolder();
398397
hsRef<RelVaultNode> VaultFindAgeSubAgeLink(const plAgeInfoStruct * info);
399398
hsRef<RelVaultNode> VaultFindAgeChildAgeLink(const plAgeInfoStruct * info);

0 commit comments

Comments
 (0)