r22333 by jghali -

[scribus-commit]

Author: jghali
Date: Sat Jan  6 23:48:58 2018
New Revision: 22333

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22333
Log:
#15090: apply patch to allow scripter 2 to be built again

Modified:
    trunk/Scribus/scribus/plugins/scripter/api_color.cpp
    trunk/Scribus/scribus/plugins/scripter/api_document.cpp
    trunk/Scribus/scribus/plugins/scripter/api_item.cpp
    trunk/Scribus/scribus/plugins/scripter/api_page.cpp
    trunk/Scribus/scribus/plugins/scripter/api_printer.cpp

Modified: trunk/Scribus/scribus/plugins/scripter/api_color.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22333&path=/trunk/Scribus/scribus/plugins/scripter/api_color.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/api_color.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scripter/api_color.cpp	Sat Jan  6 23:48:58 2018
@@ -118,7 +118,7 @@
 		{
 			RAISE("Color not found in document");
 		}
-		ScCore->primaryMainWindow()->doc->PageColors[colorName].setColorRGB(r, g, b);
+		ScCore->primaryMainWindow()->doc->PageColors[colorName].setRgbColor(r, g, b);
 	}
 	else 
 	{
@@ -127,7 +127,7 @@
 		{
 			RAISE("Color not found in default colors");
 		}
-		(*colorList)[colorName].setColorRGB(r, g, b);
+		(*colorList)[colorName].setRgbColor(r, g, b);
 	}
 }
 

Modified: trunk/Scribus/scribus/plugins/scripter/api_document.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22333&path=/trunk/Scribus/scribus/plugins/scripter/api_document.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/api_document.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scripter/api_document.cpp	Sat Jan  6 23:48:58 2018
@@ -112,7 +112,7 @@
 
 int DocumentAPI::unit()
 {
-	if (!check()) return NULL;
+	if (!check()) return 0;
 	return ScCore->primaryMainWindow()->doc->unitIndex();
 }
 
@@ -446,7 +446,7 @@
 	}
 	else
 	{
-		ScCore->primaryMainWindow()->doc->PageColors[name].setColorRGB(r, g, b);
+		ScCore->primaryMainWindow()->doc->PageColors[name].setRgbColor(r, g, b);
 	}
 	return getColor(name);
 }

Modified: trunk/Scribus/scribus/plugins/scripter/api_item.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22333&path=/trunk/Scribus/scribus/plugins/scripter/api_item.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/api_item.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scripter/api_item.cpp	Sat Jan  6 23:48:58 2018
@@ -232,12 +232,12 @@
 
 bool ItemAPI::reversed()
 {
-	return item->reversed();
+	return false; // item->reversed(); FIXME
 }
 
 void ItemAPI::setReversed(bool value)
 {
-	item->setReversed(value);
+	// item->setReversed(value); FIXME
 }
 
 double ItemAPI::cornerRadius()
@@ -312,7 +312,7 @@
 	}
 	else
 	{
-		ScCore->primaryMainWindow()->doc->MoveItem(ValueToPoint(dx), ValueToPoint(dy), item);
+		ScCore->primaryMainWindow()->doc->moveItem(ValueToPoint(dx), ValueToPoint(dy), item);
 	}
 	// Now restore the selection.
 	ScCore->primaryMainWindow()->view->Deselect();
@@ -346,7 +346,7 @@
 		ScCore->primaryMainWindow()->view->endGroupTransaction();
 	}
 	else
-		ScCore->primaryMainWindow()->doc->MoveItem(pageUnitXToDocX(x) - item->xPos(), pageUnitYToDocY(y) - item->yPos(), item);
+		ScCore->primaryMainWindow()->doc->moveItem(pageUnitXToDocX(x) - item->xPos(), pageUnitYToDocY(y) - item->yPos(), item);
 	// Now restore the selection.
 	ScCore->primaryMainWindow()->view->Deselect();
 	if (hadOrigSelection)
@@ -359,7 +359,7 @@
 		return;
 	if (item == NULL)
 		return;
-	ScCore->primaryMainWindow()->doc->SizeItem(ValueToPoint(width), ValueToPoint(height), item);
+	ScCore->primaryMainWindow()->doc->sizeItem(ValueToPoint(width), ValueToPoint(height), item);
 }
 
 void ItemAPI::rotate(double rot)

Modified: trunk/Scribus/scribus/plugins/scripter/api_page.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22333&path=/trunk/Scribus/scribus/plugins/scripter/api_page.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/api_page.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scripter/api_page.cpp	Sat Jan  6 23:48:58 2018
@@ -167,7 +167,7 @@
 	            itemType, frameType,
 	            pageXtoDocX(x), pageYtoDocY(y),
 	            width, height,
-	            w, fill, outline, true);
+	            w, fill, outline, PageItem::StandardItem);
 	return ScCore->primaryMainWindow()->doc->Items->at(i);
 }
 

Modified: trunk/Scribus/scribus/plugins/scripter/api_printer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22333&path=/trunk/Scribus/scribus/plugins/scripter/api_printer.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/api_printer.cpp	(original)
+++ trunk/Scribus/scribus/plugins/scripter/api_printer.cpp	Sat Jan  6 23:48:58 2018
@@ -94,7 +94,7 @@
 	options.useColor = color;
 	options.mirrorH  = mph;
 	options.mirrorV  = mpv;
-	options.useICC   = useICC;
+	// options.useICC   = useICC; FIXME
 	options.doGCR    = ucr;
 	options.cropMarks  = false;
 	options.bleedMarks = false;