Fix up some faulty variable definitions and clarify others.

This commit is contained in:
Collin Kidder
2015-11-23 09:19:47 -05:00
parent a6198bc20f
commit 1d89fe576e
3 changed files with 26 additions and 26 deletions
+6 -6
View File
@@ -13,33 +13,33 @@ public:
static bool decimalMode;
static int ParseStringToNum(QByteArray input)
static uint64_t ParseStringToNum(QByteArray input)
{
int temp = 0;
uint64_t temp = 0;
input = input.toUpper();
if (input.startsWith("0X") || input.startsWith("X")) //hex number
{
if (input.length() < 3) temp = 0;
else temp = input.right(input.size() - 2).toInt(NULL, 16);
else temp = input.right(input.size() - 2).toLongLong(NULL, 16);
}
else if (input.startsWith("B")) //binary number
{
input = input.right(input.size() - 1); //remove the B
for (int i = 0; i < input.length(); i++)
{
if (input[i] == '1') temp += 1 << (input.length() - i - 1);
if (input[i] == '1') temp += (uint64_t)1 << (input.length() - i - 1);
}
}
else //decimal number
{
temp = input.toInt();
temp = input.toLongLong();
}
return temp;
}
static int ParseStringToNum(QString input)
static uint64_t ParseStringToNum(QString input)
{
return ParseStringToNum(input.toUtf8());
}