extensions/source/abpilot/abspilot.hxx | 2 +- include/vcl/roadmapwizard.hxx | 2 +- vcl/source/control/wizardmachine.cxx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 7c6dd50c96a312932b332db95935c5f66d501e0c Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Sun May 18 00:20:35 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Sun May 18 20:38:15 2025 +0200 Clarify comments/debug output mentioning RoadmapWizard ... when they're not actually meant to refer to the vcl::Window based RoadmapWizard class, but either RoadmapWizardMachine or WizardMachine. Change-Id: I8ae2028d82d87433228f541b3e82b5de4e6d1180 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185465 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Jenkins diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index b5fd0a4e336f..df15fe017260 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -67,7 +67,7 @@ namespace abp virtual bool prepareLeaveCurrentState( CommitPageReason _eReason ) override; virtual bool onFinish() override; - // RoadmapWizard + // RoadmapWizardMachine virtual OUString getStateDisplayName( WizardState _nState ) const override; /** creates a new data source of the type indicated by m_aSettings diff --git a/include/vcl/roadmapwizard.hxx b/include/vcl/roadmapwizard.hxx index e42cf425ed4d..48c48ffa6790 100644 --- a/include/vcl/roadmapwizard.hxx +++ b/include/vcl/roadmapwizard.hxx @@ -44,7 +44,7 @@ namespace vcl }; - //= RoadmapWizard + //= RoadmapWizardMachine /** is - no, not a wizard for a roadmap, but the base class for wizards <em>supporting</em> a roadmap. diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx index fd26afbaa8e4..0e935e27619a 100644 --- a/vcl/source/control/wizardmachine.cxx +++ b/vcl/source/control/wizardmachine.cxx @@ -411,7 +411,7 @@ namespace vcl { // TODO: this leaves us in a state where we have no current page and an inconsistent state history. // Perhaps we should rollback the skipping here... - OSL_FAIL("RoadmapWizard::skip: very unpolite..."); + OSL_FAIL("WizardMachine::skip: very unpolite..."); // if somebody does a skip and then does not allow to leave... // (can't be a commit error, as we've already committed the current page. So if ShowPage fails here, // somebody behaves really strange ...) @@ -576,7 +576,7 @@ namespace vcl void WizardMachine::updateTravelUI() { const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) ); - OSL_ENSURE( pController != nullptr, "RoadmapWizard::updateTravelUI: no controller for the current page!" ); + OSL_ENSURE( pController != nullptr, "WizardMachine::updateTravelUI: no controller for the current page!" ); bool bCanAdvance = ( !pController || pController->canAdvance() ) // the current page allows to advance