提交: 3c79f275f1a504aa3fedf6b4aca600fc7ed808f6 - textmate (git)

TextMate is a graphical text editor for OS X 10.7+

Commit MetaInfo

• 修订版: 3c79f275f1a504aa3fedf6b4aca600fc7ed808f6 (tree)
• 时间: 2012-08-24 00:15:12
• 作者: Allan Odgaard <git@abet...>
• Commiter: Allan Odgaard

Log Message

Use constants for settings keys

更改概述

• modified: Frameworks/DocumentWindow/src/DocumentController.mm
• modified: Frameworks/DocumentWindow/src/DocumentTabs.mm
• modified: Frameworks/Find/src/Find.mm
• modified: Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.mm
• modified: Frameworks/OakFilterList/src/datasources/OakFileChooser.mm
• modified: Frameworks/OakTextView/src/OakDocumentView.mm
• modified: Frameworks/OakTextView/src/OakTextView.mm
• modified: Frameworks/document/src/document.cc
• modified: Frameworks/file/src/open.cc
• modified: Frameworks/file/src/path_info.cc
• modified: Frameworks/file/src/save.cc
• modified: Frameworks/file/src/type.cc
• add: Frameworks/settings/src/keys.cc
• add: Frameworks/settings/src/keys.h
• modified: Frameworks/settings/src/settings.h
• modified: Frameworks/settings/target

差异

--- a/Frameworks/DocumentWindow/src/DocumentController.mm
+++ b/Frameworks/DocumentWindow/src/DocumentController.mm
@@ -601,7 +601,7 @@ NSString* const kUserDefaultsFileBrowserPlacementKey = @"fileBrowserPlacement";
 {
 	D(DBF_DocumentController, bug("\n"););
 	scratchDocument = oak::uuid_t();
-	[self addDocuments:std::vector<document::document_ptr>(1, document::from_content("", settings_for_path(NULL_STR, file::path_attributes(NULL_STR), to_s(self.fileBrowserPath)).get("fileType", "text.plain"))) atIndex:documentTabs.size() andSelect:kSelectDocumentFirst closeOther:NO pruneTabBar:NO];
+	[self addDocuments:std::vector<document::document_ptr>(1, document::from_content("", settings_for_path(NULL_STR, file::path_attributes(NULL_STR), to_s(self.fileBrowserPath)).get(kSettingsFileTypeKey, "text.plain"))) atIndex:documentTabs.size() andSelect:kSelectDocumentFirst closeOther:NO pruneTabBar:NO];
 }
 
 // =========================
@@ -612,7 +612,7 @@ NSString* const kUserDefaultsFileBrowserPlacementKey = @"fileBrowserPlacement";
 {
 	D(DBF_DocumentController, bug("\n"););
 	scratchDocument = oak::uuid_t();
-	[self addDocuments:std::vector<document::document_ptr>(1, document::from_content("", settings_for_path(NULL_STR, file::path_attributes(NULL_STR), to_s(self.fileBrowserPath)).get("fileType", "text.plain"))) andSelect:kSelectDocumentFirst closeOther:NO pruneTabBar:YES];
+	[self addDocuments:std::vector<document::document_ptr>(1, document::from_content("", settings_for_path(NULL_STR, file::path_attributes(NULL_STR), to_s(self.fileBrowserPath)).get(kSettingsFileTypeKey, "text.plain"))) andSelect:kSelectDocumentFirst closeOther:NO pruneTabBar:YES];
 }
 
 - (BOOL)openFile:(NSString*)aPath
@@ -651,8 +651,8 @@ NSString* const kUserDefaultsFileBrowserPlacementKey = @"fileBrowserPlacement";
 	}
 
 	settings_t const settings = [self selectedDocument]->settings();
-	path::glob_t const excludeGlob(settings.get("exclude", ""));
-	path::glob_t const binaryGlob(settings.get("binary", ""));
+	path::glob_t const excludeGlob(settings.get(kSettingsExcludeKey, ""));
+	path::glob_t const binaryGlob(settings.get(kSettingsBinaryKey, ""));
 
 	std::vector<std::string> v;
 	iterate(path, candidates)
