[us-commits] [ehb54/ultrascan3] 034d89: SOMO: unique include guards for copy-pasted Q_OBJE...

[emre brookes]

  Branch: refs/heads/ehb54-issue-943
  Home:   https://github.com/ehb54/ultrascan3
  Commit: 034d89c8f9dcd3d15bdd4d0aa67018583b5a6eb7
      https://github.com/ehb54/ultrascan3/commit/034d89c8f9dcd3d15bdd4d0aa67018583b5a6eb7
  Author: ehb54 <brookes at uthscsa.edu>
  Date:   2026-07-04 (Sat, 04 Jul 2026)

  Changed paths:
    M us_somo/develop/include/us3i_util.h
    M us_somo/develop/include/us_hydrodyn_dad_conc_csv_frames.h
    M us_somo/develop/include/us_hydrodyn_mals_conc_csv_frames.h
    M us_somo/develop/include/us_hydrodyn_mals_saxs_conc_csv_frames.h
    M us_somo/develop/include/us_hydrodyn_saxs_hplc_conc_csv_frames.h

  Log Message:
  -----------
  SOMO: unique include guards for copy-pasted Q_OBJECT headers

Under AUTOMOC all moc outputs compile in one combined TU (mocs_compilation.cpp),
so duplicate include guards make later headers vanish -> "class has not been
declared" for their moc. (qmake hid this: each moc was its own TU.)

Fix the Q_OBJECT collisions:
- us_hydrodyn_{dad,mals,mals_saxs,saxs_hplc}_conc_csv_frames.h all shared
  US_HYDRODYN_SAXS_CONC_CSV_FRAMES_H -> give each a filename-derived guard.
- us3i_util.h shared US_UTIL_H with us_util.h (Q_OBJECT) -> US3I_UTIL_H.

Non-Q_OBJECT guard collisions (X.h/X_hydro.h, us3i_*/us_* pairs) don't affect
the moc TU and are left for now.

Refs ehb54/ultrascan-tickets#943

Co-Authored-By: Claude Opus 4.8 <noreply at anthropic.com>



To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications