mirror of
https://github.com/LongSoft/UEFITool.git
synced 2024-11-22 07:58:22 +08:00
UF QT4 compatibility
- toStdString() replaced with constData() for QByteArray - solved a problem with return codes interpreted as chars
This commit is contained in:
parent
2b21053fca
commit
5497248d40
@ -95,7 +95,7 @@ int main(int argc, char *argv[])
|
|||||||
// Split the read line
|
// Split the read line
|
||||||
QList<QByteArray> list = line.split(' ');
|
QList<QByteArray> list = line.split(' ');
|
||||||
if (list.count() < 3) {
|
if (list.count() < 3) {
|
||||||
std::cout << line.toStdString() << "skipped, too few arguments" << std::endl << std::endl;
|
std::cout << line.constData() << "skipped, too few arguments" << std::endl << std::endl;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// Get search mode
|
// Get search mode
|
||||||
@ -107,7 +107,7 @@ int main(int argc, char *argv[])
|
|||||||
else if (list.at(0) == QString("all"))
|
else if (list.at(0) == QString("all"))
|
||||||
mode = SEARCH_MODE_ALL;
|
mode = SEARCH_MODE_ALL;
|
||||||
else {
|
else {
|
||||||
std::cout << line.toStdString() << "skipped, invalid search mode" << std::endl << std::endl;
|
std::cout << line.constData() << "skipped, invalid search mode" << std::endl << std::endl;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -118,7 +118,7 @@ int main(int argc, char *argv[])
|
|||||||
else if (list.at(1) == QString("count"))
|
else if (list.at(1) == QString("count"))
|
||||||
count = true;
|
count = true;
|
||||||
else {
|
else {
|
||||||
std::cout << line.toStdString() << "skipped, invalid result type" << std::endl << std::endl;
|
std::cout << line.constData() << "skipped, invalid result type" << std::endl << std::endl;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -126,17 +126,17 @@ int main(int argc, char *argv[])
|
|||||||
QString found;
|
QString found;
|
||||||
result = w.find(mode, count, list.at(2), found);
|
result = w.find(mode, count, list.at(2), found);
|
||||||
if (result) {
|
if (result) {
|
||||||
std::cout << line.toStdString() << "skipped, find failed with error " << result << std::endl << std::endl;
|
std::cout << line.constData() << "skipped, find failed with error " << (UINT32)result << std::endl << std::endl;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (found.isEmpty()) {
|
if (found.isEmpty()) {
|
||||||
// Nothing is found
|
// Nothing is found
|
||||||
std::cout << line.toStdString() << "nothing found" << std::endl << std::endl;
|
std::cout << line.constData() << "nothing found" << std::endl << std::endl;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// Print result
|
// Print result
|
||||||
std::cout << line.toStdString() << found.toStdString() << std::endl;
|
std::cout << line.constData() << found.toStdString() << std::endl;
|
||||||
somethingFound = true;
|
somethingFound = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user