r17810 by fschmid - Silenced some more Compiler warnings.

[scribus-commit]

Author: fschmid
Date: Wed Oct 17 19:35:00 2012
New Revision: 17810

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17810
Log:
Silenced some more Compiler warnings.

Modified:
    trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.cpp
    trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp
    trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
    trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
    trunk/Scribus/scribus/scribusview.cpp
    trunk/Scribus/scribus/text/storytext.cpp

Modified: trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17810&path=/trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.cpp
==============================================================================
--- trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.cpp (original)
+++ trunk/Scribus/scribus/colormgmt/sccolormgmtstructs.cpp Wed Oct 17 19:35:00 2012
@@ -48,6 +48,9 @@
 		break;
 	case Format_LabA_8:
 		type = Color_Lab;
+		break;
+	case Format_Undefined:
+		type = Color_Unknown;
 		break;
 	}
 	return type;

Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17810&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 Wed Oct 17 19:35:00 2012
@@ -127,7 +127,7 @@
 	{
 		bool isOrdered = false;
 		int levelIndex = listLevel - 1;
-		if (levelIndex >= 0 && levelIndex < isOrdered2.size())
+		if (levelIndex >= 0 && levelIndex < static_cast<int>(isOrdered2.size()))
 			isOrdered = isOrdered2[listLevel - 1];
 		if (isOrdered)
 		{

Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17810&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp Wed Oct 17 19:35:00 2012
@@ -167,7 +167,6 @@
 
 QImage ImportCgmPlugin::readThumbnail(const QString& fileName)
 {
-	bool wasUndo = false;
 	if( fileName.isEmpty() )
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);

Modified: trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17810&path=/trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp Wed Oct 17 19:35:00 2012
@@ -159,7 +159,6 @@
 
 QImage ImportPctPlugin::readThumbnail(const QString& fileName)
 {
-	bool wasUndo = false;
 	if( fileName.isEmpty() )
 		return QImage();
 	UndoManager::instance()->setUndoEnabled(false);

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17810&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp Wed Oct 17 19:35:00 2012
@@ -1155,7 +1155,7 @@
 	  << scribus_getframetext__doc__   << scribus_gettext__doc__
 	  << scribus_getlinespace__doc__   << scribus_getcolumngap__doc__
 	  << scribus_getcolumns__doc__     << scribus_setboxtext__doc__
-	  << scribus_inserttext__doc__     << scribus_setfont__doc__
+	  << scribus_inserttext__doc__     << scribus_inserthtmltext__doc__<< scribus_setfont__doc__
 	  << scribus_setfontsize__doc__    << scribus_setlinespace__doc__
 	  << scribus_setcolumngap__doc__   << scribus_setcolumns__doc__
 	  << scribus_setalign__doc__       << scribus_selecttext__doc__

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17810&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Wed Oct 17 19:35:00 2012
@@ -4103,7 +4103,7 @@
 			double miny =  std::numeric_limits<double>::max();
 			double maxx = -std::numeric_limits<double>::max();
 			double maxy = -std::numeric_limits<double>::max();
-			for (uint ep = 0; ep < newGroupedItems.count(); ++ep)
+			for (int ep = 0; ep < newGroupedItems.count(); ++ep)
 			{
 				double x1, x2, y1, y2;
 				newGroupedItems.at(ep)->getVisualBoundingRect(&x1, &y1, &x2, &y2);

Modified: trunk/Scribus/scribus/text/storytext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17810&path=/trunk/Scribus/scribus/text/storytext.cpp
==============================================================================
--- trunk/Scribus/scribus/text/storytext.cpp (original)
+++ trunk/Scribus/scribus/text/storytext.cpp Wed Oct 17 19:35:00 2012
@@ -657,7 +657,7 @@
 	QChar   ch;
 	QString result;
 
-	uint len = length();
+	int len = length();
 	result.reserve(len);
 
 	StoryText* that(const_cast<StoryText*>(this));