Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 10222 → Rev 10223

/trunk/Scribus/scribus/filewatcher.h
7,12 → 7,12
#ifndef FILEWATCHER_H
#define FILEWATCHER_H
 
#include <qobject.h>
#include <qtimer.h>
#include <qmap.h>
#include <qfileinfo.h>
#include <qdatetime.h>
#include <QDateTime>
#include <QFileInfo>
#include <QList>
#include <QMap>
#include <QObject>
#include <QTimer>
 
#include "scribusapi.h"
 
/trunk/Scribus/scribus/scfonts.h
8,13 → 8,13
#define SCFONTS_H
 
#include <QByteArray>
#include <QDateTime>
#include <QFont>
#include <QList>
#include <QMap>
#include <QString>
#include <QStringList>
//#include <qvector.h>
#include <QFont>
#include <QMap>
#include <QDateTime>
#include <QList>
 
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_OUTLINE_H
22,13 → 22,11
 
FT_Error ftIOFunc( FT_Stream fts, unsigned long offset, unsigned char* buffer, unsigned long count);
 
// #include <qpixmap.h>
 
#include "scribusapi.h"
#include "fonts/scface.h"
#include "fpointarray.h"
#include "scconfig.h"
#include "scribusapi.h"
 
#include "fonts/scface.h"
 
class ScribusDoc;
 
/trunk/Scribus/scribus/smreplacedia.cpp
7,11 → 7,11
 
#include "smreplacedia.h"
 
#include <qstring.h>
#include <qstringlist.h>
#include <qlabel.h>
#include <qcombobox.h>
#include <qlayout.h>
#include <QString>
#include <QStringList>
#include <QLabel>
#include <QComboBox>
#include <QLayout>
//Added by qt3to4:
#include <Q3VBoxLayout>
#include <Q3HBoxLayout>
/trunk/Scribus/scribus/prefsreader.h
28,13 → 28,14
#define PREFSREADER_H
 
#include <vector>
#include <qstring.h>
#include <qxml.h>
 
#include "scribusapi.h"
#include <QString>
#include <QXmlDefaultHandler>
 
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefstable.h"
#include "scribusapi.h"
 
