Skip to content

Commit 8497564

Browse files
committed
Basic grammer check
1 parent 1df240b commit 8497564

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1010
- Exposed "sago::internal::getHome()". It might be useful when converting from old file placement.
1111

1212
### Changed
13-
- Tested and supports newer versions of CMake
13+
- Now supports newer versions of CMake
1414

1515
## [4.2.0] 2022-02-06
1616

@@ -44,7 +44,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
4444
- Now requires a C++11 compatible compiler (was C++98)
4545
- Minimum Windows version raised from Windows XP to Windows 7.
4646
- The Mac version no longer depends on CoreServices
47-
- The XDG implementation are slightly more resilient to unrelated environments in user-dirs.dirs
47+
- The XDG implementation is slightly more resilient to unrelated environments in user-dirs.dirs
4848
- Improved CMake system
4949

5050
### Removed
@@ -68,7 +68,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
6868
- Appveyor CI integration (Thanks @sum01)
6969

7070
### Changed
71-
- Optimised use of iterator.
71+
- Optimized use of iterators.
7272
- No longer keeps empty data structure on Mac and Windows platforms.
7373

7474
## [3.0] 2016-10-08
@@ -93,7 +93,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
9393
## [2.0] 2015-10-26
9494

9595
### Added
96-
- Mac OS X support using Core Framework
96+
- Mac OS X support using CoreServices Framework
9797

9898
## [1.0] 2015-09-21
9999
Designed to work with Linux and Windows XP+

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ A C++ library to look for directories like `My Documents`, `~/.config`, `%APPDAT
99
There are a lot of platform abstraction libraries available. You can get graphics abstraction libraries, GUI abstraction libraries and file abstraction libraries.
1010

1111
But folder abstraction seems to be more difficult.
12-
My problem was that the code that found the place to save data was platform dependent. This cluttered my code and often I would not discover that it did not compile until moving it to the different platforms.
12+
My problem was that the code that found the place to save data was platform-dependent. This cluttered my code and often I would not discover that it did not compile until moving it to the different platforms.
1313

1414
[I have written a bit more about it here.](https://sago007.blogspot.dk/2015/10/abstraction-for-special-folders.html)
1515

@@ -18,7 +18,7 @@ There are some alternatives that you might consider instead:
1818
* [QStandardPaths](https://doc.qt.io/qt-5/qstandardpaths.html)
1919
* [glib](https://developer.gnome.org/glib/stable/glib-Miscellaneous-Utility-Functions.html)
2020

21-
Both are properly more mature than this library. However they are both parts of large frameworks and using them with libraries outside the framework may not be that simple.
21+
Both are probably more mature than this library. However they are both parts of large frameworks and using them with libraries outside the framework may not be that simple.
2222

2323
## Operating System Support
2424

@@ -34,9 +34,9 @@ It should work on any Unix system that has the following headers available: `pwd
3434

3535
### macOS
3636

37-
Version 4.0.0 and forward uses hardcoded values for the directories on Mac OS X. Unlike the other operating systems the folders cannot be moved on a Mac and the translation is done in the UI.
38-
The versions 2.X and 3.X uses the deprecated FSFindFolder, which requires the CoreServices framework during linking.
39-
Version 1.X simple used the XDG specification.
37+
Version 4.0.0 and onwards use hardcoded values for the directories on Mac OS X. Unlike the other operating systems the folders cannot be moved on a Mac and the translation is done in the UI.
38+
The versions 2.X and 3.X use the deprecated FSFindFolder, which requires the CoreServices framework during linking.
39+
Version 1.X simply used the XDG specification.
4040

4141
## Usage
4242

@@ -173,6 +173,6 @@ From version 3.0, Windows always encodes to UTF-8, and this will be the default
173173
Before version 3.0, Windows was encoded in ANSI.
174174
Although the user may use any characters they want, I recommend that the program should have only ASCII characters in the source code itself.
175175

176-
# Licence
176+
# License
177177

178178
Provided under the MIT license for the same reason XDG is licensed under it. So that you can quickly copy-paste the methods you need or just include the "sago"-folder.

sago/platform_folders.h

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Its is under the MIT license, to encourage reuse by cut-and-paste.
2+
It is under the MIT license, to encourage reuse by cut-and-paste.
33
44
The original files are hosted here: https://github.com/sago007/PlatformFolders
55
@@ -33,7 +33,7 @@ SOFTWARE.
3333
#include <string>
3434

