From 18942f835f200d6e6b6e9c969c37104bafa73ada Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 12 Feb 2020 15:35:11 +0100 Subject: [PATCH] [libcalamares] Remove confusing name-qualifiers - Using Branding::ImageEntry, when ImageEntry is an enum class defined *in* Branding, is superfluous, and it also confuses moc; the enum type isn't recognized from QML. --- src/libcalamaresui/Branding.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index 619847d71..0912ff89f 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -183,9 +183,9 @@ public: void setGlobals( GlobalStorage* globalStorage ) const; public slots: - QString string( Branding::StringEntry stringEntry ) const; - QString styleString( Branding::StyleEntry styleEntry ) const; - QString imagePath( Branding::ImageEntry imageEntry ) const; + QString string( StringEntry stringEntry ) const; + QString styleString( StyleEntry styleEntry ) const; + QString imagePath( ImageEntry imageEntry ) const; private: static Branding* s_instance;