diff --git a/src/KMLFileHelper.cc b/src/KMLFileHelper.cc index 7415c4d3ae6b4d2add6065fb81f66982ff04a2f2..60e75e27aba695cebd0eeff68a9e35b5ff5984e7 100644 --- a/src/KMLFileHelper.cc +++ b/src/KMLFileHelper.cc @@ -11,6 +11,8 @@ #include +const char* KMLFileHelper::_errorPrefix = QT_TR_NOOP("KML file load failed. %1"); + QDomDocument KMLFileHelper::loadFile(const QString& kmlFile, QString& errorString) { QFile file(kmlFile); @@ -18,12 +20,12 @@ QDomDocument KMLFileHelper::loadFile(const QString& kmlFile, QString& errorStrin errorString.clear(); if (!file.exists()) { - errorString = tr("File not found: %1").arg(kmlFile); + errorString = QString(_errorPrefix).arg(tr("File not found: %1").arg(kmlFile)); return QDomDocument(); } if (!file.open(QIODevice::ReadOnly)) { - errorString = tr("Unable to open file: %1 error: $%2").arg(kmlFile).arg(file.errorString()); + errorString = QString(_errorPrefix).arg(tr("Unable to open file: %1 error: $%2").arg(kmlFile).arg(file.errorString())); return QDomDocument(); } @@ -31,7 +33,7 @@ QDomDocument KMLFileHelper::loadFile(const QString& kmlFile, QString& errorStrin QString errorMessage; int errorLine; if (!doc.setContent(&file, &errorMessage, &errorLine)) { - errorString = tr("Unable to parse KML file: %1 error: %2 line: %3").arg(kmlFile).arg(errorMessage).arg(errorLine); + errorString = QString(_errorPrefix).arg(tr("Unable to parse KML file: %1 error: %2 line: %3").arg(kmlFile).arg(errorMessage).arg(errorLine)); return QDomDocument(); } @@ -67,7 +69,7 @@ KMLFileHelper::KMLFileContents KMLFileHelper::determineFileContents(const QStrin return Polyline; } - errorString = tr("No known type found in KML file."); + errorString = QString(_errorPrefix).arg(tr("No supported type found in KML file.")); return Error; } @@ -83,13 +85,13 @@ bool KMLFileHelper::loadPolygonFromFile(const QString& kmlFile, QList& vertices, QString& errorString); static bool loadPolylineFromFile(const QString& kmlFile, QList& coords, QString& errorString); + +private: + static const char* _errorPrefix; };