From dbc33395997e3fb7c9a15525ff80b7232657832a Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 15 Jun 2014 19:19:07 +0200 Subject: [PATCH] Fixes in samples * removed qSleep / dependency of Qt test libs * QCoreApplication not required --- samples/blackmisc/main.cpp | 5 ++++- samples/blackmiscquantities/main.cpp | 4 +--- samples/blacksim/samplesfscommon.cpp | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/samples/blackmisc/main.cpp b/samples/blackmisc/main.cpp index 6a9548726..135a6be4a 100644 --- a/samples/blackmisc/main.cpp +++ b/samples/blackmisc/main.cpp @@ -19,8 +19,11 @@ using namespace BlackMiscTest; */ int main(int argc, char *argv[]) { + // QCoreApplication a(argc, argv); + Q_UNUSED(argc); + Q_UNUSED(argv); + BlackMisc::initResources(); - QCoreApplication a(argc, argv); CSamplesJson::samples(); CSamplesChangeObject::samples(); CSamplesContainer::samples(); diff --git a/samples/blackmiscquantities/main.cpp b/samples/blackmiscquantities/main.cpp index 5137b9b5f..070c37c97 100644 --- a/samples/blackmiscquantities/main.cpp +++ b/samples/blackmiscquantities/main.cpp @@ -2,7 +2,6 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include #include "samplesphysicalquantities.h" #include "samplesaviation.h" @@ -24,7 +23,6 @@ int main(int argc, char *argv[]) qDebug() << (t ? "Translator loaded" : "Translator not loaded"); QCoreApplication a(argc, argv); - qDebug() << "Use I18N version, y? n?"; int yn = getchar(); t = (yn == 'y' || yn == 'Y'); @@ -34,5 +32,5 @@ int main(int argc, char *argv[]) CSamplesPhysicalQuantities::samples(); CSamplesAviation::samples(); - return a.exec(); + return 0; } diff --git a/samples/blacksim/samplesfscommon.cpp b/samples/blacksim/samplesfscommon.cpp index c51b9b9a1..da90cb074 100644 --- a/samples/blacksim/samplesfscommon.cpp +++ b/samples/blacksim/samplesfscommon.cpp @@ -6,9 +6,9 @@ #include "samplesfscommon.h" #include "blacksim/fscommon/aircraftcfgentrieslist.h" #include "blacksim/fscommon/aircraftindexer.h" + #include #include -#include #include namespace BlackSimTest @@ -49,7 +49,7 @@ namespace BlackSimTest { streamOut << "."; streamOut.flush(); - QTest::qSleep(1000 * 3); + QCoreApplication::processEvents(QEventLoop::AllEvents, 1000 * 3); } while (!f.isFinished()); streamOut << endl << f.result() << " entries" << endl;