r19730 by fschmid - Some fixes for unsused variables.

scribus-commit scribus-commit at lists.scribus.net
Sun Jan 4 15:03:38 UTC 2015


Author: fschmid
Date: Sun Jan  4 15:03:38 2015
New Revision: 19730

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19730
Log:
Some fixes for unsused variables.

Modified:
    trunk/Scribus/scribus/exif.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pluginmanager.cpp
    trunk/Scribus/scribus/scfonts.cpp
    trunk/Scribus/scribus/scimage.cpp
    trunk/Scribus/scribus/scimgdataloader_jpeg.cpp
    trunk/Scribus/scribus/scimgdataloader_pict.cpp
    trunk/Scribus/scribus/scimgdataloader_ps.cpp
    trunk/Scribus/scribus/scimgdataloader_psd.cpp
    trunk/Scribus/scribus/scimgdataloader_tiff.cpp
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/selectionrubberband.h
    trunk/Scribus/scribus/ui/paintmanager.cpp
    trunk/Scribus/scribus/ui/storyeditor.cpp

Modified: trunk/Scribus/scribus/exif.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/exif.cpp
==============================================================================
--- trunk/Scribus/scribus/exif.cpp (original)
+++ trunk/Scribus/scribus/exif.cpp Sun Jan  4 15:03:38 2015
@@ -781,12 +781,12 @@
 //--------------------------------------------------------------------------
 void ExifData::process_SOFn ( const uchar * Data, int marker )
 {
-	int data_precision, num_components;
-
-	data_precision = Data[2];
+//	int data_precision, num_components;
+
+//	data_precision = Data[2];
 	ExifData::Height = Get16m ( Data+3 );
 	ExifData::Width = Get16m ( Data+5 );
-	num_components = Data[7];
+	int num_components = Data[7];
 
 	if ( num_components == 3 )
 		ExifData::IsColor = 1;

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sun Jan  4 15:03:38 2015
@@ -5127,7 +5127,6 @@
 	bool SnapGridBackup = m_Doc->SnapGrid;
 	bool SnapGuidesBackup = m_Doc->SnapGuides;
 	bool SnapElementBackup = m_Doc->SnapElement;
-	int dummy = 0;
 	m_Doc->SnapElement = false;
 	m_Doc->SnapGrid = false;
 	m_Doc->SnapGuides = false;
@@ -5143,246 +5142,247 @@
 	if (ss)
 	{
 		bool actionFound = checkGradientUndoRedo(ss, isUndo);
-		if (actionFound)
-			dummy = 0;
-		else if (ss->contains("ARC"))
-			restoreArc(ss, isUndo);
-		else if (ss->contains("MASKTYPE"))
-			restoreMaskType(ss, isUndo);
-		else if (ss->contains("POLYGON"))
-			restorePolygon(ss, isUndo);
-		else if (ss->contains("END_ARROWSCALE"))
-			restoreEndArrowScale(ss, isUndo);
-		else if (ss->contains("START_ARROWSCALE"))
-			restoreStartArrowScale(ss, isUndo);
-		else if (ss->contains("IMAGE_ROTATION"))
-			restoreImageRotation(ss, isUndo);
-		else if (ss->contains("ITEM_RESIZE"))
-			restoreResize(ss, isUndo);
-		else if (ss->contains("ITEM_ROTATE"))
-			restoreRotate(ss, isUndo);
-		else if (ss->contains("ITEM_MOVE"))
-			restoreMove(ss, isUndo);
-		else if (ss->contains("FILL"))
-			restoreFill(ss, isUndo);
-		else if (ss->contains("SHADE"))
-			restoreShade(ss, isUndo);
-		else if (ss->contains("LINE_COLOR"))
-			restoreLineColor(ss, isUndo);
-		else if (ss->contains("VERTICAL_ALIGN"))
-			restoreVerticalAlign(ss, isUndo);
-		else if (ss->contains("COLUMNS"))
-			restoreColumns(ss, isUndo);
-		else if (ss->contains("COLUMNSGAP"))
-			restoreColumnsGap(ss, isUndo);
-		else if (ss->contains("LINE_SHADE"))
-			restoreLineShade(ss, isUndo);
-		else if (ss->contains("DELETE_FRAMETEXT"))
-			restoreDeleteFrameText(ss, isUndo);
-		else if (ss->contains("INSERT_FRAMETEXT"))
-			restoreInsertFrameText(ss,isUndo);
-		else if (ss->contains("LOREM_FRAMETEXT"))
-			restoreInsertFrameText(ss,isUndo);
-		else if (ss->contains("APPLY_CHARSTYLE"))
-			restoreCharStyle(ss,isUndo);
-		else if (ss->contains("SET_CHARSTYLE"))
-			restoreSetCharStyle(ss,isUndo);
-		else if (ss->contains("SET_PARASTYLE"))
-			restoreSetParagraphStyle(ss,isUndo);
-		else if (ss->contains("APPLY_PARASTYLE"))
-			restoreParagraphStyle(ss,isUndo);
-		else if (ss->contains("APPLY_DEFAULTPARASTYLE"))
-			restoreDefaultParagraphStyle(ss,isUndo);
-		else if (ss->contains("LEFT_TEXTFRAMEDIST"))
-			restoreLeftTextFrameDist(ss,isUndo);
-		else if (ss->contains("RIGHT_TEXTFRAMEDIST"))
-			restoreRightTextFrameDist(ss,isUndo);
-		else if (ss->contains("TOP_TEXTFRAMEDIST"))
-			restoreTopTextFrameDist(ss,isUndo);
-		else if (ss->contains("BOTTOM_TEXTFRAMEDIST"))
-			restoreBottomTextFrameDist(ss,isUndo);
-		else if (ss->contains("FIRSTLINEOFFSET"))
-			restoreFirstLineOffset(ss,isUndo);
-		else if (ss->contains("PASTE_TEXT"))
-			restorePasteText(ss,isUndo);
-		else if (ss->contains("CORNER_RADIUS"))
-			restoreCornerRadius(ss,isUndo);
-		else if (ss->contains("IMAGEFLIPH"))
-		{
-			select();
-			m_Doc->itemSelection_FlipH();
-		}
-		else if (ss->contains("IMAGEFLIPV"))
-		{
-			select();
-			m_Doc->itemSelection_FlipV();
-		}
-		else if (ss->contains("OVERPRINT"))
-		{
-			if (isUndo)
-				doOverprint=!ss->getBool("OVERPRINT");
-			else
-				doOverprint=ss->getBool("OVERPRINT");
-		}
-		else if (ss->contains("FILLBLENDMODE"))
-		{
-			if (isUndo)
-				fillBlendmodeVal=ss->getInt("FILLBLENDMODE_OLD");
-			else
-				fillBlendmodeVal=ss->getInt("FILLBLENDMODE");
-		}
-		else if (ss->contains("ACTIONPDFANNOTATION"))
-		{
-			if (isUndo)
-				m_isAnnotation=!ss->getBool("ACTIONPDFANNOTATION");
-			else
-				m_isAnnotation=ss->getBool("ACTIONPDFANNOTATION");
-		}
-		else if (ss->contains("ACTIONPDFBOOKMARK"))
-		{
-			if (isUndo)
-				isBookmark=!ss->getBool("ACTIONPDFBOOKMARK");
-			else
-				isBookmark=ss->getBool("ACTIONPDFBOOKMARK");
-		}
-		else if (ss->contains("LINEBLENDMODE"))
-		{
-			if (isUndo)
-				lineBlendmodeVal=ss->getInt("LINEBLENDMODE_OLD");
-			else
-				lineBlendmodeVal=ss->getInt("LINEBLENDMODE");
-		}
-		else if (ss->contains("LOCK"))
-		{
-			select();
-			m_Doc->itemSelection_ToggleLock();
-		}
-		else if (ss->contains("SIZE_LOCK"))
-		{
-			select();
-			m_Doc->itemSelection_ToggleSizeLock();
-		}
-		else if (ss->contains("PRINT_ENABLED"))
-		{
-			select();
-			m_Doc->itemSelection_TogglePrintEnabled();
-		}
-		else if (ss->contains("NEW_NAME"))
-			restoreName(ss, isUndo);
-		else if (ss->contains("SHOW_IMAGE"))
-			restoreShowImage(ss, isUndo);
-		else if (ss->contains("TRANSPARENCY"))
-			restoreFillTP(ss, isUndo);
-		else if (ss->contains("LINE_TRANSPARENCY"))
-			restoreLineTP(ss, isUndo);
-		else if (ss->contains("LINE_STYLE"))
-			restoreLineStyle(ss, isUndo);
-		else if (ss->contains("LINE_END"))
-			restoreLineEnd(ss, isUndo);
-		else if (ss->contains("LINE_JOIN"))
-			restoreLineJoin(ss, isUndo);
-		else if (ss->contains("LINE_WIDTH"))
-			restoreLineWidth(ss, isUndo);
-		else if (ss->contains("CUSTOM_LINE_STYLE"))
-			restoreCustomLineStyle(ss, isUndo);
-		else if (ss->contains("START_ARROW"))
-			restoreArrow(ss, isUndo, true);
-		else if (ss->contains("END_ARROW"))
-			restoreArrow(ss, isUndo, false);
-		else if (ss->contains("PSTYLE"))
-			restorePStyle(ss, isUndo);
-		else if (ss->contains("CONVERT"))
-			restoreType(ss, isUndo);
-		else if (ss->contains("TEXTFLOW_OLDMODE"))
-			restoreTextFlowing(ss, isUndo);
-		else if (ss->contains("SCALE_MODE"))
-			restoreImageScaleMode(ss, isUndo);
-		else if (ss->contains("IMAGE_SCALE"))
-			restoreImageScaleChange(ss, isUndo);
-		else if (ss->contains("IMAGE_OFFSET"))
-			restoreImageOffsetChange(ss, isUndo);	
-		else if (ss->contains("EDIT_CONTOUR"))
-			restorePoly(ss, isUndo, true);
-		else if (ss->contains("EDIT_SHAPE"))
-			restorePoly(ss, isUndo, false);
-		else if (ss->contains("RES_TYP"))
-			restoreResTyp(ss, isUndo);
-		else if (ss->contains("RESET_CONTOUR"))
-			restoreContourLine(ss, isUndo);
-		else if (ss->contains("CHANGE_SHAPE_TYPE"))
-			restoreShapeType(ss, isUndo);
-		else if (ss->contains("UNITEITEM"))
-			restoreUniteItem(ss, isUndo);
-		else if (ss->contains("SPLITITEM"))
-			restoreSplitItem(ss, isUndo);
-		else if (ss->contains("MIRROR_PATH_H"))
-		{
-			bool editContour = m_Doc->nodeEdit.isContourLine;
-			m_Doc->nodeEdit.isContourLine = ss->getBool("IS_CONTOUR");
-			select();
-			m_Doc->MirrorPolyH(m_Doc->m_Selection->itemAt(0));
-			m_Doc->nodeEdit.isContourLine = editContour;
-		}
-		else if (ss->contains("MIRROR_PATH_V"))
-		{
-			bool editContour = m_Doc->nodeEdit.isContourLine;
-			m_Doc->nodeEdit.isContourLine = ss->getBool("IS_CONTOUR");
-			select();
-			m_Doc->MirrorPolyV(m_Doc->m_Selection->itemAt(0));
-			m_Doc->nodeEdit.isContourLine = editContour;
-		}
-		else if (ss->contains("SEND_TO_LAYER"))
-			restoreLayer(ss, isUndo);
-		else if (ss->contains("GET_IMAGE"))
-			restoreGetImage(ss, isUndo);
-		else if (ss->contains("EDIT_SHAPE_OR_CONTOUR"))
-			restoreShapeContour(ss, isUndo);
-		else if (ss->contains("APPLY_IMAGE_EFFECTS"))
-			restoreImageEffects(ss, isUndo);
-		else if (ss->contains("DROP_LINKS"))
-			restoreDropLinks(ss,isUndo);
-		else if (ss->contains("LINK_TEXT_FRAME"))
-			restoreLinkTextFrame(ss,isUndo);
-		else if (ss->contains("UNLINK_TEXT_FRAME"))
-			restoreUnlinkTextFrame(ss,isUndo);
-		else if (ss->contains("REVERSE_TEXT"))
-			restoreReverseText(ss, isUndo);
-		else if (ss->contains("CLEAR_IMAGE"))
-			restoreClearImage(ss,isUndo);
-		else if (ss->contains("PASTE_INLINE"))
-			restorePasteInline(ss,isUndo);
-		else if (ss->contains("TRANSFORM"))
-			restoreTransform(ss, isUndo);
-		else if (ss->contains("PATH_OPERATION"))
-			restorePathOperation(ss, isUndo);
-		else if (ss->contains("IMAGE_NBR"))
-			restoreImageNbr(ss, isUndo);
-		else if (ss->contains("CHANGE_MODE"))
-			restoreAppMode(ss, isUndo);
-		else if (ss->contains("CONNECT_PATH"))
-			restoreConnectPath(ss, isUndo);
-		else if (ss->contains("WELD_ITEMS"))
-			restoreWeldItems(ss, isUndo);
-		else if (ss->contains("UNWELD_ITEM"))
-			restoreUnWeldItem(ss, isUndo);
-		else if (ss->contains("CLEARMARKSTRING"))
-			restoreMarkString(ss, isUndo);
-		else if (ss->contains("SOFT_SHADOW"))
-			restoreSoftShadow(ss, isUndo);
-		else if (ss->contains("SOFT_SHADOW_COLOR"))
-			restoreSoftShadowColor(ss, isUndo);
-		else if (ss->contains("SOFT_SHADOW_SHADE"))
-			restoreSoftShadowShade(ss, isUndo);
-		else if (ss->contains("SOFT_SHADOW_BLUR_RADIUS"))
-			restoreSoftShadowBlurRadius(ss, isUndo);
-		else if (ss->contains("SOFT_SHADOW_XOFFSET"))
-			restoreSoftShadowXOffset(ss, isUndo);
-		else if (ss->contains("SOFT_SHADOW_YOFFSET"))
-			restoreSoftShadowYOffset(ss, isUndo);
-		else if (ss->contains("SOFT_SHADOW_OPACITY"))
-			restoreSoftShadowOpacity(ss, isUndo);
-		else if (ss->contains("SOFT_SHADOW_BLEND_MODE"))
-			restoreSoftShadowBlendMode(ss, isUndo);
+		if (!actionFound)
+		{
+			if (ss->contains("ARC"))
+				restoreArc(ss, isUndo);
+			else if (ss->contains("MASKTYPE"))
+				restoreMaskType(ss, isUndo);
+			else if (ss->contains("POLYGON"))
+				restorePolygon(ss, isUndo);
+			else if (ss->contains("END_ARROWSCALE"))
+				restoreEndArrowScale(ss, isUndo);
+			else if (ss->contains("START_ARROWSCALE"))
+				restoreStartArrowScale(ss, isUndo);
+			else if (ss->contains("IMAGE_ROTATION"))
+				restoreImageRotation(ss, isUndo);
+			else if (ss->contains("ITEM_RESIZE"))
+				restoreResize(ss, isUndo);
+			else if (ss->contains("ITEM_ROTATE"))
+				restoreRotate(ss, isUndo);
+			else if (ss->contains("ITEM_MOVE"))
+				restoreMove(ss, isUndo);
+			else if (ss->contains("FILL"))
+				restoreFill(ss, isUndo);
+			else if (ss->contains("SHADE"))
+				restoreShade(ss, isUndo);
+			else if (ss->contains("LINE_COLOR"))
+				restoreLineColor(ss, isUndo);
+			else if (ss->contains("VERTICAL_ALIGN"))
+				restoreVerticalAlign(ss, isUndo);
+			else if (ss->contains("COLUMNS"))
+				restoreColumns(ss, isUndo);
+			else if (ss->contains("COLUMNSGAP"))
+				restoreColumnsGap(ss, isUndo);
+			else if (ss->contains("LINE_SHADE"))
+				restoreLineShade(ss, isUndo);
+			else if (ss->contains("DELETE_FRAMETEXT"))
+				restoreDeleteFrameText(ss, isUndo);
+			else if (ss->contains("INSERT_FRAMETEXT"))
+				restoreInsertFrameText(ss,isUndo);
+			else if (ss->contains("LOREM_FRAMETEXT"))
+				restoreInsertFrameText(ss,isUndo);
+			else if (ss->contains("APPLY_CHARSTYLE"))
+				restoreCharStyle(ss,isUndo);
+			else if (ss->contains("SET_CHARSTYLE"))
+				restoreSetCharStyle(ss,isUndo);
+			else if (ss->contains("SET_PARASTYLE"))
+				restoreSetParagraphStyle(ss,isUndo);
+			else if (ss->contains("APPLY_PARASTYLE"))
+				restoreParagraphStyle(ss,isUndo);
+			else if (ss->contains("APPLY_DEFAULTPARASTYLE"))
+				restoreDefaultParagraphStyle(ss,isUndo);
+			else if (ss->contains("LEFT_TEXTFRAMEDIST"))
+				restoreLeftTextFrameDist(ss,isUndo);
+			else if (ss->contains("RIGHT_TEXTFRAMEDIST"))
+				restoreRightTextFrameDist(ss,isUndo);
+			else if (ss->contains("TOP_TEXTFRAMEDIST"))
+				restoreTopTextFrameDist(ss,isUndo);
+			else if (ss->contains("BOTTOM_TEXTFRAMEDIST"))
+				restoreBottomTextFrameDist(ss,isUndo);
+			else if (ss->contains("FIRSTLINEOFFSET"))
+				restoreFirstLineOffset(ss,isUndo);
+			else if (ss->contains("PASTE_TEXT"))
+				restorePasteText(ss,isUndo);
+			else if (ss->contains("CORNER_RADIUS"))
+				restoreCornerRadius(ss,isUndo);
+			else if (ss->contains("IMAGEFLIPH"))
+			{
+				select();
+				m_Doc->itemSelection_FlipH();
+			}
+			else if (ss->contains("IMAGEFLIPV"))
+			{
+				select();
+				m_Doc->itemSelection_FlipV();
+			}
+			else if (ss->contains("OVERPRINT"))
+			{
+				if (isUndo)
+					doOverprint=!ss->getBool("OVERPRINT");
+				else
+					doOverprint=ss->getBool("OVERPRINT");
+			}
+			else if (ss->contains("FILLBLENDMODE"))
+			{
+				if (isUndo)
+					fillBlendmodeVal=ss->getInt("FILLBLENDMODE_OLD");
+				else
+					fillBlendmodeVal=ss->getInt("FILLBLENDMODE");
+			}
+			else if (ss->contains("ACTIONPDFANNOTATION"))
+			{
+				if (isUndo)
+					m_isAnnotation=!ss->getBool("ACTIONPDFANNOTATION");
+				else
+					m_isAnnotation=ss->getBool("ACTIONPDFANNOTATION");
+			}
+			else if (ss->contains("ACTIONPDFBOOKMARK"))
+			{
+				if (isUndo)
+					isBookmark=!ss->getBool("ACTIONPDFBOOKMARK");
+				else
+					isBookmark=ss->getBool("ACTIONPDFBOOKMARK");
+			}
+			else if (ss->contains("LINEBLENDMODE"))
+			{
+				if (isUndo)
+					lineBlendmodeVal=ss->getInt("LINEBLENDMODE_OLD");
+				else
+					lineBlendmodeVal=ss->getInt("LINEBLENDMODE");
+			}
+			else if (ss->contains("LOCK"))
+			{
+				select();
+				m_Doc->itemSelection_ToggleLock();
+			}
+			else if (ss->contains("SIZE_LOCK"))
+			{
+				select();
+				m_Doc->itemSelection_ToggleSizeLock();
+			}
+			else if (ss->contains("PRINT_ENABLED"))
+			{
+				select();
+				m_Doc->itemSelection_TogglePrintEnabled();
+			}
+			else if (ss->contains("NEW_NAME"))
+				restoreName(ss, isUndo);
+			else if (ss->contains("SHOW_IMAGE"))
+				restoreShowImage(ss, isUndo);
+			else if (ss->contains("TRANSPARENCY"))
+				restoreFillTP(ss, isUndo);
+			else if (ss->contains("LINE_TRANSPARENCY"))
+				restoreLineTP(ss, isUndo);
+			else if (ss->contains("LINE_STYLE"))
+				restoreLineStyle(ss, isUndo);
+			else if (ss->contains("LINE_END"))
+				restoreLineEnd(ss, isUndo);
+			else if (ss->contains("LINE_JOIN"))
+				restoreLineJoin(ss, isUndo);
+			else if (ss->contains("LINE_WIDTH"))
+				restoreLineWidth(ss, isUndo);
+			else if (ss->contains("CUSTOM_LINE_STYLE"))
+				restoreCustomLineStyle(ss, isUndo);
+			else if (ss->contains("START_ARROW"))
+				restoreArrow(ss, isUndo, true);
+			else if (ss->contains("END_ARROW"))
+				restoreArrow(ss, isUndo, false);
+			else if (ss->contains("PSTYLE"))
+				restorePStyle(ss, isUndo);
+			else if (ss->contains("CONVERT"))
+				restoreType(ss, isUndo);
+			else if (ss->contains("TEXTFLOW_OLDMODE"))
+				restoreTextFlowing(ss, isUndo);
+			else if (ss->contains("SCALE_MODE"))
+				restoreImageScaleMode(ss, isUndo);
+			else if (ss->contains("IMAGE_SCALE"))
+				restoreImageScaleChange(ss, isUndo);
+			else if (ss->contains("IMAGE_OFFSET"))
+				restoreImageOffsetChange(ss, isUndo);
+			else if (ss->contains("EDIT_CONTOUR"))
+				restorePoly(ss, isUndo, true);
+			else if (ss->contains("EDIT_SHAPE"))
+				restorePoly(ss, isUndo, false);
+			else if (ss->contains("RES_TYP"))
+				restoreResTyp(ss, isUndo);
+			else if (ss->contains("RESET_CONTOUR"))
+				restoreContourLine(ss, isUndo);
+			else if (ss->contains("CHANGE_SHAPE_TYPE"))
+				restoreShapeType(ss, isUndo);
+			else if (ss->contains("UNITEITEM"))
+				restoreUniteItem(ss, isUndo);
+			else if (ss->contains("SPLITITEM"))
+				restoreSplitItem(ss, isUndo);
+			else if (ss->contains("MIRROR_PATH_H"))
+			{
+				bool editContour = m_Doc->nodeEdit.isContourLine;
+				m_Doc->nodeEdit.isContourLine = ss->getBool("IS_CONTOUR");
+				select();
+				m_Doc->MirrorPolyH(m_Doc->m_Selection->itemAt(0));
+				m_Doc->nodeEdit.isContourLine = editContour;
+			}
+			else if (ss->contains("MIRROR_PATH_V"))
+			{
+				bool editContour = m_Doc->nodeEdit.isContourLine;
+				m_Doc->nodeEdit.isContourLine = ss->getBool("IS_CONTOUR");
+				select();
+				m_Doc->MirrorPolyV(m_Doc->m_Selection->itemAt(0));
+				m_Doc->nodeEdit.isContourLine = editContour;
+			}
+			else if (ss->contains("SEND_TO_LAYER"))
+				restoreLayer(ss, isUndo);
+			else if (ss->contains("GET_IMAGE"))
+				restoreGetImage(ss, isUndo);
+			else if (ss->contains("EDIT_SHAPE_OR_CONTOUR"))
+				restoreShapeContour(ss, isUndo);
+			else if (ss->contains("APPLY_IMAGE_EFFECTS"))
+				restoreImageEffects(ss, isUndo);
+			else if (ss->contains("DROP_LINKS"))
+				restoreDropLinks(ss,isUndo);
+			else if (ss->contains("LINK_TEXT_FRAME"))
+				restoreLinkTextFrame(ss,isUndo);
+			else if (ss->contains("UNLINK_TEXT_FRAME"))
+				restoreUnlinkTextFrame(ss,isUndo);
+			else if (ss->contains("REVERSE_TEXT"))
+				restoreReverseText(ss, isUndo);
+			else if (ss->contains("CLEAR_IMAGE"))
+				restoreClearImage(ss,isUndo);
+			else if (ss->contains("PASTE_INLINE"))
+				restorePasteInline(ss,isUndo);
+			else if (ss->contains("TRANSFORM"))
+				restoreTransform(ss, isUndo);
+			else if (ss->contains("PATH_OPERATION"))
+				restorePathOperation(ss, isUndo);
+			else if (ss->contains("IMAGE_NBR"))
+				restoreImageNbr(ss, isUndo);
+			else if (ss->contains("CHANGE_MODE"))
+				restoreAppMode(ss, isUndo);
+			else if (ss->contains("CONNECT_PATH"))
+				restoreConnectPath(ss, isUndo);
+			else if (ss->contains("WELD_ITEMS"))
+				restoreWeldItems(ss, isUndo);
+			else if (ss->contains("UNWELD_ITEM"))
+				restoreUnWeldItem(ss, isUndo);
+			else if (ss->contains("CLEARMARKSTRING"))
+				restoreMarkString(ss, isUndo);
+			else if (ss->contains("SOFT_SHADOW"))
+				restoreSoftShadow(ss, isUndo);
+			else if (ss->contains("SOFT_SHADOW_COLOR"))
+				restoreSoftShadowColor(ss, isUndo);
+			else if (ss->contains("SOFT_SHADOW_SHADE"))
+				restoreSoftShadowShade(ss, isUndo);
+			else if (ss->contains("SOFT_SHADOW_BLUR_RADIUS"))
+				restoreSoftShadowBlurRadius(ss, isUndo);
+			else if (ss->contains("SOFT_SHADOW_XOFFSET"))
+				restoreSoftShadowXOffset(ss, isUndo);
+			else if (ss->contains("SOFT_SHADOW_YOFFSET"))
+				restoreSoftShadowYOffset(ss, isUndo);
+			else if (ss->contains("SOFT_SHADOW_OPACITY"))
+				restoreSoftShadowOpacity(ss, isUndo);
+			else if (ss->contains("SOFT_SHADOW_BLEND_MODE"))
+				restoreSoftShadowBlendMode(ss, isUndo);
+		}
 	}
 	if (!OnMasterPage.isEmpty())
 		m_Doc->setCurrentPage(oldCurrentPage);
@@ -7096,9 +7096,11 @@
 
 void PageItem::restorePStyle(SimpleState *state, bool isUndo)
 {
-	int styleid = state->getInt("OLD_STYLE");
-	if (!isUndo)
-		styleid = state->getInt("NEW_STYLE");
+	Q_UNUSED(state);
+	Q_UNUSED(isUndo);
+	//int styleid = state->getInt("OLD_STYLE");
+	//if (!isUndo)
+	//	styleid = state->getInt("NEW_STYLE");
 	//will be done later with other text-undo:
 	//	m_Doc->chAbStyle(this, styleid);
 }

Modified: trunk/Scribus/scribus/pluginmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/pluginmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/pluginmanager.cpp (original)
+++ trunk/Scribus/scribus/pluginmanager.cpp Sun Jan  4 15:03:38 2015
@@ -324,10 +324,10 @@
 			else
 			{
 //				QString actionName(ai.menu.toLower()+ai.menuAfterName);
-				QString actionName(ai.menuAfterName);
-				ScrAction* afterAction=0;
-				if (mw->scrActions.contains(actionName))
-					afterAction=mw->scrActions[actionName];
+			//	QString actionName(ai.menuAfterName);
+			//	ScrAction* afterAction=0;
+			//	if (mw->scrActions.contains(actionName))
+			//		afterAction=mw->scrActions[actionName];
 				if ((!ai.subMenuName.isEmpty()) && (!ai.parentMenu.isEmpty()))
 				{
 					if (!mw->scrMenuMgr->menuExists(ai.menu))
@@ -413,10 +413,10 @@
 				}
 				else
 				{
-					QString actionName(ai.seMenu.toLower()+ai.menuAfterName);
-					ScrAction* afterAction=0;
-					if (sew->seActions.contains(actionName))
-						afterAction=sew->seActions[actionName];
+				//	QString actionName(ai.seMenu.toLower()+ai.menuAfterName);
+				//	ScrAction* afterAction=0;
+				//	if (sew->seActions.contains(actionName))
+				//		afterAction=sew->seActions[actionName];
 					if ((!ai.subMenuName.isEmpty()) && (!ai.parentMenu.isEmpty()))
 					{
 						if (!sew->seMenuMgr->menuExists(ai.seMenu))

Modified: trunk/Scribus/scribus/scfonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp (original)
+++ trunk/Scribus/scribus/scfonts.cpp Sun Jan  4 15:03:38 2015
@@ -123,8 +123,9 @@
 		return;
 	FT_Library library = NULL;
 	QString pathfile, fullpath;
-	bool error;
-	error = FT_Init_FreeType( &library );
+//	bool error;
+//	error =
+	FT_Init_FreeType( &library );
 	QString pathname(path);
 	if ( !pathname.endsWith("/") )
 		pathname += "/";
@@ -183,12 +184,12 @@
 				ext = ext2;
 			if ((ext == "ttc") || (ext == "dfont") || (ext == "pfa") || (ext == "pfb") || (ext == "ttf") || (ext == "otf"))
 			{
-				error = AddScalableFont(pathfile, library, DocName);
+				AddScalableFont(pathfile, library, DocName);
 			}
 #ifdef Q_OS_MAC
 			else if (ext.isEmpty() && DocName.isEmpty())
 			{
-				error = AddScalableFont(pathfile, library, DocName);
+				bool error = AddScalableFont(pathfile, library, DocName);
 				if (error)
 					error = AddScalableFont(pathfile + "/..namedfork/rsrc",library, DocName);
 			}
@@ -788,9 +789,9 @@
 	FcObjectSetDestroy(os);
 	FcPatternDestroy(pat);
 	// Create the Freetype library
-	bool error;
+//	bool error;
 	FT_Library library = NULL;
-	error = FT_Init_FreeType( &library );
+	FT_Init_FreeType( &library );
 	// Now iterate over the font files and load them
 	int i;
 	for (i = 0; i < fs->nfont; i++) 
@@ -800,7 +801,7 @@
 		{
 			if (showFontInformation)
 				sDebug(QObject::tr("Loading font %1 (found using fontconfig)").arg(QString((char*)file)));
-			error = AddScalableFont(QString((char*)file), library, "");
+			AddScalableFont(QString((char*)file), library, "");
 		}
 		else
 			if (showFontInformation)

Modified: trunk/Scribus/scribus/scimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/scimage.cpp
==============================================================================
--- trunk/Scribus/scribus/scimage.cpp (original)
+++ trunk/Scribus/scribus/scimage.cpp Sun Jan  4 15:03:38 2015
@@ -2218,7 +2218,7 @@
 	// gsRes - is the resolution that ghostscript will render at
 	bool isCMYK = false;
 	bool ret = false;
-	bool inputProfIsEmbedded = false;
+//	bool inputProfIsEmbedded = false;
 	if (realCMYK != 0)
 		*realCMYK = false;
 	bool bilevel = false;
@@ -2341,7 +2341,7 @@
 		if ((embeddedProfile.size() > 0 ) && (cmSettings.useEmbeddedProfile()))
 		{
 			inputProf = cmSettings.doc()->colorEngine.openProfileFromMem(embeddedProfile);
-			inputProfIsEmbedded = true;
+		//	inputProfIsEmbedded = true;
 		}
 		else
 		{
@@ -2353,7 +2353,7 @@
 				if (ScCore->InputProfilesCMYK.contains(cmSettings.profileName()) && (cmSettings.profileName() != cmSettings.doc()->cmsSettings().DefaultImageCMYKProfile))
 				{
 					imgInfo.profileName = cmSettings.profileName();
-					inputProfIsEmbedded = true;
+				//	inputProfIsEmbedded = true;
 					profilePath = ScCore->InputProfilesCMYK[imgInfo.profileName];
 					inputProf =  cmSettings.doc()->colorEngine.openProfileFromFile(profilePath);
 				}
@@ -2361,7 +2361,7 @@
 				{
 					inputProf = cmSettings.doc()->DocInputImageCMYKProf;
 					imgInfo.profileName = cmSettings.doc()->cmsSettings().DefaultImageCMYKProfile;
-					inputProfIsEmbedded = false;
+				//	inputProfIsEmbedded = false;
 				}
 			}
 			else if (bilevel && (reqType == CMYKData))
@@ -2370,21 +2370,21 @@
 			{
 				imgInfo.profileName = cmSettings.profileName();
 				profilePath = ScCore->InputProfiles[imgInfo.profileName];
-				inputProfIsEmbedded = true;
+			//	inputProfIsEmbedded = true;
 				inputProf = cmSettings.doc()->colorEngine.openProfileFromFile(profilePath);
 			}
 			else
 			{
 				inputProf = cmSettings.doc()->DocInputImageRGBProf;
 				imgInfo.profileName = cmSettings.doc()->cmsSettings().DefaultImageRGBProfile;
-				inputProfIsEmbedded = false;
+			//	inputProfIsEmbedded = false;
 			}
 		}
 	}
 	else if ((cmSettings.useColorManagement() && embeddedProfile.size() > 0) && (cmSettings.useEmbeddedProfile()))
 	{
 		inputProf = cmSettings.doc()->colorEngine.openProfileFromMem(embeddedProfile);
-		inputProfIsEmbedded = true;
+	//	inputProfIsEmbedded = true;
 	}
 	else if (cmSettings.colorManagementAllowed() && isCMYK)
 		inputProf = ScCore->defaultCMYKProfile;

Modified: trunk/Scribus/scribus/scimgdataloader_jpeg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/scimgdataloader_jpeg.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_jpeg.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_jpeg.cpp Sun Jan  4 15:03:38 2015
@@ -105,7 +105,7 @@
 
 bool ScImgDataLoader_JPEG::loadPicture(const QString& fn, int /*page*/, int res, bool thumbnail)
 {
-	bool isCMYK = false;
+//	bool isCMYK = false;
 	bool fromPS = false;
 	float xres = 72.0, yres = 72.0;
 	if (!QFile::exists(fn))
@@ -268,7 +268,7 @@
 	m_imageInfoRecord.yres = qRound(yres);
 	if (cinfo.output_components == 4)
 	{
-		isCMYK = true;
+	//	isCMYK = true;
 		m_imageInfoRecord.colorspace = ColorSpaceCMYK;
 	}
 	else if (cinfo.output_components == 3)
@@ -450,10 +450,10 @@
 				}
 			}
 			m_pixelFormat = Format_YMCK_8;
-			isCMYK = true;
-		}
-		else
-			isCMYK = false;
+		//	isCMYK = true;
+		}
+		//else
+		//	isCMYK = false;
 		if ( cinfo.output_components == 1 )
 		{
 			QImage tmpImg = m_image.convertToFormat(QImage::Format_ARGB32);

Modified: trunk/Scribus/scribus/scimgdataloader_pict.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/scimgdataloader_pict.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_pict.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_pict.cpp Sun Jan  4 15:03:38 2015
@@ -102,9 +102,9 @@
 				if (vExt == -1)
 				{
 					ts >> dummy;
-					quint32 xres, yres;
-					xres = 72;
-					yres = 72;
+				//	quint32 xres, yres;
+				//	xres = 72;
+				//	yres = 72;
 					qint32 pgX2, pgY2, pgW2, pgH2;
 					ts >> pgX2 >> pgY2 >> pgW2 >> pgH2;
 					ts >> dummy;

Modified: trunk/Scribus/scribus/scimgdataloader_ps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/scimgdataloader_ps.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_ps.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_ps.cpp Sun Jan  4 15:03:38 2015
@@ -171,8 +171,7 @@
 				{
 					QByteArray imgc(thumbLen, ' ');
 					f.seek(thumbStart);
-					uint readB = f.read(imgc.data(), thumbLen);
-					readB = 0;
+					f.read(imgc.data(), thumbLen);
 					QString tmpFile = QDir::toNativeSeparators(ScPaths::getTempFileDir() + "preview.tiff");
 					QFile f2(tmpFile);
 					if (f2.open(QIODevice::WriteOnly))
@@ -1426,8 +1425,7 @@
 			if (f.open(QIODevice::ReadOnly))
 			{
 				f.seek(it.value().pos);
-				uint readB = f.read(imgc.data(), it.value().len);
-				readB = 0;
+				f.read(imgc.data(), it.value().len);
 			}
 			f.close();
 			QFile f2(tmpFile2);

Modified: trunk/Scribus/scribus/scimgdataloader_psd.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/scimgdataloader_psd.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_psd.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_psd.cpp Sun Jan  4 15:03:38 2015
@@ -290,7 +290,7 @@
 	uint tmp;
 	uint cdataStart;
 	uint ressourceDataLen;
-	uint startRessource;
+//	uint startRessource;
 
 	s.device()->seek( dataOffset );
 
@@ -486,7 +486,7 @@
 	}
 	s.device()->seek( cdataStart + tmp );
 	s >> ressourceDataLen;
-	startRessource = s.device()->pos();
+//	startRessource = s.device()->pos();
 	if (ressourceDataLen != 0)
 		parseRessourceData(s, header, ressourceDataLen);
 	return true;
@@ -995,8 +995,8 @@
 			startSrcX = 0;
 			startDstX = layerInfo[layer].xpos;
 		}
-		unsigned int startSrcYm, startSrcXm, startDstYm, startDstXm;
-		if (layerInfo[layer].maskYpos < 0)
+		unsigned int startSrcXm; //, startSrcYm, startDstYm, startDstXm;
+	/*	if (layerInfo[layer].maskYpos < 0)
 		{
 			startSrcYm = abs(layerInfo[layer].maskYpos);
 			startDstYm = 0;
@@ -1005,16 +1005,16 @@
 		{
 			startSrcYm = 0;
 			startDstYm = layerInfo[layer].maskYpos;
-		}
+		}*/
 		if (layerInfo[layer].maskXpos < 0)
 		{
 			startSrcXm = abs(layerInfo[layer].maskXpos);
-			startDstXm = 0;
+	//		startDstXm = 0;
 		}
 		else
 		{
 			startSrcXm = 0;
-			startDstXm = layerInfo[layer].maskXpos;
+	//		startDstXm = layerInfo[layer].maskXpos;
 		}
 		QString layBlend2 = layerInfo[layer].blend;
 		if ((m_imageInfoRecord.isRequest) && (m_imageInfoRecord.RequestProps.contains(layer)))

Modified: trunk/Scribus/scribus/scimgdataloader_tiff.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/scimgdataloader_tiff.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_tiff.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_tiff.cpp Sun Jan  4 15:03:38 2015
@@ -1468,8 +1468,8 @@
 			startSrcX = 0;
 			startDstX = layerInfo[layer].xpos;
 		}
