r19093 by craig - Rearrange/fix some includes and remove scribusview.h includes where possible

scribus-commit scribus-commit at lists.scribus.net
Sat Apr 26 23:02:02 UTC 2014


Author: craig
Date: Sat Apr 26 23:02:01 2014
New Revision: 19093

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19093
Log:
Rearrange/fix some includes and remove scribusview.h includes where possible

Modified:
    trunk/Scribus/scribus/actionmanager.cpp
    trunk/Scribus/scribus/canvas.cpp
    trunk/Scribus/scribus/canvasgesture_cellselect.cpp
    trunk/Scribus/scribus/canvasgesture_columnresize.cpp
    trunk/Scribus/scribus/canvasgesture_linemove.cpp
    trunk/Scribus/scribus/canvasgesture_resize.cpp
    trunk/Scribus/scribus/canvasgesture_rowresize.cpp
    trunk/Scribus/scribus/canvasgesture_rulermove.cpp
    trunk/Scribus/scribus/canvasgesture_rulermove.h
    trunk/Scribus/scribus/canvasgesture_tableresize.cpp
    trunk/Scribus/scribus/canvasmode_copyproperties.cpp
    trunk/Scribus/scribus/canvasmode_create.cpp
    trunk/Scribus/scribus/canvasmode_drawbezier.cpp
    trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
    trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
    trunk/Scribus/scribus/canvasmode_edit.cpp
    trunk/Scribus/scribus/canvasmode_editarc.cpp
    trunk/Scribus/scribus/canvasmode_edittable.cpp
    trunk/Scribus/scribus/canvasmode_eyedropper.cpp
    trunk/Scribus/scribus/canvasmode_framelinks.cpp
    trunk/Scribus/scribus/canvasmode_imageimport.cpp
    trunk/Scribus/scribus/canvasmode_nodeedit.cpp
    trunk/Scribus/scribus/canvasmode_normal.cpp
    trunk/Scribus/scribus/canvasmode_objimport.cpp
    trunk/Scribus/scribus/loadsaveplugin.cpp
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem_textframe.cpp
    trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp
    trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    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/oodraw/oodrawimp.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/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/saveastemplateplugin/satemplate.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
    trunk/Scribus/scribus/plugins/scriptplugin/svgimport.cpp
    trunk/Scribus/scribus/plugins/short-words/parse.cpp
    trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
    trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
    trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
    trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
    trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
    trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
    trunk/Scribus/scribus/scpage.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/scribus.h
    trunk/Scribus/scribus/scribusdoc.cpp
    trunk/Scribus/scribus/scribusview.h
    trunk/Scribus/scribus/scribuswin.cpp
    trunk/Scribus/scribus/ui/aligndistribute.h
    trunk/Scribus/scribus/ui/contextmenu.cpp
    trunk/Scribus/scribus/ui/extimageprops.cpp
    trunk/Scribus/scribus/ui/extimageprops.h
    trunk/Scribus/scribus/ui/guidemanager.cpp
    trunk/Scribus/scribus/ui/loremipsum.cpp
    trunk/Scribus/scribus/ui/nodeeditpalette.cpp
    trunk/Scribus/scribus/ui/notesstyleseditor.cpp
    trunk/Scribus/scribus/ui/outlinepalette.cpp
    trunk/Scribus/scribus/ui/pagepalette.cpp
    trunk/Scribus/scribus/ui/pagepalette_pages.cpp
    trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
    trunk/Scribus/scribus/ui/pdfopts.cpp
    trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
    trunk/Scribus/scribus/ui/preview.cpp
    trunk/Scribus/scribus/ui/propertiespalette_group.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/rulermover.cpp
    trunk/Scribus/scribus/ui/selfield.cpp
    trunk/Scribus/scribus/ui/selfield.h
    trunk/Scribus/scribus/ui/smlinestyle.cpp
    trunk/Scribus/scribus/ui/storyeditor.cpp
    trunk/Scribus/scribus/ui/stylemanager.cpp
    trunk/Scribus/scribus/ui/tabpdfoptions.cpp
    trunk/Scribus/scribus/ui/vruler.cpp

Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Sat Apr 26 23:02:01 2014
@@ -30,7 +30,6 @@
 #include "undomanager.h"
 #include "urllauncher.h"
 #include "util_icon.h"
-
 
 QMap<QString, QKeySequence> ActionManager::defKeys;
 QVector< QPair<QString, QStringList> > ActionManager::defMenuNames;

Modified: trunk/Scribus/scribus/canvas.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvas.cpp
==============================================================================
--- trunk/Scribus/scribus/canvas.cpp (original)
+++ trunk/Scribus/scribus/canvas.cpp Sat Apr 26 23:02:01 2014
@@ -20,6 +20,7 @@
 
 // #include <QDebug>
 #include <QToolTip>
+#include <QWidget>
 
 #include "appmodes.h"
 #include "canvas.h"

Modified: trunk/Scribus/scribus/canvasgesture_cellselect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasgesture_cellselect.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_cellselect.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_cellselect.cpp Sat Apr 26 23:02:01 2014
@@ -6,6 +6,8 @@
 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 "canvasgesture_cellselect.h"
 
 #include <algorithm>
 
@@ -23,8 +25,6 @@
 #include "tablecell.h"
 #include "tableutils.h"
 #include "ui/scmwmenumanager.h"
-
-#include "canvasgesture_cellselect.h"
 
 void CellSelect::deactivate(bool forGesture)
 {

Modified: trunk/Scribus/scribus/canvasgesture_columnresize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasgesture_columnresize.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_columnresize.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_columnresize.cpp Sat Apr 26 23:02:01 2014
@@ -16,6 +16,7 @@
 #include "fpoint.h"
 #include "pageitem.h"
 #include "pageitem_table.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 
 #include "canvasgesture_columnresize.h"

Modified: trunk/Scribus/scribus/canvasgesture_linemove.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasgesture_linemove.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_linemove.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_linemove.cpp Sat Apr 26 23:02:01 2014
@@ -22,7 +22,6 @@
 
 #include "canvas.h"
 #include "pageitem_line.h"
-#include "scribusdoc.h"
 #include "scribusview.h"
 #include "selection.h"
 #include "util_math.h"

Modified: trunk/Scribus/scribus/canvasgesture_resize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasgesture_resize.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_resize.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_resize.cpp Sat Apr 26 23:02:01 2014
@@ -25,13 +25,13 @@
 #include <QPen>
 #include <QRubberBand>
 
+#include "pageitem_arc.h"
+#include "pageitem_spiral.h"
+#include "pageitem_table.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
 #include "selection.h"
 #include "undomanager.h"
-#include "pageitem_arc.h"
-#include "pageitem_spiral.h"
-#include "pageitem_table.h"
 #include "util_math.h"
 
 ResizeGesture::ResizeGesture (CanvasMode* parent) : CanvasGesture(parent)

Modified: trunk/Scribus/scribus/canvasgesture_rowresize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasgesture_rowresize.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_rowresize.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_rowresize.cpp Sat Apr 26 23:02:01 2014
@@ -16,6 +16,7 @@
 #include "fpoint.h"
 #include "pageitem.h"
 #include "pageitem_table.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 
 #include "canvasgesture_rowresize.h"

Modified: trunk/Scribus/scribus/canvasgesture_rulermove.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasgesture_rulermove.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_rulermove.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_rulermove.cpp Sat Apr 26 23:02:01 2014
@@ -23,8 +23,20 @@
 #include "guidemanagercore.h"
 #include "scribus.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "ui/guidemanager.h"
 #include "util_icon.h"
+
+
+RulerGesture::RulerGesture(ScribusView *view, RulerGesture::Mode mode) :
+	CanvasGesture(view),
+	m_ScMW(m_view->m_ScMW),
+	m_mode(mode), m_haveGuide(false),
+	m_haveCursor(false),
+	m_xy(0,0)
+{
+
+}
 
 
 void RulerGesture::drawControls(QPainter* p)
@@ -65,7 +77,7 @@
 void RulerGesture::prepare(Mode mode)
 {
 	m_haveGuide = false;
-	m_mode = mode;	
+	m_mode = mode;
 }
 
 

Modified: trunk/Scribus/scribus/canvasgesture_rulermove.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasgesture_rulermove.h
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_rulermove.h (original)
+++ trunk/Scribus/scribus/canvasgesture_rulermove.h Sat Apr 26 23:02:01 2014
@@ -20,12 +20,6 @@
 
 #include <QPoint>
 
-#include "scribusapi.h"
-#include "canvas.h"
-#include "canvasgesture.h"
-#include "canvasmode.h"
-#include "scribusview.h"
-
 class QCursor;
 class QDragEnterEvent;
 class QDragMoveEvent;
@@ -36,7 +30,14 @@
 class QMouseEvent;
 class QKeyEvent;
 class QPainter;
+
+#include "scribusapi.h"
+#include "canvas.h"
+#include "canvasgesture.h"
+#include "canvasmode.h"
+
 class ScribusMainWindow;
+class ScribusView;
 
 /**
   This class realizes the moving of guides and the moving of the ruler origin
@@ -46,8 +47,7 @@
 	Q_OBJECT
 public:
 	enum Mode { HORIZONTAL, VERTICAL, ORIGIN };
-	RulerGesture (ScribusView* view, Mode mode) : 
-		CanvasGesture(view), m_ScMW(m_view->m_ScMW), m_mode(mode), m_haveGuide(false), m_haveCursor(false), m_xy(0,0) {};
+	RulerGesture (ScribusView* view, Mode mode);
 	virtual ~RulerGesture() {}
 
 	/**

Modified: trunk/Scribus/scribus/canvasgesture_tableresize.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasgesture_tableresize.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_tableresize.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_tableresize.cpp Sat Apr 26 23:02:01 2014
@@ -18,6 +18,7 @@
 #include "fpoint.h"
 #include "pageitem.h"
 #include "pageitem_table.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 
 #include "canvasgesture_tableresize.h"

Modified: trunk/Scribus/scribus/canvasmode_copyproperties.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_copyproperties.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_copyproperties.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_copyproperties.cpp Sat Apr 26 23:02:01 2014
@@ -36,7 +36,6 @@
 #include "util.h"
 #include "util_icon.h"
 #include "util_math.h"
-
 
 
 CanvasMode_CopyProperties::CanvasMode_CopyProperties(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW) 

Modified: trunk/Scribus/scribus/canvasmode_create.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_create.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_create.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_create.cpp Sat Apr 26 23:02:01 2014
@@ -62,6 +62,7 @@
 
 
 
+
 CreateMode::CreateMode(ScribusView* view) : CanvasMode(view) 
 {
 	canvasPressCoord.setXY(-1.0, -1.0);

Modified: trunk/Scribus/scribus/canvasmode_drawbezier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawbezier.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawbezier.cpp Sat Apr 26 23:02:01 2014
@@ -55,6 +55,7 @@
 #include "util.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 
 
 

Modified: trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawcalligraphic.cpp Sat Apr 26 23:02:01 2014
@@ -40,6 +40,7 @@
 #include "undomanager.h"
 #include "util.h"
 #include "util_math.h"
+
 
 
 

Modified: trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_drawfreehand.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawfreehand.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_drawfreehand.cpp Sat Apr 26 23:02:01 2014
@@ -37,7 +37,6 @@
 #include "undomanager.h"
 #include "util.h"
 #include "util_math.h"
-
 
 
 FreehandMode::FreehandMode(ScribusView* view) : CanvasMode(view) 

Modified: trunk/Scribus/scribus/canvasmode_edit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_edit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edit.cpp Sat Apr 26 23:02:01 2014
@@ -60,7 +60,6 @@
 #include "util_icon.h"
 #include "util_math.h"
 
-
 CanvasMode_Edit::CanvasMode_Edit(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW) 
 {
 	Mxp = Myp = -1;

Modified: trunk/Scribus/scribus/canvasmode_editarc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_editarc.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_editarc.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_editarc.cpp Sat Apr 26 23:02:01 2014
@@ -60,7 +60,6 @@
 #include "util.h"
 #include "util_icon.h"
 #include "util_math.h"
-
 
 CanvasMode_EditArc::CanvasMode_EditArc(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW) 
 {

Modified: trunk/Scribus/scribus/canvasmode_edittable.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_edittable.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_edittable.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_edittable.cpp Sat Apr 26 23:02:01 2014
@@ -32,7 +32,6 @@
 #include "ui/scmwmenumanager.h"
 #include "util_icon.h"
 
-
 // TODO: We should have a preference for this instead.
 #ifdef Q_OS_MAC
 	static const Qt::KeyboardModifiers CellNavigationModifiers = Qt::AltModifier | Qt::KeypadModifier;

Modified: trunk/Scribus/scribus/canvasmode_eyedropper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_eyedropper.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_eyedropper.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_eyedropper.cpp Sat Apr 26 23:02:01 2014
@@ -41,7 +41,6 @@
 #include "util_math.h"
 
 
-
 CanvasMode_EyeDropper::CanvasMode_EyeDropper(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW) 
 {
 	m_mouseGrabbed = false;

Modified: trunk/Scribus/scribus/canvasmode_framelinks.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_framelinks.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_framelinks.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_framelinks.cpp Sat Apr 26 23:02:01 2014
@@ -50,6 +50,7 @@
 #include "util.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 
 
 CanvasMode_FrameLinks::CanvasMode_FrameLinks(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW) 

Modified: trunk/Scribus/scribus/canvasmode_imageimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_imageimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_imageimport.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_imageimport.cpp Sat Apr 26 23:02:01 2014
@@ -30,12 +30,12 @@
 #include "canvas.h"
 #include "canvasmode.h"
 #include "prefsmanager.h"
-#include "ui/propertiespalette.h"
-#include "ui/propertiespalette_image.h"
 #include "scribus.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
 #include "selection.h"
+#include "ui/propertiespalette.h"
+#include "ui/propertiespalette_image.h"
 #include "util_icon.h"
 
 CanvasMode_ImageImport::CanvasMode_ImageImport(ScribusView *view) : CanvasMode(view), m_ScMW(view->m_ScMW)

Modified: trunk/Scribus/scribus/canvasmode_nodeedit.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_nodeedit.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_nodeedit.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_nodeedit.cpp Sat Apr 26 23:02:01 2014
@@ -26,17 +26,16 @@
 #include "pageitem.h"
 #include "scraction.h"
 #include "scribus.h"
+#include "scribusXml.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
-#include "scribusXml.h"
 #include "selection.h"
+#include "ui/pageselector.h"
+#include "ui/propertiespalette.h"
+#include "ui/scrspinbox.h"
 #include "undomanager.h"
 #include "util_icon.h"
 #include "util_math.h"
-#include "ui/pageselector.h"
-#include "ui/propertiespalette.h"
-#include "ui/scrspinbox.h"
-
 
 CanvasMode_NodeEdit::CanvasMode_NodeEdit(ScribusView* view) : CanvasMode(view), m_rectangleSelect(NULL)
 {

Modified: trunk/Scribus/scribus/canvasmode_normal.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_normal.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_normal.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_normal.cpp Sat Apr 26 23:02:01 2014
@@ -71,6 +71,7 @@
 #include "util.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 
 
 

Modified: trunk/Scribus/scribus/canvasmode_objimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/canvasmode_objimport.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_objimport.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_objimport.cpp Sat Apr 26 23:02:01 2014
@@ -45,7 +45,9 @@
 #include "util_math.h"
 
 
-CanvasMode_ObjImport::CanvasMode_ObjImport(ScribusView* view) : CanvasMode(view), m_ScMW(view->m_ScMW) 
+CanvasMode_ObjImport::CanvasMode_ObjImport(ScribusView* view) :
+	CanvasMode(view),
+	m_ScMW(view->m_ScMW)
 {
 	Mxp = Myp = -1;
 	m_mimeData = NULL;

Modified: trunk/Scribus/scribus/loadsaveplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/loadsaveplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/loadsaveplugin.cpp (original)
+++ trunk/Scribus/scribus/loadsaveplugin.cpp Sat Apr 26 23:02:01 2014
@@ -7,7 +7,7 @@
 #include "loadsaveplugin.h"
 #include "commonstrings.h"
 #include "scribuscore.h"
-#include "scribusview.h"
+
 #include "plugins/formatidlist.h"
 
 #include <QList>

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sat Apr 26 23:02:01 2014
@@ -37,8 +37,6 @@
 #include <cassert>
 #include <sstream>
 #include <QDebug>
-
-
 
 #include "appmodes.h"
 #include "canvas.h"
@@ -65,14 +63,16 @@
 #include "scpainter.h"
 #include "scpaths.h"
 #include "scpattern.h"
-
 #include "scribusapp.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "scribuswin.h"
 #include "sctextstream.h"
 #include "selection.h"
 #include "text/storytext.h"
+#include "ui/guidemanager.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "undostate.h"
 #include "util.h"
@@ -82,9 +82,6 @@
 #include "util_math.h"
 #include "util_text.h"
 
-
-#include "ui/guidemanager.h"
-#include "ui/propertiespalette.h"
 
 #include <cairo.h>
 

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Sat Apr 26 23:02:01 2014
@@ -51,6 +51,7 @@
 #include "scraction.h"
 #include "scribus.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "scribusstructs.h"
 #include "selection.h"
 #include "ui/guidemanager.h"

Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/export.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -15,6 +15,7 @@
 #include <QSharedPointer>
 
 #include "scribus.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 #include "scraction.h"
 #include "ui/scmwmenumanager.h"

Modified: trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/xpsexplugin.cpp Sat Apr 26 23:02:01 2014
@@ -47,6 +47,8 @@
 #include "scpage.h"
 #include "scpattern.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstruct.h"
 #include "tableutils.h"
 #include "util.h"

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Sat Apr 26 23:02:01 2014
@@ -22,7 +22,7 @@
 #include "scpattern.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
-#include "scribusview.h"
+
 #include "sctextstream.h"
 #include "scxmlstreamreader.h"
 #include "undomanager.h"

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp Sat Apr 26 23:02:01 2014
@@ -16,7 +16,7 @@
 #include "qtiocompressor.h"
 #include "scconfig.h"
 #include "scribusdoc.h"
-#include "scribusview.h"
+
 #include "sctextstream.h"
 #include "sccolorengine.h"
 #include "undomanager.h"

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Sat Apr 26 23:02:01 2014
@@ -23,7 +23,7 @@
 #include "scpattern.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
-#include "scribusview.h"
+
 #include "sctextstream.h"
 #include "scxmlstreamreader.h"
 #include "undomanager.h"

Modified: trunk/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -20,25 +20,25 @@
 #include <tiffio.h>
 #include <zlib.h>
 
+#include "importai.h"
+
 #include "commonstrings.h"
-
-#include "importai.h"
 #include "loadsaveplugin.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "prefstable.h"
 #include "rawimage.h"
+#include "scclocale.h"
 #include "sccolorengine.h"
 #include "scconfig.h"
-#include "scclocale.h"
 #include "scmimedata.h"
 #include "scpaths.h"
 #include "scpattern.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
 #include "text/specialchars.h"
@@ -51,9 +51,9 @@
 #include "util_color.h"
 #include "util_file.h"
 #include "util_formats.h"
+#include "util_ghostscript.h"
 #include "util_icon.h"
 #include "util_math.h"
-#include "util_ghostscript.h"
 
 #include <cairo.h>
 

Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -24,34 +24,36 @@
 
 #include <cstdlib>
 
+
 #include "commonstrings.h"
-#include "ui/customfdialog.h"
 #include "importcgm.h"
 #include "loadsaveplugin.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
 #include "pagesize.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "prefstable.h"
-#include "ui/propertiespalette.h"
 #include "rawimage.h"
 #include "scclocale.h"
 #include "sccolorengine.h"
 #include "scconfig.h"
 #include "scmimedata.h"
 #include "scpaths.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -17,34 +17,37 @@
 
 #include <cstdlib>
 
+#include "importcvg.h"
+
 #include "commonstrings.h"
-#include "ui/customfdialog.h"
-#include "importcvg.h"
 #include "loadsaveplugin.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
 #include "pagesize.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "prefstable.h"
-#include "ui/propertiespalette.h"
 #include "rawimage.h"
 #include "scclocale.h"
 #include "sccolorengine.h"
 #include "scconfig.h"
 #include "scmimedata.h"
 #include "scpaths.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -24,19 +24,16 @@
 
 #include <cstdlib>
 
+#include "importdrw.h"
+
 #include "commonstrings.h"
-#include "ui/customfdialog.h"
-#include "importdrw.h"
 #include "loadsaveplugin.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
 #include "pageitem_imageframe.h"
 #include "pagesize.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "prefstable.h"
-#include "ui/propertiespalette.h"
 #include "rawimage.h"
 #include "scclocale.h"
 #include "sccolorengine.h"
@@ -44,16 +41,22 @@
 #include "scmimedata.h"
 #include "scpaths.h"
 #include "scpattern.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -30,9 +30,9 @@
 #include <climits>
 #include <limits>
 
+#include "importidml.h"
+
 #include "commonstrings.h"
-
-#include "importidml.h"
 #include "loadsaveplugin.h"
 #include "pageitem_table.h"
 #include "pagesize.h"
@@ -46,21 +46,22 @@
 #include "scconfig.h"
 #include "scmimedata.h"
 #include "scpaths.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
 
-#include "ui/customfdialog.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
-#include "ui/propertiespalette.h"
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/odg/importodg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -32,14 +32,15 @@
 #include <climits>
 #include <limits>
 
+#include "importodg.h"
+
 #include "color.h"
-
-#include "importodg.h"
 #include "fileloader.h"
 #include "fparser.h"
 #include "loadsaveplugin.h"
 #include "pageitem_table.h"
 #include "pagesize.h"
+#include "plugins/formatidlist.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
@@ -51,23 +52,22 @@
 #include "scmimedata.h"
 #include "scpainter.h"
 #include "scpaths.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "third_party/zip/scribus_zip.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
-#include "plugins/formatidlist.h"
-
-#include "ui/customfdialog.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
-#include "ui/propertiespalette.h"
-
-#include "third_party/zip/scribus_zip.h"
+
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp Sat Apr 26 23:02:01 2014
@@ -23,7 +23,6 @@
 #include "color.h"
 #include "commonstrings.h"
 #include "fpointarray.h"
-#include "ui/scmwmenumanager.h"
 #include "pageitem.h"
 #include "pluginmanager.h"
 #include "prefscontext.h"
@@ -37,16 +36,19 @@
 #include "scribusXml.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "selection.h"
 #include "serializer.h"
 #include "stylestack.h"
+#include "third_party/zip/scribus_zip.h"
 #include "ui/customfdialog.h"
 #include "ui/propertiespalette.h"
+#include "ui/scmwmenumanager.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_icon.h"
 #include "util_math.h"
-#include "third_party/zip/scribus_zip.h"
+
 
 
 using namespace std;

Modified: trunk/Scribus/scribus/plugins/import/pages/importpages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -33,6 +33,8 @@
 #include "commonstrings.h"
 
 #include "importpages.h"
+
+
 #include "loadsaveplugin.h"
 #include "pageitem_table.h"
 #include "pagesize.h"
@@ -47,22 +49,22 @@
 #include "scconfig.h"
 #include "scmimedata.h"
 #include "scpaths.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "third_party/zip/scribus_zip.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
 
-#include "ui/customfdialog.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
-#include "ui/propertiespalette.h"
-
-#include "third_party/zip/scribus_zip.h"
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -18,19 +18,16 @@
 
 #include <cstdlib>
 
+#include "importpct.h"
+
 #include "commonstrings.h"
-#include "ui/customfdialog.h"
-#include "importpct.h"
 #include "loadsaveplugin.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
 #include "pageitem_imageframe.h"
 #include "pagesize.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "prefstable.h"
-#include "ui/propertiespalette.h"
 #include "rawimage.h"
 #include "scclocale.h"
 #include "sccolorengine.h"
@@ -38,16 +35,22 @@
 #include "scmimedata.h"
 #include "scpaths.h"
 #include "scpattern.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/ps/importps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -18,20 +18,23 @@
 
 #include <cstdlib>
 
+#include "importps.h"
+
+
 #include "commonstrings.h"
-#include "importps.h"
 #include "loadsaveplugin.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "prefstable.h"
+#include "scclocale.h"
 #include "scconfig.h"
-#include "scclocale.h"
 #include "scmimedata.h"
 #include "scpaths.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
 #include "ui/customfdialog.h"
@@ -43,6 +46,7 @@
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 #ifdef HAVE_PODOFO
 	#include <podofo/podofo.h>
 #endif

Modified: trunk/Scribus/scribus/plugins/import/shape/importshape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -17,18 +17,16 @@
 
 #include <cstdlib>
 
+#include "importshape.h"
+
+
 #include "commonstrings.h"
-#include "ui/customfdialog.h"
-#include "importshape.h"
 #include "loadsaveplugin.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
 #include "pagesize.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "prefstable.h"
-#include "ui/propertiespalette.h"
 #include "rawimage.h"
 #include "scclocale.h"
 #include "sccolorengine.h"
@@ -36,11 +34,16 @@
 #include "sclimits.h"
 #include "scmimedata.h"
 #include "scpaths.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "units.h"
 #include "util.h"

Modified: trunk/Scribus/scribus/plugins/import/sml/importsml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -17,34 +17,38 @@
 
 #include <cstdlib>
 
+#include "importsml.h"
+
+
 #include "commonstrings.h"
-#include "ui/customfdialog.h"
-#include "importsml.h"
 #include "loadsaveplugin.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
 #include "pagesize.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "prefstable.h"
-#include "ui/propertiespalette.h"
 #include "rawimage.h"
 #include "scclocale.h"
 #include "sccolorengine.h"
 #include "scconfig.h"
 #include "scmimedata.h"
 #include "scpaths.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -15,32 +15,35 @@
 #include <QPainterPath>
 #include <QRegExp>
 #include <QTemporaryFile>
+
+#include "svgplugin.h"
+
 #include "color.h"
 #include "commonstrings.h"
 #include "fonts/scfontmetrics.h"
 #include "fpointarray.h"
 #include "loadsaveplugin.h"
-#include "ui/scmwmenumanager.h"
 #include "pageitem.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "qtiocompressor.h"
+#include "scclocale.h"
 #include "sccolorengine.h"
-#include "scclocale.h"
 #include "scconfig.h"
 #include "sclimits.h"
 #include "scmimedata.h"
 #include "scpaths.h"
 #include "scpattern.h"
 #include "scraction.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "selection.h"
-#include "svgplugin.h"
 #include "ui/customfdialog.h"
 #include "ui/propertiespalette.h"
+#include "ui/scmwmenumanager.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_formats.h"

Modified: trunk/Scribus/scribus/plugins/import/viva/importviva.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -30,9 +30,12 @@
 #include <climits>
 #include <limits>
 
+
+#include "importviva.h"
+
+
+
 #include "commonstrings.h"
-
-#include "importviva.h"
 #include "loadsaveplugin.h"
 #include "pageitem_table.h"
 #include "pagesize.h"
@@ -46,20 +49,20 @@
 #include "scconfig.h"
 #include "scmimedata.h"
 #include "scpaths.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
-
-#include "ui/customfdialog.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
-#include "ui/propertiespalette.h"
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -20,26 +20,27 @@
 #include <QRegExp>
 
 #include "commonstrings.h"
-
-#include "scribusXml.h"
 #include "fonts/scfontmetrics.h"
 #include "fpointarray.h"
-#include "ui/scmwmenumanager.h"
-#include "prefsmanager.h"
+#include "loadsaveplugin.h"
 #include "pageitem.h"
 #include "prefsfile.h"
+#include "prefsmanager.h"
 #include "scmimedata.h"
 #include "scraction.h"
+#include "scribusXml.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "selection.h"
 #include "ui/customfdialog.h"
 #include "ui/propertiespalette.h"
+#include "ui/scmwmenumanager.h"
 #include "undomanager.h"
-#include "loadsaveplugin.h"
 #include "util.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 
 
 using namespace std;

Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -16,19 +16,17 @@
 #include <QDebug>
 
 #include <cstdlib>
+#include <stdio.h>
+
+#include "importwpg.h"
 
 #include "commonstrings.h"
-#include "ui/customfdialog.h"
-#include "importwpg.h"
 #include "loadsaveplugin.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
 #include "pagesize.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "prefstable.h"
-#include "ui/propertiespalette.h"
 #include "rawimage.h"
 #include "scclocale.h"
 #include "sccolorengine.h"
@@ -36,18 +34,24 @@
 #include "scmimedata.h"
 #include "scpaths.h"
 #include "scpattern.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "third_party/wpg/WPGStreamImplementation.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
-#include <stdio.h>
-#include "third_party/wpg/WPGStreamImplementation.h"
+
+
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/xar/importxar.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -24,11 +24,10 @@
 
 #include <cstdlib>
 
-#include "ui/customfdialog.h"
 #include "importxar.h"
+
+
 #include "loadsaveplugin.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
 #include "pageitem_imageframe.h"
 #include "pageitem_polygon.h"
 #include "pageitem_polyline.h"
@@ -37,7 +36,6 @@
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "prefstable.h"
-#include "ui/propertiespalette.h"
 #include "rawimage.h"
 #include "scclocale.h"
 #include "sccolorengine.h"
@@ -45,16 +43,22 @@
 #include "scmimedata.h"
 #include "scpaths.h"
 #include "scpattern.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -17,11 +17,12 @@
 
 #include <cstdlib>
 
+#include "importxfig.h"
+
 #include "commonstrings.h"
-#include "importxfig.h"
 #include "loadsaveplugin.h"
+#include "pageitem.h"
 #include "pagesize.h"
-#include "pageitem.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
@@ -33,9 +34,10 @@
 #include "scmimedata.h"
 #include "scpaths.h"
 #include "scpattern.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
 #include "ui/customfdialog.h"
@@ -47,6 +49,7 @@
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
+
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/import/xps/importxps.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -33,6 +33,7 @@
 #include "commonstrings.h"
 
 #include "importxps.h"
+
 #include "loadsaveplugin.h"
 #include "pageitem_table.h"
 #include "pagesize.h"
@@ -46,24 +47,24 @@
 #include "scconfig.h"
 #include "scmimedata.h"
 #include "scpaths.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "sctextstream.h"
 #include "selection.h"
+#include "third_party/zip/scribus_zip.h"
+#include "ui/customfdialog.h"
+#include "ui/missing.h"
+#include "ui/multiprogressdialog.h"
+#include "ui/propertiespalette.h"
 #include "undomanager.h"
 #include "util.h"
 #include "util_formats.h"
 #include "util_icon.h"
 #include "util_math.h"
-
-#include "ui/customfdialog.h"
-#include "ui/missing.h"
-#include "ui/multiprogressdialog.h"
-#include "ui/propertiespalette.h"
 #include "xpsimportoptions.h"
 
-#include "third_party/zip/scribus_zip.h"
 
 extern SCRIBUS_API ScribusQApp * ScQApp;
 

Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp (original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/satemplate.cpp Sat Apr 26 23:02:01 2014
@@ -13,6 +13,7 @@
 #include "scpaths.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmddoc.cpp Sat Apr 26 23:02:01 2014
@@ -10,6 +10,7 @@
 #include "documentinformation.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 
 #include <QApplication>
 

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmani.cpp Sat Apr 26 23:02:01 2014
@@ -6,13 +6,15 @@
 */
 #include "cmdmani.h"
 #include "cmdutil.h"
-#include "selection.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
+#include "sctextstream.h"
+#include "selection.h"
 #include "ui/propertiespalette.h" //CB argh.. noooooooooooooooooooooooooooooooooooo FIXME see other FIXME
 #include "ui/propertiespalette_image.h"
 #include "undomanager.h"
-#include "sctextstream.h"
+
 
 PyObject *scribus_loadimage(PyObject* /* self */, PyObject* args)
 {

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp Sat Apr 26 23:02:01 2014
@@ -15,6 +15,7 @@
 #include "prefsmanager.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "selection.h"
 #include "fonts/scfontmetrics.h"
 

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp Sat Apr 26 23:02:01 2014
@@ -12,6 +12,7 @@
 #include "pageitem_table.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "selection.h"
 #include "util_math.h"
 

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp Sat Apr 26 23:02:01 2014
@@ -10,6 +10,7 @@
 #include "scpage.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 
 #include <QApplication>
 

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdtext.cpp Sat Apr 26 23:02:01 2014
@@ -13,6 +13,7 @@
 #include "prefsmanager.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "selection.h"
 #include "util.h"
 

Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp Sat Apr 26 23:02:01 2014
@@ -8,6 +8,7 @@
 #include "scpage.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "selection.h"
 #include "tableborder.h"
 #include "units.h"

Modified: trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp Sat Apr 26 23:02:01 2014
@@ -7,6 +7,7 @@
 #include "guiapp.h"
 #include "cmdutil.h"
 #include "scribuscore.h"
+#include "scribusview.h"
 
 #include <QApplication>
 #include <QCursor>

Modified: trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp Sat Apr 26 23:02:01 2014
@@ -15,6 +15,7 @@
 #include "scpage.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 
 typedef struct
 {

Modified: trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp Sat Apr 26 23:02:01 2014
@@ -10,6 +10,7 @@
 #include "prefsmanager.h"
 #include "scribusdoc.h"
 #include "scribuscore.h"
+#include "scribusview.h"
 #include <structmember.h>
 #include "ui/bookmarkpalette.h"
 

Modified: trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp Sat Apr 26 23:02:01 2014
@@ -29,6 +29,7 @@
 #include "scraction.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "scpaths.h"
 #include "selection.h"
 #include "prefsfile.h"

Modified: trunk/Scribus/scribus/plugins/scriptplugin/svgimport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/scriptplugin/svgimport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/svgimport.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/svgimport.cpp Sat Apr 26 23:02:01 2014
@@ -14,6 +14,7 @@
 #include "../formatidlist.h"
 #include "loadsaveplugin.h"
 #include "scribuscore.h"
+#include "scribusview.h"
 #include "selection.h"
 #include "ui/propertiespalette.h"
 #include "ui/propertiespalette_line.h"

Modified: trunk/Scribus/scribus/plugins/short-words/parse.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/short-words/parse.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/parse.cpp (original)
+++ trunk/Scribus/scribus/plugins/short-words/parse.cpp Sat Apr 26 23:02:01 2014
@@ -19,17 +19,19 @@
 #include <QProgressBar>
 #include <QRegExp>
 
-#include "shortwords.h"
 #include "parse.h"
-#include "version.h"
+
 #include "configuration.h"
-
 #include "langmgr.h"
 #include "pageitem.h"
+#include "scpage.h"
 #include "scribus.h"
 #include "scribusdoc.h"
-#include "scpage.h"
+#include "scribusview.h"
 #include "selection.h"
+#include "shortwords.h"
+#include "version.h"
+
 
 SWParse::SWParse()
 {

Modified: trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/shortwords.cpp (original)
+++ trunk/Scribus/scribus/plugins/short-words/shortwords.cpp Sat Apr 26 23:02:01 2014
@@ -37,6 +37,7 @@
 #include "scpaths.h"
 #include "scribus.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "util_icon.h"
 
 int scribusshortwords_getPluginAPIVersion()

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/meshdistortion.cpp Sat Apr 26 23:02:01 2014
@@ -27,6 +27,7 @@
 #include "meshdistortiondialog.h"
 #include "meshdistortion.h"
 #include "scribuscore.h"
+#include "scribusview.h"
 #include "appmodes.h"
 #include "util.h"
 #include "util_math.h"

Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/pathalongpath.cpp Sat Apr 26 23:02:01 2014
@@ -24,13 +24,16 @@
 *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.              *
 ****************************************************************************/
 
+#include "pathalongpath.h"
+
+#include "appmodes.h"
+#include "pageitem_group.h"
 #include "pathdialog.h"
-#include "pathalongpath.h"
-#include "pageitem_group.h"
 #include "scribuscore.h"
-#include "appmodes.h"
+#include "scribusview.h"
 #include "util.h"
 #include "util_math.h"
+
 
 int pathalongpath_getPluginAPIVersion()
 {

Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/hunspellpluginimpl.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&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 Sat Apr 26 23:02:01 2014
@@ -9,14 +9,15 @@
 #include "langmgr.h"
 #include "pageitem.h"
 #include "pageitem_textframe.h"
+#include "scpaths.h"
+#include "scribus.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
 #include "selection.h"
-#include "scpaths.h"
-#include "scribusdoc.h"
-#include "scribus.h"
-#include "scribusview.h"
+#include "text/specialchars.h"
 #include "ui/storyeditor.h"
-#include "text/specialchars.h"
 #include "util.h"
+
 
 #include <QDebug>
 #include <QDir>

Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/pathconnect.cpp Sat Apr 26 23:02:01 2014
@@ -28,6 +28,7 @@
 #include "pathconnectdialog.h"
 #include "selection.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "undomanager.h"
 
 int pathconnect_getPluginAPIVersion()

Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp (original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/pathfinder.cpp Sat Apr 26 23:02:01 2014
@@ -30,6 +30,7 @@
 #include "pathfinderdialog.h"
 #include "selection.h"
 #include "scribuscore.h"
+#include "scribusview.h"
 #include "sccolorengine.h"
 #include "ui/propertiespalette.h"
 #include "undomanager.h"

Modified: trunk/Scribus/scribus/scpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/scpage.cpp
==============================================================================
--- trunk/Scribus/scribus/scpage.cpp (original)
+++ trunk/Scribus/scribus/scpage.cpp Sat Apr 26 23:02:01 2014
@@ -28,6 +28,7 @@
 #include "scpage.h"
 #include "scribus.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "selection.h"
 #include "undomanager.h"
 #include "undostate.h"

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sat Apr 26 23:02:01 2014
@@ -50,6 +50,7 @@
 #include <QMouseEvent>
 #include <QPixmap>
 #include <QProgressBar>
+#include <QPushButton>
 //<<QML testing
 #include <QHBoxLayout>
 #include <QQuickView>
@@ -111,18 +112,21 @@
 #include "gtgettext.h"
 #include "hyphenator.h"
 #include "langmgr.h"
+#include "loadsaveplugin.h"
 #include "marks.h"
+#include "nfttemplate.h"
 #include "notesstyles.h"
 #include "pageitem_group.h"
 #include "pageitem_imageframe.h"
 #include "pageitem_latexframe.h"
+#include "pageitem_noteframe.h"
 #include "pageitem_table.h"
 #include "pageitem_textframe.h"
-#include "pageitem_noteframe.h"
 #include "pagesize.h"
 #include "pdflib.h"
 #include "pdfoptions.h"
 #include "pluginmanager.h"
+#include "plugins/formatidlist.h"
 #include "plugins/formatidlist.h"
 #include "prefscontext.h"
 #include "prefsfile.h"
@@ -132,20 +136,22 @@
 #include "resourcecollection.h"
 #include "sccolorengine.h"
 #include "scgtplugin.h"
+#include "scimagecachemanager.h"
 #include "scmimedata.h"
 #include "scpage.h"
 #include "scpaths.h"
 #include "scprintengine_ps.h"
 #include "scraction.h"
-
-#include "scribusdoc.h"
 #include "scribusXml.h"
 #include "scribusapp.h"
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 #include "scribuswin.h"
 #include "selection.h"
 #include "serializer.h"
+#include "styleoptions.h"
+#include "tocgenerator.h"
 #include "ui/about.h"
 #include "ui/aboutplugins.h"
 #include "ui/adjustcmsdialog.h"
@@ -162,10 +168,13 @@
 #include "ui/collectforoutput_ui.h"
 #include "ui/colorcombo.h"
 #include "ui/contextmenu.h"
+#include "ui/copypagetomasterpagedialog.h"
 #include "ui/cpalette.h"
 #include "ui/customfdialog.h"
 #include "ui/delpages.h"
+#include "ui/edittoolbar.h"
 #include "ui/effectsdialog.h"
+#include "ui/filetoolbar.h"
 #include "ui/fontcombo.h"
 #include "ui/guidemanager.h"
 #include "ui/helpbrowser.h"
@@ -177,32 +186,26 @@
 #include "ui/javadocs.h"
 #include "ui/layers.h"
 #include "ui/loremipsum.h"
+#include "ui/margindialog.h"
 #include "ui/marginwidget.h"
-#include "ui/margindialog.h"
 #include "ui/mark2item.h"
 #include "ui/mark2mark.h"
 #include "ui/markanchor.h"
+#include "ui/markinsert.h"
 #include "ui/marknote.h"
+#include "ui/marksmanager.h"
 #include "ui/markvariabletext.h"
-#include "ui/markinsert.h"
-#include "ui/marksmanager.h"
 #include "ui/masterpagepalette.h"
 #include "ui/mergedoc.h"
+#include "ui/modetoolbar.h"
 #include "ui/movepage.h"
 #include "ui/multipleduplicate.h"
 #include "ui/newfile.h"
 #include "ui/newtemp.h"
-#include "nfttemplate.h"
 #include "ui/nftdialog.h"
-#include "ui_nftdialog.h"
 #include "ui/nftwidget.h"
 #include "ui/nodeeditpalette.h"
 #include "ui/notesstyleseditor.h"
-#ifdef HAVE_OSG
-	#include "ui/osgeditor.h"
-	#include <osgDB/ReaderWriter>
-	#include <osgDB/PluginQuery>
-#endif
 #include "ui/outlinepalette.h"
 #include "ui/pageitemattributes.h"
 #include "ui/pagelayout.h"
@@ -210,6 +213,7 @@
 #include "ui/pageselector.h"
 #include "ui/paintmanager.h"
 #include "ui/pdfopts.h"
+#include "ui/pdftoolbar.h"
 #include "ui/picstatus.h"
 #include "ui/polygonwidget.h"
 #include "ui/preferencesdialog.h"
@@ -226,10 +230,11 @@
 #include "ui/sccombobox.h"
 #include "ui/scfilewidget.h"
 #include "ui/scmessagebox.h"
+#include "ui/scmwmenumanager.h"
 #include "ui/scrapbookpalette.h"
-#include "ui/scmwmenumanager.h"
+#include "ui/scrspinbox.h"
+#include "ui/search.h"
 #include "ui/selectobjects.h"
-#include "ui/search.h"
 #include "ui/smcellstyle.h"
 #include "ui/smlinestyle.h"
 #include "ui/smtablestyle.h"
@@ -239,15 +244,11 @@
 #include "ui/stylemanager.h"
 #include "ui/symbolpalette.h"
 #include "ui/tabmanager.h"
-#include "tocgenerator.h"
 #include "ui/transformdialog.h"
 #include "ui/transparencypalette.h"
-#include "ui/copypagetomasterpagedialog.h"
-#include "ui/edittoolbar.h"
-#include "ui/filetoolbar.h"
-#include "ui/modetoolbar.h"
-#include "ui/pdftoolbar.h"
 #include "ui/viewtoolbar.h"
+#include "ui/vruler.h"
+#include "ui_nftdialog.h"
 #include "undogui.h"
 #include "undomanager.h"
 #include "undostate.h"
@@ -258,10 +259,14 @@
 #include "util_ghostscript.h"
 #include "util_icon.h"
 #include "util_math.h"
-#include "ui/vruler.h"
-#include "loadsaveplugin.h"
-#include "plugins/formatidlist.h"
-#include "scimagecachemanager.h"
+
+
+
+#ifdef HAVE_OSG
+	#include "ui/osgeditor.h"
+	#include <osgDB/ReaderWriter>
+	#include <osgDB/PluginQuery>
+#endif
 
 #if defined(_WIN32)
 #include "scdocoutput_ps2.h"
@@ -1200,9 +1205,9 @@
 	pageSelector->setFocusPolicy(Qt::ClickFocus);
 
 #if OPTION_USE_QTOOLBUTTON
-	zoomOutToolbarButton = new QToolButton(this);
 	zoomDefaultToolbarButton = new QToolButton(this);
 	zoomInToolbarButton = new QToolButton(this);
+	zoomOutToolbarButton = new QToolButton(this);
 	zoomDefaultToolbarButton->setAutoRaise(OPTION_FLAT_BUTTON);
 	zoomOutToolbarButton->setAutoRaise(OPTION_FLAT_BUTTON);
 	zoomInToolbarButton->setAutoRaise(OPTION_FLAT_BUTTON);

Modified: trunk/Scribus/scribus/scribus.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/scribus.h
==============================================================================
--- trunk/Scribus/scribus/scribus.h (original)
+++ trunk/Scribus/scribus/scribus.h Sat Apr 26 23:02:01 2014
@@ -39,9 +39,11 @@
 #include <QMultiHash>
 #include <QPixmap>
 #include <QPointer>
+#include <QPushButton>
 #include <QProcess>
 #include <QQuickView>
 #include <QString>
+#include <QToolButton>
 
 class QCloseEvent;
 class QDragEnterEvent;
@@ -51,13 +53,11 @@
 class QLabel;
 class QMdiArea;
 class QMdiSubWindow;
-class QProgressBar;
-class QToolButton;
 
 // application specific includes
 #include "scribusapi.h"
-#include "scribusview.h"
 #include "scribusdoc.h"
+#include "styleoptions.h"
 #include "ui/customfdialog.h"
 #include "appmodehelper.h"
 
@@ -88,6 +88,7 @@
 class PSLib;
 class PageItem;
 class PagePalette;
+class PageSelector;
 class PrefsContext;
 class PrefsManager;
 class PropertiesPalette;
@@ -98,6 +99,7 @@
 class ScribusMainWindow;
 class ScribusQApp;
 class ScribusWin;
+class ScrSpinBox;
 class SimpleState;
 class StoryEditor;
 class StyleManager;

Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sat Apr 26 23:02:01 2014
@@ -70,24 +70,23 @@
 #ifdef HAVE_OSG
 	#include "pageitem_osgframe.h"
 #endif
-#include "pageitem_symbol.h"
+#include "colormgmt/sccolormgmtenginefactory.h"
+#include "pageitem_arc.h"
 #include "pageitem_group.h"
 #include "pageitem_regularpolygon.h"
-#include "pageitem_arc.h"
 #include "pageitem_spiral.h"
-#include "ui/pagepalette.h"
+#include "pageitem_symbol.h"
 #include "pagesize.h"
 #include "pagestructs.h"
 #include "prefsfile.h"
 #include "prefsmanager.h"
 #include "resourcecollection.h"
 #include "scclocale.h"
+#include "sccolorengine.h"
 #include "sclimits.h"
-#include "sccolorengine.h"
 #include "scpage.h"
 #include "scpainter.h"
 #include "scraction.h"
-
 #include "scribusXml.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
@@ -96,6 +95,16 @@
 #include "selection.h"
 #include "serializer.h"
 #include "tableborder.h"
+#include "ui/hruler.h"
+#include "ui/layers.h"
+#include "ui/mark2item.h"
+#include "ui/mark2mark.h"
+#include "ui/markanchor.h"
+#include "ui/markinsert.h"
+#include "ui/marksmanager.h"
+#include "ui/markvariabletext.h"
+#include "ui/pagepalette.h"
+#include "ui/storyeditor.h"
 #include "ui/tablecolumnwidthsdialog.h"
 #include "ui/tablerowheightsdialog.h"
 #include "undomanager.h"
@@ -104,16 +113,6 @@
 #include "util_icon.h"
 #include "util_math.h"
 
-#include "colormgmt/sccolormgmtenginefactory.h"
-#include "ui/hruler.h"
-#include "ui/layers.h"
-#include "ui/markinsert.h"
-#include "ui/mark2item.h"
-#include "ui/mark2mark.h"
-#include "ui/markanchor.h"
-#include "ui/markvariabletext.h"
-#include "ui/marksmanager.h"
-#include "ui/storyeditor.h"
 
 // static const bool FRAMESELECTION_EDITS_DEFAULTSTYLE = false;
 

Modified: trunk/Scribus/scribus/scribusview.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/scribusview.h
==============================================================================
--- trunk/Scribus/scribus/scribusview.h (original)
+++ trunk/Scribus/scribus/scribusview.h Sat Apr 26 23:02:01 2014
@@ -24,23 +24,17 @@
 #ifndef SCRIBUSVIEW_H
 #define SCRIBUSVIEW_H
 
-#include "styleoptions.h"
-
 #include <vector>
 // include files for QT
 #include <QScrollArea>
 #include <QLineEdit>
 #include <QScrollBar>
-#if OPTION_USE_QTOOLBUTTON
-    #include <QToolButton>
-#else
-    #include <QPushButton>
-#endif
 #include <QMap>
 #include <QMenu>
 #include <QLabel>
 #include <QComboBox>
 #include <QProgressDialog>
+#include <QPushButton>
 #include <QSpinBox>
 #include <QCursor>
 #include <QDragLeaveEvent>

Modified: trunk/Scribus/scribus/scribuswin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/scribuswin.cpp
==============================================================================
--- trunk/Scribus/scribus/scribuswin.cpp (original)
+++ trunk/Scribus/scribus/scribuswin.cpp Sat Apr 26 23:02:01 2014
@@ -29,6 +29,7 @@
 
 #include "scribus.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "commonstrings.h"
 #include "ui/storyeditor.h"
 #include "util_icon.h"

Modified: trunk/Scribus/scribus/ui/aligndistribute.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/aligndistribute.h
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.h (original)
+++ trunk/Scribus/scribus/ui/aligndistribute.h Sat Apr 26 23:02:01 2014
@@ -33,19 +33,19 @@
 class QEvent;
 
 #include "scribusapi.h"
-#include "scribusview.h"
+#include "scribusdoc.h"
 #include "ui/scdockpalette.h"
 
-class QSpacerItem;
+class QComboBox;
 class QLabel;
 class QLineEdit;
-class QComboBox;
+class QSpacerItem;
 class QToolButton;
 class ScrSpinBox;
+class ScribusMainWindow;
+class ScribusView;
+class UndoManager;
 
-class ScribusMainWindow;
-class ScribusDoc;
-class UndoManager;
 struct AlignObjs;
 
 

Modified: trunk/Scribus/scribus/ui/contextmenu.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/contextmenu.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/contextmenu.cpp (original)
+++ trunk/Scribus/scribus/ui/contextmenu.cpp Sat Apr 26 23:02:01 2014
@@ -107,7 +107,7 @@
 	if (selectedItemCount==1 && currItem->asImageFrame())
 	{
 		QAction *act = addMenu(menuInfo);
-		act->setText( ScribusView::tr("In&fo"));
+		act->setText( tr("In&fo"));
 		if (currItem->asImageFrame())
 		{
 			QLabel* menuLabel = new QLabel("<html>" + currItem->infoDescription() + "</html>", this);
@@ -131,12 +131,12 @@
 	
 			QLabel *printCT = new QLabel(infoGroup);
 			QLabel *printT = new QLabel(infoGroup);
-			printCT->setText( ScribusView::tr("Print: "));
+			printCT->setText( tr("Print: "));
 			infoGroupLayout->addWidget( printCT, row, 0, Qt::AlignRight );
 			if (currItem->printEnabled())
-				printT->setText( ScribusView::tr("Enabled"));
+				printT->setText( tr("Enabled"));
 			else
-				printT->setText( ScribusView::tr("Disabled"));
+				printT->setText( tr("Disabled"));
 			infoGroupLayout->addWidget( printT, row, 1 ); // </a.l.e>
 					
 			QWidgetAction* MenAct = new QWidgetAction(this);
@@ -146,7 +146,7 @@
 	// Qt4				menuInfo->insertItem(infoGroup);
 //			currItem->createContextMenu(menuInfo, 5);
 			QAction *act = addMenu(menuInfo);
-			act->setText( ScribusView::tr("In&fo"));
+			act->setText( tr("In&fo"));
 		} else	{
 			delete infoGroupLayout;
 			delete infoGroup;
@@ -185,7 +185,7 @@
 			//add actions for marks in edit mode
 			addSeparator();
 			QAction *act2 = addMenu(menuMark);
-			act2->setText( ScribusView::tr("Insert Mark"));
+			act2->setText( tr("Insert Mark"));
 			menuMark->addAction(m_ScMW->scrActions["insertMarkVariableText"]);
 			if (m_actionList.contains("insertMarkAnchor"))
 			{
@@ -333,7 +333,7 @@
 	if (currItem->itemType() == PageItem::TextFrame)
 	{
 		QAction *act = addMenu(menuPDF);
-		act->setText( ScribusView::tr("&PDF Options"));
+		act->setText( tr("&PDF Options"));
 		menuPDF->addAction(m_ScMW->scrActions["itemPDFIsAnnotation"]);
 		if (!m_doc->masterPageMode())
 			menuPDF->addAction(m_ScMW->scrActions["itemPDFIsBookmark"]);
@@ -357,12 +357,12 @@
 		menuLocking->addAction(m_ScMW->scrActions["itemLock"]);
 		menuLocking->addAction(m_ScMW->scrActions["itemLockSize"]);
 		QAction *actL = addMenu(menuLocking);
-		actL->setText( ScribusView::tr("Locking"));
+		actL->setText( tr("Locking"));
 
 		QAction *actST = addMenu(menuSendTo);
-		actST->setText( ScribusView::tr("Send to"));
+		actST->setText( tr("Send to"));
 		QAction *actScr = menuSendTo->addMenu(menuScrapbook);
-		actScr->setText( ScribusView::tr("Scrapbook"));
+		actScr->setText( tr("Scrapbook"));
 		menuSendTo->addAction(m_ScMW->scrActions["itemSendToPattern"]);
 		menuSendTo->addAction(m_ScMW->scrActions["itemSendToInline"]);
 
@@ -393,7 +393,7 @@
 				menuLayer->addAction(m_ScMW->scrLayersActions[QString::number(layerMap[i--])]);
 			}
 			QAction *act = addMenu(menuLayer);
-			act->setText( ScribusView::tr("Send to La&yer"));
+			act->setText( tr("Send to La&yer"));
 		}
 		//-->
 	}
@@ -423,7 +423,7 @@
 		if (menuLevel->actions().count()>0)
 		{
 			QAction *act = addMenu(menuLevel);
-			act->setText( ScribusView::tr("Le&vel"));
+			act->setText( tr("Le&vel"));
 		}
 	}
 	//-->
@@ -446,7 +446,7 @@
 		if (menuConvertTo->actions().count()>0)
 		{
 			QAction *act = addMenu(menuConvertTo);
-			act->setText( ScribusView::tr("Conve&rt to"));
+			act->setText( tr("Conve&rt to"));
 		}
 	}
 	//-->
@@ -478,7 +478,7 @@
 	if (menuEditContents->actions().count()>0)
 	{
 		QAction *act = addMenu(menuEditContents);
-		act->setText( ScribusView::tr("Contents"));
+		act->setText( tr("Contents"));
 	}
 	//-->
 	
@@ -505,7 +505,7 @@
 //		menuWeld->addAction(m_AP->scrActions["itemWeld13"]);
 //		menuWeld->addAction(m_AP->scrActions["itemWeld31"]);
 //		QAction *act = addMenu(menuWeld);
-//		act->setText( ScribusView::tr("Weld to last..."));
+//		act->setText( tr("Weld to last..."));
 //	}
 	//-->
 	
@@ -526,7 +526,7 @@
 	{
 		m_doc->view()->dragX = mx;
 		m_doc->view()->dragY = my;
-		addAction( ScribusView::tr("&Paste Here") , m_doc->view(), SLOT(PasteToPage()));
+		addAction( tr("&Paste Here") , m_doc->view(), SLOT(PasteToPage()));
 	}
 	if (m_ScMW->scrRecentPasteActions.count()>0)
 	{
@@ -534,7 +534,7 @@
 		m_doc->view()->dragY = my;
 		QMenu* menuPasteRecent = new QMenu(this);
 		QAction *act = addMenu(menuPasteRecent);
-		act->setText( ScribusView::tr("Paste Recent"));
+		act->setText( tr("Paste Recent"));
 		
 		QMap<QString, QPointer<ScrAction> > scrRecentPasteActions;
 		ScrAction *recentPasteAction;

Modified: trunk/Scribus/scribus/ui/extimageprops.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/extimageprops.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/extimageprops.cpp (original)
+++ trunk/Scribus/scribus/ui/extimageprops.cpp Sat Apr 26 23:02:01 2014
@@ -41,7 +41,7 @@
 	ExtImagePropsLayout = new QVBoxLayout( this );
 	ExtImagePropsLayout->setMargin(6);
 	ExtImagePropsLayout->setSpacing(6);
-	viewWidget = view;
+	m_view = view;
 	currentItem = item;
 	currentLayer = 0;
 	originalInfo = *info;
@@ -315,7 +315,7 @@
 	doPreview = false;
 	if (originalInfo.layerInfo.count() != 0)
 		changedLayer();
-	viewWidget->Doc->loadPict(currentItem->Pfile, currentItem, true);
+	m_view->Doc->loadPict(currentItem->Pfile, currentItem, true);
 	if (pathList->count() != 0)
 	{
 		QList<QListWidgetItem *>sel = pathList->selectedItems();
@@ -342,7 +342,7 @@
 void ExtImageProps::leaveCancel()
 {
 	currentItem->pixm.imgInfo = originalInfo;
-	viewWidget->Doc->loadPict(currentItem->Pfile, currentItem, true);
+	m_view->Doc->loadPict(currentItem->Pfile, currentItem, true);
 	currentItem->imageClip = originalImageClip.copy();
 	currentItem->update();
 	reject();
@@ -355,7 +355,7 @@
 	{
 		if (originalInfo.layerInfo.count() != 0)
 			changedLayer();
-		viewWidget->Doc->loadPict(currentItem->Pfile, currentItem, true);
+		m_view->Doc->loadPict(currentItem->Pfile, currentItem, true);
 		if (pathList->count() != 0)
 		{
 			QList<QListWidgetItem *>sel = pathList->selectedItems();
@@ -380,7 +380,7 @@
 	else
 	{
 		currentItem->pixm.imgInfo = originalInfo;
-		viewWidget->Doc->loadPict(currentItem->Pfile, currentItem, true);
+		m_view->Doc->loadPict(currentItem->Pfile, currentItem, true);
 		currentItem->imageClip = originalImageClip.copy();
 		currentItem->update();
 	}
@@ -411,7 +411,7 @@
 	}
 	if (doPreview)
 	{
-		viewWidget->Doc->loadPict(currentItem->Pfile, currentItem, true);
+		m_view->Doc->loadPict(currentItem->Pfile, currentItem, true);
 		currentItem->update();
 	}
 }

Modified: trunk/Scribus/scribus/ui/extimageprops.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/extimageprops.h
==============================================================================
--- trunk/Scribus/scribus/ui/extimageprops.h (original)
+++ trunk/Scribus/scribus/ui/extimageprops.h Sat Apr 26 23:02:01 2014
@@ -51,7 +51,7 @@
 	QPushButton* cancelButton;
 	QList<QCheckBox*> FlagsSicht;
 	QList<QCheckBox*> FlagsMask;
-	ScribusView *viewWidget;
+	ScribusView *m_view;
 	PageItem *currentItem;
 	int currentLayer;
 	bool doPreview;

Modified: trunk/Scribus/scribus/ui/guidemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/guidemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/guidemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/guidemanager.cpp Sat Apr 26 23:02:01 2014
@@ -31,6 +31,7 @@
 #include "scpage.h"
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "selection.h"
 #include "undomanager.h"
 #include "units.h"

Modified: trunk/Scribus/scribus/ui/loremipsum.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/loremipsum.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/loremipsum.cpp (original)
+++ trunk/Scribus/scribus/ui/loremipsum.cpp Sat Apr 26 23:02:01 2014
@@ -43,7 +43,7 @@
 #include "scpaths.h"
 //
 #include "scribusdoc.h"
-//#include "scribusview.h"
+//
 #include "selection.h"
 #include "undomanager.h"
 #include "util_icon.h"

Modified: trunk/Scribus/scribus/ui/nodeeditpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.cpp Sat Apr 26 23:02:01 2014
@@ -10,6 +10,7 @@
 #include "nodeeditpalette.h"
 #include "pageitem.h"
 #include "scpage.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 #include "selection.h"
 #include "undomanager.h"

Modified: trunk/Scribus/scribus/ui/notesstyleseditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/notesstyleseditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/notesstyleseditor.cpp (original)
+++ trunk/Scribus/scribus/ui/notesstyleseditor.cpp Sat Apr 26 23:02:01 2014
@@ -5,7 +5,7 @@
 #include "prefsmanager.h"
 #include "prefsfile.h"
 #include "scribusdoc.h"
-#include "scribusview.h"
+
 #include "scribus.h"
 #include "undomanager.h"
 

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Sat Apr 26 23:02:01 2014
@@ -34,6 +34,7 @@
 #include "scpage.h"
 #include "scribus.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "selection.h"
 #include "undomanager.h"
 #include "units.h"

Modified: trunk/Scribus/scribus/ui/pagepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/pagepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette.cpp Sat Apr 26 23:02:01 2014
@@ -21,6 +21,7 @@
 #include "sccombobox.h"
 #include "scpage.h"
 #include "scribus.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 #include "util_icon.h"
 

Modified: trunk/Scribus/scribus/ui/pagepalette_pages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/pagepalette_pages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.cpp Sat Apr 26 23:02:01 2014
@@ -27,6 +27,7 @@
 #include "scpage.h"
 
 #include "scribuscore.h"
+#include "scribusdoc.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=19093&path=/trunk/Scribus/scribus/ui/pagepalette_widgets.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_widgets.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette_widgets.cpp Sat Apr 26 23:02:01 2014
@@ -24,7 +24,7 @@
 #include "sccombobox.h"
 #include "scpage.h"
 
-#include "scribusview.h"
+
 #include "util_icon.h"
 
 /* IconItems Code */

Modified: trunk/Scribus/scribus/ui/pdfopts.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/pdfopts.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pdfopts.cpp (original)
+++ trunk/Scribus/scribus/ui/pdfopts.cpp Sat Apr 26 23:02:01 2014
@@ -15,17 +15,6 @@
 #include "scconfig.h"
 #include "pdfopts.h"
 
-#include "commonstrings.h"
-#include "pdfoptions.h"
-#include "prefsfile.h"
-#include "prefsmanager.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>
@@ -40,6 +29,19 @@
 #include <QToolButton>
 #include <QToolTip>
 #include <QVBoxLayout>
+
+#include "commonstrings.h"
+#include "pdfoptions.h"
+#include "prefsfile.h"
+#include "prefsmanager.h"
+#include "scpaths.h"
+#include "scribusdoc.h"
+#include "scribusview.h"
+#include "ui/customfdialog.h"
+#include "ui/scrspinbox.h"
+#include "units.h"
+#include "util.h"
+#include "util_icon.h"
 
 PDFExportDialog::PDFExportDialog( QWidget* parent, const QString & docFileName,
 								  const QMap<QString, int > & DocFonts,

Modified: trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/prefs_pdfexport.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_pdfexport.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_pdfexport.cpp Sat Apr 26 23:02:01 2014
@@ -14,6 +14,7 @@
 
 #include "scribuscore.h"
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "ui/scrspinbox.h"
 #include "units.h"
 #include "util.h"

Modified: trunk/Scribus/scribus/ui/preview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/preview.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/preview.cpp (original)
+++ trunk/Scribus/scribus/ui/preview.cpp Sat Apr 26 23:02:01 2014
@@ -58,7 +58,7 @@
 #include "util.h"
 #include "util_icon.h"
 #include "sccolor.h"
-#include "scribusview.h"
+
 #include "scribusdoc.h"
 #include "scpaths.h"
 #include "ui/pageselector.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_group.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_group.cpp Sat Apr 26 23:02:01 2014
@@ -52,6 +52,7 @@
 #include "scraction.h"
 
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 #include "selection.h"
 #include "ui/autoform.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp Sat Apr 26 23:02:01 2014
@@ -21,7 +21,7 @@
 
 #include "scribuscore.h"
 #include "scraction.h"
-#include "scribusview.h"
+
 #include "selection.h"
 #include "units.h"
 #include "undomanager.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shadow.cpp Sat Apr 26 23:02:01 2014
@@ -18,7 +18,7 @@
 
 #include "scribuscore.h"
 #include "scraction.h"
-#include "scribusview.h"
+
 #include "selection.h"
 #include "units.h"
 #include "undomanager.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp Sat Apr 26 23:02:01 2014
@@ -11,7 +11,6 @@
 #define _USE_MATH_DEFINES
 #endif
 #include <cmath>
-
 
 #include "appmodes.h"
 #include "autoform.h"
@@ -23,8 +22,8 @@
 #include "sccolorengine.h"
 #include "sccombobox.h"
 #include "scraction.h"
-
 #include "scribuscore.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 #include "selection.h"
 #include "ui/nodeeditpalette.h"
@@ -35,7 +34,6 @@
 #include "util.h"
 #include "util_icon.h"
 #include "util_math.h"
-
 
 PropertiesPalette_Shape::PropertiesPalette_Shape( QWidget* parent) : QWidget(parent)
 {

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Sat Apr 26 23:02:01 2014
@@ -34,7 +34,7 @@
 
 #include "scribuscore.h"
 #include "scraction.h"
-#include "scribusview.h"
+
 #include "selection.h"
 #include "spalette.h"
 #include "styleselect.h"

Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Sat Apr 26 23:02:01 2014
@@ -30,6 +30,7 @@
 
 #include "scribuscore.h"
 #include "scraction.h"
+#include "scribusdoc.h"
 #include "scribusview.h"
 #include "selection.h"
 #include "tabmanager.h"

Modified: trunk/Scribus/scribus/ui/rulermover.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/rulermover.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/rulermover.cpp (original)
+++ trunk/Scribus/scribus/ui/rulermover.cpp Sat Apr 26 23:02:01 2014
@@ -28,6 +28,7 @@
 #include <QMenu>
 #include <QPixmap>
 #include <QPalette>
+#include <QWidget>
 
 #include "canvas.h"
 #include "canvasgesture_rulermove.h"

Modified: trunk/Scribus/scribus/ui/selfield.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/selfield.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/selfield.cpp (original)
+++ trunk/Scribus/scribus/ui/selfield.cpp Sat Apr 26 23:02:01 2014
@@ -17,7 +17,9 @@
 #include <QLabel>
 
 #include "commonstrings.h"
+#include "pageitem.h"
 #include "scfonts.h"
+#include "scribusdoc.h"
 #include "util_icon.h"
 
 SelectFields::SelectFields(QWidget* parent, QString Felder, QString Own, ScribusDoc *Doc, int Art) : QDialog(parent)

Modified: trunk/Scribus/scribus/ui/selfield.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/selfield.h
==============================================================================
--- trunk/Scribus/scribus/ui/selfield.h (original)
+++ trunk/Scribus/scribus/ui/selfield.h Sat Apr 26 23:02:01 2014
@@ -16,7 +16,8 @@
 class QLabel;
 
 #include "scribusapi.h"
-#include "scribusview.h"
+
+class ScribusDoc;
 
 class SCRIBUS_API SelectFields : public QDialog
 {

Modified: trunk/Scribus/scribus/ui/smlinestyle.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/smlinestyle.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smlinestyle.cpp (original)
+++ trunk/Scribus/scribus/ui/smlinestyle.cpp Sat Apr 26 23:02:01 2014
@@ -14,7 +14,7 @@
 #include "propertiespalette.h"
 #include "propertiespalette_line.h"
 #include "scribusdoc.h"
-#include "scribusview.h"
+
 #include "selection.h"
 #include "sccolorengine.h"
 #include "util_color.h"

Modified: trunk/Scribus/scribus/ui/storyeditor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/storyeditor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/storyeditor.cpp (original)
+++ trunk/Scribus/scribus/ui/storyeditor.cpp Sat Apr 26 23:02:01 2014
@@ -45,6 +45,7 @@
 #include <QPixmap>
 #include <QRegExp>
 #include <QShowEvent>
+#include <QScrollBar>
 #include <QTextBlock>
 #include <QTextCodec>
 #include <QTextLayout>
@@ -52,12 +53,11 @@
 
 #include "actionmanager.h"
 #include "alignselect.h"
-#include "ui/charselect.h"
 #include "colorcombo.h"
 #include "colorlistbox.h"
 #include "commonstrings.h"
-#include "ui/customfdialog.h"
 #include "fontcombo.h"
+#include "loremipsum.h"
 #include "menumanager.h"
 #include "pageitem.h"
 #include "pageitem_textframe.h"
@@ -69,20 +69,21 @@
 #include "scplugin.h"
 #include "scraction.h"
 #include "scribuscore.h"
+#include "scribusview.h"
 #include "scrspinbox.h"
 #include "search.h"
 #include "serializer.h"
 #include "shadebutton.h"
-#include "ui/spalette.h"
 #include "storyeditor.h"
 #include "styleitem.h"
-//#include "ui/stylemanager.h"
 #include "styleselect.h"
+#include "ui/charselect.h"
+#include "ui/customfdialog.h"
+#include "ui/spalette.h"
+#include "ui/stylemanager.h"
 #include "units.h"
 #include "util.h"
 #include "util_icon.h"
-#include "loremipsum.h"
-
 
 class StyledTextMimeData : public QMimeData
 {

Modified: trunk/Scribus/scribus/ui/stylemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/stylemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/stylemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/stylemanager.cpp Sat Apr 26 23:02:01 2014
@@ -11,25 +11,24 @@
 #include <QToolTip>
 #include <QMessageBox>
 
+#include "commonstrings.h"
+#include "fileloader.h"
+#include "prefsfile.h"
 #include "prefsmanager.h"
-#include "prefsfile.h"
-#include "commonstrings.h"
+#include "scraction.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
-#include "stylemanager.h"
+#include "selection.h"
 #include "shortcutwidget.h"
-#include "ui/styleview.h"
-#include "styleitem.h"
-#include "smreplacedia.h"
-#include "selection.h"
-#include "ui/customfdialog.h"
-#include "smtextstyles.h"
 #include "smlinestyle.h"
 #include "smlinestylewidget.h"
+#include "smreplacedia.h"
 #include "smstyleimport.h"
-#include "fileloader.h"
-#include "scraction.h"
-
+#include "smtextstyles.h"
+#include "styleitem.h"
+#include "stylemanager.h"
+#include "ui/customfdialog.h"
+#include "ui/styleview.h"
 
 const QString StyleManager::SEPARATOR = "$$$$"; // dumb but it works
 

Modified: trunk/Scribus/scribus/ui/tabpdfoptions.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/tabpdfoptions.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/tabpdfoptions.cpp (original)
+++ trunk/Scribus/scribus/ui/tabpdfoptions.cpp Sat Apr 26 23:02:01 2014
@@ -14,29 +14,31 @@
  ***************************************************************************/
 #include "tabpdfoptions.h"
 
-#include <QPixmap>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QGridLayout>
-#include <QSpacerItem>
-#include <QGroupBox>
+
+#include <QAbstractItemView>
 #include <QCheckBox>
 #include <QComboBox>
-#include <QPushButton>
-#include <QToolButton>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QLabel>
 #include <QLineEdit>
-#include <QLabel>
-#include <QSpinBox>
 #include <QListWidget>
 #include <QListWidgetItem>
-
+#include <QPixmap>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QSpinBox>
 #include <QStandardItem>
-#include <QAbstractItemView>
+#include <QToolButton>
+#include <QVBoxLayout>
+
 
 #include "ui/createrange.h"
 #include "pdfoptions.h"
 #include "prefsmanager.h"
 #include "scribuscore.h"
+#include "scribusview.h"
 #include "scconfig.h"
 #include "units.h"
 #include "usertaskstructs.h"

Modified: trunk/Scribus/scribus/ui/vruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19093&path=/trunk/Scribus/scribus/ui/vruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/vruler.cpp (original)
+++ trunk/Scribus/scribus/ui/vruler.cpp Sat Apr 26 23:02:01 2014
@@ -21,6 +21,8 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "vruler.h"
+
 #include <QCursor>
 //#include <QDebug>
 #include <QMouseEvent>
@@ -33,13 +35,15 @@
 
 #include <cmath>
 
+
 #include "canvasgesture_rulermove.h"
 #include "prefsmanager.h"
 #include "scpage.h"
-
 #include "scribusdoc.h"
+#include "scribusview.h"
 #include "units.h"
-#include "vruler.h"
+
+
 
 Vruler::Vruler(ScribusView *pa, ScribusDoc *doc) : QWidget(pa)
 {




More information about the scribus-commit mailing list