r13805 by jghali - #8308 (unload unused images from RAM) : commit the file interdependency part of the patch

scribus-commit scribus-commit at lists.scribus.net
Sun Aug 2 17:57:36 CEST 2009


Revision: 13805
Author: jghali
Date: 2009-08-02T15:53:06.569309Z
Commit message: #8308 (unload unused images from RAM) : commit the file interdependency part of the patch

Changeset: 
M  /trunk/Scribus/scribus/scpageoutput.h
M  /trunk/Scribus/scribus/canvasmode_panning.cpp
M  /trunk/Scribus/scribus/sccolorengine.cpp
M  /trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
M  /trunk/Scribus/scribus/canvasmode_rotate.cpp
M  /trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.h
M  /trunk/Scribus/scribus/rawimage.h
M  /trunk/Scribus/scribus/style.h
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmdcolor.cpp
M  /trunk/Scribus/scribus/scpageoutput_ps2.cpp
M  /trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.cpp
M  /trunk/Scribus/scribus/scribus.cpp
M  /trunk/Scribus/scribus/plugins/xfigimplugin/importxfig.cpp
M  /trunk/Scribus/scribus/gtwriter.h
M  /trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h
M  /trunk/Scribus/scribus/gtaction.h
M  /trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.cpp
M  /trunk/Scribus/scribus/scpageoutput.cpp
M  /trunk/Scribus/scribus/plugins/gettext/odtim/contentreader.h
M  /trunk/Scribus/scribus/plugins/tools/spellcheck/aspellpluginimpl.h
M  /trunk/Scribus/scribus/scribuswin.cpp
M  /trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.h
M  /trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
M  /trunk/Scribus/scribus/ui/pdfopts.cpp
M  /trunk/Scribus/scribus/scribusXml.h
M  /trunk/Scribus/scribus/latexhelpers.cpp
M  /trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.h
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
M  /trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.h
M  /trunk/Scribus/scribus/plugins/gettext/csvim/csvim.cpp
M  /trunk/Scribus/scribus/gtwriter.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmdgetprop.cpp
M  /trunk/Scribus/scribus/sccolor.h
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
M  /trunk/Scribus/scribus/pslib.h
M  /trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderdialog.h
M  /trunk/Scribus/scribus/plugins/tools/spellcheck/aspellpluginimpl.cpp
M  /trunk/Scribus/scribus/scfonts.cpp
M  /trunk/Scribus/scribus/scribus.h
M  /trunk/Scribus/scribus/plugins/psimport/importps.h
M  /trunk/Scribus/scribus/canvasmode.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp
M  /trunk/Scribus/scribus/plugins/tools/lenseffects/lenseffects.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmdsetprop.cpp
M  /trunk/Scribus/scribus/plugins/tools/transform/transformeffect.cpp
M  /trunk/Scribus/scribus/ui/masterpagepalette.cpp
M  /trunk/Scribus/scribus/scpainterexbase.h
M  /trunk/Scribus/scribus/plugins/fileloader/oodraw/oodrawimp.h
M  /trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
M  /trunk/Scribus/scribus/canvasmode_nodeedit.cpp
M  /trunk/Scribus/scribus/scribusXml.cpp
M  /trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
M  /trunk/Scribus/scribus/plugins/tools/pathcut/pathcut.cpp
M  /trunk/Scribus/scribus/ui/mergedoc.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
M  /trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinderdialog.cpp
M  /trunk/Scribus/scribus/scribusview.h
M  /trunk/Scribus/scribus/scimgdataloader_pdf.cpp
M  /trunk/Scribus/scribus/fonts/scface.cpp
M  /trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.cpp
M  /trunk/Scribus/scribus/hyphenator.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
M  /trunk/Scribus/scribus/plugins/short-words/parse.cpp
M  /trunk/Scribus/scribus/plugins/tools/transform/transformeffect.h
M  /trunk/Scribus/scribus/plugins/tools/spellcheck/aspellplugin.cpp
M  /trunk/Scribus/scribus/guidemanagercore.cpp
M  /trunk/Scribus/scribus/plugins/tools/pathstroker/pathstroker.h
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
M  /trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
M  /trunk/Scribus/scribus/canvasmode_objimport.cpp
M  /trunk/Scribus/scribus/gtaction.cpp
M  /trunk/Scribus/scribus/plugins/aiimplugin/importai.h
M  /trunk/Scribus/scribus/plugins/gettext/odtim/contentreader.cpp
M  /trunk/Scribus/scribus/plugins/xfigimplugin/importxfig.h
M  /trunk/Scribus/scribus/plugins/tools/subdivide/subdivide.h
M  /trunk/Scribus/scribus/plugins/saveastemplateplugin/satdialog.cpp
M  /trunk/Scribus/scribus/plugins/colorwheel/colorwheel.cpp

Diffs:
Index: scribus/hyphenator.cpp
===================================================================
--- scribus/hyphenator.cpp	(revision 13804)
+++ scribus/hyphenator.cpp	(revision 13805)
@@ -36,6 +36,7 @@
 #include "langmgr.h"
 #include "scpaths.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "text/nlsconfig.h"
Index: scribus/gtaction.cpp
===================================================================
--- scribus/gtaction.cpp	(revision 13804)
+++ scribus/gtaction.cpp	(revision 13805)
@@ -28,19 +28,27 @@
 #include <QList>
 #include <QStringList>
 
-#include "ui/missing.h"
 #include "gtaction.h"
-#include "ui/propertiespalette.h"
-#include "scribus.h"
+#include "gtfont.h"
+#include "gtstyle.h"
+#include "gtparagraphstyle.h"
+#include "gtframestyle.h"
+
 #include "color.h"
+#include "commonstrings.h"
 #include "prefsmanager.h"
 #include "hyphenator.h"
 #include "scclocale.h"
 #include "selection.h"
-#include "commonstrings.h"
-#include "util_icon.h"
 #include "sccolorengine.h"
+#include "scribus.h"
 
+#include "util_icon.h"
+#include "ui/propertiespalette.h"
+#include "ui/missing.h"
+
+
+
 // gtAction::gtAction(bool append)
 // {
 // 	prefsManager=PrefsManager::instance();
