/trunk/Scribus/scribus/pdflib_core.cpp |
---|
66,7 → 66,6 |
#include "pageitem_group.h" |
#include "pageitem_table.h" |
#include "pdfoptions.h" |
#include "prefscontext.h" |
#include "prefsmanager.h" |
#include "sccolor.h" |
#include "sccolorengine.h" |
81,7 → 80,6 |
#include "scribuscore.h" |
#include "scribusdoc.h" |
#include "scstreamfilter_flate.h" |
#include "scstreamfilter_rc4.h" |
#include "tableutils.h" |
#include "util.h" |
#include "util_file.h" |
6828,7 → 6826,7 |
} |
PutDoc("/Decode [-40000 40000 -40000 40000 0 1]\n"); |
QByteArray dat; |
for (int vd = 0; vd < vertStreamT.count(); vd++) |
for (int vd = 0; vd < vertStreamT.size(); vd++) |
{ |
dat += vertStreamT[vd]; |
} |
6959,7 → 6957,7 |
} |
PutDoc("/Decode [-40000 40000 -40000 40000 " + entx + "]\n"); |
QByteArray dat; |
for (int vd = 0; vd < vertStream.count(); vd++) |
for (int vd = 0; vd < vertStream.size(); vd++) |
{ |
dat += vertStream[vd]; |
} |
7159,7 → 7157,7 |
} |
PutDoc("/Decode [-40000 40000 -40000 40000 0 1]\n"); |
QByteArray dat; |
for (int vd = 0; vd < vertStreamT.count(); vd++) |
for (int vd = 0; vd < vertStreamT.size(); vd++) |
{ |
dat += vertStreamT[vd]; |
} |
7287,7 → 7285,7 |
} |
PutDoc("/Decode [-40000 40000 -40000 40000 " + entx + "]\n"); |
QByteArray dat; |
for (int vd = 0; vd < vertStream.count(); vd++) |
for (int vd = 0; vd < vertStream.size(); vd++) |
{ |
dat += vertStream[vd]; |
} |
7519,7 → 7517,7 |
} |
PutDoc("/Decode [-40000 40000 -40000 40000 0 1]\n"); |
QByteArray dat; |
for (int vd = 0; vd < vertStreamT.count(); vd++) |
for (int vd = 0; vd < vertStreamT.size(); vd++) |
{ |
dat += vertStreamT[vd]; |
} |
7720,7 → 7718,7 |
} |
PutDoc("/Decode [-40000 40000 -40000 40000 " + entx + "]\n"); |
QByteArray dat; |
for (int vd = 0; vd < vertStream.count(); vd++) |
for (int vd = 0; vd < vertStream.size(); vd++) |
{ |
dat += vertStream[vd]; |
} |
7882,7 → 7880,7 |
vst << encode16dVal(c->GrCol4transp) << encode16dVal(c->GrCol1transp) << encode16dVal(c->GrCol2transp) << encode16dVal(c->GrCol3transp); |
PutDoc("/Decode [-40000 40000 -40000 40000 0 1]\n"); |
QByteArray dat; |
for (int vd = 0; vd < vertStreamT.count(); vd++) |
for (int vd = 0; vd < vertStreamT.size(); vd++) |
{ |
dat += vertStreamT[vd]; |
} |
8040,7 → 8038,7 |
} |
PutDoc("/Decode [-40000 40000 -40000 40000 " + entx + "]\n"); |
QByteArray dat; |
for (int vd = 0; vd < vertStream.count(); vd++) |
for (int vd = 0; vd < vertStream.size(); vd++) |
{ |
dat += vertStream[vd]; |
} |
/trunk/Scribus/scribus/plugins/import/ai/importai.cpp |
---|
26,10 → 26,7 |
#include "commonstrings.h" |
#include "loadsaveplugin.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "qtiocompressor.h" |
#include "rawimage.h" |
#include "scclocale.h" |
45,15 → 42,11 |
#include "sctextstream.h" |
#include "selection.h" |
#include "text/specialchars.h" |
#include "ui/customfdialog.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "ui/propertiespalette.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_color.h" |
#include "util_file.h" |
#include "util_formats.h" |
#include "util_ghostscript.h" |
#include "util_math.h" |
1165,7 → 1158,7 |
bool paran = false; |
bool skip = false; |
int digitCount = 0; |
for (int i = 0; i < data.count(); i++) |
for (int i = 0; i < data.size(); i++) |
{ |
tmp = data[i]; |
if (skip) |
1228,7 → 1221,7 |
bool paran = false; |
//bool arra = false; |
bool skip = false; |
for (int a = 0; a < data.count(); a++) |
for (int a = 0; a < data.size(); a++) |
{ |
tmp = data[a]; |
if (skip) |
/trunk/Scribus/scribus/plugins/import/cdr/importcdr.cpp |
---|
21,34 → 21,18 |
#include <libcdr/libcdr.h> |
#include "commonstrings.h" |
#include "ui/customfdialog.h" |
#include "fileloader.h" |
#include "loadsaveplugin.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "ui/propertiespalette.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scpattern.h" |
#include "scribus.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusview.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
CdrPlug::CdrPlug(ScribusDoc* doc, int flags) |
: interactive(flags & LoadSavePlugin::lfInteractive), |
/trunk/Scribus/scribus/plugins/import/cgm/importcgm.cpp |
---|
28,6 → 28,7 |
#include "importcgm.h" |
#include "loadsaveplugin.h" |
#include "prefsmanager.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
63,7 → 64,7 |
{ |
actBit = 7; |
actByte++; |
if (actByte >= buffer.count()) |
if (actByte >= buffer.size()) |
break; |
dat = buffer[actByte]; |
} |
73,7 → 74,7 |
void ScBitReader::alignToWord() |
{ |
if (actByte < buffer.count() - 1) |
if (actByte < buffer.size() - 1) |
{ |
actByte++; |
actByte += actByte % 2; |
/trunk/Scribus/scribus/plugins/import/cvg/importcvg.cpp |
---|
21,6 → 21,7 |
#include "commonstrings.h" |
#include "loadsaveplugin.h" |
#include "prefsmanager.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
/trunk/Scribus/scribus/plugins/import/drw/importdrw.cpp |
---|
24,12 → 24,12 |
#include <cstdlib> |
#include "importdrw.h" |
#include "commonstrings.h" |
#include "loadsaveplugin.h" |
#include "pageitem_imageframe.h" |
#include "prefsmanager.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpattern.h" |
#include "scribusXml.h" |
/trunk/Scribus/scribus/plugins/import/emf/importemf.cpp |
---|
25,25 → 25,12 |
#include <cstdlib> |
#include "ui/customfdialog.h" |
#include "importemf.h" |
#include "loadsaveplugin.h" |
#include "fileloader.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "pageitem_imageframe.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "ui/propertiespalette.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scpattern.h" |
#include "scribus.h" |
#include "scribusdoc.h" |
50,12 → 37,10 |
#include "scribusview.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_file.h" |
#include "util_formats.h" |
#include "util_math.h" |
#define U_EMR_HEADER 1 |
/trunk/Scribus/scribus/plugins/import/fh/importfh.cpp |
---|
24,6 → 24,7 |
#include "loadsaveplugin.h" |
#include "ui/multiprogressdialog.h" |
#include "prefsmanager.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpattern.h" |
#include "scribus.h" |
/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp |
---|
36,17 → 36,10 |
#include "guidemanagercore.h" |
#include "loadsaveplugin.h" |
#include "pageitem_table.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusdoc.h" |
53,13 → 46,10 |
#include "scribusview.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "ui/customfdialog.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "ui/propertiespalette.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
IdmlPlug::IdmlPlug(ScribusDoc* doc, int flags) |
/trunk/Scribus/scribus/plugins/import/odg/importodg.cpp |
---|
31,23 → 31,14 |
#include "importodg.h" |
#include "fileloader.h" |
#include "third_party/fparser/fparser.hh" |
#include "loadsaveplugin.h" |
#include "pageitem_table.h" |
#include "pagesize.h" |
#include "plugins/formatidlist.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpainter.h" |
#include "scpaths.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusdoc.h" |
55,10 → 46,8 |
#include "sctextstream.h" |
#include "selection.h" |
#include "third_party/zip/scribus_zip.h" |
#include "ui/customfdialog.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "ui/propertiespalette.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_file.h" |
/trunk/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp |
---|
5,6 → 5,7 |
for which a new license (GPL+exception) is in place. |
*/ |
#include <QApplication> |
#include <QCursor> |
#include <QDir> |
#include <QDrag> |
22,11 → 23,9 |
#include "commonstrings.h" |
#include "fpointarray.h" |
#include "pageitem.h" |
#include "pluginmanager.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scmimedata.h" |
36,15 → 35,11 |
#include "scribusdoc.h" |
#include "scribusview.h" |
#include "selection.h" |
#include "serializer.h" |
#include "stylestack.h" |
#include "third_party/zip/scribus_zip.h" |
#include "ui/customfdialog.h" |
#include "ui/propertiespalette.h" |
#include "ui/scmessagebox.h" |
#include "ui/scmwmenumanager.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_math.h" |
/trunk/Scribus/scribus/plugins/import/pct/importpct.cpp |
---|
22,31 → 22,18 |
#include "commonstrings.h" |
#include "loadsaveplugin.h" |
#include "pageitem_imageframe.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scpattern.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusdoc.h" |
#include "scribusview.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "ui/customfdialog.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "ui/propertiespalette.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
PctPlug::PctPlug(ScribusDoc* doc, int flags) |
/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp |
---|
35,34 → 35,19 |
#include "commonstrings.h" |
#include "loadsaveplugin.h" |
#include "pagesize.h" |
#include "pdfimportoptions.h" |
#include "pdfoptions.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scribus.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
#include "util_os.h" |
#include "ui/customfdialog.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "ui/propertiespalette.h" |
PdfPlug::PdfPlug(ScribusDoc* doc, int flags) |
{ |
/trunk/Scribus/scribus/plugins/import/pm/importpm.cpp |
---|
21,34 → 21,18 |
#include <libpagemaker/libpagemaker.h> |
#include "commonstrings.h" |
#include "ui/customfdialog.h" |
#include "fileloader.h" |
#include "loadsaveplugin.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "ui/propertiespalette.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scpattern.h" |
#include "scribus.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusview.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
PmPlug::PmPlug(ScribusDoc* doc, int flags) |
{ |
/trunk/Scribus/scribus/plugins/import/ps/importps.cpp |
---|
34,9 → 34,7 |
#include "scribusview.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "ui/customfdialog.h" |
#include "ui/multiprogressdialog.h" |
#include "ui/propertiespalette.h" |
#include "ui/scmessagebox.h" |
#include "undomanager.h" |
#include "util.h" |
/trunk/Scribus/scribus/plugins/import/pub/importpub.cpp |
---|
23,19 → 23,10 |
#include <libmspub/libmspub.h> |
#include "commonstrings.h" |
#include "fileloader.h" |
#include "loadsaveplugin.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scpattern.h" |
#include "scribus.h" |
#include "scribusXml.h" |
42,16 → 33,9 |
#include "scribuscore.h" |
#include "scribusdoc.h" |
#include "scribusview.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "ui/customfdialog.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "ui/propertiespalette.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
PubPlug::PubPlug(ScribusDoc* doc, int flags) |
{ |
/trunk/Scribus/scribus/plugins/import/revenge/rawpainter.cpp |
---|
20,29 → 20,17 |
#include "commonstrings.h" |
#include "fileloader.h" |
#include "loadsaveplugin.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scpattern.h" |
#include "scribus.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusdoc.h" |
#include "scribusview.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "ui/missing.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
#include "rawpainter.h" |
1759,7 → 1747,7 |
if (m_currTextItem) |
{ |
int posC = m_currTextItem->itemText.length(); |
if (actText.count() > 0) |
if (actText.size() > 0) |
{ |
actText.replace(QChar(10), SpecialChars::LINEBREAK); |
actText.replace(QChar(12), SpecialChars::FRAMEBREAK); |
/trunk/Scribus/scribus/plugins/import/vsd/importvsd.cpp |
---|
23,16 → 23,9 |
#include <libvisio/libvisio.h> |
#include "commonstrings.h" |
#include "fileloader.h" |
#include "loadsaveplugin.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
/trunk/Scribus/scribus/plugins/import/wmf/wmfimport.cpp |
---|
10,11 → 10,12 |
#include "scconfig.h" |
#include "wmfimport.h" |
#include <QBuffer> |
#include <QCursor> |
#include <QDataStream> |
#include <QDrag> |
#include <QBuffer> |
#include <QDataStream> |
#include <QFile> |
#include <QGuiApplication> |
#include <QMimeData> |
#include <QPainterPath> |
22,20 → 23,13 |
#include "fpointarray.h" |
#include "loadsaveplugin.h" |
#include "pageitem.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "scmimedata.h" |
#include "scraction.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusdoc.h" |
#include "scribusview.h" |
#include "selection.h" |
#include "ui/customfdialog.h" |
#include "ui/propertiespalette.h" |
#include "ui/scmwmenumanager.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_math.h" |
#include "wmfstruct.h" |
/trunk/Scribus/scribus/plugins/import/wpg/importwpg.cpp |
---|
21,32 → 21,19 |
#include "commonstrings.h" |
#include "loadsaveplugin.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scpattern.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusdoc.h" |
#include "scribusview.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "third_party/wpg/WPGStreamImplementation.h" |
#include "ui/customfdialog.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "ui/propertiespalette.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
ScrPainter::ScrPainter() |
/trunk/Scribus/scribus/plugins/import/xar/importxar.cpp |
---|
28,33 → 28,20 |
#include "loadsaveplugin.h" |
#include "pageitem_imageframe.h" |
#include "pageitem_polygon.h" |
#include "pageitem_polyline.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scpattern.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusdoc.h" |
#include "scribusview.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "ui/customfdialog.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "ui/propertiespalette.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
XarPlug::XarPlug(ScribusDoc* doc, int flags) |
/trunk/Scribus/scribus/plugins/import/xfig/importxfig.cpp |
---|
24,17 → 24,9 |
#include "loadsaveplugin.h" |
#include "pageitem.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scpattern.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusdoc.h" |
41,13 → 33,9 |
#include "scribusview.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "ui/customfdialog.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "ui/propertiespalette.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
XfigPlug::XfigPlug(ScribusDoc* doc, int flags) |
1203,7 → 1191,7 |
QString tmp; |
bool sep = false; |
int sepcount = 0; |
for (int a = 1; a < text.count(); ++a) |
for (int a = 1; a < text.size(); ++a) |
{ |
QString ch = text.mid(a,1); |
if (sep) |
/trunk/Scribus/scribus/plugins/import/xps/importxps.cpp |
---|
35,18 → 35,10 |
#include "importxps.h" |
#include "loadsaveplugin.h" |
#include "pageitem_table.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusdoc.h" |
54,13 → 46,9 |
#include "sctextstream.h" |
#include "selection.h" |
#include "third_party/zip/scribus_zip.h" |
#include "ui/customfdialog.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "ui/propertiespalette.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
#include "xpsimportoptions.h" |
/trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp |
---|
21,34 → 21,18 |
#include <libzmf/libzmf.h> |
#include "commonstrings.h" |
#include "ui/customfdialog.h" |
#include "fileloader.h" |
#include "loadsaveplugin.h" |
#include "ui/missing.h" |
#include "ui/multiprogressdialog.h" |
#include "pagesize.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "prefstable.h" |
#include "ui/propertiespalette.h" |
#include "rawimage.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "scconfig.h" |
#include "scmimedata.h" |
#include "scpaths.h" |
#include "scpattern.h" |
#include "scribus.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
#include "scribusview.h" |
#include "sctextstream.h" |
#include "selection.h" |
#include "undomanager.h" |
#include "util.h" |
#include "util_formats.h" |
#include "util_math.h" |
extern SCRIBUS_API ScribusQApp * ScQApp; |
/trunk/Scribus/scribus/scpainter.cpp |
---|
1659,7 → 1659,7 |
CharStyle style(m_font, m_fontSize * 10); |
StoryText story; |
story.insertChars(textList[a]); |
story.setCharStyle(0, textList[a].count(), style); |
story.setCharStyle(0, textList[a].size(), style); |
TextShaper textShaper(story, 0); |
const QList<GlyphCluster> glyphRuns = textShaper.shape(0, story.length()).glyphs(); |
/trunk/Scribus/scribus/scribusdoc.cpp |
---|
47,7 → 47,6 |
//#include <qtconcurrentmap.h> |
#include "actionmanager.h" |
#include "text/boxes.h" |
#include "canvas.h" |
#include "colorblind.h" |
#include "colormgmt/sccolormgmtenginefactory.h" |
57,7 → 56,6 |
#include "filewatcher.h" |
#include "fpoint.h" |
#include "hyphenator.h" |
#include "langmgr.h" |
#include "notesstyles.h" |
#include "numeration.h" |
#include "pageitem.h" |
85,11 → 83,8 |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "resourcecollection.h" |
#include "scclocale.h" |
#include "sccolorengine.h" |
#include "sclimits.h" |
#include "scpage.h" |
#include "scpainter.h" |
#include "scraction.h" |
#include "scribusXml.h" |
#include "scribuscore.h" |
/trunk/Scribus/scribus/scribusview.cpp |
---|
62,7 → 62,6 |
#include <QDir> |
#include <QSizeGrip> |
#include "actionmanager.h" |
#include "appmodehelper.h" |
#include "appmodes.h" |
#include "canvas.h" |
72,7 → 71,6 |
#include "canvasmode_objimport.h" |
#include "commonstrings.h" |
#include "fileloader.h" |
#include "filewatcher.h" |
#include "hyphenator.h" |
#include "iconmanager.h" |
#include "loadsaveplugin.h" |
79,9 → 77,6 |
#include "text/textlayoutpainter.h" |
#include "pageitem.h" |
#include "pageitem_group.h" |
#include "pageitem_imageframe.h" |
#include "pageitem_latexframe.h" |
#include "pageitem_line.h" |
#include "pageitem_pathtext.h" |
#include "pageitem_polygon.h" |
#include "pageitem_polyline.h" |
88,14 → 83,10 |
#include "pageitem_table.h" |
#include "pageitem_textframe.h" |
#include "plugins/formatidlist.h" |
#include "prefscontext.h" |
#include "prefsfile.h" |
#include "prefsmanager.h" |
#include "scclocale.h" |
#include "scmimedata.h" |
#include "scpage.h" |
#include "scpainter.h" |
#include "scpaths.h" |
#include "scribusapp.h" |
#include "scribuscore.h" |
#include "scribuswin.h" |
102,25 → 93,16 |
#include "scribusXml.h" |
#include "selection.h" |
#include "selectionrubberband.h" |
#include "serializer.h" |
#include "ui/extimageprops.h" |
#include "ui/guidemanager.h" |
#include "ui/hruler.h" |
#include "ui/insertTable.h" |
#include "ui/pageitemattributes.h" |
#include "ui/pageselector.h" |
#include "ui/propertiespalette.h" |
#include "ui/propertiespalette_line.h" |
#include "ui/rulermover.h" |
#include "ui/scrapbookpalette.h" |
#include "ui/storyeditor.h" |
#include "ui/symbolpalette.h" |
#include "ui/viewtoolbar.h" |
#include "ui/vruler.h" |
#include "undomanager.h" |
#include "units.h" |
#include "util.h" |
#include "util_color.h" |
#include "util_formats.h" |
#include "util_math.h" |