r14966 by cbradney - Apply compile patch from #8651

[scribus-commit]

Revision: 14966
Author: cbradney
Date: 2010-04-13T18:52:29.311572Z
Commit message: Apply compile patch from #8651

Changeset: 
M  /trunk/Scribus/scribus/plugins/scripter/api_page.cpp

Diffs:
Index: scribus/plugins/scripter/api_page.cpp
===================================================================
--- scribus/plugins/scripter/api_page.cpp	(revision 14965)
+++ scribus/plugins/scripter/api_page.cpp	(revision 14966)
@@ -182,13 +182,9 @@
 {
     return newItem(
                PageItem::Polygon, PageItem::Rectangle, x, y, width, height,
-               // @xxx: ale
-               // ScCore->primaryMainWindow()->doc->toolSettings.dWidth,
-               // ScCore->primaryMainWindow()->doc->toolSettings.dBrush,
-               // ScCore->primaryMainWindow()->doc->toolSettings.dPen
-               ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineWidth,
-               ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeFillColor,
-               ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineColor);
+               ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth,
+               ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor,
+               ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor);
 }
 
 
@@ -205,13 +201,9 @@
 {
     return newItem(
                PageItem::Polygon, PageItem::Ellipse, x, y, width, height,
-               // @xxx: ale
-               // ScCore->primaryMainWindow()->doc->toolSettings.dWidth,
-               // ScCore->primaryMainWindow()->doc->toolSettings.dBrush,
-               // ScCore->primaryMainWindow()->doc->toolSettings.dPen);
-               ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineWidth,
-               ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeFillColor,
-               ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineColor);
+               ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth,
+               ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor,
+               ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor);
 }
 
 
@@ -231,7 +223,7 @@
                1,
                // @xxx: ale
                // ScCore->primaryMainWindow()->doc->toolSettings.dBrushPict,
-               ScCore->primaryMainWindow()->doc->itemToolPrefs.imageFillColor,
+               ScCore->primaryMainWindow()->doc->itemToolPrefs().imageFillColor,
                CommonStrings::None);
 }
 
@@ -249,12 +241,9 @@
 {
     return newItem(
                PageItem::TextFrame, PageItem::Unspecified, x, y, width, height,
-               // @xxx: ale
-               // ScCore->primaryMainWindow()->doc->toolSettings.dWidth,
-               ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineWidth,
+               ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth,
                CommonStrings::None,
-               // ScCore->primaryMainWindow()->doc->toolSettings.dPenText);
-               ScCore->primaryMainWindow()->doc->itemToolPrefs.textFont);
+               ScCore->primaryMainWindow()->doc->itemToolPrefs().textFont);
 }
 
 
@@ -271,13 +260,9 @@
 {
     PageItem *item = (PageItem*)newItem(
                          PageItem::Line, PageItem::Unspecified, x, y, width, height,
-                         // @xxx: ale
-                         // ScCore->primaryMainWindow()->doc->toolSettings.dWidth,
-                         // ScCore->primaryMainWindow()->doc->toolSettings.dBrush,
-                         // ScCore->primaryMainWindow()->doc->toolSettings.dPen);
-                         ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineWidth,
-                         ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeFillColor,
-                         ScCore->primaryMainWindow()->doc->itemToolPrefs.shapeLineColor);
+                         ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineWidth,
+                         ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeFillColor,
+                         ScCore->primaryMainWindow()->doc->itemToolPrefs().shapeLineColor);
     item->setRotation(xy2Deg(width-x, height-y));
     item->setWidthHeight(sqrt(pow(x-width, 2.0) + pow(y-height, 2.0)), 1.0);
     item->Sizing = false;