projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ugly default key for console (Ctrl-c then F1) that works even if console is...
[supertux.git]
/
src
/
tinygettext
/
tinygettext.cpp
diff --git
a/src/tinygettext/tinygettext.cpp
b/src/tinygettext/tinygettext.cpp
index
2946f7f
..
ffaaf71
100644
(file)
--- a/
src/tinygettext/tinygettext.cpp
+++ b/
src/tinygettext/tinygettext.cpp
@@
-31,7
+31,6
@@
#include "tinygettext.hpp"
#include "log.hpp"
#include "physfs/physfs_stream.hpp"
#include "tinygettext.hpp"
#include "log.hpp"
#include "physfs/physfs_stream.hpp"
-#include "log.hpp"
#include "findlocale.hpp"
//#define TRANSLATION_DEBUG
#include "findlocale.hpp"
//#define TRANSLATION_DEBUG
@@
-224,7
+223,7
@@
DictionaryManager::parseLocaleAliases()
char c = ' ';
while(in.good() && !in.eof()) {
char c = ' ';
while(in.good() && !in.eof()) {
- while(isspace(
c
) && !in.eof())
+ while(isspace(
static_cast<unsigned char>(c)
) && !in.eof())
in.get(c);
if(c == '#') { // skip comments
in.get(c);
if(c == '#') { // skip comments
@@
-234,14
+233,14
@@
DictionaryManager::parseLocaleAliases()
}
std::string alias;
}
std::string alias;
- while(!isspace(
c
) && !in.eof()) {
+ while(!isspace(
static_cast<unsigned char>(c)
) && !in.eof()) {
alias += c;
in.get(c);
}
alias += c;
in.get(c);
}
- while(isspace(
c
) && !in.eof())
+ while(isspace(
static_cast<unsigned char>(c)
) && !in.eof())
in.get(c);
std::string language;
in.get(c);
std::string language;
- while(!isspace(
c
) && !in.eof()) {
+ while(!isspace(
static_cast<unsigned char>(c)
) && !in.eof()) {
language += c;
in.get(c);
}
language += c;
in.get(c);
}
@@
-719,7
+718,7
@@
public:
do { // Read keyword
token.keyword += c;
do { // Read keyword
token.keyword += c;
- } while((c = getchar(in)) != EOF && !isspace(
c
));
+ } while((c = getchar(in)) != EOF && !isspace(
static_cast<unsigned char>(c)
));
in.unget();
state = READ_CONTENT;
in.unget();
state = READ_CONTENT;
@@
-733,7
+732,7
@@
public:
// Found start of content
state = READ_CONTENT_IN_STRING;
break;
// Found start of content
state = READ_CONTENT_IN_STRING;
break;
- } else if (isspace(
c
)) {
+ } else if (isspace(
static_cast<unsigned char>(c)
)) {
// skip
} else { // Read something that may be a keyword
in.unget();
// skip
} else { // Read something that may be a keyword
in.unget();