general: run tools/format.sh

Signed-off-by: Adrian Suciu <[email protected]>
analogdevicesinc · Oct 10, 2023 · a01250e · a01250e
1 parent b8b5779
commit a01250e
Show file tree

Hide file tree

Showing 816 changed files with 34,819 additions and 42,242 deletions.
diff --git a/.clang-format b/.clang-format
@@ -101,7 +101,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
 ReflowComments:  true
-SortIncludes:    true
+SortIncludes:    false
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,29 +23,24 @@ include(GNUInstallDirs)
 find_package(QT NAMES Qt5 REQUIRED COMPONENTS Widgets)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets LinguistTools)
 
-if (Qt5Widgets_VERSION VERSION_LESS 5.15.2)
+if(Qt5Widgets_VERSION VERSION_LESS 5.15.2)
 	message(FATAL_ERROR "Minimum supported Qt 5.15.2")
 	return()
 else()
 	message(STATUS "Using Qt version: " ${Qt5Widgets_VERSION})
 endif()
 
-#message(QtVersion: ${QT_VERSION_MAJOR}:${QT_VERSION_MINOR})
+# message(QtVersion: ${QT_VERSION_MAJOR}:${QT_VERSION_MINOR})
 
+file(GLOB SRC_LIST *.cpp *.cc)
+file(GLOB HEADER_LIST *.h *.hpp)
+file(GLOB UI_LIST *.ui)
 
-FILE(GLOB SRC_LIST  *.cpp *.cc)
-FILE(GLOB HEADER_LIST *.h *.hpp)
-FILE(GLOB UI_LIST *.ui)
-
-set(PROJECT_SOURCES
-        ${SRC_LIST}
-        ${HEADER_LIST}
-        ${UI_LIST}
-)
+set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST})
 
 include(ScopyAbout)
 configure_about(./resources/about)
-FILE(GLOB SCOPY_RESOURCE_FILES gui/res/resources.qrc resources/aboutpage.qrc)
+file(GLOB SCOPY_RESOURCE_FILES gui/res/resources.qrc resources/aboutpage.qrc)
 find_file(SCOPY_ICON_ICO icon.ico PATHS ${CMAKE_SOURCE_DIR}/gui/res)
 message(STATUS "SCOPY_RESOURCE_FILES: " ${SCOPY_RESOURCE_FILES})
 
@@ -59,7 +54,7 @@ endif()
 
 qt_add_resources(SCOPY_RESOURCES ${SCOPY_RESOURCE_FILES})
 
-if (WIN32)
+if(WIN32)
 	# Set .exe properties
 	string(REPLACE "." "," SCOPY_FILEVERSION ${PROJECT_VERSION})
 	set(SCOPY_PRODUCTVERSION_STR ${PROJECT_VERSION})
@@ -71,26 +66,38 @@ endif()
 find_path(
 	IIO_INCLUDE_DIRS
 	NAMES iio.h
-	HINTS  ${CMAKE_INSTALL_PREFIX}/include /include /usr/include /usr/local/include /opt/local/include
-	REQUIRED)
+	HINTS ${CMAKE_INSTALL_PREFIX}/include
+	      /include
+	      /usr/include
+	      /usr/local/include
+	      /opt/local/include
+	      REQUIRED
+)
 
 find_library(
 	IIO_LIBRARIES
 	NAMES iio libiio
-	HINTS  ${CMAKE_INSTALL_PREFIX}/lib /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 /opt/local/lib /opt/local/lib64
-	REQUIRED)
+	HINTS ${CMAKE_INSTALL_PREFIX}/lib
+	      /usr/lib
+	      /usr/lib64
+	      /usr/local/lib
+	      /usr/local/lib64
+	      /opt/local/lib
+	      /opt/local/lib64
+	      REQUIRED
+)
 message("IIO LIBRARIES: " ${IIO_LIBRARIES})
 
 option(ENABLE_TESTING "Enable unit tests" ON)
 if(ENABLE_TESTING)
-    message(STATUS "Unit tests enabled")
-    add_subdirectory(tests)
+	message(STATUS "Unit tests enabled")
+	add_subdirectory(tests)
 endif()
 
 option(ENABLE_APPLICATION_BUNDLE "Enable application bundle for OSX" OFF)
-if (APPLE)
-    set(ENABLE_APPLICATION_BUNDLE ON)
-    include(ScopyMacOS)
+if(APPLE)
+	set(ENABLE_APPLICATION_BUNDLE ON)
+	include(ScopyMacOS)
 endif(APPLE)
 
 set(SCOPY_DLL_PATH ${CMAKE_INSTALL_LIBDIR})
