Author: craig
Date: Sat Nov 7 22:01:02 2020
New Revision: 24202
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24202
Log:
Replace QString::SkipEmptyParts with Qt::SkipEmptyParts in
QString::split() usage
Modified:
trunk/Scribus/scribus/desaxe/saxiohelper.cpp
trunk/Scribus/scribus/gtaction.cpp
trunk/Scribus/scribus/guidemanagercore.cpp
trunk/Scribus/scribus/palettes/cxfcolor.cpp
trunk/Scribus/scribus/pdflib_core.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp
trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
trunk/Scribus/scribus/plugins/import/ai/importai.cpp
trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdannotations.cpp
trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp
trunk/Scribus/scribus/plugins/short-words/configuration.cpp
trunk/Scribus/scribus/prefsmanager.cpp
trunk/Scribus/scribus/pslib.cpp
trunk/Scribus/scribus/scpaths.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/tt/simpletreemodel/treemodel.cpp
trunk/Scribus/scribus/ui/annot.cpp
trunk/Scribus/scribus/ui/annota.cpp
trunk/Scribus/scribus/ui/helpbrowser.cpp
trunk/Scribus/scribus/ui/prefs_spelling.cpp
trunk/Scribus/scribus/ui/resourcemanager.cpp
trunk/Scribus/scribus/ui/selfield.cpp
trunk/Scribus/scribus/ui/shortcutwidget.cpp
trunk/Scribus/scribus/ui/stylemanager.cpp
trunk/Scribus/scribus/ui/unicodesearch.cpp
trunk/Scribus/scribus/util_file.cpp
Modified: trunk/Scribus/scribus/desaxe/saxiohelper.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/desaxe/saxiohelper.cpp
==============================================================================
--- trunk/Scribus/scribus/desaxe/saxiohelper.cpp (original)
+++ trunk/Scribus/scribus/desaxe/saxiohelper.cpp Sat Nov 7 22:01:02 2020
@@ -153,7 +153,7 @@
QList<double> parseDoubleList(const Xml_string& str)
{
- QStringList strlist = str.split(' ', QString::SkipEmptyParts);
+ QStringList strlist = str.split(' ', Qt::SkipEmptyParts);
QList<double> result;
for (auto it = strlist.begin(); it != strlist.end(); ++it)
result.append(parseDouble(*it));
@@ -178,7 +178,7 @@
QVector<double> parseDoubleVector(const Xml_string& str)
{
- QStringList strlist = str.split(' ', QString::SkipEmptyParts);
+ QStringList strlist = str.split(' ', Qt::SkipEmptyParts);
QVector<double> result;
for (auto it = strlist.cbegin(); it != strlist.cend(); ++it)
result.append(parseDouble(*it));
@@ -197,7 +197,7 @@
QList<int> parseIntList(const Xml_string& str)
{
- QStringList strlist = str.split(' ', QString::SkipEmptyParts);
+ QStringList strlist = str.split(' ', Qt::SkipEmptyParts);
QList<int> result;
for (auto it = strlist.cbegin(); it != strlist.cend(); ++it)
result.append(parseInt(*it));
@@ -215,7 +215,7 @@
QVector<int> parseIntVector(const Xml_string& str)
{
- QStringList strlist = str.split(' ', QString::SkipEmptyParts);
+ QStringList strlist = str.split(' ', Qt::SkipEmptyParts);
QVector<int> result;
for (auto it = strlist.cbegin(); it != strlist.cend(); ++it)
result.append(parseInt(*it));
@@ -225,7 +225,7 @@
QStack<int> parseIntStack(const Xml_string& str)
{
- QStringList strlist = str.split(' ', QString::SkipEmptyParts);
+ QStringList strlist = str.split(' ', Qt::SkipEmptyParts);
QStack<int> result;
for (auto it = strlist.cbegin(); it != strlist.cend(); ++it)
result.append(parseInt(*it));
@@ -244,7 +244,7 @@
QStringList parseStringList(const Xml_string& str)
{
- return str.split(' ', QString::SkipEmptyParts);
+ return str.split(' ', Qt::SkipEmptyParts);
}
Modified: trunk/Scribus/scribus/gtaction.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/gtaction.cpp
==============================================================================
--- trunk/Scribus/scribus/gtaction.cpp (original)
+++ trunk/Scribus/scribus/gtaction.cpp Sat Nov 7 22:01:02 2020
@@ -797,7 +797,7 @@
if( s.startsWith( "rgb(" ) )
{
QString parse = s.trimmed();
- QStringList colors = parse.split(',',
QString::SkipEmptyParts);
+ QStringList colors = parse.split(',',
Qt::SkipEmptyParts);
QString r = colors[0].right( ( colors[0].length() - 4 )
);
QString g = colors[1];
QString b = colors[2].left( ( colors[2].length() - 1 )
);
Modified: trunk/Scribus/scribus/guidemanagercore.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/guidemanagercore.cpp
==============================================================================
--- trunk/Scribus/scribus/guidemanagercore.cpp (original)
+++ trunk/Scribus/scribus/guidemanagercore.cpp Sat Nov 7 22:01:02 2020
@@ -664,7 +664,7 @@
void GuideManagerIO::readVerticalGuides(const QString& guideString, ScPage
*page, GuideManagerCore::GuideType type, bool useOldGuides)
{
- QStringList gVal(guideString.split(' ', QString::SkipEmptyParts));
+ QStringList gVal(guideString.split(' ', Qt::SkipEmptyParts));
for (QStringList::Iterator it = gVal.begin(); it != gVal.end(); ++it )
useOldGuides ?
page->guides.addHorizontal(ScCLocale::toDoubleC((*it)),
type) :
@@ -673,7 +673,7 @@
void GuideManagerIO::readHorizontalGuides(const QString& guideString, ScPage
*page, GuideManagerCore::GuideType type, bool useOldGuides)
{
- QStringList gVal(guideString.split(' ', QString::SkipEmptyParts));
+ QStringList gVal(guideString.split(' ', Qt::SkipEmptyParts));
for (QStringList::Iterator it = gVal.begin(); it != gVal.end(); ++it )
useOldGuides ?
page->guides.addVertical(ScCLocale::toDoubleC((*it)),
type):
@@ -717,7 +717,7 @@
{
if (guideString.isEmpty())
return;
- QStringList gVal(guideString.split(' ', QString::SkipEmptyParts));
+ QStringList gVal(guideString.split(' ', Qt::SkipEmptyParts));
page->guides.gx = ScCLocale::toDoubleC(gVal[0]);
page->guides.gy = ScCLocale::toDoubleC(gVal[1]);
page->guides.gw = ScCLocale::toDoubleC(gVal[2]);
Modified: trunk/Scribus/scribus/palettes/cxfcolor.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/palettes/cxfcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/palettes/cxfcolor.cpp (original)
+++ trunk/Scribus/scribus/palettes/cxfcolor.cpp Sat Nov 7 22:01:02 2020
@@ -537,7 +537,7 @@
if (spectrum.isEmpty())
return false;
- QStringList values = spectrum.split(QChar(' '),
QString::SkipEmptyParts);
+ QStringList values = spectrum.split(QChar(' '), Qt::SkipEmptyParts);
if (values.count() <= 0)
return false;
Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Sat Nov 7 22:01:02 2020
@@ -8962,7 +8962,7 @@
}
}
QByteArray anTitle = Pdf::toPdfDocEncoding(ite->itemName().replace(".",
"_"));
- QStringList bmstUtf16 = bmUtf16.split(QChar(10),
QString::SkipEmptyParts);
+ QStringList bmstUtf16 = bmUtf16.split(QChar(10), Qt::SkipEmptyParts);
const QByteArray m[] = {"4", "5", "F", "l", "H", "n"};
QByteArray ct(m[ite->annotation().ChkStil()]);
PdfId annotationObj = writer.newObject();
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
Sat Nov 7 22:01:02 2020
@@ -268,7 +268,7 @@
continue;
QStringList wt;
QStringList::Iterator it;
- wt = cc.split("\t", QString::SkipEmptyParts);
+ wt = cc.split("\t", Qt::SkipEmptyParts);
it = wt.begin();
CharStyle nstyle;
QString ch = (*it);
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
Sat Nov 7 22:01:02 2020
@@ -1252,7 +1252,7 @@
static const QString FEATURES("FEATURES");
if (attrs.hasAttribute(FEATURES))
- newStyle.setFeatures(attrs.valueAsString(FEATURES).split( " ",
QString::SkipEmptyParts));
+ newStyle.setFeatures(attrs.valueAsString(FEATURES).split( " ",
Qt::SkipEmptyParts));
static const QString SCOLOR("SCOLOR");
if (attrs.hasAttribute(SCOLOR))
@@ -2798,7 +2798,7 @@
if (attrs.hasAttribute("TXTSTYLE")) // Pre 1.4.x attribute, not used in
1.4.x
pstyle.charStyle().setFeatures(static_cast<StyleFlag>(attrs.valueAsInt("TXTSTYLE")).featureList());
if (attrs.hasAttribute("TXTFEATURES")) // Added to fix issue #13355
-
pstyle.charStyle().setFeatures(attrs.valueAsString("TXTFEATURES").split(" ",
QString::SkipEmptyParts));
+
pstyle.charStyle().setFeatures(attrs.valueAsString("TXTFEATURES").split(" ",
Qt::SkipEmptyParts));
if (attrs.hasAttribute("TXTKERN"))
pstyle.charStyle().setTracking(qRound(attrs.valueAsDouble("TXTKERN", 0.0) *
10));
if (attrs.hasAttribute("wordTrack"))
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
---
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
(original)
+++
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
Sat Nov 7 22:01:02 2020
@@ -2643,7 +2643,7 @@
static const QString FEATURES("FEATURES");
if (attrs.hasAttribute(FEATURES))
- newStyle.setFeatures(attrs.valueAsString(FEATURES).split( " ",
QString::SkipEmptyParts));
+ newStyle.setFeatures(attrs.valueAsString(FEATURES).split( " ",
Qt::SkipEmptyParts));
static const QString SCOLOR("SCOLOR");
if (attrs.hasAttribute(SCOLOR))
@@ -5238,7 +5238,7 @@
if (attrs.hasAttribute("TXTSTW"))
pstyle.charStyle().setStrikethruWidth(qRound(attrs.valueAsDouble("TXTSTW") *
10));
if (attrs.hasAttribute("TXTFEATURES"))
-
pstyle.charStyle().setFeatures(attrs.valueAsString("TXTFEATURES").split(" ",
QString::SkipEmptyParts));
+
pstyle.charStyle().setFeatures(attrs.valueAsString("TXTFEATURES").split(" ",
Qt::SkipEmptyParts));
if (attrs.hasAttribute("TXTKERN"))
pstyle.charStyle().setTracking(qRound(attrs.valueAsDouble("TXTKERN", 0.0) *
10));
if (attrs.hasAttribute("wordTrack"))
Modified: trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp Sat Nov 7
22:01:02 2020
@@ -103,7 +103,7 @@
if (loadRawText(filename, rawText))
text = toUnicode(rawText);
- QStringList lines = text.split("\n", QString::SkipEmptyParts);
+ QStringList lines = text.split("\n", Qt::SkipEmptyParts);
uint i=0;
if (hasHeader)
{
@@ -132,7 +132,7 @@
{
if ((line.indexOf(valueDelimiter) < 0) || (!useVDelim))
{
- QStringList l = line.split(fieldDelimiter,
QString::SkipEmptyParts);
+ QStringList l = line.split(fieldDelimiter, Qt::SkipEmptyParts);
for (int i = 0; i < l.size(); ++i)
{
++colIndex;
Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp Sat Nov 7
22:01:02 2020
@@ -1209,8 +1209,8 @@
}
if ((actStyle.tabDists.valid) && (actStyle.tabTypes.valid))
{
- QStringList dists = actStyle.tabDists.value.split(";",
QString::SkipEmptyParts);
- QStringList types = actStyle.tabTypes.value.split(" ",
QString::SkipEmptyParts);
+ QStringList dists = actStyle.tabDists.value.split(";",
Qt::SkipEmptyParts);
+ QStringList types = actStyle.tabTypes.value.split(" ",
Qt::SkipEmptyParts);
if (dists.count() == types.count())
{
tmpOStyle.tabStops.clear();
@@ -1279,7 +1279,7 @@
if (s.startsWith( "rgb(" ))
{
QString parse = s.trimmed();
- QStringList colors = parse.split( ',', QString::SkipEmptyParts
);
+ QStringList colors = parse.split( ',', Qt::SkipEmptyParts );
QString r = colors[0].right( ( colors[0].length() - 4 ) );
QString g = colors[1];
QString b = colors[2].left( ( colors[2].length() - 1 ) );
Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp Sat Nov 7
22:01:02 2020
@@ -987,7 +987,7 @@
f.close();
if (found)
{
- QStringList bb = BBox.split(" ",
QString::SkipEmptyParts);
+ QStringList bb = BBox.split(" ", Qt::SkipEmptyParts);
if (bb.count() == 4)
{
x = ScCLocale::toDoubleC(bb[0]);
@@ -1499,7 +1499,7 @@
symbolMode = false;
}
}
- QStringList da2 = Cdata.split(" ", QString::SkipEmptyParts);
+ QStringList da2 = Cdata.split(" ", Qt::SkipEmptyParts);
if (da2.count() == 0)
return;
command = da2.last();
@@ -2592,7 +2592,7 @@
for (int a = 0; a < da.count(); a++)
{
Cdata = da[a];
- QStringList da2 = Cdata.split(" ", QString::SkipEmptyParts);
+ QStringList da2 = Cdata.split(" ", Qt::SkipEmptyParts);
command = da2.last();
if (command == "Bd")
{
Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp Sat Nov 7
22:01:02 2020
@@ -76,7 +76,7 @@
QString IdmlPlug::getNodeValue(QDomNode &baseNode, const QString& path)
{
QString ret;
- QStringList pathParts = path.split("/", QString::SkipEmptyParts);
+ QStringList pathParts = path.split("/", Qt::SkipEmptyParts);
QDomNode n = baseNode.namedItem(pathParts[0]);
if (n.isNull())
return QString();
Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp Sat Nov 7
22:01:02 2020
@@ -1015,13 +1015,13 @@
mat.scale(sx, sy);
if (!textArea.isEmpty())
{
- QStringList points = textArea.replace(
QRegExp(","), " ").simplified().split( ' ', QString::SkipEmptyParts );
+ QStringList points = textArea.replace(
QRegExp(","), " ").simplified().split( ' ', Qt::SkipEmptyParts );
texAreaPoints.append(QPointF(ScCLocale::toDoubleC(points[0]),
ScCLocale::toDoubleC(points[1])));
texAreaPoints.append(QPointF(ScCLocale::toDoubleC(points[2]),
ScCLocale::toDoubleC(points[3])));
texAreaPoints = mat.map(texAreaPoints);
}
QString shapeType = p.attribute("draw:type");
- QStringList paths = enhPath.split("N",
QString::SkipEmptyParts);
+ QStringList paths = enhPath.split("N",
Qt::SkipEmptyParts);
if (!paths.isEmpty())
{
for (int a = 0; a < paths.count(); a++)
@@ -1913,16 +1913,16 @@
void OdgPlug::parseTransform(const QString &transform, double *rotation,
double *transX, double *transY)
{
double dx, dy;
- QStringList subtransforms = transform.split(')',
QString::SkipEmptyParts);
+ QStringList subtransforms = transform.split(')', Qt::SkipEmptyParts);
QStringList::ConstIterator it = subtransforms.begin();
QStringList::ConstIterator end = subtransforms.end();
for (; it != end; ++it)
{
- QStringList subtransform = (*it).split('(',
QString::SkipEmptyParts);
+ QStringList subtransform = (*it).split('(', Qt::SkipEmptyParts);
subtransform[0] = subtransform[0].trimmed().toLower();
subtransform[1] = subtransform[1].simplified();
QRegExp reg("[,( ]");
- QStringList params = subtransform[1].split(reg,
QString::SkipEmptyParts);
+ QStringList params = subtransform[1].split(reg,
Qt::SkipEmptyParts);
if (subtransform[0].startsWith(";") ||
subtransform[0].startsWith(","))
subtransform[0] =
subtransform[0].right(subtransform[0].length() - 1);
if (subtransform[0] == "rotate")
@@ -1951,16 +1951,16 @@
{
double dx, dy;
QTransform result;
- QStringList subtransforms = transform.split(')',
QString::SkipEmptyParts);
+ QStringList subtransforms = transform.split(')', Qt::SkipEmptyParts);
QStringList::ConstIterator it = subtransforms.begin();
QStringList::ConstIterator end = subtransforms.end();
for (; it != end; ++it)
{
- QStringList subtransform = (*it).split('(',
QString::SkipEmptyParts);
+ QStringList subtransform = (*it).split('(', Qt::SkipEmptyParts);
subtransform[0] = subtransform[0].trimmed().toLower();
subtransform[1] = subtransform[1].simplified();
QRegExp reg("[,( ]");
- QStringList params = subtransform[1].split(reg,
QString::SkipEmptyParts);
+ QStringList params = subtransform[1].split(reg,
Qt::SkipEmptyParts);
if (subtransform[0].startsWith(";") ||
subtransform[0].startsWith(","))
subtransform[0] =
subtransform[0].right(subtransform[0].length() - 1);
if (subtransform[0] == "rotate")
@@ -2005,7 +2005,7 @@
if (!object.attribute( "svg:viewBox" ).isEmpty())
{
QString viewbox( object.attribute( "svg:viewBox" ) );
- QStringList points = viewbox.replace( QRegExp(","), "
").simplified().split( ' ', QString::SkipEmptyParts );
+ QStringList points = viewbox.replace( QRegExp(","), "
").simplified().split( ' ', Qt::SkipEmptyParts );
*x = ScCLocale::toDoubleC(points[0]);
*y = ScCLocale::toDoubleC(points[1]);
*w = ScCLocale::toDoubleC(points[2]);
@@ -2026,7 +2026,7 @@
parseViewBox(object, &vx, &vy, &vw, &vh);
double sx = (vw != 0.0) ? (w / vw) : w;
double sy = (vh != 0.0) ? (h / vh) : h;
- QStringList ptList = object.attribute( "draw:points" ).split( ' ',
QString::SkipEmptyParts );
+ QStringList ptList = object.attribute( "draw:points" ).split( ' ',
Qt::SkipEmptyParts );
FPoint point, firstP;
bool bFirst = true;
for ( QStringList::Iterator it = ptList.begin(); it != ptList.end();
++it)
@@ -2678,7 +2678,7 @@
if (actStyle.markerViewBox.valid)
{
QString viewbox = actStyle.markerViewBox.value;
- QStringList points = viewbox.replace( QRegExp(","), "
").simplified().split( ' ', QString::SkipEmptyParts );
+ QStringList points = viewbox.replace( QRegExp(","), "
").simplified().split( ' ', Qt::SkipEmptyParts );
tmpOStyle.markerViewBox =
QRectF(ScCLocale::toDoubleC(points[0]), ScCLocale::toDoubleC(points[1]),
ScCLocale::toDoubleC(points[2]), ScCLocale::toDoubleC(points[3]));
}
else
@@ -3235,7 +3235,7 @@
if (s.startsWith( "rgb(" ))
{
QString parse = s.trimmed();
- QStringList colors = parse.split( ',', QString::SkipEmptyParts
);
+ QStringList colors = parse.split( ',', Qt::SkipEmptyParts );
QString r = colors[0].right( ( colors[0].length() - 4 ) );
QString g = colors[1];
QString b = colors[2].left( ( colors[2].length() - 1 ) );
Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp Sat Nov 7
22:01:02 2020
@@ -1360,7 +1360,7 @@
if (s.startsWith( "rgb(" ))
{
QString parse = s.trimmed();
- QStringList colors = parse.split( ',', QString::SkipEmptyParts
);
+ QStringList colors = parse.split( ',', Qt::SkipEmptyParts );
QString r = colors[0].right( ( colors[0].length() - 4 ) );
QString g = colors[1];
QString b = colors[2].left( ( colors[2].length() - 1 ) );
@@ -1399,16 +1399,16 @@
{
double dx, dy;
QTransform result;
- QStringList subtransforms = transform.split(')',
QString::SkipEmptyParts);
+ QStringList subtransforms = transform.split(')', Qt::SkipEmptyParts);
QStringList::ConstIterator it = subtransforms.begin();
QStringList::ConstIterator end = subtransforms.end();
for (; it != end; ++it)
{
- QStringList subtransform = (*it).split('(',
QString::SkipEmptyParts);
+ QStringList subtransform = (*it).split('(', Qt::SkipEmptyParts);
subtransform[0] = subtransform[0].trimmed().toLower();
subtransform[1] = subtransform[1].simplified();
QRegExp reg("[,( ]");
- QStringList params = subtransform[1].split(reg,
QString::SkipEmptyParts);
+ QStringList params = subtransform[1].split(reg,
Qt::SkipEmptyParts);
if (subtransform[0].startsWith(";") ||
subtransform[0].startsWith(","))
subtransform[0] =
subtransform[0].right(subtransform[0].length() - 1);
if (subtransform[0] == "rotate")
@@ -1453,7 +1453,7 @@
if (!object.attribute( "svg:viewBox" ).isEmpty())
{
QString viewbox( object.attribute( "svg:viewBox" ) );
- QStringList points = viewbox.replace( QRegExp(","), "
").simplified().split(' ', QString::SkipEmptyParts);
+ QStringList points = viewbox.replace( QRegExp(","), "
").simplified().split(' ', Qt::SkipEmptyParts);
*x = ScCLocale::toDoubleC(points[0]);
*y = ScCLocale::toDoubleC(points[1]);
*w = ScCLocale::toDoubleC(points[2]);
@@ -1474,7 +1474,7 @@
parseViewBox(object, &vx, &vy, &vw, &vh);
double sx = (vw != 0.0) ? (w / vw) : w;
double sy = (vh != 0.0) ? (h / vh) : h;
- QStringList ptList = object.attribute( "draw:points" ).split( ' ',
QString::SkipEmptyParts );
+ QStringList ptList = object.attribute( "draw:points" ).split( ' ',
Qt::SkipEmptyParts );
FPoint point, firstP;
bool bFirst = true;
for (QStringList::Iterator it = ptList.begin(); it != ptList.end();
++it)
Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp Sat Nov 7
22:01:02 2020
@@ -1651,7 +1651,7 @@
}
if (propList["style:text-position"])
{
- QStringList pos =
QString(propList["style:text-position"]->getStr().cstr()).split(' ',
QString::SkipEmptyParts);
+ QStringList pos =
QString(propList["style:text-position"]->getStr().cstr()).split(' ',
Qt::SkipEmptyParts);
if (!pos.empty())
{
if (pos[0] == "super")
@@ -3482,7 +3482,7 @@
if (s.startsWith( "rgb(" ) )
{
QString parse = s.trimmed();
- QStringList colors = parse.split(',', QString::SkipEmptyParts);
+ QStringList colors = parse.split(',', Qt::SkipEmptyParts);
QString r = colors[0].right( ( colors[0].length() - 4 ) );
QString g = colors[1];
QString b = colors[2].left( ( colors[2].length() - 1 ) );
Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshape.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshape.cpp Sat Nov 7
22:01:02 2020
@@ -431,10 +431,10 @@
QString style = pg.attribute( "style", "" ).simplified();
if (style.isEmpty())
style = pg.attribute( "svg:style", "" ).simplified();
- QStringList substyles = style.split(';',
QString::SkipEmptyParts);
+ QStringList substyles = style.split(';', Qt::SkipEmptyParts);
for (QStringList::Iterator it = substyles.begin(); it !=
substyles.end(); ++it)
{
- QStringList substyle = (*it).split(':',
QString::SkipEmptyParts);
+ QStringList substyle = (*it).split(':',
Qt::SkipEmptyParts);
QString command(substyle[0].trimmed());
QString params(substyle[1].trimmed());
if (command == "fill")
@@ -526,7 +526,7 @@
double x = 0.0;
double y = 0.0;
QString points = pg.attribute( "points"
).simplified().replace(',', " ");
- QStringList pointList = points.split(' ',
QString::SkipEmptyParts);
+ QStringList pointList = points.split(' ',
Qt::SkipEmptyParts);
FirstM = true;
for (QStringList::Iterator it = pointList.begin(); it
!= pointList.end(); it++)
{
@@ -701,7 +701,7 @@
double x = 0.0;
double y = 0.0;
QString points = pg.attribute( "points"
).simplified().replace(',', " ");
- QStringList pointList = points.split(' ',
QString::SkipEmptyParts);
+ QStringList pointList = points.split(' ',
Qt::SkipEmptyParts);
FirstM = true;
for (QStringList::Iterator it1 = pointList.begin(); it1
!= pointList.end(); it1++)
{
Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp Sat Nov 7
22:01:02 2020
@@ -265,7 +265,7 @@
if (!docElem.attribute("viewBox").isEmpty())
{
QString viewbox(docElem.attribute("viewBox"));
- QStringList points = viewbox.replace(QRegExp(","), "
").simplified().split(' ', QString::SkipEmptyParts);
+ QStringList points = viewbox.replace(QRegExp(","), "
").simplified().split(' ', Qt::SkipEmptyParts);
if (points.size() > 3)
{
QTransform matrix;
@@ -411,7 +411,7 @@
if (!docElem.attribute("viewBox").isEmpty())
{
QString viewbox(docElem.attribute("viewBox"));
- QStringList points = viewbox.replace(QRegExp(","), "
").simplified().split(' ', QString::SkipEmptyParts);
+ QStringList points = viewbox.replace(QRegExp(","), "
").simplified().split(' ', Qt::SkipEmptyParts);
if (points.size() > 3)
{
QTransform matrix;
@@ -946,7 +946,7 @@
if (xatt.contains(',') || xatt.contains(' '))
{
xatt.replace(QChar(','), QChar(' '));
- QStringList xl(xatt.split(QChar(' '),
QString::SkipEmptyParts));
+ QStringList xl(xatt.split(QChar(' '),
Qt::SkipEmptyParts));
xatt = xl.first();
}
x = parseUnit(xatt);
@@ -958,7 +958,7 @@
if (yatt.contains(',') || yatt.contains(' '))
{
yatt.replace(QChar(','), QChar(' '));
- QStringList yl(yatt.split(QChar(' '),
QString::SkipEmptyParts));
+ QStringList yl(yatt.split(QChar(' '),
Qt::SkipEmptyParts));
yatt = yl.first();
}
y = parseUnit(yatt);
@@ -970,7 +970,7 @@
if (dxatt.contains(',') || dxatt.contains(' '))
{
dxatt.replace(QChar(','), QChar(' '));
- QStringList xl(dxatt.split(QChar(' '),
QString::SkipEmptyParts));
+ QStringList xl(dxatt.split(QChar(' '),
Qt::SkipEmptyParts));
dxatt = xl.first();
}
x += parseUnit(dxatt);
@@ -982,7 +982,7 @@
if (dyatt.contains(',') || dyatt.contains(' '))
{
dyatt.replace(QChar(','), QChar(' '));
- QStringList xl(dyatt.split(QChar(' '),
QString::SkipEmptyParts));
+ QStringList xl(dyatt.split(QChar(' '),
Qt::SkipEmptyParts));
dyatt = xl.first();
}
y += parseUnit(dyatt);
@@ -1032,7 +1032,7 @@
if (!e.attribute("viewBox").isEmpty())
{
QString viewbox(e.attribute("viewBox"));
- QStringList points = viewbox.replace(QRegExp(","), "
").simplified().split(' ', QString::SkipEmptyParts);
+ QStringList points = viewbox.replace(QRegExp(","), "
").simplified().split(' ', Qt::SkipEmptyParts);
if (points.size() > 3)
{
double left = ScCLocale::toDoubleC(points[0]);
@@ -1122,10 +1122,10 @@
/* if (e.hasAttribute("style"))
{
QString style = e.attribute("style").simplified();
- QStringList substyles = style.split(';',
QString::SkipEmptyParts);
+ QStringList substyles = style.split(';', Qt::SkipEmptyParts);
for (QStringList::Iterator it = substyles.begin(); it !=
substyles.end(); ++it)
{
- QStringList substyle = (*it).split(':',
QString::SkipEmptyParts);
+ QStringList substyle = (*it).split(':',
Qt::SkipEmptyParts);
QString command(substyle[0].trimmed());
QString params(substyle[1].trimmed());
if (command == "clip-path")
@@ -1713,7 +1713,7 @@
{
QString STag = parseTagName(e);
points = points.simplified().replace(',', " ");
- QStringList pointList = points.split(' ',
QString::SkipEmptyParts);
+ QStringList pointList = points.split(' ', Qt::SkipEmptyParts);
if ((STag == "polygon" ) && (pointList.count() > 4))
z = m_Doc->itemAdd(PageItem::Polygon,
PageItem::Unspecified, baseX, baseY, 10, 10, gc->LWidth, gc->FillCol,
gc->StrokeCol);
else
@@ -2197,13 +2197,13 @@
// Workaround for QString::split() bug when string ends with space
QString trans = transform.simplified();
// Split string for handling 1 transform statement at a time
- QStringList subtransforms = trans.split(')', QString::SkipEmptyParts);
+ QStringList subtransforms = trans.split(')', Qt::SkipEmptyParts);
QStringList::ConstIterator it = subtransforms.begin();
QStringList::ConstIterator end = subtransforms.end();
for (; it != end; ++it)
{
QTransform result;
- QStringList subtransform = it->split('(',
QString::SkipEmptyParts);
+ QStringList subtransform = it->split('(', Qt::SkipEmptyParts);
subtransform[0] = subtransform[0].trimmed().toLower();
subtransform[1] = subtransform[1].simplified();
QVector<double> params = parseNumbersList(subtransform[1]);
@@ -2337,7 +2337,7 @@
if (s.startsWith( "rgb(" ) )
{
QString parse = s.trimmed();
- QStringList colors = parse.split(',', QString::SkipEmptyParts);
+ QStringList colors = parse.split(',', Qt::SkipEmptyParts);
QString r = colors[0].right(colors[0].length() - 4);
QString g = colors[1];
QString b = colors[2].left(colors[2].length() - 1);
@@ -2387,7 +2387,7 @@
{
QString iccColor = s.mid(iccFirst + 1, iccLast - iccFirst - 1);
iccColor = iccColor.trimmed();
- QStringList colors = iccColor.split(',',
QString::SkipEmptyParts);
+ QStringList colors = iccColor.split(',', Qt::SkipEmptyParts);
if (colors.count() == 5) // then we assume this is a cmyk color
{
QString cs = colors[1], ms = colors[2], ys = colors[3],
ks = colors[4];
@@ -2692,7 +2692,7 @@
if (params != "none")
{
QString params2 = params.simplified().replace(',', " ");
- QStringList dashes = params2.split(' ',
QString::SkipEmptyParts);
+ QStringList dashes = params2.split(' ',
Qt::SkipEmptyParts);
if ((dashes.count() > 0) && (parseUnit(dashes[0]) !=
0.0))
{
for (QStringList::Iterator it = dashes.begin();
it != dashes.end(); ++it)
@@ -2826,10 +2826,10 @@
if (!e.attribute("marker-start").isEmpty())
parsePA(obj, "marker-start", e.attribute("marker-start"));
QString style = e.attribute("style").simplified();
- QStringList substyles = style.split(';', QString::SkipEmptyParts);
+ QStringList substyles = style.split(';', Qt::SkipEmptyParts);
for (QStringList::Iterator it = substyles.begin(); it !=
substyles.end(); ++it)
{
- QStringList substyle = it->split(':', QString::SkipEmptyParts);
+ QStringList substyle = it->split(':', Qt::SkipEmptyParts);
if (substyle.count() >= 2)
{
QString command(substyle.at(0).trimmed());
@@ -2872,10 +2872,10 @@
else if (stop.hasAttribute("style"))
{
QString style =
stop.attribute("style").simplified();
- QStringList substyles = style.split(';',
QString::SkipEmptyParts);
+ QStringList substyles = style.split(';',
Qt::SkipEmptyParts);
for (QStringList::Iterator it =
substyles.begin(); it != substyles.end(); ++it)
{
- QStringList substyle = it->split(':',
QString::SkipEmptyParts);
+ QStringList substyle = it->split(':',
Qt::SkipEmptyParts);
if (substyle.count() >= 2)
{
QString
command(substyle.at(0).trimmed());
Modified: trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp Sat Nov 7
22:01:02 2020
@@ -247,7 +247,7 @@
// nameFilters << "*.jpg" << "*.jpeg" << "*.gif" << "*.png" << "*.ps" <<
"*.psd" << "*.tif" << "*.tiff" << "*.xpm" << "*.eps" << "*.epsf" << "*.epsi" <<
"*.eps2" << "*.eps3" << "*.epi" << "*.epg";
QString
formatD(FormatsManager::instance()->extensionListForFormat(FormatsManager::IMAGESIMGFRAME,
0));
- nameFilters = formatD.split(" ", QString::SkipEmptyParts);
+ nameFilters = formatD.split(" ", Qt::SkipEmptyParts);
nameFilters.append("*.svg");
QStringList vectorFiles =
LoadSavePlugin::getExtensionsForPreview(FORMATID_FIRSTUSER);
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdannotations.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdannotations.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdannotations.cpp
(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdannotations.cpp Sat Nov
7 22:01:02 2020
@@ -618,7 +618,7 @@
PyObject *pagevalue = PyInt_FromLong((long)page);
PyDict_SetItem(rv, pagekey, pagevalue);
- QStringList qsl = action.split(" ", QString::SkipEmptyParts);
+ QStringList qsl = action.split(" ", Qt::SkipEmptyParts);
x = qsl[0].toInt();
const char x2[] = "x";
Modified: trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp
(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin_py2x/cmdstyle.cpp Sat Nov
7 22:01:02 2020
@@ -253,7 +253,7 @@
fillShade = qMax(0.0, qMin(fillShade, 1.0));
if (strokeShade >= 0)
strokeShade = qMax(0.0, qMin(strokeShade, 1.0));
- QStringList featuresList = QString(features).split(',',
QString::SkipEmptyParts);
+ QStringList featuresList = QString(features).split(',',
Qt::SkipEmptyParts);
QString qLanguage = QString(language);
CharStyle tmpCharStyle;
Modified: trunk/Scribus/scribus/plugins/short-words/configuration.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/plugins/short-words/configuration.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/configuration.cpp (original)
+++ trunk/Scribus/scribus/plugins/short-words/configuration.cpp Sat Nov 7
22:01:02 2020
@@ -83,7 +83,7 @@
f.close();
}
if (success)
- return shorts.split(",", QString::SkipEmptyParts);
+ return shorts.split(",", Qt::SkipEmptyParts);
return QStringList();
}
Modified: trunk/Scribus/scribus/prefsmanager.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/prefsmanager.cpp (original)
+++ trunk/Scribus/scribus/prefsmanager.cpp Sat Nov 7 22:01:02 2020
@@ -916,7 +916,7 @@
QTextStream tsx(&fontPrefsFile12);
QString extraPath = tsx.readAll();
fontPrefsFile12.close();
- QStringList extraFonts = extraPath.split("\n",
QString::SkipEmptyParts);
+ QStringList extraFonts = extraPath.split("\n",
Qt::SkipEmptyParts);
for (int i = 0; i < extraFonts.count(); ++i)
fontPrefs->set(i, 0, extraFonts[i]);
}
Modified: trunk/Scribus/scribus/pslib.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp (original)
+++ trunk/Scribus/scribus/pslib.cpp Sat Nov 7 22:01:02 2020
@@ -3217,7 +3217,7 @@
if (DoSep)
{
int pla = Plate - 1 < 0 ? 3 : Plate - 1;
- QStringList cols2 = colorVal.split(" ",
QString::SkipEmptyParts);
+ QStringList cols2 = colorVal.split(" ",
Qt::SkipEmptyParts);
colorVal = ToStr(1 -
ScCLocale::toDoubleC(cols2[pla]));
}
colorValues.append(colorVal);
@@ -3398,7 +3398,7 @@
if (DoSep)
{
int pla = Plate - 1 < 0 ? 3 : Plate - 1;
- QStringList cols2 = colorVal.split(" ",
QString::SkipEmptyParts);
+ QStringList cols2 = colorVal.split(" ",
Qt::SkipEmptyParts);
colorVal = ToStr(1 -
ScCLocale::toDoubleC(cols2[pla]));
}
colorValues.append(colorVal);
@@ -3575,7 +3575,7 @@
if (DoSep)
{
int pla = Plate - 1 < 0 ? 3 : Plate - 1;
- QStringList cols2 = colorVal.split(" ",
QString::SkipEmptyParts);
+ QStringList cols2 = colorVal.split(" ",
Qt::SkipEmptyParts);
colorVal = ToStr(1 -
ScCLocale::toDoubleC(cols2[pla]));
}
colorValues.append(colorVal);
@@ -3814,7 +3814,7 @@
if (DoSep)
{
int pla = Plate - 1 < 0 ? 3 : Plate - 1;
- QStringList cols2 = GCol.split(" ",
QString::SkipEmptyParts);
+ QStringList cols2 = GCol.split(" ",
Qt::SkipEmptyParts);
PutStream(ToStr(1 -
ScCLocale::toDoubleC(cols2[pla])) + "\n");
}
else
@@ -4085,8 +4085,8 @@
if (DoSep)
{
int pla = Plate - 1 < 0 ? 3 : Plate - 1;
- QStringList cols1 = GCol.split(" ",
QString::SkipEmptyParts);
- QStringList cols2 = GCol2.split(" ",
QString::SkipEmptyParts);
+ QStringList cols1 = GCol.split(" ",
Qt::SkipEmptyParts);
+ QStringList cols2 = GCol2.split(" ",
Qt::SkipEmptyParts);
PutStream("/C1 [" + ToStr(1 -
ScCLocale::toDoubleC(cols1[pla])) + "]\n");
PutStream("/C0 [" + ToStr(1 -
ScCLocale::toDoubleC(cols2[pla])) + "]\n");
}
Modified: trunk/Scribus/scribus/scpaths.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/scpaths.cpp
==============================================================================
--- trunk/Scribus/scribus/scpaths.cpp (original)
+++ trunk/Scribus/scribus/scpaths.cpp Sat Nov 7 22:01:02 2020
@@ -466,7 +466,7 @@
if (line.indexOf(envVar) == 0)
path_data = line.mid(envVar.length()+1); //eg, Strip
"XDG_DATA_DIRS="
}
- const QStringList splitpath_data(path_data.split(sep,
QString::SkipEmptyParts));
+ const QStringList splitpath_data(path_data.split(sep,
Qt::SkipEmptyParts));
for (const QString &dir : splitpath_data)
{
QFileInfo info(dir+dirToFind);
Modified: trunk/Scribus/scribus/scribus.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat Nov 7 22:01:02 2020
@@ -7853,7 +7853,7 @@
int wo = state->getInt("PAGE");
int where = state->getInt("WHERE");
int count = state->getInt("COUNT");
- QStringList based = state->get("BASED").split("|",
QString::SkipEmptyParts);
+ QStringList based = state->get("BASED").split("|", Qt::SkipEmptyParts);
double height = state->getDouble("HEIGHT");
double width = state->getDouble("WIDTH");
int orient = state->getInt("ORIENT");
Modified: trunk/Scribus/scribus/tt/simpletreemodel/treemodel.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/tt/simpletreemodel/treemodel.cpp
==============================================================================
--- trunk/Scribus/scribus/tt/simpletreemodel/treemodel.cpp (original)
+++ trunk/Scribus/scribus/tt/simpletreemodel/treemodel.cpp Sat Nov 7
22:01:02 2020
@@ -194,7 +194,7 @@
if (!lineData.isEmpty()) {
// Read the column data from the rest of the line.
- QStringList columnStrings = lineData.split("\t",
QString::SkipEmptyParts);
+ QStringList columnStrings = lineData.split("\t",
Qt::SkipEmptyParts);
QList<QVariant> columnData;
for (int column = 0; column < columnStrings.count(); ++column)
columnData << columnStrings[column];
Modified: trunk/Scribus/scribus/ui/annot.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp (original)
+++ trunk/Scribus/scribus/ui/annot.cpp Sat Nov 7 22:01:02 2020
@@ -76,7 +76,7 @@
if ((m_annotation.ActionType() == Annotation::Action_GoTo) ||
(m_annotation.ActionType() == Annotation::Action_GoToR_FileRel) ||
(m_annotation.ActionType() == Annotation::Action_GoToR_FileAbs))
{
QString tm = m_annotation.Action();
- tl = tm.split(" ", QString::SkipEmptyParts);
+ tl = tm.split(" ", Qt::SkipEmptyParts);
}
else
{
@@ -756,7 +756,7 @@
int ss = pfor.indexOf("(");
QString pfo = pfor.mid(ss+1, pfor.length()-ss-2);
QStringList pfol;
- pfol = pfo.split(",", QString::SkipEmptyParts);
+ pfol = pfo.split(",", Qt::SkipEmptyParts);
MinValid->setText(pfol[1].simplified());
MaxValid->setText(pfol[3].simplified());
}
@@ -769,7 +769,7 @@
int ss = pfor.lastIndexOf("(");
QString pfo = pfor.mid(ss+1, pfor.length()-ss-3);
QStringList pfol;
- pfol = pfo.split(",", QString::SkipEmptyParts);
+ pfol = pfo.split(",", Qt::SkipEmptyParts);
if (pfol.count() > 1)
{
tm2 = pfol[0].simplified();
@@ -783,7 +783,7 @@
CalcFields->setText(tm);
ss = pfor.indexOf("(");
pfo = pfor.mid(ss+1, pfor.length()-ss-3);
- pfol = pfo.split(",", QString::SkipEmptyParts);
+ pfol = pfo.split(",", Qt::SkipEmptyParts);
/* PFJ - 28/02/04 - Let's get rid of lots of ifs.... */
QString pf[] = {"\"SUM\"", "\"PRD\"", "\"AVG\"", "\"MIN\"", "\"MAX\""};
size_t pfTest = sizeof(pf) / sizeof(*pf);
@@ -800,7 +800,7 @@
int ss = pfor.indexOf("(");
QString pfo = pfor.mid(ss+1, pfor.length()-ss-2);
QStringList pfol;
- pfol = pfo.split(",", QString::SkipEmptyParts);
+ pfol = pfo.split(",", Qt::SkipEmptyParts);
if (m_annotation.Format() == 1)
{
Decim->setValue(pfol[0].toInt());
@@ -1190,7 +1190,7 @@
}
tmpCact += "new Array (";
QStringList pfol;
- pfol = CalcFields->text().split(",",
QString::SkipEmptyParts);
+ pfol = CalcFields->text().split(",",
Qt::SkipEmptyParts);
if (pfol.count() > 1)
{
tmpCact += "\""+pfol[0].simplified()+"\"";
Modified: trunk/Scribus/scribus/ui/annota.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/ui/annota.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annota.cpp (original)
+++ trunk/Scribus/scribus/ui/annota.cpp Sat Nov 7 22:01:02 2020
@@ -62,7 +62,7 @@
if ((m_item->annotation().ActionType() == Annotation::Action_GoTo) ||
(m_item->annotation().ActionType() == Annotation::Action_GoToR_FileRel) ||
(m_item->annotation().ActionType() == Annotation::Action_GoToR_FileAbs))
{
QString tm = m_item->annotation().Action();
- tl = tm.split(" ", QString::SkipEmptyParts);
+ tl = tm.split(" ", Qt::SkipEmptyParts);
}
else
{
Modified: trunk/Scribus/scribus/ui/helpbrowser.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/ui/helpbrowser.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/helpbrowser.cpp (original)
+++ trunk/Scribus/scribus/ui/helpbrowser.cpp Sat Nov 7 22:01:02 2020
@@ -580,7 +580,7 @@
helpMenuFiles.append(qMakePair(installHelpDir, m_language));
if (!m_language.isEmpty())
{
- QStringList langDecomp = m_language.split(QChar('_'),
QString::SkipEmptyParts);
+ QStringList langDecomp = m_language.split(QChar('_'),
Qt::SkipEmptyParts);
QString altLanguage = langDecomp.first();
helpMenuFiles.append(qMakePair(baseHelpDir, altLanguage));
helpMenuFiles.append(qMakePair(installHelpDir, altLanguage));
Modified: trunk/Scribus/scribus/ui/prefs_spelling.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/ui/prefs_spelling.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_spelling.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_spelling.cpp Sat Nov 7 22:01:02 2020
@@ -91,7 +91,7 @@
if (d.filetype=="plain")
{
//qDebug()<<d.url<<d.files;
- const QStringList plainURLs(d.files.split(";",
QString::SkipEmptyParts));
+ const QStringList plainURLs(d.files.split(";",
Qt::SkipEmptyParts));
for (const QString& s : plainURLs)
{
ScQApp->dlManager()->addURL(d.url+"/"+s, true, downloadLocation, userDictDir);
@@ -174,14 +174,14 @@
QStringList allFileList;
foreach(DictData d, downloadList)
{
- allFileList += d.files.split(";", QString::SkipEmptyParts);
+ allFileList += d.files.split(";", Qt::SkipEmptyParts);
}
// Move downloaded files to destination
foreach(DictData d, downloadList)
{
QString basename = QFileInfo(d.url).fileName();
QString filename = downloadLocation+basename;
- QStringList files = d.files.split(";", QString::SkipEmptyParts);
+ QStringList files = d.files.split(";", Qt::SkipEmptyParts);
QString affixFile = affixFileName(files);
QString dictFile = dictFileName(files);
//qDebug()<<filename;
Modified: trunk/Scribus/scribus/ui/resourcemanager.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/ui/resourcemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/resourcemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/resourcemanager.cpp Sat Nov 7 22:01:02 2020
@@ -1035,7 +1035,7 @@
else
{
const QStringList
zipFileContents(fun->files());
- QStringList
extractFiles(d.extractfiles.split(";", QString::SkipEmptyParts));
+ QStringList
extractFiles(d.extractfiles.split(";", Qt::SkipEmptyParts));
QString
toDir(ScPaths::userFontDir(false)+fi.baseName()+"/");
QDir
dir(ScPaths::userFontDir(false));
if
(!dir.exists(fi.baseName()))
@@ -1073,7 +1073,7 @@
else
{
const
QStringList zipContents(fun->files());
- QStringList
extractFiles(d.extractfiles.split(";", QString::SkipEmptyParts));
+ QStringList
extractFiles(d.extractfiles.split(";", Qt::SkipEmptyParts));
QString
toDir(ScPaths::userDictDir(static_cast<ScPaths::DictType>(fileType), false));
QDir dir(toDir);
if
(dir.exists())
@@ -1119,7 +1119,7 @@
else
{
const
QStringList zipFileContents(fun->files());
- QStringList
extractFiles(d.extractfiles.split(";", QString::SkipEmptyParts));
+ QStringList
extractFiles(d.extractfiles.split(";", Qt::SkipEmptyParts));
QString
toDir(ScPaths::userHelpFilesDir(false)+d.lang+"/");
QDir
dir(ScPaths::userHelpFilesDir(false));
if
(!dir.exists(d.lang))
@@ -1236,7 +1236,7 @@
continue;
if (d.filetype=="zip")
{
- const QStringList
plainURLs(d.files.split(";", QString::SkipEmptyParts));
+ const QStringList
plainURLs(d.files.split(";", Qt::SkipEmptyParts));
for (const QString& s : plainURLs)
{
//
qDebug()<<"Requesting:"<<d.url+"/"+s;
@@ -1248,7 +1248,7 @@
}
if (d.filetype=="plain")
{
- const QStringList
plainURLs(d.files.split(";", QString::SkipEmptyParts));
+ const QStringList
plainURLs(d.files.split(";", Qt::SkipEmptyParts));
for (const QString& s : plainURLs)
{
ScQApp->dlManager()->addURL(d.url+"/"+s, true, ScPaths::downloadDir(),
destinationFolder);
@@ -1269,7 +1269,7 @@
if (d.filetype=="zip")
{
// qDebug()<<"zip
type:"<<d.url<<d.files;
- const QStringList
plainURLs(d.files.split(";", QString::SkipEmptyParts));
+ const QStringList
plainURLs(d.files.split(";", Qt::SkipEmptyParts));
for (const QString& s : plainURLs)
{
ScQApp->dlManager()->addURL(d.url+"/"+s, true, ScPaths::downloadDir(),
destinationFolder);
@@ -1281,7 +1281,7 @@
if (d.filetype=="plain")
{
// qDebug()<<"plain
type:"<<d.url<<d.files;
- const QStringList
plainURLs(d.files.split(";", QString::SkipEmptyParts));
+ const QStringList
plainURLs(d.files.split(";", Qt::SkipEmptyParts));
for (const QString& s : plainURLs)
{
ScQApp->dlManager()->addURL(d.url+"/"+s, true, ScPaths::downloadDir(),
destinationFolder);
@@ -1301,7 +1301,7 @@
if (d.filetype=="zip")
{
// qDebug()<<"zip
type:"<<d.url<<d.files;
- const QStringList
plainURLs(d.files.split(";", QString::SkipEmptyParts));
+ const QStringList
plainURLs(d.files.split(";", Qt::SkipEmptyParts));
for (const QString& s : plainURLs)
{
ScQApp->dlManager()->addURL(d.url+"/"+s, true, ScPaths::downloadDir(),
destinationFolder);
@@ -1322,7 +1322,7 @@
if (d.filetype == "zip")
{
// qDebug()<<"zip
type:"<<d.url<<d.files;
- const QStringList
plainURLs(d.files.split(";", QString::SkipEmptyParts));
+ const QStringList
plainURLs(d.files.split(";", Qt::SkipEmptyParts));
for (const QString& s : plainURLs)
{
ScQApp->dlManager()->addURL(d.url+"/"+s, true, ScPaths::downloadDir(),
destinationFolder);
Modified: trunk/Scribus/scribus/ui/selfield.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/ui/selfield.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/selfield.cpp (original)
+++ trunk/Scribus/scribus/ui/selfield.cpp Sat Nov 7 22:01:02 2020
@@ -95,7 +95,7 @@
SelFields = new QListWidget( this );
SelFields->setMinimumSize( QSize( 130, 180 ) );
QStringList pfol;
- pfol = Felder.split(",", QString::SkipEmptyParts);
+ pfol = Felder.split(",", Qt::SkipEmptyParts);
if (pfol.count() > 0)
{
for (int cfx = 0; cfx < pfol.count(); ++cfx)
Modified: trunk/Scribus/scribus/ui/shortcutwidget.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/ui/shortcutwidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/shortcutwidget.cpp (original)
+++ trunk/Scribus/scribus/ui/shortcutwidget.cpp Sat Nov 7 22:01:02 2020
@@ -73,7 +73,7 @@
QStringList tl;
if (!keyDisplay->text().isEmpty())
{
- tl = keyDisplay->text().split("+",
QString::SkipEmptyParts);
+ tl = keyDisplay->text().split("+", Qt::SkipEmptyParts);
Part4 = tl.last();
if (Part4 == tr("Alt") || Part4 == tr("Ctrl") || Part4
== tr("Shift") || Part4 == tr("Meta"))
Part4 = "";
@@ -132,7 +132,7 @@
if (!keyDisplay->text().isEmpty())
{
QStringList tl;
- tl = keyDisplay->text().split("+",
QString::SkipEmptyParts);
+ tl = keyDisplay->text().split("+", Qt::SkipEmptyParts);
Part4 = tl.last();
if (Part4 == tr("Alt") || Part4 == tr("Ctrl") || Part4
== tr("Shift") || Part4 == tr("Meta"))
Part4 = "";
Modified: trunk/Scribus/scribus/ui/stylemanager.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/ui/stylemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/stylemanager.cpp Sat Nov 7 22:01:02 2020
@@ -1154,7 +1154,7 @@
if (m_isEditMode)
return;
- QStringList slist = keyString.split(SEPARATOR, QString::SkipEmptyParts);
+ QStringList slist = keyString.split(SEPARATOR, Qt::SkipEmptyParts);
Q_ASSERT(slist.count() == 2);
loadType(slist[0]);
Modified: trunk/Scribus/scribus/ui/unicodesearch.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/ui/unicodesearch.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/unicodesearch.cpp (original)
+++ trunk/Scribus/scribus/ui/unicodesearch.cpp Sat Nov 7 22:01:02 2020
@@ -94,14 +94,14 @@
QFile file(ScPaths::instance().shareDir() + "unicodenameslist.txt");
if (file.open( QIODevice::ReadOnly ) )
{
- QStringList list = QString(file.readAll()).split('\n',
QString::SkipEmptyParts);
+ QStringList list = QString(file.readAll()).split('\n',
Qt::SkipEmptyParts);
file.close();
QStringList line;
UnicodeStruct uni;
for ( QStringList::Iterator it = list.begin(); it !=
list.end(); ++it )
{
- line = (*it).split(':', QString::SkipEmptyParts);
+ line = (*it).split(':', Qt::SkipEmptyParts);
uni.description = line[1].toLower();
uni.hex = line[0];
m_unicode.append(uni);
Modified: trunk/Scribus/scribus/util_file.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24202&path=/trunk/Scribus/scribus/util_file.cpp
==============================================================================
--- trunk/Scribus/scribus/util_file.cpp (original)
+++ trunk/Scribus/scribus/util_file.cpp Sat Nov 7 22:01:02 2020
@@ -201,7 +201,7 @@
{
if (filename.isEmpty())
return false;
- QString file = filename.split(' ', QString::SkipEmptyParts).at(0);
//Ignore parameters
+ QString file = filename.split(' ', Qt::SkipEmptyParts).at(0); //Ignore
parameters
#if defined(Q_OS_WIN32)
if (QFileInfo(file).suffix().isEmpty())
file += ".exe";
@@ -228,7 +228,7 @@
}
QChar envPathSeparator(ScPaths::envPathSeparator);
- const QStringList splitpath = path.split(envPathSeparator,
QString::SkipEmptyParts);
+ const QStringList splitpath = path.split(envPathSeparator,
Qt::SkipEmptyParts);
for (const QString& dir : splitpath)
{
QFileInfo info(dir, file);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
