r22723 by jghali - code style fixes
scribus-commit
scribus-commit at lists.scribus.net
Fri Oct 5 21:39:19 UTC 2018
Author: jghali
Date: Fri Oct 5 21:39:19 2018
New Revision: 22723
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22723
Log:
code style fixes
Modified:
trunk/Scribus/scribus/KarbonCurveFit.cpp
trunk/Scribus/scribus/documentchecker.cpp
trunk/Scribus/scribus/filewatcher.cpp
trunk/Scribus/scribus/fonts/sfnt.cpp
trunk/Scribus/scribus/fpointarray.cpp
trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp
trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.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/pages/importpages.cpp
trunk/Scribus/scribus/plugins/import/pct/importpct.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/import/viva/importviva.cpp
trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdgetsetprop.cpp
trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp
trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
trunk/Scribus/scribus/scfonts.cpp
trunk/Scribus/scribus/schelptreemodel.cpp
trunk/Scribus/scribus/scimage.cpp
trunk/Scribus/scribus/sclayer.cpp
trunk/Scribus/scribus/scpainter.cpp
trunk/Scribus/scribus/scpainterex_cairo.cpp
trunk/Scribus/scribus/scpainterex_ps2.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribusapp.cpp
trunk/Scribus/scribus/scribuscore.cpp
trunk/Scribus/scribus/tocgenerator.cpp
trunk/Scribus/scribus/ui/newfile.cpp
trunk/Scribus/scribus/ui/newtemp.cpp
trunk/Scribus/scribus/ui/pageitemattributes.cpp
trunk/Scribus/scribus/ui/pagelayout.cpp
trunk/Scribus/scribus/ui/prefs_documentitemattributes.cpp
trunk/Scribus/scribus/ui/prefs_documentsections.cpp
trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
trunk/Scribus/scribus/ui/prefs_printer.cpp
trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp
trunk/Scribus/scribus/ui/smsccombobox.cpp
trunk/Scribus/scribus/util.cpp
trunk/Scribus/scribus/vgradient.cpp
trunk/Scribus/scribus/vgradientex.cpp
Modified: trunk/Scribus/scribus/KarbonCurveFit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/KarbonCurveFit.cpp
==============================================================================
--- trunk/Scribus/scribus/KarbonCurveFit.cpp (original)
+++ trunk/Scribus/scribus/KarbonCurveFit.cpp Fri Oct 5 21:39:19 2018
@@ -524,11 +524,11 @@
cu2 = FitCubic(points, splitPoint, last, tHatCenter, tHat2, error,w2);
QPointF *newcurve = new QPointF[w1+w2];
- for(int i=0;i<w1;i++)
+ for (int i=0;i<w1;i++)
{
newcurve[i]=cu1[i];
}
- for(int i=0;i<w2;i++)
+ for (int i=0;i<w2;i++)
{
newcurve[i+w1]=cu2[i];
}
@@ -556,7 +556,7 @@
if(width>3){
path.moveTo(curve[0]);
path.cubicTo(curve[1],curve[2],curve[3]);
- for(int i=4;i<width;i+=4){
+ for (int i=4;i<width;i+=4){
path.cubicTo(curve[i+1],curve[i+2],curve[i+3]);
}
}
Modified: trunk/Scribus/scribus/documentchecker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/documentchecker.cpp
==============================================================================
--- trunk/Scribus/scribus/documentchecker.cpp (original)
+++ trunk/Scribus/scribus/documentchecker.cpp Fri Oct 5 21:39:19 2018
@@ -227,7 +227,7 @@
else
{
QList<VColorStop*> colorStops = currItem->fill_gradient.colorStops();
- for( int offset = 0 ; offset < colorStops.count() ; offset++ )
+ for (int offset = 0 ; offset < colorStops.count() ; offset++)
{
if (colorStops[offset]->opacity != 1.0)
{
@@ -240,7 +240,7 @@
if ((currItem->GrTypeStroke != 0) && (checkerSettings.checkTransparency))
{
QList<VColorStop*> colorStops = currItem->stroke_gradient.colorStops();
- for( int offset = 0 ; offset < colorStops.count() ; offset++ )
+ for (int offset = 0 ; offset < colorStops.count() ; offset++)
{
if (colorStops[offset]->opacity != 1.0)
{
@@ -473,7 +473,7 @@
else
{
QList<VColorStop*> colorStops = currItem->fill_gradient.colorStops();
- for( int offset = 0 ; offset < colorStops.count() ; offset++ )
+ for (int offset = 0 ; offset < colorStops.count() ; offset++)
{
if (colorStops[offset]->opacity != 1.0)
{
@@ -486,7 +486,7 @@
if ((currItem->GrTypeStroke != 0) && (checkerSettings.checkTransparency))
{
QList<VColorStop*> colorStops = currItem->stroke_gradient.colorStops();
- for( int offset = 0 ; offset < colorStops.count() ; offset++ )
+ for (int offset = 0 ; offset < colorStops.count() ; offset++)
{
if (colorStops[offset]->opacity != 1.0)
{
Modified: trunk/Scribus/scribus/filewatcher.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/filewatcher.cpp
==============================================================================
--- trunk/Scribus/scribus/filewatcher.cpp (original)
+++ trunk/Scribus/scribus/filewatcher.cpp Fri Oct 5 21:39:19 2018
@@ -227,7 +227,7 @@
m_watchedFiles.clear();
else
{
- for(int i=0; i<toRemove.count(); ++i)
+ for (int i=0; i<toRemove.count(); ++i)
m_watchedFiles.remove(toRemove[i]);
m_stateFlags &= ~AddRemoveBlocked;
m_stateFlags &= ~TimerStopped;
Modified: trunk/Scribus/scribus/fonts/sfnt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/fonts/sfnt.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/sfnt.cpp (original)
+++ trunk/Scribus/scribus/fonts/sfnt.cpp Fri Oct 5 21:39:19 2018
@@ -604,12 +604,12 @@
QByteArray result;
if (longFormat)
{
- for(int i=0; i < loca.length(); ++i)
+ for (int i=0; i < loca.length(); ++i)
appendWord(result, loca[i]);
}
else
{
- for(int i=0; i < loca.length(); ++i)
+ for (int i=0; i < loca.length(); ++i)
appendWord16(result, loca[i] / 2);
}
return result;
@@ -804,7 +804,7 @@
QMap<uint, uint>::ConstIterator cit;
//qDebug() << "writing cmap";
bool cmapHasData = false;
- for(cit = cmap.cbegin(); cit != cmap.cend(); ++cit)
+ for (cit = cmap.cbegin(); cit != cmap.cend(); ++cit)
{
uint ch = cit.key();
if (!QChar::requiresSurrogates(ch) && cit.value() != 0)
Modified: trunk/Scribus/scribus/fpointarray.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/fpointarray.cpp
==============================================================================
--- trunk/Scribus/scribus/fpointarray.cpp (original)
+++ trunk/Scribus/scribus/fpointarray.cpp Fri Oct 5 21:39:19 2018
@@ -437,9 +437,9 @@
q[ 3 ] = point(seg+2);
q[ 2 ] = point(seg+3);
// The De Casteljau algorithm.
- for( unsigned short j = 1; j <= 3; j++ )
- {
- for( unsigned short i = 0; i <= 3 - j; i++ )
+ for (unsigned short j = 1; j <= 3; j++)
+ {
+ for (unsigned short i = 0; i <= 3 - j; i++)
{
q[ i ] = ( 1.0 - t ) * q[ i ] + t * q[ i + 1 ];
}
@@ -784,7 +784,7 @@
else if(th_arc > 0 && !sweepFlag)
th_arc -= 2 * M_PI;
n_segs = static_cast<int>(ceil(fabs(th_arc / (M_PI * 0.5 + 0.001))));
- for(i = 0; i < n_segs; i++)
+ for (i = 0; i < n_segs; i++)
{
{
double sin_th, cos_th;
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp (original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader.cpp Fri Oct 5 21:39:19 2018
@@ -45,7 +45,7 @@
s >> tmp;
return ret;
}
- for( int i = 0; i < len; i++ )
+ for (int i = 0; i < len; i++)
{
s >> tmp;
ret += QChar(tmp);
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp (original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_gimp.cpp Fri Oct 5 21:39:19 2018
@@ -44,7 +44,7 @@
s >> patternHeight;
s >> patternType;
QString magic = "";
- for( int i = 0; i < 4; i++ )
+ for (int i = 0; i < 4; i++)
{
s >> magicKey[i];
magic += QChar(magicKey[i]);
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp (original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ora.cpp Fri Oct 5 21:39:19 2018
@@ -110,7 +110,7 @@
m_image.fill( qRgba(0, 0, 0, 0) );
ScPainter *painter = new ScPainter(&m_image, m_image.width(), m_image.height(), 1, 0);
painter->setZoomFactor(1);
- for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
+ for (QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
{
if (drawPag.tagName() == "stack")
{
@@ -137,7 +137,7 @@
void ScImgDataLoader_ORA::parseStackXML(QDomElement &elem, ScPainter* painter, ScZipHandler *uz)
{
- for(QDomElement lay = elem.lastChildElement(); !lay.isNull(); lay = lay.previousSiblingElement())
+ for (QDomElement lay = elem.lastChildElement(); !lay.isNull(); lay = lay.previousSiblingElement())
{
if (lay.tagName() == "layer")
{
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp (original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pdf.cpp Fri Oct 5 21:39:19 2018
@@ -140,10 +140,10 @@
if (!ScCore->havePNGAlpha())
{
QRgb *s;
- for( int yi=0; yi < m_image.height(); ++yi )
+ for (int yi=0; yi < m_image.height(); ++yi)
{
s = (QRgb*)(m_image.scanLine( yi ));
- for(int xi=0; xi < m_image.width(); ++xi )
+ for (int xi=0; xi < m_image.width(); ++xi)
{
if ((*s) == 0xffffffff)
(*s) &= 0x00ffffff;
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp (original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_pict.cpp Fri Oct 5 21:39:19 2018
@@ -822,7 +822,7 @@
fillBrush = setFillPattern();
else
fillBrush = QBrush(m_foreColor);
- for(unsigned i = 0; i < polySize; i += 4)
+ for (unsigned i = 0; i < polySize; i += 4)
{
ts >> y >> x;
m_Coords.lineTo(x, y);
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp (original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_ps.cpp Fri Oct 5 21:39:19 2018
@@ -548,10 +548,10 @@
m_imageInfoRecord.colorspace = ColorSpaceCMYK;
QRgb *s;
unsigned char cc, cm, cy, ck;
- for( int yit=0; yit < m_image.height(); ++yit )
+ for (int yit = 0; yit < m_image.height(); ++yit)
{
s = (QRgb*)(m_image.scanLine( yit ));
- for(int xit=0; xit < m_image.width(); ++xit )
+ for (int xit = 0; xit < m_image.width(); ++xit)
{
cc = 255 - qRed(*s);
cm = 255 - qGreen(*s);
@@ -1029,11 +1029,11 @@
m_image = QImage( cinfo.output_width, cinfo.output_height, QImage::Format_ARGB32 );
QRgb *s;
QRgb *d;
- for( int yi=0; yi < tmpImg.height(); ++yi )
+ for (int yi=0; yi < tmpImg.height(); ++yi)
{
s = (QRgb*)(tmpImg.scanLine( yi ));
d = (QRgb*)(m_image.scanLine( yi ));
- for(int xi=0; xi < tmpImg.width(); ++xi )
+ for (int xi=0; xi < tmpImg.width(); ++xi)
{
(*d) = (*s);
s++;
@@ -1155,11 +1155,11 @@
tmpImg = QImage( cinfo.output_width, cinfo.output_height, QImage::Format_ARGB32 );
QRgb *s;
QRgb *d;
- for( int yi=0; yi < tmpImg2.height(); ++yi )
+ for (int yi=0; yi < tmpImg2.height(); ++yi)
{
s = (QRgb*)(tmpImg2.scanLine( yi ));
d = (QRgb*)(tmpImg.scanLine( yi ));
- for(int xi=0; xi < tmpImg2.width(); ++xi )
+ for (int xi=0; xi < tmpImg2.width(); ++xi)
{
(*d) = (*s);
s++;
Modified: trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp
==============================================================================
--- trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp (original)
+++ trunk/Scribus/scribus/imagedataloaders/scimgdataloader_wpg.cpp Fri Oct 5 21:39:19 2018
@@ -70,7 +70,7 @@
if(!pen.solid)
{
dashArray.clear();
- for(unsigned i = 0; i < pen.dashArray.count(); i++)
+ for (unsigned i = 0; i < pen.dashArray.count(); i++)
{
dashArray.append(pen.dashArray.at(i)*LineW);
}
@@ -128,7 +128,7 @@
gradientAngle = brush.gradient.angle();
isGradient = true;
currentGradient = QLinearGradient();
- for(unsigned c = 0; c < brush.gradient.count(); c++)
+ for (unsigned c = 0; c < brush.gradient.count(); c++)
{
QColor stopC(brush.gradient.stopColor(c).red, brush.gradient.stopColor(c).green, brush.gradient.stopColor(c).blue);
double pos = qBound(0.0, fabs(brush.gradient.stopOffset(c)), 1.0);
@@ -197,7 +197,7 @@
imagePainter.setPen(currentPen);
Coords = QPainterPath();
Coords.moveTo(72 * vertices[0].x, 72 * vertices[0].y);
- for(unsigned i = 1; i < vertices.count(); i++)
+ for (unsigned i = 1; i < vertices.count(); i++)
{
Coords.lineTo(72 * vertices[i].x, 72 * vertices[i].y);
}
@@ -222,7 +222,7 @@
void ScrPainterIm::drawPath(const libwpg::WPGPath& path)
{
Coords = QPainterPath();
- for(unsigned i = 0; i < path.count(); i++)
+ for (unsigned i = 0; i < path.count(); i++)
{
libwpg::WPGPathElement element = path.element(i);
libwpg::WPGPoint point = element.point;
@@ -271,9 +271,9 @@
void ScrPainterIm::drawBitmap(const libwpg::WPGBitmap& bitmap, double hres, double vres)
{
QImage img(bitmap.width(), bitmap.height(), QImage::Format_RGB32);
- for(int x = 0; x < bitmap.width(); x++)
- {
- for(int y = 0; y < bitmap.height(); y++)
+ for (int x = 0; x < bitmap.width(); x++)
+ {
+ for (int y = 0; y < bitmap.height(); y++)
{
libwpg::WPGColor color = bitmap.pixel(x, y);
img.setPixel(x, y, qRgb(color.red, color.green, color.blue));
Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Fri Oct 5 21:39:19 2018
@@ -861,7 +861,7 @@
effectsInUse.clear();
//Page Item Attributes
pageItemAttributes.clear();
- for(ObjAttrVector::Iterator objAttrIt = m_Doc->itemAttributes().begin() ; objAttrIt != m_Doc->itemAttributes().end(); ++objAttrIt )
+ for (ObjAttrVector::Iterator objAttrIt = m_Doc->itemAttributes().begin() ; objAttrIt != m_Doc->itemAttributes().end(); ++objAttrIt )
{
if (((*objAttrIt).autoaddto=="textframes" && m_ItemType==TextFrame) ||
((*objAttrIt).autoaddto=="imageframes" && m_ItemType==ImageFrame)
@@ -4547,7 +4547,7 @@
if (!allItems)
{
int ids = items->indexOf(this) - 1;
- for(int idx = ids; idx >= 0 ; --idx)
+ for (int idx = ids; idx >= 0 ; --idx)
{
if (items->at(idx)->asTextFrame()) // do not bother with no text frames
{
@@ -4561,7 +4561,7 @@
}
else
{
- for(int idx = items->count() - 1; idx >= 0 ; --idx)
+ for (int idx = items->count() - 1; idx >= 0 ; --idx)
{
if (items->at(idx) != this) // avoids itself
{
@@ -7079,11 +7079,11 @@
QList<PageItem*> pList;
int id = m_Doc->Items->indexOf(this) - 1;
- for(int i = id; i >= 0 ; --i)
+ for (int i = id; i >= 0 ; --i)
pList << m_Doc->Items->at(i);
QRectF baseRect(getBoundingRect());
- for(int i = 0; i < pList.count(); ++i)
+ for (int i = 0; i < pList.count(); ++i)
{
QRectF uRect(pList.at(i)->getBoundingRect());
if (baseRect.intersects(uRect))
@@ -7606,7 +7606,7 @@
QList<ObjectAttribute> PageItem::getObjectAttributes(const QString& attributeName) const
{
QList<ObjectAttribute> attributes;
- for(ObjAttrVector::const_iterator objAttrIt = pageItemAttributes.begin() ; objAttrIt != pageItemAttributes.end(); ++objAttrIt )
+ for (ObjAttrVector::const_iterator objAttrIt = pageItemAttributes.begin() ; objAttrIt != pageItemAttributes.end(); ++objAttrIt)
{
if (objAttrIt->name == attributeName)
{
@@ -7620,7 +7620,7 @@
{
int countFound=0;
ObjAttrVector::const_iterator foundIt = pageItemAttributes.begin();
- for(ObjAttrVector::const_iterator objAttrIt = pageItemAttributes.begin(); objAttrIt != pageItemAttributes.end(); ++objAttrIt )
+ for (ObjAttrVector::const_iterator objAttrIt = pageItemAttributes.begin(); objAttrIt != pageItemAttributes.end(); ++objAttrIt)
{
if (objAttrIt->name==attributeName)
{
@@ -9587,10 +9587,10 @@
int r, g, b, a;
QRgb *s;
QRgb rgb;
- for( int yi=0; yi < h; ++yi )
+ for (int yi=0; yi < h; ++yi)
{
s = (QRgb*)(pixm.qImagePtr()->scanLine( yi ));
- for( int xi = 0; xi < w; ++xi )
+ for (int xi = 0; xi < w; ++xi)
{
rgb = *s;
tmpC.setRgb(rgb);
Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/svgexplugin.cpp Fri Oct 5 21:39:19 2018
@@ -313,7 +313,7 @@
layerGroup.setAttribute("inkscape:groupmode", "layer");
if (layer.transparency != 1.0)
layerGroup.setAttribute("opacity", FToStr(layer.transparency));
- for(int j = 0; j < Items.count(); ++j)
+ for (int j = 0; j < Items.count(); ++j)
{
Item = Items.at(j);
if (Item->LayerID != layer.ID)
Modified: trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp Fri Oct 5 21:39:19 2018
@@ -376,7 +376,7 @@
QDomElement layerGroup = p_docu.createElement("Canvas");
if (layer.transparency != 1.0)
layerGroup.setAttribute("Opacity", layer.transparency);
- for(int j = 0; j < Items.count(); ++j)
+ for (int j = 0; j < Items.count(); ++j)
{
Item = Items.at(j);
if (Item->LayerID != layer.ID)
@@ -1064,7 +1064,7 @@
QString Indices = "";
QString UnicodeString = "";
QDomElement glyph;
- for(QDomElement txtGrp = grp.firstChildElement(); !txtGrp.isNull(); txtGrp = txtGrp.nextSiblingElement() )
+ for (QDomElement txtGrp = grp.firstChildElement(); !txtGrp.isNull(); txtGrp = txtGrp.nextSiblingElement())
{
if (txtGrp.tagName() != "Glyphs")
{
Modified: trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/docxim/docxim.cpp Fri Oct 5 21:39:19 2018
@@ -92,7 +92,7 @@
return;
}
QDomElement docElem = designMapDom.documentElement();
- for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
+ for (QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
{
if (drawPag.tagName() == "Override")
{
@@ -138,15 +138,15 @@
return;
}
QDomElement docElem = designMapDom.documentElement();
- for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
+ for (QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
{
if (drawPag.tagName() == "a:themeElements")
{
- for(QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "a:fontScheme")
{
- for(QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement() )
+ for (QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement())
{
if (spr.tagName() == "a:minorFont")
{
@@ -191,15 +191,15 @@
currentParagraphStyle.charStyle().setParent(CommonStrings::DefaultCharacterStyle);
currentParagraphStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
QDomElement docElem = designMapDom.documentElement();
- for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
+ for (QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
{
if (drawPag.tagName() == "w:docDefaults")
{
- for(QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "w:rPrDefault")
{
- for(QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement() )
+ for (QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement())
{
if (spr.tagName() == "w:rPr")
parseCharProps(spr, defaultParagraphStyle);
@@ -207,7 +207,7 @@
}
else if (spf.tagName() == "w:pPrDefault")
{
- for(QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement() )
+ for (QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement())
{
if (spr.tagName() == "w:pPr")
parseParaProps(spr, defaultParagraphStyle);
@@ -232,7 +232,7 @@
newStyle.setName(m_item->itemName() + "_" + nam.attribute("w:val"));
else
newStyle.setName(nam.attribute("w:val"));
- for(QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "w:basedOn")
{
@@ -287,18 +287,18 @@
}
textItem->itemText.setDefaultStyle(defaultParagraphStyle);
QDomElement docElem = designMapDom.documentElement();
- for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
+ for (QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
{
if (drawPag.tagName() == "w:body")
{
- for(QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "w:p")
{
currentParagraphStyle = defaultParagraphStyle;
bool hasStyle = false;
QString currStyleName = "";
- for(QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement() )
+ for (QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement())
{
if (spr.tagName() == "w:pPr")
{
@@ -324,7 +324,7 @@
currentParagraphStyle.charStyle() = m_Doc->paragraphStyle(currStyleName).charStyle();
else
currentParagraphStyle.charStyle() = defaultParagraphStyle.charStyle();
- for(QDomElement spt = spr.firstChildElement(); !spt.isNull(); spt = spt.nextSiblingElement() )
+ for (QDomElement spt = spr.firstChildElement(); !spt.isNull(); spt = spt.nextSiblingElement())
{
if (spt.tagName() == "w:t")
{
@@ -368,7 +368,7 @@
void DocXIm::parseParaProps(QDomElement &props, ParagraphStyle &pStyle)
{
- for(QDomElement spt = props.firstChildElement(); !spt.isNull(); spt = spt.nextSiblingElement() )
+ for (QDomElement spt = props.firstChildElement(); !spt.isNull(); spt = spt.nextSiblingElement())
{
if (spt.tagName() == "w:rPr")
{
@@ -439,7 +439,7 @@
void DocXIm::parseCharProps(QDomElement &props, ParagraphStyle &pStyle)
{
- for(QDomElement spc = props.firstChildElement(); !spc.isNull(); spc = spc.nextSiblingElement() )
+ for (QDomElement spc = props.firstChildElement(); !spc.isNull(); spc = spc.nextSiblingElement())
{
if (spc.tagName() == "w:u")
{
@@ -621,19 +621,19 @@
currentParagraphStyle.charStyle().setParent(CommonStrings::DefaultCharacterStyle);
currentParagraphStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
QDomElement docElem = designMapDom.documentElement();
- for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
+ for (QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
{
if (drawPag.tagName() == "w:body")
{
- for(QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "w:p")
{
- for(QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement() )
+ for (QDomElement spr = spf.firstChildElement(); !spr.isNull(); spr = spr.nextSiblingElement())
{
if (spr.tagName() == "w:r")
{
- for(QDomElement spt = spr.firstChildElement(); !spt.isNull(); spt = spt.nextSiblingElement() )
+ for (QDomElement spt = spr.firstChildElement(); !spt.isNull(); spt = spt.nextSiblingElement())
{
if (spt.tagName() == "w:t")
{
Modified: trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp Fri Oct 5 21:39:19 2018
@@ -136,7 +136,7 @@
QXmlAttributes attrs;
if (atts)
{
- for(const xmlChar** cur = atts; cur && *cur; cur += 2)
+ for (const xmlChar** cur = atts; cur && *cur; cur += 2)
attrs.append(QString((char*)*cur), nullptr, QString((char*)*cur), QString((char*)*(cur + 1)));
}
hreader->startElement(nullptr, nullptr, name, attrs);
Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&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 Fri Oct 5 21:39:19 2018
@@ -289,7 +289,7 @@
{
if (!spn.hasChildNodes())
continue;
- for(QDomNode spp = spn.firstChild(); !spp.isNull(); spp = spp.nextSibling())
+ for (QDomNode spp = spn.firstChild(); !spp.isNull(); spp = spp.nextSibling())
{
if (spp.nodeName() == "text:p")
{
@@ -851,7 +851,7 @@
{
if (!spn.hasChildNodes())
continue;
- for(QDomNode spp = spn.firstChild(); !spp.isNull(); spp = spp.nextSibling())
+ for (QDomNode spp = spn.firstChild(); !spp.isNull(); spp = spp.nextSibling())
{
if (spp.nodeName() == "text:p")
{
Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp Fri Oct 5 21:39:19 2018
@@ -328,7 +328,7 @@
QXmlAttributes attrs;
if (atts)
{
- for(const xmlChar** cur = atts; cur && *cur; cur += 2)
+ for (const xmlChar** cur = atts; cur && *cur; cur += 2)
attrs.append(QString((char*)*cur), nullptr, QString((char*)*cur), QString((char*)*(cur + 1)));
}
creader->startElement(nullptr, nullptr, name, attrs);
Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.cpp Fri Oct 5 21:39:19 2018
@@ -806,7 +806,7 @@
{
QString name = QString((const char*) fullname).toLower();
QXmlAttributes attrs;
- for(const xmlChar** cur = atts; cur && *cur; cur += 2)
+ for (const xmlChar** cur = atts; cur && *cur; cur += 2)
attrs.append(QString((char*)*cur), nullptr, QString((char*)*cur), QString((char*)*(cur + 1)));
sreader->startElement(nullptr, nullptr, name, attrs);
}
Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&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 Fri Oct 5 21:39:19 2018
@@ -132,12 +132,12 @@
QDomDocument rdfD;
rdfD.setContent(metaD);
QDomElement docElemR = rdfD.documentElement();
- for(QDomNode drawPag = docElemR.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
+ for (QDomNode drawPag = docElemR.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling())
{
QDomElement dpg = drawPag.toElement();
if (dpg.tagName() == "rdf:RDF")
{
- for(QDomNode drawPag2 = dpg.firstChild(); !drawPag2.isNull(); drawPag2 = drawPag2.nextSibling() )
+ for (QDomNode drawPag2 = dpg.firstChild(); !drawPag2.isNull(); drawPag2 = drawPag2.nextSibling())
{
QDomElement dpg2 = drawPag2.toElement();
if (dpg2.hasAttribute("xmlns:xmpGImg"))
@@ -245,7 +245,7 @@
}
else
{
- for(QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
+ for (QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling())
{
QDomElement dpg = drawPag.toElement();
if (dpg.tagName() == "idPkg:Graphic")
@@ -536,7 +536,7 @@
QString activeLayer = docElem.attribute("ActiveLayer");
if (ext == "idms")
{
- for(QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
+ for (QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling())
{
QDomElement dpg = drawPag.toElement();
if (dpg.tagName() == "Layer")
@@ -568,7 +568,7 @@
}
else
{
- for(QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
+ for (QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling())
{
QDomElement dpg = drawPag.toElement();
if (dpg.tagName() == "Layer")
@@ -719,7 +719,7 @@
{
QString family = e.attribute("Name");
QMap<QString, QString> styleMap;
- for(QDomNode gr = e.firstChild(); !gr.isNull(); gr = gr.nextSibling() )
+ for (QDomNode gr = e.firstChild(); !gr.isNull(); gr = gr.nextSibling())
{
QDomElement grs = gr.toElement();
if (grs.tagName() == "Font")
@@ -820,7 +820,7 @@
int grTyp = (e.attribute("Type") == "Linear") ? 6 : 7;
VGradient currentGradient = VGradient(VGradient::linear);
currentGradient.clearStops();
- for(QDomNode gr = e.firstChild(); !gr.isNull(); gr = gr.nextSibling() )
+ for (QDomNode gr = e.firstChild(); !gr.isNull(); gr = gr.nextSibling())
{
QDomElement grs = gr.toElement();
if (grs.tagName() == "GradientStop")
@@ -904,14 +904,14 @@
QDomElement e = n.toElement();
if (e.tagName() == "RootCharacterStyleGroup")
{
- for(QDomNode it = e.firstChild(); !it.isNull(); it = it.nextSibling() )
+ for (QDomNode it = e.firstChild(); !it.isNull(); it = it.nextSibling())
{
QDomElement itpg = it.toElement();
if (itpg.tagName() == "CharacterStyle")
parseCharacterStyle(itpg);
else if (itpg.tagName() == "CharacterStyleGroup")
{
- for(QDomNode its = itpg.firstChild(); !its.isNull(); its = its.nextSibling() )
+ for (QDomNode its = itpg.firstChild(); !its.isNull(); its = its.nextSibling())
{
QDomElement itp = its.toElement();
if (itp.tagName() == "CharacterStyle")
@@ -922,14 +922,14 @@
}
if (e.tagName() == "RootParagraphStyleGroup")
{
- for(QDomNode it = e.firstChild(); !it.isNull(); it = it.nextSibling() )
+ for (QDomNode it = e.firstChild(); !it.isNull(); it = it.nextSibling())
{
QDomElement itpg = it.toElement();
if (itpg.tagName() == "ParagraphStyle")
parseParagraphStyle(itpg);
else if (itpg.tagName() == "ParagraphStyleGroup")
{
- for(QDomNode its = itpg.firstChild(); !its.isNull(); its = its.nextSibling() )
+ for (QDomNode its = itpg.firstChild(); !its.isNull(); its = its.nextSibling())
{
QDomElement itp = its.toElement();
if (itp.tagName() == "ParagraphStyle")
@@ -940,14 +940,14 @@
}
if (e.tagName() == "RootObjectStyleGroup")
{
- for(QDomNode it = e.firstChild(); !it.isNull(); it = it.nextSibling() )
+ for (QDomNode it = e.firstChild(); !it.isNull(); it = it.nextSibling())
{
QDomElement itpg = it.toElement();
if (itpg.tagName() == "ObjectStyle")
parseObjectStyle(itpg);
else if (itpg.tagName() == "ObjectStyleGroup")
{
- for(QDomNode its = itpg.firstChild(); !its.isNull(); its = its.nextSibling() )
+ for (QDomNode its = itpg.firstChild(); !its.isNull(); its = its.nextSibling())
{
QDomElement itp = its.toElement();
if (itp.tagName() == "ObjectStyle")
@@ -987,12 +987,12 @@
nstyle.TextFlow = def_TextFlow;
nstyle.LeftLineEnd = def_LeftLineEnd;
nstyle.RightLineEnd = def_RightLineEnd;
- for(QDomNode itp = styleElem.firstChild(); !itp.isNull(); itp = itp.nextSibling() )
+ for (QDomNode itp = styleElem.firstChild(); !itp.isNull(); itp = itp.nextSibling())
{
QDomElement itpr = itp.toElement();
if (itpr.tagName() == "Properties")
{
- for(QDomNode itpp = itpr.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling() )
+ for (QDomNode itpp = itpr.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling())
{
QDomElement i = itpp.toElement();
if (i.tagName() == "BasedOn")
@@ -1023,12 +1023,12 @@
nstyle.TextColumnGutter = itpr.attribute("TextColumnGutter").toDouble();
if (itpr.hasAttribute("TextColumnFixedWidth"))
nstyle.TextColumnFixedWidth = itpr.attribute("TextColumnFixedWidth").toDouble();
- for(QDomNode itpp = itpr.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling() )
+ for (QDomNode itpp = itpr.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling())
{
QDomElement i = itpp.toElement();
if (i.tagName() == "Properties")
{
- for(QDomNode it = i.firstChild(); !it.isNull(); it = it.nextSibling() )
+ for (QDomNode it = i.firstChild(); !it.isNull(); it = it.nextSibling())
{
QDomElement itx = it.toElement();
if (itx.tagName() == "InsetSpacing")
@@ -1038,7 +1038,7 @@
else if (itx.attribute("type") == "list")
{
int cc = 0;
- for(QDomNode ity = itx.firstChild(); !ity.isNull(); ity = ity.nextSibling() )
+ for (QDomNode ity = itx.firstChild(); !ity.isNull(); ity = ity.nextSibling())
{
QDomElement itxx = ity.toElement();
if (itxx.tagName() == "ListItem")
@@ -1139,12 +1139,12 @@
QString fontName = m_Doc->itemToolPrefs().textFont;
QString fontBaseName = "";
QString fontStyle = styleElem.attribute("FontStyle", "");
- for(QDomNode itp = styleElem.firstChild(); !itp.isNull(); itp = itp.nextSibling() )
+ for (QDomNode itp = styleElem.firstChild(); !itp.isNull(); itp = itp.nextSibling())
{
QDomElement itpr = itp.toElement();
if (itpr.tagName() == "Properties")
{
- for(QDomNode itpp = itpr.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling() )
+ for (QDomNode itpp = itpr.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling())
{
QDomElement i = itpp.toElement();
if (i.tagName() == "AppliedFont")
@@ -1181,12 +1181,12 @@
QString fontBaseName = "";
QString fontStyle = styleElem.attribute("FontStyle", "");
newStyle.setLineSpacingMode(ParagraphStyle::AutomaticLineSpacing);
- for(QDomNode itp = styleElem.firstChild(); !itp.isNull(); itp = itp.nextSibling() )
+ for (QDomNode itp = styleElem.firstChild(); !itp.isNull(); itp = itp.nextSibling())
{
QDomElement itpr = itp.toElement();
if (itpr.tagName() == "Properties")
{
- for(QDomNode itpp = itpr.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling() )
+ for (QDomNode itpp = itpr.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling())
{
QDomElement i = itpp.toElement();
if (i.tagName() == "AppliedFont")
@@ -1223,13 +1223,13 @@
{
QList<ParagraphStyle::TabRecord> tbs;
newStyle.resetTabValues();
- for(QDomNode tabl = i.firstChild(); !tabl.isNull(); tabl = tabl.nextSibling() )
+ for (QDomNode tabl = i.firstChild(); !tabl.isNull(); tabl = tabl.nextSibling())
{
QDomElement ta = tabl.toElement();
if (ta.tagName() == "ListItem")
{
ParagraphStyle::TabRecord tb;
- for(QDomNode tal = ta.firstChild(); !tal.isNull(); tal = tal.nextSibling() )
+ for (QDomNode tal = ta.firstChild(); !tal.isNull(); tal = tal.nextSibling())
{
QDomElement tab = tal.toElement();
QString tabVal = tab.text();
@@ -1359,10 +1359,10 @@
}
if (e.tagName() == "TransparencyDefaultContainerObject")
{
- for(QDomNode it = e.firstChild(); !it.isNull(); it = it.nextSibling() )
+ for (QDomNode it = e.firstChild(); !it.isNull(); it = it.nextSibling())
{
QDomElement itpg = it.toElement();
- for(QDomNode itp = itpg.firstChild(); !itp.isNull(); itp = itp.nextSibling() )
+ for (QDomNode itp = itpg.firstChild(); !itp.isNull(); itp = itp.nextSibling())
{
QDomElement itpr = itp.toElement();
if (itpr.tagName() == "TransparencySetting")
@@ -1448,12 +1448,12 @@
def_TextColumnGutter = e.attribute("TextColumnGutter").toDouble();
if (e.hasAttribute("TextColumnFixedWidth"))
def_TextColumnFixedWidth = e.attribute("TextColumnFixedWidth").toDouble();
- for(QDomNode itpp = e.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling() )
+ for (QDomNode itpp = e.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling())
{
QDomElement i = itpp.toElement();
if (i.tagName() == "Properties")
{
- for(QDomNode it = i.firstChild(); !it.isNull(); it = it.nextSibling() )
+ for (QDomNode it = i.firstChild(); !it.isNull(); it = it.nextSibling())
{
QDomElement itx = it.toElement();
if (itx.tagName() == "InsetSpacing")
@@ -1463,7 +1463,7 @@
else if (itx.attribute("type") == "list")
{
int cc = 0;
- for(QDomNode ity = itx.firstChild(); !ity.isNull(); ity = ity.nextSibling() )
+ for (QDomNode ity = itx.firstChild(); !ity.isNull(); ity = ity.nextSibling())
{
QDomElement itxx = ity.toElement();
if (itxx.tagName() == "ListItem")
@@ -1533,12 +1533,12 @@
void IdmlPlug::parseSpreadXMLNode(const QDomElement& spNode)
{
- for (QDomNode n = spNode.firstChild(); !n.isNull(); n = n.nextSibling() )
+ for (QDomNode n = spNode.firstChild(); !n.isNull(); n = n.nextSibling())
{
QDomElement e = n.toElement();
if (e.tagName() == "Spread")
{
- for(QDomNode sp = e.firstChild(); !sp.isNull(); sp = sp.nextSibling() )
+ for (QDomNode sp = e.firstChild(); !sp.isNull(); sp = sp.nextSibling())
{
QDomElement spe = sp.toElement();
if (spe.tagName() == "Page")
@@ -1591,7 +1591,7 @@
baseX = m_Doc->currentPage()->xOffset() + m_Doc->currentPage()->width() / 2.0;
baseY = m_Doc->currentPage()->yOffset() + m_Doc->currentPage()->height() / 2.0;
}
- for(QDomNode sp = e.firstChild(); !sp.isNull(); sp = sp.nextSibling() )
+ for (QDomNode sp = e.firstChild(); !sp.isNull(); sp = sp.nextSibling())
{
QDomElement spe = sp.toElement();
if ((spe.tagName() == "Rectangle") || (spe.tagName() == "Oval") || (spe.tagName() == "GraphicLine") || (spe.tagName() == "Polygon") || (spe.tagName() == "TextFrame") || (spe.tagName() == "Group") || (spe.tagName() == "Button"))
@@ -1611,7 +1611,7 @@
QString pageNam = e.attribute("Self");
QStringList pages;
ScPage *oldCur = m_Doc->currentPage();
- for(QDomNode sp = e.firstChild(); !sp.isNull(); sp = sp.nextSibling() )
+ for (QDomNode sp = e.firstChild(); !sp.isNull(); sp = sp.nextSibling())
{
QDomElement spe = sp.toElement();
if (spe.tagName() == "Page")
@@ -1633,7 +1633,7 @@
baseX = addedPage->xOffset() + addedPage->width() / 2.0;
else
baseX = addedPage->xOffset() - transformation.dx();
- for(QDomNode spp = e.firstChild(); !spp.isNull(); spp = spp.nextSibling() )
+ for (QDomNode spp = e.firstChild(); !spp.isNull(); spp = spp.nextSibling())
{
QDomElement spe = spp.toElement();
if ((spe.tagName() == "Rectangle") || (spe.tagName() == "Oval") || (spe.tagName() == "GraphicLine") || (spe.tagName() == "Polygon") || (spe.tagName() == "TextFrame") || (spe.tagName() == "Group") || (spe.tagName() == "Button"))
@@ -1868,23 +1868,23 @@
QString storyForPath = "";
int pathTextType = 0;
double pathTextStart = 0;
- for(QDomNode it = itElem.firstChild(); !it.isNull(); it = it.nextSibling() )
+ for (QDomNode it = itElem.firstChild(); !it.isNull(); it = it.nextSibling())
{
QDomElement ite = it.toElement();
if (ite.tagName() == "Properties")
{
- for(QDomNode itp = ite.firstChild(); !itp.isNull(); itp = itp.nextSibling() )
+ for (QDomNode itp = ite.firstChild(); !itp.isNull(); itp = itp.nextSibling())
{
QDomElement itpg = itp.toElement();
if (itpg.tagName() == "PathGeometry")
{
- for(QDomNode itg = itpg.firstChild(); !itg.isNull(); itg = itg.nextSibling() )
+ for (QDomNode itg = itpg.firstChild(); !itg.isNull(); itg = itg.nextSibling())
{
QDomElement itgg = itg.toElement();
if (itgg.tagName() == "GeometryPathType")
{
isOpen = (itgg.attribute("PathOpen") == "true");
- for(QDomNode itpp = itgg.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling() )
+ for (QDomNode itpp = itgg.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling())
{
QDomElement itpa = itpp.toElement();
if (itpa.tagName() == "PathPointArray")
@@ -1893,7 +1893,7 @@
QPointF firstBezPoint;
QPointF firstAncPoint;
QList<QPointF> pointList;
- for(QDomNode itpap = itpa.firstChild(); !itpap.isNull(); itpap = itpap.nextSibling() )
+ for (QDomNode itpap = itpa.firstChild(); !itpap.isNull(); itpap = itpap.nextSibling())
{
QDomElement itpo = itpap.toElement();
if (itpo.tagName() == "PathPointType")
@@ -1999,7 +1999,7 @@
}
else if (ite.tagName() == "TransparencySetting")
{
- for(QDomNode itp = ite.firstChild(); !itp.isNull(); itp = itp.nextSibling() )
+ for (QDomNode itp = ite.firstChild(); !itp.isNull(); itp = itp.nextSibling())
{
QDomElement itpg = itp.toElement();
if (itpg.tagName() == "BlendingSetting")
@@ -2026,12 +2026,12 @@
TextColumnGutter = ite.attribute("TextColumnGutter").toDouble();
// if (ite.hasAttribute("TextColumnFixedWidth"))
// TextColumnFixedWidth = ite.attribute("TextColumnFixedWidth").toDouble();
- for(QDomNode itpp = ite.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling() )
+ for (QDomNode itpp = ite.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling())
{
QDomElement i = itpp.toElement();
if (i.tagName() == "Properties")
{
- for(QDomNode it = i.firstChild(); !it.isNull(); it = it.nextSibling() )
+ for (QDomNode it = i.firstChild(); !it.isNull(); it = it.nextSibling())
{
QDomElement itx = it.toElement();
if (itx.tagName() == "InsetSpacing")
@@ -2041,7 +2041,7 @@
else if (itx.attribute("type") == "list")
{
int cc = 0;
- for(QDomNode ity = itx.firstChild(); !ity.isNull(); ity = ity.nextSibling() )
+ for (QDomNode ity = itx.firstChild(); !ity.isNull(); ity = ity.nextSibling())
{
QDomElement itxx = ity.toElement();
if (itxx.tagName() == "ListItem")
@@ -2073,7 +2073,7 @@
double a, b, c, d, e, f;
list >> a >> b >> c >> d >> e >> f;
imageTransform = QTransform(a, b, c, d, e, f) * transformation;
- for(QDomNode itp = ite.firstChild(); !itp.isNull(); itp = itp.nextSibling() )
+ for (QDomNode itp = ite.firstChild(); !itp.isNull(); itp = itp.nextSibling())
{
QDomElement itpg = itp.toElement();
if (itpg.tagName() == "Properties")
@@ -2738,14 +2738,14 @@
if (!storyMap.contains(storyName))
return;
item = storyMap[storyName];
- for(QDomNode st = e.firstChild(); !st.isNull(); st = st.nextSibling() )
+ for (QDomNode st = e.firstChild(); !st.isNull(); st = st.nextSibling())
{
QDomElement ste = st.toElement();
if (ste.tagName() == "ParagraphStyleRange")
parseParagraphStyleRange(ste, item);
else if (ste.tagName() == "XMLElement")
{
- for(QDomNode stx = ste.firstChild(); !stx.isNull(); stx = stx.nextSibling() )
+ for (QDomNode stx = ste.firstChild(); !stx.isNull(); stx = stx.nextSibling())
{
QDomElement stxe = stx.toElement();
if (stxe.tagName() == "ParagraphStyleRange")
@@ -2777,21 +2777,21 @@
ParagraphStyle ttx = m_Doc->paragraphStyle(pStyle);
QString fontBase = ttx.charStyle().font().family();
QString fontStyle = ttx.charStyle().font().style();
- for(QDomNode stc = ste.firstChild(); !stc.isNull(); stc = stc.nextSibling() )
+ for (QDomNode stc = ste.firstChild(); !stc.isNull(); stc = stc.nextSibling())
{
QDomElement stt = stc.toElement();
if (stt.tagName() == "CharacterStyleRange")
parseCharacterStyleRange(stt, item, fontBase, fontStyle, newStyle, item->itemText.length());
else if (stt.tagName() == "XMLElement")
{
- for(QDomNode stx = stt.firstChild(); !stx.isNull(); stx = stx.nextSibling() )
+ for (QDomNode stx = stt.firstChild(); !stx.isNull(); stx = stx.nextSibling())
{
QDomElement stxe = stx.toElement();
if (stxe.tagName() == "CharacterStyleRange")
parseCharacterStyleRange(stxe, item, fontBase, fontStyle, newStyle, item->itemText.length());
else if (stxe.tagName() == "XMLElement")
{
- for(QDomNode stxx = stxe.firstChild(); !stxx.isNull(); stxx = stxx.nextSibling() )
+ for (QDomNode stxx = stxe.firstChild(); !stxx.isNull(); stxx = stxx.nextSibling())
{
QDomElement stxxe = stxx.toElement();
if (stxxe.tagName() == "CharacterStyleRange")
@@ -2814,12 +2814,12 @@
{
QString data = "";
bool hasChangedFont = false;
- for(QDomNode stcp = stt.firstChild(); !stcp.isNull(); stcp = stcp.nextSibling() )
+ for (QDomNode stcp = stt.firstChild(); !stcp.isNull(); stcp = stcp.nextSibling())
{
QDomElement sp = stcp.toElement();
if (sp.tagName() == "Properties")
{
- for(QDomNode spa = sp.firstChild(); !spa.isNull(); spa = spa.nextSibling() )
+ for (QDomNode spa = sp.firstChild(); !spa.isNull(); spa = spa.nextSibling())
{
QDomElement spf = spa.toElement();
if (spf.tagName() == "AppliedFont")
@@ -2872,13 +2872,13 @@
}
}
readCharStyleAttributes(nstyle, stt);
- for(QDomNode stch = stt.firstChild(); !stch.isNull(); stch = stch.nextSibling() )
+ for (QDomNode stch = stt.firstChild(); !stch.isNull(); stch = stch.nextSibling())
{
QDomElement s = stch.toElement();
if (s.tagName() == "Content")
{
QString ch = "";
- for(QDomNode sh = s.firstChild(); !sh.isNull(); sh = sh.nextSibling() )
+ for (QDomNode sh = s.firstChild(); !sh.isNull(); sh = sh.nextSibling())
{
QString p = sh.nodeValue();
if (sh.nodeName() == "#text")
@@ -2935,7 +2935,7 @@
QList<double> colWidths;
double twidth = 0.0;
double theight = 0.0;
- for(QDomNode st = s.firstChild(); !st.isNull(); st = st.nextSibling() )
+ for (QDomNode st = s.firstChild(); !st.isNull(); st = st.nextSibling())
{
QDomElement sr = st.toElement();
if (sr.tagName() == "Row")
@@ -2966,7 +2966,7 @@
currItem->resizeColumn(i, colWidths[i]);
}
m_Doc->dontResize = true;
- for(QDomNode st = s.firstChild(); !st.isNull(); st = st.nextSibling() )
+ for (QDomNode st = s.firstChild(); !st.isNull(); st = st.nextSibling())
{
QDomElement sr = st.toElement();
if (sr.tagName() == "Cell")
@@ -2976,12 +2976,12 @@
if (itText)
{
m_Doc->dontResize = true;
- for(QDomNode sct = sr.firstChild(); !sct.isNull(); sct = sct.nextSibling() )
+ for (QDomNode sct = sr.firstChild(); !sct.isNull(); sct = sct.nextSibling())
{
QDomElement spf = sct.toElement();
if (spf.tagName() == "XMLElement")
{
- for(QDomNode sctx = spf.firstChild(); !sctx.isNull(); sctx = sctx.nextSibling() )
+ for (QDomNode sctx = spf.firstChild(); !sctx.isNull(); sctx = sctx.nextSibling())
{
QDomElement spfx = sctx.toElement();
if (spfx.tagName() == "ParagraphStyleRange")
@@ -3011,7 +3011,7 @@
}
else if (s.tagName() == "XMLElement")
{
- // for(QDomNode stx = s.firstChild(); !stx.isNull(); stx = stx.nextSibling() )
+ // for (QDomNode stx = s.firstChild(); !stx.isNull(); stx = stx.nextSibling())
// {
parseCharacterStyleRange(s, item, fontBase, fontStyle, newStyle, posC);
// }
Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&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 Fri Oct 5 21:39:19 2018
@@ -113,7 +113,7 @@
if (designMapDom.setContent(f))
{
QDomElement docElem = designMapDom.documentElement();
- for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
+ for (QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
{
if (drawPag.tagName() == "sl:slprint-info")
{
@@ -424,11 +424,11 @@
bool OdgPlug::parseStyleSheetsXML(QDomDocument &designMapDom)
{
QDomElement docElem = designMapDom.documentElement();
- for(QDomElement sp = docElem.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement() )
+ for (QDomElement sp = docElem.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement())
{
if (sp.tagName() == "office:font-face-decls")
{
- for(QDomElement spf = sp.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = sp.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "style:font-face")
{
@@ -442,7 +442,7 @@
if (sp.tagName() == "office:master-styles")
{
DrawStyle currStyle;
- for(QDomElement spf = sp.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = sp.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "style:master-page")
{
@@ -479,7 +479,7 @@
PageItem *retObj = m_Doc->Items->at(z);
finishItem(retObj, tmpBStyle);
}
- for(QDomElement spm = spf.firstChildElement(); !spm.isNull(); spm = spm.nextSiblingElement() )
+ for (QDomElement spm = spf.firstChildElement(); !spm.isNull(); spm = spm.nextSiblingElement())
{
PageItem* retObj = parseObj(spm);
if (retObj != nullptr)
@@ -493,7 +493,7 @@
{
if (importerFlags & LoadSavePlugin::lfCreateDoc)
{
- for(QDomElement spp = spf.firstChildElement(); !spp.isNull(); spp = spp.nextSiblingElement() )
+ for (QDomElement spp = spf.firstChildElement(); !spp.isNull(); spp = spp.nextSiblingElement())
{
if (spp.tagName() == "draw:layer")
{
@@ -551,11 +551,11 @@
bool OdgPlug::parseDocReferenceXML(QDomDocument &designMapDom)
{
QDomElement docElem = designMapDom.documentElement();
- for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
+ for (QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
{
if (drawPag.tagName() == "office:font-face-decls")
{
- for(QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
{
if (spf.tagName() == "style:font-face")
{
@@ -568,7 +568,7 @@
parseStyles(drawPag);
if (drawPag.tagName() == "office:master-styles")
{
- for(QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "style:master-page")
{
@@ -605,7 +605,7 @@
PageItem *retObj = m_Doc->Items->at(z);
finishItem(retObj, tmpBStyle);
}
- for(QDomElement spm = spf.firstChildElement(); !spm.isNull(); spm = spm.nextSiblingElement() )
+ for (QDomElement spm = spf.firstChildElement(); !spm.isNull(); spm = spm.nextSiblingElement())
{
PageItem* retObj = parseObj(spm);
if (retObj != nullptr)
@@ -619,7 +619,7 @@
{
if (importerFlags & LoadSavePlugin::lfCreateDoc)
{
- for(QDomElement spp = spf.firstChildElement(); !spp.isNull(); spp = spp.nextSiblingElement() )
+ for (QDomElement spp = spf.firstChildElement(); !spp.isNull(); spp = spp.nextSiblingElement())
{
if (spp.tagName() == "draw:layer")
{
@@ -651,11 +651,11 @@
}
else if (drawPag.tagName() == "office:body")
{
- for(QDomElement sp = drawPag.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement() )
+ for (QDomElement sp = drawPag.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement())
{
if ((sp.tagName() == "office:drawing") || (sp.tagName() == "office:presentation"))
{
- for(QDomElement spp = sp.firstChildElement(); !spp.isNull(); spp = spp.nextSiblingElement() )
+ for (QDomElement spp = sp.firstChildElement(); !spp.isNull(); spp = spp.nextSiblingElement())
{
if (spp.tagName() == "draw:page")
{
@@ -705,7 +705,7 @@
firstPage = false;
baseX = m_Doc->currentPage()->xOffset();
baseY = m_Doc->currentPage()->yOffset();
- for(QDomElement spe = spp.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spp.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
PageItem* retObj = parseObj(spe);
if (retObj != nullptr)
@@ -733,7 +733,7 @@
{
QList<PageItem*> GElements;
int gLayer = -1;
- for(QDomElement spd = draw.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement() )
+ for (QDomElement spd = draw.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement())
{
PageItem* ite = parseObj(spd);
if (ite != nullptr)
@@ -878,7 +878,7 @@
resovleStyle(tmpOStyle, "standard");
resovleStyle(tmpOStyle, getStyleName(e));
bool has_Text = false;
- for(QDomElement p = e.firstChildElement(); !p.isNull(); p = p.nextSiblingElement())
+ for (QDomElement p = e.firstChildElement(); !p.isNull(); p = p.nextSiblingElement())
{
if (p.tagName() == "text:p")
{
@@ -889,7 +889,7 @@
if ((tmpOStyle.fill_type == 0) && (tmpOStyle.stroke_type == 0) && (!has_Text))
return retObj;
QPolygonF texAreaPoints;
- for(QDomElement p = e.firstChildElement(); !p.isNull(); p = p.nextSiblingElement())
+ for (QDomElement p = e.firstChildElement(); !p.isNull(); p = p.nextSiblingElement())
{
if (p.tagName() == "draw:enhanced-geometry")
{
@@ -938,7 +938,7 @@
if (p.hasChildNodes())
{
QMap<QString, QString> formulaMap;
- for(QDomElement f = p.firstChildElement(); !f.isNull(); f = f.nextSiblingElement())
+ for (QDomElement f = p.firstChildElement(); !f.isNull(); f = f.nextSiblingElement())
{
if (f.tagName() == "draw:equation")
{
@@ -1595,7 +1595,7 @@
}
else if (n.hasChildNodes())
{
- for(QDomElement nc = n.firstChildElement(); !nc.isNull(); nc = nc.nextSiblingElement())
+ for (QDomElement nc = n.firstChildElement(); !nc.isNull(); nc = nc.nextSiblingElement())
{
if (nc.tagName() == "office:binary-data")
{
@@ -1690,7 +1690,7 @@
ObjStyle pStyle = tmpOStyle;
if (elem.hasAttribute("text:style-name"))
resovleStyle(pStyle, elem.attribute("text:style-name"));
- for(QDomElement para = elem.firstChildElement(); !para.isNull(); para = para.nextSiblingElement())
+ for (QDomElement para = elem.firstChildElement(); !para.isNull(); para = para.nextSiblingElement())
{
pStyle = tmpOStyle;
if ((para.tagName() != "text:p") && (para.tagName() != "text:list") && (para.tagName() != "text:h"))
@@ -1712,7 +1712,7 @@
}
else
{
- for(QDomNode spn = para.firstChild(); !spn.isNull(); spn = spn.nextSibling())
+ for (QDomNode spn = para.firstChild(); !spn.isNull(); spn = spn.nextSibling())
{
CharStyle tmpCStyle = tmpStyle.charStyle();
QDomElement sp = spn.toElement();
@@ -1748,14 +1748,14 @@
}
else if (sp.tagName() == "text:list-item")
{
- for(QDomElement paral = sp.firstChildElement(); !paral.isNull(); paral = paral.nextSiblingElement())
+ for (QDomElement paral = sp.firstChildElement(); !paral.isNull(); paral = paral.nextSiblingElement())
{
ObjStyle plStyle = tmpOStyle;
if (paral.hasAttribute("text:style-name"))
resovleStyle(plStyle, paral.attribute("text:style-name"));
ParagraphStyle tmpStyle = newStyle;
applyParagraphStyle(tmpStyle, plStyle);
- for(QDomNode spnl = paral.firstChild(); !spnl.isNull(); spnl = spnl.nextSibling())
+ for (QDomNode spnl = paral.firstChild(); !spnl.isNull(); spnl = spnl.nextSibling())
{
CharStyle tmpCStyle = tmpStyle.charStyle();
QDomElement spl = spnl.toElement();
@@ -2030,7 +2030,7 @@
QStringList ptList = object.attribute( "draw:points" ).split( ' ', QString::SkipEmptyParts );
FPoint point, firstP;
bool bFirst = true;
- for( QStringList::Iterator it = ptList.begin(); it != ptList.end(); ++it )
+ for ( QStringList::Iterator it = ptList.begin(); it != ptList.end(); ++it)
{
point = FPoint(ScCLocale::toDoubleC((*it).section( ',', 0, 0 )), ScCLocale::toDoubleC((*it).section( ',', 1, 1 )));
if (bFirst)
@@ -2061,7 +2061,7 @@
void OdgPlug::parseStyles(QDomElement &sp)
{
- for(QDomElement spd = sp.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement() )
+ for (QDomElement spd = sp.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement())
{
if (spd.tagName() == "draw:marker")
{
@@ -2149,7 +2149,7 @@
{
if (spd.hasChildNodes())
{
- for(QDomElement nc = spd.firstChildElement(); !nc.isNull(); nc = nc.nextSiblingElement())
+ for (QDomElement nc = spd.firstChildElement(); !nc.isNull(); nc = nc.nextSiblingElement())
{
if (nc.tagName() == "office:binary-data")
currStyle.patternData = AttributeValue(nc.text());
@@ -2166,7 +2166,7 @@
else if (spd.tagName() == "style:style")
{
DrawStyle currStyle;
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "style:graphic-properties")
{
@@ -2245,7 +2245,7 @@
else if (spd.tagName() == "style:page-layout")
{
DrawStyle currStyle;
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "style:page-layout-properties")
{
Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&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 Fri Oct 5 21:39:19 2018
@@ -1864,7 +1864,7 @@
else if (th_arc > 0 && !sweepFlag)
th_arc -= 2 * M_PI;
n_segs = static_cast<int>(ceil(fabs(th_arc / (M_PI * 0.5 + 0.001))));
- for(i = 0; i < n_segs; i++)
+ for (i = 0; i < n_segs; i++)
{
{
double sin_th, cos_th;
Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpages.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpages.cpp Fri Oct 5 21:39:19 2018
@@ -519,7 +519,7 @@
if (designMapDom.setContent(f))
{
QDomElement docElem = designMapDom.documentElement();
- for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
+ for (QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
{
if (drawPag.tagName() == "sl:slprint-info")
{
@@ -869,13 +869,13 @@
}
papersize = "Custom";
QDomElement docElem = designMapDom.documentElement();
- for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
+ for (QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
{
if (drawPag.tagName() == "sl:slprint-info")
{
docWidth = drawPag.attribute("sl:page-width", "0").toDouble();
docHeight = drawPag.attribute("sl:page-height", "0").toDouble();
- for(QDomElement sp = drawPag.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement() )
+ for (QDomElement sp = drawPag.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement())
{
if (sp.tagName() == "sf:page-margins")
{
@@ -907,7 +907,7 @@
}
else if (drawPag.tagName() == "sl:section-prototypes")
{
- for(QDomElement sp = drawPag.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement() )
+ for (QDomElement sp = drawPag.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement())
{
if (sp.tagName() == "sl:prototype")
{
@@ -925,7 +925,7 @@
baseX = addedPage->xOffset();
baseY = addedPage->yOffset();
mpagecount++;
- for(QDomElement spd = sp.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement() )
+ for (QDomElement spd = sp.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement())
{
if (spd.tagName() == "sl:stylesheet")
{
@@ -934,7 +934,7 @@
}
else if (spd.tagName() == "sl:drawables")
{
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "sl:page-group")
parsePageReference(spe);
@@ -955,7 +955,7 @@
}
else if (drawPag.tagName() == "sl:drawables")
{
- for(QDomElement sp = drawPag.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement() )
+ for (QDomElement sp = drawPag.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement())
{
if (sp.tagName() == "sl:page-group")
{
@@ -1007,7 +1007,7 @@
}
else if (drawPag.tagName() == "sf:text-storage")
{
- for(QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = drawPag.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "sf:stylesheet-ref")
{
@@ -1029,7 +1029,7 @@
newStyle.setLineSpacingMode(ParagraphStyle::FixedLineSpacing);
newStyle.setLineSpacing(nstyle.fontSize() / 10.0);
itemText.setDefaultStyle(newStyle);
- for(QDomElement spg = spf.firstChildElement(); !spg.isNull(); spg = spg.nextSiblingElement() )
+ for (QDomElement spg = spf.firstChildElement(); !spg.isNull(); spg = spg.nextSiblingElement())
{
// if (spg.tagName() == "sf:container-hint")
// {
@@ -1055,7 +1055,7 @@
int totalCount = 0;
if (spg.hasChildNodes())
{
- for(QDomElement sph = spg.firstChildElement(); !sph.isNull(); sph = sph.nextSiblingElement() )
+ for (QDomElement sph = spg.firstChildElement(); !sph.isNull(); sph = sph.nextSiblingElement())
{
totalCount += sph.text().length();
// if (sph.tagName() == "sf:container-hint")
@@ -1076,7 +1076,7 @@
}
if (spg.hasChildNodes())
{
- for(QDomElement sph = spg.firstChildElement(); !sph.isNull(); sph = sph.nextSiblingElement() )
+ for (QDomElement sph = spg.firstChildElement(); !sph.isNull(); sph = sph.nextSiblingElement())
{
if (sph.tagName() == "sf:span")
{
@@ -1109,20 +1109,20 @@
{
QString sheetName = drawPag.attribute("sfa:ID");
StyleSheet styleSH;
- for(QDomElement sp = drawPag.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement() )
+ for (QDomElement sp = drawPag.firstChildElement(); !sp.isNull(); sp = sp.nextSiblingElement())
{
if ((sp.tagName() == "sf:styles") || (sp.tagName() == "sf:anon-styles"))
{
- for(QDomElement spd = sp.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement() )
+ for (QDomElement spd = sp.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement())
{
if (spd.tagName() == "sf:characterstyle")
{
ChrStyle currStyle;
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "sf:property-map")
{
- for(QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "sf:fontSize")
{
@@ -1218,11 +1218,11 @@
if (spd.tagName() == "sf:paragraphstyle")
{
ParStyle currStyle;
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "sf:property-map")
{
- for(QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "sf:fontSize")
{
@@ -1327,11 +1327,11 @@
else if (spd.tagName() == "sf:layoutstyle")
{
LayoutStyle currStyle;
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "sf:property-map")
{
- for(QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "sf:padding")
{
@@ -1365,11 +1365,11 @@
else if (spd.tagName() == "sf:graphic-style")
{
ObjStyle currStyle;
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "sf:property-map")
{
- for(QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "sf:stroke")
{
@@ -1535,7 +1535,7 @@
void PagesPlug::parsePageReference(QDomElement &drawPag)
{
- for(QDomElement draw = drawPag.firstChildElement(); !draw.isNull(); draw = draw.nextSiblingElement() )
+ for (QDomElement draw = drawPag.firstChildElement(); !draw.isNull(); draw = draw.nextSiblingElement())
{
PageItem* retObj = parseObjReference(draw);
if (retObj != nullptr)
@@ -1585,12 +1585,12 @@
if (draw.tagName() == "sf:group")
{
QList<PageItem*> GElements;
- for(QDomElement spd = draw.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement() )
+ for (QDomElement spd = draw.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement())
{
if (spd.tagName() == "sf:geometry")
{
obState.rotation = spd.attribute("sf:angle", "0").toDouble();
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "sf:position")
{
@@ -1647,12 +1647,12 @@
}
else if ((draw.tagName() == "sf:media") || (draw.tagName() == "sf:drawable-shape"))
{
- for(QDomElement spd = draw.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement() )
+ for (QDomElement spd = draw.firstChildElement(); !spd.isNull(); spd = spd.nextSiblingElement())
{
if (spd.tagName() == "sf:geometry")
{
obState.rotation = spd.attribute("sf:angle", "0").toDouble();
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "sf:position")
{
@@ -1668,7 +1668,7 @@
}
else if (spd.tagName() == "sf:style")
{
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "sf:graphic-style-ref")
{
@@ -1678,11 +1678,11 @@
}
else if (spd.tagName() == "sf:path")
{
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if ((spe.tagName() == "sf:bezier-path") || (spe.tagName() == "sf:editable-bezier-path"))
{
- for(QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "sf:bezier")
{
@@ -1701,7 +1701,7 @@
}
else if (spd.tagName() == "sf:wrap")
{
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "sf:path")
{
@@ -1718,19 +1718,19 @@
}
else if (spd.tagName() == "sf:content")
{
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "sf:image-media")
{
- for(QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "sf:filtered-image")
{
- for(QDomElement spg = spf.firstChildElement(); !spg.isNull(); spg = spg.nextSiblingElement() )
+ for (QDomElement spg = spf.firstChildElement(); !spg.isNull(); spg = spg.nextSiblingElement())
{
if (spg.tagName() == "sf:unfiltered")
{
- for(QDomElement sph = spg.firstChildElement(); !sph.isNull(); sph = sph.nextSiblingElement() )
+ for (QDomElement sph = spg.firstChildElement(); !sph.isNull(); sph = sph.nextSiblingElement())
{
if (sph.tagName() == "sf:data")
{
@@ -1747,11 +1747,11 @@
else if (spd.tagName() == "sf:text")
{
obState.layoutStyleRef = spd.attribute("sf:layoutstyle");
- for(QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement() )
+ for (QDomElement spe = spd.firstChildElement(); !spe.isNull(); spe = spe.nextSiblingElement())
{
if (spe.tagName() == "sf:text-storage")
{
- for(QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement() )
+ for (QDomElement spf = spe.firstChildElement(); !spf.isNull(); spf = spf.nextSiblingElement())
{
if (spf.tagName() == "sf:text-body")
{
@@ -1765,7 +1765,7 @@
newStyle.setLineSpacingMode(ParagraphStyle::FixedLineSpacing);
newStyle.setLineSpacing(nstyle.fontSize() / 10.0);
itemText.setDefaultStyle(newStyle);
- for(QDomElement spg = spf.firstChildElement(); !spg.isNull(); spg = spg.nextSiblingElement() )
+ for (QDomElement spg = spf.firstChildElement(); !spg.isNull(); spg = spg.nextSiblingElement())
{
if (spg.tagName() == "sf:p")
{
@@ -1786,7 +1786,7 @@
int totalCount = 0;
if (spg.hasChildNodes())
{
- for(QDomElement sph = spg.firstChildElement(); !sph.isNull(); sph = sph.nextSiblingElement() )
+ for (QDomElement sph = spg.firstChildElement(); !sph.isNull(); sph = sph.nextSiblingElement())
{
totalCount += sph.text().length();
}
@@ -1803,7 +1803,7 @@
}
if (spg.hasChildNodes())
{
- for(QDomElement sph = spg.firstChildElement(); !sph.isNull(); sph = sph.nextSiblingElement() )
+ for (QDomElement sph = spg.firstChildElement(); !sph.isNull(); sph = sph.nextSiblingElement())
{
if (sph.tagName() == "sf:span")
{
Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpct.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpct.cpp Fri Oct 5 21:39:19 2018
@@ -1206,7 +1206,7 @@
Coords.svgInit();
PageItem *ite;
Coords.svgMoveTo(x * resX, y * resY);
- for(unsigned i = 0; i < polySize; i += 4)
+ for (unsigned i = 0; i < polySize; i += 4)
{
ts >> y >> x;
Coords.svgLineTo(x * resX, y * resX);
Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&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 Fri Oct 5 21:39:19 2018
@@ -914,7 +914,7 @@
Coords.svgInit();
PageItem *ite;
Coords.svgMoveTo(valueAsPoint(vertices[0]["svg:x"]), valueAsPoint(vertices[0]["svg:y"]));
- for(unsigned i = 1; i < vertices.count(); i++)
+ for (unsigned i = 1; i < vertices.count(); i++)
{
Coords.svgLineTo(valueAsPoint(vertices[i]["svg:x"]), valueAsPoint(vertices[i]["svg:y"]));
}
@@ -941,7 +941,7 @@
Coords.svgInit();
PageItem *ite=nullptr;
Coords.svgMoveTo(valueAsPoint(vertices[0]["svg:x"]), valueAsPoint(vertices[0]["svg:y"]));
- for(unsigned i = 1; i < vertices.count(); i++)
+ for (unsigned i = 1; i < vertices.count(); i++)
{
Coords.svgLineTo(valueAsPoint(vertices[i]["svg:x"]), valueAsPoint(vertices[i]["svg:y"]));
}
@@ -1076,7 +1076,7 @@
librevenge::RVNGPropertyListVector path = *propList.child("svg:d");
bool isClosed = false;
QString svgString;
- for(unsigned i=0; i < path.count(); i++)
+ for (unsigned i=0; i < path.count(); i++)
{
librevenge::RVNGPropertyList pList = path[i];
if (pList["librevenge:path-action"] && pList["librevenge:path-action"]->getStr() == "M")
@@ -1884,7 +1884,7 @@
ite->setDiamondGeometry(FPoint(0, 0), FPoint(ite->width(), 0), FPoint(ite->width(), ite->height()), FPoint(0, ite->height()), cp);
ite->fill_gradient.clearStops();
QList<VColorStop*> colorStops = currentGradient.colorStops();
- for( int a = 0; a < colorStops.count() ; a++ )
+ for (int a = 0; a < colorStops.count() ; a++)
{
ite->fill_gradient.addStop(colorStops[a]->color, 1.0 - colorStops[a]->rampPoint, colorStops[a]->midPoint, colorStops[a]->opacity, colorStops[a]->name, colorStops[a]->shade);
}
@@ -1907,7 +1907,7 @@
ite->setDiamondGeometry(FPoint(0, 0), FPoint(ite->width(), 0), FPoint(ite->width(), ite->height()), FPoint(0, ite->height()), cp);
ite->fill_gradient.clearStops();
QList<VColorStop*> colorStops = currentGradient.colorStops();
- for( int a = 0; a < colorStops.count() ; a++ )
+ for (int a = 0; a < colorStops.count() ; a++)
{
ite->fill_gradient.addStop(colorStops[a]->color, 1.0 - colorStops[a]->rampPoint, colorStops[a]->midPoint, colorStops[a]->opacity, colorStops[a]->name, colorStops[a]->shade);
}
@@ -2592,7 +2592,7 @@
Coords.svgInit();
PageItem *ite;
Coords.svgMoveTo(valueAsPoint(vertices[0]["svg:x"]), valueAsPoint(vertices[0]["svg:y"]));
- for(unsigned i = 1; i < vertices.count(); i++)
+ for (unsigned i = 1; i < vertices.count(); i++)
{
Coords.svgLineTo(valueAsPoint(vertices[i]["svg:x"]), valueAsPoint(vertices[i]["svg:y"]));
}
@@ -2615,7 +2615,7 @@
Coords.resize(0);
Coords.svgInit();
Coords.svgMoveTo(valueAsPoint(vertices[0]["svg:x"]), valueAsPoint(vertices[0]["svg:y"]));
- for(unsigned i = 1; i < vertices.count(); i++)
+ for (unsigned i = 1; i < vertices.count(); i++)
{
Coords.svgLineTo(valueAsPoint(vertices[i]["svg:x"]), valueAsPoint(vertices[i]["svg:y"]));
}
@@ -2746,7 +2746,7 @@
return;
bool isClosed = false;
QString svgString;
- for(unsigned i=0; i < path.count(); i++)
+ for (unsigned i=0; i < path.count(); i++)
{
WPXPropertyList propList = path[i];
if (propList["libwpg:path-action"] && propList["libwpg:path-action"]->getStr() == "M")
@@ -3289,7 +3289,7 @@
ite->setDiamondGeometry(FPoint(0, 0), FPoint(ite->width(), 0), FPoint(ite->width(), ite->height()), FPoint(0, ite->height()), cp);
ite->fill_gradient.clearStops();
QList<VColorStop*> colorStops = currentGradient.colorStops();
- for( int a = 0; a < colorStops.count() ; a++ )
+ for (int a = 0; a < colorStops.count() ; a++)
{
ite->fill_gradient.addStop(colorStops[a]->color, 1.0 - colorStops[a]->rampPoint, colorStops[a]->midPoint, colorStops[a]->opacity, colorStops[a]->name, colorStops[a]->shade);
}
@@ -3312,7 +3312,7 @@
ite->setDiamondGeometry(FPoint(0, 0), FPoint(ite->width(), 0), FPoint(ite->width(), ite->height()), FPoint(0, ite->height()), cp);
ite->fill_gradient.clearStops();
QList<VColorStop*> colorStops = currentGradient.colorStops();
- for( int a = 0; a < colorStops.count() ; a++ )
+ for(int a = 0; a < colorStops.count() ; a++)
{
ite->fill_gradient.addStop(colorStops[a]->color, 1.0 - colorStops[a]->rampPoint, colorStops[a]->midPoint, colorStops[a]->opacity, colorStops[a]->name, colorStops[a]->shade);
}
Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&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 Fri Oct 5 21:39:19 2018
@@ -432,7 +432,7 @@
if (style.isEmpty())
style = pg.attribute( "svg:style", "" ).simplified();
QStringList substyles = style.split(';', QString::SkipEmptyParts);
- for( QStringList::Iterator it = substyles.begin(); it != substyles.end(); ++it )
+ for (QStringList::Iterator it = substyles.begin(); it != substyles.end(); ++it)
{
QStringList substyle = (*it).split(':', QString::SkipEmptyParts);
QString command(substyle[0].trimmed());
@@ -528,7 +528,7 @@
QString points = pg.attribute( "points" ).simplified().replace(',', " ");
QStringList pointList = points.split(' ', QString::SkipEmptyParts);
FirstM = true;
- for( QStringList::Iterator it = pointList.begin(); it != pointList.end(); it++ )
+ for (QStringList::Iterator it = pointList.begin(); it != pointList.end(); it++)
{
x = ScCLocale::toDoubleC(*(it++));
y = ScCLocale::toDoubleC(*it);
@@ -703,7 +703,7 @@
QString points = pg.attribute( "points" ).simplified().replace(',', " ");
QStringList pointList = points.split(' ', QString::SkipEmptyParts);
FirstM = true;
- for( QStringList::Iterator it1 = pointList.begin(); it1 != pointList.end(); it1++ )
+ for (QStringList::Iterator it1 = pointList.begin(); it1 != pointList.end(); it1++)
{
x = ScCLocale::toDoubleC(*(it1++));
y = ScCLocale::toDoubleC(*it1);
Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&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 Fri Oct 5 21:39:19 2018
@@ -1130,7 +1130,7 @@
{
QString style = e.attribute( "style" ).simplified();
QStringList substyles = style.split(';', QString::SkipEmptyParts);
- for( QStringList::Iterator it = substyles.begin(); it != substyles.end(); ++it )
+ for (QStringList::Iterator it = substyles.begin(); it != substyles.end(); ++it)
{
QStringList substyle = (*it).split(':', QString::SkipEmptyParts);
QString command(substyle[0].trimmed());
@@ -1732,7 +1732,7 @@
bool bFirst = true;
double x = 0.0;
double y = 0.0;
- for( QStringList::Iterator it = pointList.begin(); it != pointList.end(); it++ )
+ for (QStringList::Iterator it = pointList.begin(); it != pointList.end(); it++)
{
x = ScCLocale::toDoubleC(*(it++));
y = ScCLocale::toDoubleC(*it);
@@ -1806,7 +1806,7 @@
SvgStyle *gc = m_gc.top();
if (gc->textAnchor != "start")
getTextChunkWidth(e, chunkWidth);
- for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
+ for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
{
if (n.isElement())
{
@@ -1844,7 +1844,7 @@
chunkW = 0;
getTextChunkWidth(e, chunkW);
}
- for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
+ for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
{
if (n.isElement() && (parseTagName(n.toElement()) == "tspan"))
{
@@ -2087,7 +2087,7 @@
bool doBreak = false;
setupNode(e);
QDomNode c = e.firstChild();
- for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
+ for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
{
if (n.isElement() && (parseTagName(n.toElement()) == "tspan"))
{
@@ -2712,7 +2712,7 @@
QStringList dashes = params2.split(' ', QString::SkipEmptyParts);
if ((dashes.count() > 0) && (parseUnit(dashes[0]) != 0.0))
{
- for( QStringList::Iterator it = dashes.begin(); it != dashes.end(); ++it )
+ for (QStringList::Iterator it = dashes.begin(); it != dashes.end(); ++it)
array.append( parseUnit(*it) );
}
}
@@ -2844,7 +2844,7 @@
parsePA(obj, "marker-start", e.attribute( "marker-start" ));
QString style = e.attribute( "style" ).simplified();
QStringList substyles = style.split(';', QString::SkipEmptyParts);
- for( QStringList::Iterator it = substyles.begin(); it != substyles.end(); ++it )
+ for (QStringList::Iterator it = substyles.begin(); it != substyles.end(); ++it)
{
QStringList substyle = it->split(':', QString::SkipEmptyParts);
if (substyle.count() >= 2)
@@ -2863,7 +2863,7 @@
double opa;
SvgStyle svgStyle;
parseStyle( &svgStyle, e );
- for(QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
+ for (QDomNode n = e.firstChild(); !n.isNull(); n = n.nextSibling())
{
opa = 1.0;
QDomElement stop = n.toElement();
@@ -2890,7 +2890,7 @@
{
QString style = stop.attribute( "style" ).simplified();
QStringList substyles = style.split(';', QString::SkipEmptyParts);
- for( QStringList::Iterator it = substyles.begin(); it != substyles.end(); ++it )
+ for (QStringList::Iterator it = substyles.begin(); it != substyles.end(); ++it)
{
QStringList substyle = it->split(':', QString::SkipEmptyParts);
if (substyle.count() >= 2)
Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importviva.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/viva/importviva.cpp Fri Oct 5 21:39:19 2018
@@ -394,7 +394,7 @@
if (designMapDom.setContent(f))
{
QDomElement docElem = designMapDom.documentElement();
- for(QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
+ for (QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling())
{
QDomElement dpg = drawPag.toElement();
if (dpg.tagName() == "vd:settings")
@@ -600,7 +600,7 @@
grTyp = 10;
VGradient currentGradient = VGradient(VGradient::linear);
currentGradient.clearStops();
- for(QDomNode gr = e.firstChild(); !gr.isNull(); gr = gr.nextSibling() )
+ for (QDomNode gr = e.firstChild(); !gr.isNull(); gr = gr.nextSibling())
{
QDomElement grs = gr.toElement();
if ((grs.tagName() == "vc:firstColor") || (grs.tagName() == "vc:secondColor"))
@@ -649,7 +649,7 @@
QDomElement e = n.toElement();
if (e.tagName() == "vd:text")
{
- for(QDomNode spo = e.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = e.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "vd:superscriptVerticalOffset")
@@ -742,7 +742,7 @@
baseX = addedPage->xOffset();
baseY = addedPage->yOffset();
mpagecount++;
- for(QDomNode spo = e.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = e.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "vo:object")
@@ -788,12 +788,12 @@
}
baseX = m_Doc->currentPage()->xOffset();
baseY = m_Doc->currentPage()->yOffset();
- for(QDomNode sp = e.firstChild(); !sp.isNull(); sp = sp.nextSibling() )
+ for (QDomNode sp = e.firstChild(); !sp.isNull(); sp = sp.nextSibling())
{
QDomElement spe = sp.toElement();
if (spe.tagName() == "vd:content")
{
- for(QDomNode spo = spe.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = spe.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "vo:object")
@@ -847,14 +847,14 @@
if (storyMap.isEmpty())
return;
QDomElement eo = obNode.toElement();
- for(QDomNode ob = eo.firstChild(); !ob.isNull(); ob = ob.nextSibling() )
+ for (QDomNode ob = eo.firstChild(); !ob.isNull(); ob = ob.nextSibling())
{
QDomElement obe = ob.toElement();
if (obe.tagName() == "vd:sequence")
{
QList<PageItem*> GElements;
GElements.clear();
- for(QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling() )
+ for (QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling())
{
QDomElement eog = obg.toElement();
if (eog.tagName() == "vd:object")
@@ -885,7 +885,7 @@
PageItem *retObj = nullptr;
QDomElement eo = obNode.toElement();
QString id = eo.attribute("vo:id");
- for(QDomNode ob = eo.firstChild(); !ob.isNull(); ob = ob.nextSibling() )
+ for (QDomNode ob = eo.firstChild(); !ob.isNull(); ob = ob.nextSibling())
{
QDomElement obe = ob.toElement();
if (obe.tagName() == "vo:groupObject")
@@ -893,7 +893,7 @@
QList<PageItem*> GElements;
double ob_xpos = 0;
double ob_ypos = 0;
- for(QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling() )
+ for (QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling())
{
QDomElement eog = obg.toElement();
if (eog.tagName() == "vo:object")
@@ -904,7 +904,7 @@
}
else if (eog.tagName() == "vo:transformation")
{
- for(QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "vo:translationX")
@@ -1027,7 +1027,7 @@
StoryText itemText;
itemText.clear();
PageItem::TextFlowMode textFlow = PageItem::TextFlowDisabled;
- for(QDomNode ob = eo.firstChild(); !ob.isNull(); ob = ob.nextSibling() )
+ for (QDomNode ob = eo.firstChild(); !ob.isNull(); ob = ob.nextSibling())
{
QDomElement obe = ob.toElement();
if ((obe.tagName() == "vo:rectangle") || (obe.tagName() == "vo:oval") || (obe.tagName() == "vo:polygon") || (obe.tagName() == "vo:line") || (obe.tagName() == "vo:polyline"))
@@ -1042,12 +1042,12 @@
ob_type = 3;
if (obe.tagName() == "vo:polyline")
ob_type = 4;
- for(QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling() )
+ for (QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling())
{
QDomElement eog = obg.toElement();
if (eog.tagName() == "vo:size")
{
- for(QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "vo:width")
@@ -1058,7 +1058,7 @@
}
else if (eog.tagName() == "vo:transformation")
{
- for(QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "vo:translationX")
@@ -1071,7 +1071,7 @@
}
else if (eog.tagName() == "vo:design")
{
- for(QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "vo:lineColor")
@@ -1192,7 +1192,7 @@
bool hasAfter = false;
triplePoint triPoint;
QList<triplePoint> tPoints;
- for(QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "vo:point")
@@ -1271,7 +1271,7 @@
hasShadow = true;
double shadowAngle = 0;
double shadowOffset = 0;
- for(QDomElement spo = eog.firstChildElement(); !spo.isNull(); spo = spo.nextSiblingElement() )
+ for (QDomElement spo = eog.firstChildElement(); !spo.isNull(); spo = spo.nextSiblingElement())
{
if (spo.tagName() == "uni:color")
shadowColor = colorTranslate[spo.text()];
@@ -1313,7 +1313,7 @@
}
else if (obe.tagName() == "vo:properties")
{
- for(QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling() )
+ for (QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling())
{
QDomElement eog = obg.toElement();
if (eog.tagName() == "vo:printable")
@@ -1329,7 +1329,7 @@
if ((obe.attribute("vo:mode") == "all") || (obe.attribute("vo:mode") == "left") || (obe.attribute("vo:mode") == "right"))
{
textFlow = PageItem::TextFlowUsesFrameShape;
- for(QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling() )
+ for (QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling())
{
QDomElement eog = obg.toElement();
if (eog.tagName() == "vo:shape")
@@ -1347,7 +1347,7 @@
}
else if (obe.tagName() == "vo:content")
{
- for(QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling() )
+ for (QDomNode obg = obe.firstChild(); !obg.isNull(); obg = obg.nextSibling())
{
QDomElement eog = obg.toElement();
if (eog.tagName() == "vo:filePath")
@@ -1377,7 +1377,7 @@
}
else if (eog.tagName() == "vo:transformation")
{
- for(QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "vo:translationX")
@@ -1394,12 +1394,12 @@
imageData = QByteArray::fromBase64(eog.text().toLatin1());
else if (eog.tagName() == "vo:areaStructure")
{
- for(QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = eog.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "uni:indents")
{
- for(QDomNode stx = eo.firstChild(); !stx.isNull(); stx = stx.nextSibling() )
+ for (QDomNode stx = eo.firstChild(); !stx.isNull(); stx = stx.nextSibling())
{
QDomElement stxe = stx.toElement();
if (stxe.tagName() == "uni:left")
@@ -1414,7 +1414,7 @@
}
else if (eo.tagName() == "uni:columns")
{
- for(QDomNode stx = eo.firstChild(); !stx.isNull(); stx = stx.nextSibling() )
+ for (QDomNode stx = eo.firstChild(); !stx.isNull(); stx = stx.nextSibling())
{
QDomElement stxe = stx.toElement();
if (stxe.tagName() == "uni:distance")
@@ -1701,7 +1701,7 @@
newStyle.setLineSpacing(nstyle.fontSize() / 10.0);
itemText.setDefaultStyle(newStyle);
int posC = 0;
- for(QDomNode spo = obNode.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = obNode.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "vs:stylesheets")
@@ -1715,12 +1715,12 @@
applyParagraphAttrs(newStyle, AttributeSets[eo.attribute("vt:story-attribute-set")]);
applyCharacterAttrs(newStyle.charStyle(), newStyle, AttributeSets[eo.attribute("vt:story-attribute-set")]);
}
- for(QDomNode stx = eo.firstChild(); !stx.isNull(); stx = stx.nextSibling() )
+ for (QDomNode stx = eo.firstChild(); !stx.isNull(); stx = stx.nextSibling())
{
QDomElement stxe = stx.toElement();
if (stxe.tagName() == "vt:chapter")
{
- for(QDomNode st = stxe.firstChild(); !st.isNull(); st = st.nextSibling() )
+ for (QDomNode st = stxe.firstChild(); !st.isNull(); st = st.nextSibling())
{
QDomElement ste = st.toElement();
if (ste.tagName() == "vt:layout")
@@ -1733,7 +1733,7 @@
if (attrs.columnGutter.valid)
textColumnGap = attrs.columnGutter.value.toDouble();
}
- for(QDomNode stc = ste.firstChild(); !stc.isNull(); stc = stc.nextSibling() )
+ for (QDomNode stc = ste.firstChild(); !stc.isNull(); stc = stc.nextSibling())
{
QDomElement stce = stc.toElement();
if (stce.tagName() == "vt:p")
@@ -1746,7 +1746,7 @@
else if (m_Doc->styleExists(stce.attribute("vt:paragraph-attribute-set")))
tmpStyle = m_Doc->paragraphStyle(stce.attribute("vt:paragraph-attribute-set"));
}
- for(QDomNode stces = stce.firstChild(); !stces.isNull(); stces = stces.nextSibling() )
+ for (QDomNode stces = stce.firstChild(); !stces.isNull(); stces = stces.nextSibling())
{
QDomElement stcet = stces.toElement();
if (stcet.tagName() == "vt:span")
@@ -1754,7 +1754,7 @@
CharStyle tmpCStyle = tmpStyle.charStyle();
if (stcet.hasAttribute("vt:character-attribute-set"))
applyCharacterAttrs(tmpCStyle, tmpStyle, AttributeSets[stcet.attribute("vt:character-attribute-set")]);
- for(QDomNode stcesp = stcet.firstChild(); !stcesp.isNull(); stcesp = stcesp.nextSibling() )
+ for (QDomNode stcesp = stcet.firstChild(); !stcesp.isNull(); stcesp = stcesp.nextSibling())
{
QDomElement stcespt = stcesp.toElement();
int count = stcespt.text().length();
@@ -1811,7 +1811,7 @@
}
else if (stcespt.tagName() == "vt:anchoring-object")
{
- for(QDomNode anc = stcespt.firstChild(); !anc.isNull(); anc = anc.nextSibling() )
+ for (QDomNode anc = stcespt.firstChild(); !anc.isNull(); anc = anc.nextSibling())
{
QDomElement anco = anc.toElement();
if (anco.tagName() == "vo:object")
@@ -1869,7 +1869,7 @@
{
if (obNode.tagName() == "vs:template")
attrs.parentStyle = obNode.text();
- for(QDomNode stx = obNode.firstChild(); !stx.isNull(); stx = stx.nextSibling() )
+ for (QDomNode stx = obNode.firstChild(); !stx.isNull(); stx = stx.nextSibling())
{
QDomElement stxe = stx.toElement();
if (stxe.tagName() == "vta:font")
@@ -2004,7 +2004,7 @@
{
int columnCount = 0;
double columnGutter = 0.0;
- for(QDomNode stc = stxe.firstChild(); !stc.isNull(); stc = stc.nextSibling() )
+ for (QDomNode stc = stxe.firstChild(); !stc.isNull(); stc = stc.nextSibling())
{
QDomElement stce = stc.toElement();
if (stce.tagName() == "vta:column")
@@ -2025,7 +2025,7 @@
{
attrs.dropCaps = AttributeValue("true");
attrs.dropCapsDist = AttributeValue(stxe.attribute("vta:distance-to-text", "0"));
- for(QDomNode stc = stxe.firstChild(); !stc.isNull(); stc = stc.nextSibling() )
+ for (QDomNode stc = stxe.firstChild(); !stc.isNull(); stc = stc.nextSibling())
{
QDomElement stce = stc.toElement();
if (stce.tagName() == "vta:size")
@@ -2046,7 +2046,7 @@
else if (stxe.tagName() == "vta:tabulators")
{
QString tabs = "";
- for(QDomNode stc = stxe.firstChild(); !stc.isNull(); stc = stc.nextSibling() )
+ for (QDomNode stc = stxe.firstChild(); !stc.isNull(); stc = stc.nextSibling())
{
QDomElement stce = stc.toElement();
if (stce.tagName() == "vta:tabulator")
@@ -2071,7 +2071,7 @@
void VivaPlug::parseAttributeSetsXML(const QDomElement& obNode)
{
- for(QDomNode spo = obNode.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = obNode.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
AttributeSet attrs;
@@ -2084,7 +2084,7 @@
void VivaPlug::parseStylesheetsXML(const QDomElement& obNode)
{
- for(QDomNode spo = obNode.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = obNode.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "vs:paragraphStylesheet")
@@ -2099,7 +2099,7 @@
newStyle.setLineSpacingMode(ParagraphStyle::FixedLineSpacing);
newStyle.setLineSpacing(nstyle.fontSize() / 10.0);
AttributeSet attrs;
- for(QDomNode stx = eo.firstChild(); !stx.isNull(); stx = stx.nextSibling() )
+ for (QDomNode stx = eo.firstChild(); !stx.isNull(); stx = stx.nextSibling())
{
QDomElement stxe = stx.toElement();
parseAttributeSetXML(stxe, attrs);
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Fri Oct 5 21:39:19 2018
@@ -1436,7 +1436,7 @@
// Start with the first word
wResult = *( lpWord = ( WORD16* )( apmfh ) );
// XOR in each of the other 9 words
- for( i=1; i<=9; i++ )
+ for (i = 1; i <= 9; i++)
{
wResult ^= lpWord[ i ];
}
Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp Fri Oct 5 21:39:19 2018
@@ -130,7 +130,7 @@
if (!pen.solid)
{
dashArray.clear();
- for(unsigned i = 0; i < pen.dashArray.count(); i++)
+ for (unsigned i = 0; i < pen.dashArray.count(); i++)
{
dashArray.append(pen.dashArray.at(i)*LineW);
}
@@ -196,7 +196,7 @@
isGradient = true;
currentGradient = VGradient(VGradient::linear);
currentGradient.clearStops();
- for(unsigned c = 0; c < brush.gradient.count(); c++)
+ for (unsigned c = 0; c < brush.gradient.count(); c++)
{
QString currStopColor = CommonStrings::None;
Rc = brush.gradient.stopColor(c).red;
@@ -267,7 +267,7 @@
Coords.svgInit();
PageItem *ite;
Coords.svgMoveTo(72 * vertices[0].x, 72 * vertices[0].y);
- for(unsigned i = 1; i < vertices.count(); i++)
+ for (unsigned i = 1; i < vertices.count(); i++)
{
Coords.svgLineTo(72 * vertices[i].x, 72 * vertices[i].y);
}
@@ -293,7 +293,7 @@
Coords.resize(0);
Coords.svgInit();
PageItem *ite;
- for(unsigned i = 0; i < path.count(); i++)
+ for (unsigned i = 0; i < path.count(); i++)
{
libwpg::WPGPathElement element = path.element(i);
libwpg::WPGPoint point = element.point;
@@ -382,9 +382,9 @@
void ScrPainter::drawBitmap(const libwpg::WPGBitmap& bitmap, double hres, double vres)
{
QImage image = QImage(bitmap.width(), bitmap.height(), QImage::Format_RGB32);
- for(int x = 0; x < bitmap.width(); x++)
- {
- for(int y = 0; y < bitmap.height(); y++)
+ for (int x = 0; x < bitmap.width(); x++)
+ {
+ for (int y = 0; y < bitmap.height(); y++)
{
libwpg::WPGColor color = bitmap.pixel(x, y);
image.setPixel(x, y, qRgb(color.red, color.green, color.blue));
Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp Fri Oct 5 21:39:19 2018
@@ -1897,10 +1897,10 @@
int te = transEnd;
QRgb *s;
QRgb r;
- for( int yi=0; yi < h; ++yi )
+ for (int yi = 0; yi < h; ++yi)
{
s = (QRgb*)(image.scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi = 0; xi < w; ++xi)
{
r = *s;
k = qMin(qRound(0.3 * qRed(r) + 0.59 * qGreen(r) + 0.11 * qBlue(r)), 255);
@@ -2693,10 +2693,10 @@
endC.getRgb(&rE, &gE, &bE);
QRgb *s;
QRgb r;
- for( int yi=0; yi < h; ++yi )
+ for (int yi = 0; yi < h; ++yi)
{
s = (QRgb*)(image.scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi = 0; xi < w; ++xi)
{
r = *s;
k = qMin(qRound(0.3 * qRed(r) + 0.59 * qGreen(r) + 0.11 * qBlue(r)), 255);
@@ -2859,10 +2859,10 @@
int w = image.width();
QRgb *s;
QRgb r;
- for( int yi=0; yi < h; ++yi )
+ for (int yi = 0; yi < h; ++yi)
{
s = (QRgb*)(image.scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi = 0; xi < w; ++xi)
{
r = *s;
*s = qRgba(qRed(r), qGreen(r), qBlue(r), 255 - qAlpha(r));
Modified: trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxps.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxps.cpp Fri Oct 5 21:39:19 2018
@@ -98,7 +98,7 @@
if (designMapDom.setContent(f))
{
QDomElement docElem = designMapDom.documentElement();
- for(QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
+ for (QDomElement drawPag = docElem.firstChildElement(); !drawPag.isNull(); drawPag = drawPag.nextSiblingElement())
{
if (drawPag.tagName() != "Relationship")
continue;
@@ -441,7 +441,7 @@
bool parsed = false;
QString DocumentReference = "";
QDomElement docElem = designMapDom.documentElement();
- for(QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
+ for(QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling())
{
QDomElement dpg = drawPag.toElement();
if (dpg.tagName() == "DocumentReference")
@@ -623,7 +623,7 @@
firstPage = false;
baseX = m_Doc->currentPage()->xOffset();
baseY = m_Doc->currentPage()->yOffset();
- for(QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
+ for (QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling())
{
QDomElement dpg = drawPag.toElement();
if ((dpg.tagName() == "Path") || (dpg.tagName() == "Glyphs") || (dpg.tagName() == "Canvas"))
@@ -637,7 +637,7 @@
}
else if (dpg.tagName() == "FixedPage.Resources")
{
- for(QDomNode sp = dpg.firstChild(); !sp.isNull(); sp = sp.nextSibling() )
+ for (QDomNode sp = dpg.firstChild(); !sp.isNull(); sp = sp.nextSibling())
{
QDomElement spe = sp.toElement();
if (spe.tagName() == "ResourceDictionary")
@@ -662,7 +662,7 @@
}
else if (spe.hasChildNodes())
{
- for(QDomElement dpgp = spe.firstChildElement(); !dpgp.isNull(); dpgp = dpgp.nextSiblingElement() )
+ for (QDomElement dpgp = spe.firstChildElement(); !dpgp.isNull(); dpgp = dpgp.nextSiblingElement())
{
if (dpgp.tagName() == "PathGeometry")
{
@@ -813,7 +813,7 @@
{
if (dpg.hasChildNodes())
{
- for(QDomNode sp = dpg.firstChild(); !sp.isNull(); sp = sp.nextSibling() )
+ for (QDomNode sp = dpg.firstChild(); !sp.isNull(); sp = sp.nextSibling())
{
QDomElement spe = sp.toElement();
if (spe.tagName() == "Glyphs.Fill")
@@ -1041,7 +1041,7 @@
bool pathFromChild = false;
if (dpg.hasChildNodes())
{
- for(QDomNode sp = dpg.firstChild(); !sp.isNull(); sp = sp.nextSibling() )
+ for (QDomNode sp = dpg.firstChild(); !sp.isNull(); sp = sp.nextSibling())
{
QDomElement spe = sp.toElement();
if (spe.tagName() == "Path.Fill")
@@ -1052,7 +1052,7 @@
parseStrokeXML(spe, path, obState);
else if (spe.tagName() == "Path.RenderTransform")
{
- for(QDomNode obg = spe.firstChild(); !obg.isNull(); obg = obg.nextSibling() )
+ for (QDomNode obg = spe.firstChild(); !obg.isNull(); obg = obg.nextSibling())
{
QDomElement eog = obg.toElement();
if (eog.tagName() == "MatrixTransform")
@@ -1109,12 +1109,12 @@
else if (dpg.tagName() == "Canvas")
{
QList<PageItem*> GElements;
- for(QDomNode sp = dpg.firstChild(); !sp.isNull(); sp = sp.nextSibling() )
+ for (QDomNode sp = dpg.firstChild(); !sp.isNull(); sp = sp.nextSibling())
{
QDomElement spe = sp.toElement();
if (spe.tagName() == "Canvas.RenderTransform")
{
- for(QDomNode obg = spe.firstChild(); !obg.isNull(); obg = obg.nextSibling() )
+ for (QDomNode obg = spe.firstChild(); !obg.isNull(); obg = obg.nextSibling())
{
QDomElement eog = obg.toElement();
if (eog.tagName() == "MatrixTransform")
@@ -1138,7 +1138,7 @@
parseOpacityXML(spe, path, obState);
else if (spe.tagName() == "Canvas.Resources")
{
- for(QDomNode obg = spe.firstChild(); !obg.isNull(); obg = obg.nextSibling() )
+ for (QDomNode obg = spe.firstChild(); !obg.isNull(); obg = obg.nextSibling())
{
QDomElement eog = obg.toElement();
if (eog.tagName() == "ResourceDictionary")
@@ -1163,7 +1163,7 @@
}
else if (eog.hasChildNodes())
{
- for(QDomElement dpgp = eog.firstChildElement(); !dpgp.isNull(); dpgp = dpgp.nextSiblingElement() )
+ for (QDomElement dpgp = eog.firstChildElement(); !dpgp.isNull(); dpgp = dpgp.nextSiblingElement())
{
if (dpgp.tagName() == "PathGeometry")
{
@@ -1329,7 +1329,7 @@
void XpsPlug::parseFillXML(QDomElement &spe, const QString& path, ObjState &obState)
{
- for(QDomNode obg = spe.firstChild(); !obg.isNull(); obg = obg.nextSibling() )
+ for (QDomNode obg = spe.firstChild(); !obg.isNull(); obg = obg.nextSibling())
{
QDomElement eog = obg.toElement();
if (eog.tagName() == "SolidColorBrush")
@@ -1364,12 +1364,12 @@
double gen_opacity = 1.0;
if (eog.hasAttribute("Opacity"))
gen_opacity = eog.attribute("Opacity", "1.0").toDouble();
- for(QDomNode gr = eog.firstChild(); !gr.isNull(); gr = gr.nextSibling() )
+ for (QDomNode gr = eog.firstChild(); !gr.isNull(); gr = gr.nextSibling())
{
QDomElement grs = gr.toElement();
if (grs.tagName() == "LinearGradientBrush.GradientStops")
{
- for(QDomNode spo = grs.firstChild(); !spo.isNull(); spo = spo.nextSibling() )
+ for (QDomNode spo = grs.firstChild(); !spo.isNull(); spo = spo.nextSibling())
{
QDomElement eo = spo.toElement();
if (eo.tagName() == "GradientStop")
@@ -1406,11 +1406,11 @@
double gen_opacity = 1.0;
if (eog.hasAttribute("Opacity"))
gen_opacity = eog.attribute("Opacity", "1.0").toDouble();
- for(QDomElement grs = eog.firstChildElement(); !grs.isNull(); grs = grs.nextSiblingElement())
+ for (QDomElement grs = eog.firstChildElement(); !grs.isNull(); grs = grs.nextSiblingElement())
{
if (grs.tagName() == "RadialGradientBrush.GradientStops")
{
- for(QDomElement eo = grs.firstChildElement(); !eo.isNull(); eo = eo.nextSiblingElement() )
+ for (QDomElement eo = grs.firstChildElement(); !eo.isNull(); eo = eo.nextSiblingElement())
{
if (eo.tagName() == "GradientStop")
{
@@ -1455,11 +1455,11 @@
listE >> Viewport_x1 >> Viewport_y1 >> Viewport_x2 >> Viewport_y2;
double vw = (Viewport_x2 * conversionFactor) / (Viewbox_x2 - Viewbox_x1);
double vh = (Viewport_y2 * conversionFactor) / (Viewbox_y2 - Viewbox_y1);
- for(QDomElement grs = eog.firstChildElement(); !grs.isNull(); grs = grs.nextSiblingElement())
+ for (QDomElement grs = eog.firstChildElement(); !grs.isNull(); grs = grs.nextSiblingElement())
{
if (grs.tagName() == "VisualBrush.Visual")
{
- for(QDomElement eo = grs.firstChildElement(); !eo.isNull(); eo = eo.nextSiblingElement() )
+ for (QDomElement eo = grs.firstChildElement(); !eo.isNull(); eo = eo.nextSiblingElement())
{
if ((eo.tagName() == "Path") || (eo.tagName() == "Glyphs") || (eo.tagName() == "Canvas"))
{
@@ -1508,7 +1508,7 @@
Coords.svgInit();
QString svgString = "";
bool windFill = false;
- for(QDomElement dpgp = spe.firstChildElement(); !dpgp.isNull(); dpgp = dpgp.nextSiblingElement() )
+ for (QDomElement dpgp = spe.firstChildElement(); !dpgp.isNull(); dpgp = dpgp.nextSiblingElement())
{
if (dpgp.tagName() == "PathGeometry")
svgString += parsePathGeometryXML(dpgp);
@@ -1535,13 +1535,13 @@
QString XpsPlug::parsePathGeometryXML(QDomElement &spe)
{
QString svgString = "";
- for(QDomElement dpg = spe.firstChildElement(); !dpg.isNull(); dpg = dpg.nextSiblingElement() )
+ for (QDomElement dpg = spe.firstChildElement(); !dpg.isNull(); dpg = dpg.nextSiblingElement())
{
if (dpg.tagName() == "PathFigure")
{
if (dpg.hasAttribute("StartPoint"))
svgString += "M " + dpg.attribute("StartPoint") + " ";
- for(QDomElement dp = dpg.firstChildElement(); !dp.isNull(); dp = dp.nextSiblingElement() )
+ for (QDomElement dp = dpg.firstChildElement(); !dp.isNull(); dp = dp.nextSiblingElement())
{
if (dp.tagName() == "PolyLineSegment")
svgString += "L " + dp.attribute("Points") + " ";
@@ -1589,7 +1589,7 @@
if (designMapDom.setContent(f))
{
QDomElement docElem = designMapDom.documentElement();
- for(QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling() )
+ for (QDomNode drawPag = docElem.firstChild(); !drawPag.isNull(); drawPag = drawPag.nextSibling())
{
QDomElement dpg = drawPag.toElement();
if (dpg.tagName() == "PathGeometry")
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdgetsetprop.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdgetsetprop.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdgetsetprop.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdgetsetprop.cpp Fri Oct 5 21:39:19 2018
@@ -225,7 +225,7 @@
// Return the list of properties
QStringList propertyNames;
int propertyOffset = includesuper ? 0 : objmeta->propertyOffset();
- for(int i = propertyOffset; i < objmeta->propertyCount(); ++i)
+ for (int i = propertyOffset; i < objmeta->propertyCount(); ++i)
{
QString propName = objmeta->property(i).name();
propertyNames << QString::fromLatin1(objmeta->property(i).name());
Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspelldialog.cpp Fri Oct 5 21:39:19 2018
@@ -113,7 +113,7 @@
return;
QString wordToIgnore = m_wfList->at(m_wfListIndex).w;
//Do we start from 0 or from the instance of the word where we are... 0 for now
- for(int i = 0; i < m_wfList->count(); ++i)
+ for (int i = 0; i < m_wfList->count(); ++i)
if (m_wfList->at(i).w == wordToIgnore)
(*m_wfList)[i].ignore = true;
goToNextWord();
@@ -134,7 +134,7 @@
return;
QString wordToChange=m_wfList->at(m_wfListIndex).w;
//Do we start from 0 or from the instance of the word where we are... 0 for now
- for(int i=0;i<m_wfList->count();++i)
+ for (int i=0;i<m_wfList->count();++i)
if (m_wfList->at(i).w==wordToChange)
replaceWord(i);
goToNextWord();
Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp Fri Oct 5 21:39:19 2018
@@ -93,7 +93,7 @@
{
PageItem *frameToCheck;
- for( int i = 0; i < m_doc->m_Selection->count(); ++i )
+ for (int i = 0; i < m_doc->m_Selection->count(); ++i)
{
frameToCheck = m_doc->m_Selection->itemAt(i);
StoryText *iText=&frameToCheck->itemText;
Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.cpp Fri Oct 5 21:39:19 2018
@@ -339,7 +339,7 @@
}
QList<VColorStop*> colorStops = currItem->fill_gradient.colorStops();
QColor qStopColor;
- for( int offset = 0 ; offset < colorStops.count() ; offset++ )
+ for (int offset = 0 ; offset < colorStops.count() ; offset++)
{
qStopColor = colorStops[ offset ]->color;
int h, s, v, sneu, vneu;
@@ -419,7 +419,7 @@
pat = QRadialGradient(x1, y1, sqrt(pow(x2 - x1, 2) + pow(y2 - y1,2)), x1, y1);
QList<VColorStop*> colorStops = currItem->stroke_gradient.colorStops();
QColor qStopColor;
- for( int offset = 0 ; offset < colorStops.count() ; offset++ )
+ for (int offset = 0 ; offset < colorStops.count() ; offset++)
{
qStopColor = colorStops[ offset ]->color;
int h, s, v, sneu, vneu;
Modified: trunk/Scribus/scribus/scfonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp (original)
+++ trunk/Scribus/scribus/scfonts.cpp Fri Oct 5 21:39:19 2018
@@ -1034,7 +1034,7 @@
int pathcount,i;
Display *display=XOpenDisplay(nullptr);
char **fontpath=XGetFontPath(display,&pathcount);
- for(i=0; i<pathcount; ++i)
+ for (i=0; i<pathcount; ++i)
AddPath(fontpath[i]);
XFreeFontPath(fontpath);
}
@@ -1204,7 +1204,7 @@
#if HAVE_FONTCONFIG
// Search fontconfig paths
QStringList::iterator fpi, fpend = FontPath.end();
- for(fpi = FontPath.begin() ; fpi != fpend; ++fpi)
+ for (fpi = FontPath.begin() ; fpi != fpend; ++fpi)
AddScalableFonts(*fpi);
AddFontconfigFonts();
#else
@@ -1215,7 +1215,7 @@
#endif
// add user and X11 fonts:
QStringList::iterator fpi, fpend = FontPath.end();
- for(fpi = FontPath.begin() ; fpi != fpend; ++fpi)
+ for (fpi = FontPath.begin() ; fpi != fpend; ++fpi)
AddScalableFonts(*fpi);
#endif
updateFontMap();
Modified: trunk/Scribus/scribus/schelptreemodel.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/schelptreemodel.cpp
==============================================================================
--- trunk/Scribus/scribus/schelptreemodel.cpp (original)
+++ trunk/Scribus/scribus/schelptreemodel.cpp Fri Oct 5 21:39:19 2018
@@ -124,7 +124,7 @@
QDomNodeList nl=n.childNodes();
if (nl.count()>0)
position=1;
- for(int i=0 ; i<= nl.count() ; i++)
+ for (int i=0 ; i<= nl.count() ; i++)
{
QDomNode child=nl.item(i);
if (child.isElement())
@@ -163,11 +163,11 @@
}
//3rd level
QDomNodeList nl2=child.childNodes();
- if (nl2.count()>0)
- position=2;
- for(int i2=0 ; i2<= nl2.count() ; i2++)
+ if (nl2.count() > 0)
+ position = 2;
+ for (int i2 = 0 ; i2 <= nl2.count(); i2++)
{
- QDomNode childchild=nl2.item(i2);
+ QDomNode childchild = nl2.item(i2);
if (childchild.isElement())
{
QDomElement ecc = childchild.toElement();
Modified: trunk/Scribus/scribus/scimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/scimage.cpp
==============================================================================
--- trunk/Scribus/scribus/scimage.cpp (original)
+++ trunk/Scribus/scribus/scimage.cpp Fri Oct 5 21:39:19 2018
@@ -422,7 +422,7 @@
yw = yi = 0;
int **stack = new int*[div];
- for(int i = 0; i < div; ++i) {
+ for (int i = 0; i < div; ++i) {
stack[i] = new int[4];
}
@@ -440,7 +440,7 @@
rinsum = ginsum = binsum = ainsum
= routsum = goutsum = boutsum = aoutsum
= rsum = gsum = bsum = asum = 0;
- for(i = -radius; i <= radius; ++i)
+ for (i = -radius; i <= radius; ++i)
{
p = pix[yi+qMin(wm,qMax(i,0))];
sir = stack[i+radius];
@@ -539,7 +539,7 @@
yp =- radius * w;
- for(i=-radius; i <= radius; ++i)
+ for (i=-radius; i <= radius; ++i)
{
yi=qMax(0,yp)+x;
@@ -642,7 +642,7 @@
delete [] vmin;
delete [] dv;
- for(int i = 0; i < div; ++i)
+ for (int i = 0; i < div; ++i)
{
delete [] stack[i];
}
@@ -667,27 +667,27 @@
return(false);
*dest = QImage(width(), height(), QImage::Format_ARGB32);
normalize=0.0;
- for(i=0; i < (widthk*widthk); i++)
+ for (i=0; i < (widthk*widthk); i++)
normalize += kernel[i];
if (fabs(normalize) <= 1.0e-12)
normalize=1.0;
normalize=1.0/normalize;
- for(i=0; i < (widthk*widthk); i++)
+ for (i=0; i < (widthk*widthk); i++)
normal_kernel[i] = normalize*kernel[i];
- for(y=0; y < dest->height(); ++y)
+ for (y=0; y < dest->height(); ++y)
{
sy = y-(widthk/2);
q = (unsigned int *)dest->scanLine(y);
- for(x=0; x < dest->width(); ++x)
+ for (x=0; x < dest->width(); ++x)
{
k = normal_kernel;
red = green = blue = alpha = 0;
sy = y-(widthk/2);
- for(mcy=0; mcy < widthk; ++mcy, ++sy)
+ for (mcy=0; mcy < widthk; ++mcy, ++sy)
{
my = sy < 0 ? 0 : sy > height()-1 ? height()-1 : sy;
sx = x+(-widthk/2);
- for(mcx=0; mcx < widthk; ++mcx, ++sx)
+ for (mcx=0; mcx < widthk; ++mcx, ++sx)
{
mx = sx < 0 ? 0 : sx > width()-1 ? width()-1 : sx;
int px = pixel(mx, my);
@@ -720,10 +720,10 @@
assert(sigma != 0.0);
if (radius > 0.0)
return((int)(2.0*ceil(radius)+1.0));
- for(width=5; ;)
+ for (width=5; ;)
{
normalize=0.0;
- for(u=(-width/2); u <= (width/2); u++)
+ for (u=(-width/2); u <= (width/2); u++)
normalize+=exp(-((double) u*u)/(2.0*sigma*sigma))/(2.50662827463100024161235523934010416269302368164062*sigma);
u=width/2;
value=exp(-((double) u*u)/(2.0*sigma*sigma))/(2.50662827463100024161235523934010416269302368164062*sigma)/normalize;
@@ -764,11 +764,11 @@
convolveImage(&dest, widthk, kernel);
free(kernel);
// liberateMemory((void **) &kernel);
- for( int yi=0; yi < dest.height(); ++yi )
+ for (int yi=0; yi < dest.height(); ++yi)
{
QRgb *s = (QRgb*)(dest.scanLine( yi ));
QRgb *d = (QRgb*)(scanLine( yi ));
- for(int xi=0; xi < dest.width(); ++xi )
+ for (int xi=0; xi < dest.width(); ++xi)
{
(*d) = (*s);
s++;
@@ -821,10 +821,10 @@
QRgb r;
int c, m, y, k;
unsigned char *p;
- for( int yi=0; yi < h; ++yi )
+ for (int yi=0; yi < h; ++yi)
{
s = (QRgb*)(scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
r = *s;
if (cmyk)
@@ -873,10 +873,10 @@
ScColorEngine::getShadeColorRGB(color, doc, rgbCol, shade);
rgbCol.getValues(cc, cm, cy);
}
- for( int yi=0; yi < h; ++yi )
+ for (int yi=0; yi < h; ++yi)
{
s = (QRgb*)(scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
r = *s;
if (cmyk)
@@ -922,10 +922,10 @@
{
curveTable2[x] = qMin(255, qMax(0, qRound(getCurveYValue(curve2, x / 255.0, lin2) * 255)));
}
- for( int yi=0; yi < h; ++yi )
+ for (int yi=0; yi < h; ++yi)
{
QRgb * s = (QRgb*)(scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
QRgb r=*s;
if (cmyk)
@@ -986,10 +986,10 @@
{
curveTable3[x] = qMin(255, qMax(0, qRound(getCurveYValue(curve2, x / 255.0, lin3) * 255)));
}
- for( int yi=0; yi < h; ++yi )
+ for (int yi=0; yi < h; ++yi)
{
QRgb * s = (QRgb*)(scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
QRgb r=*s;
if (cmyk)
@@ -1062,10 +1062,10 @@
{
curveTable4[x] = qMin(255, qMax(0, qRound(getCurveYValue(curve4, x / 255.0, lin4) * 255)));
}
- for( int yi=0; yi < h; ++yi )
+ for (int yi=0; yi < h; ++yi)
{
QRgb * s = (QRgb*)(scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
QRgb r=*s;
if (cmyk)
@@ -1109,10 +1109,10 @@
unsigned char *p;
QRgb * s;
unsigned char c, m, y, k;
- for( int yi=0; yi < h; ++yi )
+ for (int yi=0; yi < h; ++yi)
{
s = (QRgb*)(scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
if (cmyk)
{
@@ -1140,10 +1140,10 @@
int k;
QRgb * s;
QRgb r;
- for( int yi=0; yi < h; ++yi )
+ for (int yi=0; yi < h; ++yi)
{
s = (QRgb*)(scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
r = *s;
if (cmyk)
@@ -1257,10 +1257,10 @@
int h = height();
int w = width();
QRgb *s, r;
- for( int yi=0; yi < h; ++yi )
+ for (int yi=0; yi < h; ++yi)
{
s = (QRgb*)(scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
r = *s;
k = qMin(qRound(0.3 * qRed(r) + 0.59 * qGreen(r) + 0.11 * qBlue(r)), 255);
@@ -1286,7 +1286,7 @@
for (int yi = 0; yi < h; ++yi)
{
s = (const QRgb*) constScanLine(yi);
- for( int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
r = *s++;
buffer[pending++] = static_cast<unsigned char>(qRed(r));
@@ -1411,10 +1411,10 @@
buffer.resize(bufferSize + 16);
if (buffer.isNull()) // Memory allocation failure
return false;
- for( int yi=0; yi < h; ++yi )
+ for (int yi=0; yi < h; ++yi)
{
s = (const QRgb*) constScanLine(yi);
- for( int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
r = *s++;
buffer[pending++] = static_cast<unsigned char> (qRed(r));
@@ -1764,11 +1764,11 @@
delete [] gs;
delete [] bs;
QImage::operator=(QImage(nwidth, nheight, QImage::Format_ARGB32));
- for( int yi=0; yi < dst.height(); ++yi )
+ for (int yi=0; yi < dst.height(); ++yi)
{
QRgb *s = (QRgb*)(dst.scanLine( yi ));
QRgb *d = (QRgb*)(scanLine( yi ));
- for(int xi=0; xi < dst.width(); ++xi )
+ for (int xi=0; xi < dst.width(); ++xi)
{
(*d) = (*s);
s++;
@@ -1952,7 +1952,7 @@
int scanWidth = dst.width() * nChannels;
QImage::operator=(QImage(nwidth, nheight, this->format()));
- for( int yi=0; yi < dst.height(); ++yi )
+ for (int yi=0; yi < dst.height(); ++yi)
{
uchar *s = (dst.scanLine( yi ));
uchar *d = (scanLine( yi ));
@@ -2068,10 +2068,10 @@
alpha.resize(hm * wm);
if (alpha.size() > 0) //
{
- for( int yi=0; yi < hm; ++yi )
+ for (int yi=0; yi < hm; ++yi)
{
s = (QRgb*)(rImage.scanLine( yi ));
- for( int xi=0; xi < wm; ++xi )
+ for (int xi=0; xi < wm; ++xi)
{
r = *s++;
u = qAlpha(r);
@@ -2094,10 +2094,10 @@
alpha.resize(hm * w2);
if (alpha.size() > 0)
{
- for( int yi=0; yi < hm; ++yi )
+ for (int yi=0; yi < hm; ++yi)
{
s = iMask.scanLine( yi );
- for( int xi=0; xi < w2; ++xi )
+ for (int xi=0; xi < w2; ++xi)
{
u = *(s+xi);
if (PDF) u = ~u;
@@ -2529,7 +2529,7 @@
{
unsigned char* ucs = ptr2 ? (ptr2 + 1) : (ptr + 1);
unsigned char* uc = new unsigned char[width()];
- for( int uci = 0; uci < width(); ++uci )
+ for (int uci = 0; uci < width(); ++uci)
{
uc[uci] = *ucs;
ucs += 4;
@@ -2537,12 +2537,12 @@
xform.apply(uc, ptr, width());
delete[] uc;
}
- else if ( inputProfFormat == Format_GRAY_8 && (outputProfColorSpace == ColorSpace_Cmyk) )
+ else if (inputProfFormat == Format_GRAY_8 && (outputProfColorSpace == ColorSpace_Cmyk))
{
unsigned char value;
unsigned char* ucs = ptr2 ? ptr2 : ptr;
unsigned char* uc = ptr;
- for( int uci = 0; uci < width(); ++uci, uc += 4 )
+ for (int uci = 0; uci < width(); ++uci, uc += 4)
{
value = 255 - *(ucs + 1);
uc[0] = uc[1] = uc[2] = 0;
Modified: trunk/Scribus/scribus/sclayer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/sclayer.cpp
==============================================================================
--- trunk/Scribus/scribus/sclayer.cpp (original)
+++ trunk/Scribus/scribus/sclayer.cpp Fri Oct 5 21:39:19 2018
@@ -480,7 +480,7 @@
int level = 0;
ScLayers::Iterator it, itend = end();
qStableSort(begin(), end());
- for(it = begin(); it != itend; ++it, ++level)
+ for (it = begin(); it != itend; ++it, ++level)
it->Level = level;
}
Modified: trunk/Scribus/scribus/scpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/scpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainter.cpp (original)
+++ trunk/Scribus/scribus/scpainter.cpp Fri Oct 5 21:39:19 2018
@@ -631,7 +631,7 @@
pat = cairo_pattern_create_radial (fx, fy, 0, x1, y1, sqrt(pow(x2 - x1, 2) + pow(y2 - y1,2)));
QList<VColorStop*> colorStops = mask_gradient.colorStops();
QColor qStopColor;
- for( int offset = 0 ; offset < colorStops.count() ; offset++ )
+ for (int offset = 0 ; offset < colorStops.count() ; offset++)
{
qStopColor = colorStops[ offset ]->color;
double a = colorStops[offset]->opacity;
@@ -675,10 +675,10 @@
int k;
QRgb *s;
QRgb r;
- for( int yi=0; yi < h; ++yi )
+ for (int yi=0; yi < h; ++yi)
{
s = (QRgb*)(m_imageQ.scanLine( yi ));
- for( int xi=0; xi < w; ++xi )
+ for (int xi=0; xi < w; ++xi)
{
r = *s;
if (qAlpha(r) == 0)
@@ -819,7 +819,7 @@
QList<QColor> qStopColors;
QList<double> qStopRampPoints;
QColor qStopColor;
- for( int offset = 0 ; offset < colorStops.count() ; offset++ )
+ for (int offset = 0 ; offset < colorStops.count() ; offset++)
{
qStopColor = colorStops[ offset ]->color;
qStopColor.setAlphaF(colorStops[offset]->opacity);
@@ -857,7 +857,7 @@
cairo_fill(cr);
cairo_set_operator(cr, CAIRO_OPERATOR_ADD);
mpat = cairo_pattern_create_mesh();
- for( int offset = 1 ; offset < qStopRampPoints.count() ; offset++ )
+ for (int offset = 1 ; offset < qStopRampPoints.count() ; offset++)
{
QLineF e1 = edge1;
QLineF e1s = edge1;
@@ -1093,7 +1093,7 @@
cairo_pattern_set_extend(pat, CAIRO_EXTEND_PAD);
cairo_pattern_set_filter(pat, CAIRO_FILTER_GOOD);
QList<VColorStop*> colorStops = fill_gradient.colorStops();
- for( int offset = 0 ; offset < colorStops.count() ; offset++ )
+ for (int offset = 0 ; offset < colorStops.count() ; offset++)
{
rampPoint = colorStops[ offset ]->rampPoint;
if ((lastPoint == rampPoint) && (!isFirst))
@@ -1365,7 +1365,7 @@
cairo_pattern_set_extend(pat, CAIRO_EXTEND_PAD);
cairo_pattern_set_filter(pat, CAIRO_FILTER_GOOD);
QList<VColorStop*> colorStops = stroke_gradient.colorStops();
- for( int offset = 0 ; offset < colorStops.count() ; offset++ )
+ for (int offset = 0 ; offset < colorStops.count() ; offset++)
{
rampPoint = colorStops[ offset ]->rampPoint;
if ((lastPoint == rampPoint) && (!isFirst))
@@ -1872,10 +1872,10 @@
int cr = color.red();
int cg = color.green();
int cb = color.blue();
- for(int y = 0; y < h; ++y)
+ for (int y = 0; y < h; ++y)
{
QRgb *dst = (QRgb*)d;
- for(int x = 0; x < w; ++x)
+ for (int x = 0; x < w; ++x)
{
if (qAlpha(*dst) > 0)
*dst = qRgba(cr, cg, cb, qAlpha(*dst));
@@ -1900,10 +1900,10 @@
int hu, sa, v;
int cc2, cm2, cy2, k2;
QColor tmpR;
- for(int y = 0; y < h; ++y)
+ for (int y = 0; y < h; ++y)
{
QRgb *dst = (QRgb*)d;
- for(int x = 0; x < w; ++x)
+ for (int x = 0; x < w; ++x)
{
if (qAlpha(*dst) > 0)
{
@@ -1946,7 +1946,7 @@
}
yw = yi = 0;
int **stack = new int*[div];
- for(int i = 0; i < div; ++i)
+ for (int i = 0; i < div; ++i)
{
stack[i] = new int[1];
}
@@ -1960,7 +1960,7 @@
for (y = 0; y < h; ++y)
{
ainsum = aoutsum = asum = 0;
- for(i = -radius; i <= radius; ++i)
+ for (i = -radius; i <= radius; ++i)
{
p = pix[yi+qMin(wm,qMax(i,0))];
sir = stack[i+radius];
@@ -1998,7 +1998,7 @@
{
ainsum = aoutsum = asum = 0;
yp = -radius * w;
- for(i = -radius; i <= radius; ++i)
+ for (i = -radius; i <= radius; ++i)
{
yi=qMax(0,yp)+x;
sir = stack[i+radius];
@@ -2041,7 +2041,7 @@
delete [] a;
delete [] vmin;
delete [] dv;
- for(int i = 0; i < div; ++i)
+ for (int i = 0; i < div; ++i)
{
delete [] stack[i];
}
@@ -2077,7 +2077,7 @@
}
yw = yi = 0;
int **stack = new int*[div];
- for(int i = 0; i < div; ++i)
+ for (int i = 0; i < div; ++i)
{
stack[i] = new int[4];
}
@@ -2091,7 +2091,7 @@
for (y = 0; y < h; ++y)
{
rinsum = ginsum = binsum = ainsum = routsum = goutsum = boutsum = aoutsum = rsum = gsum = bsum = asum = 0;
- for(i = -radius; i <= radius; ++i)
+ for (i = -radius; i <= radius; ++i)
{
p = pix[yi+qMin(wm,qMax(i,0))];
sir = stack[i+radius];
@@ -2171,7 +2171,7 @@
{
rinsum = ginsum = binsum = ainsum = routsum = goutsum = boutsum = aoutsum = rsum = gsum = bsum = asum = 0;
yp =- radius * w;
- for(i=-radius; i <= radius; ++i)
+ for (i=-radius; i <= radius; ++i)
{
yi=qMax(0,yp)+x;
sir = stack[i+radius];
@@ -2254,7 +2254,7 @@
delete [] a;
delete [] vmin;
delete [] dv;
- for(int i = 0; i < div; ++i)
+ for (int i = 0; i < div; ++i)
{
delete [] stack[i];
}
Modified: trunk/Scribus/scribus/scpainterex_cairo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/scpainterex_cairo.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_cairo.cpp (original)
+++ trunk/Scribus/scribus/scpainterex_cairo.cpp Fri Oct 5 21:39:19 2018
@@ -674,7 +674,7 @@
bool isFirst = true;
double lastStop = 0.0;
- for( uint index = 0 ; index < gradient.Stops(); index++)
+ for (uint index = 0 ; index < gradient.Stops(); index++)
{
stop = colorStops.at(index);
if ((lastStop == stop->rampPoint) && (!isFirst))
@@ -725,7 +725,7 @@
bool isFirst = true;
double lastStop = 0.0;
- for( uint index = 0 ; index < gradient.Stops() ; index++)
+ for (uint index = 0 ; index < gradient.Stops() ; index++)
{
stop = colorStops.at(index);
if ((lastStop == stop->rampPoint) && (!isFirst))
@@ -858,7 +858,7 @@
QList<QColor> qStopColors;
QList<double> qStopRampPoints;
QColor qStopColor;
- for( int offset = 0 ; offset < colorStops.count() ; offset++ )
+ for (int offset = 0 ; offset < colorStops.count() ; offset++)
{
stop = colorStops.at(offset);
qStopColor = transformColor( ScColorShade(stop->color, stop->shade), 1.0);
@@ -903,7 +903,7 @@
cairo_fill(cr);
cairo_set_operator(cr, CAIRO_OPERATOR_ADD);
mpat = cairo_pattern_create_mesh();
- for( int offset = 1 ; offset < qStopRampPoints.count() ; offset++ )
+ for (int offset = 1 ; offset < qStopRampPoints.count() ; offset++)
{
QLineF e1 = edge1;
QLineF e1s = edge1;
@@ -1241,7 +1241,7 @@
bool isFirst = true;
double lastStop = 0.0;
- for( uint index = 0 ; index < gradient.Stops(); index++)
+ for (uint index = 0 ; index < gradient.Stops(); index++)
{
stop = colorStops.at(index);
if ((lastStop == stop->rampPoint) && (!isFirst))
@@ -1293,7 +1293,7 @@
bool isFirst = true;
double lastStop = 0.0;
- for( uint index = 0 ; index < gradient.Stops(); index++)
+ for (uint index = 0 ; index < gradient.Stops(); index++)
{
stop = colorStops.at(index);
if ((lastStop == stop->rampPoint) && (!isFirst))
Modified: trunk/Scribus/scribus/scpainterex_ps2.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/scpainterex_ps2.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainterex_ps2.cpp (original)
+++ trunk/Scribus/scribus/scpainterex_ps2.cpp Fri Oct 5 21:39:19 2018
@@ -176,7 +176,7 @@
void ScPainterEx_Ps2::transformPoints( const FPoint* ArrayIn, FPoint* ArrayOut, uint length )
{
- for( uint i = 0; i < length; i++ )
+ for (uint i = 0; i < length; i++)
{
transformPoint( ArrayIn[i], ArrayOut[i] );
}
@@ -414,7 +414,7 @@
m_stream << QString("%1 setlinewidth\n").arg(penWidth);
m_stream << "[";
- for( int i = 0; i < m_array.count();++ i )
+ for (int i = 0; i < m_array.count();++ i)
{
m_stream << QString("%1").arg(m_array[i]) << " ";
}
@@ -696,10 +696,10 @@
bool hasAlpha = false;
int width = image->width();
int height = image->height();
- for( int y = 0; y < height; y++ )
+ for (int y = 0; y < height; y++)
{
QRgb* imageBits = (QRgb*)(image->qImage().scanLine(y));
- for( int x = 0; x < width; ++x )
+ for (int x = 0; x < width; ++x)
{
if (qAlpha(*imageBits) != 255)
{
@@ -720,10 +720,10 @@
int height = image->height();
if ((image->width() % 8) != 0)
width++;
- for( int y = 0; y < height; ++y )
+ for (int y = 0; y < height; ++y)
{
unsigned char* imageBits = image->scanLine(y);
- for( int x = 0; x < width; x++ )
+ for (int x = 0; x < width; x++)
{
length++;
bits = imageBits[x];
@@ -746,10 +746,10 @@
int width = image->width();
int height = image->height();
- for( int y = 0; y < height; ++y )
+ for (int y = 0; y < height; ++y)
{
QRgb* imageBits = (QRgb*)(image->qImage().scanLine(y));
- for( int x = 0; x < width; ++x )
+ for (int x = 0; x < width; ++x)
{
cindex = 0;
while (cindex < 3)
@@ -799,10 +799,10 @@
int length = 0;
int width = image->width();
int height = image->height();
- for( int y = 0; y < height; ++y )
+ for (int y = 0; y < height; ++y)
{
QRgb* imageBits = (QRgb*)(image->qImage().scanLine(y));
- for( int x = 0; x < width; ++x )
+ for (int x = 0; x < width; ++x)
{
length++;
uchar r = (uchar) qRed(*imageBits);
@@ -829,10 +829,10 @@
int width = image->width();
int height = image->height();
- for( int y = 0; y < height; y++ )
+ for (int y = 0; y < height; y++)
{
QRgb* imageBits = (QRgb*)(image->qImage().scanLine(y));
- for( int x = 0; x < width; x++ )
+ for (int x = 0; x < width; x++)
{
four_tuple[0] = (uchar) qRed(*imageBits);
four_tuple[1] = (uchar) qGreen(*imageBits);
@@ -861,10 +861,10 @@
int length = 0;
int width = image->width();
int height = image->height();
- for( int y = 0; y < height; ++y )
+ for (int y = 0; y < height; ++y)
{
QRgb* imageBits = (QRgb*)(image->qImage().scanLine(y));
- for( int x = 0; x < width; ++x )
+ for (int x = 0; x < width; ++x)
{
length++;
uchar c = (uchar) qRed(*imageBits);
@@ -1132,7 +1132,7 @@
m_stream << QString("/DeviceCMYK setcolorspace\n");
m_stream << QString("%1 %2 %3 %4 setcolor fill\n").arg(c1).arg(m1).arg(j1).arg(n1);
- for( uint index = 1; index < gradient.Stops(); index++)
+ for (uint index = 1; index < gradient.Stops(); index++)
{
stop2 = *colorStops[index];
ramp2 = stop2.rampPoint;
@@ -1233,7 +1233,7 @@
m_stream << QString("%1 %2 %3 setrgbcolor fill\n").arg(r2).arg(g2).arg(b2);
if ( gradient.Stops() < 2 ) return;
- for( int index = gradient.Stops() - 2; index >= 0; index--)
+ for (int index = gradient.Stops() - 2; index >= 0; index--)
{
stop1 = *colorStops[index];
ramp1 = stop1.rampPoint;
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Fri Oct 5 21:39:19 2018
@@ -552,7 +552,7 @@
QStringList realSupportedExts;
QMap<QString, QString> formats;
osgDB::FileNameList plugins = osgDB::listAllAvailablePlugins();
- for(osgDB::FileNameList::iterator itr = plugins.begin(); itr != plugins.end(); ++itr)
+ for (osgDB::FileNameList::iterator itr = plugins.begin(); itr != plugins.end(); ++itr)
{
osgDB::ReaderWriterInfoList infoList;
if (QString::fromStdString(*itr).contains("qfont"))
@@ -563,7 +563,7 @@
{
osgDB::ReaderWriterInfo& info = *(*rwi_itr);
osgDB::ReaderWriter::FormatDescriptionMap::iterator fdm_itr;
- for(fdm_itr = info.extensions.begin(); fdm_itr != info.extensions.end(); ++fdm_itr)
+ for (fdm_itr = info.extensions.begin(); fdm_itr != info.extensions.end(); ++fdm_itr)
{
if (supportedExts.contains(QString::fromStdString(fdm_itr->first)))
formats.insert("*." + QString::fromStdString(fdm_itr->first) + " *." + QString::fromStdString(fdm_itr->first).toUpper(), QString::fromStdString(fdm_itr->second) + " (*." + QString::fromStdString(fdm_itr->first) + " *." + QString::fromStdString(fdm_itr->first).toUpper() + ")");
@@ -582,9 +582,9 @@
void ScribusMainWindow::initKeyboardShortcuts()
{
- for( QMap<QString, QPointer<ScrAction> >::Iterator it = scrActions.begin(); it!=scrActions.end(); ++it )
- {
- if ((ScrAction*)(it.value())!=nullptr)
+ for (auto it = scrActions.begin(); it!=scrActions.end(); ++it )
+ {
+ if ((ScrAction*)(it.value()) != nullptr)
{
QString accelerator = it.value()->shortcut().toString();
m_prefsManager->setKeyEntry(it.key(), it.value()->cleanMenuText(), accelerator,0);
@@ -3234,7 +3234,7 @@
Q_ASSERT(found);
scrLayersActions[QString("%1").arg((*it).ID)]->setChecked(true);
- for( QMap<QString, QPointer<ScrAction> >::Iterator it = scrLayersActions.begin(); it!=scrLayersActions.end(); ++it )
+ for (auto it = scrLayersActions.begin(); it != scrLayersActions.end(); ++it )
{
scrMenuMgr->addMenuItemString(it.key(), "ItemLayer");
connect( (*it), SIGNAL(triggeredData(int)), doc, SLOT(itemSelection_SendToLayer(int)) );
@@ -3247,14 +3247,14 @@
if (!HaveDoc)
return;
QMap<QString, QPointer<ScrAction> >::Iterator itend=scrLayersActions.end();
- for( QMap<QString, QPointer<ScrAction> >::Iterator it = scrLayersActions.begin(); it!=itend; ++it )
+ for (auto it = scrLayersActions.begin(); it!=itend; ++it)
{
(*it)->disconnect(SIGNAL(triggeredData(int)));
(*it)->setChecked(false);
}
if (!doc->m_Selection->isEmpty() && doc->m_Selection->itemAt(0))
scrLayersActions[QString("%1").arg(doc->m_Selection->itemAt(0)->LayerID)]->setChecked(true);
- for( QMap<QString, QPointer<ScrAction> >::Iterator it = scrLayersActions.begin(); it!=itend; ++it )
+ for (auto it = scrLayersActions.begin(); it != itend; ++it)
connect( (*it), SIGNAL(triggeredData(int)), doc, SLOT(itemSelection_SendToLayer(int)) );
}
@@ -5470,7 +5470,8 @@
{
QStringList locationEntries;
QList<PageSet> pageSet(doc->pageSets());
- for(QStringList::Iterator pNames = pageSet[doc->pagePositioning()].pageNames.begin(); pNames != pageSet[doc->pagePositioning()].pageNames.end(); ++pNames )
+ QStringList pageNames = pageSet[doc->pagePositioning()].pageNames;
+ for (auto pNames = pageNames.cbegin(); pNames != pageNames.cend(); ++pNames)
{
locationEntries << CommonStrings::translatePageSetLocString(*pNames);
}
@@ -7339,7 +7340,7 @@
BookMItem *ite = new BookMItem(bookmarkPalette->BView, &(*it2));
bookmarkPalette->BView->NrItems++;
++it2;
- for( ; it2 != doc->BookMarks.end(); ++it2 )
+ for ( ; it2 != doc->BookMarks.end(); ++it2)
{
if ((*it2).Parent == 0)
{
@@ -8715,7 +8716,7 @@
{
QString fileUrl;
QList<QUrl> fileUrls = e->mimeData()->urls();
- for( int i = 0; i < fileUrls.count(); ++i )
+ for (int i = 0; i < fileUrls.count(); ++i)
{
fileUrl = fileUrls[i].toLocalFile().toLower();
if (fileUrl.endsWith(".sla") || fileUrl.endsWith(".sla.gz") || fileUrl.endsWith(".shape") || fileUrl.endsWith(".sce"))
Modified: trunk/Scribus/scribus/scribusapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/scribusapp.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusapp.cpp (original)
+++ trunk/Scribus/scribus/scribusapp.cpp Fri Oct 5 21:39:19 2018
@@ -160,7 +160,7 @@
useGUI = true;
int argi = 1;
- for( ; argi < argsc; argi++)
+ for ( ; argi < argsc; argi++)
{ //handle options (not positional parameters)
arg = args[argi];
if (arg == ARG_PYTHONSCRIPT || arg == ARG_PYTHONSCRIPT_SHORT)
Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Fri Oct 5 21:39:19 2018
@@ -311,7 +311,7 @@
profDirs = ScPaths::systemProfilesDirs();
profDirs.prepend( m_prefsManager->appPrefs.pathPrefs.colorProfiles );
profDirs.prepend( ScPaths::instance().shareDir()+"profiles/");
- for(int i = 0; i < profDirs.count(); i++)
+ for (int i = 0; i < profDirs.count(); i++)
{
profDir = profDirs[i];
if(!profDir.isEmpty())
Modified: trunk/Scribus/scribus/tocgenerator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/tocgenerator.cpp
==============================================================================
--- trunk/Scribus/scribus/tocgenerator.cpp (original)
+++ trunk/Scribus/scribus/tocgenerator.cpp Fri Oct 5 21:39:19 2018
@@ -67,7 +67,9 @@
if (m_doc == nullptr)
return;
Q_ASSERT(!m_doc->masterPageMode());
- for(ToCSetupVector::Iterator tocSetupIt = m_doc->tocSetups().begin(); tocSetupIt != m_doc->tocSetups().end(); ++tocSetupIt )
+
+ const ToCSetupVector& topSetups = m_doc->tocSetups();
+ for (auto tocSetupIt = topSetups.cbegin(); tocSetupIt != topSetups.cend(); ++tocSetupIt)
{
PageItem* tocFrame = findTargetFrame(tocSetupIt->frameName);
if (tocFrame == nullptr)
Modified: trunk/Scribus/scribus/ui/newfile.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/ui/newfile.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newfile.cpp (original)
+++ trunk/Scribus/scribus/ui/newfile.cpp Fri Oct 5 21:39:19 2018
@@ -460,7 +460,7 @@
firstPage->setEnabled(true);
firstPage->clear();
QStringList::Iterator pNames;
- for(pNames = prefsManager->appPrefs.pageSets[nr].pageNames.begin(); pNames != prefsManager->appPrefs.pageSets[nr].pageNames.end(); ++pNames )
+ for (pNames = prefsManager->appPrefs.pageSets[nr].pageNames.begin(); pNames != prefsManager->appPrefs.pageSets[nr].pageNames.end(); ++pNames )
{
firstPage->addItem(CommonStrings::translatePageSetLocString((*pNames)));
}
Modified: trunk/Scribus/scribus/ui/newtemp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/ui/newtemp.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newtemp.cpp (original)
+++ trunk/Scribus/scribus/ui/newtemp.cpp Fri Oct 5 21:39:19 2018
@@ -53,7 +53,7 @@
Links = new QComboBox( this );
QStringList::Iterator pNames;
QList<PageSet> pageSet(doc->pageSets());
- for(pNames = pageSet[doc->pagePositioning()].pageNames.begin(); pNames != pageSet[doc->pagePositioning()].pageNames.end(); ++pNames )
+ for (pNames = pageSet[doc->pagePositioning()].pageNames.begin(); pNames != pageSet[doc->pagePositioning()].pageNames.end(); ++pNames )
{
//Links->insertItem((*pNames));
Links->addItem(CommonStrings::translatePageSetLocString((*pNames)));
Modified: trunk/Scribus/scribus/ui/pageitemattributes.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/ui/pageitemattributes.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pageitemattributes.cpp (original)
+++ trunk/Scribus/scribus/ui/pageitemattributes.cpp Fri Oct 5 21:39:19 2018
@@ -43,7 +43,7 @@
nameList.clear();
nameList.append("");
- for(ObjAttrVector::Iterator it = localDocAttributes.begin(); it!= localDocAttributes.end(); ++it)
+ for (ObjAttrVector::Iterator it = localDocAttributes.begin(); it!= localDocAttributes.end(); ++it)
nameList.append((*it).name);
updateTable();
@@ -134,7 +134,7 @@
bool found=false;
ObjAttrVector::Iterator it;
int count=0;
- for(it = localAttributes.begin(); it!= localAttributes.end(); ++it)
+ for (it = localAttributes.begin(); it!= localAttributes.end(); ++it)
{
if(count==currRow)
{
@@ -164,7 +164,7 @@
bool found=false;
ObjAttrVector::Iterator it;
int count=0;
- for(it = localAttributes.begin(); it!= localAttributes.end(); ++it)
+ for (it = localAttributes.begin(); it!= localAttributes.end(); ++it)
{
if(count==currRow)
{
@@ -184,7 +184,7 @@
void PageItemAttributes::updateTable()
{
attributesTable->setRowCount(localAttributes.count());
- for(int row = 0; row < localAttributes.count(); ++row)
+ for (int row = 0; row < localAttributes.count(); ++row)
{
uint col = 0;
ObjectAttribute& objAttr = localAttributes[row];
Modified: trunk/Scribus/scribus/ui/pagelayout.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/ui/pagelayout.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagelayout.cpp (original)
+++ trunk/Scribus/scribus/ui/pagelayout.cpp Fri Oct 5 21:39:19 2018
@@ -161,7 +161,7 @@
firstPage->setEnabled(true);
firstPage->clear();
QStringList::Iterator pNames;
- for(pNames = pageSets[nr].pageNames.begin(); pNames != pageSets[nr].pageNames.end(); ++pNames )
+ for (pNames = pageSets[nr].pageNames.begin(); pNames != pageSets[nr].pageNames.end(); ++pNames)
{
firstPage->addItem(CommonStrings::translatePageSetLocString((*pNames)));
}
@@ -194,7 +194,7 @@
firstPage->setEnabled(true);
firstPage->clear();
QStringList::Iterator pNames;
- for(pNames = pageSets[chosen].pageNames.begin(); pNames != pageSets[chosen].pageNames.end(); ++pNames )
+ for (pNames = pageSets[chosen].pageNames.begin(); pNames != pageSets[chosen].pageNames.end(); ++pNames)
{
firstPage->addItem(CommonStrings::translatePageSetLocString((*pNames)));
}
@@ -285,8 +285,8 @@
disconnect(firstPage, SIGNAL(activated(int)), this, SIGNAL(selectedFirstPage(int)));
int currFirstPageIndex=firstPage->currentIndex();
firstPage->clear();
- if (currIndex>=0 && currIndex<pageSets.count())
- for(QStringList::Iterator pNames = pageSets[currIndex].pageNames.begin(); pNames != pageSets[currIndex].pageNames.end(); ++pNames )
+ if (currIndex >= 0 && currIndex<pageSets.count())
+ for (QStringList::Iterator pNames = pageSets[currIndex].pageNames.begin(); pNames != pageSets[currIndex].pageNames.end(); ++pNames)
{
firstPage->addItem(CommonStrings::translatePageSetLocString((*pNames)));
}
Modified: trunk/Scribus/scribus/ui/prefs_documentitemattributes.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/ui/prefs_documentitemattributes.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentitemattributes.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_documentitemattributes.cpp Fri Oct 5 21:39:19 2018
@@ -121,7 +121,7 @@
{
attributesTable->setRowCount(localAttributes.count());
- for(int row = 0; row < localAttributes.count(); ++row)
+ for (int row = 0; row < localAttributes.count(); ++row)
{
uint col = 0;
ObjectAttribute& objAttr = localAttributes[row];
@@ -191,7 +191,7 @@
bool found=false;
ObjAttrVector::Iterator it;
int count=0;
- for(it = localAttributes.begin(); it!= localAttributes.end(); ++it)
+ for (it = localAttributes.begin(); it!= localAttributes.end(); ++it)
{
if(count==currRow)
{
@@ -221,7 +221,7 @@
bool found=false;
ObjAttrVector::Iterator it;
int count=0;
- for(it = localAttributes.begin(); it!= localAttributes.end(); ++it)
+ for (it = localAttributes.begin(); it!= localAttributes.end(); ++it)
{
if(count==currRow)
{
@@ -240,7 +240,7 @@
QStringList Prefs_DocumentItemAttributes::getDocAttributesNames()
{
QStringList nameList;
- for(ObjAttrVector::Iterator it = localAttributes.begin(); it!= localAttributes.end(); ++it)
+ for (ObjAttrVector::Iterator it = localAttributes.begin(); it!= localAttributes.end(); ++it)
nameList.append((*it).name);
return nameList;
}
Modified: trunk/Scribus/scribus/ui/prefs_documentsections.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/ui/prefs_documentsections.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsections.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_documentsections.cpp Fri Oct 5 21:39:19 2018
@@ -55,7 +55,7 @@
{
sectionsTable->setRowCount(m_localSections.count());
int row=0;
- for(DocumentSectionMap::Iterator it = m_localSections.begin(); it!= m_localSections.end(); ++it)
+ for (DocumentSectionMap::Iterator it = m_localSections.begin(); it!= m_localSections.end(); ++it)
{
uint i=0;
//Name
@@ -191,7 +191,7 @@
bool found=false;
DocumentSectionMap::Iterator it = m_localSections.begin();
int count=0;
- for(; it!= m_localSections.end(); ++it)
+ for (; it!= m_localSections.end(); ++it)
{
if(count==currRow)
{
@@ -221,7 +221,7 @@
m_localSections.clear();
//Copy the temp map entries over. When we find the number of the current row, also insert a new entry.
uint i=0;
- for(DocumentSectionMap::Iterator it2 = tempSections.begin(); it2!= tempSections.end(); ++it2)
+ for (DocumentSectionMap::Iterator it2 = tempSections.begin(); it2!= tempSections.end(); ++it2)
{
it2.value().number=i;
m_localSections.insert(i, it2.value());
@@ -253,7 +253,7 @@
bool found=false;
DocumentSectionMap::Iterator it = m_localSections.begin();
int count=0;
- for(; it!= m_localSections.end(); ++it)
+ for (; it!= m_localSections.end(); ++it)
{
if(count==currRow)
{
@@ -278,7 +278,7 @@
m_localSections.clear();
uint i=0;
it = tempSections.begin();
- for(; it!= tempSections.end(); ++it)
+ for (; it!= tempSections.end(); ++it)
{
it.value().number=i;
m_localSections.insert(i++, it.value());
Modified: trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsetup.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_documentsetup.cpp Fri Oct 5 21:39:19 2018
@@ -249,7 +249,7 @@
if (currIndex>0 && currIndex<pageSets.count())
{
layoutFirstPageIsComboBox->setEnabled(true);
- for(QStringList::Iterator pNames = pageSets[currIndex].pageNames.begin(); pNames != pageSets[currIndex].pageNames.end(); ++pNames )
+ for (QStringList::Iterator pNames = pageSets[currIndex].pageNames.begin(); pNames != pageSets[currIndex].pageNames.end(); ++pNames)
layoutFirstPageIsComboBox->addItem(CommonStrings::translatePageSetLocString(*pNames));
layoutFirstPageIsComboBox->setCurrentIndex(i<0?0:i);
}
Modified: trunk/Scribus/scribus/ui/prefs_printer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/ui/prefs_printer.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_printer.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_printer.cpp Fri Oct 5 21:39:19 2018
@@ -52,7 +52,7 @@
QStringList printerNames = PrinterUtil::getPrinterNames();
int numPrinters = printerNames.count();
destinationComboBox->clear();
- for( int i = 0; i < numPrinters; i++)
+ for (int i = 0; i < numPrinters; i++)
{
printerName = printerNames[i];
destinationComboBox->addItem(printerName);
Modified: trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_tableofcontents.cpp Fri Oct 5 21:39:19 2018
@@ -205,7 +205,7 @@
{
bool found=false;
QString newName=tocNameLineEdit->text();
- for(ToCSetupVector::Iterator it = localToCSetupVector.begin(); it!= localToCSetupVector.end(); ++it)
+ for (ToCSetupVector::Iterator it = localToCSetupVector.begin(); it!= localToCSetupVector.end(); ++it)
{
if ((*it).name==newName)
found=true;
@@ -235,7 +235,7 @@
{
tocListBox->clear();
QStringList sl;
- for(ToCSetupVector::Iterator it = localToCSetupVector.begin(); it!= localToCSetupVector.end(); ++it)
+ for (ToCSetupVector::Iterator it = localToCSetupVector.begin(); it!= localToCSetupVector.end(); ++it)
sl << (*it).name;
tocListBox->insertItems(0, sl);
}
Modified: trunk/Scribus/scribus/ui/smsccombobox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/ui/smsccombobox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smsccombobox.cpp (original)
+++ trunk/Scribus/scribus/ui/smsccombobox.cpp Fri Oct 5 21:39:19 2018
@@ -48,7 +48,7 @@
setFont(false);
m_hasParent = false;
m_pItem = 0;
- for(int idx(0); idx < count(); ++idx)
+ for (int idx(0); idx < count(); ++idx)
{
if (itemData(idx).toInt() == i)
ScComboBox::setCurrentIndex(idx);
@@ -67,7 +67,7 @@
addItem( tr("Use Parent Value"));
}
- for(int idx(0); idx < count(); ++idx)
+ for (int idx(0); idx < count(); ++idx)
{
if (itemData(idx).toInt() == i)
{
@@ -84,7 +84,7 @@
setFont(false);
m_hasParent = false;
m_pItem = 0;
- for(int idx(0); idx < count(); ++idx)
+ for (int idx(0); idx < count(); ++idx)
{
if (itemData(idx).toDouble() == d)
ScComboBox::setCurrentIndex(idx);
@@ -103,7 +103,7 @@
addItem( tr("Use Parent Value"));
}
- for(int idx(0); idx < count(); ++idx)
+ for (int idx(0); idx < count(); ++idx)
{
if (itemData(idx).toDouble() == d)
{
@@ -116,7 +116,7 @@
int SMScComboBox::getItemIndexForData(int i)
{
- for(int idx(0); idx < count(); ++idx)
+ for (int idx(0); idx < count(); ++idx)
{
if (itemData(idx).toInt() == i)
{
@@ -128,7 +128,7 @@
int SMScComboBox::getItemIndexForData(double d)
{
- for(int idx(0); idx < count(); ++idx)
+ for (int idx(0); idx < count(); ++idx)
{
if (itemData(idx).toDouble() == d)
{
Modified: trunk/Scribus/scribus/util.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/util.cpp
==============================================================================
--- trunk/Scribus/scribus/util.cpp (original)
+++ trunk/Scribus/scribus/util.cpp Fri Oct 5 21:39:19 2018
@@ -299,7 +299,7 @@
{
int i = 0;
QString out;
- for(int j = 0; j < in->length(); ++j)
+ for (int j = 0; j < in->length(); ++j)
{
// Qt4 .cell() added ???
out += toHex(QChar(in->at(j)).cell());
@@ -479,7 +479,7 @@
for (it = aList.begin(); it != aList.end(); ++it)
sortList.push_back(*it);
std::sort(sortList.begin(), sortList.end(), compareQStrings);
- for(uint i = 0; i < sortList.size(); i++)
+ for (uint i = 0; i < sortList.size(); i++)
retList.append(sortList[i]);
return retList;
}
Modified: trunk/Scribus/scribus/vgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/vgradient.cpp
==============================================================================
--- trunk/Scribus/scribus/vgradient.cpp (original)
+++ trunk/Scribus/scribus/vgradient.cpp Fri Oct 5 21:39:19 2018
@@ -83,7 +83,7 @@
clearStops();
QList<VColorStop*> cs = gradient.colorStops();
qStableSort(cs.begin(), cs.end(), compareStops);
- for( int i = 0; i < cs.count(); ++i)
+ for (int i = 0; i < cs.count(); ++i)
m_colorStops.append( new VColorStop( *cs[i] ) );
} // VGradient::VGradient
@@ -106,7 +106,7 @@
clearStops();
QList<VColorStop*> cs = gradient.colorStops();
qStableSort(cs.begin(), cs.end(), compareStops);
- for( int i = 0; i < cs.count(); ++i )
+ for (int i = 0; i < cs.count(); ++i)
m_colorStops.append( new VColorStop( *cs[i] ) );
return *this;
} // VGradient::operator=
Modified: trunk/Scribus/scribus/vgradientex.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22723&path=/trunk/Scribus/scribus/vgradientex.cpp
==============================================================================
--- trunk/Scribus/scribus/vgradientex.cpp (original)
+++ trunk/Scribus/scribus/vgradientex.cpp Fri Oct 5 21:39:19 2018
@@ -80,7 +80,7 @@
clearStops();
QList<VColorStopEx*> cs = gradient.colorStops();
qStableSort( cs.begin(), cs.end(), compareStopsEx);
- for( int i = 0; i < cs.count(); ++i)
+ for (int i = 0; i < cs.count(); ++i)
m_colorStops.append( new VColorStopEx( *cs[i] ) );
}
@@ -96,7 +96,7 @@
delete m_colorStops.takeFirst();
QList<VColorStop*> stops = gradient.colorStops();
qStableSort( stops.begin(), stops.end(), compareStops);
- for( int i = 0; i < stops.count(); ++i)
+ for (int i = 0; i < stops.count(); ++i)
{
VColorStop stop( *stops[i] );
ScColor color = doc.PageColors[stop.name];
@@ -123,7 +123,7 @@
clearStops();
QList<VColorStopEx*> cs = gradient.colorStops();
qStableSort( cs.begin(), cs.end(), compareStopsEx);
- for( int i = 0; i < cs.count(); ++i )
+ for (int i = 0; i < cs.count(); ++i)
m_colorStops.append( new VColorStopEx( *cs[i] ) );
return *this;
} // VGradientEx::operator=
More information about the scribus-commit
mailing list