6 files changed, 18 insertions, 18 deletions

diff --git a/examples/xml/dombookmarks/xbeltree.cpp b/examples/xml/dombookmarks/xbeltree.cpp
index f7ff1de638..d90cdc03b4 100644
--- a/examples/xml/dombookmarks/xbeltree.cpp
+++ b/examples/xml/dombookmarks/xbeltree.cpp
@@ -184,7 +184,7 @@ void XbelTree::parseFolderElement(const QDomElement &element,
     item->setText(0, title);
 
     bool folded = (element.attribute(foldedAttribute()) != QLatin1String("no"));
-    setItemExpanded(item, !folded);
+    item->setExpanded(!folded);
 
     QDomElement child = element.firstChildElement();
     while (!child.isNull()) {
diff --git a/examples/xml/htmlinfo/main.cpp b/examples/xml/htmlinfo/main.cpp
index 6591c3ac91..22bf36f33c 100644
--- a/examples/xml/htmlinfo/main.cpp
+++ b/examples/xml/htmlinfo/main.cpp
@@ -50,7 +50,8 @@
 
 #include <QtCore>
 
-void parseHtmlFile(QTextStream &out, const QString &fileName) {
+void parseHtmlFile(QTextStream &out, const QString &fileName)
+{
     QFile file(fileName);
 
     out << "Analysis of HTML file: " << fileName << endl;
@@ -71,11 +72,11 @@ void parseHtmlFile(QTextStream &out, const QString &fileName) {
     while (!reader.atEnd()) {
         reader.readNext();
         if (reader.isStartElement()) {
-            if (reader.name() == "title")
+            if (reader.name() == QLatin1String("title"))
                 title = reader.readElementText();
-            else if(reader.name() == "a")
-                links.append(reader.attributes().value("href").toString());
-            else if(reader.name() == "p")
+            else if (reader.name() == QLatin1String("a"))
+                links.append(reader.attributes().value(QLatin1String("href")).toString());
+            else if (reader.name() == QLatin1String("p"))
                 ++paragraphCount;
         }
     }
@@ -94,10 +95,10 @@ void parseHtmlFile(QTextStream &out, const QString &fileName) {
         << "  Number of links: " << links.size() << endl
         << "  Showing first few links:" << endl;
 
-    while(links.size() > 5)
+    while (links.size() > 5)
         links.removeLast();
 
-    foreach(QString link, links)
+    for (const QString &link : qAsConst(links))
         out << "    " << link << endl;
     out << endl << endl;
 }
@@ -108,11 +109,10 @@ int main(int argc, char **argv)
     QCoreApplication app(argc, argv);
 
     // get a list of all html files in the current directory
-    QStringList filter;
-    filter << "*.htm";
-    filter << "*.html";
+    const QStringList filter = { QStringLiteral("*.htm"),
+                                 QStringLiteral("*.html") };
 
-    QStringList htmlFiles = QDir(":/").entryList(filter, QDir::Files);
+    const QStringList htmlFiles = QDir(QStringLiteral(":/")).entryList(filter, QDir::Files);
 
     QTextStream out(stdout);
 
@@ -122,8 +122,8 @@ int main(int argc, char **argv)
     }
 
     // parse each html file and write the result to file/stream
-    foreach(QString file, htmlFiles)
-        parseHtmlFile(out, ":/" + file);
+    for (const QString &file : htmlFiles)
+        parseHtmlFile(out, QStringLiteral(":/") + file);
 
     return 0;
 }
diff --git a/examples/xml/saxbookmarks/xbelgenerator.cpp b/examples/xml/saxbookmarks/xbelgenerator.cpp
index ee6f113f9c..77cb6748fe 100644
--- a/examples/xml/saxbookmarks/xbelgenerator.cpp
+++ b/examples/xml/saxbookmarks/xbelgenerator.cpp
@@ -100,7 +100,7 @@ void XbelGenerator::generateItem(const QTreeWidgetItem *item, int depth)
 {
     QString tagName = item->data(0, Qt::UserRole).toString();
     if (tagName == QLatin1String("folder")) {
-        bool folded = !treeWidget->isItemExpanded(item);
+        bool folded = !item->isExpanded();
         out << indent(depth) << "<folder folded=\"" << (folded ? "yes" : "no")
                              << "\">\n"
             << indent(depth + 1) << "<title>" << escapedText(item->text(0))
diff --git a/examples/xml/saxbookmarks/xbelhandler.cpp b/examples/xml/saxbookmarks/xbelhandler.cpp
index 7e2a9db3c2..62dfbf9482 100644
--- a/examples/xml/saxbookmarks/xbelhandler.cpp
+++ b/examples/xml/saxbookmarks/xbelhandler.cpp
@@ -94,7 +94,7 @@ bool XbelHandler::startElement(const QString & /* namespaceURI */,
         item->setIcon(0, folderIcon);
         item->setText(0, QObject::tr("Folder"));
         bool folded = (attributes.value(foldedAttribute()) != QLatin1String("no"));
-        treeWidget->setItemExpanded(item, !folded);
+        item->setExpanded(!folded);
     } else if (qName == QLatin1String("bookmark")) {
         item = createChildItem(qName);
         item->setFlags(item->flags() | Qt::ItemIsEditable);
diff --git a/examples/xml/streambookmarks/xbelreader.cpp b/examples/xml/streambookmarks/xbelreader.cpp
index 099985d91e..bd187038bc 100644
--- a/examples/xml/streambookmarks/xbelreader.cpp
+++ b/examples/xml/streambookmarks/xbelreader.cpp
@@ -140,7 +140,7 @@ void XbelReader::readFolder(QTreeWidgetItem *item)
 
     QTreeWidgetItem *folder = createChildItem(item);
     bool folded = (xml.attributes().value(foldedAttribute()) != QLatin1String("no"));
-    treeWidget->setItemExpanded(folder, !folded);
+    folder->setExpanded(!folded);
 
     while (xml.readNextStartElement()) {
         if (xml.name() == QLatin1String("title"))
diff --git a/examples/xml/streambookmarks/xbelwriter.cpp b/examples/xml/streambookmarks/xbelwriter.cpp
index 2959680678..7cc16494e2 100644
--- a/examples/xml/streambookmarks/xbelwriter.cpp
+++ b/examples/xml/streambookmarks/xbelwriter.cpp
@@ -87,7 +87,7 @@ void XbelWriter::writeItem(const QTreeWidgetItem *item)
 {
     QString tagName = item->data(0, Qt::UserRole).toString();
     if (tagName == QLatin1String("folder")) {
-        bool folded = !treeWidget->isItemExpanded(item);
+        bool folded = !item->isExpanded();
         xml.writeStartElement(tagName);
         xml.writeAttribute(XbelReader::foldedAttribute(), folded ? yesValue() : noValue());
         xml.writeTextElement(titleElement(), item->text(0));