diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-07-15 20:27:32 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-07-15 17:05:46 -0700 |
| commit | e38595f68450011f24f45e45900dbb2119ce8355 (patch) | |
| tree | d7df85ed05856129a676935f360a6057e43be009 /qt-ui/subsurfacewebservices.cpp | |
| parent | 887f9e63c3705df52b802420e72f5854d75c8ca6 (diff) | |
| download | subsurface-e38595f68450011f24f45e45900dbb2119ce8355.tar.gz | |
Use QObject::tr instead of OurClasses::tr for functions
This will make more easy to move code around in the future.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/subsurfacewebservices.cpp')
| -rw-r--r-- | qt-ui/subsurfacewebservices.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qt-ui/subsurfacewebservices.cpp b/qt-ui/subsurfacewebservices.cpp index 219d10d8c..0514d89a9 100644 --- a/qt-ui/subsurfacewebservices.cpp +++ b/qt-ui/subsurfacewebservices.cpp @@ -517,7 +517,7 @@ static DiveListResult parseDiveLogsDeDiveList(const QByteArray &xmlData) * </DiveDateReader> */ QXmlStreamReader reader(xmlData); - const QString invalidXmlError = DivelogsDeWebServices::tr("Invalid response from server"); + const QString invalidXmlError = QObject::tr("Invalid response from server"); bool seenDiveDates = false; DiveListResult result; result.idCount = 0; @@ -525,7 +525,7 @@ static DiveListResult parseDiveLogsDeDiveList(const QByteArray &xmlData) if (reader.readNextStartElement() && reader.name() != "DiveDateReader") { result.errorCondition = invalidXmlError; result.errorDetails = - DivelogsDeWebServices::tr("Expected XML tag 'DiveDateReader', got instead '%1") + QObject::tr("Expected XML tag 'DiveDateReader', got instead '%1") .arg(reader.name().toString()); goto out; } @@ -571,14 +571,14 @@ static DiveListResult parseDiveLogsDeDiveList(const QByteArray &xmlData) if (!seenDiveDates) { result.errorCondition = invalidXmlError; - result.errorDetails = DivelogsDeWebServices::tr("Expected XML tag 'DiveDates' not found"); + result.errorDetails = QObject::tr("Expected XML tag 'DiveDates' not found"); } out: if (reader.hasError()) { // if there was an XML error, overwrite the result or other error conditions result.errorCondition = invalidXmlError; - result.errorDetails = DivelogsDeWebServices::tr("Malformed XML response. Line %1: %2") + result.errorDetails = QObject::tr("Malformed XML response. Line %1: %2") .arg(reader.lineNumber()) .arg(reader.errorString()); } |