r19728 by fschmid - Compile warnings fixes for the plugins.
scribus-commit
scribus-commit at lists.scribus.net
Sun Jan 4 09:03:09 UTC 2015
Author: fschmid
Date: Sun Jan 4 09:03:09 2015
New Revision: 19728
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19728
Log:
Compile warnings fixes for the plugins.
Modified:
trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
trunk/Scribus/scribus/plugins/import/ai/importai.cpp
trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
trunk/Scribus/scribus/plugins/import/pdf/slaoutput.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/saveastemplateplugin/satemplate.cpp
trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h
trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp Sun Jan 4 09:03:09 2015
@@ -1816,7 +1816,7 @@
QString tmV, tmp, tmpf, tmp2, tmp3, tmp4, PgNam, Defont, tmf;
QMap<int,int> TableID;
QList<PageItem*> TableItems;
- int x, a, counter, baseobj;
+ int x, a, counter; //, baseobj;
bool newVersion = false;
bool VorLFound = false;
QMap<int,int> layerTrans;
@@ -1985,7 +1985,7 @@
QDomNode OBJ=PAGE.firstChild();
counter = m_Doc->Items->count();
- baseobj = counter;
+ // baseobj = counter;
int pageItem = 0;
while(!OBJ.isNull())
{
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Sun Jan 4 09:03:09 2015
@@ -3619,7 +3619,7 @@
bool Scribus134Format::readColors(const QString& fileName, ColorList & colors)
{
bool firstElement = true;
- bool success = true;
+// bool success = true;
QScopedPointer<QIODevice> ioDevice(slaReader(fileName));
if (ioDevice.isNull())
@@ -3637,7 +3637,7 @@
{
if (tagName != "SCRIBUSUTF8NEW")
{
- success = false;
+ // success = false;
break;
}
firstElement = false;
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Sun Jan 4 09:03:09 2015
@@ -3931,7 +3931,7 @@
{
if (newItem->asGroupFrame())
{
- bool success = true;
+ // bool success = true;
QList<PageItem*>* DItems = doc->Items;
QList<PageItem*> GroupItems;
doc->Items = &GroupItems;
@@ -3939,7 +3939,8 @@
// #12313: set the 'loadPage' parameter to true in order to
// avoid the change of page mode and the doc item lists switch
// when loading groups in masterpages
- success = readObject(doc, reader, itemInfo, baseDir, true);
+ // success =
+ readObject(doc, reader, itemInfo, baseDir, true);
for (int as = 0; as < GroupItems.count(); ++as)
{
PageItem* currItem = GroupItems.at(as);
@@ -6483,7 +6484,7 @@
{
CharStyle cstyle;
bool firstElement = true;
- bool success = true;
+ //bool success = true;
QScopedPointer<QIODevice> ioDevice(slaReader(fileName));
if (ioDevice.isNull())
@@ -6501,7 +6502,7 @@
{
if (tagName != "SCRIBUSUTF8NEW")
{
- success = false;
+ // success = false;
break;
}
firstElement = false;
Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp Sun Jan 4 09:03:09 2015
@@ -1271,7 +1271,7 @@
QString tmp2;
QString tmp3;
bool paran = false;
- bool arra = false;
+ //bool arra = false;
bool skip = false;
for (int a = 0; a < data.count(); a++)
{
@@ -1296,13 +1296,13 @@
}
if (tmp == "[")
{
- arra = true;
+ // arra = true;
tmp2 += tmp;
continue;
}
if (tmp == "]")
{
- arra = false;
+ // arra = false;
tmp2 += tmp;
continue;
}
@@ -2960,9 +2960,9 @@
// qDebug() << QString("Encoding: %1").arg(bin);
uint dataSize = w * h * (type + alpha);
uint alphaData = w * h * type;
- bool cmyk = false;
- if (type == 4)
- cmyk = true;
+// bool cmyk = false;
+// if (type == 4)
+// cmyk = true;
if (tmp.startsWith("%%BeginData"))
{
QString dummyS;
Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&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 Sun Jan 4 09:03:09 2015
@@ -1696,7 +1696,7 @@
double RExtra = def_RExtra;
int TextColumnCount = def_TextColumnCount;
double TextColumnGutter = def_TextColumnGutter;
- double TextColumnFixedWidth = def_TextColumnFixedWidth;
+ //double TextColumnFixedWidth = def_TextColumnFixedWidth;
QString LeftLineEnd = def_LeftLineEnd;
QString RightLineEnd = def_RightLineEnd;
QString imageFit = "None";
@@ -1763,7 +1763,7 @@
RExtra = nstyle.RExtra;
TextColumnCount = nstyle.TextColumnCount;
TextColumnGutter = nstyle.TextColumnGutter;
- TextColumnFixedWidth = nstyle.TextColumnFixedWidth;
+ // TextColumnFixedWidth = nstyle.TextColumnFixedWidth;
textFlow = nstyle.TextFlow;
LeftLineEnd = nstyle.LeftLineEnd;
RightLineEnd = nstyle.RightLineEnd;
@@ -2015,8 +2015,8 @@
TextColumnCount = ite.attribute("TextColumnCount").toInt();
if (ite.hasAttribute("TextColumnGutter"))
TextColumnGutter = ite.attribute("TextColumnGutter").toDouble();
- if (ite.hasAttribute("TextColumnFixedWidth"))
- TextColumnFixedWidth = ite.attribute("TextColumnFixedWidth").toDouble();
+ // if (ite.hasAttribute("TextColumnFixedWidth"))
+ // TextColumnFixedWidth = ite.attribute("TextColumnFixedWidth").toDouble();
for(QDomNode itpp = ite.firstChild(); !itpp.isNull(); itpp = itpp.nextSibling() )
{
QDomElement i = itpp.toElement();
Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&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 Sun Jan 4 09:03:09 2015
@@ -605,7 +605,7 @@
}
else if (spf.tagName() == "sf:text-body")
{
- int txPage = 0;
+ // int txPage = 0;
StoryText itemText;
itemText.clear();
itemText.setDoc(m_Doc);
@@ -621,11 +621,12 @@
itemText.setDefaultStyle(newStyle);
for(QDomElement spg = spf.firstChildElement(); !spg.isNull(); spg = spg.nextSiblingElement() )
{
- if (spg.tagName() == "sf:container-hint")
- {
- txPage = spg.attribute("sf:page-index").toInt();
- }
- else if (spg.tagName() == "sf:p")
+ // if (spg.tagName() == "sf:container-hint")
+ // {
+ // txPage = spg.attribute("sf:page-index").toInt();
+ // }
+ // else
+ if (spg.tagName() == "sf:p")
{
ParagraphStyle tmpStyle = newStyle;
if (!spg.attribute("sf:style").isEmpty())
@@ -647,10 +648,10 @@
for(QDomElement sph = spg.firstChildElement(); !sph.isNull(); sph = sph.nextSiblingElement() )
{
totalCount += sph.text().length();
- if (sph.tagName() == "sf:container-hint")
- {
- txPage = sph.attribute("sf:page-index").toInt();
- }
+ // if (sph.tagName() == "sf:container-hint")
+ // {
+ // txPage = sph.attribute("sf:page-index").toInt();
+ // }
}
}
int count = spg.text().length();
Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&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 Sun Jan 4 09:03:09 2015
@@ -381,9 +381,9 @@
if (vExt == -1)
{
ts >> dummy;
- quint32 xres, yres;
- xres = 72;
- yres = 72;
+ // quint32 xres, yres;
+ // xres = 72;
+ // yres = 72;
resX = 1.0;
resY = 1.0;
qint32 pgX2, pgY2, pgW2, pgH2;
Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp Sun Jan 4 09:03:09 2015
@@ -602,29 +602,29 @@
if (info.isDict())
{
Object obj;
- GooString *s1;
+ // GooString *s1;
Dict *infoDict = info.getDict();
if (infoDict->lookup((char*)"Title", &obj )->isString())
{
- s1 = obj.getString();
+ // s1 = obj.getString();
m_Doc->documentInfo().setTitle(UnicodeParsedString(obj.getString()));
obj.free();
}
if (infoDict->lookup((char*)"Author", &obj )->isString())
{
- s1 = obj.getString();
+ // s1 = obj.getString();
m_Doc->documentInfo().setAuthor(UnicodeParsedString(obj.getString()));
obj.free();
}
if (infoDict->lookup((char*)"Subject", &obj )->isString())
{
- s1 = obj.getString();
+ // s1 = obj.getString();
m_Doc->documentInfo().setSubject(UnicodeParsedString(obj.getString()));
obj.free();
}
if (infoDict->lookup((char*)"Keywords", &obj )->isString())
{
- s1 = obj.getString();
+ // s1 = obj.getString();
m_Doc->documentInfo().setKeywords(UnicodeParsedString(obj.getString()));
obj.free();
}
Modified: trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&path=/trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/slaoutput.cpp Sun Jan 4 09:03:09 2015
@@ -2254,8 +2254,8 @@
gfx->display(str);
gElements = m_groupStack.pop();
m_doc->m_Selection->clear();
- double pwidth = 0;
- double pheight = 0;
+// double pwidth = 0;
+// double pheight = 0;
if (gElements.Items.count() > 0)
{
for (int dre = 0; dre < gElements.Items.count(); ++dre)
@@ -2281,8 +2281,8 @@
m_doc->DoDrawing = false;
pat.width = ite->width();
pat.height = ite->height();
- pwidth = ite->width();
- pheight = ite->height();
+ // pwidth = ite->width();
+ // pheight = ite->height();
ite->gXpos = 0;
ite->gYpos = 0;
ite->setXYPos(ite->gXpos, ite->gYpos, true);
Modified: trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&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 Sun Jan 4 09:03:09 2015
@@ -331,9 +331,9 @@
}
if(propList["draw:fill"] && propList["draw:fill"]->getStr() == "gradient")
{
- double angle = 0;
- if (propList["draw:angle"])
- angle = propList["draw:angle"]->getDouble();
+ // double angle = 0;
+ // if (propList["draw:angle"])
+ // angle = propList["draw:angle"]->getDouble();
double opacity = 1.0;
librevenge::RVNGPropertyListVector gradient;
if (propList.child("svg:linearGradient"))
Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&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 Sun Jan 4 09:03:09 2015
@@ -133,7 +133,8 @@
interactive = (flags & LoadSavePlugin::lfInteractive);
importerFlags = flags;
cancel = false;
- double x, y, b, h;
+// double x, y, b, h;
+ double b, h;
bool ret = false;
QFileInfo fi = QFileInfo(fName);
if ( !ScCore->usingGUI() )
@@ -162,8 +163,8 @@
else
progressDialog = NULL;
/* Set default Page to size defined in Preferences */
- x = 0.0;
- y = 0.0;
+// x = 0.0;
+// y = 0.0;
b = 0.0;
h = 0.0;
if (progressDialog)
@@ -413,12 +414,12 @@
QString defStrokeCol = "Black";
QColor stroke = Qt::black;
QColor fill = Qt::white;
- Qt::PenStyle Dash = Qt::SolidLine;
+// Qt::PenStyle Dash = Qt::SolidLine;
Qt::PenCapStyle LineEnd = Qt::FlatCap;
Qt::PenJoinStyle LineJoin = Qt::MiterJoin;
- int fillStyle = 1;
+// int fillStyle = 1;
double strokewidth = 0.1;
- bool poly = false;
+// bool poly = false;
while(!DOC.isNull())
{
double x1, y1, x2, y2;
@@ -426,9 +427,9 @@
FillCol = defFillCol;
stroke = Qt::black;
fill = Qt::white;
- fillStyle = 1;
+ // fillStyle = 1;
strokewidth = 1.0;
- Dash = Qt::SolidLine;
+ // Dash = Qt::SolidLine;
LineEnd = Qt::FlatCap;
LineJoin = Qt::MiterJoin;
FPointArray PoLine;
@@ -580,7 +581,8 @@
}
else if (STag == "svg:path")
{
- poly = parseSVG( pg.attribute( "d" ), &PoLine );
+ // poly =
+ parseSVG( pg.attribute( "d" ), &PoLine );
if (PoLine.size() < 4)
{
DOC = DOC.nextSibling();
Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&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 Sun Jan 4 09:03:09 2015
@@ -2928,7 +2928,8 @@
gradhelper.gradient.setRepeatMethod( VGradient::none );
QString href = e.attribute("xlink:href").mid(1);
- double x1=0, y1=0, x2=0, y2=0, fx=0, fy=0;
+// double x1=0, y1=0, x2=0, y2=0, fx=0, fy=0;
+ double x1=0, y1=0, x2=0, fx=0, fy=0;
if (!href.isEmpty())
{
if (m_gradients.contains(href))
@@ -3002,7 +3003,7 @@
x2 = parseUnit(e.attribute("r", "0.5"));
gradhelper.x2Valid = true;
}
- y2 = y1;
+ // y2 = y1;
fx = e.hasAttribute("fx") ? parseUnit(e.attribute("fx", ScCLocale::toQStringC(x1))) : x1;
gradhelper.fxValid = true;
fy = e.hasAttribute("fy") ? parseUnit(e.attribute("fy", ScCLocale::toQStringC(y1))) : y1;
Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&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 Sun Jan 4 09:03:09 2015
@@ -994,7 +994,7 @@
double imageXoffs = 0;
double imageYoffs = 0;
double imageScaleX = 1.0;
- double imageScaleY = 1.0;
+// double imageScaleY = 1.0;
double cornerRadius = 0.0;
int ob_type = 0;
bool printable = false;
@@ -1378,8 +1378,8 @@
imageYoffs = parseUnit(eo.text());
else if (eo.tagName() == "vo:scaleHorizontal")
imageScaleX = eo.text().toDouble() / 100.0;
- else if (eo.tagName() == "vo:scaleVertical")
- imageScaleY = eo.text().toDouble() / 100.0;
+ // else if (eo.tagName() == "vo:scaleVertical")
+ // imageScaleY = eo.text().toDouble() / 100.0;
}
}
else if (eog.tagName() == "vo:preview")
Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp (original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp Sun Jan 4 09:03:09 2015
@@ -104,7 +104,7 @@
if ( m_Doc )
{
Q_ASSERT(target.isEmpty());
- Sat = new MenuSAT();
+ MenuSAT* Sat = new MenuSAT();
Sat->RunSATPlug(m_Doc);
delete Sat;
Sat = 0;
Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h (original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.h Sun Jan 4 09:03:09 2015
@@ -72,6 +72,6 @@
~sat();
};
-static MenuSAT* Sat;
+//static MenuSAT* Sat;
#endif
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp Sun Jan 4 09:03:09 2015
@@ -21,7 +21,8 @@
{
double topMargin, bottomMargin, leftMargin, rightMargin;
double pageWidth, pageHeight;
- int orientation, firstPageNr, unit, pagesType, facingPages, firstPageOrder, numPages;
+// int orientation, firstPageNr, unit, pagesType, facingPages, firstPageOrder, numPages;
+ int orientation, firstPageNr, unit, pagesType, firstPageOrder, numPages;
PyObject *p, *m;
@@ -38,11 +39,11 @@
numPages = 1;
if (pagesType == 0)
{
- facingPages = 0;
+ // facingPages = 0;
firstPageOrder = 0;
}
- else
- facingPages = 1;
+// else
+// facingPages = 1;
// checking the bounds
if (pagesType < firstPageOrder)
{
Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19728&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 Sun Jan 4 09:03:09 2015
@@ -140,7 +140,7 @@
//A little hack as for some reason our en dictionary from the aspell plugin was not called en_GB or en_US but en, content was en_GB though. Meh.
if (wordLang=="en")
wordLang="en_GB";
- int spellerIndex=0;
+ // int spellerIndex=0;
//qDebug()<<"Word:"<<word<<wordLang;
if (!dictionaryMap.contains(wordLang))
{
@@ -164,7 +164,7 @@
++i;
++it;
}
- spellerIndex = i;
+ // spellerIndex = i;
}
if (hspellerMap.contains(wordLang) && hspellerMap[wordLang]->spell(word)==0)
More information about the scribus-commit
mailing list