forked from qt-creator/qt-creator
Help: Sprinkle some QLatin1String
Change-Id: I395742c2255b50c0a9017f86c7e7dca5a8535542 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -110,9 +110,8 @@ bool XbelReader::readFromFile(QIODevice *device)
|
|||||||
readNext();
|
readNext();
|
||||||
|
|
||||||
if (isStartElement()) {
|
if (isStartElement()) {
|
||||||
if (name() == "xbel"
|
if (name() == QLatin1String("xbel")
|
||||||
&& attributes().value("version")
|
&& attributes().value("version") == QLatin1String("1.0")) {
|
||||||
== "1.0") {
|
|
||||||
readXBEL();
|
readXBEL();
|
||||||
} else {
|
} else {
|
||||||
raiseError(QCoreApplication::translate("Help::Internal::XbelReader", "The file is not an XBEL version 1.0 file."));
|
raiseError(QCoreApplication::translate("Help::Internal::XbelReader", "The file is not an XBEL version 1.0 file."));
|
||||||
@@ -132,9 +131,9 @@ void XbelReader::readXBEL()
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
if (isStartElement()) {
|
if (isStartElement()) {
|
||||||
if (name() == "folder")
|
if (name() == QLatin1String("folder"))
|
||||||
readFolder(nullptr);
|
readFolder(nullptr);
|
||||||
else if (name() == "bookmark")
|
else if (name() == QLatin1String("bookmark"))
|
||||||
readBookmark(nullptr);
|
readBookmark(nullptr);
|
||||||
else
|
else
|
||||||
readUnknownElement();
|
readUnknownElement();
|
||||||
@@ -161,8 +160,7 @@ void XbelReader::readFolder(QStandardItem *item)
|
|||||||
folder->setIcon(folderIcon);
|
folder->setIcon(folderIcon);
|
||||||
folder->setData("Folder", Qt::UserRole + 10);
|
folder->setData("Folder", Qt::UserRole + 10);
|
||||||
|
|
||||||
bool expanded =
|
const bool expanded = attributes().value("folded") != QLatin1String("no");
|
||||||
(attributes().value("folded") != "no");
|
|
||||||
folder->setData(expanded, Qt::UserRole + 11);
|
folder->setData(expanded, Qt::UserRole + 11);
|
||||||
|
|
||||||
while (!atEnd()) {
|
while (!atEnd()) {
|
||||||
@@ -172,11 +170,11 @@ void XbelReader::readFolder(QStandardItem *item)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
if (isStartElement()) {
|
if (isStartElement()) {
|
||||||
if (name() == "title")
|
if (name() == QLatin1String("title"))
|
||||||
folder->setText(readElementText());
|
folder->setText(readElementText());
|
||||||
else if (name() == "folder")
|
else if (name() == QLatin1String("folder"))
|
||||||
readFolder(folder);
|
readFolder(folder);
|
||||||
else if (name() == "bookmark")
|
else if (name() == QLatin1String("bookmark"))
|
||||||
readBookmark(folder);
|
readBookmark(folder);
|
||||||
else
|
else
|
||||||
readUnknownElement();
|
readUnknownElement();
|
||||||
@@ -199,7 +197,7 @@ void XbelReader::readBookmark(QStandardItem *item)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
if (isStartElement()) {
|
if (isStartElement()) {
|
||||||
if (name() == "title")
|
if (name() == QLatin1String("title"))
|
||||||
bookmark->setText(readElementText());
|
bookmark->setText(readElementText());
|
||||||
else
|
else
|
||||||
readUnknownElement();
|
readUnknownElement();
|
||||||
|
Reference in New Issue
Block a user