feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: move global constants

Browse Source 
Global constants that are used only in one place could live
just there.

Change-Id: Ibee751b6ccc4fb0d35a8e708995730991becd749
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
This commit is contained in:
hjk
2013-01-11 09:03:02 +01:00
parent abf6f324f2
commit c0e7b65db3
4 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/help/helpplugin.cpp
View File

@@ -1168,8 +1168,8 @@ void HelpPlugin::handleHelpRequest(const QUrl &url)
QString address = url.toString(); QString address = url.toString();
if (!Core::HelpManager::instance()->findFile(url).isValid()) { if (!Core::HelpManager::instance()->findFile(url).isValid()) {
if (address.startsWith(HelpViewer::NsNokia) if (address.startsWith(QLatin1String("qthelp://com.nokia."))
|| address.startsWith(HelpViewer::NsTrolltech)) { || address.startsWith(QLatin1String("qthelp://com.trolltech."))) {
// local help not installed, resort to external web help // local help not installed, resort to external web help
QString urlPrefix = QLatin1String("http://doc.qt.digia.com/"); QString urlPrefix = QLatin1String("http://doc.qt.digia.com/");
if (url.authority() == QLatin1String("com.nokia.qtcreator")) if (url.authority() == QLatin1String("com.nokia.qtcreator"))

12
src/plugins/help/helpviewer.cpp
View File

@@ -48,18 +48,6 @@
using namespace Help::Internal; using namespace Help::Internal;
const QString HelpViewer::NsNokia = QLatin1String("qthelp://com.nokia.");
const QString HelpViewer::NsTrolltech = QLatin1String("qthelp://com.trolltech.");
const QString HelpViewer::AboutBlankPage =
QCoreApplication::translate("HelpViewer", "<title>about:blank</title>");
const QString HelpViewer::PageNotFoundMessage =
QCoreApplication::translate("HelpViewer", "<html><head><meta http-equiv=\""
"content-type\" content=\"text/html; charset=UTF-8\"><title>Error 404...</title>"
"</head><body><div align=\"center\"><br><br><h1>The page could not be found</h1>"
"<br><h3>'%1'</h3></div></body>");
struct ExtensionMap { struct ExtensionMap {
const char *extension; const char *extension;
const char *mimeType; const char *mimeType;

5
src/plugins/help/helpviewer.h
View File

@@ -85,11 +85,6 @@ public:
bool findText(const QString &text, Find::FindFlags flags, bool findText(const QString &text, Find::FindFlags flags,
bool incremental, bool fromSearch, bool *wrapped = 0); bool incremental, bool fromSearch, bool *wrapped = 0);
static const QString NsNokia;
static const QString NsTrolltech;
static const QString AboutBlankPage;
static const QString PageNotFoundMessage;
static bool isLocalUrl(const QUrl &url); static bool isLocalUrl(const QUrl &url);
static bool canOpenPage(const QString &url); static bool canOpenPage(const QString &url);
static QString mimeFromUrl(const QUrl &url); static QString mimeFromUrl(const QUrl &url);

10
src/plugins/help/helpviewer_qtb.cpp
View File

@@ -168,8 +168,14 @@ void HelpViewer::setSource(const QUrl &url)
} }
QTextBrowser::setSource(url); QTextBrowser::setSource(url);
setHtml(string == Help::Constants::AboutBlank ? AboutBlankPage setHtml(string == Help::Constants::AboutBlank
: PageNotFoundMessage.arg(url.toString())); ? HelpViewer::tr("<title>about:blank</title>")
: HelpViewer::tr("<html><head><meta http-equiv=\""
"content-type\" content=\"text/html; charset=UTF-8\"><title>Error 404...</title>"
"</head><body><div align=\"center\"><br><br><h1>The page could not be found</h1>"
"<br><h3>'%1'</h3></div></body>")
.arg(url.toString()));
emit loadFinished(true); emit loadFinished(true);
} }