From bb14ad68c0cb910d91fc32527ce4c49626089ef7 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Wed, 24 Mar 2010 17:11:07 +0100
Subject: [PATCH] Share the common page not found message.
---
src/shared/help/helpviewer.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/shared/help/helpviewer.cpp b/src/shared/help/helpviewer.cpp
index 95e41e4cda0..cf19931f43a 100644
--- a/src/shared/help/helpviewer.cpp
+++ b/src/shared/help/helpviewer.cpp
@@ -51,6 +51,10 @@
#include <QNetworkReply>
#include <QNetworkRequest>
+static QString PageNotFoundMessage =
+ QCoreApplication::translate("HelpViewer", "<title>Error 404...</title><div "
+ "align=\"center\"><br><br><h1>The page could not be found</h1><br><h3>'%1'"
+ "</h3></div>");
#if !defined(QT_NO_WEBKIT)
@@ -138,7 +142,7 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation /*op*/,
const QHelpEngineCore &engine = Help::HelpManager::helpEngineCore();
const QByteArray &data = engine.findFile(url).isValid()
- ? engine.fileData(url) : QByteArray("The page could not be found");
+ ? engine.fileData(url) : PageNotFoundMessage.arg(url.toString()).toUtf8();
return new HelpNetworkReply(request, data, mimeType);
}
@@ -420,9 +424,7 @@ void HelpViewer::setSource(const QUrl &url)
"assistantinternal_1.0.0/assistant/assistant.html")));
} else {
QTextBrowser::setSource(url);
- setHtml(tr("<title>Error 404...</title><div align=\"center\"><br><br>"
- "<h1>The page could not be found</h1><br><h3>'%1'</h3></div>")
- .arg(url.toString()));
+ setHtml(PageNotFoundMessage.arg(url.toString()));
emit sourceChanged(url);
}
}
--
GitLab