mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 08:23:04 +02:00
All QDir iterators now sort in lexicographical order.
This commit is contained in:
parent
f3c0118602
commit
5f9f1ab092
5 changed files with 15 additions and 15 deletions
|
@ -156,7 +156,7 @@ void AWSInterface::writeTable(QTextStream& stream) {
|
||||||
// Note that failures are processed first, then successes
|
// Note that failures are processed first, then successes
|
||||||
QStringList originalNamesFailures;
|
QStringList originalNamesFailures;
|
||||||
QStringList originalNamesSuccesses;
|
QStringList originalNamesSuccesses;
|
||||||
QDirIterator it1(_snapshotDirectory.toStdString().c_str());
|
QDirIterator it1(QDir(_snapshotDirectory, "", QDir::Name));
|
||||||
while (it1.hasNext()) {
|
while (it1.hasNext()) {
|
||||||
QString nextDirectory = it1.next();
|
QString nextDirectory = it1.next();
|
||||||
|
|
||||||
|
@ -204,7 +204,7 @@ void AWSInterface::writeTable(QTextStream& stream) {
|
||||||
QDir().rename(originalNamesSuccesses[i], _htmlSuccessesFolder + "/" + newNamesSuccesses[i]);
|
QDir().rename(originalNamesSuccesses[i], _htmlSuccessesFolder + "/" + newNamesSuccesses[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
QDirIterator it2((_htmlFailuresFolder).toStdString().c_str());
|
QDirIterator it2(QDir(_htmlFailuresFolder, "", QDir::Name));
|
||||||
while (it2.hasNext()) {
|
while (it2.hasNext()) {
|
||||||
QString nextDirectory = it2.next();
|
QString nextDirectory = it2.next();
|
||||||
|
|
||||||
|
@ -239,7 +239,7 @@ void AWSInterface::writeTable(QTextStream& stream) {
|
||||||
stream << "\t" << "\t" << "<font color=\"blue\">\n";
|
stream << "\t" << "\t" << "<font color=\"blue\">\n";
|
||||||
stream << "\t" << "\t" << "<h1>The following tests passed:</h1>";
|
stream << "\t" << "\t" << "<h1>The following tests passed:</h1>";
|
||||||
|
|
||||||
QDirIterator it3((_htmlSuccessesFolder).toStdString().c_str());
|
QDirIterator it3(QDir(_htmlSuccessesFolder, "", QDir::Name));
|
||||||
while (it3.hasNext()) {
|
while (it3.hasNext()) {
|
||||||
QString nextDirectory = it3.next();
|
QString nextDirectory = it3.next();
|
||||||
|
|
||||||
|
@ -337,7 +337,7 @@ void AWSInterface::updateAWS() {
|
||||||
stream << "import boto3\n";
|
stream << "import boto3\n";
|
||||||
stream << "s3 = boto3.resource('s3')\n\n";
|
stream << "s3 = boto3.resource('s3')\n\n";
|
||||||
|
|
||||||
QDirIterator it1(_htmlFailuresFolder.toStdString().c_str());
|
QDirIterator it1(QDir(_htmlFailuresFolder, "", QDir::Name));
|
||||||
while (it1.hasNext()) {
|
while (it1.hasNext()) {
|
||||||
QString nextDirectory = it1.next();
|
QString nextDirectory = it1.next();
|
||||||
|
|
||||||
|
@ -372,7 +372,7 @@ void AWSInterface::updateAWS() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QDirIterator it2(_htmlSuccessesFolder.toStdString().c_str());
|
QDirIterator it2(QDir(_htmlSuccessesFolder, "", QDir::Name));
|
||||||
while (it2.hasNext()) {
|
while (it2.hasNext()) {
|
||||||
QString nextDirectory = it2.next();
|
QString nextDirectory = it2.next();
|
||||||
|
|
||||||
|
|
|
@ -542,7 +542,7 @@ void Test::createAllMDFiles() {
|
||||||
createMDFile(_testsRootDirectory);
|
createMDFile(_testsRootDirectory);
|
||||||
}
|
}
|
||||||
|
|
||||||
QDirIterator it(_testsRootDirectory.toStdString().c_str(), QDirIterator::Subdirectories);
|
QDirIterator it(QDir(_testsRootDirectory, "", QDir::Name), QDirIterator::Subdirectories);
|
||||||
while (it.hasNext()) {
|
while (it.hasNext()) {
|
||||||
QString directory = it.next();
|
QString directory = it.next();
|
||||||
|
|
||||||
|
@ -636,7 +636,7 @@ void Test::createAllTestAutoScripts() {
|
||||||
createTestAutoScript(_testsRootDirectory);
|
createTestAutoScript(_testsRootDirectory);
|
||||||
}
|
}
|
||||||
|
|
||||||
QDirIterator it(_testsRootDirectory.toStdString().c_str(), QDirIterator::Subdirectories);
|
QDirIterator it(QDir(_testsRootDirectory, "", QDir::Name), QDirIterator::Subdirectories);
|
||||||
while (it.hasNext()) {
|
while (it.hasNext()) {
|
||||||
QString directory = it.next();
|
QString directory = it.next();
|
||||||
|
|
||||||
|
@ -704,7 +704,7 @@ void Test::createAllRecursiveScripts() {
|
||||||
|
|
||||||
createRecursiveScript(_testsRootDirectory, false);
|
createRecursiveScript(_testsRootDirectory, false);
|
||||||
|
|
||||||
QDirIterator it(_testsRootDirectory.toStdString().c_str(), QDirIterator::Subdirectories);
|
QDirIterator it(QDir(_testsRootDirectory, "", QDir::Name), QDirIterator::Subdirectories);
|
||||||
while (it.hasNext()) {
|
while (it.hasNext()) {
|
||||||
QString directory = it.next();
|
QString directory = it.next();
|
||||||
|
|
||||||
|
@ -716,7 +716,7 @@ void Test::createAllRecursiveScripts() {
|
||||||
|
|
||||||
// Only process directories that have sub-directories
|
// Only process directories that have sub-directories
|
||||||
bool hasNoSubDirectories{ true };
|
bool hasNoSubDirectories{ true };
|
||||||
QDirIterator it2(directory.toStdString().c_str(), QDirIterator::Subdirectories);
|
QDirIterator it2(QDir(directory, "", QDir::Name), QDirIterator::Subdirectories);
|
||||||
while (it2.hasNext()) {
|
while (it2.hasNext()) {
|
||||||
QString directory2 = it2.next();
|
QString directory2 = it2.next();
|
||||||
|
|
||||||
|
@ -787,7 +787,7 @@ void Test::createRecursiveScript(const QString& topLevelDirectory, bool interact
|
||||||
testFound = true;
|
testFound = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
QDirIterator it(topLevelDirectory.toStdString().c_str(), QDirIterator::Subdirectories);
|
QDirIterator it(QDir(topLevelDirectory, "", QDir::Name), QDirIterator::Subdirectories);
|
||||||
while (it.hasNext()) {
|
while (it.hasNext()) {
|
||||||
QString directory = it.next();
|
QString directory = it.next();
|
||||||
|
|
||||||
|
@ -858,7 +858,7 @@ void Test::createTestsOutline() {
|
||||||
int rootDepth { _testDirectory.count('/') };
|
int rootDepth { _testDirectory.count('/') };
|
||||||
|
|
||||||
// Each test is shown as the folder name linking to the matching GitHub URL, and the path to the associated test.md file
|
// Each test is shown as the folder name linking to the matching GitHub URL, and the path to the associated test.md file
|
||||||
QDirIterator it(_testDirectory.toStdString().c_str(), QDirIterator::Subdirectories);
|
QDirIterator it(QDir(_testDirectory, "", QDir::Name), QDirIterator::Subdirectories);
|
||||||
while (it.hasNext()) {
|
while (it.hasNext()) {
|
||||||
QString directory = it.next();
|
QString directory = it.next();
|
||||||
|
|
||||||
|
|
|
@ -275,7 +275,7 @@ void TestRailInterface::processDirectoryPython(const QString& directory,
|
||||||
const QString& userGitHub,
|
const QString& userGitHub,
|
||||||
const QString& branchGitHub) {
|
const QString& branchGitHub) {
|
||||||
// Loop over all entries in directory
|
// Loop over all entries in directory
|
||||||
QDirIterator it(directory.toStdString().c_str());
|
QDirIterator it(QDir(directory, "", QDir::Name));
|
||||||
while (it.hasNext()) {
|
while (it.hasNext()) {
|
||||||
QString nextDirectory = it.next();
|
QString nextDirectory = it.next();
|
||||||
|
|
||||||
|
@ -855,7 +855,7 @@ QDomElement TestRailInterface::processDirectoryXML(const QString& directory,
|
||||||
QDomElement result = element;
|
QDomElement result = element;
|
||||||
|
|
||||||
// Loop over all entries in directory
|
// Loop over all entries in directory
|
||||||
QDirIterator it(directory.toStdString().c_str());
|
QDirIterator it(QDir(directory, "", QDir::Name));
|
||||||
while (it.hasNext()) {
|
while (it.hasNext()) {
|
||||||
QString nextDirectory = it.next();
|
QString nextDirectory = it.next();
|
||||||
|
|
||||||
|
|
|
@ -366,7 +366,7 @@ void TestRunner::createSnapshotFolder() {
|
||||||
// Note that we cannot use just a `png` filter, as the filenames include periods
|
// Note that we cannot use just a `png` filter, as the filenames include periods
|
||||||
// Also, delete any `jpg` and `txt` files
|
// Also, delete any `jpg` and `txt` files
|
||||||
// The idea is to leave only previous zipped result folders
|
// The idea is to leave only previous zipped result folders
|
||||||
QDirIterator it(_snapshotFolder.toStdString().c_str());
|
QDirIterator it(QDir(_snapshotFolder, "", QDir::Name));
|
||||||
while (it.hasNext()) {
|
while (it.hasNext()) {
|
||||||
QString filename = it.next();
|
QString filename = it.next();
|
||||||
if (filename.right(4) == ".png" || filename.right(4) == ".jpg" || filename.right(4) == ".txt") {
|
if (filename.right(4) == ".png" || filename.right(4) == ".jpg" || filename.right(4) == ".txt") {
|
||||||
|
|
|
@ -36,7 +36,7 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) {
|
||||||
_ui.statusLabel->setText("");
|
_ui.statusLabel->setText("");
|
||||||
_ui.plainTextEdit->setReadOnly(true);
|
_ui.plainTextEdit->setReadOnly(true);
|
||||||
|
|
||||||
setWindowTitle("Nitpick - v1.1");
|
setWindowTitle("Nitpick - v1.2");
|
||||||
|
|
||||||
// Coming soon to a nitpick near you...
|
// Coming soon to a nitpick near you...
|
||||||
//// _helpWindow.textBrowser->setText()
|
//// _helpWindow.textBrowser->setText()
|
||||||
|
|
Loading…
Reference in a new issue