Whitespaces cleanup.

Author: arobenko

.github/workflows/actions_build.yml

@@ -10,8 +10,8 @@ on:
 env:
   CC_CMAKE_CONFIG: config/All.cmake
   WIN_BOOST_VERSION: "1.87.0"
-  WIN_BOOST_DIR: "C:/local/boost_1_87_0"  
-  WIN_OPENSSL_VERSION: "3.6.0"    
+  WIN_BOOST_DIR: "C:/local/boost_1_87_0"
+  WIN_OPENSSL_VERSION: "3.6.0"
 
 jobs:
   build_gcc_ubuntu_24_04:
@@ -25,29 +25,29 @@ jobs:
         qt_ver: [5, 6]
         exclude:
           - cc_ver: 9
-            cpp: 23    
+            cpp: 23
           - cc_ver: 10
-            cpp: 23   
+            cpp: 23
           - cc_ver: 11
-            cpp: 23   
+            cpp: 23
           - cc_ver: 12
-            cpp: 23                             
+            cpp: 23
           - cc_ver: 13
-            cpp: 23         
+            cpp: 23
           - cc_ver: 13
-            cpp: 23  
+            cpp: 23
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Prepare Install
-      run: sudo apt-get update --fix-missing    
-      
+      run: sudo apt-get update --fix-missing
+
     - name: Install Packages
       run: sudo apt install libboost-all-dev qtbase5-dev qt6-base-dev libqt${{matrix.qt_ver}}serialport${{matrix.qt_ver}}-dev libssl-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}}
 
     - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/build      
+      run: cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Configure CMake
       shell: bash
@@ -59,13 +59,13 @@ jobs:
         CC: gcc-${{matrix.cc_ver}}
         CXX: g++-${{matrix.cc_ver}}
 
-    - name: Build Target 
+    - name: Build Target
       working-directory: ${{runner.workspace}}/build
       shell: bash
       run: cmake --build . --config ${{matrix.type}}
       env:
-        VERBOSE: 1 
-      
+        VERBOSE: 1
+
   build_clang_ubuntu_22_04:
     runs-on: ubuntu-22.04
     strategy:
@@ -80,13 +80,13 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Prepare Install
-      run: sudo apt-get update --fix-missing    
-      
+      run: sudo apt-get update --fix-missing
+
     - name: Install Packages
       run: sudo apt install libboost-all-dev qtbase5-dev qt6-base-dev libqt${{matrix.qt_ver}}serialport${{matrix.qt_ver}}-dev libssl-dev clang-${{matrix.cc_ver}}
 
     - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/build      
+      run: cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Configure CMake
       shell: bash
@@ -98,12 +98,12 @@ jobs:
         CC: clang-${{matrix.cc_ver}}
         CXX: clang++-${{matrix.cc_ver}}
 
-    - name: Build Target 
+    - name: Build Target
       working-directory: ${{runner.workspace}}/build
       shell: bash
       run: cmake --build . --config ${{matrix.type}}
       env:
-        VERBOSE: 1 
+        VERBOSE: 1
 
   build_clang_ubuntu_24_04:
     runs-on: ubuntu-24.04
@@ -116,29 +116,29 @@ jobs:
         qt_ver: [5, 6]
         exclude:
           - cc_ver: 14
-            cpp: 20  
+            cpp: 20
           - cc_ver: 14
-            cpp: 23   
+            cpp: 23
           - cc_ver: 15
-            cpp: 20              
+            cpp: 20
           - cc_ver: 15
-            cpp: 23         
+            cpp: 23
           - cc_ver: 16
             cpp: 23
           - cc_ver: 17
-            cpp: 23     
+            cpp: 23
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Prepare Install
-      run: sudo apt-get update --fix-missing    
-      
+      run: sudo apt-get update --fix-missing
+
     - name: Install Packages
       run: sudo apt install libboost-all-dev qtbase5-dev qt6-base-dev libqt${{matrix.qt_ver}}serialport${{matrix.qt_ver}}-dev libssl-dev clang-${{matrix.cc_ver}}
 
     - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/build      
+      run: cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Configure CMake
       shell: bash
@@ -150,13 +150,13 @@ jobs:
         CC: clang-${{matrix.cc_ver}}
         CXX: clang++-${{matrix.cc_ver}}
 
-    - name: Build Target 
+    - name: Build Target
       working-directory: ${{runner.workspace}}/build
       shell: bash
       run: cmake --build . --config ${{matrix.type}}
       env:
-        VERBOSE: 1 
-    
+        VERBOSE: 1
+
   build_msvc_2022:
     runs-on: windows-2022
     strategy:
@@ -171,19 +171,19 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/build   
+      run: cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Install Boost
       shell: cmd
       run: |
-        choco install boost-msvc-14.3 --version=${{env.WIN_BOOST_VERSION}}      
-        echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.3/cmake >>%GITHUB_ENV%    
+        choco install boost-msvc-14.3 --version=${{env.WIN_BOOST_VERSION}}
+        echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.3/cmake >>%GITHUB_ENV%
 
     - name: Install OpenSSL
       if: matrix.arch == 'x64'
       shell: cmd
       run: |
