feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DockManager: Limit code repetition

Browse Source 
Change-Id: I4dbbf0737a1df9aa0853aeb4b31fa9c16a7827df
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Jarek Kobus
2024-02-17 12:22:35 +01:00
parent 353ddc87a4
commit 524c5fd5c9
1 changed files with 4 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/libs/advanceddockingsystem/dockmanager.cpp
View File

@@ -1531,100 +1531,22 @@ QByteArray DockManager::loadFile(const FilePath &filePath)
QString DockManager::readDisplayName(const FilePath &filePath) QString DockManager::readDisplayName(const FilePath &filePath)
{ {
auto data = loadFile(filePath); return readAttribute(filePath, workspaceDisplayNameAttribute);
if (data.isEmpty())
return {};
auto tmp = data.startsWith("<?xml") ? data : qUncompress(data);
DockingStateReader reader(tmp);
if (!reader.readNextStartElement())
return {};
if (reader.name() != QLatin1String("QtAdvancedDockingSystem"))
return {};
return reader.attributes().value(workspaceDisplayNameAttribute.toString()).toString();
} }
bool DockManager::writeDisplayName(const FilePath &filePath, const QString &displayName) bool DockManager::writeDisplayName(const FilePath &filePath, const QString &displayName)
{ {
const expected_str<QByteArray> content = filePath.fileContents(); return writeAttribute(filePath, workspaceDisplayNameAttribute, displayName);
QTC_ASSERT_EXPECTED(content, return false);
QDomDocument doc;
QString error_msg;
int error_line, error_col;
if (!doc.setContent(*content, &error_msg, &error_line, &error_col)) {
qWarning() << QString("XML error on line %1, col %2: %3")
.arg(error_line)
.arg(error_col)
.arg(error_msg);
return false;
}
QDomElement docElem = doc.documentElement();
docElem.setAttribute(workspaceDisplayNameAttribute.toString(), displayName);
const expected_str<void> result = write(filePath, doc.toByteArray(workspaceXmlFormattingIndent));
if (!result) {
qWarning() << "Could not write display name" << displayName << "to" << filePath << ":"
<< result.error();
return false;
}
return true;
} }
QString DockManager::readMcusEnabled(const FilePath &filePath) QString DockManager::readMcusEnabled(const FilePath &filePath)
{ {
auto data = loadFile(filePath); return readAttribute(filePath, workspaceMcusEnabledAttribute);
if (data.isEmpty())
return {};
auto tmp = data.startsWith("<?xml") ? data : qUncompress(data);
DockingStateReader reader(tmp);
if (!reader.readNextStartElement())
return {};
if (reader.name() != QLatin1String("QtAdvancedDockingSystem"))
return {};
return reader.attributes().value(workspaceMcusEnabledAttribute.toString()).toString();
} }
bool DockManager::writeMcusEnabled(const FilePath &filePath, const QString &mcusEnabled) bool DockManager::writeMcusEnabled(const FilePath &filePath, const QString &mcusEnabled)
{ {
const expected_str<QByteArray> content = filePath.fileContents(); return writeAttribute(filePath, workspaceMcusEnabledAttribute, mcusEnabled);
QTC_ASSERT_EXPECTED(content, return false);
QDomDocument doc;
QString error_msg;
int error_line, error_col;
if (!doc.setContent(*content, &error_msg, &error_line, &error_col)) {
qWarning() << QString("XML error on line %1, col %2: %3")
.arg(error_line)
.arg(error_col)
.arg(error_msg);
return false;
}
QDomElement docElem = doc.documentElement();
docElem.setAttribute(workspaceMcusEnabledAttribute.toString(), mcusEnabled);
const expected_str<void> result = write(filePath, doc.toByteArray(workspaceXmlFormattingIndent));
if (!result) {
qWarning() << "Could not write mcusEnabled" << mcusEnabled << "to" << filePath << ":"
<< result.error();
return false;
}
return true;
} }
QString DockManager::readAttribute(const FilePath &filePath, QStringView key) QString DockManager::readAttribute(const FilePath &filePath, QStringView key)