diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-05-16 12:59:39 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2014-05-16 14:27:13 +0200 |
commit | 82aa1380f2f31761f53a17b5a5f67417cb5eaf20 (patch) | |
tree | fb6923ec9ec8e6c06915d3b450c7beda9c5c8443 | |
parent | 752668b5f46821fbd62eda710e68d19ed65dd107 (diff) | |
download | qt-creator-82aa1380f2f31761f53a17b5a5f67417cb5eaf20.tar.gz |
Cleanup whitespace
Mostly trailing whitespace
Change-Id: Ic324d20e8159c9d255895248ce04f25c692daf46
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
22 files changed, 38 insertions, 46 deletions
diff --git a/scripts/mytasks.pl b/scripts/mytasks.pl index d212fde953..3eaa82099d 100644 --- a/scripts/mytasks.pl +++ b/scripts/mytasks.pl @@ -113,5 +113,5 @@ while (<PIPE>) { if ($line =~ /^\+(.*)/) { checkLine($1, $filename, $pos); } -} -close(PIPE); +} +close(PIPE); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp index e850552ac8..5c090c1d67 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp @@ -53,7 +53,7 @@ bool PositionerNodeInstance::isResizable() const } PositionerNodeInstance::Pointer PositionerNodeInstance::create(QObject *object) -{ +{ QQuickBasePositioner *positioner = qobject_cast<QQuickBasePositioner*>(object); Q_ASSERT(positioner); diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp index 1138bdd7f7..24b9b2867c 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp @@ -928,7 +928,7 @@ static inline QString fixComponentPathForIncompatibleQt(const QString &component } QObject *ObjectNodeInstance::createComponent(const QString &componentPath, QDeclarativeContext *context) -{ +{ QDeclarativeComponent component(context->engine(), QUrl::fromLocalFile(fixComponentPathForIncompatibleQt(componentPath))); QObject *object = component.beginCreate(context); diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h index bdce9b279e..e79dc8af35 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h @@ -84,7 +84,7 @@ protected: QDeclarativeItem *qmlGraphicsItem() const; QDeclarativeAnchors *anchors() const; void resetHorizontal(); - void resetVertical(); + void resetVertical(); void refresh(); void recursiveDoComponentComplete(QDeclarativeItem *declarativeItem); diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml index c292e93bd6..3d3dc135f7 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml @@ -29,9 +29,9 @@ ** ****************************************************************************/ -Custom project wizard configuration example file. Note that by convention, +Custom project wizard configuration example file. Note that by convention, the project file goes last. -The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and +The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and leave room for the Qt 4 target page. --> <wizard version="1" kind="project" diff --git a/share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml b/share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml index 2a3d0a4405..c3b8b8e872 100644 --- a/share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml +++ b/share/qtcreator/templates/wizards/qtquick1-extension/wizard.xml @@ -29,9 +29,9 @@ ** ****************************************************************************/ -Custom project wizard configuration example file. Note that by convention, +Custom project wizard configuration example file. Note that by convention, the project file goes last. -The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and +The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and leave room for the Qt 4 target page. --> <wizard version="1" kind="project" diff --git a/share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml b/share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml index d99dc5188e..2f5fa35686 100644 --- a/share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml +++ b/share/qtcreator/templates/wizards/qtquick2-extension/wizard.xml @@ -29,9 +29,9 @@ ** ****************************************************************************/ -Custom project wizard configuration example file. Note that by convention, +Custom project wizard configuration example file. Note that by convention, the project file goes last. -The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and +The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and leave room for the Qt 4 target page. --> <wizard version="1" kind="project" diff --git a/src/libs/libs.pro b/src/libs/libs.pro index 148e556945..94b57dc326 100644 --- a/src/libs/libs.pro +++ b/src/libs/libs.pro @@ -44,7 +44,7 @@ minQtVersion(5, 0, 0) { win32:SUBDIRS += utils/process_ctrlc_stub.pro -# Windows: Compile Qt Creator CDB extension if Debugging tools can be detected. +# Windows: Compile Qt Creator CDB extension if Debugging tools can be detected. win32 { include(qtcreatorcdbext/cdb_detect.pri) exists($$CDB_PATH):SUBDIRS += qtcreatorcdbext diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri index 7e88ac570c..53ebfca7fc 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri +++ b/src/libs/qmleditorwidgets/qmleditorwidgets-lib.pri @@ -42,6 +42,6 @@ FORMS += \ contextpanetext.ui include(easingpane/easingpane.pri) - + OTHER_FILES += qmleditorwidgets.pri diff --git a/src/libs/zeroconf/servicebrowser.cpp b/src/libs/zeroconf/servicebrowser.cpp index 23c0ad1bf0..a2cb63b1f8 100644 --- a/src/libs/zeroconf/servicebrowser.cpp +++ b/src/libs/zeroconf/servicebrowser.cpp @@ -606,7 +606,7 @@ void ServiceBrowser::autoRefresh() /*! \fn void errorMessage(ZeroConf::ErrorMessage::SeverityLevel severity, const QString &msg, ZeroConf::ServiceBrowser *browser) - This signal is called every time a warning or error is emitted (for example when a library + This signal is called every time a warning or error is emitted (for example when a library cannot be used and another one has to be used). Zeroconf will still work if severity < FailureLevel. */ /*! diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri index 94056a40b8..0e0e163529 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri @@ -23,7 +23,7 @@ HEADERS += propertyeditorview.h \ propertyeditorwidget.h \ fileresourcesmodel.h \ components/propertyeditor/gradientmodel.h - + QT += qml quick RESOURCES += propertyeditor.qrc diff --git a/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css b/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css index 3465bbc216..60ce428847 100644 --- a/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css +++ b/src/plugins/qmldesigner/components/resources/formeditorstylesheet.css @@ -8,23 +8,16 @@ QLabel { } QStackedWidget { - border: 0px; - background-color: #4e4e4e; + border: 0px; + background-color: #4e4e4e; } QGraphicsView { - padding: 2px; - border: 0px; - background-color: #4e4e4e; + padding: 2px; + border: 0px; + background-color: #4e4e4e; } - - QGraphicsView:focus { - - background-color: #5f5f5f; + background-color: #5f5f5f; } - - - - diff --git a/src/plugins/valgrind/callgrind/callgrind.pri b/src/plugins/valgrind/callgrind/callgrind.pri index 2c93b7ee9d..19c7650c28 100644 --- a/src/plugins/valgrind/callgrind/callgrind.pri +++ b/src/plugins/valgrind/callgrind/callgrind.pri @@ -17,7 +17,7 @@ HEADERS += \ $$PWD/callgrindstackbrowser.h \ $$PWD/callgrindrunner.h -SOURCES += \ +SOURCES += \ $$PWD/callgrindparser.cpp \ $$PWD/callgrindparsedata.cpp \ $$PWD/callgrindfunction.cpp \ diff --git a/src/plugins/valgrind/memcheck/memcheck.pri b/src/plugins/valgrind/memcheck/memcheck.pri index b2d46a715f..37b593d585 100644 --- a/src/plugins/valgrind/memcheck/memcheck.pri +++ b/src/plugins/valgrind/memcheck/memcheck.pri @@ -1,7 +1,7 @@ QT *= network HEADERS += \ - $$PWD/memcheckrunner.h + $$PWD/memcheckrunner.h SOURCES += \ - $$PWD/memcheckrunner.cpp + $$PWD/memcheckrunner.cpp diff --git a/src/shared/proparser/proiteminfo.xml b/src/shared/proparser/proiteminfo.xml index 1425c37150..0224bb166d 100644 --- a/src/shared/proparser/proiteminfo.xml +++ b/src/shared/proparser/proiteminfo.xml @@ -106,5 +106,4 @@ <name>Qt3Support module</name> </value> </variable> - </proiteminfo> diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp index c1f7c91456..21afdb6477 100644 --- a/tests/auto/cplusplus/ast/tst_ast.cpp +++ b/tests/auto/cplusplus/ast/tst_ast.cpp @@ -72,7 +72,7 @@ public: TranslationUnit *parseStatement(const QByteArray &source) { return parse(source, TranslationUnit::ParseStatement); } - + class Diagnostic: public DiagnosticClient { public: int errorCount; @@ -92,8 +92,8 @@ public: } }; - Diagnostic diag; - + Diagnostic diag; + private slots: void initTestCase(); diff --git a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp index ec185ee051..1527f00257 100644 --- a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp +++ b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp @@ -252,7 +252,7 @@ void tst_CodeFormatter::ifStatementWithoutBraces1() << Line(" while (e)") << Line(" bar;") << Line(" else") - << Line(" foo;") + << Line(" foo;") << Line("}") ; checkIndent(data); diff --git a/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp b/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp index 4e77853dbd..f3674c0cc9 100644 --- a/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp +++ b/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp @@ -145,7 +145,7 @@ void tst_SpecificRules::testMatch(Rule *rule) } void tst_SpecificRules::testMatch(Rule *rule, ProgressData *progress) -{ +{ QFETCH(QString, s); QTEST(rule->matchSucceed(s, s.length(), progress), "match"); diff --git a/tests/auto/qtcprocess/qtcprocess.pro b/tests/auto/qtcprocess/qtcprocess.pro index 6c46403de5..c7d54ae03c 100644 --- a/tests/auto/qtcprocess/qtcprocess.pro +++ b/tests/auto/qtcprocess/qtcprocess.pro @@ -3,7 +3,7 @@ include(../qttest.pri) win32:DEFINES += _CRT_SECURE_NO_WARNINGS -SOURCES += tst_qtcprocess.cpp +SOURCES += tst_qtcprocess.cpp DEFINES -= QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS DEFINES -= QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII diff --git a/tests/manual/debugger/gui/mainwindow.cpp b/tests/manual/debugger/gui/mainwindow.cpp index e90e09a5ed..4e26ca2560 100644 --- a/tests/manual/debugger/gui/mainwindow.cpp +++ b/tests/manual/debugger/gui/mainwindow.cpp @@ -83,7 +83,7 @@ MainWindow::~MainWindow() } void MainWindow::simpleBP(int inc, const QString &inx) -{ +{ int array[2] = {1,2}; m_w++; QString x = QLatin1String("h\344all\366"); @@ -295,7 +295,7 @@ void MainWindow::on_actionExtTypes_triggered() std::set<std::string> stdSet; stdSet.insert("s1"); QWidget *ww = this; - QWidget &wwr = *ww; + QWidget &wwr = *ww; QSharedPointer<QString> sps(new QString("hallo")); QList<QSharedPointer<QString> > spsl; spsl.push_back(sps); @@ -317,7 +317,7 @@ void MainWindow::on_actionExtTypes_triggered() QList <QList<int> > nestedIntList; nestedIntList << QList<int>(); - nestedIntList.front() << 1 << 2; + nestedIntList.front() << 1 << 2; QVariantList vList; vList.push_back(QVariant(42)); @@ -360,7 +360,7 @@ void Foo::MainWindow::on_actionScopes_triggered() int x = 2; Q_UNUSED(x) } - qDebug() << x; + qDebug() << x; } void Foo::MainWindow::on_actionLongString_triggered() diff --git a/tests/manual/debugger/gui/tst_gui.cpp b/tests/manual/debugger/gui/tst_gui.cpp index eceef3948a..5d3fdbb756 100644 --- a/tests/manual/debugger/gui/tst_gui.cpp +++ b/tests/manual/debugger/gui/tst_gui.cpp @@ -32,7 +32,7 @@ #include "mainwindow.h" int main(int argc, char *argv[]) -{ +{ QApplication a(argc, argv); qDebug() << "pid=" << QApplication::applicationPid(); Foo::MainWindow w; diff --git a/tests/manual/ssh/sftp/sftp.pro b/tests/manual/ssh/sftp/sftp.pro index eb5b7d8e3b..abb26a865c 100644 --- a/tests/manual/ssh/sftp/sftp.pro +++ b/tests/manual/ssh/sftp/sftp.pro @@ -1,6 +1,6 @@ include(../ssh.pri) -TARGET=sftp -SOURCES=main.cpp sftptest.cpp argumentscollector.cpp -HEADERS=sftptest.h argumentscollector.h parameters.h +TARGET = sftp +SOURCES = main.cpp sftptest.cpp argumentscollector.cpp +HEADERS = sftptest.h argumentscollector.h parameters.h |