-        choco install openssl --version=${{env.WIN_OPENSSL_VERSION}}              
+        choco install openssl --version=${{env.WIN_OPENSSL_VERSION}}
 
     - name: Install Curl
       shell: cmd
@@ -210,14 +210,13 @@ jobs:
       env:
         QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
 
-    - name: Build Target 
+    - name: Build Target
       working-directory: ${{runner.workspace}}/build
       shell: cmd
       run: cmake --build . --config ${{matrix.type}}
       env:
-        VERBOSE: 1 
+        VERBOSE: 1
 
-    
   build_msvc_2025:
     runs-on: windows-2025
     strategy:
@@ -232,19 +231,19 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/build   
+      run: cmake -E make_directory ${{runner.workspace}}/build
 
     - name: Install Boost
       shell: cmd
       run: |
-        choco install boost-msvc-14.3 --version=${{env.WIN_BOOST_VERSION}}      
-        echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.3/cmake >>%GITHUB_ENV%    
+        choco install boost-msvc-14.3 --version=${{env.WIN_BOOST_VERSION}}
+        echo BOOST_DIR=${{env.WIN_BOOST_DIR}}/lib64-msvc-14.3/cmake >>%GITHUB_ENV%
 
     - name: Install OpenSSL
       if: matrix.arch == 'x64'
       shell: cmd
       run: |
-        choco install openssl --version=${{env.WIN_OPENSSL_VERSION}}              
+        choco install openssl --version=${{env.WIN_OPENSSL_VERSION}}
 
     - name: Install Curl
       shell: cmd
@@ -271,9 +270,9 @@ jobs:
       env:
         QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
 
-    - name: Build Target 
+    - name: Build Target
       working-directory: ${{runner.workspace}}/build
       shell: cmd
       run: cmake --build . --config ${{matrix.type}}
       env:
-        VERBOSE: 1 
+        VERBOSE: 1

CMakeLists.txt

@@ -43,7 +43,7 @@ option (BUILD_SHARED_LIBS "Build as shared libraries (applicable to selected pro
 
 if ("${OPT_EXTERNALS_DIR}" STREQUAL "")
     set (OPT_EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals")
-endif ()    
+endif ()
 
 include(ExternalProject)
 include(${CMAKE_CURRENT_SOURCE_DIR}/Funcs.cmake)
@@ -76,5 +76,5 @@ cc_add_project (cc.mqttsn_client_filter.cc_tools_plugin)
 
 if (WIN32 AND OPT_CC_TOOLS_QT)
     add_custom_target ("deploy_qt"
-        COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/cc_tools_qt --target deploy_qt)    
+        COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR}/cc_tools_qt --target deploy_qt)
 endif ()

DefaultConfig.cmake

@@ -120,13 +120,13 @@ set (boost_params)
 
 macro (add_boost_param name)
     if (DEFINED ${name})
-        list (APPEND boost_params -D${name}=${${name}}) 
+        list (APPEND boost_params -D${name}=${${name}})
     endif ()
 endmacro ()
 
 if (OPT_ALLOW_BOOST)
     find_package (Boost QUIET)
-    
+
     if (TARGET Boost::boost)
         set (boost_enabled ON)
         add_boost_param(BOOST_ROOT)
@@ -159,7 +159,7 @@ set (openssl_enabled OFF)
 
 if (OPT_ALLOW_OPENSSL)
     find_package (OpenSSL QUIET)
-    
+
     if (TARGET OpenSSL::SSL)
         set (openssl_enabled ON)
     endif ()

Funcs.cmake

@@ -12,27 +12,27 @@ function (cc_add_project name)
     set (git_repo_var "${cap_name}_GIT_REPOSITORY")
     if ("${${git_repo_var}}" STREQUAL "")
         set (${git_repo_var} "https://github.com/commschamp/${name}.git")
-    endif ()  
+    endif ()
 
     if (NOT "${${git_repo_var}}" STREQUAL "_")
         set (git_repo_param GIT_REPOSITORY ${${git_repo_var}})
-    endif () 
+    endif ()
 
     set (git_tag_param)
     set (git_tag_var "${cap_name}_GIT_TAG")
     if ("${${git_tag_var}}" STREQUAL "")
         set (${git_tag_var} "${${cap_name}_DEFAULT_TAG}")
-    endif ()    
+    endif ()
 
     if (NOT "${git_repo_param}" STREQUAL "")
         set (git_tag_param GIT_TAG ${${git_tag_var}})
-    endif ()   
+    endif ()
 
     set (dep_param)
     set (dep_var "${cap_name}_DEPENDS")
     if (NOT "${${dep_var}}" STREQUAL "")
         set (dep_param DEPENDS ${${dep_var}})
-    endif ()  
+    endif ()
 
     set (exclude_from_all TRUE)
     set (opt_var "OPT_${cap_name}")
@@ -61,10 +61,10 @@ function (cc_add_project name)
             -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
             ${${cap_name}_DEFAULT_CMAKE_ARGS}
             ${${cap_name}_CMAKE_ARGS}
