diff options
29 files changed, 82 insertions, 82 deletions
diff --git a/.qmake.conf b/.qmake.conf index 10696283..88d13d1e 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.2.2 +MODULE_VERSION = 5.3.0 diff --git a/examples/xmlpatterns/filetree/doc/src/filetree.qdoc b/examples/xmlpatterns/filetree/doc/src/filetree.qdoc index 1ad2c3da..b1204b6d 100644 --- a/examples/xmlpatterns/filetree/doc/src/filetree.qdoc +++ b/examples/xmlpatterns/filetree/doc/src/filetree.qdoc @@ -31,7 +31,7 @@ \ingroup xmlpattern_examples This example shows how to use Qt XML Patterns for querying non-XML - data that is modeled to look like XML. + data that is modeled to look like XML. \tableofcontents @@ -108,7 +108,7 @@ \snippet xmlpatterns/filetree/filetree.h 1 The \c{FileTree} class declares four data members: - + \snippet xmlpatterns/filetree/filetree.h 2 The QVector \c{m_fileInfos} will contain the node model. Each @@ -126,7 +126,7 @@ can use. So we must build an analog of the file system in memory from instances of QFileInfo, and we use that analog as the custom node model. - + The two sets of flags, \c{m_filterAllowAll} and \c{m_sortFlags}, contain OR'ed flags from QDir::Filters and QDir::SortFlags respectively. They are set by the \c{FileTree} constructor and used @@ -222,7 +222,7 @@ simple as the ones described so far, but the callback function used for traversing (and building) the node model is more complex. - \section3 Building And Traversing The Node Model + \section3 Building And Traversing The Node Model The node model in \c{FileTree} is not fully built before the query engine begins evaluating the query. In fact, when the query engine @@ -299,7 +299,7 @@ \section2 The UI Class: MainWindow The example's UI is a conventional Qt GUI application inheriting - QMainWindow and the Ui_MainWindow base class generated by + QMainWindow and the Ui_MainWindow base class generated by \l{Qt Designer Manual} {Qt Designer}. \snippet xmlpatterns/filetree/mainwindow.h 0 @@ -360,12 +360,12 @@ The user chooses an XQuery from the menu in the combobox on the right. Choosing an XQuery signals the \c{on_queryBox_currentIndexChanged()} slot: - + \snippet xmlpatterns/filetree/mainwindow.cpp 2 The slot function opens and loads the query file and then calls the private function \c{evaluateResult()} to run the query: - + \snippet xmlpatterns/filetree/mainwindow.cpp 3 \c{evaluateResult()} is a second example of the same code pattern @@ -403,6 +403,6 @@ build the node model incrementally is important, because it allows us to only build the region of the model we need for evaluating the query. In other cases, it will be simpler to just build the entire - node model. + node model. */ diff --git a/examples/xmlpatterns/filetree/filetree.cpp b/examples/xmlpatterns/filetree/filetree.cpp index 5df6afb6..bcde1102 100644 --- a/examples/xmlpatterns/filetree/filetree.cpp +++ b/examples/xmlpatterns/filetree/filetree.cpp @@ -144,7 +144,7 @@ QXmlNodeModelIndex FileTree::toNodeIndex(const QFileInfo &fileInfo) const /*! This private helper function is only called by nextFromSimpleAxis(). It is called whenever nextFromSimpleAxis() is called with an axis - parameter of either \c{PreviousSibling} or \c{NextSibling}. + parameter of either \c{PreviousSibling} or \c{NextSibling}. */ //! [5] QXmlNodeModelIndex FileTree::nextSibling(const QXmlNodeModelIndex &nodeIndex, @@ -213,7 +213,7 @@ FileTree::nextFromSimpleAxis(SimpleAxis axis, const QXmlNodeModelIndex &nodeInde switch (axis) { case Parent: return toNodeIndex(QFileInfo(fi.path()), Directory); - + case FirstChild: { if (type == File) // A file has no children. @@ -233,7 +233,7 @@ FileTree::nextFromSimpleAxis(SimpleAxis axis, const QXmlNodeModelIndex &nodeInde return toNodeIndex(firstChild); } } - + case PreviousSibling: return nextSibling(nodeIndex, fi, -1); diff --git a/examples/xmlpatterns/filetree/mainwindow.cpp b/examples/xmlpatterns/filetree/mainwindow.cpp index 9bf71cd6..0147a83d 100644 --- a/examples/xmlpatterns/filetree/mainwindow.cpp +++ b/examples/xmlpatterns/filetree/mainwindow.cpp @@ -144,9 +144,9 @@ void MainWindow::loadDirectory(const QString &directory) treeInfo->setText(tr("Model of %1 output as XML.").arg(directory)); fileTree->setText(QString::fromLatin1(output.constData())); evaluateResult(); -//! [6] +//! [6] } -//! [6] +//! [6] //! [4] void MainWindow::on_actionAbout_triggered() diff --git a/examples/xmlpatterns/filetree/queries/listCPPFiles.xq b/examples/xmlpatterns/filetree/queries/listCPPFiles.xq index e311d27f..ab8dc351 100644 --- a/examples/xmlpatterns/filetree/queries/listCPPFiles.xq +++ b/examples/xmlpatterns/filetree/queries/listCPPFiles.xq @@ -10,7 +10,7 @@ declare variable $where as xs:string := string($fileTree/@filePath); <ul> { for $file in $fileTree//file[@suffix = "cpp"] order by xs:integer($file/@size) - return + return <li> {string($file/@fileName)}, size: {string($file/@size)} </li> diff --git a/examples/xmlpatterns/recipes/doc/src/recipes.qdoc b/examples/xmlpatterns/recipes/doc/src/recipes.qdoc index ced3323d..3e8b396f 100644 --- a/examples/xmlpatterns/recipes/doc/src/recipes.qdoc +++ b/examples/xmlpatterns/recipes/doc/src/recipes.qdoc @@ -31,7 +31,7 @@ \ingroup xmlpattern_examples The Recipes example shows how to use Qt XML Patterns to query XML data - loaded from a file. + loaded from a file. \tableofcontents @@ -40,7 +40,7 @@ In this case, the XML data represents a cookbook, \c{cookbook.xml}, which contains \c{<cookbook>} as its document element, which in turn contains a sequence of \c{<recipe>} elements. This XML data is - searched using queries stored in XQuery files (\c{*.xq}). + searched using queries stored in XQuery files (\c{*.xq}). \section2 The User Interface @@ -97,7 +97,7 @@ display its contents in the top group box's \l{QTextEdit} {text viewer} . Finally, it finds the XQuery files (\c{.xq}) and adds each one to the \l{QComboBox} {combo box} menu. - + \snippet xmlpatterns/recipes/querymainwindow.cpp 0 The work is done in the \l{displayQuery() slot} {displayQuery()} diff --git a/examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc b/examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc index 02d2af01..94777cd9 100644 --- a/examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc +++ b/examples/xmlpatterns/xquery/doc/src/globalVariables.qdoc @@ -62,7 +62,7 @@ do is protect the global variables to prevent the bugs described above. How can we use XQuery and \l{http://public.kitware.com/GCC_XML/HTML/Index.html} {GCC-XML} to - find the variables that need protecting? + find the variables that need protecting? \section3 A C++ application @@ -72,7 +72,7 @@ \section3 The XML description of the C++ application - Submitting this C++ source to + Submitting this C++ source to \l{http://public.kitware.com/GCC_XML/HTML/Index.html} {GCC-XML} produces this XML description: @@ -102,7 +102,7 @@ The \c xmlpatterns command loads and parses \c globals.gccxml, runs the XQuery \c reportGlobals.xq, and generates this report: - \div {class="details"} + \div {class="details"} Start report: 2008-12-16T13:43:49.65Z \enddiv @@ -122,7 +122,7 @@ \div {class="details"} End report: 2008-12-16T13:43:49.65Z \enddiv - \section1 XQuery Code Walk-Through + \section1 XQuery Code Walk-Through The XQuery source is in \c{examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq} @@ -175,12 +175,12 @@ \quotefromfile xmlpatterns/xquery/globalVariables/globals.html \skipto <body> \printuntil </body> - + The XQuery declares three more local functions that are called in turn by the \c{local:report()} function. \c{isComplexType()} returns true if the variable has a complex type. The variable can be mutable or const. - + \quotefromfile xmlpatterns/xquery/globalVariables/reportGlobals.xq \skipto declare function local:isComplexType \printuntil }; diff --git a/examples/xmlpatterns/xquery/globalVariables/globals.cpp b/examples/xmlpatterns/xquery/globalVariables/globals.cpp index 6c1f954a..0edb9cfd 100644 --- a/examples/xmlpatterns/xquery/globalVariables/globals.cpp +++ b/examples/xmlpatterns/xquery/globalVariables/globals.cpp @@ -43,7 +43,7 @@ 2. int mutablePrimitive2; 3. const int constPrimitive1 = 4; 4. const int constPrimitive2 = 3; - 5. + 5. 6. class ComplexClass 7. { 8. public: @@ -56,7 +56,7 @@ 15. ComplexClass mutableComplex2; 16. const ComplexClass constComplex1; 17. const ComplexClass constComplex2; -18. +18. 19. int main() 20. { 22. int localVariable; diff --git a/examples/xmlpatterns/xquery/globalVariables/globals.html b/examples/xmlpatterns/xquery/globalVariables/globals.html index d8affc88..1b888daf 100644 --- a/examples/xmlpatterns/xquery/globalVariables/globals.html +++ b/examples/xmlpatterns/xquery/globalVariables/globals.html @@ -12,7 +12,7 @@ .variableName { font-family: courier; - color: blue + color: blue } </style> <body> diff --git a/examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq b/examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq index 026679d6..4bc4243d 100644 --- a/examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq +++ b/examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq @@ -1,5 +1,5 @@ -(: - This XQuery loads a GCC-XML file and reports the locations of all +(: + This XQuery loads a GCC-XML file and reports the locations of all global variables in the original C++ source. To run the query, use the command line: @@ -12,10 +12,10 @@ declare variable $fileToOpen as xs:anyURI external; declare variable $inDoc as document-node() := doc($fileToOpen); -(: +(: This function determines whether the typeId is a complex type, e.g. QString. We only check whether it's a class. To be strictly - correct, we should check whether the class has a non-synthesized + correct, we should check whether the class has a non-synthesized constructor. We accept both mutable and const types. :) declare function local:isComplexType($typeID as xs:string) as xs:boolean @@ -33,7 +33,7 @@ declare function local:isPrimitive($typeId as xs:string) as xs:boolean exists($inDoc/GCC_XML/FundamentalType[@id = $typeId]) }; -(: +(: This function constructs a line for the report. The line contains a variable name, the source file, and the line number. :) @@ -42,7 +42,7 @@ declare function local:location($block as element()) as xs:string concat($inDoc/GCC_XML/File[@id = $block/@file]/@name, " at line ", $block/@line) }; -(: +(: This function generates the report. Note that it is called once in the <body> element of the <html> output. @@ -76,7 +76,7 @@ declare function local:report() as element()+ }; (: - This is where the <html> report is output. First + This is where the <html> report is output. First there is some style stuff, then the <body> element, which contains the call to the \c{local:report()} declared above. @@ -95,7 +95,7 @@ declare function local:report() as element()+ .variableName {{ font-family: courier; - color: blue + color: blue }} </style> diff --git a/src/xmlpatterns/Doxyfile b/src/xmlpatterns/Doxyfile index 83f70624..426be610 100644 --- a/src/xmlpatterns/Doxyfile +++ b/src/xmlpatterns/Doxyfile @@ -504,7 +504,7 @@ EXAMPLE_RECURSIVE = YES # directories that contain image that are included in the documentation (see # the \image command). -IMAGE_PATH = +IMAGE_PATH = # The INPUT_FILTER tag can be used to specify a program that doxygen should # invoke to filter for each input file. Doxygen will invoke the filter program @@ -990,7 +990,7 @@ INCLUDE_FILE_PATTERNS = # instead of the = operator. PREDEFINED = Q_SLOTS="slots" \ - Q_SIGNALS="signals" + Q_SIGNALS="signals" # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. @@ -1076,7 +1076,7 @@ HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES -CALLER_GRAPH = NO +CALLER_GRAPH = NO # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen # will generate a graph for each documented class showing the direct and diff --git a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h index b99e82a7..94703e51 100644 --- a/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h +++ b/src/xmlpatterns/api/qabstractxmlforwarditerator_p.h @@ -188,10 +188,10 @@ namespace QPatternist typename ListType = QList<T> > class ListIterator : public ListIteratorPlatform<T, T, ListIterator<T, ListType>, ListType> { - /* - * This declaration is needed for MSVC 2005, 14.00.50727.42 for 80x86. - */ - friend class IteratorVector; + /* + * This declaration is needed for MSVC 2005, 14.00.50727.42 for 80x86. + */ + friend class IteratorVector; using ListIteratorPlatform<T, T, ListIterator<T, ListType>, ListType>::m_list; diff --git a/src/xmlpatterns/api/qcoloroutput.cpp b/src/xmlpatterns/api/qcoloroutput.cpp index 574ca1a3..9296610a 100644 --- a/src/xmlpatterns/api/qcoloroutput.cpp +++ b/src/xmlpatterns/api/qcoloroutput.cpp @@ -106,7 +106,7 @@ namespace QPatternist */ inline bool isColoringPossible() const { -# if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) +# if defined(Q_OS_WIN) /* Windows doesn't at all support ANSI escape codes, unless * the user install a "device driver". See the Wikipedia links in the * class documentation for details. */ diff --git a/src/xmlpatterns/data/qabstractfloatcasters_tpl_p.h b/src/xmlpatterns/data/qabstractfloatcasters_tpl_p.h index 3f6f6c05..e11ad8d3 100644 --- a/src/xmlpatterns/data/qabstractfloatcasters_tpl_p.h +++ b/src/xmlpatterns/data/qabstractfloatcasters_tpl_p.h @@ -64,7 +64,7 @@ Item BooleanToAbstractFloatCaster<isDouble>::castFrom(const Item &from, const QExplicitlySharedDataPointer<DynamicContext> &context) const { // RVCT doesn't like using template parameter in trinary operator when the trinary operator result is - // passed directly into another constructor. + // passed directly into another constructor. bool tempDouble = isDouble; if(from.template as<AtomicValue>()->evaluateEBV(context)) return tempDouble ? toItem(CommonValues::DoubleOne) : toItem(CommonValues::FloatOne); diff --git a/src/xmlpatterns/data/qatomicvalue.cpp b/src/xmlpatterns/data/qatomicvalue.cpp index 18de5b98..ec6e1b79 100644 --- a/src/xmlpatterns/data/qatomicvalue.cpp +++ b/src/xmlpatterns/data/qatomicvalue.cpp @@ -227,7 +227,7 @@ ItemType::Ptr AtomicValue::qtToXDMType(const QXmlItem &item) case QVariant::Time: return BuiltinTypes::xsDateTime; case QMetaType::Float: - return BuiltinTypes::xsFloat; + return BuiltinTypes::xsFloat; case QVariant::Double: return BuiltinTypes::xsDouble; default: diff --git a/src/xmlpatterns/doc/snippets/patternist/escapeStringLiterals.xml b/src/xmlpatterns/doc/snippets/patternist/escapeStringLiterals.xml index 425ccb07..434625b0 100644 --- a/src/xmlpatterns/doc/snippets/patternist/escapeStringLiterals.xml +++ b/src/xmlpatterns/doc/snippets/patternist/escapeStringLiterals.xml @@ -1,2 +1,2 @@ -<p>"I hate quotations" -- Ralph Waldo Emerson" +<p>"I hate quotations" -- Ralph Waldo Emerson" '"I hate quotations"" -- Ralph Waldo Emerson"', appeared above</p>
\ No newline at end of file diff --git a/src/xmlpatterns/doc/snippets/patternist/introductionExample.xq b/src/xmlpatterns/doc/snippets/patternist/introductionExample.xq index 1a309dd7..549cfa24 100644 --- a/src/xmlpatterns/doc/snippets/patternist/introductionExample.xq +++ b/src/xmlpatterns/doc/snippets/patternist/introductionExample.xq @@ -1,3 +1,3 @@ <bibliography> {doc("library.xml")/bib/book[publisher="Addison-Wesley" and @year>1991]/<book year="{@year}">{title}</book>} -</bibliography> +</bibliography> diff --git a/src/xmlpatterns/functions/qcomparingaggregator_tpl_p.h b/src/xmlpatterns/functions/qcomparingaggregator_tpl_p.h index 218df2dc..d73a9588 100644 --- a/src/xmlpatterns/functions/qcomparingaggregator_tpl_p.h +++ b/src/xmlpatterns/functions/qcomparingaggregator_tpl_p.h @@ -203,7 +203,7 @@ ComparingAggregator<oper, result>::typeCheck(const StaticContext::Ptr &context, if(!m_operands.first()->staticType()->cardinality().allowsMany()) return m_operands.first(); - + // explicit scope needed in RVCT ComparingAggregator<oper, result>::prepareComparison(fetchComparator(t1, t1, context)); diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h index 5e733279..8da60c5d 100644 --- a/src/xmlpatterns/functions/qpatternplatform_p.h +++ b/src/xmlpatterns/functions/qpatternplatform_p.h @@ -121,7 +121,7 @@ namespace QPatternist inline int captureCount() const; /** - * @short Parses pattern + * @short Parses pattern */ static QRegExp parsePattern(const QString &pattern, const ReportContext::Ptr &context, diff --git a/src/xmlpatterns/functions/qsequencefns_p.h b/src/xmlpatterns/functions/qsequencefns_p.h index 22ce9b37..5fc2d947 100644 --- a/src/xmlpatterns/functions/qsequencefns_p.h +++ b/src/xmlpatterns/functions/qsequencefns_p.h @@ -145,7 +145,7 @@ namespace QPatternist virtual Expression::Ptr compress(const StaticContext::Ptr &context) { // RVCT doesn't like using template parameter in trinary operator when the trinary operator result is - // passed directly into another constructor. + // passed directly into another constructor. Q_ASSERT(Id == IDExistsFN || Id == IDEmptyFN); const Expression::Ptr me(FunctionCall::compress(context)); @@ -154,7 +154,7 @@ namespace QPatternist return me; // RVCT doesn't like using template parameter in trinary operator when the trinary operator result is - // passed directly into another constructor. + // passed directly into another constructor. Expression::ID tempId = Id; const Cardinality myCard((tempId == IDExistsFN) ? Cardinality::oneOrMore() : Cardinality::empty()); diff --git a/tests/auto/checkxmlfiles/checkxmlfiles.pro b/tests/auto/checkxmlfiles/checkxmlfiles.pro index 29bd8ee9..d1d26fbb 100644 --- a/tests/auto/checkxmlfiles/checkxmlfiles.pro +++ b/tests/auto/checkxmlfiles/checkxmlfiles.pro @@ -10,11 +10,11 @@ wince*: { QT += network requires(!isEmpty(_QMAKE_SUPER_CACHE_)) addFiles.files = \ - ../../../examples/xquery/globalVariables/globals.gccxml \ - ../../../../qtdoc/doc/src/diagrams/stylesheet/treeview.svg \ - ../../../../qtdoc/doc/src/diagrams/designer-manual/designer-mainwindow-actions.ui \ - ../../../../qtsql/examples/sql/masterdetail/albumdetails.xml \ - ../../../../qtbase/examples/widgets/tools/undo/undo.qrc + ../../../examples/xquery/globalVariables/globals.gccxml \ + ../../../../qtdoc/doc/src/diagrams/stylesheet/treeview.svg \ + ../../../../qtdoc/doc/src/diagrams/designer-manual/designer-mainwindow-actions.ui \ + ../../../../qtsql/examples/sql/masterdetail/albumdetails.xml \ + ../../../../qtbase/examples/widgets/tools/undo/undo.qrc addFiles.path = xmlfiles DEPLOYMENT += addFiles } else { diff --git a/tests/auto/patternistexamples/patternistexamples.pro b/tests/auto/patternistexamples/patternistexamples.pro index 02c66898..d55e9794 100644 --- a/tests/auto/patternistexamples/patternistexamples.pro +++ b/tests/auto/patternistexamples/patternistexamples.pro @@ -3,22 +3,22 @@ CONFIG += testcase SOURCES += tst_patternistexamples.cpp QT += testlib wince*: { - snippets.files = ../../../doc/src/snippets/patternist/* - snippets.path = patternist - widgetRen.files = ../../../examples/xquery/widgetRenderer/* - widgetRen.path = widgetRenderer - globVar.files = ../../../examples/xquery/globalVariables/* - globVar.path = globalVariables - filetree.files = ../../../examples/filetree/* - filetree.path = filetree - recipes.files = ../../../examples/recipes/* - recipes.path = recipes - files.files = ../../../examples/recipes/files/* - files.path = recipes\\files + snippets.files = ../../../doc/src/snippets/patternist/* + snippets.path = patternist + widgetRen.files = ../../../examples/xquery/widgetRenderer/* + widgetRen.path = widgetRenderer + globVar.files = ../../../examples/xquery/globalVariables/* + globVar.path = globalVariables + filetree.files = ../../../examples/filetree/* + filetree.path = filetree + recipes.files = ../../../examples/recipes/* + recipes.path = recipes + files.files = ../../../examples/recipes/files/* + files.path = recipes\\files - DEPLOYMENT += snippets widgetRen globVar filetree recipes files - # take care of dependency - QT += network + DEPLOYMENT += snippets widgetRen globVar filetree recipes files + # take care of dependency + QT += network } else { DEFINES += SOURCETREE=\\\"$$absolute_path(../../..)/\\\" } diff --git a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp index 1aae1691..0e747582 100644 --- a/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp +++ b/tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp @@ -121,7 +121,7 @@ void tst_QXmlNodeModelIndex::copyConstructor() const /* Take a copy of a temporary. */ { - /* The extra paranthesis silences a warning on win32-msvc. */ + /* The extra paranthesis silences a warning on win32-msvc. */ const QXmlNodeModelIndex copy((QXmlNodeModelIndex())); } } diff --git a/tests/auto/xmlpatterns/XSLTTODO b/tests/auto/xmlpatterns/XSLTTODO index a61e343f..2ee8106c 100644 --- a/tests/auto/xmlpatterns/XSLTTODO +++ b/tests/auto/xmlpatterns/XSLTTODO @@ -574,7 +574,7 @@ sort $in/order by @sortKey John Snelson of Oracle Berkeley DB XML & XQilla writes in private mail: - I'd had the same thought myself, too - you must be reading my mind ;-) + I'd had the same thought myself, too - you must be reading my mind ;-) What is he referring to? diff --git a/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp b/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp index e7cfe62b..a7348133 100644 --- a/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp +++ b/tests/auto/xmlpatternssdk/docs/XMLIndenterExample.cpp @@ -45,7 +45,7 @@ XMLWriter writer(&returnBuffer); writer.startDocument(); writer.startDTD(QLatin1String("html"), QLatin1String("-//W3C//DTD XHTML 1.0 Strict//EN"), - QLatin1String("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd")); + QLatin1String("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd")); writer.endDTD(); writer.startPrefixMapping(QString(), QLatin1String("http://www.w3.org/1999/xhtml")); diff --git a/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp b/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp index e7cfe62b..a7348133 100644 --- a/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp +++ b/tests/auto/xmlpatternssdk/docs/XMLWriterExample.cpp @@ -45,7 +45,7 @@ XMLWriter writer(&returnBuffer); writer.startDocument(); writer.startDTD(QLatin1String("html"), QLatin1String("-//W3C//DTD XHTML 1.0 Strict//EN"), - QLatin1String("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd")); + QLatin1String("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd")); writer.endDTD(); writer.startPrefixMapping(QString(), QLatin1String("http://www.w3.org/1999/xhtml")); diff --git a/tests/auto/xmlpatternsxqts/TODO b/tests/auto/xmlpatternsxqts/TODO index d25a6a38..fba45f90 100644 --- a/tests/auto/xmlpatternsxqts/TODO +++ b/tests/auto/xmlpatternsxqts/TODO @@ -216,7 +216,7 @@ KXQTS * Rename TestSuite::testResult(); it's not exactly a getter * Grr, rename identifiers and files from *BaseLine* into *Baseline*. * Speed up --run-outofprocess by keeping patternistrunsuite running as long as possible. -* Make text fields in test case view, selectable. Same with AST view. +* Make text fields in test case view, selectable. Same with AST view. - Code cleaning commands: * Find cases where stuff looks like "const Foo& var" instead of "const Foo &var": diff --git a/tools/xmlpatterns/qapplicationargumentparser.cpp b/tools/xmlpatterns/qapplicationargumentparser.cpp index 031e088b..83640468 100644 --- a/tools/xmlpatterns/qapplicationargumentparser.cpp +++ b/tools/xmlpatterns/qapplicationargumentparser.cpp @@ -403,7 +403,7 @@ void QApplicationArgumentParserPrivate::displayHelp() const /* " -name ". Indent a bit first, inspired by Qt's moc. */ const QString &name = at.name(); QString prolog(QLatin1String(" ")); - + /* We have a special case for the single dash. */ if(name == QChar::fromLatin1('-')) prolog.append(name); @@ -427,7 +427,7 @@ void QApplicationArgumentParserPrivate::displayHelp() const else prolog.append(QLatin1Char('<') + typeName + QLatin1Char('>')); // TODO Don't we want to display the default value? - + prolog.append(QLatin1Char(' ')); } @@ -503,7 +503,7 @@ QList<QApplicationArgument> QApplicationArgumentParserPrivate::builtinArguments( QLatin1String("Displays this help."))); result.append(QApplicationArgument(QLatin1String("version"), QLatin1String("Displays version information."))); - + result.append(QApplicationArgument(QLatin1String("-"), QLatin1String("When appearing, any following options are not interpreted as switches."))); return result; @@ -644,7 +644,7 @@ bool QApplicationArgumentParserPrivate::parseNamelessArguments(const QString &in } /*! - Parses input() together with declaredArguments() and returns \c false if the caller + Parses input() together with declaredArguments() and returns \c false if the caller should exit immediately, which is the case of which an error was encountered or help or the version was requested. diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro index 1fad1979..0f1ee4fc 100644 --- a/tools/xmlpatterns/xmlpatterns.pro +++ b/tools/xmlpatterns/xmlpatterns.pro @@ -4,12 +4,12 @@ QT = core xmlpatterns-private # in libQtXmlPatterns. See src/xmlpatterns/api/api.pri. SOURCES = main.cpp \ qapplicationargument.cpp \ - qapplicationargumentparser.cpp + qapplicationargumentparser.cpp HEADERS = main.h \ qapplicationargument.cpp \ - qapplicationargumentparser.cpp + qapplicationargumentparser.cpp load(qt_tool) |