Package Kit: Rename InstallationLocationInfo::OldState to ActiveState.

It doesn't refer to some random old state, but the currently active
one. (If the currently active state is the default one, then it will
return nothing.) So, this should make things clearer.

Change-Id: Ib3fe842f5fb51eaf2ef2f31bad8b292b47a3fb36
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10403
Tested-by: Commit checker robot <[email protected]>
Reviewed-by: waddlesplash <[email protected]>

headers/os/package/InstallationLocationInfo.h

@@ -45,8 +45,8 @@ public:
 			void				SetCurrentlyActivePackageInfos(
 									const BPackageInfoSet& infos);
 
-			const BString&		OldStateName() const;
-			void				SetOldStateName(const BString& name);
+			const BString&		ActiveStateName() const;
+			void				SetActiveStateName(const BString& name);
 
 			int64				ChangeCount() const;
 			void				SetChangeCount(int64 changeCount);
@@ -58,7 +58,7 @@ private:
 			BPackageInfoSet		fLatestActivePackageInfos;
 			BPackageInfoSet		fLatestInactivePackageInfos;
 			BPackageInfoSet		fCurrentlyActivePackageInfos;
-			BString				fOldStateName;
+			BString				fActiveStateName;
 			int64				fChangeCount;
 };
 

src/kits/package/DaemonClient.cpp

@@ -100,8 +100,8 @@ BDaemonClient::GetInstallationLocationInfo(
 	if (error != B_OK && error != B_NAME_NOT_FOUND)
 		return error;
 
-	BString oldStateName;
-	error = reply.FindString("old state", &oldStateName);
+	BString activeStateName;
+	error = reply.FindString("active state", &activeStateName);
 	if (error != B_OK && error != B_NAME_NOT_FOUND)
 		return error;
 
@@ -113,7 +113,7 @@ BDaemonClient::GetInstallationLocationInfo(
 	_info.SetLatestActivePackageInfos(latestActivePackages);
 	_info.SetLatestInactivePackageInfos(latestInactivePackages);
 	_info.SetCurrentlyActivePackageInfos(currentlyActivePackages);
-	_info.SetOldStateName(oldStateName);
+	_info.SetActiveStateName(activeStateName);
 	_info.SetChangeCount(changeCount);
 
 	return B_OK;

src/kits/package/InstallationLocationInfo.cpp

@@ -21,7 +21,7 @@ BInstallationLocationInfo::BInstallationLocationInfo()
 	fLatestActivePackageInfos(),
 	fLatestInactivePackageInfos(),
 	fCurrentlyActivePackageInfos(),
-	fOldStateName(),
+	fActiveStateName(),
 	fChangeCount(0)
 {
 }
@@ -41,7 +41,7 @@ BInstallationLocationInfo::Unset()
 	fLatestActivePackageInfos.MakeEmpty();
 	fLatestInactivePackageInfos.MakeEmpty();
 	fCurrentlyActivePackageInfos.MakeEmpty();
-	fOldStateName.Truncate(0);
+	fActiveStateName.Truncate(0);
 	fChangeCount = 0;
 }
 
@@ -136,16 +136,16 @@ BInstallationLocationInfo::SetCurrentlyActivePackageInfos(
 
 
 const BString&
-BInstallationLocationInfo::OldStateName() const
+BInstallationLocationInfo::ActiveStateName() const
 {
-	return fOldStateName;
+	return fActiveStateName;
 }
 
 
 void
-BInstallationLocationInfo::SetOldStateName(const BString& name)
+BInstallationLocationInfo::SetActiveStateName(const BString& name)
 {
-	fOldStateName = name;
+	fActiveStateName = name;
 }
 
 

src/servers/package/Volume.cpp

@@ -558,7 +558,7 @@ Volume::HandleGetLocationInfoRequest(BMessage* message)
 
 	if (fActiveState != fLatestState) {
 		if (fPackagesDirectoryCount > 1) {
-			fLocationInfoReply.AddString("old state",
+			fLocationInfoReply.AddString("active state",
 				fPackagesDirectories[fPackagesDirectoryCount - 1].Name());
 		}