use clang-format from system, qt deployed one different results

procitec · Nov 18, 2024 · 763f61e · 763f61e
1 parent 8e5e28e
commit 763f61e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/.clang-format b/.clang-format
@@ -101,5 +101,6 @@ SpacesInSquareBrackets: false
 Standard:        Cpp11
 TabWidth:        2
 UseTab:          Never
+WhitespaceSensitiveMacros: [ 'SIGNAL', 'SLOT' ]
 ...
 
diff --git a/test/browser/main.cpp b/test/browser/main.cpp
@@ -12,16 +12,10 @@ int main( int argc, char** argv )
   parser.setApplicationDescription( "TestBrowser for the qlitehtml browser widget" );
   parser.addHelpOption();
 
-  QCommandLineOption fileOption( QStringList() << "f"
-                                               << "file",
-                                 "Load html file <file> on startup.", "file" );
-  QCommandLineOption dirOption( QStringList() << "d"
-                                              << "dir",
-                                "Set directory to load files from to <directory> on startup.", "dir" );
-
-  QCommandLineOption pathOption( QStringList() << "s"
-                                               << "searchpath",
-                                 "Add <directory> to list of search paths.", "searchpath" );
+  QCommandLineOption fileOption( QStringList() << "f" << "file", "Load html file <file> on startup.", "file" );
+  QCommandLineOption dirOption( QStringList() << "d" << "dir", "Set directory to load files from to <directory> on startup.", "dir" );
+
+  QCommandLineOption pathOption( QStringList() << "s" << "searchpath", "Add <directory> to list of search paths.", "searchpath" );
   parser.addOption( fileOption );
   parser.addOption( dirOption );
   parser.addOption( pathOption );

diff --git a/test/library/test_css_content.cpp b/test/library/test_css_content.cpp
@@ -330,8 +330,7 @@ void HTMLCssTest::test_custom_css_data()
 {
   QTest::addColumn<QString>( "html" );
   QTest::addColumn<QString>( "css" );
-  QTest::newRow( "default line of text" ) << R"-(<html><body><p class="custom">paragraph default color</body></html>)-"
-                                          << R"-()-";
+  QTest::newRow( "default line of text" ) << R"-(<html><body><p class="custom">paragraph default color</body></html>)-" << R"-()-";
   QTest::newRow( "green line of text" ) << R"-(<html><body><p class="custom">paragraph green color</body></html>)-"
                                         << R"-(p.custom { color: green;})-";
   QTest::newRow( "centered red line of text" ) << R"-(<html><body><p class="custom">paragraph red and centered color</body></html>)-"

diff --git a/test/library/test_css_content.h b/test/library/test_css_content.h
@@ -10,7 +10,7 @@ class HTMLCssTest : public TestBase
   Q_OBJECT
 public:
   HTMLCssTest()
-    : TestBase( qApp->arguments() ) {};
+    : TestBase( qApp->arguments() ){};
   virtual ~HTMLCssTest() = default;
 
 private Q_SLOTS:

diff --git a/test/library/test_history.h b/test/library/test_history.h
@@ -10,7 +10,7 @@ class HistoryTest : public TestBase
   Q_OBJECT
 public:
   HistoryTest()
-    : TestBase( qApp->arguments() ) {};
+    : TestBase( qApp->arguments() ){};
   virtual ~HistoryTest() = default;
 
 private Q_SLOTS:

diff --git a/test/library/test_html_content.h b/test/library/test_html_content.h
@@ -10,7 +10,7 @@ class HTMLContentTest : public TestBase
   Q_OBJECT
 public:
   HTMLContentTest()
-    : TestBase( qApp->arguments() ) {};
+    : TestBase( qApp->arguments() ){};
   virtual ~HTMLContentTest() = default;
 
 private Q_SLOTS: