r17636 by jghali - fix more build warnings
scribus-commit
scribus-commit at lists.scribus.net
Mon Jun 25 20:19:29 UTC 2012
Author: jghali
Date: Mon Jun 25 20:19:28 2012
New Revision: 17636
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17636
Log:
fix more build warnings
Modified:
branches/Version14x/Scribus/scribus/canvasmode_edit.cpp
branches/Version14x/Scribus/scribus/canvasmode_editgradient.cpp
branches/Version14x/Scribus/scribus/canvasmode_nodeedit.cpp
branches/Version14x/Scribus/scribus/pageitem_pathtext.cpp
branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
branches/Version14x/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
branches/Version14x/Scribus/scribus/scpageoutput.cpp
branches/Version14x/Scribus/scribus/scpainterex_ps2.cpp
Modified: branches/Version14x/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17636&path=/branches/Version14x/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/canvasmode_edit.cpp (original)
+++ branches/Version14x/Scribus/scribus/canvasmode_edit.cpp Mon Jun 25 20:19:28 2012
@@ -594,8 +594,6 @@
const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
bool inText;
- double Rxp = 0;
- double Ryp = 0;
PageItem *currItem;
m_canvas->PaintSizeRect(QRect());
FPoint npf, npf2;
@@ -609,8 +607,6 @@
m_view->registerMousePress(m->globalPos());
Mxp = mousePointDoc.x();
Myp = mousePointDoc.y();
- Ryp = Myp;
- Rxp = Mxp;
SeRx = Mxp;
SeRy = Myp;
if (m->button() == Qt::MidButton)
Modified: branches/Version14x/Scribus/scribus/canvasmode_editgradient.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17636&path=/branches/Version14x/Scribus/scribus/canvasmode_editgradient.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/canvasmode_editgradient.cpp (original)
+++ branches/Version14x/Scribus/scribus/canvasmode_editgradient.cpp Mon Jun 25 20:19:28 2012
@@ -237,9 +237,8 @@
void CanvasMode_EditGradient::mouseReleaseEvent(QMouseEvent *m)
{
#ifdef GESTURE_FRAME_PREVIEW
- clearPixmapCache();
+ clearPixmapCache();
#endif // GESTURE_FRAME_PREVIEW
- const FPoint mousePointDoc = m_canvas->globalToCanvas(m->globalPos());
m_canvas->m_viewMode.m_MouseButtonPressed = false;
m_canvas->resetRenderMode();
m->accept();
Modified: branches/Version14x/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17636&path=/branches/Version14x/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/canvasmode_nodeedit.cpp (original)
+++ branches/Version14x/Scribus/scribus/canvasmode_nodeedit.cpp Mon Jun 25 20:19:28 2012
@@ -1137,7 +1137,7 @@
(m_doc->nodeEdit.submode == NodeEditContext::MOVE_POINT) ||
(m_doc->nodeEdit.submode == NodeEditContext::SPLIT_PATH && m_doc->nodeEdit.EdPoints))
{
- FPoint mousePoint = m_canvas->globalToCanvas(m->globalPos());
+ //FPoint mousePoint = m_canvas->globalToCanvas(m->globalPos());
for (uint poi=0; poi<Clip.size()-3; poi += 4)
{
// create bezier curve in canvas coords
Modified: branches/Version14x/Scribus/scribus/pageitem_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17636&path=/branches/Version14x/Scribus/scribus/pageitem_pathtext.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pageitem_pathtext.cpp (original)
+++ branches/Version14x/Scribus/scribus/pageitem_pathtext.cpp Mon Jun 25 20:19:28 2012
@@ -77,13 +77,11 @@
firstChar = 0;
MaxChars = 0;
int a;
- double chs;
QString chstr;
ScText *hl;
double dx;
FPoint point = FPoint(0, 0);
FPoint tangent = FPoint(0, 0);
- uint seg = 0;
QColor tmp;
CurX = Extra;
QString cachedStroke = "";
@@ -176,7 +174,6 @@
if (chstr[0] == SpecialChars::PAGENUMBER || chstr[0] == SpecialChars::PARSEP || chstr[0] == SpecialChars::PAGECOUNT
|| chstr[0] == SpecialChars::TAB || chstr[0] == SpecialChars::LINEBREAK)
continue;
- chs = hl->fontSize();
if (a < itemText.length()-1)
chstr += itemText.text(a+1, 1);
hl->glyph.yadvance = 0;
Modified: branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17636&path=/branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Mon Jun 25 20:19:28 2012
@@ -182,7 +182,6 @@
struct ScribusDoc::BookMa bok;
int counter;//, Pgc;
//bool AtFl;
- bool newVersion = false;
QString tmp, tmpf, PgNam, Defont;
QMap<int,int> TableID;
QList<PageItem*> TableItems;
@@ -230,8 +229,6 @@
QDomElement elem=docu.documentElement();
if (elem.tagName() != "SCRIBUSUTF8NEW")
return false;
- if (elem.hasAttribute("Version"))
- newVersion = true;
QDomNode DOC=elem.firstChild();
if (m_mwProgressBar!=0)
{
@@ -2766,9 +2763,8 @@
QMap<int,int> TableID;
QList<PageItem*> TableItems;
QMap<PageItem*, int> groupID;
- int a, counter, baseobj;
+ int a, counter;
double pageX = 0, pageY = 0;
- bool newVersion = false;
bool VorLFound = false;
QMap<int,int> layerTrans;
int maxLayer = 0;
@@ -2806,11 +2802,8 @@
QDomElement elem=docu.documentElement();
if (elem.tagName() != "SCRIBUSUTF8NEW")
return false;
- if (elem.hasAttribute("Version"))
- newVersion = true;
QDomNode DOC=elem.firstChild();
counter = m_Doc->Items->count();
- baseobj = counter;
// PrefsManager* prefsManager=PrefsManager::instance();
while(!DOC.isNull())
{
@@ -3713,8 +3706,3 @@
*num2 = counter2;
return true;
}
-
-
-
-
-
Modified: branches/Version14x/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17636&path=/branches/Version14x/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp (original)
+++ branches/Version14x/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp Mon Jun 25 20:19:28 2012
@@ -168,8 +168,6 @@
ParagraphStyle vg;
struct ScribusDoc::BookMa bok;
int counter;//, Pgc;
- //bool AtFl;
- bool newVersion = false;
QString tmp, tmpf, tmp2, tmp3, tmp4, PgNam, Defont, tmf;
QFont fo;
QMap<int,int> TableID;
@@ -216,8 +214,6 @@
QDomElement elem=docu.documentElement();
if (elem.tagName() != "SCRIBUSUTF8NEW")
return false;
- if (elem.hasAttribute("Version"))
- newVersion = true;
QDomNode DOC=elem.firstChild();
if (m_mwProgressBar!=0)
{
@@ -2022,9 +2018,8 @@
newReplacement = false;
QMap<int,int> TableID;
QList<PageItem*> TableItems;
- int a, counter, baseobj;
+ int a, counter;
double pageX = 0, pageY = 0;
- bool newVersion = false;
bool VorLFound = false;
QMap<int,int> layerTrans;
int maxLayer = 0;
@@ -2062,11 +2057,8 @@
QDomElement elem=docu.documentElement();
if (elem.tagName() != "SCRIBUSUTF8NEW")
return false;
- if (elem.hasAttribute("Version"))
- newVersion = true;
QDomNode DOC=elem.firstChild();
counter = m_Doc->Items->count();
- baseobj = counter;
while(!DOC.isNull())
{
QDomElement dc=DOC.toElement();
Modified: branches/Version14x/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17636&path=/branches/Version14x/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scpageoutput.cpp (original)
+++ branches/Version14x/Scribus/scribus/scpageoutput.cpp Mon Jun 25 20:19:28 2012
@@ -1020,10 +1020,8 @@
ScText *hl;
FPoint point = FPoint(0, 0);
FPoint tangent = FPoint(0, 0);
- uint seg = 0;
double dx;
double CurX = item->textToFrameDistLeft(); // item->CurX = item->textToFrameDistLeft()
- double CurY = 0;
QString actFill, actStroke;
double actFillShade, actStrokeShade;
StoryText& itemText = item->itemText;
@@ -1100,7 +1098,6 @@
int currPathIndex = 0;
for (int a = item->firstInFrame(); a < itemText.length(); ++a)
{
- CurY = 0;
hl = itemText.item(a);
chstr = hl->ch;
if (chstr[0] == SpecialChars::PAGENUMBER || chstr[0] == SpecialChars::PARSEP || chstr[0] == SpecialChars::PAGECOUNT
@@ -1312,9 +1309,8 @@
FPoint ColBound;
QRegion cm;
int a;
- double lineCorr;
ScText *hl;
- double desc, asce, tabDist;
+ double desc, asce;
QRect e2;
painter->save();
@@ -1331,10 +1327,6 @@
painter->setupPolygon(&item->PoLine);
fillPath(item, painter, clip);
}
- if (item->lineColor() != CommonStrings::None)
- lineCorr = item->lineWidth() / 2.0;
- else
- lineCorr = 0;
if ((item->isAnnotation()) && (item->annotation().Type() == 2) && (!item->Pfile.isEmpty()) && (item->PictureIsAvailable) && (item->imageShown()) && (item->annotation().UseIcons()))
{
painter->save();
@@ -1362,7 +1354,6 @@
for (uint ll=0; ll < item->itemText.lines(); ++ll)
{
LineSpec ls = item->itemText.line(ll);
- tabDist = ls.x;
double CurX = ls.x;
for (a = ls.firstItem; a <= ls.lastItem; ++a)
{
@@ -1404,7 +1395,6 @@
else
CurX += hl->glyph.wide();
}
- tabDist = CurX;
}
}
}
Modified: branches/Version14x/Scribus/scribus/scpainterex_ps2.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17636&path=/branches/Version14x/Scribus/scribus/scpainterex_ps2.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scpainterex_ps2.cpp (original)
+++ branches/Version14x/Scribus/scribus/scpainterex_ps2.cpp Mon Jun 25 20:19:28 2012
@@ -969,7 +969,6 @@
int r2, g2, b2;
double cosa, sina;
double ramp1, ramp2;
- double scale1, scale2;
double length, scale;
double x1, y1, x2, y2, dx, dy;
int clipBoxWidth, clipBoxHeight, maxDim;
@@ -988,9 +987,6 @@
maxDim = qRound(sqrt( (double) (clipBoxWidth * clipBoxWidth + clipBoxHeight * clipBoxHeight) )) * 2;
if ( maxDim <= 0 ) return;
- scale1 = sqrt( m_matrix.m11() * m_matrix.m11() + m_matrix.m12() * m_matrix.m12() );
- scale2 = sqrt( m_matrix.m21() * m_matrix.m21() + m_matrix.m22() * m_matrix.m22() );
-
x1 = m_matrix.dx() + gradient.origin().x() * m_matrix.m11();
y1 = m_matrix.dy() + gradient.origin().y() * m_matrix.m22();
x2 = m_matrix.dx() + gradient.vector().x() * m_matrix.m11();
@@ -1073,7 +1069,6 @@
int c2, m2, j2, n2;
double cosa, sina;
double ramp1, ramp2;
- double scale1, scale2;
double length, scale;
double x1, y1, x2, y2, dx, dy;
int clipBoxWidth, clipBoxHeight, maxDim;
@@ -1092,9 +1087,6 @@
maxDim = qRound(sqrt( (double) (clipBoxWidth * clipBoxWidth + clipBoxHeight * clipBoxHeight) )) * 2;
if ( maxDim <= 0 ) return;
- scale1 = sqrt( m_matrix.m11() * m_matrix.m11() + m_matrix.m12() * m_matrix.m12() );
- scale2 = sqrt( m_matrix.m21() * m_matrix.m21() + m_matrix.m22() * m_matrix.m22() );
-
x1 = m_matrix.dx() + gradient.origin().x() * m_matrix.m11();
y1 = m_matrix.dy() + gradient.origin().y() * m_matrix.m22();
x2 = m_matrix.dx() + gradient.vector().x() * m_matrix.m11();
@@ -1191,7 +1183,6 @@
int r1, g1, b1;
int r2, g2, b2;
double ramp1, ramp2;
- double scale1, scale2;
int clipBoxWidth, clipBoxHeight, maxDim;
QList<VColorStopEx*> colorStops = gradient.colorStops();
VColorStopEx stop1( *colorStops[gradient.Stops() - 1] );
@@ -1203,9 +1194,6 @@
clipBoxHeight = rect.height();
maxDim = qRound(sqrt( (double) (clipBoxWidth * clipBoxWidth + clipBoxHeight * clipBoxHeight) )) * 2;
if ( maxDim <= 0 ) return;
-
- scale1 = sqrt( m_matrix.m11() * m_matrix.m11() + m_matrix.m21() * m_matrix.m21() );
- scale2 = sqrt( m_matrix.m12() * m_matrix.m12() + m_matrix.m22() * m_matrix.m22() );
FPoint pc( gradient.origin().x(), gradient.origin().y() );
FPoint pcz( gradient.origin().x(), gradient.origin().y() );
@@ -1278,7 +1266,6 @@
int c1, m1, y1, k1;
int c2, m2, y2, k2;
double ramp1, ramp2;
- double scale1, scale2;
int clipBoxWidth, clipBoxHeight, maxDim;
QList<VColorStopEx*> colorStops = gradient.colorStops();
VColorStopEx stop1( *colorStops[gradient.Stops() - 1] );
@@ -1290,9 +1277,6 @@
clipBoxHeight = rect.height();
maxDim = qRound(sqrt( (double) (clipBoxWidth * clipBoxWidth + clipBoxHeight * clipBoxHeight) )) * 2;
if ( maxDim <= 0 ) return;
-
- scale1 = sqrt( m_matrix.m11() * m_matrix.m11() + m_matrix.m21() * m_matrix.m21() );
- scale2 = sqrt( m_matrix.m12() * m_matrix.m12() + m_matrix.m22() * m_matrix.m22() );
FPoint pc( gradient.origin().x(), gradient.origin().y() );
FPoint pcz( gradient.origin().x(), gradient.origin().y() );
@@ -1388,4 +1372,3 @@
}
r.setCoords( qRound(left), qRound(bottom), qRound(right), qRound(top) );
}
-
More information about the scribus-commit
mailing list