From 679f61395529f79fc6ee23bd039eb002d9b68afa Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 27 Oct 2020 15:48:51 +0100 Subject: [PATCH] [keyboard] Rename mysterious Config::init() to descriptive name --- src/modules/keyboard/Config.cpp | 2 +- src/modules/keyboard/Config.h | 2 +- src/modules/keyboardq/KeyboardQmlViewStep.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp index 7f7eb7b27..efb345edf 100644 --- a/src/modules/keyboard/Config.cpp +++ b/src/modules/keyboard/Config.cpp @@ -127,7 +127,7 @@ findLayout( const KeyboardLayoutModel* klm, const QString& currentLayout ) } void -Config::init() +Config::detectCurrentKeyboardLayout() { //### Detect current keyboard layout and variant QString currentLayout; diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h index 9a3a3a013..7c18577f6 100644 --- a/src/modules/keyboard/Config.h +++ b/src/modules/keyboard/Config.h @@ -31,7 +31,7 @@ class Config : public QObject public: Config( QObject* parent = nullptr ); - void init(); + void detectCurrentKeyboardLayout(); Calamares::JobList createJobs(); QString prettyStatus() const; diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.cpp b/src/modules/keyboardq/KeyboardQmlViewStep.cpp index 2eb9de0e7..62063b187 100644 --- a/src/modules/keyboardq/KeyboardQmlViewStep.cpp +++ b/src/modules/keyboardq/KeyboardQmlViewStep.cpp @@ -23,7 +23,7 @@ KeyboardQmlViewStep::KeyboardQmlViewStep( QObject* parent ) , m_config( new Config( this ) ) , m_nextEnabled( false ) { - m_config->init(); + m_config->detectCurrentKeyboardLayout(); m_nextEnabled = true; emit nextStatusChanged( m_nextEnabled ); }