From 7eea24f6c71cde7134cfb4b8c936f235da86289d Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Mon, 26 Apr 2010 10:27:25 +0200
Subject: Assistant: Fix some merge artifacts.

---
 tools/assistant/tools/assistant/helpviewer_qtb.cpp   |  2 +-
 tools/assistant/tools/assistant/mainwindow.cpp       | 15 ++++++---------
 tools/assistant/tools/assistant/openpagesmanager.cpp |  4 +++-
 tools/assistant/tools/assistant/openpagesmodel.cpp   |  3 +++
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.cpp b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
index c6bb7a8..78890b9 100644
--- a/tools/assistant/tools/assistant/helpviewer_qtb.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
@@ -188,7 +188,7 @@ void HelpViewer::openLinkInNewTab()
     if(lastAnchor.isEmpty())
         return;
 
-    OpenPagesManager::instance()->createNewTab(QUrl(lastAnchor));
+    OpenPagesManager::instance()->createPage(QUrl(lastAnchor));
     lastAnchor.clear();
 }
 
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index a9bcd90..9578478 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -418,8 +418,13 @@ void MainWindow::setupActions()
 
     QMenu *menu = menuBar()->addMenu(tr("&File"));
 
-    m_newTabAction = menu->addAction(tr("New &Tab"), m_centralWidget, SLOT(newTab()));
+    OpenPagesManager * const openPages = OpenPagesManager::instance();
+    m_newTabAction
+        = menu->addAction(tr("New &Tab"), openPages, SLOT(createPage()));
     m_newTabAction->setShortcut(QKeySequence::AddTab);
+    m_closeTabAction = menu->addAction(tr("&Close Tab"),
+                                          openPages, SLOT(closeCurrentPage()));
+    m_closeTabAction->setShortcuts(QKeySequence::Close);
 
     menu->addSeparator();
 
@@ -432,14 +437,6 @@ void MainWindow::setupActions()
     menu->addAction(globalActions->printAction());
     menu->addSeparator();
 
-    OpenPagesManager * const openPages = OpenPagesManager::instance();
-    m_newTabAction
-        = menu->addAction(tr("New &Tab"), openPages, SLOT(createPage()));
-    m_newTabAction->setShortcut(QKeySequence::AddTab);
-    m_closeTabAction = menu->addAction(tr("&Close Tab"),
-                                          openPages, SLOT(closeCurrentPage()));
-    m_closeTabAction->setShortcuts(QKeySequence::Close);
-
     QAction *tmp = menu->addAction(QIcon::fromTheme("application-exit"),
                                    tr("&Quit"), this, SLOT(close()));
     tmp->setMenuRole(QAction::QuitRole);
diff --git a/tools/assistant/tools/assistant/openpagesmanager.cpp b/tools/assistant/tools/assistant/openpagesmanager.cpp
index cd4460a..472a846 100644
--- a/tools/assistant/tools/assistant/openpagesmanager.cpp
+++ b/tools/assistant/tools/assistant/openpagesmanager.cpp
@@ -42,9 +42,11 @@
  
 #include "centralwidget.h"
 #include "helpenginewrapper.h"
-#include "helpviewer.h"
+#if defined(QT_NO_WEBKIT)
 #include "helpviewer_qtb.h"
+#else
 #include "helpviewer_qwv.h"
+#endif // QT_NO_WEBKIT
 #include "openpagesmodel.h"
 #include "openpageswidget.h"
 #include "tracer.h"
diff --git a/tools/assistant/tools/assistant/openpagesmodel.cpp b/tools/assistant/tools/assistant/openpagesmodel.cpp
index 9e31b84..92ca1ad 100644
--- a/tools/assistant/tools/assistant/openpagesmodel.cpp
+++ b/tools/assistant/tools/assistant/openpagesmodel.cpp
@@ -41,8 +41,11 @@
 #include "openpagesmodel.h"
 
 #include "helpenginewrapper.h"
+#if defined(QT_NO_WEBKIT)
 #include "helpviewer_qtb.h"
+#else
 #include "helpviewer_qwv.h"
+#endif // QT_NO_WEBKIT
 #include "tracer.h"
 
 #include <QtCore/QStringList>
-- 
cgit v0.12