r19080 by craig - Remove include of scribus.h wherever it will build without it. Add back in if you find it needs it. Clean builds ok here
scribus-commit
scribus-commit at lists.scribus.net
Tue Apr 22 21:46:18 UTC 2014
Author: craig
Date: Tue Apr 22 21:46:18 2014
New Revision: 19080
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19080
Log:
Remove include of scribus.h wherever it will build without it. Add back in if you find it needs it. Clean builds ok here
Modified:
trunk/Scribus/scribus/actionmanager.cpp
trunk/Scribus/scribus/gtaction.cpp
trunk/Scribus/scribus/menumanager.cpp
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/pageitem_arc.cpp
trunk/Scribus/scribus/pageitem_group.cpp
trunk/Scribus/scribus/pageitem_imageframe.cpp
trunk/Scribus/scribus/pageitem_line.cpp
trunk/Scribus/scribus/pageitem_noteframe.cpp
trunk/Scribus/scribus/pageitem_pathtext.cpp
trunk/Scribus/scribus/pageitem_polygon.cpp
trunk/Scribus/scribus/pageitem_polyline.cpp
trunk/Scribus/scribus/pageitem_regularpolygon.cpp
trunk/Scribus/scribus/pageitem_spiral.cpp
trunk/Scribus/scribus/pageitem_symbol.cpp
trunk/Scribus/scribus/pdflib_core.cpp
trunk/Scribus/scribus/pluginmanager.cpp
trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
trunk/Scribus/scribus/plugins/colorwheel/cwdialog.h
trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp
trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.h
trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.h
trunk/Scribus/scribus/plugins/import/ai/importai.cpp
trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
trunk/Scribus/scribus/plugins/import/ps/importps.cpp
trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
trunk/Scribus/scribus/plugins/import/wmf/wmfimport.h
trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp
trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
trunk/Scribus/scribus/plugins/short-words/swdialog.cpp
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h
trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.h
trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.h
trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnectdialog.h
trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
trunk/Scribus/scribus/pslib.cpp
trunk/Scribus/scribus/scfonts.cpp
trunk/Scribus/scribus/scimage.cpp
trunk/Scribus/scribus/scimgdataloader_pict.cpp
trunk/Scribus/scribus/scpage.cpp
trunk/Scribus/scribus/scpageoutput.cpp
trunk/Scribus/scribus/scpageoutput_ps2.cpp
trunk/Scribus/scribus/scplugin.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribus.h
trunk/Scribus/scribus/scribuscore.cpp
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusview.cpp
trunk/Scribus/scribus/scribuswin.cpp
trunk/Scribus/scribus/text/sctext_shared.cpp
trunk/Scribus/scribus/text/storytext.cpp
trunk/Scribus/scribus/ui/cpalette.cpp
trunk/Scribus/scribus/ui/edittoolbar.cpp
trunk/Scribus/scribus/ui/hruler.cpp
trunk/Scribus/scribus/ui/layers.cpp
trunk/Scribus/scribus/ui/loremipsum.cpp
trunk/Scribus/scribus/ui/marknote.cpp
trunk/Scribus/scribus/ui/outlinepalette.cpp
trunk/Scribus/scribus/ui/pagepalette_pages.cpp
trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
trunk/Scribus/scribus/ui/paintmanager.cpp
trunk/Scribus/scribus/ui/paintmanager.h
trunk/Scribus/scribus/ui/pluginmanagerprefsgui.cpp
trunk/Scribus/scribus/ui/pluginmanagerprefsgui.h
trunk/Scribus/scribus/ui/preferencesdialog.cpp
trunk/Scribus/scribus/ui/prefs_plugins.cpp
trunk/Scribus/scribus/ui/propertiespalette.cpp
trunk/Scribus/scribus/ui/propertiespalette_group.cpp
trunk/Scribus/scribus/ui/propertiespalette_image.cpp
trunk/Scribus/scribus/ui/propertiespalette_line.cpp
trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp
trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
trunk/Scribus/scribus/ui/propertiespalette_text.cpp
trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
trunk/Scribus/scribus/ui/propertywidget_orphans.cpp
trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
trunk/Scribus/scribus/ui/scdockpalette.cpp
trunk/Scribus/scribus/ui/scrpalettebase.cpp
trunk/Scribus/scribus/ui/sctoolbar.h
trunk/Scribus/scribus/ui/transformdialog.h
trunk/Scribus/scribus/ui/viewtoolbar.cpp
trunk/Scribus/scribus/ui/vruler.cpp
trunk/Scribus/scribus/urllauncher.cpp
trunk/Scribus/scribus/util.cpp
trunk/Scribus/scribus/util_ghostscript.cpp
trunk/Scribus/scribus/util_printer.cpp
Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Tue Apr 22 21:46:18 2014
@@ -21,7 +21,7 @@
#include "actionmanager.h"
#include "appmodes.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scribusview.h"
@@ -160,7 +160,7 @@
//File Menu
connect( (*scrActions)["fileNew"], SIGNAL(triggered()), mainWindow, SLOT(slotFileNew()) );
connect( (*scrActions)["fileNewFromTemplate"], SIGNAL(triggered()), mainWindow, SLOT(newFileFromTemplate()) );
- connect( (*scrActions)["fileOpen"], SIGNAL(triggered()), mainWindow, SLOT(slotDocOpen()) );
+ connect( (*scrActions)["fileOpen"], SIGNAL(triggered()), mainWindow, SLOT(slotFileOpen()) );
connect( (*scrActions)["fileClose"], SIGNAL(triggered()), mainWindow, SLOT(slotFileClose()) );
connect( (*scrActions)["filePrint"], SIGNAL(triggered()), mainWindow, SLOT(slotFilePrint()) );
connect( (*scrActions)["PrintPreview"], SIGNAL(triggered()), mainWindow, SLOT(printPreview()) );
Modified: trunk/Scribus/scribus/gtaction.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/gtaction.cpp
==============================================================================
--- trunk/Scribus/scribus/gtaction.cpp (original)
+++ trunk/Scribus/scribus/gtaction.cpp Tue Apr 22 21:46:18 2014
@@ -45,6 +45,7 @@
#include "scclocale.h"
#include "selection.h"
#include "sccolorengine.h"
+#include "scribusdoc.h"
#include "scribus.h"
#include "undomanager.h"
Modified: trunk/Scribus/scribus/menumanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/menumanager.cpp
==============================================================================
--- trunk/Scribus/scribus/menumanager.cpp (original)
+++ trunk/Scribus/scribus/menumanager.cpp Tue Apr 22 21:46:18 2014
@@ -19,7 +19,7 @@
* *
***************************************************************************/
#include <QMenuBar>
-#include "scribus.h"
+
#include "menumanager.h"
#include "ui/scmenu.h"
#include "scraction.h"
Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Tue Apr 22 21:46:18 2014
@@ -65,7 +65,7 @@
#include "scpainter.h"
#include "scpaths.h"
#include "scpattern.h"
-#include "scribus.h"
+
#include "scribusapp.h"
#include "scribuscore.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/pageitem_arc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem_arc.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_arc.cpp (original)
+++ trunk/Scribus/scribus/pageitem_arc.cpp Tue Apr 22 21:46:18 2014
@@ -36,7 +36,7 @@
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribusstructs.h"
#include "scribusdoc.h"
#include "undomanager.h"
Modified: trunk/Scribus/scribus/pageitem_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem_group.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_group.cpp (original)
+++ trunk/Scribus/scribus/pageitem_group.cpp Tue Apr 22 21:46:18 2014
@@ -33,7 +33,7 @@
#include "scpage.h"
#include "scpaths.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribusstructs.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/pageitem_imageframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem_imageframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_imageframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_imageframe.cpp Tue Apr 22 21:46:18 2014
@@ -37,7 +37,7 @@
#include "scpage.h"
#include "scpaths.h"
#include "scpainter.h"
-#include "scribus.h"
+
#include "scribusstructs.h"
#include "scribuscore.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/pageitem_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem_line.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_line.cpp (original)
+++ trunk/Scribus/scribus/pageitem_line.cpp Tue Apr 22 21:46:18 2014
@@ -36,7 +36,7 @@
#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusstructs.h"
#include "scribusdoc.h"
#include "undomanager.h"
Modified: trunk/Scribus/scribus/pageitem_noteframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem_noteframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_noteframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_noteframe.cpp Tue Apr 22 21:46:18 2014
@@ -4,7 +4,7 @@
#include "appmodes.h"
#include "pageitem.h"
#include "pageitem_textframe.h"
-#include "scribus.h"
+
#include "scribusdoc.h"
#include "undomanager.h"
#include "util_text.h"
Modified: trunk/Scribus/scribus/pageitem_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_pathtext.cpp (original)
+++ trunk/Scribus/scribus/pageitem_pathtext.cpp Tue Apr 22 21:46:18 2014
@@ -24,6 +24,7 @@
#include "pageitem_pathtext.h"
#include <QGridLayout>
#include <QImage>
+#include <QLabel>
#include <QList>
#include <QPainterPath>
@@ -38,7 +39,7 @@
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribusstructs.h"
#include "scribusdoc.h"
#include "undomanager.h"
@@ -449,4 +450,4 @@
clipTrans.rotate(m_rotation);
totalRect = totalRect.united(QRectF(clipTrans.mapRect(Clip.boundingRect())));
totalRect.getCoords(x1, y1, x2, y2);
-}
+}
Modified: trunk/Scribus/scribus/pageitem_polygon.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem_polygon.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_polygon.cpp (original)
+++ trunk/Scribus/scribus/pageitem_polygon.cpp Tue Apr 22 21:46:18 2014
@@ -34,7 +34,7 @@
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribusstructs.h"
#include "scribusdoc.h"
#include "undomanager.h"
Modified: trunk/Scribus/scribus/pageitem_polyline.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem_polyline.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_polyline.cpp (original)
+++ trunk/Scribus/scribus/pageitem_polyline.cpp Tue Apr 22 21:46:18 2014
@@ -36,7 +36,7 @@
#include "scpainter.h"
#include "scpage.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusstructs.h"
#include "scribusdoc.h"
#include "undomanager.h"
Modified: trunk/Scribus/scribus/pageitem_regularpolygon.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem_regularpolygon.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_regularpolygon.cpp (original)
+++ trunk/Scribus/scribus/pageitem_regularpolygon.cpp Tue Apr 22 21:46:18 2014
@@ -34,7 +34,7 @@
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribusstructs.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/pageitem_spiral.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem_spiral.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_spiral.cpp (original)
+++ trunk/Scribus/scribus/pageitem_spiral.cpp Tue Apr 22 21:46:18 2014
@@ -37,7 +37,7 @@
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribusdoc.h"
#include "scribusstructs.h"
#include "undomanager.h"
@@ -350,152 +350,152 @@
return QString();
}
-void PageItem_Spiral::getBoundingRect(double *x1, double *y1, double *x2, double *y2) const
-{
- PageItem::getBoundingRect(x1, y1, x2, y2);
- QRectF totalRect = QRectF(QPointF(*x1, *y1), QPointF(*x2, *y2));
- if (m_startArrowIndex != 0 && PoLine.size() > 0)
- {
- QTransform arrowTrans;
- FPointArray arrow = m_Doc->arrowStyles().at(m_startArrowIndex-1).points.copy();
- arrowTrans.translate(m_xPos, m_yPos);
- arrowTrans.rotate(m_rotation);
- FPoint Start = PoLine.point(0);
- for (int xx = 1; xx < PoLine.size(); xx += 2)
- {
- FPoint Vector = PoLine.point(xx);
- if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
- {
- arrowTrans.translate(Start.x(), Start.y());
- arrowTrans.rotate(atan2(Start.y()-Vector.y(),Start.x()-Vector.x())*(180.0/M_PI));
- arrowTrans.scale(m_startArrowScale / 100.0, m_startArrowScale / 100.0);
- if (NamedLStyle.isEmpty())
- {
- if (m_lineWidth != 0.0)
- arrowTrans.scale(m_lineWidth, m_lineWidth);
- }
- else
- {
- multiLine ml = m_Doc->MLineStyles[NamedLStyle];
- if (ml[ml.size()-1].Width != 0.0)
- arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
- }
- arrow.map(arrowTrans);
- break;
- }
- }
- FPoint minAr = getMinClipF(&arrow);
- FPoint maxAr = getMaxClipF(&arrow);
- totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y())));
- }
- if (m_endArrowIndex != 0 && PoLine.size() >= 2)
- {
- QTransform arrowTrans;
- FPointArray arrow = m_Doc->arrowStyles().at(m_endArrowIndex-1).points.copy();
- arrowTrans.translate(m_xPos, m_yPos);
- arrowTrans.rotate(m_rotation);
- FPoint End = PoLine.point(PoLine.size()-2);
- for (uint xx = PoLine.size()-1; xx > 0; xx -= 2)
- {
- FPoint Vector = PoLine.point(xx);
- if ((End.x() != Vector.x()) || (End.y() != Vector.y()))
- {
- arrowTrans.translate(End.x(), End.y());
- arrowTrans.rotate(atan2(End.y()-Vector.y(),End.x()-Vector.x())*(180.0/M_PI));
- arrowTrans.scale(m_endArrowScale / 100.0, m_endArrowScale / 100.0);
- if (NamedLStyle.isEmpty())
- {
- if (m_lineWidth != 0.0)
- arrowTrans.scale(m_lineWidth, m_lineWidth);
- }
- else
- {
- multiLine ml = m_Doc->MLineStyles[NamedLStyle];
- if (ml[ml.size()-1].Width != 0.0)
- arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
- }
- arrow.map(arrowTrans);
- break;
- }
- }
- FPoint minAr = getMinClipF(&arrow);
- FPoint maxAr = getMaxClipF(&arrow);
- totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y())));
- }
- totalRect.getCoords(x1, y1, x2, y2);
-}
-
-void PageItem_Spiral::getVisualBoundingRect(double * x1, double * y1, double * x2, double * y2) const
-{
- PageItem::getVisualBoundingRect(x1, y1, x2, y2);
- QRectF totalRect(QPointF(*x1, *y1), QPointF(*x2, *y2));
- if (m_startArrowIndex != 0 && PoLine.size() > 0)
- {
- QTransform arrowTrans;
- FPointArray arrow = m_Doc->arrowStyles().at(m_startArrowIndex-1).points.copy();
- arrowTrans.translate(m_xPos, m_yPos);
- arrowTrans.rotate(m_rotation);
- FPoint Start = PoLine.point(0);
- for (int xx = 1; xx < PoLine.size(); xx += 2)
- {
- FPoint Vector = PoLine.point(xx);
- if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
- {
- arrowTrans.translate(Start.x(), Start.y());
- arrowTrans.rotate(atan2(Start.y()-Vector.y(),Start.x()-Vector.x())*(180.0/M_PI));
- arrowTrans.scale(m_startArrowScale / 100.0, m_startArrowScale / 100.0);
- if (NamedLStyle.isEmpty())
- {
- if (m_lineWidth != 0.0)
- arrowTrans.scale(m_lineWidth, m_lineWidth);
- }
- else
- {
- multiLine ml = m_Doc->MLineStyles[NamedLStyle];
- if (ml[ml.size()-1].Width != 0.0)
- arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
- }
- arrow.map(arrowTrans);
- break;
- }
- }
- FPoint minAr = getMinClipF(&arrow);
- FPoint maxAr = getMaxClipF(&arrow);
- totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y())));
- }
- if (m_endArrowIndex != 0 && PoLine.size() >= 2)
- {
- QTransform arrowTrans;
- FPointArray arrow = m_Doc->arrowStyles().at(m_endArrowIndex-1).points.copy();
- arrowTrans.translate(m_xPos, m_yPos);
- arrowTrans.rotate(m_rotation);
- FPoint End = PoLine.point(PoLine.size()-2);
- for (uint xx = PoLine.size()-1; xx > 0; xx -= 2)
- {
- FPoint Vector = PoLine.point(xx);
- if ((End.x() != Vector.x()) || (End.y() != Vector.y()))
- {
- arrowTrans.translate(End.x(), End.y());
- arrowTrans.rotate(atan2(End.y()-Vector.y(),End.x()-Vector.x())*(180.0/M_PI));
- arrowTrans.scale(m_endArrowScale / 100.0, m_endArrowScale / 100.0);
- if (NamedLStyle.isEmpty())
- {
- if (m_lineWidth != 0.0)
- arrowTrans.scale(m_lineWidth, m_lineWidth);
- }
- else
- {
- multiLine ml = m_Doc->MLineStyles[NamedLStyle];
- if (ml[ml.size()-1].Width != 0.0)
- arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
- }
- arrow.map(arrowTrans);
- break;
- }
- }
- FPoint minAr = getMinClipF(&arrow);
- FPoint maxAr = getMaxClipF(&arrow);
- totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y())));
- }
- totalRect.getCoords(x1, y1, x2, y2);
+void PageItem_Spiral::getBoundingRect(double *x1, double *y1, double *x2, double *y2) const
+{
+ PageItem::getBoundingRect(x1, y1, x2, y2);
+ QRectF totalRect = QRectF(QPointF(*x1, *y1), QPointF(*x2, *y2));
+ if (m_startArrowIndex != 0 && PoLine.size() > 0)
+ {
+ QTransform arrowTrans;
+ FPointArray arrow = m_Doc->arrowStyles().at(m_startArrowIndex-1).points.copy();
+ arrowTrans.translate(m_xPos, m_yPos);
+ arrowTrans.rotate(m_rotation);
+ FPoint Start = PoLine.point(0);
+ for (int xx = 1; xx < PoLine.size(); xx += 2)
+ {
+ FPoint Vector = PoLine.point(xx);
+ if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
+ {
+ arrowTrans.translate(Start.x(), Start.y());
+ arrowTrans.rotate(atan2(Start.y()-Vector.y(),Start.x()-Vector.x())*(180.0/M_PI));
+ arrowTrans.scale(m_startArrowScale / 100.0, m_startArrowScale / 100.0);
+ if (NamedLStyle.isEmpty())
+ {
+ if (m_lineWidth != 0.0)
+ arrowTrans.scale(m_lineWidth, m_lineWidth);
+ }
+ else
+ {
+ multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+ if (ml[ml.size()-1].Width != 0.0)
+ arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
+ }
+ arrow.map(arrowTrans);
+ break;
+ }
+ }
+ FPoint minAr = getMinClipF(&arrow);
+ FPoint maxAr = getMaxClipF(&arrow);
+ totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y())));
+ }
+ if (m_endArrowIndex != 0 && PoLine.size() >= 2)
+ {
+ QTransform arrowTrans;
+ FPointArray arrow = m_Doc->arrowStyles().at(m_endArrowIndex-1).points.copy();
+ arrowTrans.translate(m_xPos, m_yPos);
+ arrowTrans.rotate(m_rotation);
+ FPoint End = PoLine.point(PoLine.size()-2);
+ for (uint xx = PoLine.size()-1; xx > 0; xx -= 2)
+ {
+ FPoint Vector = PoLine.point(xx);
+ if ((End.x() != Vector.x()) || (End.y() != Vector.y()))
+ {
+ arrowTrans.translate(End.x(), End.y());
+ arrowTrans.rotate(atan2(End.y()-Vector.y(),End.x()-Vector.x())*(180.0/M_PI));
+ arrowTrans.scale(m_endArrowScale / 100.0, m_endArrowScale / 100.0);
+ if (NamedLStyle.isEmpty())
+ {
+ if (m_lineWidth != 0.0)
+ arrowTrans.scale(m_lineWidth, m_lineWidth);
+ }
+ else
+ {
+ multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+ if (ml[ml.size()-1].Width != 0.0)
+ arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
+ }
+ arrow.map(arrowTrans);
+ break;
+ }
+ }
+ FPoint minAr = getMinClipF(&arrow);
+ FPoint maxAr = getMaxClipF(&arrow);
+ totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y())));
+ }
+ totalRect.getCoords(x1, y1, x2, y2);
+}
+
+void PageItem_Spiral::getVisualBoundingRect(double * x1, double * y1, double * x2, double * y2) const
+{
+ PageItem::getVisualBoundingRect(x1, y1, x2, y2);
+ QRectF totalRect(QPointF(*x1, *y1), QPointF(*x2, *y2));
+ if (m_startArrowIndex != 0 && PoLine.size() > 0)
+ {
+ QTransform arrowTrans;
+ FPointArray arrow = m_Doc->arrowStyles().at(m_startArrowIndex-1).points.copy();
+ arrowTrans.translate(m_xPos, m_yPos);
+ arrowTrans.rotate(m_rotation);
+ FPoint Start = PoLine.point(0);
+ for (int xx = 1; xx < PoLine.size(); xx += 2)
+ {
+ FPoint Vector = PoLine.point(xx);
+ if ((Start.x() != Vector.x()) || (Start.y() != Vector.y()))
+ {
+ arrowTrans.translate(Start.x(), Start.y());
+ arrowTrans.rotate(atan2(Start.y()-Vector.y(),Start.x()-Vector.x())*(180.0/M_PI));
+ arrowTrans.scale(m_startArrowScale / 100.0, m_startArrowScale / 100.0);
+ if (NamedLStyle.isEmpty())
+ {
+ if (m_lineWidth != 0.0)
+ arrowTrans.scale(m_lineWidth, m_lineWidth);
+ }
+ else
+ {
+ multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+ if (ml[ml.size()-1].Width != 0.0)
+ arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
+ }
+ arrow.map(arrowTrans);
+ break;
+ }
+ }
+ FPoint minAr = getMinClipF(&arrow);
+ FPoint maxAr = getMaxClipF(&arrow);
+ totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y())));
+ }
+ if (m_endArrowIndex != 0 && PoLine.size() >= 2)
+ {
+ QTransform arrowTrans;
+ FPointArray arrow = m_Doc->arrowStyles().at(m_endArrowIndex-1).points.copy();
+ arrowTrans.translate(m_xPos, m_yPos);
+ arrowTrans.rotate(m_rotation);
+ FPoint End = PoLine.point(PoLine.size()-2);
+ for (uint xx = PoLine.size()-1; xx > 0; xx -= 2)
+ {
+ FPoint Vector = PoLine.point(xx);
+ if ((End.x() != Vector.x()) || (End.y() != Vector.y()))
+ {
+ arrowTrans.translate(End.x(), End.y());
+ arrowTrans.rotate(atan2(End.y()-Vector.y(),End.x()-Vector.x())*(180.0/M_PI));
+ arrowTrans.scale(m_endArrowScale / 100.0, m_endArrowScale / 100.0);
+ if (NamedLStyle.isEmpty())
+ {
+ if (m_lineWidth != 0.0)
+ arrowTrans.scale(m_lineWidth, m_lineWidth);
+ }
+ else
+ {
+ multiLine ml = m_Doc->MLineStyles[NamedLStyle];
+ if (ml[ml.size()-1].Width != 0.0)
+ arrowTrans.scale(ml[ml.size()-1].Width, ml[ml.size()-1].Width);
+ }
+ arrow.map(arrowTrans);
+ break;
+ }
+ }
+ FPoint minAr = getMinClipF(&arrow);
+ FPoint maxAr = getMaxClipF(&arrow);
+ totalRect = totalRect.united(QRectF(QPointF(minAr.x(), minAr.y()), QPointF(maxAr.x(), maxAr.y())));
+ }
+ totalRect.getCoords(x1, y1, x2, y2);
}
Modified: trunk/Scribus/scribus/pageitem_symbol.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pageitem_symbol.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_symbol.cpp (original)
+++ trunk/Scribus/scribus/pageitem_symbol.cpp Tue Apr 22 21:46:18 2014
@@ -34,7 +34,7 @@
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribusstructs.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Tue Apr 22 21:46:18 2014
@@ -72,7 +72,7 @@
#include "scpage.h"
#include "scpaths.h"
#include "scpattern.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scribusdoc.h"
#include "scstreamfilter_flate.h"
Modified: trunk/Scribus/scribus/pluginmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pluginmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/pluginmanager.cpp (original)
+++ trunk/Scribus/scribus/pluginmanager.cpp Tue Apr 22 21:46:18 2014
@@ -14,7 +14,7 @@
#include "scconfig.h"
-#include "scribus.h"
+
#include "scribusdoc.h"
#include "scribuscore.h"
#include "ui/sctoolbar.h"
Modified: trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/barcodegenerator.cpp Tue Apr 22 21:46:18 2014
@@ -10,7 +10,7 @@
#include "commonstrings.h"
#include "loadsaveplugin.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "undomanager.h"
#include "util_ghostscript.h"
Modified: trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp Tue Apr 22 21:46:18 2014
@@ -5,19 +5,22 @@
for which a new license (GPL+exception) is in place.
*/
+#include "cwdialog.h"
+
#include <QHeaderView>
#include <QMessageBox>
-#include "ui/cmykfw.h"
#include "colorblind.h"
-#include "ui/colorlistbox.h"
#include "commonstrings.h"
-#include "cwdialog.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "sccolorengine.h"
+#include "scribus.h"
+#include "ui/cmykfw.h"
+#include "ui/colorlistbox.h"
#include "ui/propertiespalette.h"
-#include "sccolorengine.h"
#include "util_color.h"
+
CWDialog::CWDialog(QWidget* parent, ScribusDoc* doc, const char* name, bool modal)
Modified: trunk/Scribus/scribus/plugins/colorwheel/cwdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/colorwheel/cwdialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/colorwheel/cwdialog.h (original)
+++ trunk/Scribus/scribus/plugins/colorwheel/cwdialog.h Tue Apr 22 21:46:18 2014
@@ -10,7 +10,8 @@
#include "ui_cwdialog.h"
#include "colorwheelwidget.h"
-#include "scribus.h"
+#include "prefscontext.h"
+
class QSpacerItem;
class QComboBox;
Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp (original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp Tue Apr 22 21:46:18 2014
@@ -15,6 +15,7 @@
#include <QSharedPointer>
#include "scribus.h"
+#include "scribusview.h"
#include "scraction.h"
#include "ui/scmwmenumanager.h"
#include "util.h"
Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.h Tue Apr 22 21:46:18 2014
@@ -8,7 +8,7 @@
#define TEXTFILTER_H
#include "pluginapi.h"
-#include "scribus.h"
+
#include <prefscontext.h>
#include "gtwriter.h"
#include "tffilter.h"
Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp (original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.cpp Tue Apr 22 21:46:18 2014
@@ -25,14 +25,16 @@
***************************************************************************/
#include "xtgscanner.h"
-#include "text/specialchars.h"
-#include "fonts/scface.h"
+
#include <QString>
#include <QList>
#include <QDebug>
#include <QMessageBox>
-class ScribusDoc;
+#include "fonts/scface.h"
+#include "scribusdoc.h"
+#include "text/specialchars.h"
+
XtgScanner::XtgScanner (QString documentName, TextWriter *wr, QString& buffer, bool textOnly, bool prefix)
{
Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.h
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.h (original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/xtgscanner.h Tue Apr 22 21:46:18 2014
@@ -30,7 +30,7 @@
#include "scconfig.h"
#include "textwriter.h"
#include "styles/charstyle.h"
-#include "scribus.h"
+
#include "fontselectdialog.h"
#include <QHash>
Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importai.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importai.cpp Tue Apr 22 21:46:18 2014
@@ -35,7 +35,7 @@
#include "scmimedata.h"
#include "scpaths.h"
#include "scpattern.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp Tue Apr 22 21:46:18 2014
@@ -42,7 +42,7 @@
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp Tue Apr 22 21:46:18 2014
@@ -35,7 +35,7 @@
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp Tue Apr 22 21:46:18 2014
@@ -44,7 +44,7 @@
#include "scmimedata.h"
#include "scpaths.h"
#include "scpattern.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp Tue Apr 22 21:46:18 2014
@@ -46,7 +46,7 @@
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/importodg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/odg/importodg.cpp Tue Apr 22 21:46:18 2014
@@ -51,7 +51,7 @@
#include "scmimedata.h"
#include "scpainter.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/importpages.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pages/importpages.cpp Tue Apr 22 21:46:18 2014
@@ -47,7 +47,7 @@
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpct.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpct.cpp Tue Apr 22 21:46:18 2014
@@ -38,7 +38,7 @@
#include "scmimedata.h"
#include "scpaths.h"
#include "scpattern.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/ps/importps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/ps/importps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/importps.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ps/importps.cpp Tue Apr 22 21:46:18 2014
@@ -29,7 +29,7 @@
#include "scclocale.h"
#include "scmimedata.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshape.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshape.cpp Tue Apr 22 21:46:18 2014
@@ -36,7 +36,7 @@
#include "sclimits.h"
#include "scmimedata.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsml.cpp Tue Apr 22 21:46:18 2014
@@ -35,7 +35,7 @@
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp Tue Apr 22 21:46:18 2014
@@ -33,7 +33,7 @@
#include "scpaths.h"
#include "scpattern.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/importviva.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/viva/importviva.cpp Tue Apr 22 21:46:18 2014
@@ -46,7 +46,7 @@
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Tue Apr 22 21:46:18 2014
@@ -20,7 +20,7 @@
#include <QRegExp>
#include "commonstrings.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "fonts/scfontmetrics.h"
#include "fpointarray.h"
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.h
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimport.h (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimport.h Tue Apr 22 21:46:18 2014
@@ -23,7 +23,6 @@
class FPointArray;
class PageItem;
class ScribusDoc;
-class ScribusMainWindow;
class Selection;
class PrefsManager;
class TransactionSettings;
Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/wmfimportplugin.cpp Tue Apr 22 21:46:18 2014
@@ -13,7 +13,7 @@
#include <QRegExp>
#include "ui/customfdialog.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "prefsfile.h"
Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp Tue Apr 22 21:46:18 2014
@@ -36,7 +36,7 @@
#include "scmimedata.h"
#include "scpaths.h"
#include "scpattern.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxar.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxar.cpp Tue Apr 22 21:46:18 2014
@@ -45,7 +45,7 @@
#include "scmimedata.h"
#include "scpaths.h"
#include "scpattern.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp Tue Apr 22 21:46:18 2014
@@ -33,7 +33,7 @@
#include "scmimedata.h"
#include "scpaths.h"
#include "scpattern.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/importxps.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xps/importxps.cpp Tue Apr 22 21:46:18 2014
@@ -46,7 +46,7 @@
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/pconsole.cpp Tue Apr 22 21:46:18 2014
@@ -18,7 +18,7 @@
#include "prefsmanager.h"
#include "prefsfile.h"
#include "prefscontext.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "util_icon.h"
Modified: trunk/Scribus/scribus/plugins/short-words/swdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/short-words/swdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/swdialog.cpp (original)
+++ trunk/Scribus/scribus/plugins/short-words/swdialog.cpp Tue Apr 22 21:46:18 2014
@@ -18,7 +18,7 @@
#include "version.h"
#include "swdialog.h"
-#include "scribus.h"
+
#include "scpaths.h"
#include "configuration.h"
#include "ui/helpbrowser.h"
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.h Tue Apr 22 21:46:18 2014
@@ -36,7 +36,7 @@
#include "ui_meshdistortiondialog.h"
#include "pluginapi.h"
#include "scribusdoc.h"
-#include "scribus.h"
+
#if defined(_MSC_VER) && !defined(_USE_MATH_DEFINES)
#define _USE_MATH_DEFINES
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.h (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathdialog.h Tue Apr 22 21:46:18 2014
@@ -31,7 +31,7 @@
#include "ui_pathdialogbase.h"
#include "pluginapi.h"
#include "scribusdoc.h"
-#include "scribus.h"
+
class PLUGIN_API PathDialog : public QDialog, Ui::PathDialogBase
{
Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp Tue Apr 22 21:46:18 2014
@@ -13,6 +13,7 @@
#include "scpaths.h"
#include "scribusdoc.h"
#include "scribus.h"
+#include "scribusview.h"
#include "ui/storyeditor.h"
#include "text/specialchars.h"
#include "util.h"
Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.h (original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/lensdialog.h Tue Apr 22 21:46:18 2014
@@ -38,7 +38,7 @@
#include "ui_lensdialogbase.h"
#include "pluginapi.h"
#include "scribusdoc.h"
-#include "scribus.h"
+
class LensDialog;
class PLUGIN_API LensItem : public QGraphicsRectItem
Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnectdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnectdialog.h
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnectdialog.h (original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnectdialog.h Tue Apr 22 21:46:18 2014
@@ -31,7 +31,7 @@
#include "ui_pathconnectdialogbase.h"
#include "pluginapi.h"
#include "scribusdoc.h"
-#include "scribus.h"
+
class PLUGIN_API PathConnectDialog : public QDialog, Ui::PathConnectDialogBase
{
Modified: trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp Tue Apr 22 21:46:18 2014
@@ -28,15 +28,19 @@
#define _USE_MATH_DEFINES
#endif
#include <cmath>
+#include <QPainterPathStroker>
+
#include "pathstroker.h"
+
+#include "appmodes.h"
+#include "commonstrings.h"
#include "pageitem_polygon.h"
-#include "commonstrings.h"
#include "scribuscore.h"
#include "scribusdoc.h"
-#include "appmodes.h"
#include "selection.h"
#include "util.h"
-#include <QPainterPathStroker>
+
+
int pathstroker_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/pslib.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/pslib.cpp
==============================================================================
--- trunk/Scribus/scribus/pslib.cpp (original)
+++ trunk/Scribus/scribus/pslib.cpp Tue Apr 22 21:46:18 2014
@@ -48,7 +48,7 @@
#include "scfonts.h"
#include "scribusapp.h"
#include "scribusdoc.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "selection.h"
#include "scpattern.h"
Modified: trunk/Scribus/scribus/scfonts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scfonts.cpp
==============================================================================
--- trunk/Scribus/scribus/scfonts.cpp (original)
+++ trunk/Scribus/scribus/scfonts.cpp Tue Apr 22 21:46:18 2014
@@ -38,7 +38,7 @@
#include "prefsfile.h"
#include "prefscontext.h"
#include "prefstable.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scribusdoc.h"
#ifdef Q_OS_LINUX
Modified: trunk/Scribus/scribus/scimage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scimage.cpp
==============================================================================
--- trunk/Scribus/scribus/scimage.cpp (original)
+++ trunk/Scribus/scribus/scimage.cpp Tue Apr 22 21:46:18 2014
@@ -8,7 +8,7 @@
#include "cmsettings.h"
#include "scclocale.h"
#include "scimage.h"
-#include "scribus.h"
+
#include "scpaths.h"
#include "scribuscore.h"
#include "scimgdataloader_gimp.h"
Modified: trunk/Scribus/scribus/scimgdataloader_pict.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scimgdataloader_pict.cpp
==============================================================================
--- trunk/Scribus/scribus/scimgdataloader_pict.cpp (original)
+++ trunk/Scribus/scribus/scimgdataloader_pict.cpp Tue Apr 22 21:46:18 2014
@@ -32,7 +32,7 @@
#include "scconfig.h"
#include "scmimedata.h"
#include "scpaths.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/scpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scpage.cpp
==============================================================================
--- trunk/Scribus/scribus/scpage.cpp (original)
+++ trunk/Scribus/scribus/scpage.cpp Tue Apr 22 21:46:18 2014
@@ -27,6 +27,7 @@
#include "appmodes.h"
#include "scpage.h"
#include "scribus.h"
+#include "scribusdoc.h"
#include "selection.h"
#include "undomanager.h"
#include "undostate.h"
Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp (original)
+++ trunk/Scribus/scribus/scpageoutput.cpp Tue Apr 22 21:46:18 2014
@@ -29,7 +29,7 @@
#include "scimage.h"
#include "scpage.h"
#include "scpattern.h"
-#include "scribus.h"
+
#include "scribusdoc.h"
#include "util.h"
#include "util_formats.h"
Modified: trunk/Scribus/scribus/scpageoutput_ps2.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scpageoutput_ps2.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput_ps2.cpp (original)
+++ trunk/Scribus/scribus/scpageoutput_ps2.cpp Tue Apr 22 21:46:18 2014
@@ -14,7 +14,7 @@
#include "scpage.h"
#include "scpageoutput_ps2.h"
#include "scpainterex_ps2.h"
-#include "scribus.h"
+
#include "util.h"
ScPageOutput_Ps2::ScPageOutput_Ps2(QIODevice* dev, ScribusDoc* doc, int pageIndex, ScPs2OutputParams& options)
Modified: trunk/Scribus/scribus/scplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/scplugin.cpp (original)
+++ trunk/Scribus/scribus/scplugin.cpp Tue Apr 22 21:46:18 2014
@@ -7,7 +7,8 @@
#include "scplugin.h"
#include "deferredtask.h"
-#include "scribus.h"
+
+#include "scribusdoc.h"
#include "scribusapp.h"
#include "selection.h"
#include "ui/prefspanel.h"
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Tue Apr 22 21:46:18 2014
@@ -137,7 +137,7 @@
#include "scpaths.h"
#include "scprintengine_ps.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribusdoc.h"
#include "scribusXml.h"
#include "scribusapp.h"
@@ -3671,7 +3671,7 @@
}
}
-bool ScribusMainWindow::slotDocOpen()
+bool ScribusMainWindow::slotFileOpen()
{
PrefsContext* docContext = prefsManager->prefsFile->getContext("docdirs", false);
QString docDir(".");
Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Tue Apr 22 21:46:18 2014
@@ -342,7 +342,7 @@
void pasteFromScrapbook(QString fn);
void importVectorFile();
void rebuildLayersList();
- bool slotDocOpen();
+ bool slotFileOpen();
bool loadDoc(QString);
/**
* @brief Do post loading functions
Modified: trunk/Scribus/scribus/scribuscore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scribuscore.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuscore.cpp (original)
+++ trunk/Scribus/scribus/scribuscore.cpp Tue Apr 22 21:46:18 2014
@@ -18,7 +18,9 @@
* (at your option) any later version. *
* *
***************************************************************************/
-
+
+#include "scribuscore.h"
+
#include <cassert>
#include <iostream>
#include <QByteArray>
@@ -26,6 +28,7 @@
#include <QGlobalStatic>
#include <QMessageBox>
+#include "colormgmt/sccolormgmtenginefactory.h"
#include "commonstrings.h"
#include "filewatcher.h"
#include "localemgr.h"
@@ -33,14 +36,14 @@
#include "prefsmanager.h"
#include "scimagecachemanager.h"
#include "scpaths.h"
+#include "scribus.h"
#include "scribusapp.h"
-#include "scribuscore.h"
#include "ui/splash.h"
#include "undomanager.h"
#include "util.h"
+#include "util_ghostscript.h"
#include "util_icon.h"
-#include "util_ghostscript.h"
-#include "colormgmt/sccolormgmtenginefactory.h"
+
extern ScribusQApp* ScQApp;
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Tue Apr 22 21:46:18 2014
@@ -87,7 +87,7 @@
#include "scpage.h"
#include "scpainter.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribusXml.h"
#include "scribuscore.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Tue Apr 22 21:46:18 2014
@@ -127,7 +127,7 @@
#include "util_formats.h"
#include "util_icon.h"
#include "util_math.h"
-#include "scribus.h"
+
using namespace std;
Modified: trunk/Scribus/scribus/scribuswin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/scribuswin.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuswin.cpp (original)
+++ trunk/Scribus/scribus/scribuswin.cpp Tue Apr 22 21:46:18 2014
@@ -24,9 +24,11 @@
#include "scribuswin.h"
#include <QApplication>
+#include <QDir>
#include <QMessageBox>
#include "scribus.h"
+#include "scribusdoc.h"
#include "commonstrings.h"
#include "ui/storyeditor.h"
#include "util_icon.h"
Modified: trunk/Scribus/scribus/text/sctext_shared.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/text/sctext_shared.cpp
==============================================================================
--- trunk/Scribus/scribus/text/sctext_shared.cpp (original)
+++ trunk/Scribus/scribus/text/sctext_shared.cpp Tue Apr 22 21:46:18 2014
@@ -11,7 +11,7 @@
#include "fpoint.h"
#include "scfonts.h"
-#include "scribus.h"
+
#include "scribusdoc.h"
#include "sctext_shared.h"
#include "util.h"
Modified: trunk/Scribus/scribus/text/storytext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/text/storytext.cpp
==============================================================================
--- trunk/Scribus/scribus/text/storytext.cpp (original)
+++ trunk/Scribus/scribus/text/storytext.cpp Tue Apr 22 21:46:18 2014
@@ -32,7 +32,7 @@
#include "sctext_shared.h"
#include "selection.h"
#include "storytext.h"
-#include "scribus.h"
+//
#include "util.h"
#include "resourcecollection.h"
#include "desaxe/saxiohelper.h"
Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp Tue Apr 22 21:46:18 2014
@@ -58,6 +58,7 @@
#include "scpainter.h"
#include "scpattern.h"
#include "scribus.h"
+#include "scribusview.h"
#include "selection.h"
#include "undomanager.h"
#include "units.h"
Modified: trunk/Scribus/scribus/ui/edittoolbar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/edittoolbar.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/edittoolbar.cpp (original)
+++ trunk/Scribus/scribus/ui/edittoolbar.cpp Tue Apr 22 21:46:18 2014
@@ -24,7 +24,7 @@
#include "edittoolbar.h"
#include "scraction.h"
-#include "scribus.h"
+
EditToolBar::EditToolBar(ScribusMainWindow* parent) : ScToolBar( tr("Edit"), "Edit", parent)
{
Modified: trunk/Scribus/scribus/ui/hruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/hruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hruler.cpp (original)
+++ trunk/Scribus/scribus/ui/hruler.cpp Tue Apr 22 21:46:18 2014
@@ -37,7 +37,7 @@
#include "hruler.h"
#include "prefsmanager.h"
#include "scpage.h"
-#include "scribus.h"
+
#include "scribusdoc.h"
#include "scribusview.h"
#include "selection.h"
Modified: trunk/Scribus/scribus/ui/layers.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/layers.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/layers.cpp (original)
+++ trunk/Scribus/scribus/ui/layers.cpp Tue Apr 22 21:46:18 2014
@@ -34,6 +34,7 @@
#include "sccombobox.h"
#include "ui/scrspinbox.h"
#include "scribus.h"
+#include "scribusdoc.h"
#include "undomanager.h"
#include "util_icon.h"
Modified: trunk/Scribus/scribus/ui/loremipsum.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/loremipsum.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.cpp (original)
+++ trunk/Scribus/scribus/ui/loremipsum.cpp Tue Apr 22 21:46:18 2014
@@ -41,7 +41,7 @@
//#include "pageitem_textframe.h"
#include "prefsmanager.h"
#include "scpaths.h"
-//#include "scribus.h"
+//
#include "scribusdoc.h"
//#include "scribusview.h"
#include "selection.h"
Modified: trunk/Scribus/scribus/ui/marknote.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/marknote.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/marknote.cpp (original)
+++ trunk/Scribus/scribus/ui/marknote.cpp Tue Apr 22 21:46:18 2014
@@ -1,5 +1,5 @@
#include "marknote.h"
-#include "scribus.h"
+
static int lastNotesStyleIndex = 0; //remember last selected notes style
Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Tue Apr 22 21:46:18 2014
@@ -33,6 +33,7 @@
#include "propertiespalette.h"
#include "scpage.h"
#include "scribus.h"
+#include "scribusdoc.h"
#include "selection.h"
#include "undomanager.h"
#include "units.h"
Modified: trunk/Scribus/scribus/ui/pagepalette_pages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/pagepalette_pages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.cpp Tue Apr 22 21:46:18 2014
@@ -25,7 +25,7 @@
#include "pagepalette_widgets.h"
#include "sccombobox.h"
#include "scpage.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scribusview.h"
#include "util_icon.h"
Modified: trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_widgets.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_widgets.cpp Tue Apr 22 21:46:18 2014
@@ -23,7 +23,7 @@
#include "pagepalette_widgets.h"
#include "sccombobox.h"
#include "scpage.h"
-#include "scribus.h"
+
#include "scribusview.h"
#include "util_icon.h"
Modified: trunk/Scribus/scribus/ui/paintmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/paintmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.cpp (original)
+++ trunk/Scribus/scribus/ui/paintmanager.cpp Tue Apr 22 21:46:18 2014
@@ -54,6 +54,7 @@
#include "scclocale.h"
#include "scpainter.h"
#include "scpaths.h"
+#include "scribus.h"
#include "sctextstream.h"
#include "scribusXml.h"
#include "undomanager.h"
Modified: trunk/Scribus/scribus/ui/paintmanager.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/paintmanager.h
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.h (original)
+++ trunk/Scribus/scribus/ui/paintmanager.h Tue Apr 22 21:46:18 2014
@@ -30,7 +30,7 @@
#include "sccolor.h"
#include "scribusapi.h"
#include "scribusdoc.h"
-#include "scribus.h"
+
#include "vgradient.h"
#include "scpattern.h"
Modified: trunk/Scribus/scribus/ui/pluginmanagerprefsgui.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/pluginmanagerprefsgui.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pluginmanagerprefsgui.cpp (original)
+++ trunk/Scribus/scribus/ui/pluginmanagerprefsgui.cpp Tue Apr 22 21:46:18 2014
@@ -11,6 +11,7 @@
#include "pluginmanagerprefsgui.h"
#include "pluginmanager.h"
#include "scraction.h"
+#include "scribus.h"
#include "scplugin.h"
#include "commonstrings.h"
Modified: trunk/Scribus/scribus/ui/pluginmanagerprefsgui.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/pluginmanagerprefsgui.h
==============================================================================
--- trunk/Scribus/scribus/ui/pluginmanagerprefsgui.h (original)
+++ trunk/Scribus/scribus/ui/pluginmanagerprefsgui.h Tue Apr 22 21:46:18 2014
@@ -9,7 +9,9 @@
#include "prefspanel.h"
#include "ui_pluginmanagerprefsgui.h"
-#include "scribus.h"
+
+
+class ScribusMainWindow;
/*! \brief A GUI preferences interface for enabling/disabling plugins. */
Modified: trunk/Scribus/scribus/ui/preferencesdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/preferencesdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/preferencesdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/preferencesdialog.cpp Tue Apr 22 21:46:18 2014
@@ -17,7 +17,7 @@
#include "pluginmanager.h"
#include "prefsmanager.h"
#include "scplugin.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scribusdoc.h"
#include "units.h"
Modified: trunk/Scribus/scribus/ui/prefs_plugins.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/prefs_plugins.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_plugins.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_plugins.cpp Tue Apr 22 21:46:18 2014
@@ -16,7 +16,7 @@
#include "scplugin.h"
#include "scribuscore.h"
#include "scribusdoc.h"
-#include "scribus.h"
+
#include "commonstrings.h"
Prefs_Plugins::Prefs_Plugins(QWidget* parent, ScribusDoc* doc)
Modified: trunk/Scribus/scribus/ui/propertiespalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/propertiespalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.cpp Tue Apr 22 21:46:18 2014
@@ -50,7 +50,7 @@
#include "propertiespalette_xyz.h"
#include "sccombobox.h"
#include "scfonts.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scraction.h"
#include "scribusview.h"
Modified: trunk/Scribus/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_group.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_group.cpp Tue Apr 22 21:46:18 2014
@@ -50,7 +50,7 @@
#include "commonstrings.h"
#include "sccombobox.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scribusview.h"
#include "selection.h"
Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp Tue Apr 22 21:46:18 2014
@@ -17,7 +17,7 @@
#include "pageitem.h"
#include "propertiespalette_utils.h"
#include "sccombobox.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scraction.h"
#include "scribusview.h"
Modified: trunk/Scribus/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp Tue Apr 22 21:46:18 2014
@@ -18,7 +18,7 @@
#include "pageitem_textframe.h"
#include "sccolorengine.h"
#include "sccombobox.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scraction.h"
#include "scribusview.h"
Modified: trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp Tue Apr 22 21:46:18 2014
@@ -15,7 +15,7 @@
#include "sccolorengine.h"
#include "pageitem.h"
#include "propertiespalette_utils.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scraction.h"
#include "scribusview.h"
Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp Tue Apr 22 21:46:18 2014
@@ -23,7 +23,7 @@
#include "sccolorengine.h"
#include "sccombobox.h"
#include "scraction.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scribusview.h"
#include "selection.h"
Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Tue Apr 22 21:46:18 2014
@@ -31,7 +31,7 @@
#include "propertywidget_textcolor.h"
#include "sccombobox.h"
#include "scfonts.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scraction.h"
#include "scribusview.h"
Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Tue Apr 22 21:46:18 2014
@@ -27,7 +27,7 @@
#include "pageitem_textframe.h"
#include "propertiespalette_utils.h"
#include "sccombobox.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "scraction.h"
#include "scribusview.h"
Modified: trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/propertywidget_advanced.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_advanced.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_advanced.cpp Tue Apr 22 21:46:18 2014
@@ -10,6 +10,7 @@
#include "appmodes.h"
#include "pageitem_table.h"
#include "scribus.h"
+#include "scribusdoc.h"
#include "selection.h"
#include "units.h"
#include "util_icon.h"
Modified: trunk/Scribus/scribus/ui/propertywidget_orphans.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/propertywidget_orphans.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_orphans.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_orphans.cpp Tue Apr 22 21:46:18 2014
@@ -7,7 +7,8 @@
#include "propertywidget_orphans.h"
-#include "scribus.h"
+
+#include "scribusdoc.h"
PropertyWidget_Orphans::PropertyWidget_Orphans(QWidget* parent) : QFrame(parent)
{
Modified: trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp (original)
+++ trunk/Scribus/scribus/ui/propertywidget_pathtext.cpp Tue Apr 22 21:46:18 2014
@@ -7,11 +7,12 @@
#include "propertywidget_pathtext.h"
+#include "scribus.h"
#include "scribusdoc.h"
-#include "scribus.h"
#include "selection.h"
#include "units.h"
#include "util_icon.h"
+
PropertyWidget_PathText::PropertyWidget_PathText(QWidget* parent) : QFrame(parent)
{
Modified: trunk/Scribus/scribus/ui/scdockpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/scdockpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scdockpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/scdockpalette.cpp Tue Apr 22 21:46:18 2014
@@ -35,7 +35,7 @@
#include "prefsfile.h"
#include "prefsmanager.h"
#include "scdockpalette.h"
-#include "scribus.h"
+
#include "util.h"
#include "util_icon.h"
Modified: trunk/Scribus/scribus/ui/scrpalettebase.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/scrpalettebase.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/scrpalettebase.cpp (original)
+++ trunk/Scribus/scribus/ui/scrpalettebase.cpp Tue Apr 22 21:46:18 2014
@@ -33,7 +33,7 @@
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "scribus.h"
+
#include "scrpalettebase.h"
#include "util.h"
#include "util_icon.h"
Modified: trunk/Scribus/scribus/ui/sctoolbar.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/sctoolbar.h
==============================================================================
--- trunk/Scribus/scribus/ui/sctoolbar.h (original)
+++ trunk/Scribus/scribus/ui/sctoolbar.h Tue Apr 22 21:46:18 2014
@@ -37,6 +37,8 @@
class PrefsContext;
class QCloseEvent;
class QToolButton;
+
+#include "scribus.h"
class SCRIBUS_API ScToolBar : public QToolBar
{
Modified: trunk/Scribus/scribus/ui/transformdialog.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/transformdialog.h
==============================================================================
--- trunk/Scribus/scribus/ui/transformdialog.h (original)
+++ trunk/Scribus/scribus/ui/transformdialog.h Tue Apr 22 21:46:18 2014
@@ -35,7 +35,7 @@
#include <QString>
#include "ui_transformdialogbase.h"
#include "scribusdoc.h"
-#include "scribus.h"
+
#include "scribusapi.h"
class SCRIBUS_API TransformItem : public QListWidgetItem
Modified: trunk/Scribus/scribus/ui/viewtoolbar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/viewtoolbar.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/viewtoolbar.cpp (original)
+++ trunk/Scribus/scribus/ui/viewtoolbar.cpp Tue Apr 22 21:46:18 2014
@@ -26,7 +26,7 @@
#include <QFont>
#include "scraction.h"
-#include "scribus.h"
+
#include "scribusdoc.h"
#include "scribuscore.h"
Modified: trunk/Scribus/scribus/ui/vruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/ui/vruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/vruler.cpp (original)
+++ trunk/Scribus/scribus/ui/vruler.cpp Tue Apr 22 21:46:18 2014
@@ -36,7 +36,7 @@
#include "canvasgesture_rulermove.h"
#include "prefsmanager.h"
#include "scpage.h"
-#include "scribus.h"
+
#include "scribusdoc.h"
#include "units.h"
#include "vruler.h"
Modified: trunk/Scribus/scribus/urllauncher.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/urllauncher.cpp
==============================================================================
--- trunk/Scribus/scribus/urllauncher.cpp (original)
+++ trunk/Scribus/scribus/urllauncher.cpp Tue Apr 22 21:46:18 2014
@@ -14,7 +14,7 @@
#include "urllauncher.h"
#include "prefsmanager.h"
-#include "scribus.h"
+
#include "scribuscore.h"
#include "util.h"
Modified: trunk/Scribus/scribus/util.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/util.cpp
==============================================================================
--- trunk/Scribus/scribus/util.cpp (original)
+++ trunk/Scribus/scribus/util.cpp Tue Apr 22 21:46:18 2014
@@ -33,7 +33,7 @@
#include "pageitem.h"
#include "pageitem_table.h"
-#include "scribus.h"
+#include "scribusview.h"
#include "scribusdoc.h"
#include "scpainter.h"
Modified: trunk/Scribus/scribus/util_ghostscript.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/util_ghostscript.cpp
==============================================================================
--- trunk/Scribus/scribus/util_ghostscript.cpp (original)
+++ trunk/Scribus/scribus/util_ghostscript.cpp Tue Apr 22 21:46:18 2014
@@ -53,7 +53,7 @@
#include "prefsmanager.h"
#include "scpaths.h"
#include "scribuscore.h"
-#include "scribus.h"
+
#include "util.h"
using namespace std;
Modified: trunk/Scribus/scribus/util_printer.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19080&path=/trunk/Scribus/scribus/util_printer.cpp
==============================================================================
--- trunk/Scribus/scribus/util_printer.cpp (original)
+++ trunk/Scribus/scribus/util_printer.cpp Tue Apr 22 21:46:18 2014
@@ -20,7 +20,7 @@
#include <QByteArray>
#include "util.h"
#include "commonstrings.h"
-#include "scribus.h"
+
#include "scribuscore.h"
QStringList PrinterUtil::getPrinterNames()
More information about the scribus-commit
mailing list