#6106 Apply clang-format on AppFwk

Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafPdmUiTreeSelectionQModelTest.cpp

@@ -3,8 +3,6 @@
 
 #include "cafPdmUiTreeSelectionQModel.h"
 
-
-
 QList<caf::PdmOptionItemInfo> createOptions()
 {
     QList<caf::PdmOptionItemInfo> options;
@@ -13,121 +11,116 @@ QList<caf::PdmOptionItemInfo> createOptions()
         QString text;
 
         text = "First";
-        options.push_back(caf::PdmOptionItemInfo(text, text));
+        options.push_back( caf::PdmOptionItemInfo( text, text ) );
 
         text = "Second";
-        options.push_back(caf::PdmOptionItemInfo(text, text));
-
+        options.push_back( caf::PdmOptionItemInfo( text, text ) );
 
         {
-            text = "Second_a";
-            caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo(text, text);
-            itemInfo.setLevel(1);
-            options.push_back(itemInfo);
+            text                            = "Second_a";
+            caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo( text, text );
+            itemInfo.setLevel( 1 );
+            options.push_back( itemInfo );
         }
 
         {
-            text = "Second_b";
-            caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo(text, text);
-            itemInfo.setLevel(1);
-            options.push_back(itemInfo);
+            text                            = "Second_b";
+            caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo( text, text );
+            itemInfo.setLevel( 1 );
+            options.push_back( itemInfo );
         }
 
-
         text = "Third";
-        options.push_back(caf::PdmOptionItemInfo(text, text));
+        options.push_back( caf::PdmOptionItemInfo( text, text ) );
 
         text = "Fourth";
-        options.push_back(caf::PdmOptionItemInfo(text, text));
+        options.push_back( caf::PdmOptionItemInfo( text, text ) );
     }
 
     return options;
 }
 
