1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-12-05 00:39:09 +01:00

Compare commits

..

No commits in common. "681f6c5b0999e5c613fb917fd3e69f45d94a2e24" and "c9a46be7a81e55a9e6e79ac5e97614f3a0a92be1" have entirely different histories.

6 changed files with 5 additions and 10 deletions

View File

@ -1,4 +1,4 @@
version: 13.8.{build} version: 13.7.{build}
configuration: configuration:
- Release - Release

View File

@ -3,7 +3,7 @@ unix:!macx:!android {
} else { } else {
TARGET = GPXSee TARGET = GPXSee
} }
VERSION = 13.8 VERSION = 13.7
QT += core \ QT += core \

View File

@ -37,7 +37,7 @@ Unicode true
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "13.8" !define VERSION "13.7"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}_x64.exe" OutFile "GPXSee-${VERSION}_x64.exe"

View File

@ -1,7 +1,6 @@
#include <QApplication> #include <QApplication>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include "common/util.h"
#include "gpxparser.h" #include "gpxparser.h"
#include "tcxparser.h" #include "tcxparser.h"
#include "csvparser.h" #include "csvparser.h"
@ -95,7 +94,7 @@ void Data::processData(QList<TrackData> &trackData, QList<RouteData> &routeData)
Data::Data(const QString &fileName, bool tryUnknown) Data::Data(const QString &fileName, bool tryUnknown)
{ {
QFile file(fileName); QFile file(fileName);
QFileInfo fi(Util::displayName(fileName)); QFileInfo fi(fileName);
QList<TrackData> trackData; QList<TrackData> trackData;
QList<RouteData> routeData; QList<RouteData> routeData;

View File

@ -270,10 +270,6 @@ bool GHPParser::parse(QFile *file, QList<TrackData> &tracks,
_errorString = "unexpected end of file"; _errorString = "unexpected end of file";
return false; return false;
} }
if (!segment.size()) {
_errorString = "No usable data found";
return false;
}
tracks.append(TrackData()); tracks.append(TrackData());
tracks.last().append(segment); tracks.last().append(segment);

View File

@ -65,7 +65,7 @@ MapList::ParserMap MapList::_parsers = parsers();
Map *MapList::loadFile(const QString &path, bool *isDir) Map *MapList::loadFile(const QString &path, bool *isDir)
{ {
ParserMap::iterator it; ParserMap::iterator it;
QFileInfo fi(Util::displayName(path)); QFileInfo fi(path);
QString suffix(fi.completeSuffix().toLower()); QString suffix(fi.completeSuffix().toLower());
Map *map = 0; Map *map = 0;
QStringList errors; QStringList errors;