napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[keyboard] Apply coding style

Browse Source
This commit is contained in:
Adriaan de Groot 2020-10-28 13:41:34 +01:00
parent 365a2ad6fd
commit 6aedf4401f
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/keyboard/AdditionalLayoutInfo.h
View File

@ -12,7 +12,8 @@
#include <QString>
struct AdditionalLayoutInfo {
struct AdditionalLayoutInfo
{
QString additionalLayout;
QString additionalVariant;

2
src/modules/keyboard/Config.h
View File

@ -11,9 +11,9 @@
#ifndef KEYBOARD_CONFIG_H
#define KEYBOARD_CONFIG_H
#include "AdditionalLayoutInfo.h"
#include "Job.h"
#include "KeyboardLayoutModel.h"
#include "AdditionalLayoutInfo.h"
#include <QAbstractListModel>
#include <QMap>

12
src/modules/keyboard/KeyboardPage.cpp
View File

@ -53,13 +53,13 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
ui->physicalModelSelector->setModel( config->keyboardModels() );
// Connect signals and slots
connect( ui->variantSelector, &QListWidget::currentItemChanged, this, &KeyboardPage::onListVariantCurrentItemChanged );
connect(
ui->buttonRestore, &QPushButton::clicked, [this] {
cDebug() << "Restore clicked";
// ui->physicalModelSelector->setCurrentIndex( m_defaultIndex );
} );
ui->variantSelector, &QListWidget::currentItemChanged, this, &KeyboardPage::onListVariantCurrentItemChanged );
connect( ui->buttonRestore, &QPushButton::clicked, [this] {
cDebug() << "Restore clicked";
// ui->physicalModelSelector->setCurrentIndex( m_defaultIndex );
} );
connect( ui->physicalModelSelector, &QComboBox::currentTextChanged, [this]( const QString& text ) {
cDebug() << "ComboBox changed to" << text;

4
src/modules/keyboard/KeyboardViewStep.cpp
View File

@ -19,7 +19,7 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( KeyboardViewStepFactory, registerPlugin< Ke
KeyboardViewStep::KeyboardViewStep( QObject* parent )
: Calamares::ViewStep( parent )
, m_config( new Config(this) )
, m_config( new Config( this ) )
, m_widget( new KeyboardPage( m_config ) )
{
m_config->detectCurrentKeyboardLayout();
@ -109,5 +109,5 @@ KeyboardViewStep::onLeave()
void
KeyboardViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{
m_config->setConfigurationMap(configurationMap);
m_config->setConfigurationMap( configurationMap );
}

8
src/modules/keyboard/SetKeyboardLayoutJob.cpp
View File

@ -30,7 +30,7 @@
#include <QTextStream>
SetKeyboardLayoutJob::SetKeyboardLayoutJob(const QString& model,
SetKeyboardLayoutJob::SetKeyboardLayoutJob( const QString& model,
const QString& layout,
const QString& variant,
const AdditionalLayoutInfo& additionalLayoutInfo,
@ -269,12 +269,14 @@ SetKeyboardLayoutJob::writeX11Data( const QString& keyboardConfPath ) const
{
if ( !m_layout.isEmpty() )
{
stream << " Option \"XkbLayout\" \"" << m_additionalLayoutInfo.additionalLayout << "," << m_layout << "\"\n";
stream << " Option \"XkbLayout\" \"" << m_additionalLayoutInfo.additionalLayout << "," << m_layout
<< "\"\n";
}
if ( !m_variant.isEmpty() )
{
stream << " Option \"XkbVariant\" \"" << m_additionalLayoutInfo.additionalVariant << "," << m_variant << "\"\n";
stream << " Option \"XkbVariant\" \"" << m_additionalLayoutInfo.additionalVariant << "," << m_variant
<< "\"\n";
}
stream << " Option \"XkbOptions\" \"" << m_additionalLayoutInfo.groupSwitcher << "\"\n";

3
src/modules/keyboard/SetKeyboardLayoutJob.h
View File

@ -11,9 +11,8 @@
#ifndef SETKEYBOARDLAYOUTJOB_H
#define SETKEYBOARDLAYOUTJOB_H
#include "Job.h"
#include "AdditionalLayoutInfo.h"
#include "Job.h"
class SetKeyboardLayoutJob : public Calamares::Job