Index: scribus/pslib.h
===================================================================
--- scribus/pslib.h	(revision 13804)
+++ scribus/pslib.h	(revision 13805)
@@ -33,9 +33,6 @@
 #include <QPen>
 #include <QString>
 
-class ScribusDoc;
-
-#include "page.h"
 #include "scribusapi.h"
 #include "scribusstructs.h"
 #include CMS_INC
@@ -44,6 +41,8 @@
 class ScText;
 #endif
 
+class Page;
+class ScribusDoc;
 class PageItem;
 class MultiProgressDialog;
 class ScImage;
Index: scribus/canvasmode_nodeedit.cpp
===================================================================
--- scribus/canvasmode_nodeedit.cpp	(revision 13804)
+++ scribus/canvasmode_nodeedit.cpp	(revision 13805)
@@ -23,6 +23,7 @@
 #include "fpoint.h"
 #include "pageitem.h"
 #include "ui/pageselector.h"
+#include "ui/scrspinbox.h"
 #include "scraction.h"
 #include "ui/scrapbookpalette.h"
 #include "scribus.h"
@@ -1289,3 +1290,5 @@
 
 
 
+
+
Index: scribus/rawimage.h
===================================================================
--- scribus/rawimage.h	(revision 13804)
+++ scribus/rawimage.h	(revision 13805)
@@ -10,7 +10,7 @@
 #include "scconfig.h"
 #include "scribusapi.h"
 #include "QByteArray"
