r16736 by jghali - some alphabetical reordering of includes in cpp files
scribus-commit
scribus-commit at lists.scribus.net
Sun Jul 31 00:25:38 UTC 2011
Author: jghali
Date: Sun Jul 31 00:25:38 2011
New Revision: 16736
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=16736
Log:
some alphabetical reordering of includes in cpp files
Modified:
trunk/Scribus/scribus/canvas.cpp
trunk/Scribus/scribus/documentchecker.cpp
trunk/Scribus/scribus/fileloader.cpp
trunk/Scribus/scribus/fonts/scfontmetrics.cpp
trunk/Scribus/scribus/guidemanagercore.cpp
trunk/Scribus/scribus/nftrcreader.cpp
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/pageitem_arc.cpp
trunk/Scribus/scribus/pageitem_group.cpp
trunk/Scribus/scribus/pageitem_imageframe.cpp
trunk/Scribus/scribus/pageitem_line.cpp
trunk/Scribus/scribus/pageitem_pathtext.cpp
trunk/Scribus/scribus/pageitem_polygon.cpp
trunk/Scribus/scribus/pageitem_polyline.cpp
trunk/Scribus/scribus/pageitem_regularpolygon.cpp
trunk/Scribus/scribus/pageitem_spiral.cpp
trunk/Scribus/scribus/pageitem_symbol.cpp
trunk/Scribus/scribus/pageitem_textframe.cpp
trunk/Scribus/scribus/pdflib_core.cpp
trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp
trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp
trunk/Scribus/scribus/plugins/short-words/parse.cpp
trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
trunk/Scribus/scribus/scdocoutput.h
trunk/Scribus/scribus/scdocoutput_ps2.cpp
trunk/Scribus/scribus/scpage.cpp
trunk/Scribus/scribus/scpageoutput.cpp
trunk/Scribus/scribus/scpageoutput_ps2.cpp
trunk/Scribus/scribus/scprintengine_gdi.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribusXml.cpp
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusdoc.h
trunk/Scribus/scribus/scribusview.cpp
trunk/Scribus/scribus/tocgenerator.cpp
trunk/Scribus/scribus/ui/aligndistribute.cpp
trunk/Scribus/scribus/ui/applytemplatedialog.cpp
trunk/Scribus/scribus/ui/checkDocument.cpp
trunk/Scribus/scribus/ui/cpalette.cpp
trunk/Scribus/scribus/ui/dcolor.cpp
trunk/Scribus/scribus/ui/effectsdialog.cpp
trunk/Scribus/scribus/ui/fontcombo.cpp
trunk/Scribus/scribus/ui/guidemanager.cpp
trunk/Scribus/scribus/ui/hruler.cpp
trunk/Scribus/scribus/ui/inspage.cpp
trunk/Scribus/scribus/ui/javadocs.cpp
trunk/Scribus/scribus/ui/margindialog.cpp
trunk/Scribus/scribus/ui/masterpagepalette.cpp
trunk/Scribus/scribus/ui/missing.cpp
trunk/Scribus/scribus/ui/newtemp.cpp
trunk/Scribus/scribus/ui/nodeeditpalette.cpp
trunk/Scribus/scribus/ui/outlinepalette.cpp
trunk/Scribus/scribus/ui/pagepalette.cpp
trunk/Scribus/scribus/ui/propertiespalette.h
trunk/Scribus/scribus/ui/propertiespalette_utils.h
trunk/Scribus/scribus/ui/search.cpp
trunk/Scribus/scribus/ui/vruler.cpp
Modified: trunk/Scribus/scribus/canvas.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/canvas.cpp
==============================================================================
--- trunk/Scribus/scribus/canvas.cpp (original)
+++ trunk/Scribus/scribus/canvas.cpp Sun Jul 31 00:25:38 2011
@@ -23,12 +23,12 @@
#include "canvas.h"
#include "canvasmode.h"
-#include "scpage.h"
#include "pageitem_textframe.h"
#include "pageitem_group.h"
#include "prefsmanager.h"
+#include "scpage.h"
+#include "scpainter.h"
#include "scribusdoc.h"
-#include "scpainter.h"
#include "scribusview.h"
#include "selection.h"
#include "ui/hruler.h"
Modified: trunk/Scribus/scribus/documentchecker.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/documentchecker.cpp
==============================================================================
--- trunk/Scribus/scribus/documentchecker.cpp (original)
+++ trunk/Scribus/scribus/documentchecker.cpp Sun Jul 31 00:25:38 2011
@@ -23,11 +23,11 @@
#include "commonstrings.h"
#include "documentchecker.h"
-#include "scpage.h"
#include "pageitem.h"
#include "pdf_analyzer.h"
#include "sccolor.h"
#include "sclayer.h"
+#include "scpage.h"
#include "scribusdoc.h"
#include "scribusstructs.h"
#include "text/nlsconfig.h"
Modified: trunk/Scribus/scribus/fileloader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/fileloader.cpp
==============================================================================
--- trunk/Scribus/scribus/fileloader.cpp (original)
+++ trunk/Scribus/scribus/fileloader.cpp Sun Jul 31 00:25:38 2011
@@ -21,24 +21,28 @@
#include <cmath>
#include <QTextStream>
+#include "scconfig.h"
+
#include "commonstrings.h"
#include "fileloader.h"
-#include "ui/fontreplacedialog.h"
#include "hyphenator.h"
-#include "ui/missing.h"
+#include "loadsaveplugin.h"
+#include "pagestructs.h"
+#include "pluginmanager.h"
+#include "prefsmanager.h"
+#include "resourcecollection.h"
+#include "scclocale.h"
#include "scpage.h"
-#include "pluginmanager.h"
-#include "plugins/formatidlist.h"
-#include "pagestructs.h"
-#include "resourcecollection.h"
-#include "scconfig.h"
-#include "scclocale.h"
#include "scribuscore.h"
#include "scribusXml.h"
#include "units.h"
-#include "loadsaveplugin.h"
+#include "util.h"
+
+#include "plugins/formatidlist.h"
+#include "text/nlsconfig.h"
#include "ui/guidemanager.h"
-#include "text/nlsconfig.h"
+#include "ui/fontreplacedialog.h"
+#include "ui/missing.h"
// We need to include the headers for the plugins we support until we start
// using LoadSavePlugin to pick them for us. We only use these headers to
@@ -46,10 +50,7 @@
// #include "plugins/svgimplugin/svgplugin.h"
// #include "plugins/psimport/importpsplugin.h"
// #include "plugins/fileloader/oodraw/oodrawimp.h"
-
#include <zlib.h>
-#include "util.h"
-#include "prefsmanager.h"
/*!
\author Franz Schmid
Modified: trunk/Scribus/scribus/fonts/scfontmetrics.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/fonts/scfontmetrics.cpp
==============================================================================
--- trunk/Scribus/scribus/fonts/scfontmetrics.cpp (original)
+++ trunk/Scribus/scribus/fonts/scfontmetrics.cpp Sun Jul 31 00:25:38 2011
@@ -15,9 +15,9 @@
#include "fpoint.h"
#include "fpointarray.h"
-#include "scpage.h"
#include "scfontmetrics.h"
#include "scfonts.h"
+#include "scpage.h"
#include "scpainter.h"
#include "scribusdoc.h"
#include "style.h"
Modified: trunk/Scribus/scribus/guidemanagercore.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/guidemanagercore.cpp
==============================================================================
--- trunk/Scribus/scribus/guidemanagercore.cpp (original)
+++ trunk/Scribus/scribus/guidemanagercore.cpp Sun Jul 31 00:25:38 2011
@@ -7,20 +7,20 @@
#include <QPen>
#include <QTabWidget>
+
#include "guidemanagercore.h"
+
+#include "fpoint.h"
+#include "scclocale.h"
+#include "scpage.h"
#include "scpainter.h"
-#include "scpage.h"
-#include "fpoint.h"
-#include "undomanager.h"
-#include "undostate.h"
-#include "ui/guidemanager.h"
-#include "scclocale.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "pagestructs.h"
#include "selection.h"
-
-
+#include "undomanager.h"
+#include "undostate.h"
+#include "ui/guidemanager.h"
GuideManagerCore::GuideManagerCore():
undoManager(UndoManager::instance()),
Modified: trunk/Scribus/scribus/nftrcreader.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/nftrcreader.cpp
==============================================================================
--- trunk/Scribus/scribus/nftrcreader.cpp (original)
+++ trunk/Scribus/scribus/nftrcreader.cpp Sun Jul 31 00:25:38 2011
@@ -1,205 +1,205 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-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.
-*/
-/***************************************************************************
- * Riku Leino, tsoots at gmail.com *
- ***************************************************************************/
-
-#include "nftrcreader.h"
-
-using namespace std;
-
-nftrcreader::nftrcreader(std::vector<nfttemplate*> *tmplts,QString sourceDir)
-{
- templates = tmplts;
- currentDir = sourceDir;
- setupCategories();
-}
-
-bool nftrcreader::startDocument()
-{
- inSettings = false;
- inTemplate = false;
- inName = false;
- inFile = false;
- inTNail = false;
- inImg = false;
- inPSize = false;
- inColor = false;
- inDescr = false;
- inUsage = false;
- inScribusVersion = false;
- inDate = false;
- inAuthor = false;
- inEmail = false;
- return true;
-}
-
-bool nftrcreader::startElement(const QString&, const QString&, const QString &name, const QXmlAttributes &attrs)
-{
- if (name == "name")
- inName = true;
- else if (name == "file")
- inFile = true;
- else if (name == "tnail")
- inTNail = true;
- else if (name == "img")
- inImg = true;
- else if (name == "psize")
- inPSize = true;
- else if (name == "color")
- inColor = true;
- else if (name == "descr")
- inDescr = true;
- else if (name == "usage")
- inUsage = true;
- else if (name == "scribus_version")
- inScribusVersion = true;
- else if (name == "date")
- inDate = true;
- else if (name == "author")
- inAuthor = true;
- else if (name == "email")
- inEmail = true;
-
-
- if (name == "template") // new template starts here
- {
- inTemplate = true;
- QString category;
- QString enCat;
- for (int i = 0; i < attrs.count(); i++)
- {
- if (attrs.localName(i) == "category")
- {
- category = getCategory(attrs.value(i));
- enCat = attrs.value(i);
- }
- }
- tmpTemplate = new nfttemplate(new QFile(currentFile), category); // create a new template
- tmpTemplate->enCategory = enCat;
- }
-
- if (name == "settings")
- inSettings = true;
-
- return true;
-}
-
-bool nftrcreader::characters(const QString &ch)
-{
- QString tmp(ch);
- if (inName)
- tmpTemplate->name = tmp;
- else if (inFile)
- {
- if (tmp.left(1) == "/")
- tmpTemplate->file = tmp;
- else
- tmpTemplate->file = currentDir + "/" + tmp;
- } else if (inTNail)
- {
- if (tmp.left(1) == "/")
- tmpTemplate->tnail = tmp;
- else
- tmpTemplate->tnail = currentDir + "/" + tmp;
- } else if (inImg)
- {
- if (tmp.left(1) == "/")
- tmpTemplate->img = tmp;
- else
- tmpTemplate->img = currentDir + "/" + tmp;
- } else if (inPSize)
- tmpTemplate->psize = tmp;
- else if (inColor)
- tmpTemplate->color = tmp;
- else if (inDescr)
- tmpTemplate->descr = tmp;
- else if (inUsage)
- tmpTemplate->usage = tmp;
- else if (inScribusVersion)
- tmpTemplate->scribusVersion = tmp;
- else if (inDate)
- tmpTemplate->date = tmp;
- else if (inAuthor)
- tmpTemplate->author = tmp;
- else if (inEmail)
- tmpTemplate->email = tmp;
-
- return true;
-}
-
-bool nftrcreader::endElement(const QString&, const QString&, const QString &name)
-{
- if (name == "template")
- { // new template starts here
- inTemplate = false;
- if (tmpTemplate != NULL) // If we have a template already created
- if (tmpTemplate->isValid()) // and the template really exists push
- templates->push_back(tmpTemplate); // it to the templates vector and start a new one
- }
- if (inTemplate) {
- if (inName && name == "name")
- inName = false;
- else if (inFile && name == "file")
- inFile = false;
- else if (inTNail && name == "tnail")
- inTNail = false;
- else if (inImg && name == "img")
- inImg = false;
- else if (inPSize && name == "psize")
- inPSize = false;
- else if (inColor && name == "color")
- inColor = false;
- else if (inDescr && name == "descr")
- inDescr = false;
- else if (inUsage && name == "usage")
- inUsage = false;
- else if (inScribusVersion && name == "scribus_version")
- inScribusVersion = false;
- else if (inDate && name == "date")
- inDate = false;
- else if (inAuthor && name == "author")
- inAuthor = false;
- else if (inEmail && name == "email")
- inEmail = false;
- else if (inTemplate && name == "template")
- inTemplate = false;
- }
-
- if (inSettings && name == "settings")
- inSettings = false;
-
- return true;
-}
-
-void nftrcreader::setSourceDir(QString source)
-{
- currentDir = source;
-}
-
-void nftrcreader::setSourceFile(QString sourceFile)
-{
- currentFile = sourceFile;
-}
-
-QString nftrcreader::getCategory(QString cat)
-{
- QMap<QString, QString>::iterator it = cats.find(cat);
- if (it==cats.end())
- cats.insert(cat, cat);
- if (it != cats.end())
- return it.value();
- return cat;
-}
-
-void nftrcreader::setupCategories()
-{
- // en will be used in template.xml and it will be then replaced with the lang when used for users
- // to get the categories in their language.
+/*
+For general Scribus (>=1.3.2) copyright and licensing information please refer
+to the COPYING file provided with the program. Following this notice may exist
+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.
+*/
+/***************************************************************************
+ * Riku Leino, tsoots at gmail.com *
+ ***************************************************************************/
+
+#include "nftrcreader.h"
+
+using namespace std;
+
+nftrcreader::nftrcreader(std::vector<nfttemplate*> *tmplts,QString sourceDir)
+{
+ templates = tmplts;
+ currentDir = sourceDir;
+ setupCategories();
+}
+
+bool nftrcreader::startDocument()
+{
+ inSettings = false;
+ inTemplate = false;
+ inName = false;
+ inFile = false;
+ inTNail = false;
+ inImg = false;
+ inPSize = false;
+ inColor = false;
+ inDescr = false;
+ inUsage = false;
+ inScribusVersion = false;
+ inDate = false;
+ inAuthor = false;
+ inEmail = false;
+ return true;
+}
+
+bool nftrcreader::startElement(const QString&, const QString&, const QString &name, const QXmlAttributes &attrs)
+{
+ if (name == "name")
+ inName = true;
+ else if (name == "file")
+ inFile = true;
+ else if (name == "tnail")
+ inTNail = true;
+ else if (name == "img")
+ inImg = true;
+ else if (name == "psize")
+ inPSize = true;
+ else if (name == "color")
+ inColor = true;
+ else if (name == "descr")
+ inDescr = true;
+ else if (name == "usage")
+ inUsage = true;
+ else if (name == "scribus_version")
+ inScribusVersion = true;
+ else if (name == "date")
+ inDate = true;
+ else if (name == "author")
+ inAuthor = true;
+ else if (name == "email")
+ inEmail = true;
+
+
+ if (name == "template") // new template starts here
+ {
+ inTemplate = true;
+ QString category;
+ QString enCat;
+ for (int i = 0; i < attrs.count(); i++)
+ {
+ if (attrs.localName(i) == "category")
+ {
+ category = getCategory(attrs.value(i));
+ enCat = attrs.value(i);
+ }
+ }
+ tmpTemplate = new nfttemplate(new QFile(currentFile), category); // create a new template
+ tmpTemplate->enCategory = enCat;
+ }
+
+ if (name == "settings")
+ inSettings = true;
+
+ return true;
+}
+
+bool nftrcreader::characters(const QString &ch)
+{
+ QString tmp(ch);
+ if (inName)
+ tmpTemplate->name = tmp;
+ else if (inFile)
+ {
+ if (tmp.left(1) == "/")
+ tmpTemplate->file = tmp;
+ else
+ tmpTemplate->file = currentDir + "/" + tmp;
+ } else if (inTNail)
+ {
+ if (tmp.left(1) == "/")
+ tmpTemplate->tnail = tmp;
+ else
+ tmpTemplate->tnail = currentDir + "/" + tmp;
+ } else if (inImg)
+ {
+ if (tmp.left(1) == "/")
+ tmpTemplate->img = tmp;
+ else
+ tmpTemplate->img = currentDir + "/" + tmp;
+ } else if (inPSize)
+ tmpTemplate->psize = tmp;
+ else if (inColor)
+ tmpTemplate->color = tmp;
+ else if (inDescr)
+ tmpTemplate->descr = tmp;
+ else if (inUsage)
+ tmpTemplate->usage = tmp;
+ else if (inScribusVersion)
+ tmpTemplate->scribusVersion = tmp;
+ else if (inDate)
+ tmpTemplate->date = tmp;
+ else if (inAuthor)
+ tmpTemplate->author = tmp;
+ else if (inEmail)
+ tmpTemplate->email = tmp;
+
+ return true;
+}
+
+bool nftrcreader::endElement(const QString&, const QString&, const QString &name)
+{
+ if (name == "template")
+ { // new template starts here
+ inTemplate = false;
+ if (tmpTemplate != NULL) // If we have a template already created
+ if (tmpTemplate->isValid()) // and the template really exists push
+ templates->push_back(tmpTemplate); // it to the templates vector and start a new one
+ }
+ if (inTemplate) {
+ if (inName && name == "name")
+ inName = false;
+ else if (inFile && name == "file")
+ inFile = false;
+ else if (inTNail && name == "tnail")
+ inTNail = false;
+ else if (inImg && name == "img")
+ inImg = false;
+ else if (inPSize && name == "psize")
+ inPSize = false;
+ else if (inColor && name == "color")
+ inColor = false;
+ else if (inDescr && name == "descr")
+ inDescr = false;
+ else if (inUsage && name == "usage")
+ inUsage = false;
+ else if (inScribusVersion && name == "scribus_version")
+ inScribusVersion = false;
+ else if (inDate && name == "date")
+ inDate = false;
+ else if (inAuthor && name == "author")
+ inAuthor = false;
+ else if (inEmail && name == "email")
+ inEmail = false;
+ else if (inTemplate && name == "template")
+ inTemplate = false;
+ }
+
+ if (inSettings && name == "settings")
+ inSettings = false;
+
+ return true;
+}
+
+void nftrcreader::setSourceDir(QString source)
+{
+ currentDir = source;
+}
+
+void nftrcreader::setSourceFile(QString sourceFile)
+{
+ currentFile = sourceFile;
+}
+
+QString nftrcreader::getCategory(QString cat)
+{
+ QMap<QString, QString>::iterator it = cats.find(cat);
+ if (it==cats.end())
+ cats.insert(cat, cat);
+ if (it != cats.end())
+ return it.value();
+ return cat;
+}
+
+void nftrcreader::setupCategories()
+{
+ // en will be used in template.xml and it will be then replaced with the lang when used for users
+ // to get the categories in their language.
cats.insert(QString("Advertisements"), QObject::tr("Advertisements"));
cats.insert(QString("Announcements") , QObject::tr("Announcements"));
cats.insert(QString("Brochures") , QObject::tr("Brochures"));
@@ -223,5 +223,5 @@
cats.insert(QString("Posters") , QObject::tr("Posters"));
cats.insert(QString("Programs") , QObject::tr("Programs"));
cats.insert(QString("Signs") , QObject::tr("Signs"));
- cats.insert(QString("Text Documents"), QObject::tr("Text Documents"));
-}
+ cats.insert(QString("Text Documents"), QObject::tr("Text Documents"));
+}
Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Sun Jul 31 00:25:38 2011
@@ -40,16 +40,17 @@
#include "cmsettings.h"
#include "colorblind.h"
#include "commonstrings.h"
-#include "ui/guidemanager.h"
-#include "scpage.h"
+
#include "pageitem_textframe.h"
#include "pageitem_latexframe.h"
#include "prefsmanager.h"
-#include "ui/propertiespalette.h"
+
#include "resourcecollection.h"
#include "scclocale.h"
#include "sccolorengine.h"
#include "scimagecacheproxy.h"
+#include "sclimits.h"
+#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
#include "scpattern.h"
@@ -61,17 +62,19 @@
#include "scribuswin.h"
#include "sctextstream.h"
#include "selection.h"
-#include "sclimits.h"
#include "text/nlsconfig.h"
#include "text/storytext.h"
#include "undomanager.h"
#include "undostate.h"
#include "util.h"
+#include "util_file.h"
#include "util_formats.h"
+#include "util_icon.h"
#include "util_math.h"
#include "util_text.h"
-#include "util_file.h"
-#include "util_icon.h"
+
+#include "ui/guidemanager.h"
+#include "ui/propertiespalette.h"
#include <cairo.h>
Modified: trunk/Scribus/scribus/pageitem_arc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem_arc.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_arc.cpp (original)
+++ trunk/Scribus/scribus/pageitem_arc.cpp Sun Jul 31 00:25:38 2011
@@ -27,21 +27,20 @@
#include <cmath>
#include <cassert>
-#include "scpage.h"
+#include "scconfig.h"
+
#include "pageitem.h"
#include "pageitem_arc.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
#include "scribus.h"
#include "scribusstructs.h"
#include "scribusdoc.h"
-
#include "undomanager.h"
#include "undostate.h"
-#include "scconfig.h"
-
#include "util.h"
#include "util_math.h"
Modified: trunk/Scribus/scribus/pageitem_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem_group.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_group.cpp (original)
+++ trunk/Scribus/scribus/pageitem_group.cpp Sun Jul 31 00:25:38 2011
@@ -27,10 +27,10 @@
#include <QApplication>
#include "commonstrings.h"
-#include "scpage.h"
#include "pageitem_group.h"
#include "prefsmanager.h"
#include "scpainter.h"
+#include "scpage.h"
#include "scpaths.h"
#include "scraction.h"
#include "scribus.h"
Modified: trunk/Scribus/scribus/pageitem_imageframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem_imageframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_imageframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_imageframe.cpp Sun Jul 31 00:25:38 2011
@@ -30,11 +30,11 @@
#include <cassert>
#include "filewatcher.h"
-#include "scpage.h"
#include "pageitem.h"
#include "pageitem_imageframe.h"
#include "prefsmanager.h"
#include "scraction.h"
+#include "scpage.h"
#include "scpaths.h"
#include "scpainter.h"
#include "scribus.h"
Modified: trunk/Scribus/scribus/pageitem_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem_line.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_line.cpp (original)
+++ trunk/Scribus/scribus/pageitem_line.cpp Sun Jul 31 00:25:38 2011
@@ -24,21 +24,20 @@
#include <cmath>
#include <cassert>
-#include "scpage.h"
+#include "scconfig.h"
+
+#include "commonstrings.h"
#include "pageitem.h"
#include "pageitem_line.h"
#include "prefsmanager.h"
+#include "scpage.h"
+#include "scpainter.h"
#include "scpaths.h"
-#include "scpainter.h"
#include "scribus.h"
#include "scribusstructs.h"
#include "scribusdoc.h"
-#include "commonstrings.h"
-
#include "undomanager.h"
#include "undostate.h"
-#include "scconfig.h"
-
#include "util.h"
using namespace std;
Modified: trunk/Scribus/scribus/pageitem_pathtext.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem_pathtext.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_pathtext.cpp (original)
+++ trunk/Scribus/scribus/pageitem_pathtext.cpp Sun Jul 31 00:25:38 2011
@@ -29,20 +29,20 @@
#include <cassert>
-#include "scpage.h"
+#include "scconfig.h"
+
+#include "commonstrings.h"
#include "pageitem.h"
#include "prefsmanager.h"
+#include "scpage.h"
+#include "scpainter.h"
#include "scpaths.h"
-#include "scpainter.h"
#include "scraction.h"
#include "scribus.h"
#include "scribusstructs.h"
#include "scribusdoc.h"
-#include "commonstrings.h"
#include "undomanager.h"
#include "undostate.h"
-#include "scconfig.h"
-
#include "util.h"
#include "util_math.h"
Modified: trunk/Scribus/scribus/pageitem_polygon.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem_polygon.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_polygon.cpp (original)
+++ trunk/Scribus/scribus/pageitem_polygon.cpp Sun Jul 31 00:25:38 2011
@@ -21,24 +21,24 @@
* *
***************************************************************************/
+#include "pageitem_polygon.h"
+
#include <cmath>
#include <cassert>
+#include "scconfig.h"
+
+#include "pageitem.h"
+#include "prefsmanager.h"
#include "scpage.h"
-#include "pageitem.h"
-#include "pageitem_polygon.h"
-#include "prefsmanager.h"
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
#include "scribus.h"
#include "scribusstructs.h"
#include "scribusdoc.h"
-
#include "undomanager.h"
#include "undostate.h"
-#include "scconfig.h"
-
#include "util.h"
using namespace std;
Modified: trunk/Scribus/scribus/pageitem_polyline.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem_polyline.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_polyline.cpp (original)
+++ trunk/Scribus/scribus/pageitem_polyline.cpp Sun Jul 31 00:25:38 2011
@@ -27,20 +27,20 @@
#include <cmath>
#include <cassert>
-#include "scpage.h"
+#include "scconfig.h"
+
+#include "commonstrings.h"
#include "pageitem.h"
#include "pageitem_polyline.h"
#include "prefsmanager.h"
#include "scpainter.h"
+#include "scpage.h"
#include "scpaths.h"
#include "scribus.h"
#include "scribusstructs.h"
#include "scribusdoc.h"
-#include "commonstrings.h"
#include "undomanager.h"
#include "undostate.h"
-#include "scconfig.h"
-
#include "util.h"
using namespace std;
Modified: trunk/Scribus/scribus/pageitem_regularpolygon.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem_regularpolygon.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_regularpolygon.cpp (original)
+++ trunk/Scribus/scribus/pageitem_regularpolygon.cpp Sun Jul 31 00:25:38 2011
@@ -27,10 +27,10 @@
#include <cmath>
#include <cassert>
-#include "scpage.h"
#include "pageitem.h"
#include "pageitem_regularpolygon.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
Modified: trunk/Scribus/scribus/pageitem_spiral.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem_spiral.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_spiral.cpp (original)
+++ trunk/Scribus/scribus/pageitem_spiral.cpp Sun Jul 31 00:25:38 2011
@@ -27,22 +27,21 @@
#include <cmath>
#include <cassert>
+#include "scconfig.h"
+
#include "commonstrings.h"
-#include "scpage.h"
#include "pageitem.h"
#include "pageitem_spiral.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
#include "scribus.h"
+#include "scribusdoc.h"
#include "scribusstructs.h"
-#include "scribusdoc.h"
-
#include "undomanager.h"
#include "undostate.h"
-#include "scconfig.h"
-
#include "util.h"
#include "util_math.h"
Modified: trunk/Scribus/scribus/pageitem_symbol.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem_symbol.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_symbol.cpp (original)
+++ trunk/Scribus/scribus/pageitem_symbol.cpp Sun Jul 31 00:25:38 2011
@@ -27,10 +27,10 @@
#include <QApplication>
#include "commonstrings.h"
-#include "scpage.h"
#include "pageitem.h"
#include "pageitem_symbol.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Sun Jul 31 00:25:38 2011
@@ -30,16 +30,15 @@
#include <QRegion>
#include <cassert>
+#include "scconfig.h"
#include "canvas.h"
#include "commonstrings.h"
-#include "ui/guidemanager.h"
#include "hyphenator.h"
-#include "scpage.h"
#include "pageitem.h"
#include "pageitem_textframe.h"
#include "prefsmanager.h"
-#include "scconfig.h"
+#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
#include "scraction.h"
@@ -52,6 +51,9 @@
#include "undostate.h"
#include "util.h"
#include "util_math.h"
+
+#include "ui/guidemanager.h"
+
#include <cairo.h>
using namespace std;
@@ -3515,49 +3517,30 @@
void PageItem_TextFrame::drawOverflowMarker(ScPainter *p)
{
- /*CB Old large corner indicator.
- double scp1 = 1.0/qMax(ScMW->view->getScale(), 1);
- double scp16 = 16.0*scp1;
- double scp14 = 14.0*scp1;
- double scp3 = 3.0*scp1;
- double scm_lineWidth16 = Width - scp16;
- double scpheight16 = Height - scp16;
- double scm_lineWidth3 = Width - scp3;
- double scpheight3 = Height - scp3;
- p->setPen(Qt::black, scp1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
- p->setBrush(white);
- p->drawRect(scm_lineWidth16, scpheight16, scp14, scp14);
- p->drawLine(FPoint(scm_lineWidth16, scpheight16), FPoint(scm_lineWidth3, scpheight3));
- p->drawLine(FPoint(scm_lineWidth16, scpheight3), FPoint(scm_lineWidth3, scpheight16));
- */
- //TODO: CB clean
- double scp1 = p->zoomFactor() ;// / ScMW->view->scale();
- double ofwh = 8 * scp1;
- //CB moved down while locked marker disabled
- //double ofx = Width - ofwh/2;
- //double ofy = Height - ofwh*3.0;
- double ofx = Width - ofwh/2;
- double ofy = Height - ofwh*1.5;
- double lx1= ofx;
- double ly1= ofy;
- double lx2= ofx+ofwh;
- double ly2= ofy+ofwh;
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameNormColor, 0.5 / p->zoomFactor(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ qreal sideLength = 10 / qMax(p->zoomFactor(), 1.0);
+ qreal left = Width - sideLength / 2;
+ qreal right = left + sideLength;
+ qreal top = Height - sideLength * 1.5;
+ qreal bottom = top + sideLength;
+
+ QColor color(PrefsManager::instance()->appPrefs.displayPrefs.frameNormColor);
if ((isBookmark) || (m_isAnnotation))
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameAnnotationColor, 0.5 / p->zoomFactor(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ color = PrefsManager::instance()->appPrefs.displayPrefs.frameAnnotationColor;
if ((BackBox != 0) || (NextBox != 0))
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameLinkColor, 0.5 / p->zoomFactor(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ color = PrefsManager::instance()->appPrefs.displayPrefs.frameLinkColor;
if (m_Locked)
- p->setPen(PrefsManager::instance()->appPrefs.displayPrefs.frameLockColor, 0.5 / p->zoomFactor(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ color = PrefsManager::instance()->appPrefs.displayPrefs.frameLockColor;
if (m_Doc->m_Selection->containsItem(this))
- p->setPen(Qt::red, 0.5 / p->zoomFactor(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
+ color = Qt::red;
+
+ p->setPen(color, 0.5 / p->zoomFactor(), Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
p->setPenOpacity(1.0);
p->setBrush(Qt::white);
p->setBrushOpacity(1.0);
p->setFillMode(ScPainter::Solid);
- p->drawRect(ofx, ofy, ofwh, ofwh);
- p->drawLine(FPoint(lx1, ly1), FPoint(lx2, ly2));
- p->drawLine(FPoint(lx1, ly2), FPoint(lx2, ly1));
+ p->drawRect(left, top, sideLength, sideLength);
+ p->drawLine(FPoint(left, top), FPoint(right, bottom));
+ p->drawLine(FPoint(left, bottom), FPoint(right, top));
}
void PageItem_TextFrame::drawColumnBorders(ScPainter *p)
Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp (original)
+++ trunk/Scribus/scribus/pdflib_core.cpp Sun Jul 31 00:25:38 2011
@@ -56,13 +56,8 @@
#include <QtXml>
#include <QUuid>
-
-#include "ui/bookmwin.h"
-#include "ui/bookmarkpalette.h"
#include "cmsettings.h"
#include "commonstrings.h"
-#include "ui/multiprogressdialog.h"
-#include "scpage.h"
#include "pageitem.h"
#include "pageitem_textframe.h"
#include "pageitem_group.h"
@@ -72,6 +67,7 @@
#include "sccolor.h"
#include "sccolorengine.h"
#include "scfonts.h"
+#include "scpage.h"
#include "scpaths.h"
#include "scpattern.h"
#include "scribus.h"
@@ -85,9 +81,14 @@
#include "util_formats.h"
#include "util_math.h"
#include "util_ghostscript.h"
+
#ifdef HAVE_OSG
#include "third_party/prc/exportPRC.h"
#endif
+
+#include "ui/bookmwin.h"
+#include "ui/bookmarkpalette.h"
+#include "ui/multiprogressdialog.h"
using namespace std;
Modified: trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ai/importaiplugin.cpp Sun Jul 31 00:25:38 2011
@@ -5,19 +5,22 @@
for which a new license (GPL+exception) is in place.
*/
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importai.h"
#include "importaiplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
+
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "scconfig.h"
+#include "scpage.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
+
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
#include <QApplication>
#include <QMessageBox>
Modified: trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cgm/importcgmplugin.cpp Sun Jul 31 00:25:38 2011
@@ -12,19 +12,20 @@
email : Franz.Schmid at altmuehlnet.de
***************************************************************************/
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importcgm.h"
#include "importcgmplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
int importcgm_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/cvg/importcvgplugin.cpp Sun Jul 31 00:25:38 2011
@@ -5,19 +5,20 @@
for which a new license (GPL+exception) is in place.
*/
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importcvg.h"
#include "importcvgplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
int importcvg_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/drw/importdrwplugin.cpp Sun Jul 31 00:25:38 2011
@@ -12,19 +12,20 @@
email : Franz.Schmid at altmuehlnet.de
***************************************************************************/
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importdrw.h"
#include "importdrwplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
int importdrw_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pct/importpctplugin.cpp Sun Jul 31 00:25:38 2011
@@ -5,19 +5,20 @@
for which a new license (GPL+exception) is in place.
*/
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importpct.h"
#include "importpctplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
int importpct_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdfplugin.cpp Sun Jul 31 00:25:38 2011
@@ -4,24 +4,26 @@
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 <QApplication>
+#include <QMessageBox>
+
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importpdf.h"
#include "importpdfplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
-#include "scpaths.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "scpage.h"
+#include "scpaths.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
#include "util.h"
-#include <QApplication>
-#include <QMessageBox>
-
+
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
int importpdf_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/ps/importpsplugin.cpp Sun Jul 31 00:25:38 2011
@@ -5,19 +5,22 @@
for which a new license (GPL+exception) is in place.
*/
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importps.h"
#include "importpsplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
+
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "scconfig.h"
+#include "scpage.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
+
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
int importps_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/shape/importshapeplugin.cpp Sun Jul 31 00:25:38 2011
@@ -5,19 +5,20 @@
for which a new license (GPL+exception) is in place.
*/
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importshape.h"
#include "importshapeplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
int importshape_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/sml/importsmlplugin.cpp Sun Jul 31 00:25:38 2011
@@ -5,19 +5,20 @@
for which a new license (GPL+exception) is in place.
*/
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importsml.h"
#include "importsmlplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
int importsml_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/wpg/importwpgplugin.cpp Sun Jul 31 00:25:38 2011
@@ -5,19 +5,20 @@
for which a new license (GPL+exception) is in place.
*/
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importwpg.h"
#include "importwpgplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
int importwpg_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xar/importxarplugin.cpp Sun Jul 31 00:25:38 2011
@@ -5,19 +5,20 @@
for which a new license (GPL+exception) is in place.
*/
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importxar.h"
#include "importxarplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
int importxar_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/xfig/importxfigplugin.cpp Sun Jul 31 00:25:38 2011
@@ -5,19 +5,20 @@
for which a new license (GPL+exception) is in place.
*/
#include "commonstrings.h"
-#include "ui/customfdialog.h"
+
#include "importxfig.h"
#include "importxfigplugin.h"
-#include "ui/scmwmenumanager.h"
-#include "scpage.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scraction.h"
#include "scribuscore.h"
#include "undomanager.h"
#include "util_formats.h"
+#include "ui/customfdialog.h"
+#include "ui/scmwmenumanager.h"
int importxfig_getPluginAPIVersion()
{
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdpage.cpp Sun Jul 31 00:25:38 2011
@@ -6,9 +6,9 @@
*/
#include "cmdpage.h"
#include "cmdutil.h"
+#include "commonstrings.h"
#include "scpage.h"
#include "scribuscore.h"
-#include "commonstrings.h"
#include "scribusdoc.h"
#include <QApplication>
Modified: trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp Sun Jul 31 00:25:38 2011
@@ -5,11 +5,11 @@
for which a new license (GPL+exception) is in place.
*/
#include "cmdutil.h"
-#include "units.h"
#include "scpage.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "selection.h"
+#include "units.h"
ScribusMainWindow* Carrier;
ScribusDoc* doc;
Modified: trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp Sun Jul 31 00:25:38 2011
@@ -5,13 +5,14 @@
for which a new license (GPL+exception) is in place.
*/
#include "objimageexport.h"
-#include "cmdutil.h"
-#include "scpage.h"
#include <QImageWriter>
#include <structmember.h>
#include <QFileInfo>
#include <vector>
+
+#include "cmdutil.h"
+#include "scpage.h"
#include "scribuscore.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/plugins/short-words/parse.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&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 Sun Jul 31 00:25:38 2011
@@ -24,12 +24,12 @@
#include "version.h"
#include "configuration.h"
+#include "langmgr.h"
+#include "pageitem.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "scpage.h"
-#include "pageitem.h"
#include "selection.h"
-#include "langmgr.h"
SWParse::SWParse()
{
Modified: trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&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 Sun Jul 31 00:25:38 2011
@@ -25,13 +25,15 @@
#include <QPixmap>
#include "shortwords.h"
-#include "version.h"
-#include "swdialog.h"
+
#include "configuration.h"
#include "parse.h"
+#include "prefs_shortwords.h"
+#include "swdialog.h"
+#include "swprefsgui.h"
+#include "version.h"
+
#include "scpage.h"
-#include "swprefsgui.h"
-#include "prefs_shortwords.h"
#include "scpaths.h"
#include "scribus.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp (original)
+++ trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp Sun Jul 31 00:25:38 2011
@@ -36,11 +36,11 @@
#include "canvas.h"
#include "cmsettings.h"
#include "commonstrings.h"
-#include "scpage.h"
#include "prefsmanager.h"
#include "prefsfile.h"
#include "prefscontext.h"
#include "scgzfile.h"
+#include "scpage.h"
#include "scpattern.h"
#include "scribuscore.h"
#include "sctextstruct.h"
Modified: trunk/Scribus/scribus/scdocoutput.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/scdocoutput.h
==============================================================================
--- trunk/Scribus/scribus/scdocoutput.h (original)
+++ trunk/Scribus/scribus/scdocoutput.h Sun Jul 31 00:25:38 2011
@@ -12,8 +12,8 @@
#include "scribusapi.h"
#include "scribusdoc.h"
#include "scpage.h"
+#include "scpageoutput.h"
#include "scpainterexbase.h"
-#include "scpageoutput.h"
class SCRIBUS_API ScDocOutput
{
Modified: trunk/Scribus/scribus/scdocoutput_ps2.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/scdocoutput_ps2.cpp
==============================================================================
--- trunk/Scribus/scribus/scdocoutput_ps2.cpp (original)
+++ trunk/Scribus/scribus/scdocoutput_ps2.cpp Sun Jul 31 00:25:38 2011
@@ -6,11 +6,12 @@
*/
#include "scdocoutput_ps2.h"
+
+#include "commonstrings.h"
+#include "scpage.h"
#include "scpageoutput_ps2.h"
#include "scribuscore.h"
-#include "commonstrings.h"
#include "scribusdoc.h"
-#include "scpage.h"
using namespace std;
Modified: trunk/Scribus/scribus/scpage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/scpage.cpp
==============================================================================
--- trunk/Scribus/scribus/scpage.cpp (original)
+++ trunk/Scribus/scribus/scpage.cpp Sun Jul 31 00:25:38 2011
@@ -24,14 +24,15 @@
#include <QDebug>
#include <QPixmap>
-#include "ui/guidemanager.h"
-#include "ui/nodeeditpalette.h"
#include "scpage.h"
#include "scribus.h"
#include "selection.h"
#include "undomanager.h"
#include "undostate.h"
#include "util_icon.h"
+
+#include "ui/guidemanager.h"
+#include "ui/nodeeditpalette.h"
ScPage::ScPage(const double x, const double y, const double b, const double h) :
UndoObject(QObject::tr("Page")),
Modified: trunk/Scribus/scribus/scpageoutput.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/scpageoutput.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput.cpp (original)
+++ trunk/Scribus/scribus/scpageoutput.cpp Sun Jul 31 00:25:38 2011
@@ -13,7 +13,6 @@
#include "cmsettings.h"
#include "commonstrings.h"
-#include "scpage.h"
#include "pageitem.h"
#include "pageitem_imageframe.h"
#include "pageitem_line.h"
@@ -24,6 +23,7 @@
#include "prefsmanager.h"
#include "scfonts.h"
#include "scimage.h"
+#include "scpage.h"
#include "scpattern.h"
#include "scribus.h"
#include "scribusdoc.h"
Modified: trunk/Scribus/scribus/scpageoutput_ps2.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/scpageoutput_ps2.cpp
==============================================================================
--- trunk/Scribus/scribus/scpageoutput_ps2.cpp (original)
+++ trunk/Scribus/scribus/scpageoutput_ps2.cpp Sun Jul 31 00:25:38 2011
@@ -9,9 +9,9 @@
#include "commonstrings.h"
#include "fonts/scfontmetrics.h"
-#include "scpage.h"
#include "pageitem.h"
#include "scimage.h"
+#include "scpage.h"
#include "scpageoutput_ps2.h"
#include "scpainterex_ps2.h"
#include "scribus.h"
Modified: trunk/Scribus/scribus/scprintengine_gdi.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/scprintengine_gdi.cpp
==============================================================================
--- trunk/Scribus/scribus/scprintengine_gdi.cpp (original)
+++ trunk/Scribus/scribus/scprintengine_gdi.cpp Sun Jul 31 00:25:38 2011
@@ -29,16 +29,16 @@
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
-#include "scprintengine_gdi.h"
-#include "scpainterex_cairo.h"
+#include "pslib.h"
#include "scpage.h"
#include "scpageoutput.h"
#include "scpaths.h"
-#include "pslib.h"
-#include "scribusview.h"
+#include "scpainterex_cairo.h"
+#include "scprintengine_gdi.h"
+#include "scribus.h"
#include "scribusapp.h"
#include "scribuscore.h"
-#include "scribus.h"
+#include "scribusview.h"
#include "util.h"
#include "util_ghostscript.h"
#include "ui/customfdialog.h"
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Jul 31 00:25:38 2011
@@ -99,7 +99,6 @@
#include "gtgettext.h"
#include "hyphenator.h"
#include "langmgr.h"
-#include "scpage.h"
#include "pageitem_imageframe.h"
#include "pageitem_latexframe.h"
#include "pageitem_textframe.h"
@@ -117,6 +116,7 @@
#include "sccolorengine.h"
#include "scgtplugin.h"
#include "scmimedata.h"
+#include "scpage.h"
#include "scpaths.h"
#include "scprintengine_ps.h"
#include "scraction.h"
Modified: trunk/Scribus/scribus/scribusXml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/scribusXml.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusXml.cpp (original)
+++ trunk/Scribus/scribus/scribusXml.cpp Sun Jul 31 00:25:38 2011
@@ -31,7 +31,6 @@
#include <cstdlib>
#include "commonstrings.h"
-#include "scpage.h"
#include "pageitem.h"
#include "pageitem_latexframe.h"
#ifdef HAVE_OSG
@@ -39,6 +38,7 @@
#endif
#include "prefsmanager.h"
#include "scclocale.h"
+#include "scpage.h"
#include "scribusdoc.h"
#include "selection.h"
#include "text/nlsconfig.h"
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Sun Jul 31 00:25:38 2011
@@ -66,13 +66,11 @@
#include "prefsfile.h"
#include "prefsmanager.h"
#include "resourcecollection.h"
+#include "scclocale.h"
+#include "sclimits.h"
#include "sccolorengine.h"
-#include "ui/scmessagebox.h"
-#include "colormgmt/sccolormgmtenginefactory.h"
-#include "scclocale.h"
+#include "scpage.h"
#include "scpainter.h"
-#include "sclimits.h"
-#include "scpage.h"
#include "scraction.h"
#include "scribus.h"
#include "scribusXml.h"
@@ -82,9 +80,6 @@
#include "scribuswin.h"
#include "selection.h"
#include "serializer.h"
-#include "ui/hruler.h"
-#include "ui/layers.h"
-#include "ui/storyeditor.h"
#include "text/nlsconfig.h"
#include "undomanager.h"
#include "units.h"
@@ -92,6 +87,11 @@
#include "util_icon.h"
#include "util_math.h"
+#include "colormgmt/sccolormgmtenginefactory.h"
+#include "ui/hruler.h"
+#include "ui/layers.h"
+#include "ui/scmessagebox.h"
+#include "ui/storyeditor.h"
// static const bool FRAMESELECTION_EDITS_DEFAULTSTYLE = false;
Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Sun Jul 31 00:25:38 2011
@@ -41,11 +41,11 @@
#include "colormgmt/sccolormgmtengine.h"
#include "documentinformation.h"
#include "observable.h"
-#include "scpage.h"
#include "pageitem.h"
#include "pagestructs.h"
#include "prefsstructs.h"
#include "scguardedptr.h"
+#include "scpage.h"
#include "sclayer.h"
#include "styles/styleset.h"
#include "undoobject.h"
Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Sun Jul 31 00:25:38 2011
@@ -79,7 +79,6 @@
#include "commonstrings.h"
#include "filewatcher.h"
#include "hyphenator.h"
-#include "scpage.h"
#include "pageitem_imageframe.h"
#include "pageitem_line.h"
#include "pageitem_pathtext.h"
@@ -92,6 +91,7 @@
#include "prefsmanager.h"
#include "scclocale.h"
#include "scmimedata.h"
+#include "scpage.h"
#include "scpainter.h"
#include "scpaths.h"
#include "scribuscore.h"
Modified: trunk/Scribus/scribus/tocgenerator.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/tocgenerator.cpp
==============================================================================
--- trunk/Scribus/scribus/tocgenerator.cpp (original)
+++ trunk/Scribus/scribus/tocgenerator.cpp Sun Jul 31 00:25:38 2011
@@ -26,9 +26,9 @@
#include "gtframestyle.h"
#include "gtparagraphstyle.h"
#include "gtwriter.h"
-#include "scpage.h"
#include "pageitem.h"
#include "pagestructs.h"
+#include "scpage.h"
#include "scribusdoc.h"
TOCGenerator::TOCGenerator(QObject *parent, ScribusDoc *doc) : QObject(parent)
Modified: trunk/Scribus/scribus/ui/aligndistribute.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/aligndistribute.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/aligndistribute.cpp (original)
+++ trunk/Scribus/scribus/ui/aligndistribute.cpp Sun Jul 31 00:25:38 2011
@@ -35,15 +35,17 @@
#include <QVariant>
#include "commonstrings.h"
-#include "scpage.h"
-#include "ui/scmessagebox.h"
+
+
#include "scribusdoc.h"
-#include "ui/scrspinbox.h"
#include "selection.h"
#include "undomanager.h"
+#include "scpage.h"
+#include "scribusstructs.h"
#include "units.h"
#include "util_icon.h"
-#include "scribusstructs.h"
+#include "ui/scmessagebox.h"
+#include "ui/scrspinbox.h"
//TODO Distribute with
Modified: trunk/Scribus/scribus/ui/applytemplatedialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/applytemplatedialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/applytemplatedialog.cpp (original)
+++ trunk/Scribus/scribus/ui/applytemplatedialog.cpp Sun Jul 31 00:25:38 2011
@@ -28,8 +28,8 @@
#include <QVBoxLayout>
#include "commonstrings.h"
+#include "scpage.h"
#include "scribusdoc.h"
-#include "scpage.h"
#include "util_icon.h"
enum {
Modified: trunk/Scribus/scribus/ui/checkDocument.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/checkDocument.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/checkDocument.cpp (original)
+++ trunk/Scribus/scribus/ui/checkDocument.cpp Sun Jul 31 00:25:38 2011
@@ -19,13 +19,12 @@
#include <QTreeWidgetItem>
#include <QVBoxLayout>
-
+#include "documentchecker.h"
+#include "prefsmanager.h"
#include "sccombobox.h"
+#include "scpage.h"
#include "scribuscore.h"
#include "scribusdoc.h"
-#include "scpage.h"
-#include "prefsmanager.h"
-#include "documentchecker.h"
#include "util_icon.h"
#include "util.h"
Modified: trunk/Scribus/scribus/ui/cpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/cpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/cpalette.cpp Sun Jul 31 00:25:38 2011
@@ -45,22 +45,22 @@
#include <QDebug>
#include "colorlistbox.h"
+#include "commonstrings.h"
#include "sccombobox.h"
#include "scribusdoc.h"
#include "scrspinbox.h"
#include "gradienteditor.h"
#include "insertTable.h"
-#include "units.h"
-#include "scpage.h"
#include "pageitem.h"
-#include "util_icon.h"
-#include "commonstrings.h"
#include "sccolorengine.h"
#include "sclistwidgetdelegate.h"
+#include "scpage.h"
#include "scpainter.h"
#include "scpattern.h"
#include "scribus.h"
#include "selection.h"
+#include "units.h"
+#include "util_icon.h"
#include "util.h"
#include "util_math.h"
Modified: trunk/Scribus/scribus/ui/dcolor.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/dcolor.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/dcolor.cpp (original)
+++ trunk/Scribus/scribus/ui/dcolor.cpp Sun Jul 31 00:25:38 2011
@@ -14,12 +14,11 @@
#include <QPushButton>
#include "commonstrings.h"
+#include "colorcombo.h"
+#include "dcolor.h"
+#include "prefsmanager.h"
+#include "scpage.h"
#include "scribusdoc.h"
-#include "scpage.h"
-#include "colorcombo.h"
-#include "prefsmanager.h"
-
-#include "dcolor.h"
#include "util_icon.h"
DelColor::DelColor( QWidget* parent, ColorList colorList, QString colorName, bool haveDoc) : QDialog( parent )
Modified: trunk/Scribus/scribus/ui/effectsdialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/effectsdialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/effectsdialog.cpp (original)
+++ trunk/Scribus/scribus/ui/effectsdialog.cpp Sun Jul 31 00:25:38 2011
@@ -27,9 +27,9 @@
#include "cmsettings.h"
#include "colorcombo.h"
#include "curvewidget.h"
-#include "scpage.h"
#include "sccombobox.h"
#include "scclocale.h"
+#include "scpage.h"
#include "scribusdoc.h"
#include "scrspinbox.h"
#include "sctextstream.h"
Modified: trunk/Scribus/scribus/ui/fontcombo.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/fontcombo.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/fontcombo.cpp (original)
+++ trunk/Scribus/scribus/ui/fontcombo.cpp Sun Jul 31 00:25:38 2011
@@ -29,12 +29,11 @@
#include <QPixmap>
#include <QStringList>
+#include "fontcombo.h"
+#include "prefsmanager.h"
#include "sccombobox.h"
-
+#include "scpage.h"
#include "scribusdoc.h"
-#include "fontcombo.h"
-#include "scpage.h"
-#include "prefsmanager.h"
#include "util_icon.h"
#include "util.h"
Modified: trunk/Scribus/scribus/ui/guidemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/guidemanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/guidemanager.cpp (original)
+++ trunk/Scribus/scribus/ui/guidemanager.cpp Sun Jul 31 00:25:38 2011
@@ -23,17 +23,18 @@
***************************************************************************/
#include "guidemanager.h"
+
#include "commonstrings.h"
+#include "guidesdelegate.h"
+#include "guidesmodel.h"
+#include "scinputdialog.h"
#include "scpage.h"
-#include "scinputdialog.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "selection.h"
#include "undomanager.h"
#include "units.h"
#include "util.h"
-#include "guidesmodel.h"
-#include "guidesdelegate.h"
GuideManager::GuideManager(QWidget* parent) :
Modified: trunk/Scribus/scribus/ui/hruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/hruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/hruler.cpp (original)
+++ trunk/Scribus/scribus/ui/hruler.cpp Sun Jul 31 00:25:38 2011
@@ -35,8 +35,8 @@
#include "canvasgesture_rulermove.h"
#include "hruler.h"
+#include "prefsmanager.h"
#include "scpage.h"
-#include "prefsmanager.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "scribusview.h"
Modified: trunk/Scribus/scribus/ui/inspage.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/inspage.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/inspage.cpp (original)
+++ trunk/Scribus/scribus/ui/inspage.cpp Sun Jul 31 00:25:38 2011
@@ -13,12 +13,13 @@
#include <QGroupBox>
#include <QCheckBox>
#include <QPushButton>
+
+#include "commonstrings.h"
+#include "scpage.h"
#include "scribusdoc.h"
-#include "scpage.h"
-#include "units.h"
#include "scrspinbox.h"
#include "pagesize.h"
-#include "commonstrings.h"
+#include "units.h"
#include "util_icon.h"
#include "util.h"
Modified: trunk/Scribus/scribus/ui/javadocs.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/javadocs.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/javadocs.cpp (original)
+++ trunk/Scribus/scribus/ui/javadocs.cpp Sun Jul 31 00:25:38 2011
@@ -13,13 +13,15 @@
#include <QPushButton>
#include <QRegExp>
#include <QToolTip>
+
+#include "commonstrings.h"
#include "editor.h"
+#include "query.h"
+#include "scpage.h"
+#include "scribusdoc.h"
#include "ui/scmessagebox.h"
-#include "scribusdoc.h"
-#include "scpage.h"
-#include "commonstrings.h"
-#include "query.h"
#include "util_icon.h"
+
JavaDocs::JavaDocs(QWidget* parent, ScribusDoc *doc, ScribusView* vie) : QDialog( parent )
{
Modified: trunk/Scribus/scribus/ui/margindialog.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/margindialog.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/margindialog.cpp (original)
+++ trunk/Scribus/scribus/ui/margindialog.cpp Sun Jul 31 00:25:38 2011
@@ -14,15 +14,15 @@
#include <QComboBox>
#include <QCheckBox>
+#include "commonstrings.h"
#include "margindialog.h"
#include "marginwidget.h"
+#include "pagesize.h"
#include "pagestructs.h"
#include "scpage.h"
#include "scribusdoc.h"
+#include "scrspinbox.h"
#include "units.h"
-#include "scrspinbox.h"
-#include "pagesize.h"
-#include "commonstrings.h"
#include "util_icon.h"
MarginDialog::MarginDialog( QWidget* parent, ScribusDoc* doc ) : QDialog( parent)
Modified: trunk/Scribus/scribus/ui/masterpagepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/masterpagepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/masterpagepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/masterpagepalette.cpp Sun Jul 31 00:25:38 2011
@@ -23,14 +23,14 @@
#include "commonstrings.h"
#include "mergedoc.h"
#include "newtemp.h"
+#include "pagestructs.h"
+#include "prefsmanager.h"
#include "scpage.h"
-#include "pagestructs.h"
-#include "selection.h"
-#include "prefsmanager.h"
#include "scribus.h"
-#include "scribusXml.h"
#include "scribusdoc.h"
#include "scribusview.h"
+#include "scribusXml.h"
+#include "selection.h"
#include "util_icon.h"
MasterPagesPalette::MasterPagesPalette( QWidget* parent, ScribusDoc *pCurrentDoc, ScribusView *pCurrentView, QString masterPageName)
Modified: trunk/Scribus/scribus/ui/missing.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/missing.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/missing.cpp (original)
+++ trunk/Scribus/scribus/ui/missing.cpp Sun Jul 31 00:25:38 2011
@@ -13,13 +13,13 @@
#include <QImage>
#include <QPixmap>
+#include "commonstrings.h"
#include "fontcombo.h"
+#include "prefsmanager.h"
+#include "scpage.h"
#include "scribusdoc.h"
-#include "scpage.h"
-#include "prefsmanager.h"
-#include "commonstrings.h"
+#include "util.h"
#include "util_icon.h"
-#include "util.h"
static const char* const image100_data[] =
{
Modified: trunk/Scribus/scribus/ui/newtemp.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/newtemp.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/newtemp.cpp (original)
+++ trunk/Scribus/scribus/ui/newtemp.cpp Sun Jul 31 00:25:38 2011
@@ -15,10 +15,10 @@
#include <QLabel>
#include <QPushButton>
+#include "commonstrings.h"
+#include "pagestructs.h"
#include "scpage.h"
-#include "pagestructs.h"
#include "scribusdoc.h"
-#include "commonstrings.h"
#include "util_icon.h"
NewTm::NewTm( QWidget* parent, QString text, QString titel, ScribusDoc *doc, const QString& answerText)
Modified: trunk/Scribus/scribus/ui/nodeeditpalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/nodeeditpalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/nodeeditpalette.cpp (original)
+++ trunk/Scribus/scribus/ui/nodeeditpalette.cpp Sun Jul 31 00:25:38 2011
@@ -8,8 +8,8 @@
#include <QEvent>
#include "nodeeditpalette.h"
+#include "pageitem.h"
#include "scpage.h"
-#include "pageitem.h"
#include "scribusview.h"
#include "selection.h"
#include "undomanager.h"
Modified: trunk/Scribus/scribus/ui/outlinepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/outlinepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/outlinepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/outlinepalette.cpp Sun Jul 31 00:25:38 2011
@@ -25,8 +25,8 @@
#include "commonstrings.h"
#include "contextmenu.h"
#include "outlinepalette.h"
+#include "propertiespalette.h"
#include "scpage.h"
-#include "propertiespalette.h"
#include "scribus.h"
#include "selection.h"
#include "undomanager.h"
Modified: trunk/Scribus/scribus/ui/pagepalette.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/pagepalette.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette.cpp (original)
+++ trunk/Scribus/scribus/ui/pagepalette.cpp Sun Jul 31 00:25:38 2011
@@ -20,14 +20,13 @@
#include <QPainter>
#include "commonstrings.h"
-#include "scpage.h"
#include "pagelayout.h"
#include "pagepalette.h"
#include "sccombobox.h"
+#include "scpage.h"
#include "scribus.h"
#include "scribusview.h"
#include "util_icon.h"
-
/* IconItems Code */
SeItem::SeItem(QString text, uint nr, const QPixmap& Pix) : QTableWidgetItem(QIcon(Pix), "", 1002)
Modified: trunk/Scribus/scribus/ui/propertiespalette.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/propertiespalette.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette.h Sun Jul 31 00:25:38 2011
@@ -22,12 +22,12 @@
#include "scguardedptr.h"
#include "scrspinbox.h"
#include "pageitem.h"
-#include "scpage.h"
#include "linkbutton.h"
#include "linecombo.h"
+#include "scguardedptr.h"
+#include "sclistboxpixmap.h"
+#include "scpage.h"
#include "spalette.h"
-#include "sclistboxpixmap.h"
-#include "scguardedptr.h"
#include "sctreewidget.h"
class ColorCombo;
Modified: trunk/Scribus/scribus/ui/propertiespalette_utils.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/propertiespalette_utils.h
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_utils.h (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_utils.h Sun Jul 31 00:25:38 2011
@@ -33,10 +33,10 @@
#include "scribusapi.h"
#include "scrspinbox.h"
#include "pageitem.h"
-#include "scpage.h"
#include "linkbutton.h"
#include "linecombo.h"
#include "sclistboxpixmap.h"
+#include "scpage.h"
#include "sctreewidget.h"
class ScribusDoc;
Modified: trunk/Scribus/scribus/ui/search.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/search.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/search.cpp (original)
+++ trunk/Scribus/scribus/ui/search.cpp Sun Jul 31 00:25:38 2011
@@ -19,19 +19,19 @@
#include <QPixmap>
#include <QMessageBox>
+#include "colorcombo.h"
#include "colorlistbox.h"
#include "commonstrings.h"
-#include "colorcombo.h"
#include "fontcombo.h"
-#include "scrspinbox.h"
-#include "scpage.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
+#include "scpage.h"
#include "scribus.h"
+#include "scrspinbox.h"
#include "shadebutton.h"
+#include "styleselect.h"
#include "ui/storyeditor.h"
-#include "styleselect.h"
#include "util.h"
#include "util_icon.h"
#include "util_text.h"
Modified: trunk/Scribus/scribus/ui/vruler.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=16736&path=/trunk/Scribus/scribus/ui/vruler.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/vruler.cpp (original)
+++ trunk/Scribus/scribus/ui/vruler.cpp Sun Jul 31 00:25:38 2011
@@ -34,8 +34,8 @@
#include <cmath>
#include "canvasgesture_rulermove.h"
+#include "prefsmanager.h"
#include "scpage.h"
-#include "prefsmanager.h"
#include "scribus.h"
#include "scribusdoc.h"
#include "units.h"
More information about the scribus-commit
mailing list