04.11.2011 - adjust for Windows & QNX, multiprotocol, repeater, signals, process, codec, console input

This commit is contained in:
peri4
2011-11-04 15:33:15 +03:00
parent 39ec9cac5c
commit e25553b97b
32 changed files with 468 additions and 294 deletions

View File

@@ -308,7 +308,7 @@ string PIString::convertToStd() const {
char PIString::toChar() const {
PIString s(toNativeDecimalPoints());
char v;
sscanf(s.data(), "%c", &v);
sscanf(s.stdString().c_str(), "%c", &v);
return v;
}
@@ -316,9 +316,9 @@ char PIString::toChar() const {
short PIString::toShort() const {
PIString s(trimmed().toLowerCase().toNativeDecimalPoints());
short v;
if (s.left(2) == "0x") {sscanf(s.data(), "%hx", &v); return v;}
if (s.left(1) == "0") {sscanf(s.data(), "%ho", &v); return v;}
sscanf(s.data(), "%hd", &v);
if (s.left(2) == "0x") {sscanf(s.stdString().c_str(), "%hx", &v); return v;}
if (s.left(1) == "0") {sscanf(s.stdString().c_str(), "%ho", &v); return v;}
sscanf(s.stdString().c_str(), "%hd", &v);
return v;
}
@@ -326,9 +326,9 @@ short PIString::toShort() const {
int PIString::toInt() const {
PIString s(trimmed().toLowerCase().toNativeDecimalPoints());
int v;
if (s.left(2) == "0x") {sscanf(s.data(), "%x", &v); return v;}
if (s.left(1) == "0") {sscanf(s.data(), "%o", &v); return v;}
sscanf(s.data(), "%d", &v);
if (s.left(2) == "0x") {sscanf(s.stdString().c_str(), "%x", &v); return v;}
if (s.left(1) == "0") {sscanf(s.stdString().c_str(), "%o", &v); return v;}
sscanf(s.stdString().c_str(), "%d", &v);
return v;
}
@@ -336,9 +336,9 @@ int PIString::toInt() const {
long PIString::toLong() const {
PIString s(trimmed().toLowerCase().toNativeDecimalPoints());
long v;
if (s.left(2) == "0x") {sscanf(s.data(), "%lx", &v); return v;}
if (s.left(1) == "0") {sscanf(s.data(), "%lo", &v); return v;}
sscanf(s.data(), "%ld", &v);
if (s.left(2) == "0x") {sscanf(s.stdString().c_str(), "%lx", &v); return v;}
if (s.left(1) == "0") {sscanf(s.stdString().c_str(), "%lo", &v); return v;}
sscanf(s.stdString().c_str(), "%ld", &v);
return v;
}
@@ -346,9 +346,9 @@ long PIString::toLong() const {
llong PIString::toLLong() const {
PIString s(trimmed().toLowerCase().toNativeDecimalPoints());
llong v;
if (s.left(2) == "0x") {sscanf(s.data(), "%llx", &v); return v;}
if (s.left(1) == "0") {sscanf(s.data(), "%llo", &v); return v;}
sscanf(s.data(), "%lld", &v);
if (s.left(2) == "0x") {sscanf(s.stdString().c_str(), "%llx", &v); return v;}
if (s.left(1) == "0") {sscanf(s.stdString().c_str(), "%llo", &v); return v;}
sscanf(s.stdString().c_str(), "%lld", &v);
return v;
}