applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-30 02:45:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares][modules] Use compatibility for QString::split()

Browse source 
- Use the compatibility value, which has an enum value suitable
  for the Qt version in use.
This commit is contained in:
Adriaan de Groot 2020-06-23 11:13:55 +02:00
parent d6b0583bad
commit 192263cf9d
8 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/keyboard/Config.cpp
View file

@ -26,6 +26,7 @@
#include "JobQueue.h"
#include "utils/Logger.h"
#include "utils/Retranslator.h"
#include "utils/String.h"
#include <QApplication>
#include <QProcess>
@ -287,7 +288,7 @@ Config::init()
if ( process.waitForFinished() )
{
const QStringList list = QString( process.readAll() ).split( "\n", QString::SkipEmptyParts );
const QStringList list = QString( process.readAll() ).split( "\n", SplitSkipEmptyParts );
for ( QString line : list )
{
@ -300,7 +301,7 @@ Config::init()
line = line.remove( "}" ).remove( "{" ).remove( ";" );
line = line.mid( line.indexOf( "\"" ) + 1 );
QStringList split = line.split( "+", QString::SkipEmptyParts );
QStringList split = line.split( "+", SplitSkipEmptyParts );
if ( split.size() >= 2 )
{
currentLayout = split.at( 1 );
@ -496,7 +497,7 @@ Config::onActivate()
}
if ( !lang.isEmpty() )
{
const auto langParts = lang.split( '_', QString::SkipEmptyParts );
const auto langParts = lang.split( '_', SplitSkipEmptyParts );
// Note that this his string is not fit for display purposes!
// It doesn't come from QLocale::nativeCountryName.