[ehb54/ultrascan3] 871efe: SOMO: add strip_pre_qt5.pl, to remove conditions d...
Branch: refs/heads/ehb54-issue-1105 Home: https://github.com/ehb54/ultrascan3 Commit: 871efe1a3fd7e59971ac52630790c4a1c2eabdb3 https://github.com/ehb54/ultrascan3/commit/871efe1a3fd7e59971ac52630790c4a1c... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-10-02 (Fri, 02 Oct 2026) Changed paths: A us_somo/develop/strip_pre_qt5.pl Log Message: ----------- SOMO: add strip_pre_qt5.pl, to remove conditions decided for Qt 5.15+ SOMO still carries #if branches for Qt 3 and Qt 4. This script removes each preprocessor condition that is decided for every Qt SOMO builds against (5.15 up to 7.0): it keeps the live branch, drops the dead one, and reduces a mixed condition such as QT_VERSION < 0x040000 || !defined(Q_OS_MAC) to the part still needed (!defined(Q_OS_MAC)). Conditions it cannot decide, such as QT_VERSION >= QT_VERSION_CHECK(6, 0, 0), are left exactly as written, and, as in the C preprocessor, "#if" lines inside /* */ comments are not treated as directives. --min-qt sets the oldest Qt (default 5.15); --dry-run only reports. Committed so the change can be re-run on somo-dev and on any branch that conflicts, rather than merged by hand. The next commit is its output. Refs ehb54/ultrascan-tickets#1105 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Commit: 439d5e060b232e5c5cd43e52300e2cf03c59eb7e https://github.com/ehb54/ultrascan3/commit/439d5e060b232e5c5cd43e52300e2cf03... Author: ehb54 <brookes@uthscsa.edu> Date: 2026-10-02 (Fri, 02 Oct 2026) Changed paths: M us_somo/develop/include/us3_defines.h M us_somo/develop/include/us3i_defines.h M us_somo/develop/include/us3i_editor.h M us_somo/develop/include/us3i_gui_settings.h M us_somo/develop/include/us3i_gui_util.h M us_somo/develop/include/us3i_images.h M us_somo/develop/include/us3i_plot.h M us_somo/develop/include/us3i_widgets.h M us_somo/develop/include/us3i_widgets_dialog.h M us_somo/develop/include/us_color.h M us_somo/develop/include/us_dirhist.h M us_somo/develop/include/us_editor.h M us_somo/develop/include/us_file_util.h M us_somo/develop/include/us_hydrodyn_best.h M us_somo/develop/include/us_hydrodyn_cluster.h M us_somo/develop/include/us_hydrodyn_cluster_additional.h M us_somo/develop/include/us_hydrodyn_cluster_best.h M us_somo/develop/include/us_hydrodyn_cluster_bfnb.h M us_somo/develop/include/us_hydrodyn_cluster_config_server.h M us_somo/develop/include/us_hydrodyn_cluster_status.h M us_somo/develop/include/us_hydrodyn_cluster_submit.h M us_somo/develop/include/us_hydrodyn_comparative.h M us_somo/develop/include/us_hydrodyn_dad.h M us_somo/develop/include/us_hydrodyn_dad_baseline_best.h M us_somo/develop/include/us_hydrodyn_dad_ciq.h M us_somo/develop/include/us_hydrodyn_dad_cistarq.h M us_somo/develop/include/us_hydrodyn_dad_fit.h M us_somo/develop/include/us_hydrodyn_dad_fit_global.h M us_somo/develop/include/us_hydrodyn_dad_gauss_mode.h M us_somo/develop/include/us_hydrodyn_dad_movie.h M us_somo/develop/include/us_hydrodyn_dad_options.h M us_somo/develop/include/us_hydrodyn_dad_p3d.h M us_somo/develop/include/us_hydrodyn_dad_scale_trend.h M us_somo/develop/include/us_hydrodyn_dad_simulate.h M us_somo/develop/include/us_hydrodyn_mals.h M us_somo/develop/include/us_hydrodyn_mals_baseline_best.h M us_somo/develop/include/us_hydrodyn_mals_ciq.h M us_somo/develop/include/us_hydrodyn_mals_cistarq.h M us_somo/develop/include/us_hydrodyn_mals_fit.h M us_somo/develop/include/us_hydrodyn_mals_fit_global.h M us_somo/develop/include/us_hydrodyn_mals_gauss_mode.h M us_somo/develop/include/us_hydrodyn_mals_movie.h M us_somo/develop/include/us_hydrodyn_mals_options.h M us_somo/develop/include/us_hydrodyn_mals_p3d.h M us_somo/develop/include/us_hydrodyn_mals_saxs.h M us_somo/develop/include/us_hydrodyn_mals_saxs_baseline_best.h M us_somo/develop/include/us_hydrodyn_mals_saxs_ciq.h M us_somo/develop/include/us_hydrodyn_mals_saxs_cistarq.h M us_somo/develop/include/us_hydrodyn_mals_saxs_fit.h M us_somo/develop/include/us_hydrodyn_mals_saxs_fit_global.h M us_somo/develop/include/us_hydrodyn_mals_saxs_gauss_mode.h M us_somo/develop/include/us_hydrodyn_mals_saxs_movie.h M us_somo/develop/include/us_hydrodyn_mals_saxs_options.h M us_somo/develop/include/us_hydrodyn_mals_saxs_p3d.h M us_somo/develop/include/us_hydrodyn_mals_saxs_scale_trend.h M us_somo/develop/include/us_hydrodyn_mals_saxs_simulate.h M us_somo/develop/include/us_hydrodyn_mals_scale_trend.h M us_somo/develop/include/us_hydrodyn_mals_simulate.h M us_somo/develop/include/us_hydrodyn_overlap.h M us_somo/develop/include/us_hydrodyn_overlap_reduction.h M us_somo/develop/include/us_hydrodyn_pdb_tool.h M us_somo/develop/include/us_hydrodyn_pdb_tool_merge.h M us_somo/develop/include/us_hydrodyn_results.h M us_somo/develop/include/us_hydrodyn_save.h M us_somo/develop/include/us_hydrodyn_saxs_1d.h M us_somo/develop/include/us_hydrodyn_saxs_2d.h M us_somo/develop/include/us_hydrodyn_saxs_buffer.h M us_somo/develop/include/us_hydrodyn_saxs_buffer_nth.h M us_somo/develop/include/us_hydrodyn_saxs_cormap.h M us_somo/develop/include/us_hydrodyn_saxs_guinier_frames.h M us_somo/develop/include/us_hydrodyn_saxs_hplc.h M us_somo/develop/include/us_hydrodyn_saxs_hplc_baseline_best.h M us_somo/develop/include/us_hydrodyn_saxs_hplc_ciq.h M us_somo/develop/include/us_hydrodyn_saxs_hplc_fit.h M us_somo/develop/include/us_hydrodyn_saxs_hplc_fit_global.h M us_somo/develop/include/us_hydrodyn_saxs_hplc_gauss_mode.h M us_somo/develop/include/us_hydrodyn_saxs_hplc_movie.h M us_somo/develop/include/us_hydrodyn_saxs_hplc_options.h M us_somo/develop/include/us_hydrodyn_saxs_hplc_p3d.h M us_somo/develop/include/us_hydrodyn_saxs_hplc_scale_trend.h M us_somo/develop/include/us_hydrodyn_saxs_hplc_simulate.h M us_somo/develop/include/us_hydrodyn_saxs_iqq_residuals.h M us_somo/develop/include/us_hydrodyn_saxs_residuals.h M us_somo/develop/include/us_hydrodyn_saxs_screen.h M us_somo/develop/include/us_hydrodyn_saxs_search.h M us_somo/develop/include/us_hydrodyn_xsr.h M us_somo/develop/include/us_hydrodyn_zeno.h M us_somo/develop/include/us_json.h M us_somo/develop/include/us_math.h M us_somo/develop/include/us_multi_column.h M us_somo/develop/include/us_pdb_util.h M us_somo/develop/include/us_pm.h M us_somo/develop/include/us_pm_global.h M us_somo/develop/include/us_saxs_gp.h M us_somo/develop/include/us_saxs_util.h M us_somo/develop/include/us_util.h M us_somo/develop/src/us3i_color.cpp M us_somo/develop/src/us3i_editor.cpp M us_somo/develop/src/us3i_gui_settings.cpp M us_somo/develop/src/us3i_plot.cpp M us_somo/develop/src/us3i_widgets.cpp M us_somo/develop/src/us3i_widgets_dialog.cpp M us_somo/develop/src/us_cmdline_app.cpp M us_somo/develop/src/us_color.cpp M us_somo/develop/src/us_config.cpp M us_somo/develop/src/us_config_gui.cpp M us_somo/develop/src/us_dirhist.cpp M us_somo/develop/src/us_editor.cpp M us_somo/develop/src/us_help.cpp M us_somo/develop/src/us_hydrodyn.cpp M us_somo/develop/src/us_hydrodyn_addresidue.cpp M us_somo/develop/src/us_hydrodyn_anaflex_core.cpp M us_somo/develop/src/us_hydrodyn_asa.cpp M us_somo/develop/src/us_hydrodyn_batch.cpp M us_somo/develop/src/us_hydrodyn_bd.cpp M us_somo/develop/src/us_hydrodyn_bd_core.cpp M us_somo/develop/src/us_hydrodyn_bd_options.cpp M us_somo/develop/src/us_hydrodyn_bead_output.cpp M us_somo/develop/src/us_hydrodyn_beads.cpp M us_somo/develop/src/us_hydrodyn_best.cpp M us_somo/develop/src/us_hydrodyn_cluster.cpp M us_somo/develop/src/us_hydrodyn_cluster_advanced.cpp M us_somo/develop/src/us_hydrodyn_cluster_dmd.cpp M us_somo/develop/src/us_hydrodyn_cluster_results.cpp M us_somo/develop/src/us_hydrodyn_cluster_status.cpp M us_somo/develop/src/us_hydrodyn_cluster_submit.cpp M us_somo/develop/src/us_hydrodyn_comparative.cpp M us_somo/develop/src/us_hydrodyn_csv_viewer.cpp M us_somo/develop/src/us_hydrodyn_dad.cpp M us_somo/develop/src/us_hydrodyn_dad_baseline_best.cpp M us_somo/develop/src/us_hydrodyn_dad_conc.cpp M us_somo/develop/src/us_hydrodyn_dad_conc_csv_frames.cpp M us_somo/develop/src/us_hydrodyn_dad_fit_global.cpp M us_somo/develop/src/us_hydrodyn_dad_gg.cpp M us_somo/develop/src/us_hydrodyn_dad_gui.cpp M us_somo/develop/src/us_hydrodyn_dad_makeiq.cpp M us_somo/develop/src/us_hydrodyn_dad_modes.cpp M us_somo/develop/src/us_hydrodyn_dad_modes_bb.cpp M us_somo/develop/src/us_hydrodyn_dad_modes_wheel.cpp M us_somo/develop/src/us_hydrodyn_dad_movie.cpp M us_somo/develop/src/us_hydrodyn_dad_options.cpp M us_somo/develop/src/us_hydrodyn_dad_scale_trend.cpp M us_somo/develop/src/us_hydrodyn_dad_stack.cpp M us_somo/develop/src/us_hydrodyn_dad_svd.cpp M us_somo/develop/src/us_hydrodyn_dad_util.cpp M us_somo/develop/src/us_hydrodyn_grid.cpp M us_somo/develop/src/us_hydrodyn_hydrate.cpp M us_somo/develop/src/us_hydrodyn_hydro_zeno.cpp M us_somo/develop/src/us_hydrodyn_mals.cpp M us_somo/develop/src/us_hydrodyn_mals_baseline_best.cpp M us_somo/develop/src/us_hydrodyn_mals_conc.cpp M us_somo/develop/src/us_hydrodyn_mals_conc_csv_frames.cpp M us_somo/develop/src/us_hydrodyn_mals_fit_global.cpp M us_somo/develop/src/us_hydrodyn_mals_gg.cpp M us_somo/develop/src/us_hydrodyn_mals_gui.cpp M us_somo/develop/src/us_hydrodyn_mals_makeiq.cpp M us_somo/develop/src/us_hydrodyn_mals_modes.cpp M us_somo/develop/src/us_hydrodyn_mals_modes_bb.cpp M us_somo/develop/src/us_hydrodyn_mals_modes_wheel.cpp M us_somo/develop/src/us_hydrodyn_mals_movie.cpp M us_somo/develop/src/us_hydrodyn_mals_options.cpp M us_somo/develop/src/us_hydrodyn_mals_plots.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_baseline_best.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_conc.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_conc_csv_frames.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_fit_global.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_gg.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_gui.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_makeiq.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_modes.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_modes_bb.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_modes_wheel.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_movie.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_options.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_scale_trend.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_stack.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_svd.cpp M us_somo/develop/src/us_hydrodyn_mals_saxs_util.cpp M us_somo/develop/src/us_hydrodyn_mals_scale_trend.cpp M us_somo/develop/src/us_hydrodyn_mals_stack.cpp M us_somo/develop/src/us_hydrodyn_mals_svd.cpp M us_somo/develop/src/us_hydrodyn_mals_util.cpp M us_somo/develop/src/us_hydrodyn_pdb_tool.cpp M us_somo/develop/src/us_hydrodyn_pdb_tool_merge.cpp M us_somo/develop/src/us_hydrodyn_pdb_tool_util.cpp M us_somo/develop/src/us_hydrodyn_pdb_visualization.cpp M us_somo/develop/src/us_hydrodyn_results.cpp M us_somo/develop/src/us_hydrodyn_sas_options_saxs.cpp M us_somo/develop/src/us_hydrodyn_saxs.cpp M us_somo/develop/src/us_hydrodyn_saxs_1d.cpp M us_somo/develop/src/us_hydrodyn_saxs_2d.cpp M us_somo/develop/src/us_hydrodyn_saxs_buffer.cpp M us_somo/develop/src/us_hydrodyn_saxs_buffer_conc.cpp M us_somo/develop/src/us_hydrodyn_saxs_buffer_gui.cpp M us_somo/develop/src/us_hydrodyn_saxs_buffer_nth.cpp M us_somo/develop/src/us_hydrodyn_saxs_conc.cpp M us_somo/develop/src/us_hydrodyn_saxs_cormap.cpp M us_somo/develop/src/us_hydrodyn_saxs_external.cpp M us_somo/develop/src/us_hydrodyn_saxs_guinier_frames.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_baseline_best.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_bl.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_conc.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_conc_csv_frames.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_fit_global.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_gg.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_gui.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_makeiq.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_modes.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_modes_bb.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_modes_wheel.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_movie.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_options.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_scale_trend.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_stack.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_svd.cpp M us_somo/develop/src/us_hydrodyn_saxs_hplc_util.cpp M us_somo/develop/src/us_hydrodyn_saxs_ift.cpp M us_somo/develop/src/us_hydrodyn_saxs_iqq.cpp M us_somo/develop/src/us_hydrodyn_saxs_iqq_bead_model.cpp M us_somo/develop/src/us_hydrodyn_saxs_iqq_residuals.cpp M us_somo/develop/src/us_hydrodyn_saxs_iqq_sh.cpp M us_somo/develop/src/us_hydrodyn_saxs_legend.cpp M us_somo/develop/src/us_hydrodyn_saxs_screen.cpp M us_somo/develop/src/us_hydrodyn_saxs_search.cpp M us_somo/develop/src/us_hydrodyn_xsr.cpp M us_somo/develop/src/us_hydrodyn_zeno.cpp M us_somo/develop/src/us_json.cpp M us_somo/develop/src/us_license.cpp M us_somo/develop/src/us_register.cpp M us_somo/develop/src/us_saxs_gp.cpp M us_somo/develop/src/us_saxs_util.cpp M us_somo/develop/src/us_saxs_util_guinier.cpp M us_somo/develop/src/us_saxs_util_hydrate.cpp M us_somo/develop/src/us_util.cpp M us_somo/develop/us3_config/main.cpp M us_somo/develop/us3_hydrodyn/main.cpp Log Message: ----------- SOMO: remove the dead pre-Qt5 conditional code Output of strip_pre_qt5.pl (previous commit) over every SOMO C/C++ file; vendored Eigen, perceiver/ and grpy/ are skipped and have none: cd us_somo/develop ./strip_pre_qt5.pl $(git ls-files '*.cpp' '*.h' '*.hpp' '*.c' '*.cc' | grep -v -E '^(include/Eigen|perceiver|grpy)/') 237 files: 1,992 conditions decided and removed with their dead branches, 38 reduced to the part still needed (34 of them to !defined(Q_OS_MAC)); 17,115 lines removed. What is left: the two QT_VERSION_CHECK(6, 0, 0) tests, and two lines inside a /* */ comment in us_hydrodyn_addresidue.cpp. Verified with the CMake builds: every translation unit of the standalone Qt 5 and Qt 6 builds (427 each: libus_somo, the GUI apps, us_saxs_cmds_t) was preprocessed before and after, and 426 of each are identical. The exception, us3i_gui_settings.cpp, includes us3i_gui_settings.h before any Qt header, so the header's "#if QT_VERSION > 0x050000" saw an undefined QT_VERSION and took the Qt 4 branch there (<QtGui>, plus three Qwt 5 rename macros the file never uses). It now gets <QtWidgets> as intended, and its object code is identical before and after under both Qt versions. The two changed files no build compiles, us_color.cpp (commented out of libus_somo.pro) and us_hydrodyn_saxs_hplc_bl.cpp (in no .pro), only lose dead branches. Refs ehb54/ultrascan-tickets#1105 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Compare: https://github.com/ehb54/ultrascan3/compare/871efe1a3fd7%5E...439d5e060b23 To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications
participants (1)
-
emre brookes