From bc306e210fdad4d7c6d7fe2ecd17177627f0e503 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 21 May 2013 23:20:51 +0200
Subject: [PATCH] Declare some string constants actually const

---
 headers/os/package/PackageInfo.h    |  4 ++--
 headers/os/package/RepositoryInfo.h | 16 ++++++++--------
 src/kits/package/PackageInfo.cpp    |  4 ++--
 src/kits/package/RepositoryInfo.cpp | 16 ++++++++--------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/headers/os/package/PackageInfo.h b/headers/os/package/PackageInfo.h
index f2b08b2f14..c51bb8f182 100644
--- a/headers/os/package/PackageInfo.h
+++ b/headers/os/package/PackageInfo.h
@@ -161,8 +161,8 @@ public:
 									ParseErrorListener* listener = NULL);
 
 public:
-	static	const char*			kElementNames[];
-	static	const char*			kArchitectureNames[];
+	static	const char*	const	kElementNames[];
+	static	const char*	const	kArchitectureNames[];
 
 private:
 			class Parser;
diff --git a/headers/os/package/RepositoryInfo.h b/headers/os/package/RepositoryInfo.h
index b74f01780b..db69dc64e2 100644
--- a/headers/os/package/RepositoryInfo.h
+++ b/headers/os/package/RepositoryInfo.h
@@ -57,14 +57,14 @@ public:
 
 	static	const uint8			kDefaultPriority;
 
-	static	const char*			kNameField;
-	static	const char*			kURLField;
-	static	const char*			kVendorField;
-	static	const char*			kSummaryField;
-	static	const char*			kPriorityField;
-	static	const char*			kArchitectureField;
-	static	const char*			kLicenseNameField;
-	static	const char*			kLicenseTextField;
+	static	const char* const	kNameField;
+	static	const char* const	kURLField;
+	static	const char* const	kVendorField;
+	static	const char*	const	kSummaryField;
+	static	const char*	const	kPriorityField;
+	static	const char*	const	kArchitectureField;
+	static	const char*	const	kLicenseNameField;
+	static	const char*	const	kLicenseTextField;
 
 private:
 			status_t			fInitStatus;
diff --git a/src/kits/package/PackageInfo.cpp b/src/kits/package/PackageInfo.cpp
index 6e6553e942..a7c083054d 100644
--- a/src/kits/package/PackageInfo.cpp
+++ b/src/kits/package/PackageInfo.cpp
@@ -966,7 +966,7 @@ BPackageInfo::Parser::_IsValidResolvableName(const char* string,
 }
 
 
-const char* BPackageInfo::kElementNames[B_PACKAGE_INFO_ENUM_COUNT] = {
+const char* const BPackageInfo::kElementNames[B_PACKAGE_INFO_ENUM_COUNT] = {
 	"name",
 	"summary",
 	"description",
@@ -990,7 +990,7 @@ const char* BPackageInfo::kElementNames[B_PACKAGE_INFO_ENUM_COUNT] = {
 };
 
 
-const char*
+const char* const
 BPackageInfo::kArchitectureNames[B_PACKAGE_ARCHITECTURE_ENUM_COUNT] = {
 	"any",
 	"x86",
diff --git a/src/kits/package/RepositoryInfo.cpp b/src/kits/package/RepositoryInfo.cpp
index 5dce7e1fa7..ea042feb85 100644
--- a/src/kits/package/RepositoryInfo.cpp
+++ b/src/kits/package/RepositoryInfo.cpp
@@ -26,14 +26,14 @@ namespace BPackageKit {
 
 const uint8 BRepositoryInfo::kDefaultPriority	= 50;
 
-const char* BRepositoryInfo::kNameField			= "name";
-const char* BRepositoryInfo::kURLField			= "url";
-const char* BRepositoryInfo::kVendorField		= "vendor";
-const char* BRepositoryInfo::kSummaryField		= "summary";
-const char* BRepositoryInfo::kPriorityField		= "priority";
-const char* BRepositoryInfo::kArchitectureField	= "architecture";
-const char* BRepositoryInfo::kLicenseNameField	= "licenseName";
-const char* BRepositoryInfo::kLicenseTextField	= "licenseText";
+const char* const BRepositoryInfo::kNameField			= "name";
+const char* const BRepositoryInfo::kURLField			= "url";
+const char* const BRepositoryInfo::kVendorField			= "vendor";
+const char* const BRepositoryInfo::kSummaryField		= "summary";
+const char* const BRepositoryInfo::kPriorityField		= "priority";
+const char* const BRepositoryInfo::kArchitectureField	= "architecture";
+const char* const BRepositoryInfo::kLicenseNameField	= "licenseName";
+const char* const BRepositoryInfo::kLicenseTextField	= "licenseText";
 
 
 BRepositoryInfo::BRepositoryInfo()