-#include "QImage"
+#include <QImage>
 
 class SCRIBUS_API RawImage : public QByteArray
 {
Index: scribus/gtwriter.cpp
===================================================================
--- scribus/gtwriter.cpp	(revision 13804)
+++ scribus/gtwriter.cpp	(revision 13805)
@@ -25,7 +25,8 @@
  ***************************************************************************/
 
 #include "gtwriter.h"
-//#include "scfonts.h"
+#include "gtframestyle.h"
+
 #include "pageitem.h"
 #include "scribusstructs.h"
 
Index: scribus/canvasmode.cpp
===================================================================
--- scribus/canvasmode.cpp	(revision 13804)
+++ scribus/canvasmode.cpp	(revision 13805)
@@ -41,6 +41,7 @@
 #include "scpainter.h"
 #include "ui/scresizecursor.h"
 #include "scribus.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 #include "util_icon.h"
 
Index: scribus/sccolor.h
===================================================================
--- scribus/sccolor.h	(revision 13804)
+++ scribus/sccolor.h	(revision 13805)
@@ -36,7 +36,7 @@
 
 /**
   *@author Franz Schmid
-  * \brief This Class adds support for CMYK-Colors to QT.
+  * \brief This Class adds support for CMYK-Colors to Qt.
   * its API is based on the API of QColor
   */
 
Index: scribus/scpageoutput_ps2.cpp
===================================================================
--- scribus/scpageoutput_ps2.cpp	(revision 13804)
+++ scribus/scpageoutput_ps2.cpp	(revision 13805)
@@ -9,6 +9,7 @@
 
 #include "commonstrings.h"
 #include "fonts/scfontmetrics.h"
+#include "page.h"
 #include "pageitem.h"
 #include "scimage.h"
 #include "scpageoutput_ps2.h"
Index: scribus/fonts/scface.cpp
===================================================================
--- scribus/fonts/scface.cpp	(revision 13804)
+++ scribus/fonts/scface.cpp	(revision 13805)
@@ -4,17 +4,13 @@
 #include "fonts/scface.h"
 #include "text/storytext.h"
 
+static const QString NONE_LITERAL("(None)");
+
 ScFace::ScFaceData::ScFaceData() : 
 	refs(0), 
 	usage(0), 
-	scName(""),
-	fontFile("(None)"),
+	fontFile(NONE_LITERAL),
 	faceIndex(-1),
-	psName(""),
-	family(""),
-	style(""),
-	variant(""),
-	forDocument(""),
 	status(ScFace::NULLFACE),
 	typeCode(ScFace::UNKNOWN_TYPE),
 	formatCode(ScFace::UNKNOWN_FORMAT),
@@ -133,24 +129,21 @@
    unicode emulate: spaces, hyphen, ligatures?, diacritics?
  *****/
 
-ScFace::ScFace() :  replacedName(), replacedInDoc()
+ScFace::ScFace() :  m(new ScFaceData())
 {
-	m = new ScFaceData();
 	m->refs = 1;
 	m->usage = 0;
 }
 
 
-ScFace::ScFace(ScFaceData* data) : replacedName(), replacedInDoc()
+ScFace::ScFace(ScFaceData* data) : m(data)
 {
-	m = data;
 	++(m->refs);
 	m->cachedStatus = ScFace::UNKNOWN;
 }
 
-ScFace::ScFace(const ScFace& other) : replacedName(other.replacedName), replacedInDoc(other.replacedInDoc)
+ScFace::ScFace(const ScFace& other) : m(other.m), replacedName(other.replacedName), replacedInDoc(other.replacedInDoc)
 {
-	m = other.m;
 	++(m->refs);
 }
 
Index: scribus/scribusview.h
===================================================================
--- scribus/scribusview.h	(revision 13804)
+++ scribus/scribusview.h	(revision 13805)
@@ -53,6 +53,7 @@
 #include <QRect>
 #include <QRectF>
 #include <QTime>
+#include <QTimer>
 #include <QWheelEvent>
 #include <QRubberBand>
 #include <QList>
@@ -64,7 +65,6 @@
 #include "observable.h"
 #include "scribusapi.h"
 #include "scribusdoc.h"
-#include "ui/scrspinbox.h"
 
 class Canvas;
 class CanvasMode;
@@ -73,9 +73,13 @@
 class Vruler;
 class Page;
 class RulerMover;
+class PageItem;
 class PageSelector;
+class ScribusDoc;
 class ScribusWin;
 class ScribusMainWindow;
+class ScrSpinBox;
+class Selection;
 class UndoManager;
 class UndoTransaction;
 class TransactionSettings;
Index: scribus/scimgdataloader_pdf.cpp
===================================================================
--- scribus/scimgdataloader_pdf.cpp	(revision 13804)
+++ scribus/scimgdataloader_pdf.cpp	(revision 13805)
@@ -5,6 +5,7 @@
 for which a new license (GPL+exception) is in place.
 */
 #include <QDebug>
+#include <QDir>
 #include <QFile>
 #include <QFileInfo>
 
Index: scribus/gtaction.h
===================================================================
--- scribus/gtaction.h	(revision 13804)
+++ scribus/gtaction.h	(revision 13805)
@@ -32,21 +32,21 @@
 #include <QMap>
 #include <QString>
 
+#include "scribusapi.h"
+
 class PageItem;
 class PrefsManager;
 class ScFace;
-
-#include "gtfont.h"
-#include "gtframestyle.h"
-#include "gtparagraphstyle.h"
-#include "gtstyle.h"
-#include "scribusapi.h"
-
 class CharStyle;
 class ParagraphStyle;
 class ScribusDoc;
 class ScribusMainWindow;
 
+class gtStyle;
+class gtParagraphStyle;
+class gtFont;
+class gtFrameStyle;
+
 typedef QMap<QString, QString> FontFamilyMap;
 
 class SCRIBUS_API gtAction
Index: scribus/scribuswin.cpp
===================================================================
--- scribus/scribuswin.cpp	(revision 13804)
+++ scribus/scribuswin.cpp	(revision 13805)
@@ -20,22 +20,24 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <QCloseEvent>
-#include <QDir>
-#include <QFileInfo>
-#include <QMessageBox>
 
+#include "scribuswin.h"
+#include "scribus.h"
 #include "commonstrings.h"
 #include "fileloader.h"
 #include "ui/masterpagepalette.h"
 #include "ui/pageselector.h"
-#include "scribus.h"
-#include "scribuswin.h"
+#include "ui/scrspinbox.h"
 #include "ui/storyeditor.h"
 #include "util.h"
 #include "util_file.h"
 #include "util_icon.h"
 
+#include <QCloseEvent>
+#include <QDir>
+#include <QFileInfo>
+#include <QMessageBox>
+
 ScribusWin::ScribusWin(QWidget* parent, ScribusDoc* doc) : QMainWindow(parent)
 {
 	setWindowIcon(loadIcon("AppIcon2.png"));
Index: scribus/plugins/scriptplugin/cmdgetprop.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdgetprop.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/cmdgetprop.cpp	(revision 13805)
@@ -7,6 +7,7 @@
 #include "cmdgetprop.h"
 #include "cmdutil.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 
 PyObject *scribus_getfillcolor(PyObject* /* self */, PyObject* args)
 {
Index: scribus/plugins/scriptplugin/cmdtext.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdtext.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/cmdtext.cpp	(revision 13805)
@@ -11,6 +11,7 @@
 #include "selection.h"
 #include "util.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "hyphenator.h"
 
 PyObject *scribus_getfontsize(PyObject* /* self */, PyObject* args)
Index: scribus/plugins/scriptplugin/cmdmani.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdmani.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/cmdmani.cpp	(revision 13805)
@@ -9,6 +9,7 @@
 #include "ui/propertiespalette.h" //CB argh.. noooooooooooooooooooooooooooooooooooo FIXME see other FIXME
 #include "selection.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "undomanager.h"
 
 PyObject *scribus_loadimage(PyObject* /* self */, PyObject* args)
Index: scribus/plugins/scriptplugin/objimageexport.cpp
===================================================================
--- scribus/plugins/scriptplugin/objimageexport.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/objimageexport.cpp	(revision 13805)
@@ -13,6 +13,7 @@
 #include <QFileInfo>
 #include <vector>
 #include "scribuscore.h"
+#include "scribusdoc.h"
 
 typedef struct
 {
Index: scribus/plugins/scriptplugin/cmdsetprop.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdsetprop.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/cmdsetprop.cpp	(revision 13805)
@@ -7,6 +7,7 @@
 #include "cmdsetprop.h"
 #include "cmdutil.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 
 PyObject *scribus_setgradfill(PyObject* /* self */, PyObject* args)
 {
Index: scribus/plugins/scriptplugin/cmddoc.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmddoc.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/cmddoc.cpp	(revision 13805)
@@ -9,6 +9,7 @@
 #include "units.h"
 #include "documentinformation.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 
 /*
 newDocument(size, margins, orientation, firstPageNumber,
Index: scribus/plugins/scriptplugin/cmdcolor.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdcolor.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/cmdcolor.cpp	(revision 13805)
@@ -9,6 +9,7 @@
 #include "prefsmanager.h"
 #include "commonstrings.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "sccolorengine.h"
 
 PyObject *scribus_colornames(PyObject* /* self */)
Index: scribus/plugins/scriptplugin/scriptercore.cpp
===================================================================
--- scribus/plugins/scriptplugin/scriptercore.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/scriptercore.cpp	(revision 13805)
@@ -26,6 +26,7 @@
 #include "pconsole.h"
 #include "scraction.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "scpaths.h"
 #include "selection.h"
 #include "prefsfile.h"
Index: scribus/plugins/scriptplugin/objprinter.cpp
===================================================================
--- scribus/plugins/scriptplugin/objprinter.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/objprinter.cpp	(revision 13805)
@@ -17,6 +17,7 @@
 #include "pslib.h"
 #include "scpaths.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "util_file.h"
 #include "util_ghostscript.h"
 #include "util_printer.h"
Index: scribus/plugins/scriptplugin/cmdmisc.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdmisc.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/cmdmisc.cpp	(revision 13805)
@@ -13,6 +13,7 @@
 #include <QList>
 
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "fonts/scfontmetrics.h"
 #include "prefsmanager.h"
 
Index: scribus/plugins/gettext/csvim/csvim.cpp
===================================================================
--- scribus/plugins/gettext/csvim/csvim.cpp	(revision 13804)
+++ scribus/plugins/gettext/csvim/csvim.cpp	(revision 13805)
@@ -5,6 +5,9 @@
 for which a new license (GPL+exception) is in place.
 */
 #include "csvim.h"
+#include "gtwriter.h"
+#include "gtparagraphstyle.h"
+#include "gtframestyle.h"
 #include "scribusstructs.h"
 
 QString FileFormatName()
Index: scribus/plugins/gettext/csvim/csvim.h
===================================================================
--- scribus/plugins/gettext/csvim/csvim.h	(revision 13804)
+++ scribus/plugins/gettext/csvim/csvim.h	(revision 13805)
@@ -9,8 +9,6 @@
 
 #include "pluginapi.h"
 #include "csvdia.h"
-#include <gtwriter.h>
-#include <gtparagraphstyle.h>
 #include <QByteArray>
 #include <QFile>
 #include <QFileInfo>
@@ -18,6 +16,9 @@
 #include <QStringList>
 #include <QTextCodec>
 
+class gtParagraphStyle;
+class gtWriter;
+
 extern "C" PLUGIN_API void GetText(QString filename, QString encoding, bool textOnly, gtWriter *writer);
 
 extern "C" PLUGIN_API QString FileFormatName();
Index: scribus/plugins/gettext/sxwim/contentreader.cpp
===================================================================
--- scribus/plugins/gettext/sxwim/contentreader.cpp	(revision 13804)
+++ scribus/plugins/gettext/sxwim/contentreader.cpp	(revision 13805)
@@ -25,10 +25,11 @@
  ***************************************************************************/
 
 #include "contentreader.h"
+#include "gtparagraphstyle.h"
 
 #ifdef HAVE_XML
 
-#include <scribusstructs.h>
+#include "scribusstructs.h"
 #include <QByteArray>
 
 ContentReader* ContentReader::creader = NULL;
Index: scribus/plugins/gettext/textfilter/tffilter.cpp
===================================================================
--- scribus/plugins/gettext/textfilter/tffilter.cpp	(revision 13804)
+++ scribus/plugins/gettext/textfilter/tffilter.cpp	(revision 13805)
@@ -18,6 +18,7 @@
 #include <QCheckBox>
 #include "scribusapi.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "prefsmanager.h"
 #include "prefsfile.h"
 #include "util_icon.h"
Index: scribus/plugins/tools/subdivide/subdivide.h
===================================================================
--- scribus/plugins/tools/subdivide/subdivide.h	(revision 13804)
+++ scribus/plugins/tools/subdivide/subdivide.h	(revision 13805)
@@ -29,7 +29,6 @@
 
 #include "pluginapi.h"
 #include "scplugin.h"
-#include "selection.h"
 
 /** \brief This is a simple Subdivide" plugin for Scribus 1.3 and later.
 \author Franz Schmid
Index: scribus/plugins/xfigimplugin/importxfig.cpp
===================================================================
--- scribus/plugins/xfigimplugin/importxfig.cpp	(revision 13804)
+++ scribus/plugins/xfigimplugin/importxfig.cpp	(revision 13805)
@@ -25,6 +25,7 @@
 #include "ui/missing.h"
 #include "ui/multiprogressdialog.h"
 #include "pagesize.h"
+#include "pageitem.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
Index: scribus/plugins/xfigimplugin/importxfig.h
===================================================================
--- scribus/plugins/xfigimplugin/importxfig.h	(revision 13804)
+++ scribus/plugins/xfigimplugin/importxfig.h	(revision 13805)
@@ -12,14 +12,15 @@
 #include "qstring.h"
 
 #include "pluginapi.h"
-#include "pageitem.h"
 #include "sccolor.h"
 #include "fpointarray.h"
 #include <QList>
+#include <QStack>
 #include <QMatrix>
 #include <QMultiMap>
 
 class MultiProgressDialog;
+class PageItem;
 class ScribusDoc;
 class Selection;
 class TransactionSettings;
Index: scribus/plugins/colorwheel/colorwheel.cpp
===================================================================
--- scribus/plugins/colorwheel/colorwheel.cpp	(revision 13804)
+++ scribus/plugins/colorwheel/colorwheel.cpp	(revision 13805)
@@ -8,6 +8,7 @@
 #include "colorwheel.h"
 #include "cwdialog.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 
 int colorwheel_getPluginAPIVersion()
 {
Index: scribus/plugins/fileloader/oodraw/oodrawimp.h
===================================================================
--- scribus/plugins/fileloader/oodraw/oodrawimp.h	(revision 13804)
+++ scribus/plugins/fileloader/oodraw/oodrawimp.h	(revision 13805)
@@ -11,9 +11,9 @@
 #include "loadsaveplugin.h"
 #include "../../formatidlist.h"
 #include "stylestack.h"
-#include "pageitem.h"
 #include "scribusstructs.h"
 
+class PageItem;
 class ScrAction;
 class ScribusDoc;
 class Selection;
Index: scribus/plugins/psimport/importps.h
===================================================================
--- scribus/plugins/psimport/importps.h	(revision 13804)
+++ scribus/plugins/psimport/importps.h	(revision 13805)
@@ -12,13 +12,13 @@
 #include "qstring.h"
 
 #include "pluginapi.h"
-#include "pageitem.h"
 #include "sccolor.h"
 #include "fpointarray.h"
 #include <QList>
 #include <QPainterPath>
 
 class MultiProgressDialog;
+class PageItem;
 class ScribusDoc;
 class Selection;
 class TransactionSettings;
Index: scribus/canvasmode_objimport.cpp
===================================================================
--- scribus/canvasmode_objimport.cpp	(revision 13804)
+++ scribus/canvasmode_objimport.cpp	(revision 13805)
@@ -29,6 +29,7 @@
 #include "fpoint.h"
 #include "fpointarray.h"
 #include "ui/pageselector.h"
+#include "ui/scrspinbox.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
@@ -209,3 +210,4 @@
 
 
 
+
Index: scribus/scribus.h
===================================================================
--- scribus/scribus.h	(revision 13804)
+++ scribus/scribus.h	(revision 13805)
@@ -100,6 +100,7 @@
 class ReformDoc;
 class ScToolBar;
 class ScrAction;
+class ScribusDoc;
 class ScribusCore;
 class ScribusMainWindow;
 class ScribusQApp;
Index: scribus/scpainterexbase.h
===================================================================
--- scribus/scpainterexbase.h	(revision 13804)
+++ scribus/scpainterexbase.h	(revision 13805)
@@ -42,8 +42,8 @@
 #include "fpointarray.h"
 #include "vgradientex.h"
 #include "sccolorshade.h"
-#include "scimage.h"
 
+class ScImage;
 class ScPattern;
 
 class SCRIBUS_API ScPainterExBase
Index: scribus/canvasmode_panning.cpp
===================================================================
--- scribus/canvasmode_panning.cpp	(revision 13804)
+++ scribus/canvasmode_panning.cpp	(revision 13805)
@@ -28,6 +28,7 @@
 #include "fpoint.h"
 #include "fpointarray.h"
 #include "scribusview.h"
+#include "scribusdoc.h"
 #include "util.h"
 #include "util_icon.h"
 
Index: scribus/latexhelpers.cpp
===================================================================
--- scribus/latexhelpers.cpp	(revision 13804)
+++ scribus/latexhelpers.cpp	(revision 13805)
@@ -24,6 +24,8 @@
 
 #include <QDebug>
 #include <QFile>
+#include <QFileInfo>
+#include <QDir>
 #include <QMessageBox>
 
 #include "prefsmanager.h"
Index: scribus/scribusXml.h
===================================================================
--- scribus/scribusXml.h	(revision 13804)
+++ scribus/scribusXml.h	(revision 13805)
@@ -23,7 +23,6 @@
 #include "scfonts.h"
 #include "scribusapi.h"
 #include "scribusstructs.h"
-#include "selection.h"
 #include "styles/styleset.h"
 
 #include <QXmlStreamAttributes>
@@ -36,6 +35,7 @@
 class ScribusDoc;
 class ScPattern;
 class ScXmlStreamWriter;
+class Selection;
 
 class SCRIBUS_API ScriXmlDoc
 {
@@ -99,3 +99,4 @@
 
 
 
+
Index: scribus/sccolorengine.cpp
===================================================================
--- scribus/sccolorengine.cpp	(revision 13804)
+++ scribus/sccolorengine.cpp	(revision 13805)
@@ -23,6 +23,7 @@
 
 #include "sccolorengine.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include CMS_INC
 
 QColor ScColorEngine::getRGBColor(const ScColor& color, const ScribusDoc* doc)
Index: scribus/scribusXml.cpp
===================================================================
--- scribus/scribusXml.cpp	(revision 13804)
+++ scribus/scribusXml.cpp	(revision 13805)
@@ -35,9 +35,11 @@
 #include "page.h"
 #include "pageitem.h"
 #include "pageitem_latexframe.h"
+#include "selection.h"
 #include "units.h"
 #include "prefsmanager.h"
 #include "scribusview.h"
+#include "scribusdoc.h"
 #include "scclocale.h"
 #include "commonstrings.h"
 #include "text/nlsconfig.h"
@@ -2673,3 +2675,4 @@
 		style.setTabValues(tabs);
 }
 
+
Index: scribus/guidemanagercore.cpp
===================================================================
--- scribus/guidemanagercore.cpp	(revision 13804)
+++ scribus/guidemanagercore.cpp	(revision 13805)
@@ -16,10 +16,12 @@
 #include "ui/guidemanager.h"
 #include "scclocale.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "pagestructs.h"
 #include "selection.h"
 
 
+
 GuideManagerCore::GuideManagerCore():
 	undoManager(UndoManager::instance()),
 	m_page(0),
Index: scribus/scfonts.cpp
===================================================================
--- scribus/scfonts.cpp	(revision 13804)
+++ scribus/scfonts.cpp	(revision 13805)
@@ -40,6 +40,7 @@
 #include "prefstable.h"
 #include "scribus.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #ifdef Q_WS_X11
 #include <X11/X.h>
 #include <X11/Xlib.h>
Index: scribus/scpageoutput.h
===================================================================
--- scribus/scpageoutput.h	(revision 13804)
+++ scribus/scpageoutput.h	(revision 13805)
@@ -13,6 +13,7 @@
 #include "scribusapi.h"
 #include "sccolor.h"
 #include "scpainterexbase.h"
+#include "scimage.h"
 
 class ScribusDoc;
 class Page;
Index: scribus/gtwriter.h
===================================================================
--- scribus/gtwriter.h	(revision 13804)
+++ scribus/gtwriter.h	(revision 13805)
@@ -29,10 +29,6 @@
 
 #include "scribusapi.h"
 #include "gtaction.h"
-#include "gtfont.h"
-#include "gtframestyle.h"
-#include "gtparagraphstyle.h"
-#include "gtstyle.h"
 
 class PageItem;
 
Index: scribus/scpageoutput.cpp
===================================================================
--- scribus/scpageoutput.cpp	(revision 13804)
+++ scribus/scpageoutput.cpp	(revision 13805)
@@ -1700,3 +1700,5 @@
 
 
 
+
+
Index: scribus/ui/pdfopts.cpp
===================================================================
--- scribus/ui/pdfopts.cpp	(revision 13804)
+++ scribus/ui/pdfopts.cpp	(revision 13805)
@@ -13,7 +13,20 @@
  *                                                                         *
  ***************************************************************************/
 #include "pdfopts.h"
+#include "commonstrings.h"
 
+#include "pdfoptions.h"
+#include "prefsfile.h"
+#include "prefsmanager.h"
+#include "scconfig.h"
+#include "scpaths.h"
+#include "scribusview.h"
+#include "ui/customfdialog.h"
+#include "ui/scrspinbox.h"
+#include "units.h"
+#include "util.h"
+#include "util_icon.h"
+
 #include <QByteArray>
 #include <QCheckBox>
 #include <QGridLayout>
@@ -28,18 +41,6 @@
 #include <QToolTip>
 #include <QVBoxLayout>
 
-#include "commonstrings.h"
-#include "ui/customfdialog.h"
-#include "pdfoptions.h"
-#include "prefsfile.h"
-#include "prefsmanager.h"
-#include "scconfig.h"
-#include "scpaths.h"
-#include "scribusview.h"
-#include "units.h"
-#include "util.h"
-#include "util_icon.h"
-
 PDFExportDialog::PDFExportDialog( QWidget* parent, const QString & docFileName,
 								  const QMap<QString, int > & DocFonts,
 								  ScribusView *currView, PDFOptions & pdfOptions,
Index: scribus/ui/mergedoc.cpp
===================================================================
--- scribus/ui/mergedoc.cpp	(revision 13804)
+++ scribus/ui/mergedoc.cpp	(revision 13805)
@@ -5,31 +5,33 @@
 for which a new license (GPL+exception) is in place.
 */
 
-#include <QHBoxLayout>
-#include <QGridLayout>
-#include <QPixmap>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QLineEdit>
-#include <QLabel>
-#include <QSpinBox>
-#include <QCheckBox>
-#include <QSpacerItem>
-#include <QApplication>
-#include <QCursor>
-#include <QToolTip>
-
 #include "scconfig.h"
 #include "mergedoc.h"
+
+#include "fileloader.h"
 #include "commonstrings.h"
-#include "ui/customfdialog.h"
-#include "fileloader.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "sccombobox.h"
 #include "scpaths.h"
+#include "ui/customfdialog.h"
 #include "util_icon.h"
 
+#include <QApplication>
+#include <QCheckBox>
+#include <QCursor>
+#include <QDir>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPixmap>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QToolTip>
+#include <QVBoxLayout>
+
 MergeDoc::MergeDoc(QWidget* parent, bool importMasterPages, int targetDocPageCount, int currentPage) : QDialog(parent)
 {
 	masterPages = importMasterPages;
Index: scribus/ui/masterpagepalette.cpp
===================================================================
--- scribus/ui/masterpagepalette.cpp	(revision 13804)
+++ scribus/ui/masterpagepalette.cpp	(revision 13805)
@@ -24,6 +24,7 @@
 #include "newtemp.h"
 #include "page.h"
 #include "pagestructs.h"
+#include "selection.h"
 #include "prefsmanager.h"
 #include "scribus.h"
 #include "scribusXml.h"
@@ -469,3 +470,4 @@
 		QWidget::changeEvent(e);
 }
 
+
Index: scribus/canvasmode_rotate.cpp
===================================================================
--- scribus/canvasmode_rotate.cpp	(revision 13804)
+++ scribus/canvasmode_rotate.cpp	(revision 13805)
@@ -21,10 +21,12 @@
 
 #include "canvas.h"
 #include "ui/contextmenu.h"
+#include "ui/scrspinbox.h"
 #include "fpoint.h"
 #include "pageitem.h"
 #include "ui/pageselector.h"
 #include "prefsmanager.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 #include "selection.h"
 #include "undomanager.h"
Index: scribus/style.h
===================================================================
--- scribus/style.h	(revision 13804)
+++ scribus/style.h	(revision 13805)
@@ -21,7 +21,6 @@
 #include <QString>
 #include "scfonts.h"
 #include "scribusapi.h"
-#include "sccolor.h"
 #include "styles/stylecontext.h"
 #include "desaxe/saxio.h"
 
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(revision 13804)
+++ scribus/scribus.cpp	(revision 13805)
@@ -179,9 +179,11 @@
 #include "scraction.h"
 #include "ui/scrapbookpalette.h"
 #include "scribus.h"
+#include "scribusdoc.h"
 #include "scribusXml.h"
 #include "scribusapp.h"
 #include "scribuscore.h"
+#include "scribusview.h"
 #include "scribuswin.h"
 #include "ui/search.h"
 #include "selection.h"
Index: scribus/plugins/scriptplugin/cmdobj.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdobj.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/cmdobj.cpp	(revision 13805)
@@ -10,8 +10,8 @@
 #include "util_math.h"
 #include "commonstrings.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 
-
 PyObject *scribus_newrect(PyObject* /* self */, PyObject* args)
 {
 	double x, y, w, h;
Index: scribus/plugins/scriptplugin/cmdpage.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdpage.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/cmdpage.cpp	(revision 13805)
@@ -9,8 +9,8 @@
 #include "page.h"
 #include "scribuscore.h"
 #include "commonstrings.h"
+#include "scribusdoc.h"
 
-
 PyObject *scribus_actualpage(PyObject* /* self */)
 {
 	if(!checkHaveDocument())
Index: scribus/plugins/scriptplugin/cmdutil.cpp
===================================================================
--- scribus/plugins/scriptplugin/cmdutil.cpp	(revision 13804)
+++ scribus/plugins/scriptplugin/cmdutil.cpp	(revision 13805)
@@ -8,6 +8,7 @@
 #include "units.h"
 #include "page.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "selection.h"
 
 ScribusMainWindow* Carrier;
Index: scribus/plugins/gettext/odtim/contentreader.h
===================================================================
--- scribus/plugins/gettext/odtim/contentreader.h	(revision 13804)
+++ scribus/plugins/gettext/odtim/contentreader.h	(revision 13805)
@@ -38,10 +38,12 @@
 #endif
 #include <QXmlAttributes>
 #include <QMap>
-#include <gtstyle.h>
-#include <gtwriter.h>
-#include "stylereader.h"
 
+class gtStyle;
+class gtWriter;
+class ListStyle;
+class StyleReader;
+
 typedef std::vector<std::pair<QString, QString> > Properties;
 typedef QMap<QString, Properties > TMap;
 
Index: scribus/plugins/gettext/odtim/contentreader.cpp
===================================================================
--- scribus/plugins/gettext/odtim/contentreader.cpp	(revision 13804)
+++ scribus/plugins/gettext/odtim/contentreader.cpp	(revision 13805)
@@ -28,6 +28,10 @@
 #include <QByteArray>
 #include "contentreader.h"
 #include "scribusstructs.h"
+#include "gtwriter.h"
+#include "gtstyle.h"
+#include "gtparagraphstyle.h"
+#include "stylereader.h"
 
 ContentReader* ContentReader::creader = NULL;
 
Index: scribus/plugins/short-words/shortwords.cpp
===================================================================
--- scribus/plugins/short-words/shortwords.cpp	(revision 13804)
+++ scribus/plugins/short-words/shortwords.cpp	(revision 13805)
@@ -35,6 +35,7 @@
 #include "swprefsgui.h"
 #include "scpaths.h"
 #include "scribus.h"
+#include "scribusdoc.h"
 #include "util_icon.h"
 
 int scribusshortwords_getPluginAPIVersion()
@@ -166,3 +167,4 @@
 	return true;
 }
 
+
Index: scribus/plugins/short-words/parse.cpp
===================================================================
--- scribus/plugins/short-words/parse.cpp	(revision 13804)
+++ scribus/plugins/short-words/parse.cpp	(revision 13805)
@@ -24,6 +24,7 @@
 #include "configuration.h"
 
 #include "scribus.h"
+#include "scribusdoc.h"
 #include "page.h"
 #include "pageitem.h"
 #include "selection.h"
Index: scribus/plugins/saveastemplateplugin/satdialog.cpp
===================================================================
--- scribus/plugins/saveastemplateplugin/satdialog.cpp	(revision 13804)
+++ scribus/plugins/saveastemplateplugin/satdialog.cpp	(revision 13805)
@@ -10,6 +10,7 @@
 #include "satdialog.h"
 #include "scribusapi.h"
 
+#include <QDir>
 #include <QXmlDefaultHandler>
 #include <QXmlSimpleReader>
 
Index: scribus/plugins/aiimplugin/importai.h
===================================================================
--- scribus/plugins/aiimplugin/importai.h	(revision 13804)
+++ scribus/plugins/aiimplugin/importai.h	(revision 13805)
@@ -7,20 +7,20 @@
 #ifndef IMPORTAI_H
 #define IMPORTAI_H
 
-#include "qglobal.h"
-#include "qobject.h"
-#include "qstring.h"
+#include <QList>
+#include <QMatrix>
+#include <QObject>
+#include <QString>
 
 #include "pluginapi.h"
-#include "pageitem.h"
+
+#include "fpointarray.h"
 #include "sccolor.h"
-#include "fpointarray.h"
+#include "text/storytext.h"
 #include "vgradient.h"
-#include <QList>
-#include <QMatrix>
-// #include <QPainterPath>
 
 class MultiProgressDialog;
+class PageItem;
 class ScribusDoc;
 class Selection;
 class TransactionSettings;
Index: scribus/plugins/tools/lenseffects/lenseffects.cpp
===================================================================
--- scribus/plugins/tools/lenseffects/lenseffects.cpp	(revision 13804)
+++ scribus/plugins/tools/lenseffects/lenseffects.cpp	(revision 13805)
@@ -27,6 +27,7 @@
 #include "lenseffects.h"
 #include "lensdialog.h"
 #include "scribuscore.h"
+#include "selection.h"
 
 int lenseffects_getPluginAPIVersion()
 {
Index: scribus/plugins/tools/lenseffects/lenseffects.h
===================================================================
--- scribus/plugins/tools/lenseffects/lenseffects.h	(revision 13804)
+++ scribus/plugins/tools/lenseffects/lenseffects.h	(revision 13805)
@@ -29,7 +29,6 @@
 
 #include "pluginapi.h"
 #include "scplugin.h"
-#include "selection.h"
 
 /** \brief This is a simple "Lens Effects" plugin for Scribus 1.3 and later.
 \author Franz Schmid
Index: scribus/plugins/tools/pathfinder/pathfinder.cpp
===================================================================
--- scribus/plugins/tools/pathfinder/pathfinder.cpp	(revision 13804)
+++ scribus/plugins/tools/pathfinder/pathfinder.cpp	(revision 13805)
@@ -24,18 +24,21 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.              *
 ****************************************************************************/
 
-#include <QMessageBox>
-#include <QPixmap>
+#include "pathfinder.h"
+
 #include "pageitem_polygon.h"
-#include "pathfinder.h"
 #include "pathfinderdialog.h"
-#include "ui/propertiespalette.h"
+#include "selection.h"
 #include "scribuscore.h"
 #include "sccolorengine.h"
+#include "ui/propertiespalette.h"
 #include "util_color.h"
 #include "util_math.h"
 #include "util_icon.h"
 
+#include <QMessageBox>
+#include <QPixmap>
+
 int pathfinder_getPluginAPIVersion()
 {
 	return PLUGIN_API_VERSION;
Index: scribus/plugins/tools/pathfinder/pathfinderdialog.cpp
===================================================================
--- scribus/plugins/tools/pathfinder/pathfinderdialog.cpp	(revision 13804)
+++ scribus/plugins/tools/pathfinder/pathfinderdialog.cpp	(revision 13805)
@@ -21,10 +21,13 @@
  *                                                                         *
  ***************************************************************************/
 #include "pathfinderdialog.h"
+
+#include "fpointarray.h"
+#include "pageitem.h"
+#include "sccolorengine.h"
+#include "scribusdoc.h"
 #include "util.h"
 #include "util_icon.h"
-#include "fpointarray.h"
-#include "sccolorengine.h"
 
 #include <QPixmap>
 #include <QPainter>
Index: scribus/plugins/tools/pathfinder/pathfinder.h
===================================================================
--- scribus/plugins/tools/pathfinder/pathfinder.h	(revision 13804)
+++ scribus/plugins/tools/pathfinder/pathfinder.h	(revision 13805)
@@ -30,7 +30,6 @@
 #include <QColor>
 #include "pluginapi.h"
 #include "scplugin.h"
-#include "selection.h"
 
 /** \brief This is a simple "Path Finder" plugin for Scribus 1.3 and later.
 \author Franz Schmid
Index: scribus/plugins/tools/pathfinder/pathfinderdialog.h
===================================================================
--- scribus/plugins/tools/pathfinder/pathfinderdialog.h	(revision 13804)
+++ scribus/plugins/tools/pathfinder/pathfinderdialog.h	(revision 13805)
@@ -12,9 +12,10 @@
 #include <QPainterPath>
 #include <QColor>
 #include <QList>
-#include "pageitem.h"
-#include "scribusdoc.h"
 
+class PageItem;
+class ScribusDoc;
+
 class PLUGIN_API PathFinderDialog : public QDialog, Ui::PathFinderBase
 { 
 	Q_OBJECT
Index: scribus/plugins/tools/pathconnect/pathconnect.cpp
===================================================================
--- scribus/plugins/tools/pathconnect/pathconnect.cpp	(revision 13804)
+++ scribus/plugins/tools/pathconnect/pathconnect.cpp	(revision 13805)
@@ -26,6 +26,8 @@
 
 #include "pathconnect.h"
 #include "pathconnectdialog.h"
+#include "selection.h"
+#include "scribusdoc.h"
 
 int pathconnect_getPluginAPIVersion()
 {
Index: scribus/plugins/tools/pathconnect/pathconnect.h
===================================================================
--- scribus/plugins/tools/pathconnect/pathconnect.h	(revision 13804)
+++ scribus/plugins/tools/pathconnect/pathconnect.h	(revision 13805)
@@ -30,10 +30,10 @@
 #include "fpointarray.h"
 #include "pluginapi.h"
 #include "scplugin.h"
-#include "selection.h"
 #include "scribuscore.h"
-#include "scribusdoc.h"
 
+class ScribusDoc;
+
 /** \brief This is a simple "Path Connect" plugin for Scribus 1.3 and later.
 \author Franz Schmid
 \date November 2008
Index: scribus/plugins/tools/pathstroker/pathstroker.cpp
===================================================================
--- scribus/plugins/tools/pathstroker/pathstroker.cpp	(revision 13804)
+++ scribus/plugins/tools/pathstroker/pathstroker.cpp	(revision 13805)
@@ -28,7 +28,9 @@
 #include "pageitem_polygon.h"
 #include "commonstrings.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "scribusstructs.h"
+#include "selection.h"
 #include "util.h"
 #include <QPainterPathStroker>
 
Index: scribus/plugins/tools/pathstroker/pathstroker.h
===================================================================
--- scribus/plugins/tools/pathstroker/pathstroker.h	(revision 13804)
+++ scribus/plugins/tools/pathstroker/pathstroker.h	(revision 13805)
@@ -29,7 +29,6 @@
 
 #include "pluginapi.h"
 #include "scplugin.h"
-#include "selection.h"
 
 /** \brief This is a simple "Path Stroker" plugin for Scribus 1.3 and later.
 \author Franz Schmid
Index: scribus/plugins/tools/pathcut/pathcut.cpp
===================================================================
--- scribus/plugins/tools/pathcut/pathcut.cpp	(revision 13804)
+++ scribus/plugins/tools/pathcut/pathcut.cpp	(revision 13805)
@@ -26,7 +26,9 @@
 
 #include "pathcut.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "scribusstructs.h"
+#include "selection.h"
 #include "util.h"
 #include "util_icon.h"
 #include <QPainterPathStroker>
Index: scribus/plugins/tools/pathcut/pathcut.h
===================================================================
--- scribus/plugins/tools/pathcut/pathcut.h	(revision 13804)
+++ scribus/plugins/tools/pathcut/pathcut.h	(revision 13805)
@@ -29,7 +29,6 @@
 
 #include "pluginapi.h"
 #include "scplugin.h"
-#include "selection.h"
 
 /** \brief This is a simple "Path Cutter" plugin for Scribus 1.3 and later.
 \author Franz Schmid
Index: scribus/plugins/tools/transform/transformeffect.cpp
===================================================================
--- scribus/plugins/tools/transform/transformeffect.cpp	(revision 13804)
+++ scribus/plugins/tools/transform/transformeffect.cpp	(revision 13805)
@@ -27,6 +27,7 @@
 #include "transformeffect.h"
 #include "transformdialog.h"
 #include "scribuscore.h"
+#include "selection.h"
 
 int transformeffect_getPluginAPIVersion()
 {
Index: scribus/plugins/tools/transform/transformeffect.h
===================================================================
--- scribus/plugins/tools/transform/transformeffect.h	(revision 13804)
+++ scribus/plugins/tools/transform/transformeffect.h	(revision 13805)
@@ -29,7 +29,6 @@
 
 #include "pluginapi.h"
 #include "scplugin.h"
-#include "selection.h"
 
 /** \brief This is a simple "Transform Effect" plugin for Scribus 1.3 and later.
 \author Franz Schmid
Index: scribus/plugins/tools/spellcheck/aspellplugin.cpp
===================================================================
--- scribus/plugins/tools/spellcheck/aspellplugin.cpp	(revision 13804)
+++ scribus/plugins/tools/spellcheck/aspellplugin.cpp	(revision 13805)
@@ -4,9 +4,13 @@
 a copyright and/or license notice that predates the release of Scribus 1.3.2
 for which a new license (GPL+exception) is in place.
 */
-#include "scraction.h"
+
 #include "aspellplugin.h"
 #include "aspellpluginimpl.h"
+#include "scraction.h"
+#include "scribus.h"
+#include "scribusdoc.h"
+#include "pageitem.h"
 
 // See scplugin.h and pluginmanager.{cpp,h} for detail on what these methods
 // do. That documentatation is not duplicated here.
Index: scribus/plugins/tools/spellcheck/aspellpluginimpl.cpp
===================================================================
--- scribus/plugins/tools/spellcheck/aspellpluginimpl.cpp	(revision 13804)
+++ scribus/plugins/tools/spellcheck/aspellpluginimpl.cpp	(revision 13805)
@@ -5,6 +5,13 @@
 for which a new license (GPL+exception) is in place.
 */
 #include "aspellpluginimpl.h"
+// Scribus include files
+#include "scribusdoc.h"           // For ScribusDoc
+#include "scribus.h"              // For ScribusMainWindow
+#include "selection.h"            // Item selected
+#include "prefsfile.h"            // Stored plugin preferences
+#include "prefsmanager.h"         // Preferences manager
+#include "pageitem.h"
 #include "pageitem_textframe.h"
 #include "text/specialchars.h"
 #include "util.h"
Index: scribus/plugins/tools/spellcheck/aspellpluginimpl.h
===================================================================
--- scribus/plugins/tools/spellcheck/aspellpluginimpl.h	(revision 13804)
+++ scribus/plugins/tools/spellcheck/aspellpluginimpl.h	(revision 13805)
@@ -15,17 +15,15 @@
 #include <QString>
 #include <QStringList>
 #include <QHash>
-// Scribus include files
-#include "scribusdoc.h"           // For ScribusDoc
-#include "scribus.h"              // For ScribusMainWindow
-#include "selection.h"            // Item selected
-#include "prefsfile.h"            // Stored plugin preferences
-#include "prefsmanager.h"         // Preferences manager
 // Local include files
 #include "ui_aspellpluginbase.h"  // For GUI from QT4 designer
 // #include "donedlgimpl.h"          // For spell-checking done dialog
 #include "suggest.h"              // For aspell interface class
 
+class ScribusDoc;
+class PrefsContext;
+class PageItem;
+
 /*!
 \class AspellPluginImpl
 \author Gora Mohanty <gora at srijan.in>
Index: scribus/plugins/tools/subdivide/subdivide.cpp
===================================================================
--- scribus/plugins/tools/subdivide/subdivide.cpp	(revision 13804)
+++ scribus/plugins/tools/subdivide/subdivide.cpp	(revision 13805)
@@ -26,7 +26,9 @@
 
 #include "subdivide.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "scribusstructs.h"
+#include "selection.h"
 
 int subdivide_getPluginAPIVersion()
 {




More information about the scribus-commit mailing list