diff options
Diffstat (limited to 'src/assistant')
50 files changed, 182 insertions, 182 deletions
diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro index 65ac5aa65..34590d69e 100644 --- a/src/assistant/assistant.pro +++ b/src/assistant/assistant.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs SUBDIRS += clucene \ - help \ + help \ assistant \ qhelpgenerator \ qcollectiongenerator \ diff --git a/src/assistant/assistant/aboutdialog.h b/src/assistant/assistant/aboutdialog.h index 315d5af99..8be9b9add 100644 --- a/src/assistant/assistant/aboutdialog.h +++ b/src/assistant/assistant/aboutdialog.h @@ -59,7 +59,7 @@ public: AboutLabel(QWidget *parent = 0); void setText(const QString &text, const QByteArray &resources); QSize minimumSizeHint() const; - + private: QVariant loadResource(int type, const QUrl &name); void setSource(const QUrl &url); diff --git a/src/assistant/assistant/contentwindow.cpp b/src/assistant/assistant/contentwindow.cpp index a511de982..9f85ac51f 100644 --- a/src/assistant/assistant/contentwindow.cpp +++ b/src/assistant/assistant/contentwindow.cpp @@ -176,7 +176,7 @@ void ContentWindow::showContextMenu(const QPoint &pos) QAction *newTab = menu.addAction(tr("Open Link in New Tab")); if (!HelpViewer::canOpenPage(itm->url().path())) newTab->setEnabled(false); - + menu.move(m_contentWidget->mapToGlobal(pos)); QAction *action = menu.exec(); diff --git a/src/assistant/assistant/helpenginewrapper.h b/src/assistant/assistant/helpenginewrapper.h index 994d2067d..6346adc99 100644 --- a/src/assistant/assistant/helpenginewrapper.h +++ b/src/assistant/assistant/helpenginewrapper.h @@ -96,7 +96,7 @@ public: const QStringList customFilters() const; QUrl findFile(const QUrl &url) const; QByteArray fileData(const QUrl &url) const; - QMap<QString, QUrl> linksForIdentifier(const QString &id) const; + QMap<QString, QUrl> linksForIdentifier(const QString &id) const; const QStringList filterAttributes() const; const QStringList filterAttributes(const QString &filterName) const; QString error() const; diff --git a/src/assistant/assistant/indexwindow.cpp b/src/assistant/assistant/indexwindow.cpp index b0aeb72ff..4cfdf4060 100644 --- a/src/assistant/assistant/indexwindow.cpp +++ b/src/assistant/assistant/indexwindow.cpp @@ -213,7 +213,7 @@ void IndexWindow::open(QHelpIndexWidget* indexWidget, const QModelIndex &index) QUrl url; if (links.count() > 1) { TopicChooser tc(this, keyword, links); - if (tc.exec() == QDialog::Accepted) + if (tc.exec() == QDialog::Accepted) url = tc.link(); } else if (links.count() == 1) { url = links.constBegin().value(); diff --git a/src/assistant/assistant/preferencesdialog.h b/src/assistant/assistant/preferencesdialog.h index d7ee5da0a..f3344f0ae 100644 --- a/src/assistant/assistant/preferencesdialog.h +++ b/src/assistant/assistant/preferencesdialog.h @@ -73,7 +73,7 @@ private slots: void appFontSettingChanged(int index); void browserFontSettingToggled(bool on); void browserFontSettingChanged(int index); - + void setBlankPage(); void setCurrentPage(); void setDefaultPage(); diff --git a/src/assistant/assistant/remotecontrol_win.h b/src/assistant/assistant/remotecontrol_win.h index 1251b03a7..a892d69c1 100644 --- a/src/assistant/assistant/remotecontrol_win.h +++ b/src/assistant/assistant/remotecontrol_win.h @@ -54,7 +54,7 @@ class StdInListenerWin : public QThread public: StdInListenerWin(QObject *parent); ~StdInListenerWin(); - + signals: void receivedCommand(const QString &cmd); diff --git a/src/assistant/clucene/clucene.pro b/src/assistant/clucene/clucene.pro index 49bdb9d6f..5f152689c 100644 --- a/src/assistant/clucene/clucene.pro +++ b/src/assistant/clucene/clucene.pro @@ -33,8 +33,8 @@ CONFIG(exceptions_off) { win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x win32-msvc.net | win32-msvc2* { - QMAKE_CFLAGS_RELEASE -= -O2 - QMAKE_CXXFLAGS_RELEASE -= -O2 + QMAKE_CFLAGS_RELEASE -= -O2 + QMAKE_CXXFLAGS_RELEASE -= -O2 } # the following define could be set globally in case we need it elsewhere diff --git a/src/assistant/clucene/license.txt b/src/assistant/clucene/license.txt index 9ef3d701d..75657f7b4 100644 --- a/src/assistant/clucene/license.txt +++ b/src/assistant/clucene/license.txt @@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an diff --git a/src/assistant/clucene/qanalyzer.cpp b/src/assistant/clucene/qanalyzer.cpp index 1bd67d10e..ae666f01d 100644 --- a/src/assistant/clucene/qanalyzer.cpp +++ b/src/assistant/clucene/qanalyzer.cpp @@ -184,12 +184,12 @@ QCLuceneKeywordAnalyzer::~QCLuceneKeywordAnalyzer() QCLucenePerFieldAnalyzerWrapper::QCLucenePerFieldAnalyzerWrapper( - QCLuceneAnalyzer *defaultAnalyzer) + QCLuceneAnalyzer *defaultAnalyzer) : QCLuceneAnalyzer() { - d->analyzer = new + d->analyzer = new lucene::analysis::PerFieldAnalyzerWrapper(defaultAnalyzer->d->analyzer); - + analyzers.append(defaultAnalyzer); defaultAnalyzer->d->deleteCLuceneAnalyzer = false; } @@ -199,10 +199,10 @@ QCLucenePerFieldAnalyzerWrapper::~QCLucenePerFieldAnalyzerWrapper() qDeleteAll(analyzers); } -void QCLucenePerFieldAnalyzerWrapper::addAnalyzer(const QString &fieldName, +void QCLucenePerFieldAnalyzerWrapper::addAnalyzer(const QString &fieldName, QCLuceneAnalyzer *analyzer) { - lucene::analysis::PerFieldAnalyzerWrapper *analyzerWrapper = + lucene::analysis::PerFieldAnalyzerWrapper *analyzerWrapper = static_cast<lucene::analysis::PerFieldAnalyzerWrapper*> (d->analyzer); if (analyzerWrapper == 0) diff --git a/src/assistant/clucene/qanalyzer_p.h b/src/assistant/clucene/qanalyzer_p.h index d53f0c654..4c858c01c 100644 --- a/src/assistant/clucene/qanalyzer_p.h +++ b/src/assistant/clucene/qanalyzer_p.h @@ -76,7 +76,7 @@ public: virtual ~QCLuceneAnalyzer(); qint32 positionIncrementGap(const QString &fieldName) const; - QCLuceneTokenStream tokenStream(const QString &fieldName, + QCLuceneTokenStream tokenStream(const QString &fieldName, const QCLuceneReader &reader) const; protected: diff --git a/src/assistant/clucene/qclucene_global_p.h b/src/assistant/clucene/qclucene_global_p.h index 6d8e8197c..292de0813 100644 --- a/src/assistant/clucene/qclucene_global_p.h +++ b/src/assistant/clucene/qclucene_global_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE // W A R N I N G // ------------- // -// adjustments here, need to be done in +// adjustments here, need to be done in // QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well // #if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS) diff --git a/src/assistant/clucene/qdocument.cpp b/src/assistant/clucene/qdocument.cpp index 87ce943d0..77f942544 100644 --- a/src/assistant/clucene/qdocument.cpp +++ b/src/assistant/clucene/qdocument.cpp @@ -90,7 +90,7 @@ QCLuceneField* QCLuceneDocument::getField(const QString &name) const } } delete [] fieldName; - + return field; } @@ -99,7 +99,7 @@ QString QCLuceneDocument::get(const QString &name) const QCLuceneField* field = getField(name); if (field) return field->stringValue(); - + return QString(); } diff --git a/src/assistant/clucene/qfield.cpp b/src/assistant/clucene/qfield.cpp index b62cdc758..bcdbc5de5 100644 --- a/src/assistant/clucene/qfield.cpp +++ b/src/assistant/clucene/qfield.cpp @@ -65,7 +65,7 @@ QCLuceneField::QCLuceneField(const QString &name, const QString &value, int conf delete [] fieldValue; } -QCLuceneField::QCLuceneField(const QString &name, QCLuceneReader *reader, +QCLuceneField::QCLuceneField(const QString &name, QCLuceneReader *reader, int configs) : d(new QCLuceneFieldPrivate()) , reader(reader) diff --git a/src/assistant/clucene/qfield_p.h b/src/assistant/clucene/qfield_p.h index 5bce06f99..16c3496d3 100644 --- a/src/assistant/clucene/qfield_p.h +++ b/src/assistant/clucene/qfield_p.h @@ -63,47 +63,47 @@ private: class Q_CLUCENE_EXPORT QCLuceneField { public: - enum Store { - STORE_YES = 1, - STORE_NO = 2, - STORE_COMPRESS = 4 - }; - - enum Index { - INDEX_NO = 16, - INDEX_TOKENIZED = 32, - INDEX_UNTOKENIZED = 64, - INDEX_NONORMS = 128 - }; - - enum TermVector { - TERMVECTOR_NO = 256, - TERMVECTOR_YES = 512, - TERMVECTOR_WITH_POSITIONS = 1024, - TERMVECTOR_WITH_OFFSETS = 2048 - }; - - QCLuceneField(const QString &name, const QString &value, int configs); - QCLuceneField(const QString &name, QCLuceneReader *reader, int configs); + enum Store { + STORE_YES = 1, + STORE_NO = 2, + STORE_COMPRESS = 4 + }; + + enum Index { + INDEX_NO = 16, + INDEX_TOKENIZED = 32, + INDEX_UNTOKENIZED = 64, + INDEX_NONORMS = 128 + }; + + enum TermVector { + TERMVECTOR_NO = 256, + TERMVECTOR_YES = 512, + TERMVECTOR_WITH_POSITIONS = 1024, + TERMVECTOR_WITH_OFFSETS = 2048 + }; + + QCLuceneField(const QString &name, const QString &value, int configs); + QCLuceneField(const QString &name, QCLuceneReader *reader, int configs); ~QCLuceneField(); QString name() const; QString stringValue() const; QCLuceneReader* readerValue() const; - bool isStored() const; - bool isIndexed() const; - bool isTokenized() const; - bool isCompressed() const; - void setConfig(int termVector); - bool isTermVectorStored() const; - bool isStoreOffsetWithTermVector() const; - bool isStorePositionWithTermVector() const; - qreal getBoost() const; - void setBoost(qreal value); - bool isBinary() const; - bool getOmitNorms() const; - void setOmitNorms(bool omitNorms); - QString toString() const; + bool isStored() const; + bool isIndexed() const; + bool isTokenized() const; + bool isCompressed() const; + void setConfig(int termVector); + bool isTermVectorStored() const; + bool isStoreOffsetWithTermVector() const; + bool isStorePositionWithTermVector() const; + qreal getBoost() const; + void setBoost(qreal value); + bool isBinary() const; + bool getOmitNorms() const; + void setOmitNorms(bool omitNorms); + QString toString() const; protected: QCLuceneField(); diff --git a/src/assistant/clucene/qhits_p.h b/src/assistant/clucene/qhits_p.h index 2b857233b..8dc8cb1a3 100644 --- a/src/assistant/clucene/qhits_p.h +++ b/src/assistant/clucene/qhits_p.h @@ -65,16 +65,16 @@ private: class Q_CLUCENE_EXPORT QCLuceneHits { public: - QCLuceneHits(const QCLuceneSearcher &searcher, const QCLuceneQuery &query, + QCLuceneHits(const QCLuceneSearcher &searcher, const QCLuceneQuery &query, const QCLuceneFilter &filter); - QCLuceneHits(const QCLuceneSearcher &searcher, const QCLuceneQuery &query, + QCLuceneHits(const QCLuceneSearcher &searcher, const QCLuceneQuery &query, const QCLuceneFilter &filter, const QCLuceneSort &sort); virtual ~QCLuceneHits(); QCLuceneDocument document(const qint32 index); qint32 length() const; - qint32 id (const qint32 index); - qreal score(const qint32 index); + qint32 id(const qint32 index); + qreal score(const qint32 index); protected: friend class QCLuceneSearcher; diff --git a/src/assistant/clucene/qindexreader.cpp b/src/assistant/clucene/qindexreader.cpp index 60fe10d41..2740aa55d 100644 --- a/src/assistant/clucene/qindexreader.cpp +++ b/src/assistant/clucene/qindexreader.cpp @@ -74,7 +74,7 @@ QCLuceneIndexReader QCLuceneIndexReader::open(const QString &path) QCLuceneIndexReader indexReader; indexReader.d->reader = IndexReader::open(path); - + return indexReader; } diff --git a/src/assistant/clucene/qindexreader_p.h b/src/assistant/clucene/qindexreader_p.h index 4baf0e48e..c0849126d 100644 --- a/src/assistant/clucene/qindexreader_p.h +++ b/src/assistant/clucene/qindexreader_p.h @@ -67,34 +67,34 @@ class Q_CLUCENE_EXPORT QCLuceneIndexReader { public: enum FieldOption { - ALL = 1, - INDEXED = 2, - UNINDEXED = 4, - INDEXED_WITH_TERMVECTOR = 8, - INDEXED_NO_TERMVECTOR = 16, - TERMVECTOR = 32, - TERMVECTOR_WITH_POSITION = 64, - TERMVECTOR_WITH_OFFSET = 128, - TERMVECTOR_WITH_POSITION_OFFSET = 256 - }; + ALL = 1, + INDEXED = 2, + UNINDEXED = 4, + INDEXED_WITH_TERMVECTOR = 8, + INDEXED_NO_TERMVECTOR = 16, + TERMVECTOR = 32, + TERMVECTOR_WITH_POSITION = 64, + TERMVECTOR_WITH_OFFSET = 128, + TERMVECTOR_WITH_POSITION_OFFSET = 256 + }; virtual ~QCLuceneIndexReader(); static bool isLuceneFile(const QString &filename); static bool indexExists(const QString &directory); static QCLuceneIndexReader open(const QString &path); - + static void unlock(const QString &path); static bool isLocked(const QString &directory); - static quint64 lastModified(const QString &directory); - static qint64 getCurrentVersion(const QString &directory); + static quint64 lastModified(const QString &directory); + static qint64 getCurrentVersion(const QString &directory); void close(); bool isCurrent(); - void undeleteAll(); - qint64 getVersion(); - void deleteDocument(qint32 docNum); + void undeleteAll(); + qint64 getVersion(); + void deleteDocument(qint32 docNum); bool hasNorms(const QString &field); qint32 deleteDocuments(const QCLuceneTerm &term); bool document(qint32 index, QCLuceneDocument &document); diff --git a/src/assistant/clucene/qindexwriter.cpp b/src/assistant/clucene/qindexwriter.cpp index d07ee475a..ab3425697 100644 --- a/src/assistant/clucene/qindexwriter.cpp +++ b/src/assistant/clucene/qindexwriter.cpp @@ -50,7 +50,7 @@ QCLuceneIndexWriter::QCLuceneIndexWriter(const QString &path, : d(new QCLuceneIndexWriterPrivate()) , analyzer(analyzer) { - d->writer = new lucene::index::IndexWriter(path, + d->writer = new lucene::index::IndexWriter(path, analyzer.d->analyzer, create, closeDir); } @@ -83,7 +83,7 @@ void QCLuceneIndexWriter::addIndexes(const QList<QCLuceneIndexReader*> &readers) { using namespace lucene::index; IndexReader** readerArray = new IndexReader*[readers.count()]; - + for (int i = 0; i < readers.count(); ++i) readerArray[i] = (readers.at(i))->d->reader; @@ -91,7 +91,7 @@ void QCLuceneIndexWriter::addIndexes(const QList<QCLuceneIndexReader*> &readers) delete [] readerArray; } -void QCLuceneIndexWriter::addDocument(QCLuceneDocument &doc, +void QCLuceneIndexWriter::addDocument(QCLuceneDocument &doc, QCLuceneAnalyzer &analyzer) { if (doc.d->document) diff --git a/src/assistant/clucene/qindexwriter_p.h b/src/assistant/clucene/qindexwriter_p.h index 20ac8b309..f6d4317e0 100644 --- a/src/assistant/clucene/qindexwriter_p.h +++ b/src/assistant/clucene/qindexwriter_p.h @@ -73,44 +73,44 @@ public: DEFAULT_MAX_MERGE_DOCS = 0x7FFFFFFFL }; - QCLuceneIndexWriter(const QString &path, QCLuceneAnalyzer &analyzer, - bool create, bool closeDir = true); + QCLuceneIndexWriter(const QString &path, QCLuceneAnalyzer &analyzer, + bool create, bool closeDir = true); virtual ~QCLuceneIndexWriter(); - void close(); - void optimize(); + void close(); + void optimize(); qint32 docCount(); QCLuceneAnalyzer getAnalyzer(); - + void addIndexes(const QList<QCLuceneIndexReader*> &readers); void addDocument(QCLuceneDocument &doc, QCLuceneAnalyzer &analyzer); - qint32 getMaxFieldLength() const; - void setMaxFieldLength(qint32 value); - + qint32 getMaxFieldLength() const; + void setMaxFieldLength(qint32 value); + qint32 getMaxBufferedDocs() const; void setMaxBufferedDocs(qint32 value); - - qint64 getWriteLockTimeout() const; + + qint64 getWriteLockTimeout() const; void setWriteLockTimeout(qint64 writeLockTimeout); - + qint64 getCommitLockTimeout() const; - void setCommitLockTimeout(qint64 commitLockTimeout); + void setCommitLockTimeout(qint64 commitLockTimeout); - qint32 getMergeFactor() const; - void setMergeFactor(qint32 value); + qint32 getMergeFactor() const; + void setMergeFactor(qint32 value); qint32 getTermIndexInterval() const; - void setTermIndexInterval(qint32 interval); - - qint32 getMinMergeDocs() const; - void setMinMergeDocs(qint32 value); + void setTermIndexInterval(qint32 interval); + + qint32 getMinMergeDocs() const; + void setMinMergeDocs(qint32 value); - qint32 getMaxMergeDocs() const; - void setMaxMergeDocs(qint32 value); + qint32 getMaxMergeDocs() const; + void setMaxMergeDocs(qint32 value); bool getUseCompoundFile() const; - void setUseCompoundFile(bool value); + void setUseCompoundFile(bool value); protected: QSharedDataPointer<QCLuceneIndexWriterPrivate> d; diff --git a/src/assistant/clucene/qquery.cpp b/src/assistant/clucene/qquery.cpp index 350868c02..93f33bae6 100644 --- a/src/assistant/clucene/qquery.cpp +++ b/src/assistant/clucene/qquery.cpp @@ -73,10 +73,10 @@ QString QCLuceneQuery::getQueryName() const bool QCLuceneQuery::instanceOf(const QString &other) const { - if (other == getQueryName()) - return true; + if (other == getQueryName()) + return true; - return false; + return false; } QString QCLuceneQuery::toString(const QString &field) const @@ -160,7 +160,7 @@ QCLuceneTerm QCLuceneRangeQuery::getUpperTerm() const bool QCLuceneRangeQuery::isInclusive() const { - lucene::search::RangeQuery *query = + lucene::search::RangeQuery *query = static_cast<lucene::search::RangeQuery*> (d->query); if (query == 0) @@ -171,7 +171,7 @@ bool QCLuceneRangeQuery::isInclusive() const QString QCLuceneRangeQuery::getField() const { - lucene::search::RangeQuery *query = + lucene::search::RangeQuery *query = static_cast<lucene::search::RangeQuery*> (d->query); if (query == 0) @@ -222,7 +222,7 @@ QString QCLuceneBooleanQuery::getClassName() quint32 QCLuceneBooleanQuery::getClauseCount() const { - lucene::search::BooleanQuery *query = + lucene::search::BooleanQuery *query = static_cast<lucene::search::BooleanQuery*> (d->query); if (query == 0) @@ -233,7 +233,7 @@ quint32 QCLuceneBooleanQuery::getClauseCount() const quint32 QCLuceneBooleanQuery::getMaxClauseCount() const { - lucene::search::BooleanQuery *query = + lucene::search::BooleanQuery *query = static_cast<lucene::search::BooleanQuery*> (d->query); if (query == 0) @@ -244,7 +244,7 @@ quint32 QCLuceneBooleanQuery::getMaxClauseCount() const void QCLuceneBooleanQuery::setMaxClauseCount(quint32 maxClauseCount) { - lucene::search::BooleanQuery *query = + lucene::search::BooleanQuery *query = static_cast<lucene::search::BooleanQuery*> (d->query); if (query == 0) @@ -254,14 +254,14 @@ void QCLuceneBooleanQuery::setMaxClauseCount(quint32 maxClauseCount) } void QCLuceneBooleanQuery::add(QCLuceneQuery *query, bool required, bool prohibited) -{ - add(query, false, required, prohibited); +{ + add(query, false, required, prohibited); } -void QCLuceneBooleanQuery::add(QCLuceneQuery *query, bool delQuery, +void QCLuceneBooleanQuery::add(QCLuceneQuery *query, bool delQuery, bool required, bool prohibited) { - lucene::search::BooleanQuery *booleanQuery = + lucene::search::BooleanQuery *booleanQuery = static_cast<lucene::search::BooleanQuery*> (d->query); if (booleanQuery == 0) @@ -294,7 +294,7 @@ QString QCLucenePhraseQuery::getClassName() qint32 QCLucenePhraseQuery::getSlop() const { - lucene::search::PhraseQuery *phraseQuery = + lucene::search::PhraseQuery *phraseQuery = static_cast<lucene::search::PhraseQuery*> (d->query); if (phraseQuery == 0) @@ -305,7 +305,7 @@ qint32 QCLucenePhraseQuery::getSlop() const void QCLucenePhraseQuery::setSlop(const qint32 slop) { - lucene::search::PhraseQuery *phraseQuery = + lucene::search::PhraseQuery *phraseQuery = static_cast<lucene::search::PhraseQuery*> (d->query); if (phraseQuery == 0) @@ -316,7 +316,7 @@ void QCLucenePhraseQuery::setSlop(const qint32 slop) void QCLucenePhraseQuery::addTerm(const QCLuceneTerm &term) { - lucene::search::PhraseQuery *phraseQuery = + lucene::search::PhraseQuery *phraseQuery = static_cast<lucene::search::PhraseQuery*> (d->query); if (phraseQuery == 0) @@ -328,7 +328,7 @@ void QCLucenePhraseQuery::addTerm(const QCLuceneTerm &term) void QCLucenePhraseQuery::addTerm(const QCLuceneTerm &term, qint32 position) { - lucene::search::PhraseQuery *phraseQuery = + lucene::search::PhraseQuery *phraseQuery = static_cast<lucene::search::PhraseQuery*> (d->query); if (phraseQuery == 0) @@ -341,7 +341,7 @@ void QCLucenePhraseQuery::addTerm(const QCLuceneTerm &term, qint32 position) QString QCLucenePhraseQuery::getFieldName() const { - lucene::search::PhraseQuery *phraseQuery = + lucene::search::PhraseQuery *phraseQuery = static_cast<lucene::search::PhraseQuery*> (d->query); if (phraseQuery == 0) diff --git a/src/assistant/clucene/qquery_p.h b/src/assistant/clucene/qquery_p.h index 291d426dc..0b084432f 100644 --- a/src/assistant/clucene/qquery_p.h +++ b/src/assistant/clucene/qquery_p.h @@ -76,7 +76,7 @@ public: qreal getBoost() const; QString getQueryName() const; bool instanceOf(const QString &other) const; - QString toString(const QString &field) const; + QString toString(const QString &field) const; quint32 hashCode() const; QString toString() const; bool equals(const QCLuceneQuery &other) const; @@ -102,8 +102,8 @@ public: ~QCLucenePrefixQuery(); static QString getClassName(); - - QCLuceneTerm getPrefix() const; + + QCLuceneTerm getPrefix() const; private: QCLuceneTerm prefix; @@ -112,13 +112,13 @@ private: class Q_CLUCENE_EXPORT QCLuceneRangeQuery : public QCLuceneQuery { public: - QCLuceneRangeQuery(const QCLuceneTerm &lowerTerm, + QCLuceneRangeQuery(const QCLuceneTerm &lowerTerm, const QCLuceneTerm &upperTerm, bool inclusive); ~QCLuceneRangeQuery(); static QString getClassName(); - - QCLuceneTerm getLowerTerm() const; + + QCLuceneTerm getLowerTerm() const; QCLuceneTerm getUpperTerm() const; bool isInclusive() const; @@ -136,8 +136,8 @@ public: ~QCLuceneTermQuery(); static QString getClassName(); - - QCLuceneTerm getTerm() const; + + QCLuceneTerm getTerm() const; private: QCLuceneTerm term; @@ -172,7 +172,7 @@ public: qint32 getSlop() const; void setSlop(const qint32 slop); - + void addTerm(const QCLuceneTerm &term); void addTerm(const QCLuceneTerm &term, qint32 position); diff --git a/src/assistant/clucene/qqueryparser.cpp b/src/assistant/clucene/qqueryparser.cpp index 2b934849c..a71fbae97 100644 --- a/src/assistant/clucene/qqueryparser.cpp +++ b/src/assistant/clucene/qqueryparser.cpp @@ -141,13 +141,13 @@ QCLuceneQuery* QCLuceneMultiFieldQueryParser::parse(const QString &query, QCLuceneQuery* QCLuceneMultiFieldQueryParser::parse(const QString &query, const QStringList &fieldList, - QList<FieldFlags> flags, + QList<FieldFlags> flags, QCLuceneAnalyzer &analyzer) { QCLuceneBooleanQuery *retValue = new QCLuceneBooleanQuery(); qint32 i = 0; foreach (const QString &field, fieldList) { - QCLuceneQuery *q = QCLuceneQueryParser::parse(query, field, analyzer); + QCLuceneQuery *q = QCLuceneQueryParser::parse(query, field, analyzer); if (q) { qint32 flag = flags.at(i); switch (flag) { diff --git a/src/assistant/clucene/qqueryparser_p.h b/src/assistant/clucene/qqueryparser_p.h index 362d829c7..5b2527632 100644 --- a/src/assistant/clucene/qqueryparser_p.h +++ b/src/assistant/clucene/qqueryparser_p.h @@ -71,7 +71,7 @@ public: QCLuceneQuery* parse(const QString &query); QCLuceneQuery* parse(QCLuceneReader &reader); - static QCLuceneQuery* parse(const QString &query, const QString &field, + static QCLuceneQuery* parse(const QString &query, const QString &field, QCLuceneAnalyzer &analyzer); QCLuceneAnalyzer getAnalyzer(); QString getField(); @@ -94,7 +94,7 @@ public: PROHIBITED_FIELD = 2 }; - QCLuceneMultiFieldQueryParser(const QStringList &fieldList, + QCLuceneMultiFieldQueryParser(const QStringList &fieldList, QCLuceneAnalyzer &analyzer); ~QCLuceneMultiFieldQueryParser(); diff --git a/src/assistant/clucene/qsearchable_p.h b/src/assistant/clucene/qsearchable_p.h index d4aa715dd..4c374d65c 100644 --- a/src/assistant/clucene/qsearchable_p.h +++ b/src/assistant/clucene/qsearchable_p.h @@ -93,7 +93,7 @@ public: QCLuceneHits search(const QCLuceneQuery &query); QCLuceneHits search(const QCLuceneQuery &query, const QCLuceneFilter &filter); QCLuceneHits search(const QCLuceneQuery &query, const QCLuceneSort &sort); - QCLuceneHits search(const QCLuceneQuery &query, const QCLuceneFilter &filter, + QCLuceneHits search(const QCLuceneQuery &query, const QCLuceneFilter &filter, const QCLuceneSort &sort); protected: diff --git a/src/assistant/clucene/qterm_p.h b/src/assistant/clucene/qterm_p.h index 74eb603ef..77bb11de5 100644 --- a/src/assistant/clucene/qterm_p.h +++ b/src/assistant/clucene/qterm_p.h @@ -73,17 +73,17 @@ public: virtual ~QCLuceneTerm(); QString field() const; - QString text() const; - - void set(const QString &field, const QString &text); - void set(const QCLuceneTerm &fieldTerm, const QString &text); - void set(const QString &field, const QString &text, bool internField); + QString text() const; + + void set(const QString &field, const QString &text); + void set(const QCLuceneTerm &fieldTerm, const QString &text); + void set(const QString &field, const QString &text, bool internField); bool equals(const QCLuceneTerm &other) const; qint32 compareTo(const QCLuceneTerm &other) const; - - QString toString() const; - quint32 hashCode() const; + + QString toString() const; + quint32 hashCode() const; quint32 textLength() const; protected: diff --git a/src/assistant/clucene/qtoken.cpp b/src/assistant/clucene/qtoken.cpp index 18c23115b..1bc3b561e 100644 --- a/src/assistant/clucene/qtoken.cpp +++ b/src/assistant/clucene/qtoken.cpp @@ -52,13 +52,13 @@ QCLuceneToken::QCLuceneToken() d->token = new lucene::analysis::Token(); } -QCLuceneToken::QCLuceneToken(const QString &text, qint32 startOffset, +QCLuceneToken::QCLuceneToken(const QString &text, qint32 startOffset, qint32 endOffset, const QString &defaultTyp) : d(new QCLuceneTokenPrivate()) , tokenText(QStringToTChar(text)) , tokenType(QStringToTChar(defaultTyp)) { - d->token = new lucene::analysis::Token(tokenText, int32_t(startOffset), + d->token = new lucene::analysis::Token(tokenText, int32_t(startOffset), int32_t(endOffset), tokenType); } diff --git a/src/assistant/clucene/qtoken_p.h b/src/assistant/clucene/qtoken_p.h index 0e774dc4e..e7c2a65dd 100644 --- a/src/assistant/clucene/qtoken_p.h +++ b/src/assistant/clucene/qtoken_p.h @@ -65,12 +65,12 @@ class Q_CLUCENE_EXPORT QCLuceneToken { public: QCLuceneToken(); - QCLuceneToken(const QString &text, qint32 startOffset, + QCLuceneToken(const QString &text, qint32 startOffset, qint32 endOffset, const QString &defaultTyp = QLatin1String("word")); - + virtual ~QCLuceneToken(); - void set(const QString &text, qint32 startOffset, + void set(const QString &text, qint32 startOffset, qint32 endOffset, const QString &defaultTyp = QLatin1String("word")); quint32 bufferLength() const; diff --git a/src/assistant/clucene/qtokenizer.cpp b/src/assistant/clucene/qtokenizer.cpp index 32eab930b..2bd3d8b2d 100644 --- a/src/assistant/clucene/qtokenizer.cpp +++ b/src/assistant/clucene/qtokenizer.cpp @@ -55,7 +55,7 @@ bool QCLuceneTokenizer::next(QCLuceneToken &token) QCLuceneStandardTokenizer::QCLuceneStandardTokenizer(const QCLuceneReader &reader) : QCLuceneTokenizer(reader) { - d->tokenStream = + d->tokenStream = new lucene::analysis::standard::StandardTokenizer(reader.d->reader); } @@ -64,10 +64,10 @@ QCLuceneStandardTokenizer::~QCLuceneStandardTokenizer() // nothing todo } -bool QCLuceneStandardTokenizer::readApostrophe(const QString &string, +bool QCLuceneStandardTokenizer::readApostrophe(const QString &string, QCLuceneToken &token) { - lucene::analysis::standard::StandardTokenizer *stdTokenizer = + lucene::analysis::standard::StandardTokenizer *stdTokenizer = static_cast<lucene::analysis::standard::StandardTokenizer*> (d->tokenStream); if (stdTokenizer == 0) @@ -77,13 +77,13 @@ bool QCLuceneStandardTokenizer::readApostrophe(const QString &string, lucene::util::StringBuffer buffer(value); bool retValue = stdTokenizer->ReadApostrophe(&buffer, token.d->token); delete [] value; - + return retValue; } bool QCLuceneStandardTokenizer::readAt(const QString &string, QCLuceneToken &token) { - lucene::analysis::standard::StandardTokenizer *stdTokenizer = + lucene::analysis::standard::StandardTokenizer *stdTokenizer = static_cast<lucene::analysis::standard::StandardTokenizer*> (d->tokenStream); if (stdTokenizer == 0) @@ -93,14 +93,14 @@ bool QCLuceneStandardTokenizer::readAt(const QString &string, QCLuceneToken &tok lucene::util::StringBuffer buffer(value); bool retValue = stdTokenizer->ReadAt(&buffer, token.d->token); delete [] value; - + return retValue; } -bool QCLuceneStandardTokenizer::readCompany(const QString &string, +bool QCLuceneStandardTokenizer::readCompany(const QString &string, QCLuceneToken &token) { - lucene::analysis::standard::StandardTokenizer *stdTokenizer = + lucene::analysis::standard::StandardTokenizer *stdTokenizer = static_cast<lucene::analysis::standard::StandardTokenizer*> (d->tokenStream); if (stdTokenizer == 0) @@ -110,7 +110,7 @@ bool QCLuceneStandardTokenizer::readCompany(const QString &string, lucene::util::StringBuffer buffer(value); bool retValue = stdTokenizer->ReadCompany(&buffer, token.d->token); delete [] value; - + return retValue; } diff --git a/src/assistant/clucene/qtokenstream.cpp b/src/assistant/clucene/qtokenstream.cpp index bcceb9a5c..79819f226 100644 --- a/src/assistant/clucene/qtokenstream.cpp +++ b/src/assistant/clucene/qtokenstream.cpp @@ -61,7 +61,7 @@ void QCLuceneTokenStream::close() bool QCLuceneTokenStream::next(QCLuceneToken &token) { - return d->tokenStream->next(token.d->token); + return d->tokenStream->next(token.d->token); } QT_END_NAMESPACE diff --git a/src/assistant/help/qhelpcollectionhandler_p.h b/src/assistant/help/qhelpcollectionhandler_p.h index 744dfa14d..5ee7b1d84 100644 --- a/src/assistant/help/qhelpcollectionhandler_p.h +++ b/src/assistant/help/qhelpcollectionhandler_p.h @@ -101,7 +101,7 @@ public: bool addFilterAttributes(const QStringList &attributes); QStringList filterAttributes() const; QStringList filterAttributes(const QString &filterName) const; - + int registerNamespace(const QString &nspace, const QString &fileName); bool registerVirtualFolder(const QString &folderName, int namespaceId); void optimizeDatabase(const QString &fileName); diff --git a/src/assistant/help/qhelpdatainterface.cpp b/src/assistant/help/qhelpdatainterface.cpp index fa3af6fd6..20485c322 100644 --- a/src/assistant/help/qhelpdatainterface.cpp +++ b/src/assistant/help/qhelpdatainterface.cpp @@ -103,7 +103,7 @@ QList<QHelpDataContentItem*> QHelpDataContentItem::children() const bool QHelpDataIndexItem::operator==(const QHelpDataIndexItem & other) const { - return (other.name == name) + return (other.name == name) && (other.reference == reference); } diff --git a/src/assistant/help/qhelpdatainterface_p.h b/src/assistant/help/qhelpdatainterface_p.h index ebb2bc172..81714a57b 100644 --- a/src/assistant/help/qhelpdatainterface_p.h +++ b/src/assistant/help/qhelpdatainterface_p.h @@ -85,7 +85,7 @@ struct QHELP_EXPORT QHelpDataIndexItem { QString name; QString identifier; QString reference; - + bool operator==(const QHelpDataIndexItem & other) const; }; diff --git a/src/assistant/help/qhelpdbreader.cpp b/src/assistant/help/qhelpdbreader.cpp index 6262dfed5..ca669cbf1 100644 --- a/src/assistant/help/qhelpdbreader.cpp +++ b/src/assistant/help/qhelpdbreader.cpp @@ -546,13 +546,13 @@ QSet<int> QHelpDBReader::indexIds(const QStringList &attributes) const "a.FilterAttributeId=b.Id AND b.Name='%1'")) .arg(attributes.at(i))); } - + if (!m_query->exec(query)) return ids; while (m_query->next()) ids.insert(m_query->value(0).toInt()); - + return ids; } @@ -573,7 +573,7 @@ bool QHelpDBReader::createAttributesCache(const QStringList &attributes, if (m_viewAttributes.count() || needUpdate) { m_viewAttributes.clear(); - m_indicesCache = indexIds; + m_indicesCache = indexIds; } foreach (const QString &s, attributes) m_viewAttributes.insert(s); diff --git a/src/assistant/help/qhelpdbreader_p.h b/src/assistant/help/qhelpdbreader_p.h index 3b8014425..e4d867282 100644 --- a/src/assistant/help/qhelpdbreader_p.h +++ b/src/assistant/help/qhelpdbreader_p.h @@ -68,7 +68,7 @@ class QHelpDBReader : public QObject Q_OBJECT public: - QHelpDBReader(const QString &dbName); + QHelpDBReader(const QString &dbName); QHelpDBReader(const QString &dbName, const QString &uniqueId, QObject *parent); ~QHelpDBReader(); diff --git a/src/assistant/help/qhelpenginecore.h b/src/assistant/help/qhelpenginecore.h index 76a384fb2..202b1850d 100644 --- a/src/assistant/help/qhelpenginecore.h +++ b/src/assistant/help/qhelpenginecore.h @@ -60,7 +60,7 @@ class QHELP_EXPORT QHelpEngineCore : public QObject Q_PROPERTY(bool autoSaveFilter READ autoSaveFilter WRITE setAutoSaveFilter) Q_PROPERTY(QString collectionFile READ collectionFile WRITE setCollectionFile) Q_PROPERTY(QString currentFilter READ currentFilter WRITE setCurrentFilter) - + public: explicit QHelpEngineCore(const QString &collectionFile, QObject *parent = 0); virtual ~QHelpEngineCore(); diff --git a/src/assistant/help/qhelpsearchindexwriter_default.cpp b/src/assistant/help/qhelpsearchindexwriter_default.cpp index ebfae3fc9..ec2c267aa 100644 --- a/src/assistant/help/qhelpsearchindexwriter_default.cpp +++ b/src/assistant/help/qhelpsearchindexwriter_default.cpp @@ -207,7 +207,7 @@ void QHelpSearchIndexWriter::run() const QLatin1String key("DefaultSearchNamespaces"); const QString collectionFile(this->m_collectionFile); const QString indexPath = m_indexFilesFolder; - + mutex.unlock(); QHelpEngineCore engine(collectionFile, 0); @@ -255,7 +255,7 @@ void QHelpSearchIndexWriter::run() // get rid of duplicated files if (url.hasFragment()) url.setFragment(QString()); - + QString s = url.toString(); if (s.endsWith(QLatin1String(".html")) || s.endsWith(QLatin1String(".htm")) diff --git a/src/assistant/qhelpconverter/conversionwizard.h b/src/assistant/qhelpconverter/conversionwizard.h index 0fe30e2be..c15df556e 100644 --- a/src/assistant/qhelpconverter/conversionwizard.h +++ b/src/assistant/qhelpconverter/conversionwizard.h @@ -77,7 +77,7 @@ private: void initializePage(int id); QStringList getUnreferencedFiles(const QStringList &files); bool eventFilter(QObject *obj, QEvent *e); - + AdpReader m_adpReader; InputPage *m_inputPage; GeneralPage *m_generalPage; diff --git a/src/assistant/qhelpconverter/doc/filterpage.html b/src/assistant/qhelpconverter/doc/filterpage.html index 7b3781bd5..f95f3b294 100644 --- a/src/assistant/qhelpconverter/doc/filterpage.html +++ b/src/assistant/qhelpconverter/doc/filterpage.html @@ -3,7 +3,7 @@ <p>The help system offers the possibility to filter all installed documentations for certain <b>attributes</b>. Commonly specified attributes are e.g. the company and product name as well as the product version.</p> -<p>The help engine and Assistant use <b>custom filters</b> to do the actual +<p>The help engine and Assistant use <b>custom filters</b> to do the actual documentation filtering. A custom filter is basically just a alias name for a list of filter attributes. So, if e.g. the custom filter "MyFilter" lists the attributes "mycompany, myproduct" then only the documentation with those diff --git a/src/assistant/qhelpconverter/doc/identifierpage.html b/src/assistant/qhelpconverter/doc/identifierpage.html index 952b88de8..714b51c56 100644 --- a/src/assistant/qhelpconverter/doc/identifierpage.html +++ b/src/assistant/qhelpconverter/doc/identifierpage.html @@ -4,7 +4,7 @@ be used to specify keywords which should not be shown in the index. Identifiers are especially help full when using context sensitive help and one keyword has more links assigned to it.</p> -<p>E.g. consider the keyword "replace" in Qt. It is +<p>E.g. consider the keyword "replace" in Qt. It is included, among others, in QString and QList. To be able to retrieve the proper documentation, there is an identifier "QString::replace" and one "QList::replace".</p> diff --git a/src/assistant/qhelpconverter/finishpage.h b/src/assistant/qhelpconverter/finishpage.h index 810b4702a..e7fbc72f0 100644 --- a/src/assistant/qhelpconverter/finishpage.h +++ b/src/assistant/qhelpconverter/finishpage.h @@ -55,7 +55,7 @@ class FinishPage : public QWizardPage public: FinishPage(QWidget *parent = 0); void appendMessage(const QString &msg); - + private: QTextEdit *m_textEdit; }; diff --git a/src/assistant/qhelpconverter/identifierpage.cpp b/src/assistant/qhelpconverter/identifierpage.cpp index 82ff597ea..8e7ca8d58 100644 --- a/src/assistant/qhelpconverter/identifierpage.cpp +++ b/src/assistant/qhelpconverter/identifierpage.cpp @@ -51,7 +51,7 @@ IdentifierPage::IdentifierPage(QWidget *parent) "the keywords found in the .adp or .dcf file.")); m_ui.setupUi(this); - + connect(m_ui.identifierCheckBox, SIGNAL(toggled(bool)), this, SLOT(setupButtons(bool))); @@ -64,7 +64,7 @@ void IdentifierPage::setupButtons(bool checked) { m_ui.globalButton->setEnabled(checked); m_ui.fileNameButton->setEnabled(checked); - m_ui.prefixLineEdit->setEnabled(checked + m_ui.prefixLineEdit->setEnabled(checked && m_ui.globalButton->isChecked()); } diff --git a/src/assistant/qhelpconverter/identifierpage.h b/src/assistant/qhelpconverter/identifierpage.h index ae8daa012..07b7cbb6c 100644 --- a/src/assistant/qhelpconverter/identifierpage.h +++ b/src/assistant/qhelpconverter/identifierpage.h @@ -53,12 +53,12 @@ class IdentifierPage : public QWizardPage public: IdentifierPage(QWidget *parent = 0); - + private slots: void setupButtons(bool checked); private: - Ui::IdentifierPage m_ui; + Ui::IdentifierPage m_ui; }; QT_END_NAMESPACE diff --git a/src/assistant/qhelpconverter/inputpage.h b/src/assistant/qhelpconverter/inputpage.h index 5ea1bfb7e..54c4952e0 100644 --- a/src/assistant/qhelpconverter/inputpage.h +++ b/src/assistant/qhelpconverter/inputpage.h @@ -55,7 +55,7 @@ class InputPage : public QWizardPage public: explicit InputPage(AdpReader *reader, QWidget *parent = 0); - + private slots: void getFileName(); diff --git a/src/assistant/qhelpconverter/main.cpp b/src/assistant/qhelpconverter/main.cpp index 8ca718908..07c0b1b7b 100644 --- a/src/assistant/qhelpconverter/main.cpp +++ b/src/assistant/qhelpconverter/main.cpp @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) QFileInfo fi(QString::fromLocal8Bit(argv[1])); if (fi.exists()) w.setAdpFileName(fi.absoluteFilePath()); - } + } w.show(); return app.exec(); } diff --git a/src/assistant/qhelpconverter/outputpage.cpp b/src/assistant/qhelpconverter/outputpage.cpp index ba52e1236..df4bc71cd 100644 --- a/src/assistant/qhelpconverter/outputpage.cpp +++ b/src/assistant/qhelpconverter/outputpage.cpp @@ -98,7 +98,7 @@ bool OutputPage::checkFile(const QString &fileName, const QString &title) QFile fi(m_path + QDir::separator() + fileName); if (!fi.exists()) return true; - + if (QMessageBox::warning(this, title, tr("The specified file %1 already exist.\n\nDo you want to remove it?") .arg(fileName), tr("Remove"), tr("Cancel")) == 0) { diff --git a/src/assistant/qhelpconverter/pathpage.h b/src/assistant/qhelpconverter/pathpage.h index 9f51344ce..37fb66752 100644 --- a/src/assistant/qhelpconverter/pathpage.h +++ b/src/assistant/qhelpconverter/pathpage.h @@ -56,7 +56,7 @@ public: void setPath(const QString &path); QStringList paths() const; QStringList filters() const; - + private slots: void addPath(); void removePath(); diff --git a/src/assistant/qhelpconverter/qhcpwriter.cpp b/src/assistant/qhelpconverter/qhcpwriter.cpp index 653697bcc..2eea7a932 100644 --- a/src/assistant/qhelpconverter/qhcpwriter.cpp +++ b/src/assistant/qhelpconverter/qhcpwriter.cpp @@ -52,7 +52,7 @@ QhcpWriter::QhcpWriter() void QhcpWriter::setHelpProjectFile(const QString &qhpFile) { - m_qhpFile = qhpFile; + m_qhpFile = qhpFile; } void QhcpWriter::setProperties(const QMap<QString, QString> props) @@ -70,7 +70,7 @@ bool QhcpWriter::writeFile(const QString &fileName) QFile out(fileName); if (!out.open(QIODevice::WriteOnly)) return false; - + setDevice(&out); writeStartDocument(); writeStartElement(QLatin1String("QHelpCollectionProject")); @@ -127,7 +127,7 @@ void QhcpWriter::writeDocuments() out.append(QLatin1String(".qch")); writeStartElement(QLatin1String("docFiles")); - + writeStartElement(QLatin1String("generate")); writeStartElement(QLatin1String("file")); writeTextElement(QLatin1String("input"), m_qhpFile); diff --git a/src/assistant/qhelpconverter/qhpwriter.h b/src/assistant/qhelpconverter/qhpwriter.h index f751099e5..99df3bb2f 100644 --- a/src/assistant/qhelpconverter/qhpwriter.h +++ b/src/assistant/qhelpconverter/qhpwriter.h @@ -60,7 +60,7 @@ public: void setCustomFilters(const QList<CustomFilter> filters); void setFiles(const QStringList &files); void generateIdentifiers(IdentifierPrefix prefix, - const QString prefixString = QString()); + const QString prefixString = QString()); bool writeFile(const QString &fileName); private: diff --git a/src/assistant/shared/helpgenerator.h b/src/assistant/shared/helpgenerator.h index df43b7c28..c502b4418 100644 --- a/src/assistant/shared/helpgenerator.h +++ b/src/assistant/shared/helpgenerator.h @@ -63,7 +63,7 @@ public: private slots: void printStatus(const QString &msg); void printWarning(const QString &msg); - + private: QHelpGenerator *generator; }; |