diff options
| -rw-r--r-- | src/assistant/help/qhelpcollectionhandler.cpp | 20 | ||||
| -rw-r--r-- | src/distancefieldgenerator/distancefieldmodelworker.cpp | 2 | ||||
| -rw-r--r-- | src/linguist/lupdate/main.cpp | 4 | ||||
| -rw-r--r-- | src/qdoc/htmlgenerator.cpp | 7 |
4 files changed, 21 insertions, 12 deletions
diff --git a/src/assistant/help/qhelpcollectionhandler.cpp b/src/assistant/help/qhelpcollectionhandler.cpp index c67c92518..ddf5edccc 100644 --- a/src/assistant/help/qhelpcollectionhandler.cpp +++ b/src/assistant/help/qhelpcollectionhandler.cpp @@ -278,6 +278,7 @@ bool QHelpCollectionHandler::isTimeStampCorrect(const TimeStamp &timeStamp) cons return false; const QString oldFileName = m_query->value(0).toString(); + m_query->clear(); if (oldFileName != timeStamp.fileName) return false; @@ -300,6 +301,7 @@ bool QHelpCollectionHandler::hasTimeStampInfo(const QString &nameSpace) const if (!m_query->next()) return false; + m_query->clear(); return true; } @@ -797,7 +799,10 @@ bool QHelpCollectionHandler::fileExists(const QUrl &url) const if (!m_query->exec() || !m_query->next()) return false; - return m_query->value(0).toInt(); + const int count = m_query->value(0).toInt(); + m_query->clear(); + + return count; } static QString prepareFilterQuery(int attributesCount, @@ -1328,7 +1333,10 @@ QString QHelpCollectionHandler::namespaceVersion(const QString &namespaceName) c if (!m_query->exec() || !m_query->next()) return QString(); - return m_query->value(0).toString(); + const QString ret = m_query->value(0).toString(); + m_query->clear(); + + return ret; } int QHelpCollectionHandler::registerNamespace(const QString &nspace, const QString &fileName) @@ -1352,8 +1360,10 @@ int QHelpCollectionHandler::registerNamespace(const QString &nspace, const QStri m_query->bindValue(0, nspace); m_query->bindValue(1, fi.absoluteDir().relativeFilePath(fileName)); int namespaceId = errorValue; - if (m_query->exec()) + if (m_query->exec()) { namespaceId = m_query->lastInsertId().toInt(); + m_query->clear(); + } if (namespaceId < 1) { emit error(tr("Cannot register namespace \"%1\".").arg(nspace)); return errorValue; @@ -1371,8 +1381,10 @@ int QHelpCollectionHandler::registerVirtualFolder(const QString &folderName, int m_query->bindValue(1, folderName); int virtualId = -1; - if (m_query->exec()) + if (m_query->exec()) { virtualId = m_query->lastInsertId().toInt(); + m_query->clear(); + } if (virtualId < 1) { emit error(tr("Cannot register virtual folder '%1'.").arg(folderName)); return -1; diff --git a/src/distancefieldgenerator/distancefieldmodelworker.cpp b/src/distancefieldgenerator/distancefieldmodelworker.cpp index 373cb05ab..d140ff219 100644 --- a/src/distancefieldgenerator/distancefieldmodelworker.cpp +++ b/src/distancefieldgenerator/distancefieldmodelworker.cpp @@ -129,7 +129,7 @@ static void readCmapSubtable(DistanceFieldModelWorker *worker, const QByteArray return; } - const void *end = cmap.constData() + tableOffset + subtable->length; + const void *end = cmap.constData() + tableOffset + length; worker->readCmapSubtable(subtable, end); } diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp index c6b026dc7..16fe85f2a 100644 --- a/src/linguist/lupdate/main.cpp +++ b/src/linguist/lupdate/main.cpp @@ -239,9 +239,9 @@ static void printUsage() " -no-sort\n" " Do not sort contexts in TS files.\n" " -no-recursive\n" - " Do not recursively scan the following directories.\n" + " Do not recursively scan directories.\n" " -recursive\n" - " Recursively scan the following directories (default).\n" + " Recursively scan directories (default).\n" " -I <includepath> or -I<includepath>\n" " Additional location to look for include files.\n" " May be specified multiple times.\n" diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index 39ac26445..23cd581e6 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -1157,11 +1157,8 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark break; case Atom::SectionHeadingLeft: { int unit = atom->string().toInt() + hOffset(relative); - out() << "<h" + QString::number(unit) + QLatin1Char(' '); - if (unit < 3) { - out() << "id=\"" << Doc::canonicalTitle(Text::sectionHeading(atom).toString()) << "\""; - } - out() << '>'; + out() << "<h" + QString::number(unit) + QLatin1Char(' ') + << "id=\"" << Doc::canonicalTitle(Text::sectionHeading(atom).toString()) << "\">"; inSectionHeading_ = true; break; } |