Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 10017 → Rev 10018

/trunk/Scribus/scribus/util.cpp
511,9 → 511,9
bb[ax] = in->at(ax).cell();
assert(in->at(ax).row() == 0);
}
uLong exlen = uint(bb.size() * 0.001 + 16) + bb.size();
uLong exlen = (uLong)(bb.size() * 0.001 + 16) + bb.size();
QByteArray bc(exlen);
if( bc.size() == exlen )
if( bc.size() == static_cast<qint32>(exlen) )
{
int errcode = compress2((Byte *)bc.data(), &exlen, (Byte *)bb.data(), uLong(bb.size()), 9);
if (errcode != Z_OK)
/trunk/Scribus/scribus/scribuscore.h
115,7 → 115,7
void initCMS();
QList<ScribusMainWindow*> ScMWList;
uint m_currScMW;
int m_currScMW;
SplashScreen *m_SplashScreen;
UndoManager *undoManager;
/trunk/Scribus/scribus/scribuscore.cpp
500,7 → 500,7
 
ScribusMainWindow * ScribusCore::primaryMainWindow( )
{
if (ScMWList.count()==0 || m_currScMW>ScMWList.count())
if (ScMWList.count() == 0 || m_currScMW > ScMWList.count())
return 0;
ScribusMainWindow* mw=ScMWList.at(m_currScMW);
if (!mw)
/trunk/Scribus/scribus/page.cpp
28,7 → 28,7
#include "undostate.h"
#include "frameedit.h"
#include "guidemanager.h"
//Added by qt3to4:
 
#include <QPixmap>
 
extern QPixmap loadIcon(QString nam);
/trunk/Scribus/scribus/page.h
26,7 → 26,6
 
#include <utility>
 
#include "q3ptrlist.h"
#include <QList>
 
#include "scribusapi.h"
/trunk/Scribus/scribus/tabpdfoptions.cpp
1117,10 → 1117,10
EffVal.clear();
if (EffVal.count() != 0)
{
for (uint pg2 = 0; pg2 < doc->Pages->count(); ++pg2)
for (int pg2 = 0; pg2 < doc->Pages->count(); ++pg2)
{
Pages->addItem( tr("Page")+" "+tmp.setNum(pg2+1));
if (static_cast<uint>(EffVal.count()-1) < pg2)
if (EffVal.count()-1 < pg2)
{
ef.pageEffectDuration = 1;
ef.pageViewDuration = 1;
1134,7 → 1134,7
}
else
{
for (uint pg = 0; pg < doc->Pages->count(); ++pg)
for (int pg = 0; pg < doc->Pages->count(); ++pg)
{
Pages->addItem( tr("Page")+" "+tmp.setNum(pg+1));
ef.pageEffectDuration = 1;
1609,7 → 1609,7
 
void TabPDFOptions::EffectOnAll()
{
for (uint pg = 0; pg < doc->Pages->count(); ++pg)
for (int pg = 0; pg < doc->Pages->count(); ++pg)
{
EffVal[pg].pageViewDuration = PageTime->value();
EffVal[pg].pageEffectDuration = EffectTime->value();
1740,7 → 1740,7
Pages->clear();
if (PagePrev->isChecked())
{
for (uint pg = 0; pg < doc->Pages->count(); ++pg)
for (int pg = 0; pg < doc->Pages->count(); ++pg)
{
pm.convertFromImage(doc->view()->PageToPixmap(pg, 70));
pgMaxX = qMax(pgMaxX, pm.width());
1751,7 → 1751,7
}
else
{
for (uint pg = 0; pg < doc->Pages->count(); ++pg)
for (int pg = 0; pg < doc->Pages->count(); ++pg)
{
new QListWidgetItem( tr("Page")+" "+tmp.setNum(pg+1), Pages);
}
/trunk/Scribus/scribus/reformdoc.cpp
241,7 → 241,7
currDoc->bleeds.Top = tabPage->marginGroup->topBleed();
currDoc->bleeds.Left = tabPage->marginGroup->leftBleed();
currDoc->bleeds.Right = tabPage->marginGroup->rightBleed();
for (uint p = 0; p < currDoc->Pages->count(); ++p)
for (int p = 0; p < currDoc->Pages->count(); ++p)
{
Page *pp = currDoc->Pages->at(p);
if (tabPage->sizeAllPages->isChecked())
261,7 → 261,7
pp->initialMargins.Bottom = br2;
}
}
for (uint p = 0; p < currDoc->MasterPages.count(); ++p)
for (int p = 0; p < currDoc->MasterPages.count(); ++p)
{
Page *pp = currDoc->MasterPages.at(p);
if (tabPage->sizeAllMasterPages->isChecked())
/trunk/Scribus/scribus/pdflib.cpp
166,7 → 166,7
progressDialog->setProgress("EMP", 0);
progressDialog->setProgress("EP", 0);
}
for (uint ap = 0; ap < doc.MasterPages.count() && !abortExport; ++ap)
for (int ap = 0; ap < doc.MasterPages.count() && !abortExport; ++ap)
{
if (doc.MasterItems.count() != 0)
{
/trunk/Scribus/scribus/annota.cpp
125,7 → 125,7
Pg = new Navigator( GroupBox1, 100, item->annotation().Ziel()+1, view, item->annotation().Extern());
else
{
if (static_cast<uint>(item->annotation().Ziel()) < view->Doc->Pages->count())
if (item->annotation().Ziel() < view->Doc->Pages->count())
Pg = new Navigator( GroupBox1, 100, item->annotation().Ziel(), view);
else
{
/trunk/Scribus/scribus/plugins/scriptplugin/cmdutil.cpp
92,7 → 92,7
if (col == ite->lineColor())
ite->setLineColor(rep);
QList<VColorStop*> cstops = ite->fill_gradient.colorStops();
for (int cst = 0; cst < ite->fill_gradient.Stops(); ++cst)
for (uint cst = 0; cst < ite->fill_gradient.Stops(); ++cst)
{
if (col == cstops.at(cst)->name)
{
121,7 → 121,7
if (col == ite->lineColor())
ite->setLineColor(rep);
QList<VColorStop*> cstops = ite->fill_gradient.colorStops();
for (int cst = 0; cst < ite->fill_gradient.Stops(); ++cst)
for (uint cst = 0; cst < ite->fill_gradient.Stops(); ++cst)
{
if (col == cstops.at(cst)->name)
{
/trunk/Scribus/scribus/plugins/gettext/textfilter/tffilter.cpp
114,12 → 114,12
QBoxLayout* layout2 = new QVBoxLayout(actionFrame);
layout2->setMargin(0);
layout2->setSpacing(0);
alayout = new Q3HBoxLayout();
alayout = new QHBoxLayout();
alayout->setMargin(0);
alayout->setSpacing(0);
layout2->addLayout(alayout);
layout2->addSpacing(4);
blayout = new Q3HBoxLayout();
blayout = new QHBoxLayout();
blayout->setSpacing(0);
blayout->setMargin(0);
layout2->addLayout(blayout);
/trunk/Scribus/scribus/plugins/svgimplugin/svgplugin.h
8,10 → 8,7
#define SVGPLUG_H
 
#include <qdom.h>
#include <q3ptrstack.h>
#include <qsize.h>
//Added by qt3to4:
#include <Q3PtrList>
#include <QList>
#include <QStack>
#include "pluginapi.h"
/trunk/Scribus/scribus/plugins/fileloader/scribus12format/scribus12format.cpp
25,7 → 25,6
#include <QList>
//Added by qt3to4:
#include <QByteArray>
#include <Q3PtrList>
#include <QTextStream>
#include <QApplication>
 
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.h
16,7 → 16,6
#include <qdom.h>
#include <QMap>
#include <QString>
#include <Q3PtrList>
#include <QList>
#include <QProgressBar>
 
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
22,8 → 22,6
#include <qcursor.h>
#include <qfileinfo.h>
#include <QList>
//Added by qt3to4:
#include <Q3PtrList>
#include <QDataStream>
 
 
/trunk/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
25,7 → 25,6
#include <QList>
//Added by qt3to4:
#include <QByteArray>
#include <Q3PtrList>
#include <QTextStream>
#include <QApplication>
 
/trunk/Scribus/scribus/plugins/psimport/importps.h
10,7 → 10,6
#include "qglobal.h"
#include "qobject.h"
#include "qstring.h"
#include "q3ptrlist.h"
 
#include "pluginapi.h"
#include "pageitem.h"
/trunk/Scribus/scribus/pslib.cpp
1744,7 → 1744,7
}
PS_begin_doc(Doc, 0.0, 0.0, maxWidth, maxHeight, pageNs.size()*pagemult, doDev, sep, farb, Ic, gcr, over);
}
uint ap=0;
int ap=0;
for (; ap < Doc->MasterPages.count() && !abortExport; ++ap)
{
progressDialog->setOverallProgress(ap);
/trunk/Scribus/scribus/tocgenerator.cpp
84,7 → 84,7
if (pageCounter==NULL)
return;
uint pageNumberWidth=QString("%1").arg(currDoc->DocPages.count()).length();
for (uint i=0;i<currDoc->DocPages.count();++i)
for (int i=0;i<currDoc->DocPages.count();++i)
pageCounter[i]=0;
int maxDataWidth=0;
for (int d = 0; d < currDoc->DocItems.count(); ++d)