From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 29 Aug 2011 12:10:12 +0000 (+0200)
Subject: Fix diagnostic messages.
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=b7f129fe38bac84996104ceea4e9e735839d379b;p=konrad%2Fqtdeclarative.git

Fix diagnostic messages.

Change-Id: Id06ff4237129ef5525032c9a2510e4316be52ae2
Reviewed-on: http://codereview.qt.nokia.com/3802
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
---

diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp
index dd7f4e4..49cb40f 100644
--- a/src/declarative/qml/qdeclarativedirparser.cpp
+++ b/src/declarative/qml/qdeclarativedirparser.cpp
@@ -109,14 +109,14 @@ bool QDeclarativeDirParser::parse()
         QFile file(_filePathSouce);
         if (!QDeclarative_isFileCaseCorrect(_filePathSouce)) {
             QDeclarativeError error;
-            error.setDescription(QString::fromUtf8("cannot load module \"%2\": File name case mismatch for \"%1\"").arg(_filePathSouce));
+            error.setDescription(QString::fromUtf8("cannot load module \"$$URI$$\": File name case mismatch for \"%1\"").arg(_filePathSouce));
             _errors.prepend(error);
             return false;
         } else if (file.open(QFile::ReadOnly)) {
             _source = QString::fromUtf8(file.readAll());
         } else {
             QDeclarativeError error;
-            error.setDescription(QString::fromUtf8("module \"%2\" definition \"%1\" not readable").arg(_filePathSouce));
+            error.setDescription(QString::fromUtf8("module \"$$URI$$\" definition \"%1\" not readable").arg(_filePathSouce));
             _errors.prepend(error);
             return false;
         }
@@ -259,7 +259,9 @@ QList<QDeclarativeError> QDeclarativeDirParser::errors(const QString &uri) const
     QList<QDeclarativeError> errors = _errors;
     for (int i = 0; i < errors.size(); ++i) {
         QDeclarativeError &e = errors[i];
-        e.setDescription(e.description().arg(uri));
+        QString description = e.description();
+        description.replace(QLatin1String("$$URI$$"), uri);
+        e.setDescription(description);
     }
     return errors;
 }
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index 3df19a9..0c0719a 100644
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -1076,7 +1076,7 @@ bool QDeclarativeImportDatabase::importPlugin(const QString &filePath, const QSt
         if (!QDeclarative_isFileCaseCorrect(absoluteFilePath)) {
             if (errors) {
                 QDeclarativeError error;
-                error.setDescription(tr("File name case mismatch for \"%2\"").arg(absoluteFilePath));
+                error.setDescription(tr("File name case mismatch for \"%1\"").arg(absoluteFilePath));
                 errors->prepend(error);
             }
             return false;