From dc1a4fab8e63eb65bab465ce0cb86e198365738e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 4 May 2020 12:43:53 +0200 Subject: [PATCH] [libcalamaresui] Chase Branding API change --- src/libcalamaresui/ViewManager.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index a4b8d8b8d..c78680418 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -226,7 +226,9 @@ ViewManager::onInitFailed( const QStringList& modules ) detailString = details.join( QString() ); } - insertViewStep( 0, new BlankViewStep( title, description.arg( *Calamares::Branding::ProductName ), detailString ) ); + insertViewStep( + 0, + new BlankViewStep( title, description.arg( Calamares::Branding::instance()->productName() ), detailString ) ); } void @@ -335,15 +337,16 @@ ViewManager::next() "to undo these changes." ); QString confirm = settings->isSetupMode() ? tr( "&Set up now" ) : tr( "&Install now" ); - int reply = QMessageBox::question( - m_widget, - title, - question.arg( *Calamares::Branding::ShortProductName, *Calamares::Branding::ShortVersionedName ), - confirm, - tr( "Go &back" ), - QString(), - 0 /* default first button, i.e. confirm */, - 1 /* escape is second button, i.e. cancel */ ); + const auto* branding = Calamares::Branding::instance(); + int reply + = QMessageBox::question( m_widget, + title, + question.arg( branding->shortProductName(), branding->shortVersionedName() ), + confirm, + tr( "Go &back" ), + QString(), + 0 /* default first button, i.e. confirm */, + 1 /* escape is second button, i.e. cancel */ ); if ( reply == 1 ) { return;