diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-07-24 15:40:37 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-07-26 07:02:36 +0000 |
commit | 92bda3eabf2498f4965f9e162f91c1663230ff55 (patch) | |
tree | 36ca3c1a7ec02a6aceac7811d29c5f8730f57b1d | |
parent | 30a75f7f0d540b5fd312b3cb2cf850e4e177c68b (diff) |
Unexport HelpProjectData and move it to helpgenerator app tree
Change-Id: I5af687d5f7dd3fc886a33453b5613df062a8f5a2
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
13 files changed, 34 insertions, 26 deletions
diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro index efb3c2a2a..7ffa008c5 100644 --- a/src/assistant/help/help.pro +++ b/src/assistant/help/help.pro @@ -15,8 +15,6 @@ SOURCES += qhelpenginecore.cpp \ qhelpdbreader.cpp \ qhelpcontentwidget.cpp \ qhelpindexwidget.cpp \ - qhelpdatainterface.cpp \ - qhelpprojectdata.cpp \ qhelpcollectionhandler.cpp \ qhelpsearchengine.cpp \ qhelpsearchquerywidget.cpp \ @@ -33,8 +31,6 @@ HEADERS += qhelpenginecore.h \ qhelpdbreader_p.h \ qhelpcontentwidget.h \ qhelpindexwidget.h \ - qhelpdatainterface_p.h \ - qhelpprojectdata_p.h \ qhelpcollectionhandler_p.h \ qhelpsearchengine.h \ qhelpsearchquerywidget.h \ diff --git a/src/assistant/shared/helpgenerator.cpp b/src/assistant/qhelpgenerator/helpgenerator.cpp index 45a44f4fe..440d5b4d9 100644 --- a/src/assistant/shared/helpgenerator.cpp +++ b/src/assistant/qhelpgenerator/helpgenerator.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "helpgenerator.h" -#include <private/qhelpdatainterface_p.h> +#include "qhelpdatainterface_p.h" #include <qhelp_global.h> #include <QtCore/QtMath> diff --git a/src/assistant/shared/helpgenerator.h b/src/assistant/qhelpgenerator/helpgenerator.h index 4ca84c73a..4ca84c73a 100644 --- a/src/assistant/shared/helpgenerator.h +++ b/src/assistant/qhelpgenerator/helpgenerator.h diff --git a/src/assistant/qhelpgenerator/main.cpp b/src/assistant/qhelpgenerator/main.cpp index bca4ec248..ce9d46498 100644 --- a/src/assistant/qhelpgenerator/main.cpp +++ b/src/assistant/qhelpgenerator/main.cpp @@ -27,8 +27,9 @@ ****************************************************************************/ #include "../shared/collectionconfiguration.h" -#include "../shared/helpgenerator.h" +#include "helpgenerator.h" #include "collectionconfigreader.h" +#include "qhelpprojectdata_p.h" #include <QtCore/QBuffer> #include <QtCore/QDataStream> @@ -41,7 +42,6 @@ #include <QtHelp/QHelpEngineCore> -#include <private/qhelpprojectdata_p.h> QT_USE_NAMESPACE diff --git a/src/assistant/help/qhelpdatainterface.cpp b/src/assistant/qhelpgenerator/qhelpdatainterface.cpp index fade438e1..fade438e1 100644 --- a/src/assistant/help/qhelpdatainterface.cpp +++ b/src/assistant/qhelpgenerator/qhelpdatainterface.cpp diff --git a/src/assistant/help/qhelpdatainterface_p.h b/src/assistant/qhelpgenerator/qhelpdatainterface_p.h index 0cff9ccf5..0bc6969d1 100644 --- a/src/assistant/help/qhelpdatainterface_p.h +++ b/src/assistant/qhelpgenerator/qhelpdatainterface_p.h @@ -51,14 +51,13 @@ // We mean it. // -#include "qhelp_global.h" - -#include <QtCore/QStringList> #include <QtCore/QSharedData> +#include <QtCore/QStringList> +#include <QtCore/QVariant> QT_BEGIN_NAMESPACE -class QHELP_EXPORT QHelpDataContentItem +class QHelpDataContentItem { public: QHelpDataContentItem(QHelpDataContentItem *parent, const QString &title, @@ -75,7 +74,7 @@ private: QList<QHelpDataContentItem*> m_children; }; -struct QHELP_EXPORT QHelpDataIndexItem { +struct QHelpDataIndexItem { QHelpDataIndexItem() {} QHelpDataIndexItem(const QString &n, const QString &id, const QString &r) : name(n), identifier(id), reference(r) {} @@ -101,7 +100,7 @@ public: QStringList files; }; -class QHELP_EXPORT QHelpDataFilterSection +class QHelpDataFilterSection { public: QHelpDataFilterSection(); @@ -125,12 +124,12 @@ private: QSharedDataPointer<QHelpDataFilterSectionData> d; }; -struct QHELP_EXPORT QHelpDataCustomFilter { +struct QHelpDataCustomFilter { QStringList filterAttributes; QString name; }; -class QHELP_EXPORT QHelpDataInterface +class QHelpDataInterface { public: QHelpDataInterface() {} diff --git a/src/assistant/qhelpgenerator/qhelpgenerator.pro b/src/assistant/qhelpgenerator/qhelpgenerator.pro index 0e7b08b48..dabd87ccc 100644 --- a/src/assistant/qhelpgenerator/qhelpgenerator.pro +++ b/src/assistant/qhelpgenerator/qhelpgenerator.pro @@ -3,13 +3,17 @@ QT += network help-private QTPLUGIN.platforms = qminimal SOURCES += ../shared/collectionconfiguration.cpp \ - ../shared/helpgenerator.cpp \ + helpgenerator.cpp \ collectionconfigreader.cpp \ + qhelpprojectdata.cpp \ + qhelpdatainterface.cpp \ main.cpp HEADERS += ../shared/collectionconfiguration.h \ - ../shared/helpgenerator.h \ - collectionconfigreader.h + helpgenerator.h \ + collectionconfigreader.h \ + qhelpprojectdata_p.h \ + qhelpdatainterface_p.h QMAKE_TARGET_DESCRIPTION = "Qt Compressed Help File Generator" load(qt_tool) diff --git a/src/assistant/help/qhelpprojectdata.cpp b/src/assistant/qhelpgenerator/qhelpprojectdata.cpp index 90bf75a5f..90bf75a5f 100644 --- a/src/assistant/help/qhelpprojectdata.cpp +++ b/src/assistant/qhelpgenerator/qhelpprojectdata.cpp diff --git a/src/assistant/help/qhelpprojectdata_p.h b/src/assistant/qhelpgenerator/qhelpprojectdata_p.h index 1abd12c1c..227c67bb9 100644 --- a/src/assistant/help/qhelpprojectdata_p.h +++ b/src/assistant/qhelpgenerator/qhelpprojectdata_p.h @@ -51,14 +51,13 @@ // We mean it. // -#include "qhelp_global.h" #include "qhelpdatainterface_p.h" QT_BEGIN_NAMESPACE class QHelpProjectDataPrivate; -class QHELP_EXPORT QHelpProjectData : public QHelpDataInterface +class QHelpProjectData : public QHelpDataInterface { public: QHelpProjectData(); diff --git a/tests/auto/qhelpgenerator/qhelpgenerator.pro b/tests/auto/qhelpgenerator/qhelpgenerator.pro index 06bc1c631..da3826844 100644 --- a/tests/auto/qhelpgenerator/qhelpgenerator.pro +++ b/tests/auto/qhelpgenerator/qhelpgenerator.pro @@ -1,9 +1,13 @@ TARGET = tst_qhelpgenerator CONFIG += testcase -HEADERS += ../../../src/assistant/shared/helpgenerator.h +HEADERS += ../../../src/assistant/qhelpgenerator/helpgenerator.h \ + ../../../src/assistant/qhelpgenerator/qhelpdatainterface_p.h \ + ../../../src/assistant/qhelpgenerator/qhelpprojectdata_p.h SOURCES += tst_qhelpgenerator.cpp \ - ../../../src/assistant/shared/helpgenerator.cpp + ../../../src/assistant/qhelpgenerator/helpgenerator.cpp \ + ../../../src/assistant/qhelpgenerator/qhelpdatainterface.cpp \ + ../../../src/assistant/qhelpgenerator/qhelpprojectdata.cpp QT += help-private sql testlib DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp index b5ecc5118..14d264e84 100644 --- a/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp +++ b/tests/auto/qhelpgenerator/tst_qhelpgenerator.cpp @@ -31,8 +31,8 @@ #include <QtSql/QSqlDatabase> #include <QtSql/QSqlQuery> -#include <QtHelp/private/qhelpprojectdata_p.h> -#include "../../../src/assistant/shared/helpgenerator.h" +#include "../../../src/assistant/qhelpgenerator/qhelpprojectdata_p.h" +#include "../../../src/assistant/qhelpgenerator/helpgenerator.h" class tst_QHelpGenerator : public QObject { diff --git a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro index ec2e313d5..51d127ac0 100644 --- a/tests/auto/qhelpprojectdata/qhelpprojectdata.pro +++ b/tests/auto/qhelpprojectdata/qhelpprojectdata.pro @@ -1,7 +1,13 @@ TARGET = tst_qhelpprojectdata CONFIG += testcase -SOURCES += tst_qhelpprojectdata.cpp +HEADERS += ../../../src/assistant/qhelpgenerator/qhelpdatainterface_p.h \ + ../../../src/assistant/qhelpgenerator/qhelpprojectdata_p.h + +SOURCES += tst_qhelpprojectdata.cpp \ + ../../../src/assistant/qhelpgenerator/qhelpdatainterface.cpp \ + ../../../src/assistant/qhelpgenerator/qhelpprojectdata.cpp + QT += help-private testlib DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp index 36864163b..a09135d7c 100644 --- a/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp +++ b/tests/auto/qhelpprojectdata/tst_qhelpprojectdata.cpp @@ -29,7 +29,7 @@ #include <QtCore/QFileInfo> -#include <QtHelp/private/qhelpprojectdata_p.h> +#include "../../../src/assistant/qhelpgenerator/qhelpprojectdata_p.h" class tst_QHelpProjectData : public QObject { |