From f12085f8a00957ed17c33e9d75e51dc74a3d2115 Mon Sep 17 00:00:00 2001
From: kh <qtc-committer@nokia.com>
Date: Fri, 31 Jul 2009 12:02:46 +0200
Subject: Fix internal documentation after QUrl change.

Reviewed-by: kh
---
 tools/assistant/tools/assistant/assistant.qch     | Bin 368640 -> 368640 bytes
 tools/assistant/tools/assistant/doc/assistant.qhp |   2 +-
 tools/assistant/tools/assistant/helpviewer.cpp    |   4 ++--
 tools/assistant/tools/assistant/main.cpp          |   2 +-
 tools/assistant/tools/assistant/mainwindow.cpp    |   2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/assistant/tools/assistant/assistant.qch b/tools/assistant/tools/assistant/assistant.qch
index 99687ed..3e66bd9 100644
Binary files a/tools/assistant/tools/assistant/assistant.qch and b/tools/assistant/tools/assistant/assistant.qch differ
diff --git a/tools/assistant/tools/assistant/doc/assistant.qhp b/tools/assistant/tools/assistant/doc/assistant.qhp
index 7a26101..7ea4cdd 100644
--- a/tools/assistant/tools/assistant/doc/assistant.qhp
+++ b/tools/assistant/tools/assistant/doc/assistant.qhp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <QtHelpProject version="1.0">
     <virtualFolder>assistant</virtualFolder>
-    <namespace>com.trolltech.com.assistantinternal_1.0.0</namespace>
+    <namespace>com.trolltech.com.assistantinternal-1.0.0</namespace>
       <filterSection>
         <files>
         <file>assistant.html</file>
diff --git a/tools/assistant/tools/assistant/helpviewer.cpp b/tools/assistant/tools/assistant/helpviewer.cpp
index 6799db3..5422bf46 100644
--- a/tools/assistant/tools/assistant/helpviewer.cpp
+++ b/tools/assistant/tools/assistant/helpviewer.cpp
@@ -306,7 +306,7 @@ void HelpViewer::setSource(const QUrl &url)
     loadFinished = false;
     if (url.toString() == QLatin1String("help")) {
         load(QUrl(QLatin1String("qthelp://com.trolltech.com."
-            "assistantinternal_1.0.0/assistant/assistant.html")));
+            "assistantinternal-1.0.0/assistant/assistant.html")));
     } else {
         load(url);
     }
@@ -425,7 +425,7 @@ void HelpViewer::setSource(const QUrl &url)
 
     if (help) {
         QTextBrowser::setSource(QUrl(QLatin1String("qthelp://com.trolltech.com."
-            "assistantinternal_1.0.0/assistant/assistant.html")));
+            "assistantinternal-1.0.0/assistant/assistant.html")));
     } else {
         QTextBrowser::setSource(url);
         setHtml(tr("<title>Error 404...</title><div align=\"center\"><br><br>"
diff --git a/tools/assistant/tools/assistant/main.cpp b/tools/assistant/tools/assistant/main.cpp
index 05355d9..a0a5a0d 100644
--- a/tools/assistant/tools/assistant/main.cpp
+++ b/tools/assistant/tools/assistant/main.cpp
@@ -306,7 +306,7 @@ int main(int argc, char *argv[])
                         }
                     }
 
-                    QLatin1String intern("com.trolltech.com.assistantinternal_");
+                    QLatin1String intern("com.trolltech.com.assistantinternal-");
                     foreach (const QString &doc, userDocs) {
                         if (!callerDocs.contains(doc) && !doc.startsWith(intern))
                             user.unregisterDocumentation(doc);
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index 7926020..0c1723c 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -274,7 +274,7 @@ bool MainWindow::initHelpDB()
         return false;
 
     bool assistantInternalDocRegistered = false;
-    QString intern(QLatin1String("com.trolltech.com.assistantinternal_"));
+    QString intern(QLatin1String("com.trolltech.com.assistantinternal-"));
     foreach (const QString &ns, m_helpEngine->registeredDocumentations()) {
         if (ns.startsWith(intern)) {
             intern = ns;
-- 
cgit v0.12