class SCRIBUS_API PrefsReader : public QXmlDefaultHandler
{
/trunk/Scribus/scribus/gtaction.cpp
28,8 → 28,8
#include "gtaction.h"
#include "mpalette.h"
#include "scribus.h"
#include <qcursor.h>
#include <qstringlist.h>
#include <QCursor>
#include <QStringList>
//Added by qt3to4:
#include <QList>
#include "color.h"
/trunk/Scribus/scribus/linecombo.h
24,8 → 24,8
#ifndef LINECOMBO_H
#define LINECOMBO_H
 
#include <qcombobox.h>
#include <qpixmap.h>
#include <QComboBox>
#include <QPixmap>
 
#include "scribusapi.h"
 
/trunk/Scribus/scribus/scpainterex_gdi.h
30,9 → 30,9
 
// libart wrapper
 
#include <qglobal.h>
#include <QColor>
#include <QFont>
#include <QGlobalStatic>
#include <QList>
#include <QMatrix>
#include <QPixmap>
/trunk/Scribus/scribus/util.cpp
32,7 → 32,7
#include <QList>
#include <QPixmap>
#include <QWidget>
#include <qdir.h>
#include <QDir>
 
 
#include <cmath>
64,7 → 64,7
// #include "prefstable.h"
#include "prefsmanager.h"
#include <QProcess>
#include <q3process.h>
#include <Q3Process>
#include "scmessagebox.h"
#include "scpixmapcache.h"
#include "scpaths.h"
/trunk/Scribus/scribus/fmitem.cpp
25,8 → 25,8
string class */
#include "fmitem.h"
#include <qfontmetrics.h>
#include <qapplication.h>
#include <QFontMetrics>
#include <QApplication>
 
FmItem::FmItem(const QString& s, const ScFace&)
{
/trunk/Scribus/scribus/scribuscore.h
22,7 → 22,7
#ifndef SCRIBUSCORE_H
#define SCRIBUSCORE_H
 
#include <qobject.h>
#include <QObject>
#include <QList>
#include "scribus.h"
#include "scribusapi.h"
/trunk/Scribus/scribus/selection.h
20,10 → 20,10
#ifndef SELECTION_H
#define SELECTION_H
 
#include <qpointer.h>
#include <qobject.h>
#include <qmap.h>
#include <QList>
#include <QMap>
#include <QObject>
#include <QPointer>
 
#include "pageitem.h"
#include "scribusapi.h"
/trunk/Scribus/scribus/smtextstylewidgets.cpp
6,7 → 6,6
*/
 
#include "smtextstylewidgets.h"
//#include "smtextstylewidgets.moc"
#include "units.h"
#include "util.h"
#include "util_icon.h"
14,17 → 13,16
#include "smwidgets.h"
 
#include <QGroupBox>
#include <qlayout.h>
#include <qtoolbutton.h>
#include <qlabel.h>
#include <QLayout>
#include <QToolButton>
#include <QLabel>
#include <QMenu>
#include <qcombobox.h>
#include <qspinbox.h>
#include <q3frame.h>
#include <qpixmap.h>
#include <qtabwidget.h>
#include <qmap.h>
//Added by qt3to4:
#include <QComboBox>
#include <QSpinBox>
#include <Q3Frame>
#include <QPixmap>
#include <QTabWidget>
#include <QMap>
#include <Q3HBoxLayout>
#include <Q3GridLayout>
#include <Q3VBoxLayout>
/trunk/Scribus/scribus/gtmeasure.cpp
24,8 → 24,8
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
 
#include <qstring.h>
#include <qobject.h>
#include <QString>
#include <QObject>
 
#include "gtmeasure.h"
 
/trunk/Scribus/scribus/undoobject.cpp
25,8 → 25,6
***************************************************************************/
 
#include "undoobject.h"
//Added by qt3to4:
#include <QPixmap>
 
ulong UndoObject::nextId_ = 1;
 
/trunk/Scribus/scribus/rulermover.cpp
24,8 → 24,8
#include "rulermover.h"
#include "scribusview.h"
#include "scribusdoc.h"
#include <qcursor.h>
#include <qapplication.h>
#include <QCursor>
#include <QApplication>
#include <QMouseEvent>
#include <QPixmap>
#include "util_icon.h"
/trunk/Scribus/scribus/colorcombo.h
17,12 → 17,14
#define COLORCOMBO_H
 
#include <QComboBox>
#include "colorlistbox.h"
 
#ifdef QT_WS_MAC
#include <qmacstyle_mac.h>
#include <QMacStyle>
#endif
 
 
#include "colorlistbox.h"
 
/*!
\class ColorCombo colorcombo.h
\brief The ColorCombo widget is a combo box for displaying list of colors.
/trunk/Scribus/scribus/gradienteditor.cpp
23,9 → 23,9
 
#include "gradienteditor.h"
//#include "gradienteditor.moc"
#include <qpainter.h>
#include <qpixmap.h>
#include <qcursor.h>
#include <QPainter>
#include <QPixmap>
#include <QCursor>
#include <QApplication>
//Added by qt3to4:
#include <QPolygon>
/trunk/Scribus/scribus/picsearch.h
9,12 → 9,12
 
#include <QDialog>
#include <QListWidgetItem>
#include <qcheckbox.h>
#include <qlabel.h>
#include <qpushbutton.h>
#include <qlayout.h>
#include <qtooltip.h>
#include <qstringlist.h>
#include <QCheckBox>
#include <QLabel>
#include <QPushButton>
#include <QLayout>
#include <QToolTip>
#include <QStringList>
 
#include "scribusapi.h"
#include "ui_picsearch.h"
/trunk/Scribus/scribus/gtdialogs.h
27,6 → 27,7
#ifndef GTDIALOGS_H
#define GTDIALOGS_H
 
#include <Q3FileDialog>
#include <QCheckBox>
#include <QComboBox>
#include <QDialog>
43,9 → 44,7
#include <QTextCodec>
#include <QToolButton>
#include <QToolTip>
#include <q3filedialog.h>
 
 
#include "scribusapi.h"
 
class PrefsContext;
/trunk/Scribus/scribus/scribuscore.cpp
21,8 → 21,7
#include <cassert>
#include <iostream>
#include <qglobal.h>
//Added by qt3to4:
#include <QGlobalStatic>
#include <QByteArray>
 
 
/trunk/Scribus/scribus/rulermover.h
24,7 → 24,7
#ifndef RULERMOVER_H
#define RULERMOVER_H
 
#include <qwidget.h>
#include <QWidget>
//Added by qt3to4:
#include <QMouseEvent>
 
/trunk/Scribus/scribus/scpainterex_ps2.h
30,7 → 30,7
 
// libart wrapper
 
#include <qglobal.h>
#include <QGlobalStatic>
#include <QColor>
#include <QFont>
#include <QMatrix>
/trunk/Scribus/scribus/sccombobox.cpp
13,12 → 13,12
*
*/
 
#include <q3listbox.h>
#include <Q3ListBox>
#include "sccombobox.h"
 
#ifdef QT_WS_MAC
 
#include <qmacstyle_mac.h>
#include <QMacStyle>
 
/// use listbox instead of popupmenu for combo boxes
class ScMacStyle : public QMacStyle {
/trunk/Scribus/scribus/annotation.h
26,7 → 26,7
#include "scconfig.h"
#endif
 
#include <qstring.h>
#include <QString>
#include "scribusapi.h"
#include "desaxe/saxio.h"
 
/trunk/Scribus/scribus/fmitem.h
24,14 → 24,14
#ifndef FMITEM_H
#define FMITEM_H
 
#include <qsize.h>
#include <qpainter.h>
#include <qfont.h>
#include <qstring.h>
#include <qmenudata.h>
#include <QSize>
#include <QPainter>
#include <QFont>
#include <QString>
#include <QMenuData>
 
#include "scfonts.h"
#include "scribusapi.h"
#include "scfonts.h"
 
/**
*@author Franz Schmid
/trunk/Scribus/scribus/util_math.cpp
22,16 → 22,12
***************************************************************************/
 
#include "util_math.h"
#include <qbitmap.h>
#include <qfile.h>
#include <qfileinfo.h>
// #include <qdatastream.h>
// #include <qregexp.h>
#include <qdir.h>
#include <qdom.h>
#include <qcheckbox.h>
#include <qwidget.h>
//Added by qt3to4:
#include <QBitmap>
#include <QFile>
#include <QFileInfo>
#include <QDir>
#include <QCheckBox>
#include <QWidget>
#include <QPixmap>
#include <QList>
#include <QByteArray>
38,16 → 34,10
#include <Q3PointArray>
#include <QImageReader>
 
// #include <algorithm>
// #include <cstdlib>
#include <cmath>
#include <algorithm>
#include "scconfig.h"
 
//#ifdef HAVE_UNISTD_H
//#include <unistd.h>
//#endif
 
#if defined(_WIN32)
#if defined(_MSC_VER)
#define __STDC__ 1 // hack to get md5_buffer correctly identified
58,21 → 48,14
 
#include "md5.h"
 
// #include <setjmp.h>
#include "commonstrings.h"
// #include "pagestructs.h"
// #include "prefsfile.h"
// #include "prefscontext.h"
// #include "prefstable.h"
// #include "prefsmanager.h"
#include <QProcess>
#include <q3process.h>
#include <Q3Process>
#include "scmessagebox.h"
#include "scpixmapcache.h"
#include "scpaths.h"
// #include "text/nlsconfig.h"
 
extern "C"
extern "C"
{
#define XMD_H // shut JPEGlib up
#if defined(Q_OS_UNIXWARE)
/trunk/Scribus/scribus/tabdisplay.cpp
4,14 → 4,14
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 <qpushbutton.h>
#include <qcheckbox.h>
#include <qlabel.h>
#include <qslider.h>
#include <qtooltip.h>
#include <qgroupbox.h>
#include <qcolordialog.h>
#include <qpainter.h>
#include <QPushButton>
#include <QCheckBox>
#include <QLabel>
#include <QSlider>
#include <QToolTip>
#include <QGroupBox>
#include <QColorDialog>
#include <QPainter>
 
#include <QList>
#include <QPixmap>
/trunk/Scribus/scribus/mspinbox.cpp
23,9 → 23,9
 
#include "mspinbox.h"
//#include "mspinbox.moc"
#include <qapplication.h>
#include <qlineedit.h>
#include <qregexp.h>
#include <QApplication>
#include <QLineEdit>
#include <QRegExp>
//Added by qt3to4:
#include <QWheelEvent>
#include <QKeyEvent>
/trunk/Scribus/scribus/pdflib_core.h
8,7 → 8,7
#ifndef PDFLIBCORE_H
#define PDFLIBCORE_H
 
#include <qfile.h>
#include <QFile>
#include <QDataStream>
#include <QPixmap>
#include <QList>
/trunk/Scribus/scribus/scpageoutput_ps2.cpp
4,15 → 4,16
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 "scpageoutput_ps2.h"
#include "scpainterex_ps2.h"
 
#include "qpainter.h"
#include "pageitem.h"
#include <QPainter>
 
#include "commonstrings.h"
#include "fonts/scfontmetrics.h"
#include "pageitem.h"
#include "scimage.h"
#include "scpageoutput_ps2.h"
#include "scpainterex_ps2.h"
#include "scribus.h"
#include "scimage.h"
#include "util.h"
 
ScPageOutput_Ps2::ScPageOutput_Ps2(QIODevice* dev, ScribusDoc* doc, int pageIndex, ScPs2OutputParams& options)
/trunk/Scribus/scribus/fonts/scface_ttf.cpp
5,9 → 5,9
for which a new license (GPL+exception) is in place.
*/
 
#include <qfile.h>
#include <qstring.h>
#include <qobject.h>
#include <QFile>
#include <QString>
#include <QObject>
 
#include <sys/types.h>
 
/trunk/Scribus/scribus/fonts/ftface.cpp
4,8 → 4,8
#include FT_OUTLINE_H
#include FT_GLYPH_H
 
#include <qobject.h>
#include <qfile.h>
#include <QObject>
#include <QFile>
 
#include "scfonts.h"
#include "util.h"
/trunk/Scribus/scribus/fonts/scfontmetrics.h
9,9 → 9,9
#define SCFONTMETRICS_H
 
#include <utility>
#include <qglobal.h>
#include <qstring.h>
#include <qcolor.h>
#include <QGlobalStatic>
#include <QString>
#include <QColor>
//Added by qt3to4:
#include <QPixmap>
 
/trunk/Scribus/scribus/fonts/scface.h
13,10 → 13,10
virtual: dispatch to constituents, handle embedding (-)
*/
 
#include <qstring.h>
//#include <qvector.h>
#include <qmap.h>
//#include <qarray.h>
#include <QString>
//#include <QVector>
#include <QMap>
//#include <QArray>
#include <utility>
 
#include "fpointarray.h"
/trunk/Scribus/scribus/fonts/ftface.h
2,10 → 2,10
#define FT_FACE_H
 
 
#include <qstring.h>
//#include <qvector.h>
#include <qmap.h>
//#include <qarray.h>
#include <QString>
//#include <QVector>
#include <QMap>
//#include <QArray>
 
#include "scribusapi.h"
 
/trunk/Scribus/scribus/prefsmanager.cpp
19,13 → 19,13
***************************************************************************/
 
#include <QDesktopWidget>
#include <qcolor.h>
#include <qdir.h>
#include <qdom.h>
#include <qfile.h>
#include <qstring.h>
#include <qstylefactory.h>
#include <qmatrix.h>
#include <QColor>
#include <QDir>
#include <QDomDocument>
#include <QFile>
#include <QString>
#include <QStyleFactory>
#include <QMatrix>
#include <QList>
 
#include "prefsmanager.h"
/trunk/Scribus/scribus/scimgdataloader_pdf.cpp
4,8 → 4,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 <qfile.h>
#include <qfileinfo.h>
#include <QFile>
#include <QFileInfo>
 
#include "util_ghostscript.h"
#include "scpaths.h"
/trunk/Scribus/scribus/picsearchoptions.cpp
20,17 → 20,17
*/
 
#include <cassert>
#include <qmessagebox.h>
#include <qstringlist.h>
#include <qdir.h>
#include <qlineedit.h>
#include <qtooltip.h>
#include <qpushbutton.h>
#include <qtooltip.h>
#include <qcheckbox.h>
#include <qtimer.h>
#include <qfiledialog.h>
#include <qlabel.h>
#include <QMessageBox>
#include <QStringList>
#include <QDir>
#include <QLineEdit>
#include <QToolTip>
#include <QPushButton>
#include <QToolTip>
#include <QCheckBox>
#include <QTimer>
#include <QFileDialog>
#include <QLabel>
#include "picsearchoptions.h"
//#include "picsearchoptions.moc"
#include "filesearch.h"
/trunk/Scribus/scribus/util_printer.cpp
14,7 → 14,7
#include <winspool.h>
#endif
 
#include <qstringlist.h>
#include <QStringList>
#include <QDataStream>
#include <QByteArray>
#include "util.h"
/trunk/Scribus/scribus/prefsfile.h
27,7 → 27,7
#ifndef PREFSFILE_H
#define PREFSFILE_H
 
#include <qmap.h>
#include <QMap>
#include <QTextStream>
 
#include "scribusapi.h"
/trunk/Scribus/scribus/gtgettext.h
30,11 → 30,11
#include <iostream>
#include <vector>
 
#include <qdir.h>
#include <qmap.h>
#include <qobject.h>
#include <qstring.h>
#include <qstringlist.h>
#include <QDir>
#include <QMap>
#include <QObject>
#include <QString>
#include <QStringList>
 
#include "scconfig.h"
#include "scribusapi.h"
/trunk/Scribus/scribus/selection.cpp
17,10 → 17,9
* (at your option) any later version. *
* *
***************************************************************************/
#include "selection.h"
//#include "selection.moc"
 
#include "scribusdoc.h"
#include "selection.h"
 
Selection::Selection(QObject* parent)
: QObject(parent),
/trunk/Scribus/scribus/fpointarray.cpp
24,7 → 24,7
#include "fpointarray.h"
#include <cstdarg>
#include <math.h>
#include <qregexp.h>
#include <QRegExp>
//Added by qt3to4:
#include <QVector>
 
/trunk/Scribus/scribus/usertaskstructs.h
7,9 → 7,10
#ifndef USERTASKSTRUCTS_H
#define USERTASKSTRUCTS_H
 
#include <qstring.h>
#include <QString>
 
#include "gtgettext.h"
#include "pageitem.h"
#include "gtgettext.h"
 
struct InsertAFrameData
{
/trunk/Scribus/scribus/collect4output.h
7,8 → 7,8
#ifndef COLLECT4OUTPUT_H
#define COLLECT4OUTPUT_H
 
#include <qobject.h>
#include <qmap.h>
#include <QObject>
#include <QMap>
 
class QString;
class ScribusDoc;
/trunk/Scribus/scribus/pdfoptionsio.h
7,12 → 7,12
#ifndef PDFOPTIONSIO_H
#define PDFOPTIONSIO_H
 
#include "scribusapi.h"
#include "pdfoptions.h"
#include <qdom.h>
#include <QDomElement>
#include <QList>
//Added by qt3to4:
 
#include "pdfoptions.h"
#include "scribusapi.h"
 
/**
* @file pdfoptionsio.h
* @author Craig Ringer
/trunk/Scribus/scribus/scribusXml.cpp
14,11 → 14,11
 
#include "scribusXml.h"
//#include "scribusXml.moc"
#include <qfile.h>
#include <qcursor.h>
#include <qregexp.h>
#include <qdir.h>
#include <qtextcodec.h>
#include <QFile>
#include <QCursor>
#include <QRegExp>
#include <QDir>
#include <QTextCodec>
//Added by qt3to4:
#include <QtAlgorithms>
#include <QApplication>
/trunk/Scribus/scribus/fileunzip.h
31,7 → 31,7
#include "scribusapi.h"
 
#include <zlib.h>
#include <qstring.h>
#include <QString>
 
/**
* @brief Extract files from a zip archive.
/trunk/Scribus/scribus/tabscrapbook.cpp
4,8 → 4,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 <qcheckbox.h>
#include <qspinbox.h>
#include <QCheckBox>
#include <QSpinBox>
 
#include "tabscrapbook.h"
//#include "tabscrapbook.moc"
/trunk/Scribus/scribus/scmessagebox.h
21,7 → 21,8
#ifndef SCMESSAGEBOX_H
#define SCMESSAGEBOX_H
 
#include <qmessagebox.h>
#include <QMessageBox>
 
#include "scribusapi.h"
 
class SCRIBUS_API ScMessageBox : public QMessageBox
/trunk/Scribus/scribus/documentinformation.h
22,7 → 22,7
#ifndef DOCUMENTINFORMATION_H
#define DOCUMENTINFORMATION_H
 
#include <qstring.h>
#include <QString>
#include "scribusapi.h"
 
class SCRIBUS_API DocumentInformation
/trunk/Scribus/scribus/smstyleimport.cpp
6,17 → 6,15
*/
 
#include "smstyleimport.h"
//#include "smstyleimport.moc"
#include "commonstrings.h"
 
#include <qpixmap.h>
#include <qlayout.h>
#include <q3listview.h>
#include <qpushbutton.h>
#include <q3header.h>
#include <q3buttongroup.h>
#include <qradiobutton.h>
//Added by qt3to4:
#include <QPixmap>
#include <QLayout>
#include <Q3ListView>
#include <QPushButton>
#include <Q3Header>
#include <Q3ButtonGroup>
#include <QRadioButton>
#include <Q3HBoxLayout>
#include <Q3VBoxLayout>
#include "util_icon.h"
/trunk/Scribus/scribus/scimgdataloader_gimp.cpp
4,8 → 4,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 <qfile.h>
#include <qfileinfo.h>
#include <QFile>
#include <QFileInfo>
#include "scimgdataloader_gimp.h"
 
ScImgDataLoader_GIMP::ScImgDataLoader_GIMP(void) : ScImgDataLoader()
/trunk/Scribus/scribus/scmessagebox.cpp
20,7 → 20,6
***************************************************************************/
 
#include "scmessagebox.h"
//#include "scmessagebox.moc"
#include "scribuscore.h"
 
extern ScribusQApp* ScQApp;
/trunk/Scribus/scribus/undostate.h
27,12 → 27,11
#ifndef UNDOSTATE_H
#define UNDOSTATE_H
 
#include <qmap.h>
//Added by qt3to4:
#include <QMap>
#include <QPixmap>
 
#include "scribusapi.h"
 
class QPixmap;
class QString;
class PageItem;
class UndoObject;
/trunk/Scribus/scribus/util_ghostscript.h
14,10 → 14,10
#ifndef _GSUTIL_H
#define _GSUTIL_H
 
#include <qpixmap.h>
#include <qstring.h>
#include <qstringlist.h>
#include <QMap>
#include <QPixmap>
#include <QString>
#include <QStringList>
 
#include "scribusapi.h"
 
/trunk/Scribus/scribus/colorblind.h
7,9 → 7,9
#ifndef COLORBLIND_H
#define COLORBLIND_H
 
#include <qvariant.h>
#include <qcolor.h>
#include <qobject.h>
#include <QVariant>
#include <QColor>
#include <QObject>
 
/*! \brief This code is an implementation of an algorithm described by Hans Brettel,
Francoise Vienot and John Mollon in the Journal of the Optical Society of
/trunk/Scribus/scribus/fpoint.cpp
23,7 → 23,7
 
#include "fpoint.h"
 
#include <qmatrix.h>
#include <QMatrix>
 
//Create transformed point
FPoint::FPoint(const double x, const double y, const double dx, const double dy, const double rot, const double sx, const double sy, const bool invert)
/trunk/Scribus/scribus/colorsetmanager.cpp
13,7 → 13,7
#include "scpaths.h"
#include "util.h"
#include "commonstrings.h"
#include <qdom.h>
#include <QDomElement>
#include <QTextStream>
#include <QByteArray>
//Added by qt3to4:
/trunk/Scribus/scribus/util_printer.h
7,10 → 7,11
#ifndef PRINTERUTIL_H
#define PRINTERUTIL_H
 
 
#include <QString>
 
#include "scribusapi.h"
 
#include <qstring.h>
 
class QStringList;
 
class SCRIBUS_API PrinterUtil
/trunk/Scribus/scribus/tocgenerator.h
21,9 → 21,10
#ifndef TOCGENERATOR_H
#define TOCGENERATOR_H
 
#include <qobject.h>
#include <QObject>
 
#include "scribusapi.h"
 
class ScribusDoc;
class PageItem;
 
/trunk/Scribus/scribus/styles/charstyle.cpp
6,7 → 6,7
*/
 
 
#include <qobject.h>
#include <QObject>
#include "sctextstruct.h"
#include "scfonts.h"
#include "resourcecollection.h"
/trunk/Scribus/scribus/styles/linestyle.cpp
6,7 → 6,7
*/
 
 
#include <qobject.h>
#include <QObject>
#include "sctextstruct.h"
#include "scfonts.h"
#include "resourcecollection.h"
/trunk/Scribus/scribus/styles/stylecontext.h
18,8 → 18,8
#define STYLECONTEXT_H
 
#include <cassert>
#include <q3signal.h>
#include <qstring.h>
#include <Q3Signal>
#include <QString>
#include <QList>
#include "scribusapi.h"
 
/trunk/Scribus/scribus/styles/stylecontextproxy.h
18,8 → 18,8
#define STYLECONTEXTPROXY_H
 
#include <cassert>
#include <q3signal.h>
#include <qstring.h>
#include <Q3Signal>
#include <QString>
#include "scfonts.h"
#include "scribusapi.h"
#include "sccolor.h"
/trunk/Scribus/scribus/styles/linestyle.h
17,7 → 17,7
#ifndef LINESTYLE_H
#define LINESTYLE_H
 
#include <qstring.h>
#include <QString>
#include "style.h"
#include "styles/stylecontextproxy.h"
 
/trunk/Scribus/scribus/text/sctext_shared.h
1,11 → 1,11
#ifndef SCTEXT_SHARED_H
#define SCTEXT_SHARED_H
 
#include <qobject.h>
#include <qstring.h>
#include <q3valuevector.h>
#include <q3ptrvector.h>
#include <q3ptrlist.h>
#include <QObject>
#include <QString>
#include <Q3ValueVector>
#include <Q3PtrVector>
#include <Q3PtrList>
#include <cassert>
 
//#include "text/paragraphlayout.h"
/trunk/Scribus/scribus/text/specialchars.h
26,7 → 26,7
#define SPECIALCHARS_H
 
 
#include <qstring.h>
#include <QString>
#include "scribusapi.h"
 
class SCRIBUS_API SpecialChars {
/trunk/Scribus/scribus/text/storytext.h
25,11 → 25,11
#ifndef STORYTEXT_H_
#define STORYTEXT_H_
 
#include <qobject.h>
#include <qstring.h>
#include <q3valuevector.h>
#include <q3ptrvector.h>
#include <q3ptrlist.h>
#include <QObject>
#include <QString>
#include <Q3ValueVector>
#include <Q3PtrVector>
#include <Q3PtrList>
#include <cassert>
 
//#include "text/paragraphlayout.h"
/trunk/Scribus/scribus/mspinbox.h
24,9 → 24,9
#ifndef MSPINBOX_H
#define MSPINBOX_H
 
#include <qmap.h>
#include <qspinbox.h>
#include <qstring.h>
#include <QMap>
#include <QSpinBox>
#include <QString>
//Added by qt3to4:
#include <QEvent>
#include "scribusapi.h"
/trunk/Scribus/scribus/scpainterex_gdi.cpp
36,7 → 36,7
 
#ifdef SC_USE_GDIPLUS
#include <gdiplus.h>
//Added by qt3to4:
 
#include <QList>
using namespace Gdiplus;
#endif
45,10 → 45,10
#include "scpainterex_gdi.h"
#include "sccolorengine.h"
 
#include <qpaintdevice.h>
#include <qpixmap.h>
#include <q3pointarray.h>
#include <qimage.h>
#include <QPaintDevice>
#include <QPixmap>
#include <Q3PointArray>
#include <QImage>
 
#include <iostream>
using namespace std;
/trunk/Scribus/scribus/scribus.cpp
21,20 → 21,18
* *
***************************************************************************/
 
#include <q3accel.h>
#include <QApplication>
#include <qeventloop.h>
#include <qcolordialog.h>
#include <qcolor.h>
#include <qicon.h>
#include <qstylefactory.h>
#include <qregexp.h>
#include <qtextcodec.h>
#include <qcursor.h>
#include <q3vbox.h>
#include <qpixmap.h>
#include <qkeysequence.h>
//Added by qt3to4:
#include <QEventLoop>
#include <QColorDialog>
#include <QColor>
#include <QIcon>
#include <QStyleFactory>
#include <QRegExp>
#include <QTextCodec>
#include <QCursor>
#include <Q3VBox>
#include <QPixmap>
#include <QKeySequence>
#include <QMouseEvent>
#include <QFrame>
#include <QDesktopWidget>
/trunk/Scribus/scribus/filesearch.h
9,9 → 9,9
 
#include "scribusapi.h"
#include "deferredtask.h"
#include <qstringlist.h>
#include <QStringList>
#include <QStack>
#include <qdir.h>
#include <QDir>
 
class QTimer;
 
/trunk/Scribus/scribus/scribusapp.h
21,8 → 21,8
 
#ifndef SCRIBUSAPP_H
#define SCRIBUSAPP_H
#include <qapplication.h>
#include <qstring.h>
#include <QApplication>
#include <QString>
 
#include "scribusapi.h"
class ScribusCore;
/trunk/Scribus/scribus/colorlistbox.h
8,8 → 8,8
#define COLORLISTBOX_H
 
#include <QListWidget>
#include <qcolor.h>
#include <qpointer.h>
#include <QColor>
#include <QPointer>
 
#include "colorsetmanager.h"
#include "commonstrings.h"
/trunk/Scribus/scribus/prefstable.h
29,9 → 29,9
 
#include <string>
#include <vector>
#include <qmap.h>
#include <qstring.h>
#include <qstringlist.h>
#include <QMap>
#include <QString>
#include <QStringList>
 
#include "scribusapi.h"
 
/trunk/Scribus/scribus/fileunzip.cpp
53,7 → 53,7
 
#include <iostream>
#include "unzip.h"
#include <qdir.h>
#include <QDir>
//Added by qt3to4:
#include <QByteArray>
 
/trunk/Scribus/scribus/designer/scrspinboxplugin.h
10,7 → 10,7
#include <QDesignerContainerExtension>
#include <QDesignerCustomWidgetInterface>
 
#include <qplugin.h>
#include <QPlugin>
 
 
class QDesignerFormEditorInterface;
/trunk/Scribus/scribus/designer/sctextbrowserplugin.h
10,7 → 10,7
#include <QDesignerContainerExtension>
#include <QDesignerCustomWidgetInterface>
 
#include <qplugin.h>
#include <QPlugin>
 
 
class QDesignerFormEditorInterface;
/trunk/Scribus/scribus/designer/sctablewidgetplugin.h
10,7 → 10,7
#include <QDesignerContainerExtension>
#include <QDesignerCustomWidgetInterface>
 
#include <qplugin.h>
#include <QPlugin>
 
 
class QDesignerFormEditorInterface;
/trunk/Scribus/scribus/colorlistbox.cpp
6,9 → 6,9
*/
#include "colorlistbox.h"
//#include "colorlistbox.moc"
#include <qpainter.h>
#include <qpixmap.h>
#include <qbitmap.h>
#include <QPainter>
#include <QPixmap>
#include <QBitmap>
#include <cstdlib>
#include <QToolTip>
#include <QEvent>
/trunk/Scribus/scribus/vgradient.h
26,11 → 26,12
#ifndef __VGRADIENT_H__
#define __VGRADIENT_H__
 
#include <QColor>
#include <QList>
#include <QMatrix>
 
#include "fpoint.h"
#include "scribusapi.h"
#include "fpoint.h"
#include <qcolor.h>
#include <qmatrix.h>
 
class SCRIBUS_API VColorStop
{
/trunk/Scribus/scribus/vgradient.cpp
22,10 → 22,12
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include "vgradient.h"
 
#include <QMutableListIterator>
#include <QtAlgorithms>
 
#include "vgradient.h"
 
// colorStop comparison function for stable_sort function
bool compareStops(const VColorStop* item1, const VColorStop* item2 )
{
/trunk/Scribus/scribus/cmsettings.h
29,7 → 29,7
 
#include "scconfig.h"
#include "scribusapi.h"
#include <qstring.h>
#include <QString>
class ScribusDoc;
 
#include "lcms.h"
/trunk/Scribus/scribus/desaxe/digester_parse.cpp
8,9 → 8,9
*/
 
 
#include <qxml.h>
#include <qfile.h>
#include <qstring.h>
#include <QFile>
#include <QString>
#include <QXmlDefaultHandler>
 
#include "digester.h"
 
/trunk/Scribus/scribus/desaxe/desaxe_test.cpp
8,10 → 8,9
*/
 
#include <iostream.h>
#include <qfile.h>
#include <qfileinfo.h>
#include <qdom.h>
//Added by qt3to4:
#include <QFile>
#include <QFileInfo>
#include <QDomDocument>
#include <QByteArray>
 
#include "digester.h"
/trunk/Scribus/scribus/gtmeasure.h
27,7 → 27,7
#ifndef GTMEASURE_H
#define GTMEASURE_H
 
#include <qstring.h>
#include <QString>
 
#include "scribusapi.h"
#include "units.h"
/trunk/Scribus/scribus/undoobject.h
27,8 → 27,8
#ifndef UNDOOBJECT_H
#define UNDOOBJECT_H
 
#include <qstring.h>
#include <qpixmap.h>
#include <QPixmap>
#include <QString>
 
#include "scribusapi.h"
#include "undostate.h"
/trunk/Scribus/scribus/scpaths.cpp
5,8 → 5,8
for which a new license (GPL+exception) is in place.
*/
#include "scpaths.h"
#include <qapplication.h>
#include <qdir.h>
#include <QApplication>
#include <QDir>
 
#include "scconfig.h"
 
/trunk/Scribus/scribus/smlinestyle.h
12,8 → 12,8
#include "styleitem.h"
#include "ui_smlinestylew.h"
 
#include <qobject.h>
#include <qcolor.h>
#include <QObject>
#include <QColor>
 
class ScribusDoc;
class LineCombo;
/trunk/Scribus/scribus/sclistboxpixmap.h
7,15 → 7,17
#ifndef SCLISTBOXPIXMAP_H
#define SCLISTBOXPIXMAP_H
 
#include "scribusapi.h"
#include <memory>
#include <qdebug.h>
#include <qapplication.h>
#include <q3listbox.h>
#include <qpainter.h>
#include <qpixmap.h>
 
#include <Q3ListBox>
#include <QApplication>
#include <QDebug>
#include <QPainter>
#include <QPixmap>
#include <QVariant>
 
#include "scguardedptr.h"
#include "scribusapi.h"
 
class QVariant;
 
/trunk/Scribus/scribus/fpointarray.h
24,12 → 24,13
#ifndef FPOINTARRAY_H
#define FPOINTARRAY_H
 
#include <qmatrix.h>
#include <qpoint.h>
#include <QMatrix>
#include <QPainterPath>
#include <QPoint>
#include <QVector>
#include <QPainterPath>
 
#include "fpoint.h"
#include "scribusapi.h"
#include "fpoint.h"
 
/**
*@author Franz Schmid
/trunk/Scribus/scribus/pdflib_core.cpp
26,14 → 26,14
#include "scconfig.h"
 
#include <string>
#include <qstring.h>
#include <qrect.h>
#include <qimage.h>
#include <qregexp.h>
#include <qdatetime.h>
#include <qfileinfo.h>
#include <QString>
#include <QRect>
#include <QImage>
#include <QRegExp>
#include <QDateTime>
#include <QFileInfo>
#include <QDataStream>
#include <qdir.h>
#include <QDir>
#include <QList>
#include <QByteArray>
#include <QPixmap>
/trunk/Scribus/scribus/hyphenator.cpp
26,9 → 26,9
 
#include "scconfig.h"
 
#include <qregexp.h>
#include <qcursor.h>
#include <qdir.h>
#include <QRegExp>
#include <QCursor>
#include <QDir>
//Added by qt3to4:
#include <QByteArray>
#include <cstdlib>
/trunk/Scribus/scribus/exif.cpp
15,7 → 15,7
 
 
#include "exif.h"
#include <qmatrix.h>
#include <QMatrix>
 
 
static unsigned char * LastExifRefd;
/trunk/Scribus/scribus/filesearch.cpp
6,8 → 6,8
*/
#include "filesearch.h"
//#include "filesearch.moc"
#include <qtimer.h>
#include <qregexp.h>
#include <QTimer>
#include <QRegExp>
 
 
enum FileSearchStatus
/trunk/Scribus/scribus/undostate.cpp
26,8 → 26,6
 
#include "undostate.h"
#include "undoobject.h"
//Added by qt3to4:
#include <QPixmap>
 
UndoState::UndoState(const QString& name, const QString& description, QPixmap* pixmap) :
actionName_(name),
/trunk/Scribus/scribus/util_ghostscript.cpp
24,13 → 24,13
 
#include "util_ghostscript.h"
 
#include <qdir.h>
#include <qfile.h>
#include <qfileinfo.h>
#include <qpainter.h>
#include <QDebug>
#include <QDir>
#include <QFile>
#include <QFileInfo>
#include <QPainter>
#include <QPixmap>
#include <QProcess>
#include <QPixmap>
#include <QDebug>
 
#include "scconfig.h"
 
37,13 → 37,12
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
 
#include "prefsfile.h"
#include "prefsmanager.h"
#include "scpaths.h"
#include "scribuscore.h"
 
#include "scribus.h"
 
#include "util.h"
 
using namespace std;
/trunk/Scribus/scribus/pslib.h
23,19 → 23,21
 
#ifndef PSLIB_H
#define PSLIB_H
#include <qstring.h>
#include <qpen.h>
#include <qfile.h>
#include <QList>
#include <Q3TextStream>
//Added by qt3to4:
 
#include <vector>
#include <utility>
 
#include <Q3TextStream>
#include <QFile>
#include <QList>
#include <QPen>
#include <QString>
 
class ScribusDoc;
//class ScribusView;
#include "scribusapi.h"
 
#include "page.h"
#include "pageitem.h"
#include "scribusapi.h"
#include "scribusstructs.h"
#include CMS_INC
 
/trunk/Scribus/scribus/seiten.h
7,6 → 7,9
#ifndef SEITENPAL_H
#define SEITENPAL_H
 
#include <Q3DragObject>
#include <Q3ListBox>
#include <Q3Table>
#include <QCheckBox>
#include <QDialog>
#include <QDragEnterEvent>
24,9 → 27,6
#include <QSplitter>
#include <QToolTip>
#include <QVBoxLayout>
#include <q3dragobject.h>
#include <q3listbox.h>
#include <q3table.h>
 
 
#include "scribusapi.h"
/trunk/Scribus/scribus/patterndialog.cpp
31,12 → 31,12
#include "util.h"
#include "stencilreader.h"
#include "scconfig.h"
#include <qpixmap.h>
#include <qimage.h>
#include <qdir.h>
#include <qfiledialog.h>
#include <qapplication.h>
#include <qeventloop.h>
#include <QPixmap>
#include <QImage>
#include <QDir>
#include <QFileDialog>
#include <QApplication>
#include <QEventLoop>
#include <QCursor>
#include <QImageReader>
#include <QPainter>
/trunk/Scribus/scribus/pluginmanager.h
7,9 → 7,9
#ifndef _PLUGIN_MANAGER_
#define _PLUGIN_MANAGER_
 
#include <qobject.h>
#include <qstring.h>
#include <qmap.h>
#include <QObject>
#include <QString>
#include <QMap>
 
#include "scribusapi.h"
 
/trunk/Scribus/scribus/fpoint.h
24,7 → 24,7
#ifndef FPOINT_H
#define FPOINT_H
 
#include <qpoint.h>
#include <QPoint>
#include "scribusapi.h"
/**
*@author Franz Schmid
/trunk/Scribus/scribus/aligndistribute.h
24,9 → 24,9
 
#include "ui_aligndistribute.h"
 
#include <qvariant.h>
#include <qpixmap.h>
#include <qdialog.h>
#include <QVariant>
#include <QPixmap>
#include <QDialog>
#include <QLabel>
#include <QList>
 
/trunk/Scribus/scribus/undomanager.h
29,7 → 29,7
 
#include <vector>
#include <utility>
#include <qobject.h>
#include <QObject>
//Added by qt3to4:
#include <QPixmap>
 
/trunk/Scribus/scribus/smwidgets.cpp
7,8 → 7,8
 
#include "smwidgets.h"
//#include "smwidgets.moc"
#include <qtooltip.h>
#include <qlineedit.h>
#include <QToolTip>
#include <QLineEdit>
#include "units.h"
 
/***********************************************************************/
/trunk/Scribus/scribus/scpattern.h
24,13 → 24,15
#ifndef SCPATTERN_H
#define SCPATTERN_H
 
class QString;
class ScribusDoc;
#include <QImage>
#include <QList>
#include <qimage.h>
#include <QString>
 
#include "pageitem.h"
#include "scribusapi.h"
#include "pageitem.h"
 
class ScribusDoc;
 
class SCRIBUS_API ScPattern
{
public:
/trunk/Scribus/scribus/undogui.cpp
24,15 → 24,15
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
 
#include <qlayout.h>
#include <qpixmap.h>
#include <qpushbutton.h>
#include <qrect.h>
#include <qstyle.h>
#include <qtooltip.h>
#include <qcheckbox.h>
#include <qfont.h>
#include <qfontmetrics.h>
#include <QLayout>
#include <QPixmap>
#include <QPushButton>
#include <QRect>
#include <QStyle>
#include <QToolTip>
#include <QCheckBox>
#include <QFont>
#include <QFontMetrics>
#include <QHBoxLayout>
#include <QVBoxLayout>
/trunk/Scribus/scribus/scpattern.cpp
21,7 → 21,7
* *
***************************************************************************/
 
#include <qstring.h>
#include <QString>
 
#include "scpattern.h"
#include "pageitem.h"
/trunk/Scribus/scribus/stencilreader.h
7,9 → 7,9
#ifndef STENCILREADER_H
#define STENCILREADER_H
 
#include <qdom.h>
//Added by qt3to4:
#include <QDomElement>
#include <QPixmap>
 
#include "scribusapi.h"
#include "scribusstructs.h"
 
/trunk/Scribus/scribus/langmgr.h
22,10 → 22,10
#ifndef LANGMANAGER_H
#define LANGMANAGER_H
 
#include <qmap.h>
#include <QMap>
#include <utility>
 
#include <qstring.h>
#include <QString>
#include "scribusapi.h"
 
typedef std::pair<QString, QString> langPair;
/trunk/Scribus/scribus/filewatcher.cpp
4,8 → 4,6
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 "filewatcher.h"
//#include "filewatcher.moc"
 
#include "scconfig.h"
 
15,12 → 13,13
 
#ifdef _WIN32
#include <windows.h>
//Added by qt3to4:
#include <QList>
#endif
 
#include <QStringList>
 
#include "filewatcher.h"
 
FileWatcher::FileWatcher( QObject* parent) : QObject(parent)
{
m_timeOut=10000;
/trunk/Scribus/scribus/resourcecollection.h
17,9 → 17,9
#ifndef RESOURCE_COLLECTION_H
#define RESOURCE_COLLECTION_H
 
#include <qstring.h>
#include <qmap.h>
#include <qlist.h>
#include <QList>
#include <QMap>
#include <QString>
 
/**
* A simple structure which holds the names of all resources & styles used in a doc or part of a document.
/trunk/Scribus/scribus/sccolor.h
24,15 → 24,16
#ifndef SCCOLOR_H
#define SCCOLOR_H
 
#include <qstring.h>
#include <qcolor.h>
#include <qmap.h>
#include <qpointer.h>
#include <QColor>
#include <QMap>
#include <QPointer>
#include <QString>
 
class ScribusDoc;
#include "scribusapi.h"
 
class ScribusDoc;
 
 
/**
*@author Franz Schmid
* \brief This Class adds support for CMYK-Colors to QT.
/trunk/Scribus/scribus/collect4output.cpp
20,10 → 20,10
#include "scraction.h"
#include "scpattern.h"
 
#include <qmessagebox.h>
#include <qstring.h>
#include <qmap.h>
#include <qdir.h>
#include <QMessageBox>
#include <QString>
#include <QMap>
#include <QDir>
 
CollectForOutput::CollectForOutput(ScribusDoc* doc, bool withFontsA, bool withProfilesA, bool compressDocA)
: QObject(ScCore, 0),
/trunk/Scribus/scribus/main_win32.cpp
36,7 → 36,7
#include <fcntl.h>
#include <io.h>
 
#include <qapplication.h>
#include <QApplication>
#include <exception>
using namespace std;
 
/trunk/Scribus/scribus/gtaction.h
27,18 → 27,20
#ifndef GTACTION_H
#define GTACTION_H
 
#include <qcolor.h>
#include <qtextcodec.h>
#include <qmap.h>
#include <qstring.h>
#include <QColor>
#include <QTextCodec>
#include <QMap>
#include <QString>
 
class PageItem;
class PrefsManager;
class ScFace;
#include "scribusapi.h"
 
#include "gtfont.h"
#include "gtframestyle.h"
#include "gtparagraphstyle.h"
#include "gtstyle.h"
#include "scribusapi.h"
 
class ScribusDoc;
class ScribusMainWindow;
/trunk/Scribus/scribus/vgradientex.cpp
22,9 → 22,11
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#include "vgradientex.h"
 
#include <QtAlgorithms>
 
#include "vgradientex.h"
 
// comparison function for use with stable_sort
bool compareStopsEx( const VColorStopEx* item1, const VColorStopEx* item2 )
{
/trunk/Scribus/scribus/bookmwin.h
24,20 → 24,19
#ifndef BOOKMWIN_H
#define BOOKMWIN_H
 
#include <qdialog.h>
#include <q3listview.h>
#include <qevent.h>
#include <qpoint.h>
#include <qlayout.h>
//Added by qt3to4:
#include <Q3ListView>
#include <QDialog>
#include <QDragMoveEvent>
#include <QDropEvent>
#include <QEvent>
#include <QLayout>
#include <QMouseEvent>
#include <QDragMoveEvent>
#include <QPoint>
 
#include "pageitem.h"
#include "scribusapi.h"
#include "scribusdoc.h"
#include "scribusview.h"
#include "scribusdoc.h"
#include "pageitem.h"
 
/**
*@author Franz Schmid
/trunk/Scribus/scribus/scribusXml.h
15,14 → 15,14
#ifndef _SCRIBUS_CONFIG_
#define _SCRIBUS_CONFIG_
 
#include "scribusapi.h"
#include <QDomDocument>
#include <QDomElement>
#include <QList>
#include <qdom.h>
#include <QProgressBar>
 
#include "pageitem.h"
// #include "multiline.h"
#include "scfonts.h"
#include "scribusapi.h"
#include "scribusstructs.h"
#include "selection.h"
#include "styles/styleset.h"
/trunk/Scribus/scribus/sampleitem.cpp
12,9 → 12,9
#include "undomanager.h"
#include "commonstrings.h"
#include "prefsmanager.h"
#include <qcolor.h>
#include <qstring.h>
#include <qcursor.h>
#include <QColor>
#include <QString>
#include <QCursor>
//Added by qt3to4:
#include <QPixmap>
#include "text/nlsconfig.h"
/trunk/Scribus/scribus/gtstyle.h
27,7 → 27,7
#ifndef GTSTYLE_H
#define GTSTYLE_H
 
#include <qstring.h>
#include <QString>
#include "scribusapi.h"
#include "gtfont.h"
 
/trunk/Scribus/scribus/gtdialogs.cpp
29,7 → 29,7
#include "prefscontext.h"
#include "prefsfile.h"
#include "sccombobox.h"
#include <qlabel.h>
#include <QLabel>
//Added by qt3to4:
#include <QHBoxLayout>
#include <QPixmap>
/trunk/Scribus/scribus/prefsmanager.h
20,13 → 20,13
#ifndef PREFSMANAGER_H
#define PREFSMANAGER_H
 
#include <qkeysequence.h>
#include <qobject.h>
#include <qstringlist.h>
#include <qmap.h>
#include <QKeySequence>
#include <QMap>
#include <QObject>
#include <QStringList>
 
#include "prefsstructs.h"
#include "scribusapi.h"
#include "prefsstructs.h"
 
class PrefsFile;
class ScribusMainWindow;
/trunk/Scribus/scribus/smstyleimport.h
7,8 → 7,8
#ifndef SMSTYLEIMPORT_H
#define SMSTYLEIMPORT_H
 
#include <qdialog.h>
#include <qmap.h>
#include <QDialog>
#include <QMap>
//Added by qt3to4:
#include <Q3VBoxLayout>
#include <Q3HBoxLayout>
/trunk/Scribus/scribus/sccolor.cpp
21,18 → 21,15
* *
***************************************************************************/
 
#include <qcolor.h>
#include <qstring.h>
#include <assert.h>
 
#include "commonstrings.h"
#include "sccolor.h"
#include "sccolorengine.h"
#include "scconfig.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include "commonstrings.h"
#include "scconfig.h"
 
 
ScColor::ScColor(void)
{
// Model = colorModelCMYK;
/trunk/Scribus/scribus/autoformbuttongroup.h
7,8 → 7,8
#ifndef AUTOFORMBUTTONGROUP_H
#define AUTOFORMBUTTONGROUP_H
 
#include <qwidget.h>
#include <qtoolbutton.h>
#include <QWidget>
#include <QToolButton>
#include <QFrame>
#include <QGridLayout>
#include <QPixmap>
/trunk/Scribus/scribus/tabprinter.cpp
4,15 → 4,14
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 <qcheckbox.h>
#include <qcombobox.h>
#include <qlabel.h>
#include <qtooltip.h>
#include <qlineedit.h>
#include <qradiobutton.h>
#include <QCheckBox>
#include <QComboBox>
#include <QLabel>
#include <QToolTip>
#include <QLineEdit>
#include <QRadioButton>
 
#include "tabprinter.h"
//#include "tabprinter.moc"
#include "scrspinbox.h"
#include "prefsmanager.h"
#include "units.h"
/trunk/Scribus/scribus/scimgdataloader_tiff.cpp
4,9 → 4,9
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 <qfile.h>
#include <qfileinfo.h>
#include <qobject.h>
#include <QFile>
#include <QFileInfo>
#include <QObject>
//Added by qt3to4:
#include <QList>
#include "scconfig.h"
/trunk/Scribus/scribus/guidemanagercore.cpp
5,8 → 5,8
for which a new license (GPL+exception) is in place.
*/
 
#include <qpen.h>
#include <qtabwidget.h>
#include <QPen>
#include <QTabWidget>
#include "guidemanagercore.h"
#include "scpainter.h"
#include "page.h"
/trunk/Scribus/scribus/tabgeneral.cpp
4,19 → 4,18
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 <qcombobox.h>
#include <qstringlist.h>
#include <qpushbutton.h>
#include <qgroupbox.h>
#include <qcheckbox.h>
#include <qspinbox.h>
#include <qlineedit.h>
#include <qstylefactory.h>
#include <qtooltip.h>
#include <qfiledialog.h>
#include <QComboBox>
#include <QStringList>
#include <QPushButton>
#include <QGroupBox>
#include <QCheckBox>
#include <QSpinBox>
#include <QLineEdit>
#include <QStyleFactory>
#include <QToolTip>
#include <QFileDialog>
 
#include "tabgeneral.h"
//#include "tabgeneral.moc"
 
#include "prefsmanager.h"
#include "scribusapp.h"
/trunk/Scribus/scribus/fileloader.h
6,10 → 6,10
*/
#ifndef SCRIBUS_FILELOADER_H
#define SCRIBUS_FILELOADER_H
#include <qobject.h>
#include <qstring.h>
#include <qstringlist.h>
#include <qmap.h>
#include <QObject>
#include <QString>
#include <QStringList>
#include <QMap>
#include <QList>
 
#include "scribusapi.h"
/trunk/Scribus/scribus/scimgdataloader_qt.cpp
4,8 → 4,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 <qfile.h>
#include <qfileinfo.h>
#include <QFile>
#include <QFileInfo>
#include <QByteArray>
#include <QImageReader>
#include <QList>
/trunk/Scribus/scribus/scimagestructs.cpp
4,6 → 4,7
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 "scimagestructs.h"
 
ExifValues::ExifValues(void)
/trunk/Scribus/scribus/scrpalettebase.cpp
24,19 → 24,17
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
 
#include <qapplication.h>
#include <qpoint.h>
//Added by qt3to4:
#include <QApplication>
#include <QCloseEvent>
#include <QDesktopWidget>
#include <QHideEvent>
#include <QCloseEvent>
#include <QPoint>
 
#include "prefscontext.h"
#include "prefsfile.h"
#include "prefsmanager.h"
#include "scribus.h"
#include "scrpalettebase.h"
#include "scribus.h"
#include "prefsmanager.h"
#include "prefsfile.h"
#include "prefscontext.h"
#include "util.h"
#include "util_icon.h"
 
/trunk/Scribus/scribus/sclayer.cpp
632,5 → 632,5
 
uint qHash(const ScLayer& layer)
{
return qHash(&layer);
}
return qHash(&layer);
}
/trunk/Scribus/scribus/main_nix.cpp
28,7 → 28,7
#include <iostream>
#include <signal.h>
 
#include <qapplication.h>
#include <QApplication>
 
#define BASE_QM "scribus"
 
/trunk/Scribus/scribus/smlinestyle.cpp
21,14 → 21,14
#include "util.h"
#include "util_color.h"
#include "util_icon.h"
#include <q3header.h>
#include <q3listbox.h>
#include <q3listview.h>
#include <qlayout.h>
#include <qlineedit.h>
#include <qpixmap.h>
#include <qpushbutton.h>
#include <qtabwidget.h>
#include <Q3Header>
#include <Q3ListBox>
#include <Q3ListView>
#include <QLayout>
#include <QLineEdit>
#include <QPixmap>
#include <QPushButton>
#include <QTabWidget>
 
 
/*** LineStyleWidget *******************************************************/
/trunk/Scribus/scribus/seiten.cpp
5,24 → 5,23
for which a new license (GPL+exception) is in place.
*/
 
 
//QPixmap doesnt seem to include this for its mask() code
#include <QBitmap>
#include <QCursor>
#include <QList>
#include <QLabel>
//QPixmap doesnt seem to include this for its mask() code
#include <QBitmap>
#include <QMenu>
 
#include "seiten.h"
 
#include "commonstrings.h"
#include "scribus.h"
#include "scribusview.h"
#include "page.h"
#include "pagelayout.h"
#include "sccombobox.h"
#include "scribus.h"
#include "scribusview.h"
#include "seiten.h"
#include "util_icon.h"
 
 
/* Code fuer DragObjekt */
SeDrag::SeDrag(QString secret, QWidget * parent, const char * name): Q3StoredDrag("page/magic", parent, name)
{
/trunk/Scribus/scribus/frameedit.h
7,7 → 7,7
#ifndef NODEPALETTE_H
#define NODEPALETTE_H
 
#include <qtooltip.h>
#include <QToolTip>
#include <QCheckBox>
#include <QLabel>
#include <QPushButton>
/trunk/Scribus/scribus/commonstrings.h
22,8 → 22,8
#ifndef COMMONSTRINGS_H
#define COMMONSTRINGS_H
 
#include <qobject.h>
#include <qstring.h>
#include <QObject>
#include <QString>
#include "scribusapi.h"
 
/*! \brief A simple common strings class to reduce the string count and ease
/trunk/Scribus/scribus/scimage.cpp
15,7 → 15,7
#include "scimgdataloader_pdf.h"
#include "scimgdataloader_qt.h"
#include "scimgdataloader_tiff.h"
#include <qmessagebox.h>
#include <QMessageBox>
#include <QTextStream>
#include <QList>
#include <QByteArray>
/trunk/Scribus/scribus/bookmwin.cpp
21,6 → 21,7
* *
***************************************************************************/
 
#include <Q3Header>
#include <QAction>
#include <QCursor>
#include <QDrag>
30,7 → 31,6
#include <QMimeData>
#include <QMouseEvent>
#include <QPixmap>
#include <q3header.h>
 
#include "bookmwin.h"
 
/trunk/Scribus/scribus/vgradientex.h
27,11 → 27,12
#define __VGRADIENTEX_H__
 
#include <QList>
#include <QMatrix>
 
#include "fpoint.h"
#include "sccolor.h"
#include "scribusapi.h"
#include "scribusdoc.h"
#include "fpoint.h"
#include "sccolor.h"
#include <qmatrix.h>
 
class SCRIBUS_API VColorStopEx
{
/trunk/Scribus/scribus/scimgdataloader_jpeg.cpp
4,9 → 4,9
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 <qfile.h>
#include <qfileinfo.h>
#include <qobject.h>
#include <QFile>
#include <QFileInfo>
#include <QObject>
#include <setjmp.h>
#include "scconfig.h"
#include "scimgdataloader_jpeg.h"
/trunk/Scribus/scribus/tabmiscellaneous.cpp
4,11 → 4,11
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 <qcheckbox.h>
#include <qspinbox.h>
#include <qcolordialog.h>
#include <qtooltip.h>
#include <qpushbutton.h>
#include <QCheckBox>
#include <QSpinBox>
#include <QColorDialog>
#include <QToolTip>
#include <QPushButton>
 
#include "tabmiscellaneous.h"
//#include "tabmiscellaneous.moc"
/trunk/Scribus/scribus/sampleitem.h
7,8 → 7,7
#ifndef SAMPLEITEM_H
#define SAMPLEITEM_H
 
#include <qobject.h>
//Added by qt3to4:
#include <QObject>
#include <QPixmap>
#include "scribusapi.h"
#include "scribusstructs.h"
/trunk/Scribus/scribus/gtfont.h
29,7 → 29,7
 
#include <vector>
 
#include <qstring.h>
#include <QString>
#include "scribusapi.h"
 
enum FontEffect {
/trunk/Scribus/scribus/guidemanagercore.h
8,7 → 8,7
#ifndef GUIDEMANAGERCORE_H
#define GUIDEMANAGERCORE_H
 
#include <qpair.h>
#include <QPair>
 
#include "scribusstructs.h"
#include "undoobject.h"
/trunk/Scribus/scribus/util_color.cpp
23,22 → 23,14
 
#include "util_color.h"
 
#include <qbitmap.h>
#include <qdatetime.h>
#include <qpainter.h>
#include <qcheckbox.h>
//Added by qt3to4:
#include <QBitmap>
#include <QDateTime>
#include <QPainter>
#include <QCheckBox>
#include <QPixmap>
// #include <algorithm>
// #include <cstdlib>
// #include <cmath>
 
#include "scconfig.h"
 
//#ifdef HAVE_UNISTD_H
//#include <unistd.h>
//#endif
 
#if defined(_WIN32)
#if defined(_MSC_VER)
#define __STDC__ 1 // hack to get md5_buffer correctly identified
49,20 → 41,10
 
#include "md5.h"
 
// #include <setjmp.h>
// #include "commonstrings.h"
// #include "pagestructs.h"
// #include "prefsfile.h"
// #include "prefscontext.h"
// #include "prefstable.h"
// #include "prefsmanager.h"
// #include "qprocess.h"
// #include "scmessagebox.h"
 
#include "scribusdoc.h"
#include "scpixmapcache.h"
#include "commonstrings.h"
// #include "scpaths.h"
// #include "text/nlsconfig.h"
#include "util_icon.h"
#include "util.h"
#include "sccolorengine.h"
/trunk/Scribus/scribus/plugins/scriptplugin/objimageexport.cpp
10,7 → 10,7
 
#include <QImageWriter>
#include <structmember.h>
#include <qfileinfo.h>
#include <QFileInfo>
#include <vector>
#include "scribuscore.h"
 
/trunk/Scribus/scribus/plugins/scriptplugin/cmdvar.h
19,7 → 19,7
#include <Python.h>
#endif
 
#include <qstring.h>
#include <QString>
 
#include "scribus.h"
 
/trunk/Scribus/scribus/plugins/scriptplugin/objpdffile.cpp
12,7 → 12,7
#include "scribuscore.h"
 
#include <structmember.h>
#include <qfileinfo.h>
#include <QFileInfo>
//Added by qt3to4:
#include <QList>
#include <QPixmap>
/trunk/Scribus/scribus/plugins/scriptplugin/scriptercore.cpp
6,13 → 6,12
*/
#include "scriptercore.h"
 
#include <qglobal.h>
#include <qwidget.h>
#include <qstring.h>
#include <qapplication.h>
#include <qmessagebox.h>
#include <qtextcodec.h>
#include <qdom.h>
#include <QGlobalStatic>
#include <QWidget>
#include <QString>
#include <QApplication>
#include <QMessageBox>
#include <QTextCodec>
#include <QByteArray>
#include <QPixmap>
#include <cstdlib>
34,8 → 33,6
#include "prefstable.h"
#include "prefsmanager.h"
 
//#include "scriptercore.moc"
 
ScripterCore::ScripterCore(QWidget* parent)
{
pcon = new PythonConsole(parent);
/trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
9,8 → 9,8
#include "prefsmanager.h"
 
#include <structmember.h>
#include <qfileinfo.h>
#include <qdir.h>
#include <QFileInfo>
#include <QDir>
#include <vector>
#include "pslib.h"
#include "util_ghostscript.h"
/trunk/Scribus/scribus/plugins/scriptplugin/scriptplugin.cpp
36,7 → 36,6
#include "cmdmisc.h"
#include "cmdgetsetprop.h"
#include "scriptplugin.h"
//#include "scriptplugin.moc"
#include "cmdutil.h"
#include "objprinter.h"
#include "objpdffile.h"
48,9 → 47,6
#include "customfdialog.h"
#include "helpbrowser.h"
#include "mpalette.h"
//#include "seiten.h"
//#include "layers.h"
//#include "tree.h"
#include "menumanager.h"
#include "scpaths.h"
#include "units.h"
60,14 → 56,13
 
#include "util_icon.h"
 
#include <qapplication.h>
#include <qmessagebox.h>
#include <qtextcodec.h>
#include <qdom.h>
#include <qregexp.h>
#include <qpixmap.h>
#include <qwidget.h>
#include <qstring.h>
#include <QApplication>
#include <QMessageBox>
#include <QTextCodec>
#include <QRegExp>
#include <QPixmap>
#include <QWidget>
#include <QString>
//Added by qt3to4:
#include <QByteArray>
#include <cstdlib>
/trunk/Scribus/scribus/plugins/scriptplugin/guiapp.cpp
7,8 → 7,8
#include "guiapp.h"
#include "cmdutil.h"
#include "scribuscore.h"
#include <qstring.h>
#include <qcursor.h>
#include <QString>
#include <QCursor>
 
PyObject *scribus_messagebartext(PyObject* /* self */, PyObject* args)
{
/trunk/Scribus/scribus/plugins/scriptplugin/svgimport.cpp
15,7 → 15,7
#include "scribuscore.h"
#include "selection.h"
 
#include <qstring.h>
#include <QString>
 
PyObject *scribus_placesvg(PyObject* /* self */, PyObject* args)
{
/trunk/Scribus/scribus/plugins/gettext/csvim/csvim.h
12,11 → 12,11
#include <gtwriter.h>
#include <gtparagraphstyle.h>
#include <QByteArray>
#include <qfile.h>
#include <qfileinfo.h>
#include <qstring.h>
#include <qstringlist.h>
#include <qtextcodec.h>
#include <QFile>
#include <QFileInfo>
#include <QString>
#include <QStringList>
#include <QTextCodec>
 
extern "C" PLUGIN_API void GetText(QString filename, QString encoding, bool textOnly, gtWriter *writer);
 
/trunk/Scribus/scribus/plugins/gettext/txtim/txtim.cpp
4,13 → 4,13
a copyright and/or license notice that predates the release of Scribus 1.3.2
for which a new license (GPL+exception) is in place.
*/
#include <qobject.h>
#include <QObject>
#include <QByteArray>
#include <qfile.h>
#include <qfileinfo.h>
#include <qstring.h>
#include <qstringlist.h>
#include <qtextcodec.h>
#include <QFile>
#include <QFileInfo>
#include <QString>
#include <QStringList>
#include <QTextCodec>
 
#include "txtim.h"
#include "scribusstructs.h"
/trunk/Scribus/scribus/plugins/gettext/sxwim/sxwdia.cpp
17,7 → 17,7
#include <QPushButton>
 
#include "scribusapi.h"
#include <qtooltip.h>
#include <QToolTip>
#include "util_icon.h"
 
SxwDialog::SxwDialog(bool update, bool prefix, bool pack) : QDialog(0)
/trunk/Scribus/scribus/plugins/gettext/sxwim/contentreader.h
38,8 → 38,8
#else
#include <libxml/SAX.h>
#endif
#include <qxml.h>
#include <qmap.h>
#include <QXmlAttributes>
#include <QMap>
#include <gtstyle.h>
#include <gtwriter.h>
#include "stylereader.h"
/trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.cpp
25,7 → 25,7
***************************************************************************/
 
#include "sxwim.h"
#include <qstringlist.h>
#include <QStringList>
 
#ifdef HAVE_XML
 
/trunk/Scribus/scribus/plugins/gettext/sxwim/stylereader.h
36,8 → 36,8
#else
#include <libxml/SAX.h>
#endif
#include <qmap.h>
#include <qxml.h>
#include <QMap>
#include <QXmlAttributes>
#include <gtstyle.h>
#include <gtwriter.h>
 
/trunk/Scribus/scribus/plugins/gettext/sxwim/sxwim.h
27,7 → 27,7
#ifndef SXWIM_H
#define SXWIM_H
 
#include <qstring.h>
#include <QString>
#include <gtwriter.h>
#include "scconfig.h"
#include "pluginapi.h"
/trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.cpp
24,7 → 24,7
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
 
#include <qobject.h>
#include <QObject>
//Added by qt3to4:
#include <QByteArray>
#include "htmlreader.h"
/trunk/Scribus/scribus/plugins/gettext/htmlim/htmlim.cpp
26,9 → 26,9
 
#include "htmlim.h"
//#include "htmlim.moc"
#include <qobject.h>
#include <qstring.h>
#include <qstringlist.h>
#include <QObject>
#include <QString>
#include <QStringList>
 
#ifdef HAVE_XML
 
/trunk/Scribus/scribus/plugins/gettext/htmlim/htmlreader.h
34,8 → 34,8
 
#include <libxml/HTMLparser.h>
 
#include <qstring.h>
#include <qxml.h>
#include <QString>
#include <QXmlAttributes>
 
#include <gtparagraphstyle.h>
#include <gtwriter.h>
/trunk/Scribus/scribus/plugins/gettext/textfilter/textfilter.cpp
6,13 → 6,13
*/
#include "textfilter.h"
#include <QByteArray>
#include <qfile.h>
#include <qfileinfo.h>
#include <qstring.h>
#include <qstringlist.h>
#include <qtextcodec.h>
#include <qregexp.h>
#include <qmap.h>
#include <QFile>
#include <QFileInfo>
#include <QString>
#include <QStringList>
#include <QTextCodec>
#include <QRegExp>
#include <QMap>
#include "prefsmanager.h"
#include "prefsfile.h"
#include <vector>
/trunk/Scribus/scribus/plugins/gettext/docim/docim.h
10,8 → 10,8
#include "scconfig.h"
 
#include "pluginapi.h"
#include <qobject.h>
#include <qstringlist.h>
#include <QObject>
#include <QStringList>
 
class gtWriter;
class QProcess;
/trunk/Scribus/scribus/plugins/gettext/docim/docim.cpp
9,13 → 9,13
#include "gtwriter.h"
#include "scpaths.h"
#include "scribusstructs.h"
#include <qobject.h>
#include <QObject>
#include <QByteArray>
#include <qmessagebox.h>
#include <QMessageBox>
#include <QProcess>
#include <qstring.h>
#include <qstringlist.h>
#include <qtextcodec.h>
#include <QString>
#include <QStringList>
#include <QTextCodec>
 
#if defined(_WIN32)
#include <windows.h>
/trunk/Scribus/scribus/plugins/gettext/pdbim/pdbim.cpp
4,12 → 4,12
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 <qfile.h>
#include <qfileinfo.h>
#include <qstring.h>
#include <qstringlist.h>
#include <qtextcodec.h>
#include <qcursor.h>
#include <QFile>
#include <QFileInfo>
#include <QString>
#include <QStringList>
#include <QTextCodec>
#include <QCursor>
 
#include "pdbim.h"
#include "gtwriter.h"
/trunk/Scribus/scribus/plugins/gettext/odtim/odtim.h
27,7 → 27,7
#ifndef SXWIM_H
#define SXWIM_H
 
#include <qstring.h>
#include <QString>
#include <gtwriter.h>
#include "scconfig.h"
#include "pluginapi.h"
/trunk/Scribus/scribus/plugins/gettext/odtim/contentreader.h
38,8 → 38,8
#else
#include <libxml/SAX.h>
#endif
#include <qxml.h>
#include <qmap.h>
#include <QXmlAttributes>
#include <QMap>
#include <gtstyle.h>
#include <gtwriter.h>
#include "stylereader.h"
/trunk/Scribus/scribus/plugins/gettext/odtim/stylereader.cpp
24,21 → 24,20
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "stylereader.h"
#include "stylereader.h"
#ifdef HAVE_XML
#ifdef HAVE_XML
#include <scribusstructs.h>
#include <gtmeasure.h>
#include <gtparagraphstyle.h>
#include <gtframestyle.h>
#include <gtfont.h>
//Added by qt3to4:
#include <scribusstructs.h>
#include <gtmeasure.h>
#include <gtparagraphstyle.h>
#include <gtframestyle.h>
#include <gtfont.h>
#include <QByteArray>
StyleReader* StyleReader::sreader = NULL;
StyleReader* StyleReader::sreader = NULL;
extern xmlSAXHandlerPtr sSAXHandler;
extern xmlSAXHandlerPtr sSAXHandler;
StyleReader::StyleReader(QString documentName, gtWriter *w,
bool textOnly, bool prefix, bool combineStyles)
/trunk/Scribus/scribus/plugins/gettext/odtim/stylereader.h
36,8 → 36,8
#else
#include <libxml/SAX.h>
#endif
#include <qmap.h>
#include <qxml.h>
#include <QMap>
#include <QXmlAttributes>
#include <gtstyle.h>
#include <gtwriter.h>
 
/trunk/Scribus/scribus/plugins/gettext/odtim/odtim.cpp
25,7 → 25,7
***************************************************************************/
 
#include "odtim.h"
#include <qstringlist.h>
#include <QStringList>
 
#ifdef HAVE_XML
 
/trunk/Scribus/scribus/plugins/gettext/odtim/contentreader.cpp
24,8 → 24,7
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
 
#include <qglobal.h>
//Added by qt3to4:
#include <QGlobalStatic>
#include <QByteArray>
#include "contentreader.h"
#include "scribusstructs.h"
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftemplate.cpp
7,10 → 7,10
/***************************************************************************
* Riku Leino, tsoots@gmail.com *
***************************************************************************/
#include <qstring.h>
#include <qcursor.h>
#include <qdir.h>
#include <qwidget.h>
#include <QString>
#include <QCursor>
#include <QDir>
#include <QWidget>
 
#include "scribus.h"
#include "scribuscore.h"
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/nfttemplate.cpp
8,7 → 8,7
* Riku Leino, tsoots@gmail.com *
***************************************************************************/
#include "nfttemplate.h"
#include <qfileinfo.h>
#include <QFileInfo>
 
nfttemplate::nfttemplate(QFile* tmplXmlFile, const QString &tmplCategory)
{
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftrcreader.h
12,11 → 12,11
 
#include <vector>
#include <utility>
#include <qobject.h>
#include <qdir.h>
#include <qxml.h>
#include <qstring.h>
#include <qstringlist.h>
#include <QObject>
#include <QDir>
#include <QXmlDefaultHandler>
#include <QString>
#include <QStringList>
#include "nfttemplate.h"
 
typedef std::pair<QString*,QString*> Pair;
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/nfttemplate.h
10,8 → 10,8
#ifndef NFTTEMPLATE_H
#define NFTTEMPLATE_H
 
#include <qstring.h>
#include <qfile.h>
#include <QString>
#include <QFile>
#include <QTextStream>
 
class nfttemplate {
/trunk/Scribus/scribus/plugins/newfromtemplateplugin/nftsettings.h
12,9 → 12,9
 
#include "scconfig.h"
#include <vector>
#include <qstring.h>
#include <qdir.h>
#include <qfile.h>
#include <QString>
#include <QDir>
#include <QFile>
#include "nfttemplate.h"
#include "nftrcreader.h"
/trunk/Scribus/scribus/plugins/imposition/imposition.h
22,11 → 22,11
#define IMPOSITION_UI_H
 
#include "ui_impositionbase.h"
#include <qtabwidget.h>
#include <qgroupbox.h>
#include <qframe.h>
#include <qlabel.h>
#include <qspinbox.h>
#include <QTabWidget>
#include <QGroupBox>
#include <QFrame>
#include <QLabel>
#include <QSpinBox>
 
#include "scribusstructs.h"
#include "scribuscore.h"
/trunk/Scribus/scribus/plugins/short-words/shortwords.cpp
15,13 → 15,13
or documentation
*/
 
#include <qcheckbox.h>
#include <qcursor.h>
#include <qdir.h>
#include <qfile.h>
#include <qmessagebox.h>
#include <QCheckBox>
#include <QCursor>
#include <QDir>
#include <QFile>
#include <QMessageBox>
#include <QProgressBar>
#include <qtextcodec.h>
#include <QTextCodec>
//Added by qt3to4:
#include <QPixmap>
 
/trunk/Scribus/scribus/plugins/short-words/parse.h
9,7 → 9,7
 
#include "shortwords.h"
 
#include <qobject.h>
#include <QObject>
 
class PageItem;
 
/trunk/Scribus/scribus/plugins/short-words/configuration.cpp
28,8 → 28,8
#include "prefsmanager.h"
#include "prefscontext.h"
#include "prefsfile.h"
#include <qdir.h>
#include <qstringlist.h>
#include <QDir>
#include <QStringList>
 
 
SWConfig::SWConfig()
/trunk/Scribus/scribus/plugins/short-words/configuration.h
7,7 → 7,7
#ifndef _SCRIBUS_SHORTCFG_H_
#define _SCRIBUS_SHORTCFG_H_
 
#include <qobject.h>
#include <QObject>
 
class QString;
class QStringList;
/trunk/Scribus/scribus/plugins/pixmapexport/export.cpp
7,10 → 7,10
#include "export.h"
#include "dialog.h"
//#include "export.moc"
#include <qpixmap.h>
#include <qstring.h>
#include <qdir.h>
#include <qcursor.h>
#include <QPixmap>
#include <QString>
#include <QDir>
#include <QCursor>
 
#include "scmessagebox.h"
#include "scribus.h"
/trunk/Scribus/scribus/plugins/pixmapexport/export.h
7,8 → 7,8
#ifndef _SCRIBUS_PIXMAPEXPORT_H_
#define _SCRIBUS_PIXMAPEXPORT_H_
 
#include <qstring.h>
#include <qfiledialog.h>
#include <QString>
#include <QFileDialog>
#include <pluginapi.h>
#include <loadsaveplugin.h>
#include <vector>
/trunk/Scribus/scribus/plugins/myplugin/mypluginimpl.cpp
7,8 → 7,8
#include "mypluginimpl.h"
#include "scribusdoc.h"
 
#include <qstring.h>
#include <qmessagebox.h>
#include <QString>
#include <QMessageBox>
 
// Initialize members here, if any
MyPluginImpl::MyPluginImpl() : QObject(0, "MyPluginImpl")
/trunk/Scribus/scribus/plugins/myplugin/mypluginimpl.h
7,7 → 7,7
#ifndef MYPLUGINIMPL_H
#define MYPLUGINIMPL_H
 
#include <qobject.h>
#include <QObject>
 
class QString;
class ScribusDoc;
/trunk/Scribus/scribus/plugins/svgimplugin/svgplugin.cpp
14,9 → 14,9
#include "scribusXml.h"
#include "mpalette.h"
#include "prefsfile.h"
#include <qfile.h>
#include <qregexp.h>
#include <qcursor.h>
#include <QFile>
#include <QRegExp>
#include <QCursor>
//Added by qt3to4:
#include <QDrag>
#include <QMimeData>
/trunk/Scribus/scribus/plugins/svgimplugin/svgplugin.h
7,8 → 7,8
#ifndef SVGPLUG_H
#define SVGPLUG_H
 
#include <qdom.h>
#include <qsize.h>
#include <QDomElement>
#include <QSize>
#include <QList>
#include <QStack>
#include "pluginapi.h"
/trunk/Scribus/scribus/plugins/fileloader/oldscribusformat/oldscribusformatimpl.cpp
8,8 → 8,8
//#include "oldscribusformatimpl.moc"
#include "scribus.h"
 
#include <qstring.h>
#include <qmessagebox.h>
#include <QString>
#include <QMessageBox>
 
// Initialize members here, if any
OldScribusFormatImpl::OldScribusFormatImpl() : QObject(0, "OldScribusFormatImpl")
/trunk/Scribus/scribus/plugins/fileloader/oldscribusformat/oldscribusformatimpl.h
7,7 → 7,7
#ifndef OLDSCRIBUSFORMATIMPL_H
#define OLDSCRIBUSFORMATIMPL_H
 
#include <qobject.h>
#include <QObject>
 
class QString;
 
/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
5,7 → 5,6
for which a new license (GPL+exception) is in place.
*/
#include "scribus12format.h"
//#include "scribus12format.moc"
#include "scribus12formatimpl.h"
 
#include "../../formatidlist.h"
20,10 → 19,9
#include "util.h"
#include "util_color.h"
#include "scgzfile.h"
#include <qcursor.h>
#include <qfileinfo.h>
#include <QCursor>
#include <QFileInfo>
#include <QList>
//Added by qt3to4:
#include <QByteArray>
#include <QTextStream>
#include <QApplication>
/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12formatimpl.cpp
8,8 → 8,8
//#include "scribus12formatimpl.moc"
#include "scribuscore.h"
 
#include <qstring.h>
#include <qmessagebox.h>
#include <QString>
#include <QMessageBox>
 
// Initialize members here, if any
Scribus12FormatImpl::Scribus12FormatImpl() : QObject(0, "Scribus12FormatImpl")
/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.h
13,9 → 13,9
#include "scribusstructs.h"
#include "styles/styleset.h"
 
#include <qdom.h>
#include <qmap.h>
#include <qstring.h>
#include <QDomElement>
#include <QMap>
#include <QString>
#include <QList>
 
class LastStyles;
/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12formatimpl.h
7,7 → 7,7
#ifndef SCRIBUS12FORMATIMPL_H
#define SCRIBUS12FORMATIMPL_H
 
#include <qobject.h>
#include <QObject>
 
class QString;
 
/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
22,8 → 22,8
#include "util_math.h"
#include "util_color.h"
#include "scgzfile.h"
#include <qcursor.h>
#include <qfileinfo.h>
#include <QCursor>
#include <QFileInfo>
//Added by qt3to4:
#include <QByteArray>
#include <QDataStream>
/trunk/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.h
13,7 → 13,7
#include "scribusstructs.h"
#include "styles/styleset.h"
 
#include <qdom.h>
#include <QDomElement>
#include <QMap>
#include <QString>
#include <QList>
/trunk/Scribus/scribus/plugins/fileloader/oodraw/oodrawimp.cpp
4,13 → 4,13
a copyright and/or license notice that predates the release of Scribus 1.3.2
for which a new license (GPL+exception) is in place.
*/
#include <qwidget.h>
#include <qfile.h>
#include <qregexp.h>
#include <qcursor.h>
#include <qdir.h>
#include <qstring.h>
#include <qdom.h>
#include <QWidget>
#include <QFile>
#include <QRegExp>
#include <QCursor>
#include <QDir>
#include <QString>
#include <QDomElement>
#include <QDrag>
#include <QMimeData>
#include <cmath>
/trunk/Scribus/scribus/plugins/fileloader/oodraw/oodrawimp.h
8,7 → 8,7
#define OODPLUG_H
 
#include <QObject>
#include <q3dict.h>
#include <Q3Dict>
#include <QList>
#include "pluginapi.h"
#include "loadsaveplugin.h"
/trunk/Scribus/scribus/plugins/fileloader/oodraw/stylestack.h
27,8 → 27,8
#ifndef STYLESTACK_H
#define STYLESTACK_H
 
#include <qdom.h>
#include <qstringlist.h>
#include <QDomElement>
#include <QStringList>
#include <QList>
#include <QStack>
 
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.h
13,7 → 13,7
#include "scribusstructs.h"
#include "styles/styleset.h"
 
#include <qdom.h>
#include <QDomElement>
#include <QMap>
#include <QString>
#include <QList>
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134formatimpl.h
7,7 → 7,7
#ifndef OLDSCRIBUSFORMATIMPL_H
#define OLDSCRIBUSFORMATIMPL_H
 
#include <qobject.h>
#include <QObject>
 
class QString;
 
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134formatimpl.cpp
8,8 → 8,8
//#include "scribus134formatimpl.moc"
#include "scribuscore.h"
 
#include <qstring.h>
#include <qmessagebox.h>
#include <QString>
#include <QMessageBox>
 
// Initialize members here, if any
Scribus134FormatImpl::Scribus134FormatImpl() : QObject(0, "Scribus134FormatImpl")
/trunk/Scribus/scribus/plugins/fontpreview/fontpreviewplugin.cpp
9,7 → 9,7
#include "fontpreview.h"
#include "scribuscore.h"
#include "scribusdoc.h"
#include <qcursor.h>
#include <QCursor>
 
int fontpreview_getPluginAPIVersion()
{
/trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.h
7,8 → 7,8
#ifndef SVGPLUG_H
#define SVGPLUG_H
 
#include <qobject.h>
#include <qdom.h>
#include <QObject>
#include <QDomElement>
#include "pluginapi.h"
#include "loadsaveplugin.h"
 
/trunk/Scribus/scribus/plugins/svgexplugin/svgexplugin.cpp
21,7 → 21,7
* *
***************************************************************************/
 
#include <qfile.h>
#include <QFile>
#include <QTextStream>
#include <QDataStream>
#include <QByteArray>
/trunk/Scribus/scribus/plugins/psimport/importps.cpp
17,9 → 17,9
#include "prefsmanager.h"
#include "prefstable.h"
#include "scribusXml.h"
#include <qfile.h>
#include <qcursor.h>
#include <qregexp.h>
#include <QFile>
#include <QCursor>
#include <QRegExp>
#include <QStack>
#include <QDrag>
#include <QMimeData>
/trunk/Scribus/scribus/patterndialog.h
27,12 → 27,12
#ifndef PATTERNDIALOG_H
#define PATTERNDIALOG_H
 
#include <qmap.h>
#include <qstring.h>
#include <qdialog.h>
#include <QMap>
#include <QString>
#include <QDialog>
#include <QListWidgetItem>
#include <qpushbutton.h>
#include <qlayout.h>
#include <QPushButton>
#include <QLayout>
#include "ui_patterndialog.h"
#include "scribusapi.h"
#include "scribusdoc.h"
/trunk/Scribus/scribus/autoformbuttongroup.cpp
4,10 → 4,10
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 <qimage.h>
#include <qlayout.h>
#include <qbitmap.h>
#include <qpixmap.h>
#include <QImage>
#include <QLayout>
#include <QBitmap>
#include <QPixmap>
 
#include "autoformbuttongroup.h"
#include "fpointarray.h"
/trunk/Scribus/scribus/scrpalettebase.h
26,11 → 26,10
#ifndef SCRPALETTE_BASE_H
#define SCRPALETTE_BASE_H
 
#include <qdialog.h>
#include <qkeysequence.h>
//Added by qt3to4:
#include <QCloseEvent>
#include <QDialog>
#include <QHideEvent>
#include <QCloseEvent>
#include <QKeySequence>
 
#include "scribusapi.h"
class PrefsContext;
/trunk/Scribus/scribus/scribusapp.cpp
25,13 → 25,13
#include <iostream>
#include <cstdlib>
 
#include <qstring.h>
#include <qfont.h>
#include <qtranslator.h>
#include <qfileinfo.h>
#include <qfile.h>
#include <qdir.h>
#include <qtextcodec.h>
#include <QString>
#include <QFont>
#include <QTranslator>
#include <QFileInfo>
#include <QFile>
#include <QDir>
#include <QTextCodec>
#include <QTextStream>
 
#include "scribusapp.h"
/trunk/Scribus/scribus/scpageoutput_ps2.h
7,7 → 7,7
#ifndef SCPAGEOUTPUTPS2_H
#define SCPAGEOUTPUTPS2_H
 
#include <qdatastream.h>
#include <QDataStream>
#include <QRect>
 
#include "scconfig.h"
/trunk/Scribus/scribus/upgradechecker.cpp
6,9 → 6,10
*/
 
#include <QDir>
#include <qdom.h>
#include <QDomDocument>
#include <QTextStream>
#include <QWidget>
 
#include <iostream>
#include <cstdlib>
 
/trunk/Scribus/scribus/scpainterexbase.h
28,9 → 28,9
#ifndef __SCPAINTEREXBASE_H__
#define __SCPAINTEREXBASE_H__
 
#include <qglobal.h>
#include <QColor>
#include <QFont>
#include <QGlobalStatic>
#include <QList>
#include <QMatrix>
#include <QPixmap>
/trunk/Scribus/scribus/langmgr.cpp
21,11 → 21,11
#include <iostream>
 
#include <qdir.h>
#include <qfileinfo.h>
#include <qmap.h>
#include <qobject.h>
#include <qstringlist.h>
#include <QDir>
#include <QFileInfo>
#include <QMap>
#include <QObject>
#include <QStringList>
 
#include "scconfig.h"
#include "langmgr.h"
/trunk/Scribus/scribus/prefspanel.h
7,7 → 7,7
#ifndef PREFSPANEL_H
#define PREFSPANEL_H
 
#include <qwidget.h>
#include <QWidget>
#include "scribusapi.h"
 
/**
/trunk/Scribus/scribus/scpreview.cpp
5,17 → 5,16
for which a new license (GPL+exception) is in place.
*/
#include "scpreview.h"
#include <qdom.h>
#include <qmap.h>
#include <qpainter.h>
#include <qrect.h>
#include <qimage.h>
#include <qregion.h>
#include <qregexp.h>
#include <qfileinfo.h>
#include <qbitmap.h>
#include <qdir.h>
//Added by qt3to4:
#include <QDomDocument>
#include <QMap>
#include <QPainter>
#include <QRect>
#include <QImage>
#include <QRegion>
#include <QRegExp>
#include <QFileInfo>
#include <QBitmap>
#include <QDir>
#include <QList>
#include <QPolygon>
#include <QTextStream>
/trunk/Scribus/scribus/pslib.cpp
23,16 → 23,16
 
#include "pslib.h"
 
#include <qfileinfo.h>
#include <qimage.h>
#include <qcolor.h>
#include <qfontinfo.h>
#include <QFileInfo>
#include <QImage>
#include <QColor>
#include <QFontInfo>
#include <QList>
#include <QByteArray>
#include <QList>
#include <cstdlib>
#include <qregexp.h>
#include <qbuffer.h>
#include <QRegExp>
#include <QBuffer>
#include <QStack>
 
#include "commonstrings.h"
/trunk/Scribus/scribus/prefscontext.h
28,8 → 28,8
#define PREFSCONTEXT_H
 
#include <string>
#include <qmap.h>
#include <qstring.h>
#include <QMap>
#include <QString>
 
#include "scribusapi.h"
#include "prefstable.h"
/trunk/Scribus/scribus/pluginmanager.cpp
5,11 → 5,10
for which a new license (GPL+exception) is in place.
*/
#include "pluginmanager.h"
//#include "pluginmanager.moc"
#include "scplugin.h"
#include "loadsaveplugin.h"
 
#include <qdir.h>
#include <QDir>
 
#include "scconfig.h"
 
31,7 → 30,7
#elif defined(DLL_USE_NATIVE_API) && defined(_WIN32)
#include <windows.h>
#else
#include <qlibrary.h>
#include <QLibrary>
#endif
 
 
/trunk/Scribus/scribus/tocgenerator.cpp
21,8 → 21,8
#include "tocgenerator.h"
//#include "tocgenerator.moc"
 
#include <qmap.h>
#include <qstring.h>
#include <QMap>
#include <QString>
 
#include "scribusdoc.h"
#include "pagestructs.h"
/trunk/Scribus/scribus/picsearch.cpp
5,8 → 5,8
for which a new license (GPL+exception) is in place.
*/
#include "picsearch.h"
#include <qpixmap.h>
#include <qpainter.h>
#include <QPixmap>
#include <QPainter>
 
#include "commonstrings.h"
#include "scimage.h"
/trunk/Scribus/scribus/scimagestructs.h
7,10 → 7,11
#ifndef SCIMAGESTRUCTS_H
#define SCIMAGESTRUCTS_H
 
#include <qstring.h>
#include <QImage>
#include <QList>
#include <qimage.h>
#include <qmap.h>
#include <QMap>
#include <QString>
 
#include "fpointarray.h"
#include "sccolor.h"
 
/trunk/Scribus/scribus/gradienteditor.h
24,10 → 24,10
#ifndef GRADEDITOR_H
#define GRADEDITOR_H
 
#include <qlabel.h>
#include <qspinbox.h>
#include <qlayout.h>
#include <qtooltip.h>
#include <QLabel>
#include <QSpinBox>
#include <QLayout>
#include <QToolTip>
//Added by qt3to4:
#include <QList>
#include <QPaintEvent>
/trunk/Scribus/scribus/prefsfile.cpp
24,10 → 24,10
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
 
#include <qfile.h>
#include <qfileinfo.h>
#include <qstring.h>
#include <qxml.h>
#include <QFile>
#include <QFileInfo>
#include <QString>
#include <QXmlInputSource>
#include "prefsfile.h"
#include "prefsreader.h"
#include "prefstable.h"
/trunk/Scribus/scribus/smtextstyles.cpp
29,7 → 29,7
#include "mpalette.h"
#include "smwidgets.h"
 
#include <qtabwidget.h>
#include <QTabWidget>
 
SMParagraphStyle::SMParagraphStyle(StyleSet<CharStyle> *cstyles) : StyleItem(),
pwidget_(0), doc_(0), selectionIsDirty_(false), unitRatio_(1.0), cstyles_(cstyles)