-		unsigned int startSrcYm, startSrcXm, startDstYm, startDstXm;
-		if (layerInfo[layer].maskYpos < 0)
+		unsigned int startSrcXm; //, startSrcYm, startDstYm, startDstXm;
+	/*	if (layerInfo[layer].maskYpos < 0)
 		{
 			startSrcYm = abs(layerInfo[layer].maskYpos);
 			startDstYm = 0;
@@ -1478,16 +1478,16 @@
 		{
 			startSrcYm = 0;
 			startDstYm = layerInfo[layer].maskYpos;
-		}
+		}*/
 		if (layerInfo[layer].maskXpos < 0)
 		{
 			startSrcXm = abs(layerInfo[layer].maskXpos);
-			startDstXm = 0;
+		//	startDstXm = 0;
 		}
 		else
 		{
 			startSrcXm = 0;
-			startDstXm = layerInfo[layer].maskXpos;
+		//	startDstXm = layerInfo[layer].maskXpos;
 		}
 		QString layBlend2 = layerInfo[layer].blend;
 		if ((m_imageInfoRecord.isRequest) && (m_imageInfoRecord.RequestProps.contains(layer)))

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sun Jan  4 15:03:38 2015
@@ -14760,7 +14760,7 @@
 		return;
 	
 	PageItem *bb;