@@ -1220,7 +1220,7 @@ static std::string parent_or_home (std::string const& path)
 - (NSString*)projectPath
 {
 	settings_t const& settings = documentTabs.empty() || [self selectedDocument]->path() == NULL_STR ? settings_for_path(NULL_STR, "", to_s(self.fileBrowserPath)) : [self selectedDocument]->settings();
-	return [NSString stringWithCxxString:settings.get("projectDirectory", NULL_STR)] ?: self.fileBrowserPath ?: self.documentPath;
+	return [NSString stringWithCxxString:settings.get(kSettingsProjectDirectoryKey, NULL_STR)] ?: self.fileBrowserPath ?: self.documentPath;
 }
 
 - (NSString*)fileBrowserPath
@@ -1335,7 +1335,7 @@ static std::string parent_or_home (std::string const& path)
 static std::string file_chooser_glob (std::string const& path)
 {
 	settings_t const& settings = settings_for_path(NULL_STR, "", path);
-	std::string const propertyKeys[] = { "includeFilesInFileChooser", "includeInFileChooser", "includeFiles", "include" };
+	std::string const propertyKeys[] = { kSettingsIncludeFilesInFileChooserKey, kSettingsIncludeInFileChooserKey, kSettingsIncludeFilesKey, kSettingsIncludeKey };
 	iterate(key, propertyKeys)
 	{
 		if(settings.has(*key))

--- a/Frameworks/DocumentWindow/src/DocumentTabs.mm
+++ b/Frameworks/DocumentWindow/src/DocumentTabs.mm
@@ -42,7 +42,7 @@ namespace
 
 	// This is also set after open succeeds
 	settings_t const& settings = [self selectedDocument]->settings();
-	self.windowTitle      = [NSString stringWithCxxString:settings.get("windowTitle", [self selectedDocument]->display_name())];
+	self.windowTitle      = [NSString stringWithCxxString:settings.get(kSettingsWindowTitleKey, [self selectedDocument]->display_name())];
 	self.representedFile  = [NSString stringWithCxxString:[self selectedDocument]->path()];
 	self.isDocumentEdited = [self selectedDocument]->is_modified();
 
@@ -77,7 +77,7 @@ namespace
 	if(*aDocument == *[self selectedDocument])
 	{
 		settings_t const& settings = [self selectedDocument]->settings();
-		self.windowTitle      = [NSString stringWithCxxString:settings.get("windowTitle", [self selectedDocument]->display_name())];
+		self.windowTitle      = [NSString stringWithCxxString:settings.get(kSettingsWindowTitleKey, [self selectedDocument]->display_name())];
 		self.representedFile  = [NSString stringWithCxxString:[self selectedDocument]->path()];
 		self.isDocumentEdited = [self selectedDocument]->is_modified();
 	}
@@ -284,7 +284,7 @@ namespace
 	}
 
 	settings_t const& settings = aDocument->settings();
-	self.windowTitle      = [NSString stringWithCxxString:settings.get("windowTitle", aDocument->display_name())];
+	self.windowTitle      = [NSString stringWithCxxString:settings.get(kSettingsWindowTitleKey, aDocument->display_name())];
 	self.representedFile  = [NSString stringWithCxxString:aDocument->path()];
 	self.isDocumentEdited = aDocument->is_modified();
 

--- a/Frameworks/Find/src/Find.mm
+++ b/Frameworks/Find/src/Find.mm
@@ -245,7 +245,7 @@ NSString* const FolderOptionsDefaultsKey  = @"Folder Search Options";
 				std::string excludeGlob = "";
 				if(![controller.searchIn isEqualToString:FFSearchInOpenFiles])
 				{
-					static std::string const excludeKeys[] = { "excludeInFolderSearch", "exclude" };
+					static std::string const excludeKeys[] = { kSettingsExcludeInFolderSearchKey, kSettingsExcludeKey };
 					for(size_t i = 0; i < sizeofA(excludeKeys) && excludeGlob == ""; ++i)
 						excludeGlob = settings_for_path(NULL_STR, "", to_s(controller.searchFolder)).get(excludeKeys[i], "");
 				}

--- a/Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.mm
+++ b/Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.mm
@@ -91,10 +91,10 @@ namespace
 		{
 			request_t (std::string const& path = NULL_STR, NSUInteger options = 0) : _path(path), _options(options), _include_file_glob(""), _include_folder_glob(""), _exclude_file_glob(""), _exclude_folder_glob("")
 			{
-				static std::string const includeFileKeys[]   = { "includeFilesInBrowser",       "includeInBrowser", "includeFiles",       "include" };
-				static std::string const includeFolderKeys[] = { "includeDirectoriesInBrowser", "includeInBrowser", "includeDirectories", "include" };
-				static std::string const excludeFileKeys[]   = { "excludeFilesInBrowser",       "excludeInBrowser", "excludeFiles",       "exclude" };
-				static std::string const excludeFolderKeys[] = { "excludeDirectoriesInBrowser", "excludeInBrowser", "excludeDirectories", "exclude" };
+				static std::string const includeFileKeys[]   = { kSettingsIncludeFilesInBrowserKey,       kSettingsIncludeInBrowserKey, kSettingsIncludeFilesKey,       kSettingsIncludeKey };
+				static std::string const includeFolderKeys[] = { kSettingsIncludeDirectoriesInBrowserKey, kSettingsIncludeInBrowserKey, kSettingsIncludeDirectoriesKey, kSettingsIncludeKey };
+				static std::string const excludeFileKeys[]   = { kSettingsExcludeFilesInBrowserKey,       kSettingsExcludeInBrowserKey, kSettingsExcludeFilesKey,       kSettingsExcludeKey };
+				static std::string const excludeFolderKeys[] = { kSettingsExcludeDirectoriesInBrowserKey, kSettingsExcludeInBrowserKey, kSettingsExcludeDirectoriesKey, kSettingsExcludeKey };
 
 				settings_t const& settings = settings_for_path(NULL_STR, "", path);
 

--- a/Frameworks/OakFilterList/src/datasources/OakFileChooser.mm
+++ b/Frameworks/OakFilterList/src/datasources/OakFileChooser.mm
@@ -177,7 +177,7 @@ void file_chooser_t::set_path (std::string const& path)
 	_ranked_items.clear();
 
 	std::string excludeGlob = "";
-	static std::string const excludeKeys[] = { "excludeInFileChooser", "exclude" };
+	static std::string const excludeKeys[] = { kSettingsExcludeInFileChooserKey, kSettingsExcludeKey };
 	for(size_t i = 0; i < sizeofA(excludeKeys) && excludeGlob == ""; ++i)
 		excludeGlob = settings_for_path(NULL_STR, "", path).get(excludeKeys[i], "");
 

--- a/Frameworks/OakTextView/src/OakDocumentView.mm
+++ b/Frameworks/OakTextView/src/OakDocumentView.mm
@@ -127,7 +127,7 @@ private:
 		
 		std::string themeUUID = to_s([[NSUserDefaults standardUserDefaults] stringForKey:kUserDefaultsThemeUUIDKey]);
 		if(themeUUID == NULL_STR)
-			themeUUID = settings.get("theme", "71D40D9D-AE48-11D9-920A-000D93589AF6");
+			themeUUID = settings.get(kSettingsThemeKey, "71D40D9D-AE48-11D9-920A-000D93589AF6");
 		
 		[self setThemeWithUUID:[NSString stringWithCxxString:themeUUID]];
 

--- a/Frameworks/OakTextView/src/OakTextView.mm
+++ b/Frameworks/OakTextView/src/OakTextView.mm
@@ -386,9 +386,9 @@ static std::string shell_quote (std::vector<std::string> paths)
 		settings_t const& settings = document->settings();
 
 		editor = ng::editor_for_document(document);
-		wrapColumn = settings.get("wrapColumn", wrapColumn);
-		layout.reset(new ng::layout_t(document->buffer(), theme, fontName, fontSize, settings.get("softWrap", false), wrapColumn, document->folded()));
-		if(settings.get("showWrapColumn", false))
+		wrapColumn = settings.get(kSettingsWrapColumnKey, wrapColumn);
+		layout.reset(new ng::layout_t(document->buffer(), theme, fontName, fontSize, settings.get(kSettingsSoftWrapKey, false), wrapColumn, document->folded()));
+		if(settings.get(kSettingsShowWrapColumnKey, false))
 			layout->set_draw_wrap_column(true);
 
 		BOOL hasFocus = (self.keyState & (OakViewViewIsFirstResponderMask|OakViewWindowIsKeyMask|OakViewApplicationIsActiveMask)) == (OakViewViewIsFirstResponderMask|OakViewWindowIsKeyMask|OakViewApplicationIsActiveMask);
@@ -439,9 +439,9 @@ static std::string shell_quote (std::vector<std::string> paths)
 		CGFloat defaultFontSize   = [[NSUserDefaults standardUserDefaults] floatForKey:kUserDefaultsFontSizeKey] ?: [defaultFont pointSize];
 
 		theme          = parse_theme(bundles::item_ptr()); // set a fallback theme, OakDocumentView will call setThemeWithUUID: later
-		fontName       = settings.get("fontName", to_s(defaultFontName));
-		fontSize       = settings.get("fontSize", (int32_t)defaultFontSize);
-		showInvisibles = settings.get("showInvisibles", false);
+		fontName       = settings.get(kSettingsFontNameKey, to_s(defaultFontName));
+		fontSize       = settings.get(kSettingsFontSizeKey, (int32_t)defaultFontSize);
+		showInvisibles = settings.get(kSettingsShowInvisiblesKey, false);
 		antiAlias      = ![[NSUserDefaults standardUserDefaults] boolForKey:kUserDefaultsDisableAntiAliasKey];
 
 		[self registerForDraggedTypes:[[self class] dropTypes]];

--- a/Frameworks/document/src/document.cc
+++ b/Frameworks/document/src/document.cc
@@ -485,10 +485,10 @@ namespace document
 			return false;
 
 		settings_t const& settings = settings_for_path(path);
-		if(settings.has("binary"))
+		if(settings.has(kSettingsBinaryKey))
 		{
-			D(DBF_Document_Binary, bug(".tm_properties reports it as binary: %s\n", BSTR(path::glob_t(settings.get("binary", "")).does_match(path))););
-			return path::glob_t(settings.get("binary", "")).does_match(path);
+			D(DBF_Document_Binary, bug(".tm_properties reports it as binary: %s\n", BSTR(path::glob_t(settings.get(kSettingsBinaryKey, "")).does_match(path))););
+			return path::glob_t(settings.get(kSettingsBinaryKey, "")).does_match(path);
 		}
 
 		return false;
@@ -546,9 +546,9 @@ namespace document
 		}
 
 		settings_t const& settings = this->settings();
-		_buffer->indent() = text::indent_t(settings.get("tabSize", 4), SIZE_T_MAX, settings.get("softTabs", false));
-		_buffer->set_spelling_language(settings.get("spellingLanguage", "en"));
-		_buffer->set_live_spelling(settings.get("spellChecking", false));
+		_buffer->indent() = text::indent_t(settings.get(kSettingsTabSizeKey, 4), SIZE_T_MAX, settings.get(kSettingsSoftTabsKey, false));
+		_buffer->set_spelling_language(settings.get(kSettingsSpellingLanguageKey, "en"));
+		_buffer->set_live_spelling(settings.get(kSettingsSpellCheckingKey, false));
 
 		const_cast<document_t*>(this)->broadcast(callback_t::did_change_indent_settings);
 

--- a/Frameworks/file/src/open.cc
+++ b/Frameworks/file/src/open.cc
@@ -436,7 +436,7 @@ namespace
 						break;
 
 						case kEstimateEncodingStatePathSettings:
-							_encoding = settings_for_path(_path, "attr.file.unknown-encoding " + file::path_attributes(_path)).get("encoding", kCharsetUnknown);
+							_encoding = settings_for_path(_path, "attr.file.unknown-encoding " + file::path_attributes(_path)).get(kSettingsEncodingKey, kCharsetUnknown);
 						break;
 
 						case kEstimateEncodingStateAskUser:

--- a/Frameworks/file/src/path_info.cc
+++ b/Frameworks/file/src/path_info.cc
@@ -144,7 +144,7 @@ namespace file
 			}
 		}
 
