summaryrefslogtreecommitdiffstats
path: root/scribus/plugins
diff options
context:
space:
mode:
authorjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-06-25 18:06:29 +0000
committerjghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>2012-06-25 18:06:29 +0000
commitbb38814c256aae1c4442a16eb91a4f5d1fece200 (patch)
tree74bc6b39816eeca9a764466f9dd720a02dc7ba45 /scribus/plugins
parent7efd603c3c10965dda75de63918aaa3843bc0d1a (diff)
downloadscribus-bb38814c256aae1c4442a16eb91a4f5d1fece200.tar.gz
scribus-bb38814c256aae1c4442a16eb91a4f5d1fece200.tar.xz
scribus-bb38814c256aae1c4442a16eb91a4f5d1fece200.zip
fix quite a few build warnings
git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17634 11d20701-8431-0410-a711-e3c959e3b870
Diffstat (limited to 'scribus/plugins')
-rw-r--r--scribus/plugins/import/ai/importai.cpp3
-rw-r--r--scribus/plugins/import/cvg/importcvg.cpp7
-rw-r--r--scribus/plugins/import/oodraw/oodrawimp.cpp6
-rw-r--r--scribus/plugins/import/pct/importpct.cpp3
-rw-r--r--scribus/plugins/import/ps/importps.cpp3
-rw-r--r--scribus/plugins/import/svg/svgplugin.cpp3
-rw-r--r--scribus/plugins/import/wmf/wmfimport.cpp3
-rw-r--r--scribus/plugins/import/xfig/importxfig.cpp3
-rw-r--r--scribus/plugins/svgexplugin/svgexplugin.cpp4
9 files changed, 2 insertions, 33 deletions
diff --git a/scribus/plugins/import/ai/importai.cpp b/scribus/plugins/import/ai/importai.cpp
index 98645c4..b1e9eac 100644
--- a/scribus/plugins/import/ai/importai.cpp
+++ b/scribus/plugins/import/ai/importai.cpp
@@ -200,9 +200,6 @@ bool AIPlug::import(QString fNameIn, const TransactionSettings& trSettings, int
m_Doc->PageColors.insert(it.key(), it.value());
}
Elements.clear();
- FPoint minSize = m_Doc->minCanvasCoordinate;
- FPoint maxSize = m_Doc->maxCanvasCoordinate;
- FPoint cOrigin = m_Doc->view()->canvasOrigin();
m_Doc->view()->Deselect();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
diff --git a/scribus/plugins/import/cvg/importcvg.cpp b/scribus/plugins/import/cvg/importcvg.cpp
index a52071a..0012bfb 100644
--- a/scribus/plugins/import/cvg/importcvg.cpp
+++ b/scribus/plugins/import/cvg/importcvg.cpp
@@ -63,7 +63,7 @@ bool CvgPlug::import(QString fNameIn, const TransactionSettings& trSettings, int
interactive = (flags & LoadSavePlugin::lfInteractive);
importerFlags = flags;
cancel = false;
- double x, y, b, h;
+ double b, h;
bool ret = false;
CustColors.clear();
QFileInfo fi = QFileInfo(fName);
@@ -93,8 +93,6 @@ bool CvgPlug::import(QString fNameIn, const TransactionSettings& trSettings, int
else
progressDialog = NULL;
/* Set default Page to size defined in Preferences */
- x = 0.0;
- y = 0.0;
b = 0.0;
h = 0.0;
if (progressDialog)
@@ -146,9 +144,6 @@ bool CvgPlug::import(QString fNameIn, const TransactionSettings& trSettings, int
m_Doc->m_pageSize = "Custom";
}
Elements.clear();
- FPoint minSize = m_Doc->minCanvasCoordinate;
- FPoint maxSize = m_Doc->maxCanvasCoordinate;
- FPoint cOrigin = m_Doc->view()->canvasOrigin();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
m_Doc->view()->updatesOn(false);
diff --git a/scribus/plugins/import/oodraw/oodrawimp.cpp b/scribus/plugins/import/oodraw/oodrawimp.cpp
index 103fce5..6111964 100644
--- a/scribus/plugins/import/oodraw/oodrawimp.cpp
+++ b/scribus/plugins/import/oodraw/oodrawimp.cpp
@@ -378,9 +378,6 @@ bool OODPlug::convert(const TransactionSettings& trSettings, int flags)
m_Doc->documentInfo.setKeywords(Keys.left(Keys.length()-2));
}
}
- FPoint minSize = m_Doc->minCanvasCoordinate;
- FPoint maxSize = m_Doc->maxCanvasCoordinate;
- FPoint cOrigin = m_Doc->view()->canvasOrigin();
Elements.clear();
m_Doc->view()->Deselect();
m_Doc->setLoading(true);
@@ -2003,6 +2000,3 @@ OODPlug::~OODPlug()
m_styles.clear();
m_draws.clear();
}
-
-
-
diff --git a/scribus/plugins/import/pct/importpct.cpp b/scribus/plugins/import/pct/importpct.cpp
index 27756ba..34a3a02 100644
--- a/scribus/plugins/import/pct/importpct.cpp
+++ b/scribus/plugins/import/pct/importpct.cpp
@@ -147,9 +147,6 @@ bool PctPlug::import(QString fNameIn, const TransactionSettings& trSettings, int
m_Doc->m_pageSize = "Custom";
}
Elements.clear();
- FPoint minSize = m_Doc->minCanvasCoordinate;
- FPoint maxSize = m_Doc->maxCanvasCoordinate;
- FPoint cOrigin = m_Doc->view()->canvasOrigin();
m_Doc->view()->Deselect();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
diff --git a/scribus/plugins/import/ps/importps.cpp b/scribus/plugins/import/ps/importps.cpp
index 7e0e673..f4e52ec 100644
--- a/scribus/plugins/import/ps/importps.cpp
+++ b/scribus/plugins/import/ps/importps.cpp
@@ -214,9 +214,6 @@ bool EPSPlug::import(QString fName, const TransactionSettings &trSettings, int f
}
boundingBoxRect.addRect(0, 0, b-x, h-y);
Elements.clear();
- FPoint minSize = m_Doc->minCanvasCoordinate;
- FPoint maxSize = m_Doc->maxCanvasCoordinate;
- FPoint cOrigin = m_Doc->view()->canvasOrigin();
m_Doc->view()->Deselect();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
diff --git a/scribus/plugins/import/svg/svgplugin.cpp b/scribus/plugins/import/svg/svgplugin.cpp
index abb11e0..5e42597 100644
--- a/scribus/plugins/import/svg/svgplugin.cpp
+++ b/scribus/plugins/import/svg/svgplugin.cpp
@@ -298,9 +298,6 @@ void SVGPlug::convert(const TransactionSettings& trSettings, int flags)
m_Doc->PageOri = 0;
m_Doc->m_pageSize = "Custom";
}
- FPoint minSize = m_Doc->minCanvasCoordinate;
- FPoint maxSize = m_Doc->maxCanvasCoordinate;
- FPoint cOrigin = m_Doc->view()->canvasOrigin();
m_Doc->view()->Deselect();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
diff --git a/scribus/plugins/import/wmf/wmfimport.cpp b/scribus/plugins/import/wmf/wmfimport.cpp
index 5db1597..9a42c58 100644
--- a/scribus/plugins/import/wmf/wmfimport.cpp
+++ b/scribus/plugins/import/wmf/wmfimport.cpp
@@ -567,9 +567,6 @@ bool WMFImport::importWMF(const TransactionSettings& trSettings, int flags)
m_Doc->PageOri = 0;
m_Doc->m_pageSize = "Custom";
}
- FPoint minSize = m_Doc->minCanvasCoordinate;
- FPoint maxSize = m_Doc->maxCanvasCoordinate;
- FPoint cOrigin = m_Doc->view()->canvasOrigin();
m_Doc->view()->Deselect();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
diff --git a/scribus/plugins/import/xfig/importxfig.cpp b/scribus/plugins/import/xfig/importxfig.cpp
index e6eb5b1..782cd9f 100644
--- a/scribus/plugins/import/xfig/importxfig.cpp
+++ b/scribus/plugins/import/xfig/importxfig.cpp
@@ -221,9 +221,6 @@ bool XfigPlug::import(QString fNameIn, const TransactionSettings& trSettings, in
m_Doc->m_pageSize = "Custom";
}
Elements.clear();
- FPoint minSize = m_Doc->minCanvasCoordinate;
- FPoint maxSize = m_Doc->maxCanvasCoordinate;
- FPoint cOrigin = m_Doc->view()->canvasOrigin();
m_Doc->view()->Deselect();
m_Doc->setLoading(true);
m_Doc->DoDrawing = false;
diff --git a/scribus/plugins/svgexplugin/svgexplugin.cpp b/scribus/plugins/svgexplugin/svgexplugin.cpp
index d9d4786..009cb21 100644
--- a/scribus/plugins/svgexplugin/svgexplugin.cpp
+++ b/scribus/plugins/svgexplugin/svgexplugin.cpp
@@ -857,12 +857,10 @@ QDomElement SVGExPlug::processPathTextItem(PageItem *Item, QString trans, QStrin
}
}
}
- double x, y, wide;
+ double wide;
QString chstr;
for (int a = 0; a < Item->itemText.length(); ++a)
{
- x = 0.0;
- y = 0.0;
ScText *hl = Item->itemText.item(a);
const CharStyle& charStyle(Item->itemText.charStyle(a));
chstr = Item->itemText.text(a,1);