r23284 by jghali - Adjust include order

[scribus-commit]

Author: jghali
Date: Mon Oct 28 14:28:20 2019
New Revision: 23284

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23284
Log:
Adjust include order

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
    trunk/Scribus/scribus/scribus.cpp
    trunk/Scribus/scribus/ui/outlinepalette.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23284&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp	(original)
+++ trunk/Scribus/scribus/pageitem.cpp	Mon Oct 28 14:28:20 2019
@@ -73,9 +73,9 @@
 #include "sctextstream.h"
 #include "selection.h"
 #include "text/storytext.h"
+#include "ui/contentpalette.h"
 #include "ui/guidemanager.h"
 #include "ui/propertiespalette.h"
-#include "ui/contentpalette.h"
 #include "undomanager.h"
 #include "undostate.h"
 #include "units.h"

Modified: trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23284&path=/trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp	(original)
+++ trunk/Scribus/scribus/plugins/colorwheel/cwdialog.cpp	Mon Oct 28 14:28:20 2019
@@ -18,8 +18,8 @@
 #include "scribus.h"
 #include "ui/cmykfw.h"
 #include "ui/colorlistbox.h"
+#include "ui/contentpalette.h"
 #include "ui/propertiespalette.h"
-#include "ui/contentpalette.h"
 #include "util_color.h"
 
 

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23284&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Mon Oct 28 14:28:20 2019
@@ -170,6 +170,7 @@
 #include "ui/checkDocument.h"
 #include "ui/collectforoutput_ui.h"
 #include "ui/colorcombo.h"
+#include "ui/contentpalette.h"
 #include "ui/contextmenu.h"
 #include "ui/copypagetomasterpagedialog.h"
 #include "ui/cpalette.h"
@@ -226,7 +227,6 @@
 #include "ui/propertiespalette_line.h"
 #include "ui/propertiespalette_shape.h"
 #include "ui/propertiespalette_xyz.h"
-#include "ui/contentpalette.h"
 #include "ui/query.h"
 #include "ui/recoverdialog.h"
 #include "ui/replacecolors.h"

Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23284&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp	(original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp	Mon Oct 28 14:28:20 2019
@@ -27,12 +27,12 @@
 #include "appmodes.h"
 #include "canvasmode.h"
 #include "commonstrings.h"
+#include "contentpalette.h"
 #include "contextmenu.h"
 #include "iconmanager.h"
 #include "layers.h"
 #include "outlinepalette.h"
 #include "propertiespalette.h"
-#include "contentpalette.h"
 #include "scpage.h"
 #include "scribus.h"
 #include "scribusdoc.h"