From 677acf607409b4fe99a99516ddd6fc81e63cd82c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 1 Aug 2012 16:56:29 +0200 Subject: [PATCH] Add export macros to QtCLucene QtCLucene is not the same library as QtHelp, so it can't use the same macros and same #define as QtHelp. Change-Id: Idefe46cbd8842f406131c8f041b531a92a2261a2 Reviewed-by: Oswald Buddenhagen --- src/assistant/clucene/clucene.pro | 2 -- src/assistant/clucene/qanalyzer_p.h | 16 ++++++++-------- src/assistant/clucene/qclucene_global_p.h | 8 ++++---- src/assistant/clucene/qdocument_p.h | 4 ++-- src/assistant/clucene/qfield_p.h | 4 ++-- src/assistant/clucene/qfilter_p.h | 4 ++-- src/assistant/clucene/qhits_p.h | 4 ++-- src/assistant/clucene/qindexreader_p.h | 4 ++-- src/assistant/clucene/qindexwriter_p.h | 4 ++-- src/assistant/clucene/qquery_p.h | 14 +++++++------- src/assistant/clucene/qqueryparser_p.h | 6 +++--- src/assistant/clucene/qreader_p.h | 6 +++--- src/assistant/clucene/qsearchable_p.h | 10 +++++----- src/assistant/clucene/qsort_p.h | 4 ++-- src/assistant/clucene/qterm_p.h | 4 ++-- src/assistant/clucene/qtoken_p.h | 4 ++-- src/assistant/clucene/qtokenizer_p.h | 4 ++-- src/assistant/clucene/qtokenstream_p.h | 4 ++-- 18 files changed, 52 insertions(+), 54 deletions(-) diff --git a/src/assistant/clucene/clucene.pro b/src/assistant/clucene/clucene.pro index 02722d1..4a260ca 100644 --- a/src/assistant/clucene/clucene.pro +++ b/src/assistant/clucene/clucene.pro @@ -6,8 +6,6 @@ TARGET = QtCLucene QT = core CONFIG += internal_module -DEFINES += QHELP_LIB - load(qt_module_config) include(fulltextsearch.pri) diff --git a/src/assistant/clucene/qanalyzer_p.h b/src/assistant/clucene/qanalyzer_p.h index 8332ff9..307cfb1 100644 --- a/src/assistant/clucene/qanalyzer_p.h +++ b/src/assistant/clucene/qanalyzer_p.h @@ -55,7 +55,7 @@ class QCLuceneStandardAnalyzer; class QCLuceneWhitespaceAnalyzer; class QCLucenePerFieldAnalyzerWrapper; -class QHELP_EXPORT QCLuceneAnalyzerPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneAnalyzerPrivate : public QSharedData { public: QCLuceneAnalyzerPrivate(); @@ -70,7 +70,7 @@ private: QCLuceneAnalyzerPrivate &operator=(const QCLuceneAnalyzerPrivate &other); }; -class QHELP_EXPORT QCLuceneAnalyzer +class Q_CLUCENE_EXPORT QCLuceneAnalyzer { public: virtual ~QCLuceneAnalyzer(); @@ -94,7 +94,7 @@ private: QCLuceneAnalyzer(); }; -class QHELP_EXPORT QCLuceneStandardAnalyzer : public QCLuceneAnalyzer +class Q_CLUCENE_EXPORT QCLuceneStandardAnalyzer : public QCLuceneAnalyzer { public: QCLuceneStandardAnalyzer(); @@ -103,21 +103,21 @@ public: ~QCLuceneStandardAnalyzer(); }; -class QHELP_EXPORT QCLuceneWhitespaceAnalyzer : public QCLuceneAnalyzer +class Q_CLUCENE_EXPORT QCLuceneWhitespaceAnalyzer : public QCLuceneAnalyzer { public: QCLuceneWhitespaceAnalyzer(); ~QCLuceneWhitespaceAnalyzer(); }; -class QHELP_EXPORT QCLuceneSimpleAnalyzer : public QCLuceneAnalyzer +class Q_CLUCENE_EXPORT QCLuceneSimpleAnalyzer : public QCLuceneAnalyzer { public: QCLuceneSimpleAnalyzer(); ~QCLuceneSimpleAnalyzer(); }; -class QHELP_EXPORT QCLuceneStopAnalyzer : public QCLuceneAnalyzer +class Q_CLUCENE_EXPORT QCLuceneStopAnalyzer : public QCLuceneAnalyzer { public: QCLuceneStopAnalyzer(); @@ -128,14 +128,14 @@ public: QStringList englishStopWords() const; }; -class QHELP_EXPORT QCLuceneKeywordAnalyzer : public QCLuceneAnalyzer +class Q_CLUCENE_EXPORT QCLuceneKeywordAnalyzer : public QCLuceneAnalyzer { public: QCLuceneKeywordAnalyzer(); ~QCLuceneKeywordAnalyzer(); }; -class QHELP_EXPORT QCLucenePerFieldAnalyzerWrapper : public QCLuceneAnalyzer +class Q_CLUCENE_EXPORT QCLucenePerFieldAnalyzerWrapper : public QCLuceneAnalyzer { public: QCLucenePerFieldAnalyzerWrapper(QCLuceneAnalyzer *defaultAnalyzer); diff --git a/src/assistant/clucene/qclucene_global_p.h b/src/assistant/clucene/qclucene_global_p.h index 5fad4c6..fb66e54 100644 --- a/src/assistant/clucene/qclucene_global_p.h +++ b/src/assistant/clucene/qclucene_global_p.h @@ -49,11 +49,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifdef QT_STATIC -# define QHELP_EXPORT -#elif defined(QHELP_LIB) -# define QHELP_EXPORT Q_DECL_EXPORT +# define Q_CLUCENE_EXPORT +#elif defined(QT_BUILD_CLUCENE_LIB) +# define Q_CLUCENE_EXPORT Q_DECL_EXPORT #else -# define QHELP_EXPORT Q_DECL_IMPORT +# define Q_CLUCENE_EXPORT Q_DECL_IMPORT #endif // diff --git a/src/assistant/clucene/qdocument_p.h b/src/assistant/clucene/qdocument_p.h index 3d906e3..06a9d5a 100644 --- a/src/assistant/clucene/qdocument_p.h +++ b/src/assistant/clucene/qdocument_p.h @@ -51,7 +51,7 @@ class QCLuceneIndexWriter; class QCLuceneIndexSearcher; class QCLuceneMultiSearcher; -class QHELP_EXPORT QCLuceneDocumentPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneDocumentPrivate : public QSharedData { public: QCLuceneDocumentPrivate(); @@ -66,7 +66,7 @@ private: QCLuceneDocumentPrivate &operator=(const QCLuceneDocumentPrivate &other); }; -class QHELP_EXPORT QCLuceneDocument +class Q_CLUCENE_EXPORT QCLuceneDocument { public: QCLuceneDocument(); diff --git a/src/assistant/clucene/qfield_p.h b/src/assistant/clucene/qfield_p.h index 1eb278c..555d9d8 100644 --- a/src/assistant/clucene/qfield_p.h +++ b/src/assistant/clucene/qfield_p.h @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE class QCLuceneReader; class QCLuceneDocument; -class QHELP_EXPORT QCLuceneFieldPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneFieldPrivate : public QSharedData { public: QCLuceneFieldPrivate(); @@ -60,7 +60,7 @@ private: QCLuceneFieldPrivate &operator=(const QCLuceneFieldPrivate &other); }; -class QHELP_EXPORT QCLuceneField +class Q_CLUCENE_EXPORT QCLuceneField { public: enum Store { diff --git a/src/assistant/clucene/qfilter_p.h b/src/assistant/clucene/qfilter_p.h index ff7d675..a45b988 100644 --- a/src/assistant/clucene/qfilter_p.h +++ b/src/assistant/clucene/qfilter_p.h @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE class QCLuceneHits; class QCLuceneSearcher; -class QHELP_EXPORT QCLuceneFilterPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneFilterPrivate : public QSharedData { public: QCLuceneFilterPrivate(); @@ -59,7 +59,7 @@ private: QCLuceneFilterPrivate &operator=(const QCLuceneFilterPrivate &other); }; -class QHELP_EXPORT QCLuceneFilter +class Q_CLUCENE_EXPORT QCLuceneFilter { QCLuceneFilter(); virtual ~QCLuceneFilter(); diff --git a/src/assistant/clucene/qhits_p.h b/src/assistant/clucene/qhits_p.h index a804f75..69912a9 100644 --- a/src/assistant/clucene/qhits_p.h +++ b/src/assistant/clucene/qhits_p.h @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE class QCLuceneSearcher; -class QHELP_EXPORT QCLuceneHitsPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneHitsPrivate : public QSharedData { public: QCLuceneHitsPrivate(); @@ -62,7 +62,7 @@ private: QCLuceneHitsPrivate &operator=(const QCLuceneHitsPrivate &other); }; -class QHELP_EXPORT QCLuceneHits +class Q_CLUCENE_EXPORT QCLuceneHits { public: QCLuceneHits(const QCLuceneSearcher &searcher, const QCLuceneQuery &query, diff --git a/src/assistant/clucene/qindexreader_p.h b/src/assistant/clucene/qindexreader_p.h index 8bc22c8..1c9ef5f 100644 --- a/src/assistant/clucene/qindexreader_p.h +++ b/src/assistant/clucene/qindexreader_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QCLuceneIndexWriter; class QCLuceneIndexSearcher; -class QHELP_EXPORT QCLuceneIndexReaderPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneIndexReaderPrivate : public QSharedData { public: QCLuceneIndexReaderPrivate(); @@ -63,7 +63,7 @@ private: QCLuceneIndexReaderPrivate &operator=(const QCLuceneIndexReaderPrivate &other); }; -class QHELP_EXPORT QCLuceneIndexReader +class Q_CLUCENE_EXPORT QCLuceneIndexReader { public: enum FieldOption { diff --git a/src/assistant/clucene/qindexwriter_p.h b/src/assistant/clucene/qindexwriter_p.h index bac6499..03be0d5 100644 --- a/src/assistant/clucene/qindexwriter_p.h +++ b/src/assistant/clucene/qindexwriter_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QCLuceneIndexReader; -class QHELP_EXPORT QCLuceneIndexWriterPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneIndexWriterPrivate : public QSharedData { public: QCLuceneIndexWriterPrivate(); @@ -61,7 +61,7 @@ private: QCLuceneIndexWriterPrivate &operator=(const QCLuceneIndexWriterPrivate &other); }; -class QHELP_EXPORT QCLuceneIndexWriter +class Q_CLUCENE_EXPORT QCLuceneIndexWriter { public: enum { diff --git a/src/assistant/clucene/qquery_p.h b/src/assistant/clucene/qquery_p.h index 24ebf03..7ae4889 100644 --- a/src/assistant/clucene/qquery_p.h +++ b/src/assistant/clucene/qquery_p.h @@ -52,7 +52,7 @@ class QCLucenePrefixQuery; class QCLuceneBooleanQuery; class QCLucenePhraseQuery; -class QHELP_EXPORT QCLuceneQueryPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneQueryPrivate : public QSharedData { public: QCLuceneQueryPrivate(); @@ -67,7 +67,7 @@ private: QCLuceneQueryPrivate &operator=(const QCLuceneQueryPrivate &other); }; -class QHELP_EXPORT QCLuceneQuery +class Q_CLUCENE_EXPORT QCLuceneQuery { public: virtual ~QCLuceneQuery(); @@ -95,7 +95,7 @@ private: QCLuceneQuery(); }; -class QHELP_EXPORT QCLucenePrefixQuery : public QCLuceneQuery +class Q_CLUCENE_EXPORT QCLucenePrefixQuery : public QCLuceneQuery { public: QCLucenePrefixQuery(const QCLuceneTerm &prefix); @@ -109,7 +109,7 @@ private: QCLuceneTerm prefix; }; -class QHELP_EXPORT QCLuceneRangeQuery : public QCLuceneQuery +class Q_CLUCENE_EXPORT QCLuceneRangeQuery : public QCLuceneQuery { public: QCLuceneRangeQuery(const QCLuceneTerm &lowerTerm, @@ -129,7 +129,7 @@ private: QCLuceneTerm upperTerm; }; -class QHELP_EXPORT QCLuceneTermQuery : public QCLuceneQuery +class Q_CLUCENE_EXPORT QCLuceneTermQuery : public QCLuceneQuery { public: QCLuceneTermQuery(const QCLuceneTerm &term); @@ -143,7 +143,7 @@ private: QCLuceneTerm term; }; -class QHELP_EXPORT QCLuceneBooleanQuery : public QCLuceneQuery +class Q_CLUCENE_EXPORT QCLuceneBooleanQuery : public QCLuceneQuery { public: QCLuceneBooleanQuery(); @@ -162,7 +162,7 @@ private: QList queries; }; -class QHELP_EXPORT QCLucenePhraseQuery : public QCLuceneQuery +class Q_CLUCENE_EXPORT QCLucenePhraseQuery : public QCLuceneQuery { public: QCLucenePhraseQuery(); diff --git a/src/assistant/clucene/qqueryparser_p.h b/src/assistant/clucene/qqueryparser_p.h index 9a075b6..a88ab0e 100644 --- a/src/assistant/clucene/qqueryparser_p.h +++ b/src/assistant/clucene/qqueryparser_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE class QCLuceneQuery; class QCLuceneMultiFieldQueryParser; -class QHELP_EXPORT QCLuceneQueryParserPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneQueryParserPrivate : public QSharedData { public: QCLuceneQueryParserPrivate(); @@ -63,7 +63,7 @@ private: QCLuceneQueryParserPrivate &operator=(const QCLuceneQueryParserPrivate &other); }; -class QHELP_EXPORT QCLuceneQueryParser +class Q_CLUCENE_EXPORT QCLuceneQueryParser { public: QCLuceneQueryParser(const QString &field, QCLuceneAnalyzer &analyzer); @@ -85,7 +85,7 @@ private: QCLuceneAnalyzer analyzer; }; -class QHELP_EXPORT QCLuceneMultiFieldQueryParser : public QCLuceneQueryParser +class Q_CLUCENE_EXPORT QCLuceneMultiFieldQueryParser : public QCLuceneQueryParser { public: enum FieldFlags { diff --git a/src/assistant/clucene/qreader_p.h b/src/assistant/clucene/qreader_p.h index c29ff1c..3c7a8a6 100644 --- a/src/assistant/clucene/qreader_p.h +++ b/src/assistant/clucene/qreader_p.h @@ -48,7 +48,7 @@ class QCLuceneDocument; class QCLuceneQueryParser; class QCLuceneStandardTokenizer; -class QHELP_EXPORT QCLuceneReaderPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneReaderPrivate : public QSharedData { public: QCLuceneReaderPrivate(); @@ -63,7 +63,7 @@ private: QCLuceneReaderPrivate &operator=(const QCLuceneReaderPrivate &other); }; -class QHELP_EXPORT QCLuceneReader +class Q_CLUCENE_EXPORT QCLuceneReader { public: QCLuceneReader(); @@ -91,7 +91,7 @@ private: TCHAR *string; }; -class QHELP_EXPORT QCLuceneFileReader : public QCLuceneReader +class Q_CLUCENE_EXPORT QCLuceneFileReader : public QCLuceneReader { public: QCLuceneFileReader(const QString &path, const QString &encoding, diff --git a/src/assistant/clucene/qsearchable_p.h b/src/assistant/clucene/qsearchable_p.h index 55e5b06..915436d 100644 --- a/src/assistant/clucene/qsearchable_p.h +++ b/src/assistant/clucene/qsearchable_p.h @@ -54,7 +54,7 @@ class QCLuceneSearcher; class QCLuceneIndexSearcher; class QCLuceneMultiSearcher; -class QHELP_EXPORT QCLuceneSearchablePrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneSearchablePrivate : public QSharedData { public: QCLuceneSearchablePrivate(); @@ -69,7 +69,7 @@ private: QCLuceneSearchablePrivate &operator=(const QCLuceneSearchablePrivate &other); }; -class QHELP_EXPORT QCLuceneSearchable +class Q_CLUCENE_EXPORT QCLuceneSearchable { public: virtual ~QCLuceneSearchable(); @@ -84,7 +84,7 @@ private: QCLuceneSearchable(); }; -class QHELP_EXPORT QCLuceneSearcher : public QCLuceneSearchable +class Q_CLUCENE_EXPORT QCLuceneSearcher : public QCLuceneSearchable { public: QCLuceneSearcher(); @@ -100,7 +100,7 @@ protected: friend class QCLuceneHits; }; -class QHELP_EXPORT QCLuceneIndexSearcher : public QCLuceneSearcher +class Q_CLUCENE_EXPORT QCLuceneIndexSearcher : public QCLuceneSearcher { public: QCLuceneIndexSearcher(const QString &path); @@ -116,7 +116,7 @@ private: QCLuceneIndexReader reader; }; -class QHELP_EXPORT QCLuceneMultiSearcher : public QCLuceneSearcher +class Q_CLUCENE_EXPORT QCLuceneMultiSearcher : public QCLuceneSearcher { public: QCLuceneMultiSearcher(const QList searchables); diff --git a/src/assistant/clucene/qsort_p.h b/src/assistant/clucene/qsort_p.h index 9ac5715..72c701c 100644 --- a/src/assistant/clucene/qsort_p.h +++ b/src/assistant/clucene/qsort_p.h @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE class QCLuceneHits; class QCLuceneField; -class QHELP_EXPORT QCLuceneSortPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneSortPrivate : public QSharedData { public: QCLuceneSortPrivate(); @@ -61,7 +61,7 @@ private: QCLuceneSortPrivate &operator=(const QCLuceneSortPrivate &other); }; -class QHELP_EXPORT QCLuceneSort +class Q_CLUCENE_EXPORT QCLuceneSort { public: QCLuceneSort(); diff --git a/src/assistant/clucene/qterm_p.h b/src/assistant/clucene/qterm_p.h index 94d86e5..b977f93 100644 --- a/src/assistant/clucene/qterm_p.h +++ b/src/assistant/clucene/qterm_p.h @@ -48,7 +48,7 @@ class QCLucenePrefixQuery; class QCLuceneIndexReader; class QCLucenePhraseQuery; -class QHELP_EXPORT QCLuceneTermPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneTermPrivate : public QSharedData { public: QCLuceneTermPrivate(); @@ -63,7 +63,7 @@ private: QCLuceneTermPrivate &operator=(const QCLuceneTermPrivate &other); }; -class QHELP_EXPORT QCLuceneTerm +class Q_CLUCENE_EXPORT QCLuceneTerm { public: QCLuceneTerm(); diff --git a/src/assistant/clucene/qtoken_p.h b/src/assistant/clucene/qtoken_p.h index 9e6b909..52c086e 100644 --- a/src/assistant/clucene/qtoken_p.h +++ b/src/assistant/clucene/qtoken_p.h @@ -46,7 +46,7 @@ class QCLuceneTokenizer; class QCLuceneTokenStream; class QCLuceneStandardTokenizer; -class QHELP_EXPORT QCLuceneTokenPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneTokenPrivate : public QSharedData { public: QCLuceneTokenPrivate(); @@ -61,7 +61,7 @@ private: QCLuceneTokenPrivate &operator=(const QCLuceneTokenPrivate &other); }; -class QHELP_EXPORT QCLuceneToken +class Q_CLUCENE_EXPORT QCLuceneToken { public: QCLuceneToken(); diff --git a/src/assistant/clucene/qtokenizer_p.h b/src/assistant/clucene/qtokenizer_p.h index 9ae3abe..c6f60a1 100644 --- a/src/assistant/clucene/qtokenizer_p.h +++ b/src/assistant/clucene/qtokenizer_p.h @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE -class QHELP_EXPORT QCLuceneTokenizer : public QCLuceneTokenStream +class Q_CLUCENE_EXPORT QCLuceneTokenizer : public QCLuceneTokenStream { public: QCLuceneTokenizer(const QCLuceneReader &reader); @@ -56,7 +56,7 @@ private: QCLuceneReader reader; }; -class QHELP_EXPORT QCLuceneStandardTokenizer : public QCLuceneTokenizer +class Q_CLUCENE_EXPORT QCLuceneStandardTokenizer : public QCLuceneTokenizer { public: QCLuceneStandardTokenizer(const QCLuceneReader &reader); diff --git a/src/assistant/clucene/qtokenstream_p.h b/src/assistant/clucene/qtokenstream_p.h index 1ae6cd9..ebaa241 100644 --- a/src/assistant/clucene/qtokenstream_p.h +++ b/src/assistant/clucene/qtokenstream_p.h @@ -52,7 +52,7 @@ class QCLuceneStandardAnalyzer; class QCLuceneWhitespaceAnalyzer; class QCLucenePerFieldAnalyzerWrapper; -class QHELP_EXPORT QCLuceneTokenStreamPrivate : public QSharedData +class Q_CLUCENE_EXPORT QCLuceneTokenStreamPrivate : public QSharedData { public: QCLuceneTokenStreamPrivate(); @@ -67,7 +67,7 @@ private: QCLuceneTokenStreamPrivate &operator=(const QCLuceneTokenStreamPrivate &other); }; -class QHELP_EXPORT QCLuceneTokenStream +class Q_CLUCENE_EXPORT QCLuceneTokenStream { public: virtual ~QCLuceneTokenStream(); -- 2.7.4