diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-17 20:14:07 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-20 13:10:57 +0100 |
commit | cf01d7136fb79ee3f8e8522748b08519f0ea528f (patch) | |
tree | ed4021fd66f4da1b164ca27e522da28525b473f7 /src/assistant/qhelpconverter | |
parent | 2f2dd0137982e5894b93ca1770c096c19e3dc46c (diff) | |
download | qttools-cf01d7136fb79ee3f8e8522748b08519f0ea528f.tar.gz |
whitespace fixes
remove trailing spaces & expand tabs
Change-Id: If9909c94b52d9dacb7c8735470525d18a1c97d6b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/assistant/qhelpconverter')
-rw-r--r-- | src/assistant/qhelpconverter/conversionwizard.h | 2 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/doc/filterpage.html | 2 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/doc/identifierpage.html | 2 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/finishpage.h | 2 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/identifierpage.cpp | 4 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/identifierpage.h | 4 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/inputpage.h | 2 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/main.cpp | 2 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/outputpage.cpp | 2 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/pathpage.h | 2 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/qhcpwriter.cpp | 6 | ||||
-rw-r--r-- | src/assistant/qhelpconverter/qhpwriter.h | 2 |
12 files changed, 16 insertions, 16 deletions
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: |