diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-07-17 00:01:45 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2013-07-17 11:11:25 +0200 |
commit | ad9e7ccab6e8476c0cb478ea2e4f13354dc21635 (patch) | |
tree | 9c67e7cfec7e7d0603e9279de9227cdef1cac530 /share | |
parent | c67f7f63497b321f42ee0081f29b7e3804023a10 (diff) | |
download | qt-creator-ad9e7ccab6e8476c0cb478ea2e4f13354dc21635.tar.gz |
Fix coding style for else statements
Change-Id: I1309db70e98d678e150388c76ce665e988fdf081
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'share')
5 files changed, 8 insertions, 14 deletions
diff --git a/share/qtcreator/dumper/dumper.cpp b/share/qtcreator/dumper/dumper.cpp index 8d8fa4195a..0dd4208d3a 100644 --- a/share/qtcreator/dumper/dumper.cpp +++ b/share/qtcreator/dumper/dumper.cpp @@ -3770,9 +3770,7 @@ void *qDumpObjectData440( d.put(",namespace=\"" NS "\","); d.put("dumperversion=\"1.3\","); d.disarm(); - } - - else if (protocolVersion == 2 || protocolVersion == 3) { + } else if (protocolVersion == 2 || protocolVersion == 3) { QDumper d; d.protocolVersion = protocolVersion; @@ -3796,9 +3794,7 @@ void *qDumpObjectData440( << d.outerType << d.iname << d.exp << d.iname; #endif handleProtocolVersion2and3(d); - } - - else { + } else { #if USE_QT_CORE # ifndef QT_BOOTSTRAPPED qDebug() << "Unsupported protocol version" << protocolVersion; diff --git a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp index 06f4568f05..8ed9c60f6a 100644 --- a/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp +++ b/share/qtcreator/qml/qmljsdebugger/editor/liveselectiontool.cpp @@ -257,9 +257,7 @@ void LiveSelectionTool::mouseReleaseEvent(QMouseEvent *event) { if (m_singleSelectionManipulator.isActive()) { m_singleSelectionManipulator.end(event->pos()); - } - else if (m_rubberbandSelectionManipulator.isActive()) { - + } else if (m_rubberbandSelectionManipulator.isActive()) { QPointF mouseMovementVector = m_rubberbandSelectionManipulator.beginPoint() - event->pos(); if (mouseMovementVector.toPoint().manhattanLength() < Constants::DragStartDistance) { m_singleSelectionManipulator.begin(event->pos()); diff --git a/share/qtcreator/qml/qmlobserver/proxysettings.cpp b/share/qtcreator/qml/qmlobserver/proxysettings.cpp index 88aac339d1..473ec01c2b 100644 --- a/share/qtcreator/qml/qmlobserver/proxysettings.cpp +++ b/share/qtcreator/qml/qmlobserver/proxysettings.cpp @@ -84,8 +84,7 @@ QNetworkProxy ProxySettings::httpProxy () proxy.setUser (settings.value ("http_proxy/username", "").toString ()); proxy.setPassword (settings.value ("http_proxy/password", "").toString ()); //QNetworkProxy::setApplicationProxy (proxy); - } - else { + } else { proxy.setType (QNetworkProxy::NoProxy); } return proxy; diff --git a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp index 18f9963d99..9cfdba4f09 100644 --- a/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp @@ -464,7 +464,8 @@ void NodeInstanceClientProxy::dispatchCommand(const QVariant &command) else if (command.userType() == synchronizeCommandType) { SynchronizeCommand synchronizeCommand = command.value<SynchronizeCommand>(); m_synchronizeId = synchronizeCommand.synchronizeId(); - } else + } else { Q_ASSERT(false); + } } } // namespace QmlDesigner diff --git a/share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ExtendedFunctionButton.qml index 46cbfb22b4..1e804835de 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ExtendedFunctionButton.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/ExtendedFunctionButton.qml @@ -38,9 +38,9 @@ AnimatedToolButton { hoverIconFromFile: "images/submenu.png"; function setIcon() { - if (backendValue == null) + if (backendValue == null) { extendedFunctionButton.iconFromFile = "images/placeholder.png" - else if (backendValue.isBound ) { + } else if (backendValue.isBound ) { if (backendValue.isTranslated) { //translations are a special case extendedFunctionButton.iconFromFile = "images/placeholder.png" } else { |