diff options
| author | ck <qt-info@nokia.com> | 2010-01-22 12:03:18 (GMT) |
|---|---|---|
| committer | ck <qt-info@nokia.com> | 2010-01-22 12:03:18 (GMT) |
| commit | 2c3f2a0c41a9a2b8f1961197369b278d335f9cf1 (patch) | |
| tree | b5841ec4630dce58f4ef2e8039d7167e06a2a893 | |
| parent | 178f722835ec0995fe211046579c50893659cc8e (diff) | |
| download | Qt-2c3f2a0c41a9a2b8f1961197369b278d335f9cf1.zip Qt-2c3f2a0c41a9a2b8f1961197369b278d335f9cf1.tar.gz Qt-2c3f2a0c41a9a2b8f1961197369b278d335f9cf1.tar.bz2 | |
QtHelp: Minor clean-ups.
| -rw-r--r-- | tools/assistant/tools/assistant/helpenginewrapper.cpp | 3 | ||||
| -rw-r--r-- | 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 |