r16477 by craig - Remove duplicate header includes

[scribus-commit]

Author: craig
Date: Tue Mar 22 16:08:58 2011
New Revision: 16477

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16477
Log:
Remove duplicate header includes 

Modified:
    branches/Version135/Scribus/scribus/hruler.cpp
    branches/Version135/Scribus/scribus/pageitem.cpp
    branches/Version135/Scribus/scribus/picsearchoptions.cpp
    branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    branches/Version135/Scribus/scribus/prefs.cpp
    branches/Version135/Scribus/scribus/prefsmanager.cpp
    branches/Version135/Scribus/scribus/pslib.cpp

Modified: branches/Version135/Scribus/scribus/hruler.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16477&path=/branches/Version135/Scribus/scribus/hruler.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/hruler.cpp (original)
+++ branches/Version135/Scribus/scribus/hruler.cpp Tue Mar 22 16:08:58 2011
@@ -25,10 +25,8 @@
 
 #include <QCursor>
 #include <QMouseEvent>
-// #include <QDebug>
+#include <QPainter>
 #include <QPaintEvent>
-#include <QPainter>
-#include <QPixmap>
 #include <QPixmap>
 #include <QPolygon>
 #include <QRect>

Modified: branches/Version135/Scribus/scribus/pageitem.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16477&path=/branches/Version135/Scribus/scribus/pageitem.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/pageitem.cpp (original)
+++ branches/Version135/Scribus/scribus/pageitem.cpp Tue Mar 22 16:08:58 2011
@@ -39,7 +39,6 @@
 #include <string>
 
 #include "canvas.h"
-#include "scpaths.h"
 #include "cmsettings.h"
 #include "colorblind.h"
 #include "commonstrings.h"

Modified: branches/Version135/Scribus/scribus/picsearchoptions.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16477&path=/branches/Version135/Scribus/scribus/picsearchoptions.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/picsearchoptions.cpp (original)
+++ branches/Version135/Scribus/scribus/picsearchoptions.cpp Tue Mar 22 16:08:58 2011
@@ -20,16 +20,17 @@
 */
 
 #include <cassert>
-#include <QMessageBox>
-#include <QStringList>
+
+#include <QCheckBox>
 #include <QDir>
-#include <QLineEdit>
-#include <QToolTip>
-#include <QPushButton>
-#include <QToolTip>
-#include <QCheckBox>
 #include <QFileDialog>
 #include <QLabel>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QStringList>
+#include <QToolTip>
+
 #include "picsearchoptions.h"
 #include "filesearch.h"
 

Modified: branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16477&path=/branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Tue Mar 22 16:08:58 2011
@@ -7,6 +7,12 @@
 #include "scribus134format.h"
 #include "scribus134formatimpl.h"
 
+#include <QApplication>
+#include <QByteArray>
+#include <QCursor>
+#include <QFileInfo>
+#include <QList>
+
 #include "../../formatidlist.h"
 #include "commonstrings.h"
 #include "hyphenator.h"
@@ -15,6 +21,7 @@
 #include "prefsmanager.h"
 #include "scclocale.h"
 #include "scconfig.h"
+#include "scgzfile.h"
 #include "scpattern.h"
 #include "scribusdoc.h"
 #include "scribusview.h"
@@ -22,20 +29,10 @@
 #include "sccolorengine.h"
 #include "scribuscore.h"
 #include "undomanager.h"
-
 #include "units.h"
 #include "util.h"
 #include "util_math.h"
 #include "util_color.h"
-#include "scgzfile.h"
-#include "scpattern.h"
-#include <QCursor>
-// #include <QDebug>
-#include <QFileInfo>
-#include <QList>
-#include <QByteArray>
-#include <QApplication>
-
 
 // See scplugin.h and pluginmanager.{cpp,h} for detail on what these methods
 // do. That documentatation is not duplicated here.

Modified: branches/Version135/Scribus/scribus/prefs.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16477&path=/branches/Version135/Scribus/scribus/prefs.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/prefs.cpp (original)
+++ branches/Version135/Scribus/scribus/prefs.cpp Tue Mar 22 16:08:58 2011
@@ -52,7 +52,6 @@
 #include "tabtypography.h"
 #include "tocindexprefs.h"
 #include "undomanager.h"
-#include "units.h"
 #include "units.h"
 #include "util_icon.h"
 

Modified: branches/Version135/Scribus/scribus/prefsmanager.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16477&path=/branches/Version135/Scribus/scribus/prefsmanager.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/prefsmanager.cpp (original)
+++ branches/Version135/Scribus/scribus/prefsmanager.cpp Tue Mar 22 16:08:58 2011
@@ -24,8 +24,8 @@
 #include <QDir>
 #include <QDomDocument>
 #include <QFile>
+#include <QList>
 #include <QMatrix>
-#include <QList>
 #include <QString>
 #include <QStringList>
 #include <QStyleFactory>
@@ -50,7 +50,6 @@
 #include "scpaths.h"
 #include "scribuscore.h"
 #include "scribusstructs.h"
-#include "scribuscore.h"
 #include "ui/modetoolbar.h"
 #include "util_file.h"
 #include "util_ghostscript.h"

Modified: branches/Version135/Scribus/scribus/pslib.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16477&path=/branches/Version135/Scribus/scribus/pslib.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/pslib.cpp (original)
+++ branches/Version135/Scribus/scribus/pslib.cpp Tue Mar 22 16:08:58 2011
@@ -23,17 +23,16 @@
 
 #include "pslib.h"
 
+#include <cstdlib>
+
+#include <QBuffer>
+#include <QByteArray>
+#include <QColor>
 #include <QFileInfo>
+#include <QFontInfo>
 #include <QImage>
-#include <QColor>
-//#include <QDebug>
-#include <QFontInfo>
 #include <QList>
-#include <QByteArray>
-#include <QList>
-#include <cstdlib>
 #include <QRegExp>
-#include <QBuffer>
 #include <QStack>
 
 #include "cmsettings.h"