@@ -110,35 +117,33 @@ add_subdirectory(plugins)
 set(SCOPY_DEPENDENCIES ${IIO_LIBRARIES})
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
-    qt_add_executable(${PROJECT_NAME}
-    MANUAL_FINALIZATION
-	${PROJECT_SOURCES}
-	${SCOPY_RESOURCES}
-	${SCOPY_DEPENDENCIES}
-	${SCOPY_WIN32_RESOURCES}
-    )
-# Define target properties for Android with Qt 6 as:
-#    set_property(TARGET tool_launcher APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR
-#                 ${CMAKE_CURRENT_SOURCE_DIR}/android)
-# For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
+	qt_add_executable(
+		${PROJECT_NAME}
+		MANUAL_FINALIZATION
+		${PROJECT_SOURCES}
+		${SCOPY_RESOURCES}
+		${SCOPY_DEPENDENCIES}
+		${SCOPY_WIN32_RESOURCES}
+	)
+	# Define target properties for Android with Qt 6 as: set_property(TARGET tool_launcher APPEND PROPERTY
+	# QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android) For more information, see
+	# https://doc.qt.io/qt-6/qt-add-executable.html#target-creation
 else()
-    if(ANDROID)
-	add_library(${PROJECT_NAME} SHARED
-            ${PROJECT_SOURCES}
-            ${SCOPY_RESOURCES}
-            ${SCOPY_DEPENDENCIES}
-        )
-# Define properties for Android with Qt 5 after find_package() calls as:
-#    set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android")
-    else()
-        add_executable(${PROJECT_NAME} WIN32 ${OSX_BUNDLE}
-            ${PROJECT_SOURCES}
-            ${SCOPY_RESOURCES}
-            ${SCOPY_DEPENDENCIES}
-            ${EXTRA_BUNDLE_FILES}
-            ${SCOPY_WIN32_RESOURCES}
-        )
-    endif()
+	if(ANDROID)
+		add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES} ${SCOPY_RESOURCES} ${SCOPY_DEPENDENCIES})
+		# Define properties for Android with Qt 5 after find_package() calls as: set(ANDROID_PACKAGE_SOURCE_DIR
+		# "${CMAKE_CURRENT_SOURCE_DIR}/android")
+	else()
+		add_executable(
+			${PROJECT_NAME} WIN32
+			${OSX_BUNDLE}
+			${PROJECT_SOURCES}
+			${SCOPY_RESOURCES}
+			${SCOPY_DEPENDENCIES}
+			${EXTRA_BUNDLE_FILES}
+			${SCOPY_WIN32_RESOURCES}
+		)
+	endif()
 endif()
 
 list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_constexpr OUT_CONSTEXPR)
@@ -151,50 +156,49 @@ target_link_libraries(${PROJECT_NAME} PRIVATE Qt${QT_VERSION_MAJOR}::Widgets ${S
 # Compiler options
 target_compile_options(${PROJECT_NAME} PUBLIC -Wall)
 
-#List of warnings to be treated as errors
-target_compile_options(${PROJECT_NAME} PUBLIC
-        -Werror=return-type
-        -Werror=uninitialized
-        -Werror=init-self
-        -Werror=switch
+# List of warnings to be treated as errors
+target_compile_options(
+	${PROJECT_NAME} PUBLIC -Werror=return-type -Werror=uninitialized -Werror=init-self -Werror=switch
 )
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/apple/Info.plist.cmakein ${CMAKE_CURRENT_BINARY_DIR}/Info.plist COPYONLY)
-set_target_properties(${PROJECT_NAME}  PROPERTIES
-    MACOSX_BUNDLE_GUI_IDENTIFIER scopy
-    MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
-    MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
-    MACOSX_BUNDLE TRUE
-    MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
-    WIN32_EXECUTABLE TRUE
+set_target_properties(
+	${PROJECT_NAME}
+	PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER scopy
+		   MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION}
+		   MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
+		   MACOSX_BUNDLE TRUE
+		   MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
+		   WIN32_EXECUTABLE TRUE
 )
 
-if (ENABLE_APPLICATION_BUNDLE OR ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-    set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME Scopy)
+if(ENABLE_APPLICATION_BUNDLE OR ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+	set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME Scopy)
 endif()
 
 configure_file(resources/qt.conf.cmakein ${CMAKE_CURRENT_BINARY_DIR}/qt.conf COPYONLY)
 configure_file(resources/scopy.desktop.cmakein ${CMAKE_CURRENT_BINARY_DIR}/scopy.desktop @ONLY)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/scopy.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/applications)
-	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gui/res/icon_small.svg DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/scalable/apps RENAME scopy.svg)
+	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gui/res/icon_small.svg
+		DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/scalable/apps RENAME scopy.svg
+	)
 	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/translations DESTINATION ${CMAKE_INSTALL_FULL_DATADIR})
 endif()
 if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 	include(ScopyWindows)
 	duplicate_target(${PROJECT_NAME} Scopy-console)
 	set_target_properties(Scopy-console PROPERTIES WIN32_EXECUTABLE FALSE)
 endif()
-if (NOT ENABLE_APPLICATION_BUNDLE)
-    install(TARGETS ${PROJECT_NAME}
-            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    )
+if(NOT ENABLE_APPLICATION_BUNDLE)
+	install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+		RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	)
 endif()
 
 install(TARGETS ${PROJECT_NAME} BUNDLE DESTINATION .)
 
 if(QT_VERSION_MAJOR EQUAL 6)
