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

Utils: Drop Utils::SkipEmptyParts again

Browse Source 
We require Qt 5.14 nowadays.

Change-Id: Iff245257d3cb19207007c0445ee13814e66152dd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-07-21 10:19:36 +02:00
parent c41847ce5d
commit 43b658e9e7
67 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/scxmleditor/common/colorthemes.cpp
View File

@@ -153,9 +153,9 @@ void ColorThemes::setDocument(ScxmlEditor::PluginInterface::ScxmlDocument *doc)
if (m_document) {
PluginInterface::ScxmlTag *scxmlTag = m_document->scxmlRootTag();
if (scxmlTag && scxmlTag->hasEditorInfo(Constants::C_SCXML_EDITORINFO_COLORS)) {
const QStringList colors = scxmlTag->editorInfo(Constants::C_SCXML_EDITORINFO_COLORS).split(";;", Utils::SkipEmptyParts);
const QStringList colors = scxmlTag->editorInfo(Constants::C_SCXML_EDITORINFO_COLORS).split(";;", Qt::SkipEmptyParts);
for (const QString &color : colors) {
const QStringList colorInfo = color.split("_", Utils::SkipEmptyParts);
const QStringList colorInfo = color.split("_", Qt::SkipEmptyParts);
if (colorInfo.count() == 2)
documentColors[colorInfo[0]] = colorInfo[1];
}

2
src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
View File

@@ -287,7 +287,7 @@ void GraphicsScene::paste(const QPointF &targetPos)
QString strMinPos = QLatin1String(mimeData->data("StateChartEditor/CopiedMinPos"));
QPointF minPos(0, 0);
if (!strMinPos.isEmpty()) {
QStringList coords = strMinPos.split(":", Utils::SkipEmptyParts);
QStringList coords = strMinPos.split(":", Qt::SkipEmptyParts);
if (coords.count() == 2)
minPos = QPointF(coords[0].toDouble(), coords[1].toDouble());
}

2
src/plugins/scxmleditor/plugin_interface/serializer.cpp
View File

@@ -108,7 +108,7 @@ void Serializer::read(QPoint &d)
void Serializer::setData(const QString &d)
{
m_data = d.split(m_separator, Utils::SkipEmptyParts);
m_data = d.split(m_separator, Qt::SkipEmptyParts);
m_index = 0;
}

2
src/plugins/scxmleditor/plugin_interface/stateitem.cpp
View File

@@ -121,7 +121,7 @@ void StateItem::updateAttributes()
// Check initial attribute
QString strNewId = tagValue("id", true);
if (!m_parallelState) {
QStringList NSIDs = strNewId.split(tag()->document()->nameSpaceDelimiter(), Utils::SkipEmptyParts);
QStringList NSIDs = strNewId.split(tag()->document()->nameSpaceDelimiter(), Qt::SkipEmptyParts);
if (!NSIDs.isEmpty()) {
NSIDs[NSIDs.count() - 1] = m_stateNameItem->toPlainText();
QString strOldId = NSIDs.join(tag()->document()->nameSpaceDelimiter());