ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

data: cleaning xml tag names

Browse Source 
* replaced xml tags that have been written in PascalCase with the underscore_notation throughout all of the settings files.
This commit is contained in:
malte_langkabel
2015-10-20 11:08:42 +02:00
parent a73906252e
commit 73b25c45ff
5 changed files with 49 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/app/data/ApplicationSettings_template.xml
+11 -11
View File
@@ -7,21 +7,21 @@
<!-- COLOR: int int int int - rgba e.g. 125 125 125 255 -->
<config>
<StartupProject><!-- STRING: path to project settings xml file --></StartupProject>
<startup_project><!-- STRING: path to project settings xml file --></startup_project>
<source>
<CompilerFlags>
<CompilerFlag><!-- STRING: compiler flag, including the dash e.g. -v --></CompilerFlag>
</CompilerFlags>
<compiler_flags>
<compiler_flag><!-- STRING: compiler flag, including the dash e.g. -v --></compiler_flag>
</compiler_flags>
<HeaderSearchPaths>
<HeaderSearchPath><!-- STRING: header search path for each path a HeaderSearchPath element --></HeaderSearchPath>
</HeaderSearchPaths>
<header_search_paths>
<header_search_path><!-- STRING: header search path for each path a header_search_path element --></header_search_path>
</header_search_paths>
<!-- MAC ONLY -->
<FrameworkSearchPaths>
<FrameworkSearchPath><!-- STRING: framework search path --></FrameworkSearchPath>
</FrameworkSearchPaths>
<framework_search_paths>
<framework_search_path><!-- STRING: framework search path --></framework_search_path>
</framework_search_paths>
</source>
<application>
@@ -31,7 +31,7 @@
</application>
<code>
<TabWidth><!-- INTEGER: number of spaces to represent a tab in code files --></TabWidth>
<tab_width><!-- INTEGER: number of spaces to represent a tab in code files --></tab_width>
<snippet>
<snap_range><!-- INTEGER: max amount of lines that the current snippet will be extended to snap to scope start/end --></snap_range>
bin/app/data/ProjectSettings_template.xml
+16 -16
View File
@@ -8,27 +8,27 @@
<config>
<source>
<SourcePaths>
<SourcePath><!-- STRING: path to source file or directory, also used as header search path --></SourcePath>
</SourcePaths>
<source_paths>
<source_path><!-- STRING: path to source file or directory, also used as header search path --></source_path>
</source_paths>
<CompilerFlags>
<CompilerFlag><!-- STRING: compiler flag, including the dash e.g. -v --></CompilerFlag>
</CompilerFlags>
<compiler_flags>
<compiler_flag><!-- STRING: compiler flag, including the dash e.g. -v --></compiler_flag>
</compiler_flags>
<HeaderSearchPaths>
<HeaderSearchPath><!-- STRING: header search path for each path a HeaderSearchPath element --></HeaderSearchPath>
</HeaderSearchPaths>
<header_search_paths>
<header_search_path><!-- STRING: header search path for each path a header_search_path element --></header_search_path>
</header_search_paths>
<!-- MAC ONLY -->
<FrameworkSearchPaths>
<FrameworkSearchPath><!-- STRING: framework search path --></FrameworkSearchPath>
</FrameworkSearchPaths>
<framework_search_paths>
<framework_search_path><!-- STRING: framework search path --></framework_search_path>
</framework_search_paths>
<Extensions>
<HeaderExtensions><!-- STRING: extension for header/include e.g. .h --></HeaderExtensions>
<SourceExtensions><!-- STRING: extension for source e.g. .cpp --></SourceExtensions>
</Extensions>
<extensions>
<header_extensions><!-- STRING: extension for header/include e.g. .h --></header_extensions>
<source_extensions><!-- STRING: extension for source e.g. .cpp --></source_extensions>
</extensions>
</source>
</config>
bin/app/data/test.xml
-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<config>
<source>
<SourcePath>data/src</SourcePath>
</source>
</config>
src/lib/settings/ApplicationSettings.cpp
+8 -8
View File
@@ -18,33 +18,33 @@ ApplicationSettings::~ApplicationSettings()
std::string ApplicationSettings::getStartupProjectFilePath() const
{
return getValue<std::string>("StartupProject", "");
return getValue<std::string>("startup_project", "");
}
std::vector<FilePath> ApplicationSettings::getHeaderSearchPaths() const
{
return getPathValues("source/HeaderSearchPaths/HeaderSearchPath");
return getPathValues("source/header_search_paths/header_search_path");
}
bool ApplicationSettings::setHeaderSearchPaths(const std::vector<FilePath>& headerSearchPaths)
{
return setPathValues("source/HeaderSearchPaths/HeaderSearchPath", headerSearchPaths);
return setPathValues("source/header_search_paths/header_search_path", headerSearchPaths);
}
std::vector<FilePath> ApplicationSettings::getFrameworkSearchPaths() const
{
return getPathValues("source/FrameworkSearchPaths/FrameworkSearchPath");
return getPathValues("source/framework_search_paths/framework_search_path");
}
bool ApplicationSettings::setFrameworkSearchPaths(const std::vector<FilePath>& frameworkSearchPaths)
{
return setPathValues("source/FrameworkSearchPaths/FrameworkSearchPath", frameworkSearchPaths);
return setPathValues("source/framework_search_paths/framework_search_path", frameworkSearchPaths);
}
std::vector<std::string> ApplicationSettings::getCompilerFlags() const
{
std::vector<std::string> defaultValues;
return getValues("source/CompilerFlags/CompilerFlag", defaultValues);
return getValues("source/compiler_flags/compiler_flag", defaultValues);
}
std::string ApplicationSettings::getFontName() const
@@ -79,12 +79,12 @@ void ApplicationSettings::setColorSchemePath(const std::string& colorSchemePath)
int ApplicationSettings::getCodeTabWidth() const
{
return getValue<int>("code/TabWidth", 4);
return getValue<int>("code/tab_width", 4);
}
void ApplicationSettings::setCodeTabWidth(int codeTabWidth)
{
setValue<int>("code/TabWidth", codeTabWidth);
setValue<int>("code/tab_width", codeTabWidth);
}
int ApplicationSettings::getCodeSnippetSnapRange() const
src/lib/settings/ProjectSettings.cpp
+14 -14
View File
@@ -39,65 +39,65 @@ ProjectSettings::~ProjectSettings()
void ProjectSettings::save(const FilePath& filePath)
{
moveRelativePathValues("source/SourcePaths/SourcePath", filePath);
moveRelativePathValues("source/HeaderSearchPaths/HeaderSearchPath", filePath);
moveRelativePathValues("source/FrameworkSearchPaths/FrameworkSearchPath", filePath);
moveRelativePathValues("source/source_paths/source_path", filePath);
moveRelativePathValues("source/header_search_paths/header_search_path", filePath);
moveRelativePathValues("source/framework_search_paths/framework_search_path", filePath);
Settings::save(filePath);
}
std::vector<FilePath> ProjectSettings::getSourcePaths() const
{
return getRelativePathValues("source/SourcePaths/SourcePath");
return getRelativePathValues("source/source_paths/source_path");
}
bool ProjectSettings::setSourcePaths(const std::vector<FilePath>& sourcePaths)
{
return setPathValues("source/SourcePaths/SourcePath", sourcePaths);
return setPathValues("source/source_paths/source_path", sourcePaths);
}
std::vector<FilePath> ProjectSettings::getHeaderSearchPaths() const
{
return getRelativePathValues("source/HeaderSearchPaths/HeaderSearchPath");
return getRelativePathValues("source/header_search_paths/header_search_path");
}
bool ProjectSettings::setHeaderSearchPaths(const std::vector<FilePath>& headerSearchPaths)
{
return setPathValues("source/HeaderSearchPaths/HeaderSearchPath", headerSearchPaths);
return setPathValues("source/header_search_paths/header_search_path", headerSearchPaths);
}
std::vector<FilePath> ProjectSettings::getFrameworkSearchPaths() const
{
return getRelativePathValues("source/FrameworkSearchPaths/FrameworkSearchPath");
return getRelativePathValues("source/framework_search_paths/framework_search_path");
}
bool ProjectSettings::setFrameworkSearchPaths(const std::vector<FilePath>& frameworkSearchPaths)
{
return setPathValues("source/FrameworkSearchPaths/FrameworkSearchPath", frameworkSearchPaths);
return setPathValues("source/framework_search_paths/framework_search_path", frameworkSearchPaths);
}
std::vector<std::string> ProjectSettings::getCompilerFlags() const
{
std::vector<std::string> defaultValues;
return getValues("source/CompilerFlags/CompilerFlag", defaultValues);
return getValues("source/compiler_flags/compiler_flag", defaultValues);
}
std::vector<std::string> ProjectSettings::getHeaderExtensions() const
{
return getValues("source/Extensions/HeaderExtensions", getDefaultHeaderExtensions());
return getValues("source/extensions/header_extensions", getDefaultHeaderExtensions());
}
std::vector<std::string> ProjectSettings::getSourceExtensions() const
{
return getValues("source/Extensions/SourceExtensions", getDefaultSourceExtensions());
return getValues("source/extensions/source_extensions", getDefaultSourceExtensions());
}
bool ProjectSettings::setHeaderExtensions(const std::vector<std::string> &headerExtensions)
{
return setValues("source/Extensions/HeaderExtensions", headerExtensions);
return setValues("source/extensions/header_extensions", headerExtensions);
}
bool ProjectSettings::setSourceExtensions(const std::vector<std::string> &sourceExtensions)
{
return setValues("source/Extensions/SourceExtensions", sourceExtensions);
return setValues("source/extensions/source_extensions", sourceExtensions);
}