diff options
| author | Kitware Robot <kwrobot@kitware.com> | 2018-06-01 13:53:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-01 13:53:42 (GMT) |
| commit | d7204e649ed4ebb19bb341b4e49eb51514364922 (patch) | |
| tree | d9ac3ded5ae6899be7188795011743fe3e6da0a6 /Tests/QtAutogen | |
| parent | 12fed3edb107c949671043196fa94c542b45452a (diff) | |
| download | CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.zip CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.tar.gz CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.tar.bz2 | |
Revise C++ coding style using clang-format-6.0
Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`. Use `clang-format` version 6.0.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Tests/QtAutogen')
| -rw-r--r-- | Tests/QtAutogen/Complex/calwidget.cpp | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/Complex/generated.h | 5 | ||||
| -rw-r--r-- | Tests/QtAutogen/Complex/main.cpp | 4 | ||||
| -rw-r--r-- | Tests/QtAutogen/DefinesTest/defines_test.cpp | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInterface/libwidget.h | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/UicInterface/mywidget.h | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/Tests/QtAutogen/Complex/calwidget.cpp b/Tests/QtAutogen/Complex/calwidget.cpp index 380e982..8ce53f1 100644 --- a/Tests/QtAutogen/Complex/calwidget.cpp +++ b/Tests/QtAutogen/Complex/calwidget.cpp @@ -51,7 +51,7 @@ #include "ui_calwidget.h" #ifdef UI_CALWIDGET_H -#error Definition of UI_CALWIDGET_H should be disabled by file option. +# error Definition of UI_CALWIDGET_H should be disabled by file option. #endif Window::Window() diff --git a/Tests/QtAutogen/Complex/generated.h b/Tests/QtAutogen/Complex/generated.h index 62e1607..cac14de 100644 --- a/Tests/QtAutogen/Complex/generated.h +++ b/Tests/QtAutogen/Complex/generated.h @@ -7,7 +7,10 @@ #include "myinterface.h" #include "myotherinterface.h" -class Generated : public QObject, MyInterface, MyOtherInterface +class Generated + : public QObject + , MyInterface + , MyOtherInterface { Q_OBJECT Q_INTERFACES(MyInterface MyOtherInterface) diff --git a/Tests/QtAutogen/Complex/main.cpp b/Tests/QtAutogen/Complex/main.cpp index d557c70..b5b6ed1 100644 --- a/Tests/QtAutogen/Complex/main.cpp +++ b/Tests/QtAutogen/Complex/main.cpp @@ -52,8 +52,8 @@ #include "xyz.h" #include "yaf.h" #ifdef TEST_DEBUG_CLASS -#include "debug_class.h" -#include <iostream> +# include "debug_class.h" +# include <iostream> #endif int main(int argv, char** args) diff --git a/Tests/QtAutogen/DefinesTest/defines_test.cpp b/Tests/QtAutogen/DefinesTest/defines_test.cpp index cf4e9cb..a533622 100644 --- a/Tests/QtAutogen/DefinesTest/defines_test.cpp +++ b/Tests/QtAutogen/DefinesTest/defines_test.cpp @@ -2,7 +2,7 @@ #include <QObject> #ifdef QT_GUI_LIB -#include <QTextDocument> +# include <QTextDocument> class SomeDocument : public QTextDocument { diff --git a/Tests/QtAutogen/UicInterface/libwidget.h b/Tests/QtAutogen/UicInterface/libwidget.h index b6f3e82..a7ad14f 100644 --- a/Tests/QtAutogen/UicInterface/libwidget.h +++ b/Tests/QtAutogen/UicInterface/libwidget.h @@ -6,7 +6,7 @@ #include <memory> #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) -#include <klocalizedstring.h> +# include <klocalizedstring.h> #endif #include "ui_libwidget.h" diff --git a/Tests/QtAutogen/UicInterface/mywidget.h b/Tests/QtAutogen/UicInterface/mywidget.h index c23e55d..1d31ce7 100644 --- a/Tests/QtAutogen/UicInterface/mywidget.h +++ b/Tests/QtAutogen/UicInterface/mywidget.h @@ -6,7 +6,7 @@ #include <memory> #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) -#include <klocalizedstring.h> +# include <klocalizedstring.h> #endif #include "ui_mywidget.h" |