Remove all Trolltech references.

Change-Id: Idad55a5e6d87ea5703681e3ef11fc35ce9ff84eb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

diff --git a/examples/assistant/doc/src/simpletextviewer.qdoc b/examples/assistant/doc/src/simpletextviewer.qdoc
index 51e0a87..335cf8f 100644 (file)
--- a/examples/assistant/doc/src/simpletextviewer.qdoc
+++ b/examples/assistant/doc/src/simpletextviewer.qdoc
@@ -96,7 +96,7 @@
     \code
     <?xml version="1.0" encoding="UTF-8"?>
     <QtHelpProject version="1.0">
-      <namespace>com.trolltech.examples.simpletextviewer</namespace>
+      <namespace>org.qt-project.examples.simpletextviewer</namespace>
       <virtualFolder>doc</virtualFolder>
     \endcode
 
@@ -223,7 +223,7 @@
     <assistant>
         <title>Simple Text Viewer</title>
         <applicationIcon>images/handbook.png</applicationIcon>
-        <cacheDirectory>Trolltech/SimpleTextViewer</cacheDirectory>
+        <cacheDirectory>QtProject/SimpleTextViewer</cacheDirectory>
     \endcode
 
     The \c cacheDirectory tag specifies a subdirectory of the users
@@ -238,7 +238,7 @@
     actual page file name.
 
     \code
-        <startPage>qthelp://com.trolltech.examples.simpletextviewer/doc/index.html</startPage>
+        <startPage>qthelp://org.qt-project.examples.simpletextviewer/doc/index.html</startPage>
     \endcode
 
     Next, we alter the name of the "About" menu item to "About Simple

diff --git a/examples/assistant/remotecontrol/remotecontrol.cpp b/examples/assistant/remotecontrol/remotecontrol.cpp
index 772ea75..2553d63 100644 (file)
--- a/examples/assistant/remotecontrol/remotecontrol.cpp
+++ b/examples/assistant/remotecontrol/remotecontrol.cpp
@@ -62,7 +62,7 @@ RemoteControl::RemoteControl(QWidget *parent, Qt::WindowFlags flags)
     QTextStream(&rc) << QLatin1String("qthelp://org.qt-project.qtdoc.")
                      << (QT_VERSION >> 16) << ((QT_VERSION >> 8) & 0xFF)
                      << (QT_VERSION & 0xFF)
-                     << QLatin1String("/qtdoc/index.html");
+                     << QLatin1String("/qdoc/index.html");
 
     ui.startUrlLineEdit->setText(rc);
 

diff --git a/examples/assistant/simpletextviewer/assistant.cpp b/examples/assistant/simpletextviewer/assistant.cpp
index 5e4d099..c3740d6 100644 (file)
--- a/examples/assistant/simpletextviewer/assistant.cpp
+++ b/examples/assistant/simpletextviewer/assistant.cpp
@@ -70,7 +70,7 @@ void Assistant::showDocumentation(const QString &page)
         return;
 
     QByteArray ba("SetSource ");
-    ba.append("qthelp://com.trolltech.examples.simpletextviewer/doc/");
+    ba.append("qthelp://org.qt-project.examples.simpletextviewer/doc/");
     
     proc->write(ba + page.toLocal8Bit() + '\n');
 }
@@ -93,7 +93,7 @@ bool Assistant::startAssistant()
         QStringList args;
         args << QLatin1String("-collectionFile")
             << QLibraryInfo::location(QLibraryInfo::ExamplesPath)
-            + QLatin1String("/qtassistant/simpletextviewer/documentation/simpletextviewer.qhc")
+            + QLatin1String("/assistant/simpletextviewer/documentation/simpletextviewer.qhc")
             << QLatin1String("-enableRemoteControl");
 
         proc->start(app, args);

diff --git a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qch b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qch
index c401328..f8a1ce3 100644 (file)
Binary files a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qch and b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qch differ

diff --git a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc
index db380ca..33ef3ff 100644 (file)
Binary files a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc and b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhc differ

diff --git a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp
index e7c2321..698c57b 100644 (file)
--- a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp
+++ b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhcp
@@ -3,8 +3,8 @@
     <assistant>
         <title>Simple Text Viewer</title>
         <applicationIcon>images/handbook.png</applicationIcon>
-        <cacheDirectory>Trolltech/SimpleTextViewer</cacheDirectory>
-        <startPage>qthelp://com.trolltech.examples.simpletextviewer/doc/index.html</startPage>
+        <cacheDirectory>QtProject/SimpleTextViewer</cacheDirectory>
+        <startPage>qthelp://org.qt-project.examples.simpletextviewer/doc/index.html</startPage>
         <aboutMenuText>
             <text>About Simple Text Viewer</text>
         </aboutMenuText>

diff --git a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp
index 4cb83a5..eddc603 100644 (file)
--- a/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp
+++ b/examples/assistant/simpletextviewer/documentation/simpletextviewer.qhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <QtHelpProject version="1.0">
-    <namespace>com.trolltech.examples.simpletextviewer</namespace>
+    <namespace>org.qt-project.examples.simpletextviewer</namespace>
     <virtualFolder>doc</virtualFolder>
     <filterSection>
         <toc>

diff --git a/examples/assistant/simpletextviewer/mainwindow.cpp b/examples/assistant/simpletextviewer/mainwindow.cpp
index fe4e132..bc17001 100644 (file)
--- a/examples/assistant/simpletextviewer/mainwindow.cpp
+++ b/examples/assistant/simpletextviewer/mainwindow.cpp
@@ -57,7 +57,7 @@ MainWindow::MainWindow()
 // ![0]
     textViewer = new TextEdit;
     textViewer->setContents(QLibraryInfo::location(QLibraryInfo::ExamplesPath)
-            + QLatin1String("/qtassistant/simpletextviewer/documentation/intro.html"));
+            + QLatin1String("/assistant/simpletextviewer/documentation/intro.html"));
     setCentralWidget(textViewer);
 
     createActions();

diff --git a/src/assistant/assistant/Info_mac.plist b/src/assistant/assistant/Info_mac.plist
index 76369a1..48b8480 100644 (file)
--- a/src/assistant/assistant/Info_mac.plist
+++ b/src/assistant/assistant/Info_mac.plist
@@ -11,7 +11,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleIdentifier</key>
-       <string>com.trolltech.assistant</string>
+        <string>org.qt-project.assistant</string>
        <key>CFBundleExecutable</key>
        <string>@EXECUTABLE@</string>
 </dict>