-	double gx, gy, gh, gw, x, y;
+	double gx, gy, gh, gw; //, x, y;
 	int aa;
 	double sc = 1; //FIXME:av Scale;
 	int drm = rotMode;
@@ -14860,8 +14860,8 @@
 			ma3.translate(gx, gy);
 			ma3.scale(scx, scy);
 			FPoint n(gx-oldPos.x(), gy-oldPos.y());
-			x = ma3.m11() * n.x() + ma3.m21() * n.y() + ma3.dx();
-			y = ma3.m22() * n.y() + ma3.m12() * n.x() + ma3.dy();
+		//	x = ma3.m11() * n.x() + ma3.m21() * n.y() + ma3.dx();
+		//	y = ma3.m22() * n.y() + ma3.m12() * n.x() + ma3.dy();
 		//	MoveItem(gx-x, gy-y, bb);
 			bb->setXYPos(b1.x()+gx, b1.y()+gy);
 			if (oldRot != 0)

Modified: trunk/Scribus/scribus/selectionrubberband.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/selectionrubberband.h
==============================================================================
--- trunk/Scribus/scribus/selectionrubberband.h (original)
+++ trunk/Scribus/scribus/selectionrubberband.h Sun Jan  4 15:03:38 2015
@@ -8,6 +8,7 @@
 
 class SCRIBUS_API SelectionRubberBand : public QRubberBand
 {
+	Q_OBJECT
 	public:
 		SelectionRubberBand(QRubberBand::Shape s, QWidget * p = 0);
 		~SelectionRubberBand();

Modified: trunk/Scribus/scribus/ui/paintmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/ui/paintmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/paintmanager.cpp Sun Jan  4 15:03:38 2015
@@ -368,7 +368,7 @@
 			if (it->parent() == colorItems)
 			{
 				QString curCol = it->text(0);
-				ScColor tmpColor = m_colorList[curCol];
+				//ScColor tmpColor = m_colorList[curCol];
 				bool enableDel  = (!isMandatoryColor(curCol)) && (m_colorList.count() > 1);
 				bool enableEdit = (!isMandatoryColor(curCol));
 				duplicateButton->setEnabled(curCol != "Registration");

Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19730&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Sun Jan  4 15:03:38 2015
@@ -988,7 +988,8 @@
 {
 	emit SideBarUp(false);
 	bool useMimeStyledText = false;
-	int  newParaCount, lengthLastPara, advanceLen = 0;
+	// int  newParaCount, lengthLastPara,
+	int advanceLen = 0;
 	int  pos = textCursor().hasSelection() ? textCursor().selectionStart() : textCursor().position();
 	const QMimeData* mimeData = QApplication::clipboard()->mimeData(QClipboard::Clipboard);
 	if (mimeData->hasFormat("application/x-scribus-styledtext"))
@@ -1013,8 +1014,8 @@
 		if (!data.isEmpty())
 		{
 			data.replace(QRegExp("\r"), "");
-			newParaCount=data.count("\n");
-			lengthLastPara=data.length()-data.lastIndexOf("\n");
+		//	newParaCount=data.count("\n");
+		//	lengthLastPara=data.length()-data.lastIndexOf("\n");
 			data.replace(QRegExp("\n"), SpecialChars::PARSEP);
 //			inserted=true;
 			advanceLen = data.length() /*- newParaCount*/;
@@ -2138,7 +2139,7 @@
 controlling back to story editor - have rest */
 void StoryEditor::doubleClick(int para, int position)
 {
-	int indexFrom=0, indexTo=0;
+	int indexFrom=0; //, indexTo=0;
 	QString selText = Editor->textCursor().selectedText();
 	if (selText.length() == 0 || !m_smartSelection)
 	{
@@ -2146,7 +2147,7 @@
 		return;
 	}
 	indexFrom = Editor->textCursor().selectionStart();
-	indexTo = Editor->textCursor().selectionEnd();
+//	indexTo = Editor->textCursor().selectionEnd();
 	selText =  selText.trimmed();
 	Editor->textCursor().clearSelection();
 	Editor->textCursor().setPosition(indexFrom);




More information about the scribus-commit mailing list