From 2c3f2a0c41a9a2b8f1961197369b278d335f9cf1 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Fri, 22 Jan 2010 13:03:18 +0100
Subject: QtHelp: Minor clean-ups.

---
 tools/assistant/tools/assistant/helpenginewrapper.cpp | 3 ---
 tools/assistant/tools/qcollectiongenerator/main.cpp   | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/tools/assistant/tools/assistant/helpenginewrapper.cpp b/tools/assistant/tools/assistant/helpenginewrapper.cpp
index 72ba30d..9785710 100644
--- a/tools/assistant/tools/assistant/helpenginewrapper.cpp
+++ b/tools/assistant/tools/assistant/helpenginewrapper.cpp
@@ -102,8 +102,6 @@ signals:
 private:
     HelpEngineWrapperPrivate(const QString &collectionFile);
 
-    friend class TimeoutForwarder;
-
     void initFileSystemWatchers();
     void assertDocFilesWatched();
     void qchFileChanged(const QString &fileName, bool fromTimeout);
@@ -114,7 +112,6 @@ private:
     QFileSystemWatcher * const m_qchWatcher;
     typedef QPair<QDateTime, QSharedPointer<TimeoutForwarder> > RecentSignal;
     QMap<QString, RecentSignal> m_recentQchUpdates;
-
 };
 
 HelpEngineWrapper *HelpEngineWrapper::helpEngineWrapper = 0;
diff --git a/tools/assistant/tools/qcollectiongenerator/main.cpp b/tools/assistant/tools/qcollectiongenerator/main.cpp
index d8150ff..f75d891 100644
--- a/tools/assistant/tools/qcollectiongenerator/main.cpp
+++ b/tools/assistant/tools/qcollectiongenerator/main.cpp
@@ -42,19 +42,19 @@
 #include "../shared/collectionconfiguration.h"
 #include "../shared/helpgenerator.h"
 
+#include <private/qhelpgenerator_p.h>
+#include <private/qhelpprojectdata_p.h>
+
 #include <QtCore/QDir>
 #include <QtCore/QMap>
 #include <QtCore/QFileInfo>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDateTime>
 #include <QtCore/QBuffer>
-
-#include <private/qhelpgenerator_p.h>
-#include <private/qhelpprojectdata_p.h>
 #include <QtHelp/QHelpEngineCore>
-
 #include <QtXml/QXmlStreamReader>
 
+
 QT_USE_NAMESPACE
 
 class CollectionConfigReader : public QXmlStreamReader
-- 
cgit v0.12