aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/scxmleditor
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2020-06-17 06:35:31 +0200
committerhjk <hjk@qt.io>2020-06-17 05:55:25 +0000
commit1c81a3b3e887d9774cc342caafccebd7cdb90f19 (patch)
tree7008ebd0f4d8de1299dfc5d734832175d7a4624f /src/plugins/scxmleditor
parent6e798401a0558ad039fff62b80e97660053b60b8 (diff)
All: Use Utils::SkipEmptyParts
Task-number: QTCREATORBUG-24098 Change-Id: Iab45de9a9c17ddc39a0e343b1175d4f6cb94b098 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/scxmleditor')
-rw-r--r--src/plugins/scxmleditor/common/colorthemes.cpp9
-rw-r--r--src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp3
-rw-r--r--src/plugins/scxmleditor/plugin_interface/serializer.cpp4
-rw-r--r--src/plugins/scxmleditor/plugin_interface/stateitem.cpp4
4 files changed, 13 insertions, 7 deletions
diff --git a/src/plugins/scxmleditor/common/colorthemes.cpp b/src/plugins/scxmleditor/common/colorthemes.cpp
index 06b503a569d..8f553bd9bdd 100644
--- a/src/plugins/scxmleditor/common/colorthemes.cpp
+++ b/src/plugins/scxmleditor/common/colorthemes.cpp
@@ -30,9 +30,10 @@
#include "scxmleditorconstants.h"
#include "scxmltag.h"
-#include <QMenu>
-
#include <coreplugin/icore.h>
+#include <utils/stringutils.h>
+
+#include <QMenu>
using namespace ScxmlEditor::Common;
@@ -152,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(";;", QString::SkipEmptyParts);
+ const QStringList colors = scxmlTag->editorInfo(Constants::C_SCXML_EDITORINFO_COLORS).split(";;", Utils::SkipEmptyParts);
for (const QString &color : colors) {
- const QStringList colorInfo = color.split("_", QString::SkipEmptyParts);
+ const QStringList colorInfo = color.split("_", Utils::SkipEmptyParts);
if (colorInfo.count() == 2)
documentColors[colorInfo[0]] = colorInfo[1];
}
diff --git a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
index 863b40ae0c0..16182f58953 100644
--- a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
@@ -41,6 +41,7 @@
#include "warningitem.h"
#include <utils/qtcassert.h>
+#include <utils/stringutils.h>
#include <QAction>
#include <QGuiApplication>
@@ -286,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(":", QString::SkipEmptyParts);
+ QStringList coords = strMinPos.split(":", Utils::SkipEmptyParts);
if (coords.count() == 2)
minPos = QPointF(coords[0].toDouble(), coords[1].toDouble());
}
diff --git a/src/plugins/scxmleditor/plugin_interface/serializer.cpp b/src/plugins/scxmleditor/plugin_interface/serializer.cpp
index 93cd3f15710..1959d0713d1 100644
--- a/src/plugins/scxmleditor/plugin_interface/serializer.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/serializer.cpp
@@ -25,6 +25,8 @@
#include "serializer.h"
+#include <utils/stringutils.h>
+
using namespace ScxmlEditor::PluginInterface;
Serializer::Serializer()
@@ -106,7 +108,7 @@ void Serializer::read(QPoint &d)
void Serializer::setData(const QString &d)
{
- m_data = d.split(m_separator, QString::SkipEmptyParts);
+ m_data = d.split(m_separator, Utils::SkipEmptyParts);
m_index = 0;
}
diff --git a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp
index acecc460b8e..1601973f2ac 100644
--- a/src/plugins/scxmleditor/plugin_interface/stateitem.cpp
+++ b/src/plugins/scxmleditor/plugin_interface/stateitem.cpp
@@ -40,6 +40,8 @@
#include "transitionitem.h"
#include "utilsprovider.h"
+#include <utils/stringutils.h>
+
#include <QBrush>
#include <QCoreApplication>
#include <QDebug>
@@ -119,7 +121,7 @@ void StateItem::updateAttributes()
// Check initial attribute
QString strNewId = tagValue("id", true);
if (!m_parallelState) {
- QStringList NSIDs = strNewId.split(tag()->document()->nameSpaceDelimiter(), QString::SkipEmptyParts);
+ QStringList NSIDs = strNewId.split(tag()->document()->nameSpaceDelimiter(), Utils::SkipEmptyParts);
if (!NSIDs.isEmpty()) {
NSIDs[NSIDs.count() - 1] = m_stateNameItem->toPlainText();
QString strOldId = NSIDs.join(tag()->document()->nameSpaceDelimiter());