grant0013 8a2dbd1c10 Fix merge-resolution braces in PrintHostDialogs.hpp + PhysicalPrinterDialog.cpp ...

The 8dfd480c52 merge stripped <<<<<<<, =======, >>>>>>> markers
from three files. Two of the resolutions ended up syntactically
broken:

* PrintHostDialogs.hpp: both sides of the conflict added a new class
  declaration in the same spot. The common closing }; lived after
  the >>>>>>> marker, so concatenating without re-adding a closing
  brace between the two classes left CrealityPrintHostSendDialog
  unclosed. Compiler caught it via "storage class specified for
  EVT_PRINTHOST_PROGRESS" at the wxDECLARE_EVENT lines (the events
  were being parsed inside the still-open class body).

* PhysicalPrinterDialog.cpp: upstream's BonjourDialog fallback was
  inside an `else { }` block whose closing brace remained after I
  replaced the else with explicit early-return branches. Result was
  one extra `}` after the Bonjour block.

No public commits affected -- the broken merge commit is still
local-only on LXC 104. Catching this before the force-push.

2026-05-28 08:10:21 +00:00

10 KiB

Raw Blame History

View Raw