-
-
-
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
-TEST(PdmUiTreeSelectionQModelTest, BasicUsage)
+TEST( PdmUiTreeSelectionQModelTest, BasicUsage )
 {
     QList<caf::PdmOptionItemInfo> options = createOptions();
 
     caf::PdmUiTreeSelectionQModel myModel;
-    myModel.setOptions(nullptr, options);
+    myModel.setOptions( nullptr, options );
 
-    EXPECT_EQ(options.size(), myModel.optionItemCount());
+    EXPECT_EQ( options.size(), myModel.optionItemCount() );
 
-    EXPECT_EQ(4, myModel.rowCount(myModel.index(-1, -1)));
-    
-    EXPECT_EQ(0, myModel.rowCount(myModel.index(0, 0)));
-    EXPECT_EQ(2, myModel.rowCount(myModel.index(1, 0)));
-    EXPECT_EQ(0, myModel.rowCount(myModel.index(2, 0)));
-    EXPECT_EQ(0, myModel.rowCount(myModel.index(3, 0)));
+    EXPECT_EQ( 4, myModel.rowCount( myModel.index( -1, -1 ) ) );
+
+    EXPECT_EQ( 0, myModel.rowCount( myModel.index( 0, 0 ) ) );
+    EXPECT_EQ( 2, myModel.rowCount( myModel.index( 1, 0 ) ) );
+    EXPECT_EQ( 0, myModel.rowCount( myModel.index( 2, 0 ) ) );
+    EXPECT_EQ( 0, myModel.rowCount( myModel.index( 3, 0 ) ) );
 
     // Test for row out of bounds
-    EXPECT_FALSE(myModel.index(4, 0).isValid());
+    EXPECT_FALSE( myModel.index( 4, 0 ).isValid() );
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
-TEST(PdmUiTreeSelectionQModelTest, ParentBehaviour)
+TEST( PdmUiTreeSelectionQModelTest, ParentBehaviour )
 {
     QList<caf::PdmOptionItemInfo> options = createOptions();
 
     caf::PdmUiTreeSelectionQModel myModel;
-    myModel.setOptions(nullptr, options);
+    myModel.setOptions( nullptr, options );
 
-    QModelIndex parentIndex = myModel.index(1, 0);
-    EXPECT_EQ(2, myModel.rowCount(parentIndex));
+    QModelIndex parentIndex = myModel.index( 1, 0 );
+    EXPECT_EQ( 2, myModel.rowCount( parentIndex ) );
 
     {
-        QModelIndex firstChildIndex = myModel.index(0, 0, parentIndex);
-        EXPECT_STREQ("Second_a", myModel.data(firstChildIndex).toString().toLatin1());
-        EXPECT_TRUE(parentIndex == myModel.parent(firstChildIndex));
+        QModelIndex firstChildIndex = myModel.index( 0, 0, parentIndex );
+        EXPECT_STREQ( "Second_a", myModel.data( firstChildIndex ).toString().toLatin1() );
+        EXPECT_TRUE( parentIndex == myModel.parent( firstChildIndex ) );
     }
 
     {
-        QModelIndex secondChildIndex = myModel.index(1, 0, parentIndex);
-        EXPECT_STREQ("Second_b", myModel.data(secondChildIndex).toString().toLatin1());
-        EXPECT_TRUE(parentIndex == myModel.parent(secondChildIndex));
+        QModelIndex secondChildIndex = myModel.index( 1, 0, parentIndex );
+        EXPECT_STREQ( "Second_b", myModel.data( secondChildIndex ).toString().toLatin1() );
+        EXPECT_TRUE( parentIndex == myModel.parent( secondChildIndex ) );
     }
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
-TEST(PdmUiTreeSelectionQModelTest, SetDataAndSignal)
+TEST( PdmUiTreeSelectionQModelTest, SetDataAndSignal )
 {
     QList<caf::PdmOptionItemInfo> options = createOptions();
 
     caf::PdmUiTreeSelectionQModel myModel;
-    myModel.setOptions(nullptr, options);
+    myModel.setOptions( nullptr, options );
 
-    QModelIndex parentIndex = myModel.index(0, 0);
+    QModelIndex parentIndex = myModel.index( 0, 0 );
 
-    myModel.setData(parentIndex, QVariant(true));
+    myModel.setData( parentIndex, QVariant( true ) );
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
-TEST(PdmUiTreeSelectionQModelTest, SetCheckedStateForItems)
+TEST( PdmUiTreeSelectionQModelTest, SetCheckedStateForItems )
 {
     QList<caf::PdmOptionItemInfo> options = createOptions();
 
     caf::PdmUiTreeSelectionQModel myModel;
-    myModel.setOptions(nullptr, options);
+    myModel.setOptions( nullptr, options );
 
-    QModelIndex parentIndex = myModel.index(1, 0);
-    QModelIndex firstChildIndex = myModel.index(0, 0, parentIndex);
+    QModelIndex parentIndex     = myModel.index( 1, 0 );
+    QModelIndex firstChildIndex = myModel.index( 0, 0, parentIndex );
 
     QModelIndexList indices;
     indices << firstChildIndex;
 
-    myModel.setCheckedStateForItems(indices, false);
+    myModel.setCheckedStateForItems( indices, false );
 
     // No test code for this behaviour, only making sure this runs without any errors
 }

Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafPdmUiTreeViewModelTest.cpp

@@ -5,56 +5,48 @@
 #include "cafPdmObject.h"
 #include "cafPdmUiTreeView.h"
 
-#include <QModelIndex>
 #include <QApplication>
+#include <QModelIndex>
 
 using namespace caf;
 
-
-
-class SimpleObj: public caf::PdmObject
+class SimpleObj : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
-public:
-    SimpleObj() : PdmObject()
-    {
-        CAF_PDM_InitObject("SimpleObj", "", "Tooltip SimpleObj", "WhatsThis SimpleObj");
 
-   }
+public:
+    SimpleObj()
+        : PdmObject()
+    {
+        CAF_PDM_InitObject( "SimpleObj", "", "Tooltip SimpleObj", "WhatsThis SimpleObj" );
+    }
     ~SimpleObj() {}
-
 };
-CAF_PDM_SOURCE_INIT(SimpleObj, "SimpleObj");
+CAF_PDM_SOURCE_INIT( SimpleObj, "SimpleObj" );
 
-
-
-class DemoPdmObject: public caf::PdmObject
+class DemoPdmObject : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
+
 public:
-
-    DemoPdmObject() 
-    {   
-        CAF_PDM_InitObject("DemoPdmObject", "", "Tooltip DemoPdmObject", "WhatsThis DemoPdmObject");
-
-        CAF_PDM_InitFieldNoDefault(&m_simpleObjPtrField, "SimpleObjPtrField", "SimpleObjPtrField", "", "Tooltip", "WhatsThis");
-    }
-
-    ~DemoPdmObject() 
+    DemoPdmObject()
     {
-        m_simpleObjPtrField.deleteAllChildObjects();
+        CAF_PDM_InitObject( "DemoPdmObject", "", "Tooltip DemoPdmObject", "WhatsThis DemoPdmObject" );
+
+        CAF_PDM_InitFieldNoDefault( &m_simpleObjPtrField, "SimpleObjPtrField", "SimpleObjPtrField", "", "Tooltip", "WhatsThis" );
     }
 
+    ~DemoPdmObject() { m_simpleObjPtrField.deleteAllChildObjects(); }
+
     caf::PdmChildArrayField<caf::PdmObjectHandle*> m_simpleObjPtrField;
 };
 
-CAF_PDM_SOURCE_INIT(DemoPdmObject, "DemoPdmObject");
-
+CAF_PDM_SOURCE_INIT( DemoPdmObject, "DemoPdmObject" );
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
-TEST(PdmUiTreeViewModelTest, DeleteOneItemAndVerifyTreeOrdering)
+TEST( PdmUiTreeViewModelTest, DeleteOneItemAndVerifyTreeOrdering )
 {
     SimpleObj* obj1 = new SimpleObj;
     SimpleObj* obj2 = new SimpleObj;
@@ -62,29 +54,29 @@ TEST(PdmUiTreeViewModelTest, DeleteOneItemAndVerifyTreeOrdering)
     SimpleObj* obj4 = new SimpleObj;
 
     DemoPdmObject* demoObj = new DemoPdmObject;
-    demoObj->m_simpleObjPtrField.push_back(obj1);
-    demoObj->m_simpleObjPtrField.push_back(obj2);
-    demoObj->m_simpleObjPtrField.push_back(obj3);
-    demoObj->m_simpleObjPtrField.push_back(obj4);
+    demoObj->m_simpleObjPtrField.push_back( obj1 );
+    demoObj->m_simpleObjPtrField.push_back( obj2 );
+    demoObj->m_simpleObjPtrField.push_back( obj3 );
+    demoObj->m_simpleObjPtrField.push_back( obj4 );
 
     PdmUiTreeView treeView;
-    treeView.setPdmItem(demoObj);
+    treeView.setPdmItem( demoObj );
 
     QModelIndex mi;
-    mi = treeView.findModelIndex(obj1);
-    EXPECT_TRUE(mi.isValid());
+    mi = treeView.findModelIndex( obj1 );
+    EXPECT_TRUE( mi.isValid() );
 
-    demoObj->m_simpleObjPtrField.removeChildObject(obj1);
+    demoObj->m_simpleObjPtrField.removeChildObject( obj1 );
     demoObj->m_simpleObjPtrField().uiCapability()->updateConnectedEditors();
 
-    mi = treeView.findModelIndex(obj1);
-    EXPECT_FALSE(mi.isValid());
+    mi = treeView.findModelIndex( obj1 );
+    EXPECT_FALSE( mi.isValid() );
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
-TEST(PdmUiTreeViewModelTest, AddOneItemAndVerifyTreeOrdering)
+TEST( PdmUiTreeViewModelTest, AddOneItemAndVerifyTreeOrdering )
 {
     SimpleObj* obj1 = new SimpleObj;
     SimpleObj* obj2 = new SimpleObj;
@@ -92,28 +84,28 @@ TEST(PdmUiTreeViewModelTest, AddOneItemAndVerifyTreeOrdering)
     SimpleObj* obj4 = new SimpleObj;
 
     DemoPdmObject* demoObj = new DemoPdmObject;
-    demoObj->m_simpleObjPtrField.push_back(obj1);
-    demoObj->m_simpleObjPtrField.push_back(obj2);
-    demoObj->m_simpleObjPtrField.push_back(obj3);
+    demoObj->m_simpleObjPtrField.push_back( obj1 );
+    demoObj->m_simpleObjPtrField.push_back( obj2 );
+    demoObj->m_simpleObjPtrField.push_back( obj3 );
 
     PdmUiTreeView treeView;
-    treeView.setPdmItem(demoObj);
+    treeView.setPdmItem( demoObj );
 
     QModelIndex mi;
-    mi = treeView.findModelIndex(obj4);
-    EXPECT_FALSE(mi.isValid());
+    mi = treeView.findModelIndex( obj4 );
+    EXPECT_FALSE( mi.isValid() );
 
-    demoObj->m_simpleObjPtrField.push_back(obj4);
+    demoObj->m_simpleObjPtrField.push_back( obj4 );
     demoObj->m_simpleObjPtrField().uiCapability()->updateConnectedEditors();
 
-    mi = treeView.findModelIndex(obj4);
-    EXPECT_TRUE(mi.isValid());
+    mi = treeView.findModelIndex( obj4 );
+    EXPECT_TRUE( mi.isValid() );
 }
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
-TEST(PdmUiTreeViewModelTest, ChangeOrderingAndVerifyTreeOrdering)
+TEST( PdmUiTreeViewModelTest, ChangeOrderingAndVerifyTreeOrdering )
 {
     SimpleObj* obj1 = new SimpleObj;
     SimpleObj* obj2 = new SimpleObj;
@@ -121,84 +113,82 @@ TEST(PdmUiTreeViewModelTest, ChangeOrderingAndVerifyTreeOrdering)
     SimpleObj* obj4 = new SimpleObj;
 
     DemoPdmObject* demoObj = new DemoPdmObject;
-    demoObj->m_simpleObjPtrField.push_back(obj1);
-    demoObj->m_simpleObjPtrField.push_back(obj2);
-    demoObj->m_simpleObjPtrField.push_back(obj3);
-    demoObj->m_simpleObjPtrField.push_back(obj4);
+    demoObj->m_simpleObjPtrField.push_back( obj1 );
+    demoObj->m_simpleObjPtrField.push_back( obj2 );
+    demoObj->m_simpleObjPtrField.push_back( obj3 );
+    demoObj->m_simpleObjPtrField.push_back( obj4 );
 
     PdmUiTreeView treeView;
-    treeView.setPdmItem(demoObj);
+    treeView.setPdmItem( demoObj );
 
     QModelIndex mi;
-    mi = treeView.findModelIndex(obj4);
-    EXPECT_EQ(3, mi.row());
+    mi = treeView.findModelIndex( obj4 );
+    EXPECT_EQ( 3, mi.row() );
 
     demoObj->m_simpleObjPtrField.clear();
-    demoObj->m_simpleObjPtrField.push_back(obj1);
-    demoObj->m_simpleObjPtrField.push_back(obj4);
-    demoObj->m_simpleObjPtrField.push_back(obj3);
-    demoObj->m_simpleObjPtrField.push_back(obj2);
+    demoObj->m_simpleObjPtrField.push_back( obj1 );
+    demoObj->m_simpleObjPtrField.push_back( obj4 );
+    demoObj->m_simpleObjPtrField.push_back( obj3 );
+    demoObj->m_simpleObjPtrField.push_back( obj2 );
 
     demoObj->m_simpleObjPtrField().uiCapability()->updateConnectedEditors();
 
-    mi = treeView.findModelIndex(obj4);
-    EXPECT_EQ(1, mi.row());
+    mi = treeView.findModelIndex( obj4 );
+    EXPECT_EQ( 1, mi.row() );
 }
 
-
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
-TEST(PdmUiTreeViewModelTest, ChangeDeepInTreeNotifyRootAndVerifyTreeOrdering)
+TEST( PdmUiTreeViewModelTest, ChangeDeepInTreeNotifyRootAndVerifyTreeOrdering )
 {
     DemoPdmObject* root = new DemoPdmObject;
 
     SimpleObj* rootObj1 = new SimpleObj;
-    root->m_simpleObjPtrField.push_back(rootObj1);
+    root->m_simpleObjPtrField.push_back( rootObj1 );
 
     DemoPdmObject* demoObj = new DemoPdmObject;
-    root->m_simpleObjPtrField.push_back(demoObj);
+    root->m_simpleObjPtrField.push_back( demoObj );
 
     SimpleObj* obj1 = new SimpleObj;
     SimpleObj* obj2 = new SimpleObj;
     SimpleObj* obj3 = new SimpleObj;
     SimpleObj* obj4 = new SimpleObj;
-    demoObj->m_simpleObjPtrField.push_back(obj1);
-    demoObj->m_simpleObjPtrField.push_back(obj2);
-    demoObj->m_simpleObjPtrField.push_back(obj3);
-    demoObj->m_simpleObjPtrField.push_back(obj4);
+    demoObj->m_simpleObjPtrField.push_back( obj1 );
+    demoObj->m_simpleObjPtrField.push_back( obj2 );
+    demoObj->m_simpleObjPtrField.push_back( obj3 );
+    demoObj->m_simpleObjPtrField.push_back( obj4 );
 
     PdmUiTreeView treeView;
-    treeView.setPdmItem(root);
+    treeView.setPdmItem( root );
 
     QModelIndex mi;
-    mi = treeView.findModelIndex(obj4);
-    EXPECT_EQ(3, mi.row());
+    mi = treeView.findModelIndex( obj4 );
+    EXPECT_EQ( 3, mi.row() );
 
-    demoObj->m_simpleObjPtrField.removeChildObject(obj4);
+    demoObj->m_simpleObjPtrField.removeChildObject( obj4 );
 
     root->m_simpleObjPtrField().uiCapability()->updateConnectedEditors();
 
-    mi = treeView.findModelIndex(obj4);
-    EXPECT_FALSE(mi.isValid());
+    mi = treeView.findModelIndex( obj4 );
+    EXPECT_FALSE( mi.isValid() );
 }
 
-
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
-TEST(PdmUiTreeViewModelTest, DISABLED_PerformanceLargeNumberOfItems)
+TEST( PdmUiTreeViewModelTest, DISABLED_PerformanceLargeNumberOfItems )
 {
-    //int objCount = 20000;
+    // int objCount = 20000;
     int objCount = 100000;
 
     DemoPdmObject* demoObj = new DemoPdmObject;
-    for (int i = 0; i < objCount; i++)
+    for ( int i = 0; i < objCount; i++ )
     {
-        demoObj->m_simpleObjPtrField.push_back(new SimpleObj);
+        demoObj->m_simpleObjPtrField.push_back( new SimpleObj );
     }
 
     PdmUiTreeView treeView;
-    treeView.setPdmItem(demoObj);
+    treeView.setPdmItem( demoObj );
     demoObj->m_simpleObjPtrField().uiCapability()->updateConnectedEditors();
 }

Fwk/AppFwk/cafUserInterface/cafUserInterface_UnitTests/cafUserInterface_UnitTests.cpp

@@ -34,26 +34,25 @@
 //
 //##################################################################################################
 
-
 #include "gtest/gtest.h"
-#include <stdio.h>
 #include <iostream>
+#include <stdio.h>
 #include <string>
 
 #include <QApplication>
 
 //--------------------------------------------------------------------------------------------------
-/// 
+///
 //--------------------------------------------------------------------------------------------------
-int main(int argc, char **argv) 
+int main( int argc, char** argv )
 {
-    QApplication app(argc, argv);
+    QApplication app( argc, argv );
 
-    testing::InitGoogleTest(&argc, argv);
+    testing::InitGoogleTest( &argc, argv );
     int result = RUN_ALL_TESTS();
 
     char text[5];
-    std::cin.getline(text, 5);
+    std::cin.getline( text, 5 );
 
     return result;
 }