From 6b05247d1e353b7b540fc16c29df129bf636e368 Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin+qt@viroteck.net>
Date: Mon, 18 Jun 2012 17:33:58 +0200
Subject: [PATCH] Small cleanup: remove braces from single line conditionals.
Change-Id: I20588ad0634aebec8374a570179ee43dd1b1dd3b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
---
tools/qmlscene/main.cpp | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 4e6dd924f3..06b3c378dc 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -242,9 +242,8 @@ static int displayOptionsDialog(Options *options)
static bool checkVersion(const QUrl &url)
{
- if (!qgetenv("QMLSCENE_IMPORT_NAME").isEmpty()) {
+ if (!qgetenv("QMLSCENE_IMPORT_NAME").isEmpty())
qWarning("QMLSCENE_IMPORT_NAME is no longer supported.");
- }
QString fileName = url.toLocalFile();
if (fileName.isEmpty()) {
@@ -270,11 +269,10 @@ static bool checkVersion(const QUrl &url)
codeFound = true;
} else {
QString import;
- if (quick1.indexIn(line) >= 0) {
+ if (quick1.indexIn(line) >= 0)
import = quick1.cap(0).trimmed();
- } else if (qt47.indexIn(line) >= 0) {
+ else if (qt47.indexIn(line) >= 0)
import = qt47.cap(0).trimmed();
- }
if (!import.isNull()) {
qWarning("qmlscene: '%s' is no longer supported.\n"
@@ -318,9 +316,8 @@ static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory)
if(comp.isError()) {
QList<QQmlError> errors = comp.errors();
- foreach (const QQmlError &error, errors) {
+ foreach (const QQmlError &error, errors)
qWarning() << error;
- }
}
if (dummyData) {
@@ -443,9 +440,8 @@ int main(int argc, char ** argv)
else
window->show();
- if (options.quitImmediately) {
+ if (options.quitImmediately)
QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection);
- }
exitCode = app.exec();
--
GitLab