3535
/**
36-
* The namespace I use for common function. Nothing special about it.
36+
* The namespace I use for common functions. Nothing special about it.
3737
*/
3838
namespace sago {
3939

@@ -52,7 +52,7 @@ std::string getHome();
5252
#endif //DOXYGEN_SHOULD_SKIP_THIS
5353

5454
/**
55-
* Retrives the base folder for storing data files.
55+
* Retrieves the base folder for storing data files.
5656
* You must add the program name yourself like this:
5757
* @code{.cpp}
5858
* string data_home = getDataHome()+"/My Program Name/";
@@ -64,7 +64,7 @@ std::string getHome();
6464
std::string getDataHome();
6565

6666
/**
67-
* Retrives the base folder for storing config files.
67+
* Retrieves the base folder for storing config files.
6868
* You must add the program name yourself like this:
6969
* @code{.cpp}
7070
* string data_home = getConfigHome()+"/My Program Name/";
@@ -76,7 +76,7 @@ std::string getDataHome();
7676
std::string getConfigHome();
7777

7878
/**
79-
* Retrives the base folder for storing cache files.
79+
* Retrieves the base folder for storing cache files.
8080
* You must add the program name yourself like this:
8181
* @code{.cpp}
8282
* string data_home = getCacheDir()+"/My Program Name/cache/";
@@ -89,27 +89,27 @@ std::string getConfigHome();
8989
std::string getCacheDir();
9090

9191
/**
92-
* Retrives the base folder used for state files.
92+
* Retrieves the base folder used for state files.
9393
* You must add the program name yourself like this:
9494
* @code{.cpp}
9595
* string data_home = getStateDir()+"/My Program Name/";
9696
* @endcode
9797
* On Windows this defaults to %APPDATALOCAL%
9898
* On Linux this defaults to ~/.local/state but can be configured by the user
9999
* On OS X this is the same as getDataHome()
100-
* @return The base folder for storing data that do not need to be backed up but should not be reguarly deleted either.
100+
* @return The base folder for storing data that do not need to be backed up but should not be regularly deleted either.
101101
*/
102102
std::string getStateDir();
103103

104104
/**
105105
* This will append extra folders that your program should be looking for data files in.
106-
* This does not normally include the path returned by GetDataHome().
106+
* This does not normally include the path returned by getDataHome().
107107
* If you want all the folders you should do something like:
108108
* @code{.cpp}
109109
* vector<string> folders;
110110
* folders.push_back(getDataHome());
111111
* appendAdditionalDataDirectories(folders);
112-
* for (string s& : folders) {
112+
* for (string& s : folders) {
113113
* s+="/My Program Name/";
114114
* }
115115
* @endcode
@@ -121,13 +121,13 @@ void appendAdditionalDataDirectories(std::vector<std::string>& homes);
121121

122122
/**
123123
* This will append extra folders that your program should be looking for config files in.
124-
* This does not normally include the path returned by GetConfigHome().
124+
* This does not normally include the path returned by getConfigHome().
125125
* If you want all the folders you should do something like:
126126
* @code{.cpp}
127127
* std::vector<std::string> folders;
128128
* folders.push_back(sago::getConfigHome());
129129
* sago::appendAdditionalConfigDirectories(folders);
130-
* for (std::string s& : folders) {
130+
* for (std::string& s : folders) {
131131
* s+="/My Program Name/";
132132
* }
133133
* @endcode
@@ -194,8 +194,8 @@ std::string getVideoFolder();
194194
* string saved_games_folder = sago::getSaveGamesFolder1()+"/My Program Name/";
195195
* @endcode
196196
* @note Windows: This is an XP compatible version and returns the path to "My Games" in Documents. Vista and later has an official folder.
197-
* @note Linux: XDF does not define a folder for saved games. This will just return the same as GetDataHome()
198-
* @return The folder base folder for storing save games.
197+
* @note Linux: XDG does not define a folder for saved games. This will just return the same as getDataHome()
198+
* @return The base folder for storing save games.
199199
*/
200200
std::string getSaveGamesFolder1();
201201

@@ -205,18 +205,18 @@ std::string getSaveGamesFolder1();
205205
* @code{.cpp}
206206
* string saved_games_folder = sago::getSaveGamesFolder2()+"/My Program Name/";
207207
* @endcode
208-
* @note PlatformFolders provide different folders to for saved games as not all operating systems has support for Saved Games yet.
208+
* @note PlatformFolders provides different folders for saved games as not all operating systems has support for Saved Games yet.
209209
* It is recommended to pick the highest number (currently getSaveGamesFolder2) at the time your product enters production and stick with it
210210
* @note Windows: This returns the "Saved Games" folder. This folder exist in Vista and later
211-
* @note Linux: XDF does not define a folder for saved games. This will just return the same as GetDataHome()
212-
* @return The folder base folder for storing save games.
211+
* @note Linux: XDG does not define a folder for saved games. This will just return the same as getDataHome()
212+
* @return The base folder for storing save games.
213213
*/
214214
std::string getSaveGamesFolder2();
215215

216216
#ifndef DOXYGEN_SHOULD_SKIP_THIS
217217

218218
/**
219-
* This class contains methods for finding the system depended special folders.
219+
* This class contains methods for finding the system-dependent special folders.
220220
* For Windows these folders are either by convention or given by CSIDL.
221221
* For Linux XDG convention is used.
222222
* The Linux version has very little error checking and assumes that the config is correct
@@ -269,8 +269,8 @@ class PlatformFolders {
269269
* string saved_games_folder = pf.getSaveGamesFolder1()+"/My Program Name/";
270270
* @endcode
271271
* @note Windows: This is an XP compatible version and returns the path to "My Games" in Documents. Vista and later has an official folder.
272-
* @note Linux: XDF does not define a folder for saved games. This will just return the same as GetDataHome()
273-
* @return The folder base folder for storing save games.
272+
* @note Linux: XDG does not define a folder for saved games. This will just return the same as getDataHome()
273+
* @return The base folder for storing save games.
274274
*/
275275
std::string getSaveGamesFolder1() const;
276276
private:

0 commit comments

Comments
 (0)