-        LIST_SEPARATOR |             
+        LIST_SEPARATOR |
         ${dep_param}
         EXCLUDE_FROM_ALL ${exclude_from_all}
-    )      
+    )
 
 endfunction ()
 

README.md

@@ -107,21 +107,21 @@ cmake -DCMAKE_POLICY_DEFAULT_CMP0167=NEW -DCMAKE_PREFIX_PATH=/path/to/boost/cmak
 
 The provided [Dockerfile](docker/Dockerfile) can be used to build any configuration. When no extra build arguments
 are provided all [CommsChampion Ecosystem](https://commschamp.github.io/) applications will end up
-in the final image. 
+in the final image.
 
-All the artifacts will reside in the `/cc` directory (the binary executables will be in `/cc/bin`) and the 
+All the artifacts will reside in the `/cc` directory (the binary executables will be in `/cc/bin`) and the
 [cc.sh](docker/cc.sh) script will be a default entrypoint. There is a user defined and all the applications
 are executed with the selected user permissions. The expected usage of the entrypoint is:
 ```
 /cc.sh <cmd> <cmd_options...>
-``` 
+```
 The `<cmd>` is the name of the binary from the `/cc/bin`. When no arguments are provided then the script
 will list all the available commands. Every binary in the `/cc/bin` is expected to have `-h` command line
 options for help.
 
 Below are the build configuration arguments, default value of which that can be changed with `--build-arg`.
 
-- **CONFIG** (=config/AllDocker.cmake) - Path to the configuration to be used with the 
+- **CONFIG** (=config/AllDocker.cmake) - Path to the configuration to be used with the
   [CMAKE_PROJECT_INCLUDE](https://cmake.org/cmake/help/latest/variable/CMAKE_PROJECT_INCLUDE.html) cmake parameter.
 - **HAS_GUI_APPS** (=true) - Flag to install relevant Qt libraries for the GUI applications.
 - **HAS_BOOST_APPS** (=true) - Flag to install relevant Boost libraries for command line applications.
@@ -192,18 +192,18 @@ docker build --progress=plain \
 
 # AppImage Support
 
-The provided [script/appimage_create.sh](script/appimage_create.sh) script can be used to create 
+The provided [script/appimage_create.sh](script/appimage_create.sh) script can be used to create
 an AppImage binary when the relevant configuration has already been built.
 ```
 ./script/appimage_create.sh /path/to/install /path/to/AppDir
 ```
-Please open the script's code and note the requirement for the `~/bin/linuxdeploy-<arch>.AppImage` 
+Please open the script's code and note the requirement for the `~/bin/linuxdeploy-<arch>.AppImage`
 (and `linuxdeploy-plugin-qt-<arch>.AppImage` alongside it when Qt based applications are included).
 The default path to the `linuxdeploy` can be changed using `LINUXDEPLOY` environment variable.
 ```
 LINUXDEPLOY=/some/othe/path/to/linuxdeploy ./script/appimage_create.sh /path/to/install /path/to/AppDir
 ```
-The provided [script/appimage_build.sh](script/appimage_build.sh) script can be used to 
+The provided [script/appimage_build.sh](script/appimage_build.sh) script can be used to
 both build and create an AppImage binary.
 ```
 ./script/appimage_build.sh
@@ -212,13 +212,13 @@ Please open the script's code to see the environment variables that can be used
 configuration. Note an ability to select the build configuration using the `PROJ_INCLUDE` environment
 variable.
 
-The [AppRun](appimage/AppRun) script will be the entrypoint. The expected usage is similar to the 
+The [AppRun](appimage/AppRun) script will be the entrypoint. The expected usage is similar to the
 [docker](#docker-support) one
 ```
 /path/to/cc-<arch>.AppImage <cmd> [<options>...]
 ```
 
-When executed without providing `<cmd>` as an argument the script will list all the available commands. 
+When executed without providing `<cmd>` as an argument the script will list all the available commands.
 Use `-h` option to get help for the selected command.
 ```
 /path/to/cc-<arch>.AppImage cc_mqtt5_client_sub -h

docker/Dockerfile

@@ -23,7 +23,7 @@ WORKDIR /cc/build
 # Build the target
 RUN cmake .. -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release -DCMAKE_PROJECT_INCLUDE=${CONFIG}
 
-RUN cmake --build /cc/build --parallel $(nproc) 
+RUN cmake --build /cc/build --parallel $(nproc)
 
 RUN rm -rf /cc/build/install/include /cc/build/install/bin/*.sh /cc/build/install/lib/*.a
 
@@ -37,7 +37,7 @@ ARG HAS_BOOST_APPS=true
 ARG HAS_CODE_GENERATORS=true
 
 # Install packages
-RUN apt update 
+RUN apt update
 RUN if [ "${HAS_GUI_APPS}" = "true" ]; then apt install -y libqt5gui5 libqt5widgets5 libqt5serialport5 qt5dxcb-plugin; fi
 RUN if [ "${HAS_BOOST_APPS}" = "true" ]; then apt install -y libssl3 libboost-program-options1.74.0 libboost-system1.74.0; fi
 RUN if [ "${HAS_CODE_GENERATORS}" = "true" ]; then apt install -y libxml2; fi