From cc5095781d8fdb0607576e6f31c4905416fc3601 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Thu, 19 Mar 2015 17:58:18 +0100 Subject: [PATCH] Branding::style is now ::styleString for clarity. --- src/libcalamaresui/Branding.cpp | 13 +++++++------ src/libcalamaresui/Branding.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 916fd84d1..8755b8abd 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -208,6 +208,13 @@ Branding::string( Branding::StringEntry stringEntry ) const } +QString +Branding::styleString( Branding::StyleEntry styleEntry ) const +{ + return m_style.value( s_styleEntryStrings.value( styleEntry ) ); +} + + QString Branding::imagePath( Branding::ImageEntry imageEntry ) const { @@ -236,12 +243,6 @@ Branding::slideshowPath() const return m_slideshowPath; } -QString -Branding::style( Branding::StyleEntry styleEntry ) const -{ - return m_style.value( s_styleEntryStrings.value( styleEntry ) ); -} - void Branding::setGlobals( GlobalStorage* globalStorage ) const diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index 2a2279945..4ebaf3c1f 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -70,10 +70,10 @@ public: QString componentDirectory() const; QString string( Branding::StringEntry stringEntry ) const; + QString styleString( Branding::StyleEntry styleEntry ) const; QString imagePath( Branding::ImageEntry imageEntry ) const; QPixmap image( Branding::ImageEntry imageEntry, const QSize& size ) const; QString slideshowPath() const; - QString style( Branding::StyleEntry styleEntry ) const; /** * Creates a map called "branding" in the global storage, and inserts an