-		res.push_back(settings_for_path(path, text::join(res, " ")).get("scopeAttributes", ""));
+		res.push_back(settings_for_path(path, text::join(res, " ")).get(kSettingsScopeAttributesKey, ""));
 		res.erase(std::remove(res.begin(), res.end(), ""), res.end());
 		return text::join(res, " ");
 	}

--- a/Frameworks/file/src/save.cc
+++ b/Frameworks/file/src/save.cc
@@ -332,11 +332,11 @@ namespace
 						_select_encoding_state = kSelectEncodingStateAskUser;
 
 						settings_t const& settings = settings_for_path(_path);
-						std::string encoding = settings.get("encoding", kCharsetNoEncoding);
+						std::string encoding = settings.get(kSettingsEncodingKey, kCharsetNoEncoding);
 						if(encoding != kCharsetNoEncoding)
 						{
 							_encoding = encoding;
-							_bom      = settings.get("useBOM", false);
+							_bom      = settings.get(kSettingsUseBOMKey, false);
 						}
 						else if(_encoding == kCharsetNoEncoding)
 						{
@@ -469,7 +469,7 @@ namespace file
 	// ==============
 
 	// bool hasEncoding   = path::get_attr(path, "com.apple.TextEncoding") != NULL_STR;
-	// bool storeEncoding = dstSettings.get("storeEncodingPerFile", hasEncoding);
+	// bool storeEncoding = dstSettings.get(kSettingsStoreEncodingPerFileKey, hasEncoding);
 	// if(storeEncoding || hasEncoding)
 	// 	path::set_attr(path, "com.apple.TextEncoding", storeEncoding ? encoding : NULL_STR);
 

--- a/Frameworks/file/src/type.cc
+++ b/Frameworks/file/src/type.cc
@@ -136,7 +136,7 @@ static std::string file_type_from_bytes (io::bytes_ptr const& bytes)
 static std::string find_file_type (std::string const& path, io::bytes_ptr const& bytes, std::string const& virtualPath = NULL_STR)
 {
 	// FIXME we need to use “current” folder when getting (fileType) settings
-	std::string res = settings_for_path(path, file::path_attributes(path)).get("fileType", NULL_STR);
+	std::string res = settings_for_path(path, file::path_attributes(path)).get(kSettingsFileTypeKey, NULL_STR);
 
 	if(res == NULL_STR && (virtualPath != NULL_STR || path != NULL_STR))
 		res = user_bindings().grammar_for(virtualPath != NULL_STR ? virtualPath : path);
@@ -148,7 +148,7 @@ static std::string find_file_type (std::string const& path, io::bytes_ptr const&
 		res = file_type_from_path(virtualPath != NULL_STR ? virtualPath : path);
 
 	if(res == NULL_STR)
-		res = settings_for_path(path, "attr.file.unknown-type " + file::path_attributes(path)).get("fileType", NULL_STR);
+		res = settings_for_path(path, "attr.file.unknown-type " + file::path_attributes(path)).get(kSettingsFileTypeKey, NULL_STR);
 
 	return res;
 }

--- /dev/null
+++ b/Frameworks/settings/src/keys.cc
@@ -0,0 +1,44 @@
+#include "keys.h"
+
+std::string const kSettingsFileTypeKey                    = "fileType";
+
+std::string const kSettingsTabSizeKey                     = "tabSize";
+std::string const kSettingsSoftTabsKey                    = "softTabs";
+
+std::string const kSettingsSpellCheckingKey               = "spellChecking";
+std::string const kSettingsSpellingLanguageKey            = "spellingLanguage";
+
+std::string const kSettingsThemeKey                       = "theme";
+std::string const kSettingsFontNameKey                    = "fontName";
+std::string const kSettingsFontSizeKey                    = "fontSize";
+std::string const kSettingsSoftWrapKey                    = "softWrap";
+std::string const kSettingsWrapColumnKey                  = "wrapColumn";
+std::string const kSettingsShowWrapColumnKey              = "showWrapColumn";
+std::string const kSettingsShowInvisiblesKey              = "showInvisibles";
+
+std::string const kSettingsProjectDirectoryKey            = "projectDirectory";
+std::string const kSettingsWindowTitleKey                 = "windowTitle";
+std::string const kSettingsScopeAttributesKey             = "scopeAttributes";
+
+std::string const kSettingsBinaryKey                      = "binary";
+std::string const kSettingsEncodingKey                    = "encoding";
+std::string const kSettingsUseBOMKey                      = "useBOM";
+std::string const kSettingsStoreEncodingPerFileKey        = "storeEncodingPerFile";
+
+std::string const kSettingsIncludeKey                     = "include";
+std::string const kSettingsIncludeDirectoriesKey          = "includeDirectories";
+std::string const kSettingsIncludeDirectoriesInBrowserKey = "includeDirectoriesInBrowser";
+std::string const kSettingsIncludeFilesKey                = "includeFiles";
+std::string const kSettingsIncludeFilesInBrowserKey       = "includeFilesInBrowser";
+std::string const kSettingsIncludeFilesInFileChooserKey   = "includeFilesInFileChooser";
+std::string const kSettingsIncludeInBrowserKey            = "includeInBrowser";
+std::string const kSettingsIncludeInFileChooserKey        = "includeInFileChooser";
+
+std::string const kSettingsExcludeKey                     = "exclude";
+std::string const kSettingsExcludeDirectoriesKey          = "excludeDirectories";
+std::string const kSettingsExcludeDirectoriesInBrowserKey = "excludeDirectoriesInBrowser";
+std::string const kSettingsExcludeFilesKey                = "excludeFiles";
+std::string const kSettingsExcludeFilesInBrowserKey       = "excludeFilesInBrowser";
+std::string const kSettingsExcludeInBrowserKey            = "excludeInBrowser";
+std::string const kSettingsExcludeInFileChooserKey        = "excludeInFileChooser";
+std::string const kSettingsExcludeInFolderSearchKey       = "excludeInFolderSearch";

--- /dev/null
+++ b/Frameworks/settings/src/keys.h
@@ -0,0 +1,49 @@
+#ifndef SETTINGS_KEYS_H_7IGXFQJ6
+#define SETTINGS_KEYS_H_7IGXFQJ6
+
+#include <oak/misc.h>
+
+PUBLIC extern std::string const kSettingsFileTypeKey;
+
+PUBLIC extern std::string const kSettingsTabSizeKey;
+PUBLIC extern std::string const kSettingsSoftTabsKey;
+
+PUBLIC extern std::string const kSettingsSpellCheckingKey;
+PUBLIC extern std::string const kSettingsSpellingLanguageKey;
+
+PUBLIC extern std::string const kSettingsThemeKey;
+PUBLIC extern std::string const kSettingsFontNameKey;
+PUBLIC extern std::string const kSettingsFontSizeKey;
+PUBLIC extern std::string const kSettingsSoftWrapKey;
+PUBLIC extern std::string const kSettingsWrapColumnKey;
+PUBLIC extern std::string const kSettingsShowWrapColumnKey;
+PUBLIC extern std::string const kSettingsShowInvisiblesKey;
+
+PUBLIC extern std::string const kSettingsProjectDirectoryKey;
+PUBLIC extern std::string const kSettingsWindowTitleKey;
+PUBLIC extern std::string const kSettingsScopeAttributesKey;
+
+PUBLIC extern std::string const kSettingsBinaryKey;
+PUBLIC extern std::string const kSettingsEncodingKey;
+PUBLIC extern std::string const kSettingsUseBOMKey;
+PUBLIC extern std::string const kSettingsStoreEncodingPerFileKey;
+
+PUBLIC extern std::string const kSettingsIncludeKey;
+PUBLIC extern std::string const kSettingsIncludeDirectoriesKey;
+PUBLIC extern std::string const kSettingsIncludeDirectoriesInBrowserKey;
+PUBLIC extern std::string const kSettingsIncludeFilesKey;
+PUBLIC extern std::string const kSettingsIncludeFilesInBrowserKey;
+PUBLIC extern std::string const kSettingsIncludeFilesInFileChooserKey;
+PUBLIC extern std::string const kSettingsIncludeInBrowserKey;
+PUBLIC extern std::string const kSettingsIncludeInFileChooserKey;
+
+PUBLIC extern std::string const kSettingsExcludeKey;
+PUBLIC extern std::string const kSettingsExcludeDirectoriesKey;
+PUBLIC extern std::string const kSettingsExcludeDirectoriesInBrowserKey;
+PUBLIC extern std::string const kSettingsExcludeFilesKey;
+PUBLIC extern std::string const kSettingsExcludeFilesInBrowserKey;
+PUBLIC extern std::string const kSettingsExcludeInBrowserKey;
+PUBLIC extern std::string const kSettingsExcludeInFileChooserKey;
+PUBLIC extern std::string const kSettingsExcludeInFolderSearchKey;
+
+#endif /* end of include guard: SETTINGS_KEYS_H_7IGXFQJ6 */

--- a/Frameworks/settings/src/settings.h
+++ b/Frameworks/settings/src/settings.h
@@ -1,6 +1,7 @@
 #ifndef SETTINGS_H_F99MMG5F
 #define SETTINGS_H_F99MMG5F
 
+#include "keys.h"
 #include <io/io.h>
 #include <oak/oak.h>
 #include <text/format.h>

--- a/Frameworks/settings/target
+++ b/Frameworks/settings/target
@@ -1,4 +1,4 @@
 TEST_SOURCES = tests/*.cc
 SOURCES      = src/*.{cc,rl}
-EXPORT       = src/{settings,volume,track_paths}.h
+EXPORT       = src/{settings,volume,track_paths,keys}.h
 LINK        += io plist OakSystem regexp scope