summaryrefslogtreecommitdiff
path: root/src/os
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2010-08-01 19:44:49 +0000
committerfrosch <frosch@openttd.org>2010-08-01 19:44:49 +0000
commit4bd32799f13480763bfb58db82bb98d1500753ae (patch)
tree3aff9492cad51a7cb456158b0a3a32c90f978fe4 /src/os
parent613b273f36ffd1d300ea08c5d6b1c469d145a591 (diff)
downloadopenttd-4bd32799f13480763bfb58db82bb98d1500753ae.tar.xz
(svn r20286) -Codechange: Unify end of doxygen comments.
Diffstat (limited to 'src/os')
-rw-r--r--src/os/unix/unix.cpp9
-rw-r--r--src/os/windows/win32.cpp18
2 files changed, 18 insertions, 9 deletions
diff --git a/src/os/unix/unix.cpp b/src/os/unix/unix.cpp
index 97a68f592..cec912bec 100644
--- a/src/os/unix/unix.cpp
+++ b/src/os/unix/unix.cpp
@@ -129,7 +129,8 @@ const char *GetCurrentLocale(const char *param);
/**
* Try and try to decipher the current locale from environmental
* variables. MacOSX is hardcoded, other OS's are dynamic. If no suitable
- * locale can be found, don't do any conversion "" */
+ * locale can be found, don't do any conversion ""
+ */
static const char *GetLocalCode()
{
#if defined(__APPLE__)
@@ -178,7 +179,8 @@ static const char *convert_tofrom_fs(iconv_t convd, const char *name)
/**
* Convert from OpenTTD's encoding to that of the local environment
* @param name pointer to a valid string that will be converted
- * @return pointer to a new stringbuffer that contains the converted string */
+ * @return pointer to a new stringbuffer that contains the converted string
+ */
const char *OTTD2FS(const char *name)
{
static iconv_t convd = (iconv_t)(-1);
@@ -198,7 +200,8 @@ const char *OTTD2FS(const char *name)
/**
* Convert to OpenTTD's encoding from that of the local environment
* @param name pointer to a valid string that will be converted
- * @return pointer to a new stringbuffer that contains the converted string */
+ * @return pointer to a new stringbuffer that contains the converted string
+ */
const char *FS2OTTD(const char *name)
{
static iconv_t convd = (iconv_t)(-1);
diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp
index 2cc85cbb7..021ce60a1 100644
--- a/src/os/windows/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -44,7 +44,8 @@ bool MyShowCursor(bool show)
/**
* Helper function needed by dynamically loading libraries
* XXX: Hurray for MS only having an ANSI GetProcAddress function
- * on normal windows and no Wide version except for in Windows Mobile/CE */
+ * on normal windows and no Wide version except for in Windows Mobile/CE
+ */
bool LoadLibraryList(Function proc[], const char *dll)
{
while (*dll != '\0') {
@@ -567,7 +568,8 @@ void CSleep(int milliseconds)
* @param name pointer to a valid string that will be converted (local, or wide)
* @return pointer to the converted string; if failed string is of zero-length
* @see the current code-page comes from video\win32_v.cpp, event-notification
- * WM_INPUTLANGCHANGE */
+ * WM_INPUTLANGCHANGE
+ */
const char *FS2OTTD(const TCHAR *name)
{
static char utf8_buf[512];
@@ -604,7 +606,8 @@ const char *FS2OTTD(const TCHAR *name)
* @param name pointer to a valid string that will be converted (UTF8)
* @return pointer to the converted string; if failed string is of zero-length
* @see the current code-page comes from video\win32_v.cpp, event-notification
- * WM_INPUTLANGCHANGE */
+ * WM_INPUTLANGCHANGE
+ */
const TCHAR *OTTD2FS(const char *name)
{
static TCHAR system_buf[512];
@@ -638,7 +641,8 @@ const TCHAR *OTTD2FS(const char *name)
* @param name pointer to a valid string that will be converted
* @param utf8_buf pointer to a valid buffer that will receive the converted string
* @param buflen length in characters of the receiving buffer
- * @return pointer to utf8_buf. If conversion fails the string is of zero-length */
+ * @return pointer to utf8_buf. If conversion fails the string is of zero-length
+ */
char *convert_from_fs(const wchar_t *name, char *utf8_buf, size_t buflen)
{
int len = WideCharToMultiByte(CP_UTF8, 0, name, -1, utf8_buf, (int)buflen, NULL, NULL);
@@ -658,7 +662,8 @@ char *convert_from_fs(const wchar_t *name, char *utf8_buf, size_t buflen)
* @param utf16_buf pointer to a valid wide-char buffer that will receive the
* converted string
* @param buflen length in wide characters of the receiving buffer
- * @return pointer to utf16_buf. If conversion fails the string is of zero-length */
+ * @return pointer to utf16_buf. If conversion fails the string is of zero-length
+ */
wchar_t *convert_to_fs(const char *name, wchar_t *utf16_buf, size_t buflen)
{
int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, utf16_buf, (int)buflen);
@@ -674,7 +679,8 @@ wchar_t *convert_to_fs(const char *name, wchar_t *utf16_buf, size_t buflen)
* Our very own SHGetFolderPath function for support of windows operating
* systems that don't have this function (eg Win9x, etc.). We try using the
* native function, and if that doesn't exist we will try a more crude approach
- * of environment variables and hope for the best */
+ * of environment variables and hope for the best
+ */
HRESULT OTTDSHGetFolderPath(HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, LPTSTR pszPath)
{
static HRESULT (WINAPI *SHGetFolderPath)(HWND, int, HANDLE, DWORD, LPTSTR) = NULL;