-    qt_finalize_executable(${PROJECT_NAME})
+	qt_finalize_executable(${PROJECT_NAME})
 endif()
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
@@ -5,8 +5,7 @@ project(scopy-${SCOPY_MODULE} VERSION 0.1 LANGUAGES CXX)
 
 include(GenerateExportHeader)
 
-# TODO: split stylesheet/resources and add here
-# TODO: export header files correctly
+# TODO: split stylesheet/resources and add here TODO: export header files correctly
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -23,42 +22,34 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
 
 set(SCOPY_QT_COMPONENTS Core Widgets Concurrent)
 
-FILE(GLOB SRC_LIST  src/*.cpp src/*.cc)
-FILE(GLOB HEADER_LIST include/${SCOPY_MODULE}/*.h include/${SCOPY_MODULE}/*.hpp)
-FILE(GLOB UI_LIST ui/*.ui)
+file(GLOB SRC_LIST src/*.cpp src/*.cc)
+file(GLOB HEADER_LIST include/${SCOPY_MODULE}/*.h include/${SCOPY_MODULE}/*.hpp)
+file(GLOB UI_LIST ui/*.ui)
 
-
-configure_file(include/${SCOPY_MODULE}/${PROJECT_NAME}_config.h.cmakein
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_config.h @ONLY)
+configure_file(
+	include/${SCOPY_MODULE}/${PROJECT_NAME}_config.h.cmakein
+	${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_config.h @ONLY
+)
 set(SRC_LIST ${SRC_LIST} ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_config.h)
 
-set(PROJECT_SOURCES
-        ${SRC_LIST}
-        ${HEADER_LIST}
-        ${UI_LIST}
-)
+set(PROJECT_SOURCES ${SRC_LIST} ${HEADER_LIST} ${UI_LIST})
 
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${SCOPY_QT_COMPONENTS} REQUIRED)
 
-add_library(${PROJECT_NAME} SHARED
-    ${PROJECT_SOURCES}
-)
+add_library(${PROJECT_NAME} SHARED ${PROJECT_SOURCES})
 
-generate_export_header(${PROJECT_NAME} EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_export.h)
+generate_export_header(
+	${PROJECT_NAME} EXPORT_FILE_NAME ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE}/${PROJECT_NAME}_export.h
+)
 
 target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-target_include_directories(${PROJECT_NAME} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE})
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/${SCOPY_MODULE})
 target_include_directories(${PROJECT_NAME} PUBLIC scopy-gui scopy-pluginbase scopyiioutil)
 
 foreach(comp ${SCOPY_QT_COMPONENTS})
-    set(SCOPY_QT_LIBRARIES ${SCOPY_QT_LIBRARIES} Qt${QT_VERSION_MAJOR}::${comp})
+	set(SCOPY_QT_LIBRARIES ${SCOPY_QT_LIBRARIES} Qt${QT_VERSION_MAJOR}::${comp})
 endforeach()
 
-target_link_libraries(${PROJECT_NAME} PUBLIC
-	${SCOPY_QT_LIBRARIES}
-)
+target_link_libraries(${PROJECT_NAME} PUBLIC ${SCOPY_QT_LIBRARIES})
 
-install(TARGETS ${PROJECT_NAME}
-	LIBRARY DESTINATION ${SCOPY_DLL_PATH}
-	RUNTIME DESTINATION ${SCOPY_DLL_PATH})
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SCOPY_DLL_PATH} RUNTIME DESTINATION ${SCOPY_DLL_PATH})
diff --git a/common/include/common/common.h b/common/include/common/common.h
@@ -1,15 +1,14 @@
 #ifndef COMMON_H
 #define COMMON_H
 
-#include <QtGlobal>
 #include <QString>
+#include <QtGlobal>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-namespace Qt
-{
+namespace Qt {
 static auto endl = ::endl;
 static auto SkipEmptyParts = QString::SkipEmptyParts;
-}
+} // namespace Qt
 #endif
 
 #endif // COMMON_H
diff --git a/common/include/common/scopyconfig.h b/common/include/common/scopyconfig.h
@@ -1,12 +1,14 @@
 #ifndef SCOPYCONFIG_H
 #define SCOPYCONFIG_H
 
-#include <QString>
 #include "scopy-common_export.h"
 
+#include <QString>
+
 namespace scopy {
 
-class SCOPY_COMMON_EXPORT config {
+class SCOPY_COMMON_EXPORT config
+{
 public:
 	static QString defaultPluginFolderPath();
 	static QString localPluginFolderPath();
@@ -23,8 +25,9 @@ class SCOPY_COMMON_EXPORT config {
 
 	static QString dump();
 	static QString getUuid();
+
 private:
 	inline static int uuid = 0;
 };
-}
+} // namespace scopy
 #endif // SCOPYCONFIG_H