flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 01:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #710 Simple algorithms to replace several regular expressions.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-08-30 04:02:00 +01:00
parent d2aa2e9c1c
commit 87eeac4e15
13 changed files with 218 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
View File

@@ -18,6 +18,7 @@
#include "blackmisc/simulation/xplane/aircraftmodelloaderxplane.h"
#include "blackmisc/simulation/xplane/xplaneutil.h"
#include "blackmisc/statusmessage.h"
#include "blackmisc/stringutils.h"
#include "blackmisc/worker.h"
#include <string.h>
@@ -386,7 +387,7 @@ namespace BlackMisc
// Version number.
QString versionLine = readLineFrom(ts);
if (versionLine.isNull()) { return false; }
QString version = versionLine.split(QRegularExpression("\\s"), QString::SkipEmptyParts).at(0);
QString version = splitStringRefs(versionLine, [](QChar c) { return c.isSpace(); }).value(0).toString();
// For version 7, there is another line 'obj'
if (version == "700") { readLineFrom(ts); }
@@ -394,7 +395,7 @@ namespace BlackMisc
// Texture
QString textureLine = readLineFrom(ts);
if (textureLine.isNull()) { return false; }
QString texture = textureLine.split(QRegularExpression("\\s"), QString::SkipEmptyParts).at(0);
QString texture = splitStringRefs(textureLine, [](QChar c) { return c.isSpace(); }).value(0).toString();
objFile.close();
@@ -570,7 +571,7 @@ namespace BlackMisc
{
++lineNum;
QString line = in.readLine();
auto tokens = line.split(QRegularExpression("\\s+"));
auto tokens = splitString(line, [](QChar c) { return c.isSpace(); });
if (!tokens.empty())
{
auto it = commands.find(tokens[0]);
@@ -614,7 +615,7 @@ namespace BlackMisc
{
++lineNum;
QString line = in.readLine();
auto tokens = line.split(QRegularExpression("\\s+"), QString::SkipEmptyParts);
auto tokens = splitString(line, [](QChar c) { return c.isSpace(); });
if (!tokens.empty())
{
auto it = commands.find(tokens[0]);